From 572e40ca2713bc5d79fc3ee5fb852b0c7b14d6db Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Sat, 7 Nov 2020 11:30:45 +0100
Subject: [PATCH 0001/1300] backend that supports asgi and status update
 sockets with channels

---
 Pipfile                            |   2 +
 Pipfile.lock                       | 582 +++++++++++++++++++++++++----
 src/documents/consumer.py          |  44 ++-
 src/documents/parsers.py           |   3 +-
 src/paperless/asgi.py              |  37 ++
 src/paperless/settings.py          |  12 +
 src/paperless_tesseract/parsers.py |  25 +-
 7 files changed, 613 insertions(+), 92 deletions(-)
 create mode 100644 src/paperless/asgi.py

diff --git a/Pipfile b/Pipfile
index e8f862578..d526ae252 100644
--- a/Pipfile
+++ b/Pipfile
@@ -26,6 +26,8 @@ fuzzywuzzy = "*"
 python-Levenshtein = "*"
 django-extensions = ""
 watchdog = "*"
+channels = "~=3.0"
+channels-redis = "*"
 
 [dev-packages]
 coveralls = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 8b3bf705a..642e38214 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "2c1558fe7df0aee1ee20b095c2102f802470bf4a4ae09a7749ac487f8bfab8b6"
+            "sha256": "192d7419b844e6bb81fed793e7766b2ba15f2a016af1a33fc73cf09e12de5fb7"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -14,13 +14,151 @@
         ]
     },
     "default": {
+        "aioredis": {
+            "hashes": [
+                "sha256:15f8af30b044c771aee6787e5ec24694c048184c7b9e54c3b60c750a4b93273a",
+                "sha256:b61808d7e97b7cd5a92ed574937a079c9387fdadd22bfbfa7ad2fd319ecc26e3"
+            ],
+            "version": "==1.3.1"
+        },
         "asgiref": {
             "hashes": [
-                "sha256:7e51911ee147dd685c3c8b805c0ad0cb58d360987b56953878f8c06d2d1c6f1a",
-                "sha256:9fc6fb5d39b8af147ba40765234fa822b39818b12cc80b35ad9b0cef3a476aed"
+                "sha256:a5098bc870b80e7b872bff60bb363c7f2c2c89078759f6c47b53ff8c525a152e",
+                "sha256:cd88907ecaec59d78e4ac00ea665b03e571cb37e3a0e37b3702af1a9e86c365a"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==3.2.10"
+            "version": "==3.3.0"
+        },
+        "async-timeout": {
+            "hashes": [
+                "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f",
+                "sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3"
+            ],
+            "markers": "python_full_version >= '3.5.3'",
+            "version": "==3.0.1"
+        },
+        "attrs": {
+            "hashes": [
+                "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
+                "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==20.3.0"
+        },
+        "autobahn": {
+            "hashes": [
+                "sha256:24ce276d313e84d68241c3aef30d484f352b90a40168981b3640312c821df77b",
+                "sha256:86bbce30cdd407137c57670993a8f9bfdfe3f8e994b889181d85e844d5aa8dfb"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==20.7.1"
+        },
+        "automat": {
+            "hashes": [
+                "sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33",
+                "sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111"
+            ],
+            "version": "==20.2.0"
+        },
+        "cffi": {
+            "hashes": [
+                "sha256:005f2bfe11b6745d726dbb07ace4d53f057de66e336ff92d61b8c7e9c8f4777d",
+                "sha256:09e96138280241bd355cd585148dec04dbbedb4f46128f340d696eaafc82dd7b",
+                "sha256:0b1ad452cc824665ddc682400b62c9e4f5b64736a2ba99110712fdee5f2505c4",
+                "sha256:0ef488305fdce2580c8b2708f22d7785ae222d9825d3094ab073e22e93dfe51f",
+                "sha256:15f351bed09897fbda218e4db5a3d5c06328862f6198d4fb385f3e14e19decb3",
+                "sha256:22399ff4870fb4c7ef19fff6eeb20a8bbf15571913c181c78cb361024d574579",
+                "sha256:23e5d2040367322824605bc29ae8ee9175200b92cb5483ac7d466927a9b3d537",
+                "sha256:2791f68edc5749024b4722500e86303a10d342527e1e3bcac47f35fbd25b764e",
+                "sha256:2f9674623ca39c9ebe38afa3da402e9326c245f0f5ceff0623dccdac15023e05",
+                "sha256:3363e77a6176afb8823b6e06db78c46dbc4c7813b00a41300a4873b6ba63b171",
+                "sha256:33c6cdc071ba5cd6d96769c8969a0531be2d08c2628a0143a10a7dcffa9719ca",
+                "sha256:3b8eaf915ddc0709779889c472e553f0d3e8b7bdf62dab764c8921b09bf94522",
+                "sha256:3cb3e1b9ec43256c4e0f8d2837267a70b0e1ca8c4f456685508ae6106b1f504c",
+                "sha256:3eeeb0405fd145e714f7633a5173318bd88d8bbfc3dd0a5751f8c4f70ae629bc",
+                "sha256:44f60519595eaca110f248e5017363d751b12782a6f2bd6a7041cba275215f5d",
+                "sha256:4d7c26bfc1ea9f92084a1d75e11999e97b62d63128bcc90c3624d07813c52808",
+                "sha256:529c4ed2e10437c205f38f3691a68be66c39197d01062618c55f74294a4a4828",
+                "sha256:6642f15ad963b5092d65aed022d033c77763515fdc07095208f15d3563003869",
+                "sha256:85ba797e1de5b48aa5a8427b6ba62cf69607c18c5d4eb747604b7302f1ec382d",
+                "sha256:8f0f1e499e4000c4c347a124fa6a27d37608ced4fe9f7d45070563b7c4c370c9",
+                "sha256:a624fae282e81ad2e4871bdb767e2c914d0539708c0f078b5b355258293c98b0",
+                "sha256:b0358e6fefc74a16f745afa366acc89f979040e0cbc4eec55ab26ad1f6a9bfbc",
+                "sha256:bbd2f4dfee1079f76943767fce837ade3087b578aeb9f69aec7857d5bf25db15",
+                "sha256:bf39a9e19ce7298f1bd6a9758fa99707e9e5b1ebe5e90f2c3913a47bc548747c",
+                "sha256:c11579638288e53fc94ad60022ff1b67865363e730ee41ad5e6f0a17188b327a",
+                "sha256:c150eaa3dadbb2b5339675b88d4573c1be3cb6f2c33a6c83387e10cc0bf05bd3",
+                "sha256:c53af463f4a40de78c58b8b2710ade243c81cbca641e34debf3396a9640d6ec1",
+                "sha256:cb763ceceae04803adcc4e2d80d611ef201c73da32d8f2722e9d0ab0c7f10768",
+                "sha256:cc75f58cdaf043fe6a7a6c04b3b5a0e694c6a9e24050967747251fb80d7bce0d",
+                "sha256:d80998ed59176e8cba74028762fbd9b9153b9afc71ea118e63bbf5d4d0f9552b",
+                "sha256:de31b5164d44ef4943db155b3e8e17929707cac1e5bd2f363e67a56e3af4af6e",
+                "sha256:e66399cf0fc07de4dce4f588fc25bfe84a6d1285cc544e67987d22663393926d",
+                "sha256:f0620511387790860b249b9241c2f13c3a80e21a73e0b861a2df24e9d6f56730",
+                "sha256:f4eae045e6ab2bb54ca279733fe4eb85f1effda392666308250714e01907f394",
+                "sha256:f92cdecb618e5fa4658aeb97d5eb3d2f47aa94ac6477c6daf0f306c5a3b9e6b1",
+                "sha256:f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591"
+            ],
+            "version": "==1.14.3"
+        },
+        "channels": {
+            "hashes": [
+                "sha256:5cdd9c6b9ee663cdf1bbb00de7cdab885a3c418f9d32a29f04b09498828020f6",
+                "sha256:b02e150b48704ec3607d4168402ac5c26138dd183fcdb7f2aeb965e6e19fd558"
+            ],
+            "index": "pypi",
+            "version": "==3.0.1"
+        },
+        "channels-redis": {
+            "hashes": [
+                "sha256:18d63f6462a58011740dc8eeb57ea4b31ec220eb551cb71b27de9c6779a549de",
+                "sha256:2fb31a63b05373f6402da2e6a91a22b9e66eb8b56626c6bfc93e156c734c5ae6"
+            ],
+            "index": "pypi",
+            "version": "==3.2.0"
+        },
+        "constantly": {
+            "hashes": [
+                "sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35",
+                "sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d"
+            ],
+            "version": "==15.1.0"
+        },
+        "cryptography": {
+            "hashes": [
+                "sha256:07ca431b788249af92764e3be9a488aa1d39a0bc3be313d826bbec690417e538",
+                "sha256:13b88a0bd044b4eae1ef40e265d006e34dbcde0c2f1e15eb9896501b2d8f6c6f",
+                "sha256:32434673d8505b42c0de4de86da8c1620651abd24afe91ae0335597683ed1b77",
+                "sha256:3cd75a683b15576cfc822c7c5742b3276e50b21a06672dc3a800a2d5da4ecd1b",
+                "sha256:4e7268a0ca14536fecfdf2b00297d4e407da904718658c1ff1961c713f90fd33",
+                "sha256:545a8550782dda68f8cdc75a6e3bf252017aa8f75f19f5a9ca940772fc0cb56e",
+                "sha256:55d0b896631412b6f0c7de56e12eb3e261ac347fbaa5d5e705291a9016e5f8cb",
+                "sha256:5849d59358547bf789ee7e0d7a9036b2d29e9a4ddf1ce5e06bb45634f995c53e",
+                "sha256:6dc59630ecce8c1f558277ceb212c751d6730bd12c80ea96b4ac65637c4f55e7",
+                "sha256:7117319b44ed1842c617d0a452383a5a052ec6aa726dfbaffa8b94c910444297",
+                "sha256:75e8e6684cf0034f6bf2a97095cb95f81537b12b36a8fedf06e73050bb171c2d",
+                "sha256:7b8d9d8d3a9bd240f453342981f765346c87ade811519f98664519696f8e6ab7",
+                "sha256:a035a10686532b0587d58a606004aa20ad895c60c4d029afa245802347fab57b",
+                "sha256:a4e27ed0b2504195f855b52052eadcc9795c59909c9d84314c5408687f933fc7",
+                "sha256:a733671100cd26d816eed39507e585c156e4498293a907029969234e5e634bc4",
+                "sha256:a75f306a16d9f9afebfbedc41c8c2351d8e61e818ba6b4c40815e2b5740bb6b8",
+                "sha256:bd717aa029217b8ef94a7d21632a3bb5a4e7218a4513d2521c2a2fd63011e98b",
+                "sha256:d25cecbac20713a7c3bc544372d42d8eafa89799f492a43b79e1dfd650484851",
+                "sha256:d26a2557d8f9122f9bf445fc7034242f4375bd4e95ecda007667540270965b13",
+                "sha256:d3545829ab42a66b84a9aaabf216a4dce7f16dbc76eb69be5c302ed6b8f4a29b",
+                "sha256:d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3",
+                "sha256:efe15aca4f64f3a7ea0c09c87826490e50ed166ce67368a68f315ea0807a20df"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==3.2.1"
+        },
+        "daphne": {
+            "hashes": [
+                "sha256:60856f7efa0b1e1b969efa074e8698bd09de4713ecc06e6a4d19d04c66c4a3bd",
+                "sha256:b43e70d74ff832a634ff6c92badd208824e4530e08b340116517e5aad0aca774"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==3.0.0"
         },
         "dateparser": {
             "hashes": [
@@ -32,11 +170,11 @@
         },
         "django": {
             "hashes": [
-                "sha256:a2127ad0150ec6966655bedf15dbbff9697cc86d61653db2da1afa506c0b04cc",
-                "sha256:c93c28ccf1d094cbd00d860e83128a39e45d2c571d3b54361713aaaf9a94cac4"
+                "sha256:14a4b7cd77297fba516fc0d92444cc2e2e388aa9de32d7a68d4a83d58f5a4927",
+                "sha256:14b87775ffedab2ef6299b73343d1b4b41e5d4e2aa58c6581f114dbec01e3f8f"
             ],
             "index": "pypi",
-            "version": "==3.1.2"
+            "version": "==3.1.3"
         },
         "django-cors-headers": {
             "hashes": [
@@ -65,11 +203,10 @@
         },
         "djangorestframework": {
             "hashes": [
-                "sha256:5c5071fcbad6dce16f566d492015c829ddb0df42965d488b878594aabc3aed21",
-                "sha256:d54452aedebb4b650254ca092f9f4f5df947cb1de6ab245d817b08b4f4156249"
+                "sha256:0209bafcb7b5010fdfec784034f059d512256424de2a0f084cb82b096d6dd6a7"
             ],
             "index": "pypi",
-            "version": "==3.12.1"
+            "version": "==3.12.2"
         },
         "filemagic": {
             "hashes": [
@@ -94,6 +231,80 @@
             "index": "pypi",
             "version": "==20.0.4"
         },
+        "hiredis": {
+            "hashes": [
+                "sha256:06a039208f83744a702279b894c8cf24c14fd63c59cd917dcde168b79eef0680",
+                "sha256:0a909bf501459062aa1552be1461456518f367379fdc9fdb1f2ca5e4a1fdd7c0",
+                "sha256:18402d9e54fb278cb9a8c638df6f1550aca36a009d47ecf5aa263a38600f35b0",
+                "sha256:1e4cbbc3858ec7e680006e5ca590d89a5e083235988f26a004acf7244389ac01",
+                "sha256:23344e3c2177baf6975fbfa361ed92eb7d36d08f454636e5054b3faa7c2aff8a",
+                "sha256:289b31885b4996ce04cadfd5fc03d034dce8e2a8234479f7c9e23b9e245db06b",
+                "sha256:2c1c570ae7bf1bab304f29427e2475fe1856814312c4a1cf1cd0ee133f07a3c6",
+                "sha256:2c227c0ed371771ffda256034427320870e8ea2e4fd0c0a618c766e7c49aad73",
+                "sha256:3bb9b63d319402cead8bbd9dd55dca3b667d2997e9a0d8a1f9b6cc274db4baee",
+                "sha256:3ef2183de67b59930d2db8b8e8d4d58e00a50fcc5e92f4f678f6eed7a1c72d55",
+                "sha256:43b8ed3dbfd9171e44c554cb4acf4ee4505caa84c5e341858b50ea27dd2b6e12",
+                "sha256:47bcf3c5e6c1e87ceb86cdda2ee983fa0fe56a999e6185099b3c93a223f2fa9b",
+                "sha256:5263db1e2e1e8ae30500cdd75a979ff99dcc184201e6b4b820d0de74834d2323",
+                "sha256:5b1451727f02e7acbdf6aae4e06d75f66ee82966ff9114550381c3271a90f56c",
+                "sha256:6996883a8a6ff9117cbb3d6f5b0dcbbae6fb9e31e1a3e4e2f95e0214d9a1c655",
+                "sha256:6c96f64a54f030366657a54bb90b3093afc9c16c8e0dfa29fc0d6dbe169103a5",
+                "sha256:7332d5c3e35154cd234fd79573736ddcf7a0ade7a986db35b6196b9171493e75",
+                "sha256:7885b6f32c4a898e825bb7f56f36a02781ac4a951c63e4169f0afcf9c8c30dfb",
+                "sha256:7b0f63f10a166583ab744a58baad04e0f52cfea1ac27bfa1b0c21a48d1003c23",
+                "sha256:819f95d4eba3f9e484dd115ab7ab72845cf766b84286a00d4ecf76d33f1edca1",
+                "sha256:8968eeaa4d37a38f8ca1f9dbe53526b69628edc9c42229a5b2f56d98bb828c1f",
+                "sha256:89ebf69cb19a33d625db72d2ac589d26e936b8f7628531269accf4a3196e7872",
+                "sha256:8daecd778c1da45b8bd54fd41ffcd471a86beed3d8e57a43acf7a8d63bba4058",
+                "sha256:955ba8ea73cf3ed8bd2f963b4cb9f8f0dcb27becd2f4b3dd536fd24c45533454",
+                "sha256:964f18a59f5a64c0170f684c417f4fe3e695a536612e13074c4dd5d1c6d7c882",
+                "sha256:969843fbdfbf56cdb71da6f0bdf50f9985b8b8aeb630102945306cf10a9c6af2",
+                "sha256:996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132",
+                "sha256:9e9c9078a7ce07e6fce366bd818be89365a35d2e4b163268f0ca9ba7e13bb2f6",
+                "sha256:a04901757cb0fb0f5602ac11dda48f5510f94372144d06c2563ba56c480b467c",
+                "sha256:a7bf1492429f18d205f3a818da3ff1f242f60aa59006e53dee00b4ef592a3363",
+                "sha256:aa0af2deb166a5e26e0d554b824605e660039b161e37ed4f01b8d04beec184f3",
+                "sha256:abfb15a6a7822f0fae681785cb38860e7a2cb1616a708d53df557b3d76c5bfd4",
+                "sha256:b253fe4df2afea4dfa6b1fa8c5fef212aff8bcaaeb4207e81eed05cb5e4a7919",
+                "sha256:b27f082f47d23cffc4cf1388b84fdc45c4ef6015f906cd7e0d988d9e35d36349",
+                "sha256:b33aea449e7f46738811fbc6f0b3177c6777a572207412bbbf6f525ffed001ae",
+                "sha256:b44f9421c4505c548435244d74037618f452844c5d3c67719d8a55e2613549da",
+                "sha256:bcc371151d1512201d0214c36c0c150b1dc64f19c2b1a8c9cb1d7c7c15ebd93f",
+                "sha256:c2851deeabd96d3f6283e9c6b26e0bfed4de2dc6fb15edf913e78b79fc5909ed",
+                "sha256:cdfd501c7ac5b198c15df800a3a34c38345f5182e5f80770caf362bccca65628",
+                "sha256:d2c0caffa47606d6d7c8af94ba42547bd2a441f06c74fd90a1ffe328524a6c64",
+                "sha256:dcb2db95e629962db5a355047fb8aefb012df6c8ae608930d391619dbd96fd86",
+                "sha256:e0eeb9c112fec2031927a1745788a181d0eecbacbed941fc5c4f7bc3f7b273bf",
+                "sha256:e154891263306200260d7f3051982774d7b9ef35af3509d5adbbe539afd2610c",
+                "sha256:e2e023a42dcbab8ed31f97c2bcdb980b7fbe0ada34037d87ba9d799664b58ded",
+                "sha256:e64be68255234bb489a574c4f2f8df7029c98c81ec4d160d6cd836e7f0679390",
+                "sha256:e82d6b930e02e80e5109b678c663a9ed210680ded81c1abaf54635d88d1da298"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==1.1.0"
+        },
+        "hyperlink": {
+            "hashes": [
+                "sha256:47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af",
+                "sha256:c528d405766f15a2c536230de7e160b65a08e20264d8891b3eb03307b0df3c63"
+            ],
+            "version": "==20.0.1"
+        },
+        "idna": {
+            "hashes": [
+                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
+                "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.10"
+        },
+        "incremental": {
+            "hashes": [
+                "sha256:717e12246dddf231a349175f48d74d93e2897244939173b01974ab6661406b9f",
+                "sha256:7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3"
+            ],
+            "version": "==17.5.0"
+        },
         "joblib": {
             "hashes": [
                 "sha256:698c311779f347cf6b7e6b8a39bb682277b8ee4aba8cf9507bc0cf4cd4737b72",
@@ -110,45 +321,68 @@
             "index": "pypi",
             "version": "==1.0.8"
         },
+        "msgpack": {
+            "hashes": [
+                "sha256:002a0d813e1f7b60da599bdf969e632074f9eec1b96cbed8fb0973a63160a408",
+                "sha256:25b3bc3190f3d9d965b818123b7752c5dfb953f0d774b454fd206c18fe384fb8",
+                "sha256:271b489499a43af001a2e42f42d876bb98ccaa7e20512ff37ca78c8e12e68f84",
+                "sha256:39c54fdebf5fa4dda733369012c59e7d085ebdfe35b6cf648f09d16708f1be5d",
+                "sha256:4233b7f86c1208190c78a525cd3828ca1623359ef48f78a6fea4b91bb995775a",
+                "sha256:5bea44181fc8e18eed1d0cd76e355073f00ce232ff9653a0ae88cb7d9e643322",
+                "sha256:5dba6d074fac9b24f29aaf1d2d032306c27f04187651511257e7831733293ec2",
+                "sha256:7a22c965588baeb07242cb561b63f309db27a07382825fc98aecaf0827c1538e",
+                "sha256:908944e3f038bca67fcfedb7845c4a257c7749bf9818632586b53bcf06ba4b97",
+                "sha256:9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0",
+                "sha256:aa5c057eab4f40ec47ea6f5a9825846be2ff6bf34102c560bad5cad5a677c5be",
+                "sha256:b3758dfd3423e358bbb18a7cccd1c74228dffa7a697e5be6cb9535de625c0dbf",
+                "sha256:c901e8058dd6653307906c5f157f26ed09eb94a850dddd989621098d347926ab",
+                "sha256:cec8bf10981ed70998d98431cd814db0ecf3384e6b113366e7f36af71a0fca08",
+                "sha256:db685187a415f51d6b937257474ca72199f393dad89534ebbdd7d7a3b000080e",
+                "sha256:e35b051077fc2f3ce12e7c6a34cf309680c63a842db3a0616ea6ed25ad20d272",
+                "sha256:e7bbdd8e2b277b77782f3ce34734b0dfde6cbe94ddb74de8d733d603c7f9e2b1",
+                "sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140"
+            ],
+            "version": "==1.0.0"
+        },
         "numpy": {
             "hashes": [
-                "sha256:0ee77786eebbfa37f2141fd106b549d37c89207a0d01d8852fde1c82e9bfc0e7",
-                "sha256:199bebc296bd8a5fc31c16f256ac873dd4d5b4928dfd50e6c4995570fc71a8f3",
-                "sha256:1a307bdd3dd444b1d0daa356b5f4c7de2e24d63bdc33ea13ff718b8ec4c6a268",
-                "sha256:1ea7e859f16e72ab81ef20aae69216cfea870676347510da9244805ff9670170",
-                "sha256:271139653e8b7a046d11a78c0d33bafbddd5c443a5b9119618d0652a4eb3a09f",
-                "sha256:35bf5316af8dc7c7db1ad45bec603e5fb28671beb98ebd1d65e8059efcfd3b72",
-                "sha256:463792a249a81b9eb2b63676347f996d3f0082c2666fd0604f4180d2e5445996",
-                "sha256:50d3513469acf5b2c0406e822d3f314d7ac5788c2b438c24e5dd54d5a81ef522",
-                "sha256:50f68ebc439821b826823a8da6caa79cd080dee2a6d5ab9f1163465a060495ed",
-                "sha256:51e8d2ae7c7e985c7bebf218e56f72fa93c900ad0c8a7d9fbbbf362f45710f69",
-                "sha256:522053b731e11329dd52d258ddf7de5288cae7418b55e4b7d32f0b7e31787e9d",
-                "sha256:5ea4401ada0d3988c263df85feb33818dc995abc85b8125f6ccb762009e7bc68",
-                "sha256:604d2e5a31482a3ad2c88206efd43d6fcf666ada1f3188fd779b4917e49b7a98",
-                "sha256:6ff88bcf1872b79002569c63fe26cd2cda614e573c553c4d5b814fb5eb3d2822",
-                "sha256:7197ee0a25629ed782c7bd01871ee40702ffeef35bc48004bc2fdcc71e29ba9d",
-                "sha256:741d95eb2b505bb7a99fbf4be05fa69f466e240c2b4f2d3ddead4f1b5f82a5a5",
-                "sha256:83af653bb92d1e248ccf5fdb05ccc934c14b936bcfe9b917dc180d3f00250ac6",
-                "sha256:8802d23e4895e0c65e418abe67cdf518aa5cbb976d97f42fd591f921d6dffad0",
-                "sha256:8edc4d687a74d0a5f8b9b26532e860f4f85f56c400b3a98899fc44acb5e27add",
-                "sha256:942d2cdcb362739908c26ce8dd88db6e139d3fa829dd7452dd9ff02cba6b58b2",
-                "sha256:9a0669787ba8c9d3bb5de5d9429208882fb47764aa79123af25c5edc4f5966b9",
-                "sha256:9d08d84bb4128abb9fbd9f073e5c69f70e5dab991a9c42e5b4081ea5b01b5db0",
-                "sha256:9f7f56b5e85b08774939622b7d45a5d00ff511466522c44fc0756ac7692c00f2",
-                "sha256:a2daea1cba83210c620e359de2861316f49cc7aea8e9a6979d6cb2ddab6dda8c",
-                "sha256:b9074d062d30c2779d8af587924f178a539edde5285d961d2dfbecbac9c4c931",
-                "sha256:c4aa79993f5d856765819a3651117520e41ac3f89c3fc1cb6dee11aa562df6da",
-                "sha256:d78294f1c20f366cde8a75167f822538a7252b6e8b9d6dbfb3bdab34e7c1929e",
-                "sha256:dfdc8b53aa9838b9d44ed785431ca47aa3efaa51d0d5dd9c412ab5247151a7c4",
-                "sha256:dffed17848e8b968d8d3692604e61881aa6ef1f8074c99e81647ac84f6038535",
-                "sha256:e080087148fd70469aade2abfeadee194357defd759f9b59b349c6192aba994c",
-                "sha256:e983cbabe10a8989333684c98fdc5dd2f28b236216981e0c26ed359aaa676772",
-                "sha256:ea6171d2d8d648dee717457d0f75db49ad8c2f13100680e284d7becf3dc311a6",
-                "sha256:eefc13863bf01583a85e8c1121a901cc7cb8f059b960c4eba30901e2e6aba95f",
-                "sha256:efd656893171bbf1331beca4ec9f2e74358fc732a2084f664fd149cc4b3441d2"
+                "sha256:08308c38e44cc926bdfce99498b21eec1f848d24c302519e64203a8da99a97db",
+                "sha256:09c12096d843b90eafd01ea1b3307e78ddd47a55855ad402b157b6c4862197ce",
+                "sha256:13d166f77d6dc02c0a73c1101dd87fdf01339febec1030bd810dcd53fff3b0f1",
+                "sha256:141ec3a3300ab89c7f2b0775289954d193cc8edb621ea05f99db9cb181530512",
+                "sha256:16c1b388cc31a9baa06d91a19366fb99ddbe1c7b205293ed072211ee5bac1ed2",
+                "sha256:18bed2bcb39e3f758296584337966e68d2d5ba6aab7e038688ad53c8f889f757",
+                "sha256:1aeef46a13e51931c0b1cf8ae1168b4a55ecd282e6688fdb0a948cc5a1d5afb9",
+                "sha256:27d3f3b9e3406579a8af3a9f262f5339005dd25e0ecf3cf1559ff8a49ed5cbf2",
+                "sha256:2a2740aa9733d2e5b2dfb33639d98a64c3b0f24765fed86b0fd2aec07f6a0a08",
+                "sha256:4377e10b874e653fe96985c05feed2225c912e328c8a26541f7fc600fb9c637b",
+                "sha256:448ebb1b3bf64c0267d6b09a7cba26b5ae61b6d2dbabff7c91b660c7eccf2bdb",
+                "sha256:50e86c076611212ca62e5a59f518edafe0c0730f7d9195fec718da1a5c2bb1fc",
+                "sha256:5734bdc0342aba9dfc6f04920988140fb41234db42381cf7ccba64169f9fe7ac",
+                "sha256:64324f64f90a9e4ef732be0928be853eee378fd6a01be21a0a8469c4f2682c83",
+                "sha256:6ae6c680f3ebf1cf7ad1d7748868b39d9f900836df774c453c11c5440bc15b36",
+                "sha256:6d7593a705d662be5bfe24111af14763016765f43cb6923ed86223f965f52387",
+                "sha256:8cac8790a6b1ddf88640a9267ee67b1aee7a57dfa2d2dd33999d080bc8ee3a0f",
+                "sha256:8ece138c3a16db8c1ad38f52eb32be6086cc72f403150a79336eb2045723a1ad",
+                "sha256:9eeb7d1d04b117ac0d38719915ae169aa6b61fca227b0b7d198d43728f0c879c",
+                "sha256:a09f98011236a419ee3f49cedc9ef27d7a1651df07810ae430a6b06576e0b414",
+                "sha256:a5d897c14513590a85774180be713f692df6fa8ecf6483e561a6d47309566f37",
+                "sha256:ad6f2ff5b1989a4899bf89800a671d71b1612e5ff40866d1f4d8bcf48d4e5764",
+                "sha256:c42c4b73121caf0ed6cd795512c9c09c52a7287b04d105d112068c1736d7c753",
+                "sha256:cb1017eec5257e9ac6209ac172058c430e834d5d2bc21961dceeb79d111e5909",
+                "sha256:d6c7bb82883680e168b55b49c70af29b84b84abb161cbac2800e8fcb6f2109b6",
+                "sha256:e452dc66e08a4ce642a961f134814258a082832c78c90351b75c41ad16f79f63",
+                "sha256:e5b6ed0f0b42317050c88022349d994fe72bfe35f5908617512cd8c8ef9da2a9",
+                "sha256:e9b30d4bd69498fc0c3fe9db5f62fffbb06b8eb9321f92cc970f2969be5e3949",
+                "sha256:ec149b90019852266fec2341ce1db513b843e496d5a8e8cdb5ced1923a92faab",
+                "sha256:edb01671b3caae1ca00881686003d16c2209e07b7ef8b7639f1867852b948f7c",
+                "sha256:f0d3929fe88ee1c155129ecd82f981b8856c5d97bcb0d5f23e9b4242e79d1de3",
+                "sha256:f29454410db6ef8126c83bd3c968d143304633d45dc57b51252afbd79d700893",
+                "sha256:fe45becb4c2f72a0907c1d0246ea6449fe7a9e2293bb0e11c4e9a32bb0930a15",
+                "sha256:fedbd128668ead37f33917820b704784aff695e0019309ad446a6d0b065b57e4"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==1.19.3"
+            "version": "==1.19.4"
         },
         "pathtools": {
             "hashes": [
@@ -202,9 +436,11 @@
                 "sha256:0deac2af1a587ae12836aa07970f5cb91964f05a7c6cdb69d8425ff4c15d4e2c",
                 "sha256:0e4dc3d5996760104746e6cfcdb519d9d2cd27c738296525d5867ea695774e67",
                 "sha256:11b9c0ebce097180129e422379b824ae21c8f2a6596b159c7659e2e5a00e1aa0",
+                "sha256:15978a1fbd225583dd8cdaf37e67ccc278b5abecb4caf6b2d6b8e2b948e953f6",
                 "sha256:1fabed9ea2acc4efe4671b92c669a213db744d2af8a9fc5d69a8e9bc14b7a9db",
                 "sha256:2dac98e85565d5688e8ab7bdea5446674a83a3945a8f416ad0110018d1501b94",
                 "sha256:42ec1035841b389e8cc3692277a0bd81cdfe0b65d575a2c8862cec7a80e62e52",
+                "sha256:6422f2ff0919fd720195f64ffd8f924c1395d30f9a495f31e2392c2efafb5056",
                 "sha256:6a32f3a4cb2f6e1a0b15215f448e8ce2da192fd4ff35084d80d5e39da683e79b",
                 "sha256:7312e931b90fe14f925729cde58022f5d034241918a5c4f9797cac62f6b3a9dd",
                 "sha256:7d92a09b788cbb1aec325af5fcba9fed7203897bbd9269d5691bb1e3bce29550",
@@ -236,6 +472,58 @@
             "index": "pypi",
             "version": "==2.8.6"
         },
+        "pyasn1": {
+            "hashes": [
+                "sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359",
+                "sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576",
+                "sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf",
+                "sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7",
+                "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d",
+                "sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00",
+                "sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8",
+                "sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86",
+                "sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12",
+                "sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776",
+                "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba",
+                "sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2",
+                "sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3"
+            ],
+            "version": "==0.4.8"
+        },
+        "pyasn1-modules": {
+            "hashes": [
+                "sha256:0845a5582f6a02bb3e1bde9ecfc4bfcae6ec3210dd270522fee602365430c3f8",
+                "sha256:0fe1b68d1e486a1ed5473f1302bd991c1611d319bba158e98b106ff86e1d7199",
+                "sha256:15b7c67fabc7fc240d87fb9aabf999cf82311a6d6fb2c70d00d3d0604878c811",
+                "sha256:426edb7a5e8879f1ec54a1864f16b882c2837bfd06eee62f2c982315ee2473ed",
+                "sha256:65cebbaffc913f4fe9e4808735c95ea22d7a7775646ab690518c056784bc21b4",
+                "sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e",
+                "sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74",
+                "sha256:a99324196732f53093a84c4369c996713eb8c89d360a496b599fb1a9c47fc3eb",
+                "sha256:b80486a6c77252ea3a3e9b1e360bc9cf28eaac41263d173c032581ad2f20fe45",
+                "sha256:c29a5e5cc7a3f05926aff34e097e84f8589cd790ce0ed41b67aed6857b26aafd",
+                "sha256:cbac4bc38d117f2a49aeedec4407d23e8866ea4ac27ff2cf7fb3e5b570df19e0",
+                "sha256:f39edd8c4ecaa4556e989147ebf219227e2cd2e8a43c7e7fcb1f1c18c5fd6a3d",
+                "sha256:fe0644d9ab041506b62782e92b06b8c68cca799e1a9636ec398675459e031405"
+            ],
+            "version": "==0.2.8"
+        },
+        "pycparser": {
+            "hashes": [
+                "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0",
+                "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.20"
+        },
+        "pyhamcrest": {
+            "hashes": [
+                "sha256:412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316",
+                "sha256:7ead136e03655af85069b6f47b23eb7c3e5c221aa9f022a4fbb499f5b7308f29"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==2.0.2"
+        },
         "pyocr": {
             "hashes": [
                 "sha256:fa15adc7e1cf0d345a2990495fe125a947c6e09a60ddba0256a1c14b2e603179"
@@ -243,6 +531,13 @@
             "index": "pypi",
             "version": "==0.7.2"
         },
+        "pyopenssl": {
+            "hashes": [
+                "sha256:621880965a720b8ece2f1b2f54ea2071966ab00e2970ad2ce11d596102063504",
+                "sha256:9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507"
+            ],
+            "version": "==19.1.0"
+        },
         "python-dateutil": {
             "hashes": [
                 "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c",
@@ -276,10 +571,10 @@
         },
         "pytz": {
             "hashes": [
-                "sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed",
-                "sha256:c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048"
+                "sha256:3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268",
+                "sha256:5c55e189b682d420be27c6995ba6edce0c0a77dd67bfbe2ae6607134d5851ffd"
             ],
-            "version": "==2020.1"
+            "version": "==2020.4"
         },
         "regex": {
             "hashes": [
@@ -287,26 +582,42 @@
                 "sha256:06b52815d4ad38d6524666e0d50fe9173533c9cc145a5779b89733284e6f688f",
                 "sha256:11116d424734fe356d8777f89d625f0df783251ada95d6261b4c36ad27a394bb",
                 "sha256:119e0355dbdd4cf593b17f2fc5dbd4aec2b8899d0057e4957ba92f941f704bf5",
+                "sha256:127a9e0c0d91af572fbb9e56d00a504dbd4c65e574ddda3d45b55722462210de",
                 "sha256:1ec66700a10e3c75f1f92cbde36cca0d3aaee4c73dfa26699495a3a30b09093c",
+                "sha256:227a8d2e5282c2b8346e7f68aa759e0331a0b4a890b55a5cfbb28bd0261b84c0",
+                "sha256:2564def9ce0710d510b1fc7e5178ce2d20f75571f788b5197b3c8134c366f50c",
+                "sha256:297116e79074ec2a2f885d22db00ce6e88b15f75162c5e8b38f66ea734e73c64",
                 "sha256:2dc522e25e57e88b4980d2bdd334825dbf6fa55f28a922fc3bfa60cc09e5ef53",
                 "sha256:3a5f08039eee9ea195a89e180c5762bfb55258bfb9abb61a20d3abee3b37fd12",
+                "sha256:3dfca201fa6b326239e1bccb00b915e058707028809b8ecc0cf6819ad233a740",
                 "sha256:49461446b783945597c4076aea3f49aee4b4ce922bd241e4fcf62a3e7c61794c",
                 "sha256:4afa350f162551cf402bfa3cd8302165c8e03e689c897d185f16a167328cc6dd",
                 "sha256:4b5a9bcb56cc146c3932c648603b24514447eafa6ce9295234767bf92f69b504",
+                "sha256:52e83a5f28acd621ba8e71c2b816f6541af7144b69cc5859d17da76c436a5427",
                 "sha256:625116aca6c4b57c56ea3d70369cacc4d62fead4930f8329d242e4fe7a58ce4b",
                 "sha256:654c1635f2313d0843028487db2191530bca45af61ca85d0b16555c399625b0e",
                 "sha256:8092a5a06ad9a7a247f2a76ace121183dc4e1a84c259cf9c2ce3bbb69fac3582",
                 "sha256:832339223b9ce56b7b15168e691ae654d345ac1635eeb367ade9ecfe0e66bee0",
                 "sha256:8ca9dca965bd86ea3631b975d63b0693566d3cc347e55786d5514988b6f5b84c",
+                "sha256:96f99219dddb33e235a37283306834700b63170d7bb2a1ee17e41c6d589c8eb9",
+                "sha256:9b6305295b6591e45f069d3553c54d50cc47629eb5c218aac99e0f7fafbf90a1",
                 "sha256:a62162be05edf64f819925ea88d09d18b09bebf20971b363ce0c24e8b4aa14c0",
+                "sha256:aacc8623ffe7999a97935eeabbd24b1ae701d08ea8f874a6ff050e93c3e658cf",
+                "sha256:b45bab9f224de276b7bc916f6306b86283f6aa8afe7ed4133423efb42015a898",
                 "sha256:b88fa3b8a3469f22b4f13d045d9bd3eda797aa4e406fde0a2644bc92bbdd4bdd",
+                "sha256:b8a686a6c98872007aa41fdbb2e86dc03b287d951ff4a7f1da77fb7f14113e4d",
+                "sha256:bd904c0dec29bbd0769887a816657491721d5f545c29e30fd9d7a1a275dc80ab",
+                "sha256:bf4f896c42c63d1f22039ad57de2644c72587756c0cfb3cc3b7530cfe228277f",
                 "sha256:c13d311a4c4a8d671f5860317eb5f09591fbe8259676b86a85769423b544451e",
                 "sha256:c2c6c56ee97485a127555c9595c069201b5161de9d05495fbe2132b5ac104786",
+                "sha256:c32c91a0f1ac779cbd73e62430de3d3502bbc45ffe5bb6c376015acfa848144b",
                 "sha256:c3466a84fce42c2016113101018a9981804097bacbab029c2d5b4fcb224b89de",
+                "sha256:c454ad88e56e80e44f824ef8366bb7e4c3def12999151fd5c0ea76a18fe9aa3e",
                 "sha256:c8a2b7ccff330ae4c460aff36626f911f918555660cc28163417cb84ffb25789",
                 "sha256:cb905f3d2e290a8b8f1579d3984f2cfa7c3a29cc7cba608540ceeed18513f520",
                 "sha256:cfcf28ed4ce9ced47b9b9670a4f0d3d3c0e4d4779ad4dadb1ad468b097f808aa",
                 "sha256:dd3e6547ecf842a29cf25123fbf8d2461c53c8d37aa20d87ecee130c89b7079b",
+                "sha256:de7fd57765398d141949946c84f3590a68cf5887dac3fc52388df0639b01eda4",
                 "sha256:ea37320877d56a7f0a1e6a625d892cf963aa7f570013499f5b8d5ab8402b5625",
                 "sha256:f1fce1e4929157b2afeb4bb7069204d4370bab9f4fc03ca1fbec8bd601f8c87d",
                 "sha256:f43109822df2d3faac7aad79613f5f02e4eab0fc8ad7932d2e70e2a83bd49c26"
@@ -337,28 +648,41 @@
         },
         "scipy": {
             "hashes": [
-                "sha256:07b083128beae040f1129bd8a82b01804f5e716a7fd2962c1053fa683433e4ab",
-                "sha256:0edd67e8a00903aaf7a29c968555a2e27c5a69fea9d1dcfffda80614281a884f",
-                "sha256:12fdcbfa56cac926a0a9364a30cbf4ad03c2c7b59f75b14234656a5e4fd52bf3",
-                "sha256:1fee28b6641ecbff6e80fe7788e50f50c5576157d278fa40f36c851940eb0aff",
-                "sha256:33e6a7439f43f37d4c1135bc95bcd490ffeac6ef4b374892c7005ce2c729cf4a",
-                "sha256:5163200ab14fd2b83aba8f0c4ddcc1fa982a43192867264ab0f4c8065fd10d17",
-                "sha256:66ec29348444ed6e8a14c9adc2de65e74a8fc526dc2c770741725464488ede1f",
-                "sha256:8cc5c39ed287a8b52a5509cd6680af078a40b0e010e2657eca01ffbfec929468",
-                "sha256:a1a13858b10d41beb0413c4378462b43eafef88a1948d286cb357eadc0aec024",
-                "sha256:a3db1fe7c6cb29ca02b14c9141151ebafd11e06ffb6da8ecd330eee5c8283a8a",
-                "sha256:aebb69bcdec209d874fc4b0c7ac36f509d50418a431c1422465fa34c2c0143ea",
-                "sha256:b9751b39c52a3fa59312bd2e1f40144ee26b51404db5d2f0d5259c511ff6f614",
-                "sha256:bc0e63daf43bf052aefbbd6c5424bc03f629d115ece828e87303a0bcc04a37e4",
-                "sha256:d5e3cc60868f396b78fc881d2c76460febccfe90f6d2f082b9952265c79a8788",
-                "sha256:ddae76784574cc4c172f3d5edd7308be16078dd3b977e8746860c76c195fa707",
-                "sha256:e2602f79c85924e4486f684aa9bbab74afff90606100db88d0785a0088be7edb",
-                "sha256:e527c9221b6494bcd06a17f9f16874406b32121385f9ab353b8a9545be458f0b",
-                "sha256:f574558f1b774864516f3c3fe072ebc90a29186f49b720f60ed339294b7f32ac",
-                "sha256:ffcbd331f1ffa82e22f1d408e93c37463c9a83088243158635baec61983aaacf"
+                "sha256:168c45c0c32e23f613db7c9e4e780bc61982d71dcd406ead746c7c7c2f2004ce",
+                "sha256:213bc59191da2f479984ad4ec39406bf949a99aba70e9237b916ce7547b6ef42",
+                "sha256:25b241034215247481f53355e05f9e25462682b13bd9191359075682adcd9554",
+                "sha256:2c872de0c69ed20fb1a9b9cf6f77298b04a26f0b8720a5457be08be254366c6e",
+                "sha256:3397c129b479846d7eaa18f999369a24322d008fac0782e7828fa567358c36ce",
+                "sha256:368c0f69f93186309e1b4beb8e26d51dd6f5010b79264c0f1e9ca00cd92ea8c9",
+                "sha256:3d5db5d815370c28d938cf9b0809dade4acf7aba57eaf7ef733bfedc9b2474c4",
+                "sha256:4598cf03136067000855d6b44d7a1f4f46994164bcd450fb2c3d481afc25dd06",
+                "sha256:4a453d5e5689de62e5d38edf40af3f17560bfd63c9c5bd228c18c1f99afa155b",
+                "sha256:4f12d13ffbc16e988fa40809cbbd7a8b45bc05ff6ea0ba8e3e41f6f4db3a9e47",
+                "sha256:634568a3018bc16a83cda28d4f7aed0d803dd5618facb36e977e53b2df868443",
+                "sha256:65923bc3809524e46fb7eb4d6346552cbb6a1ffc41be748535aa502a2e3d3389",
+                "sha256:6b0ceb23560f46dd236a8ad4378fc40bad1783e997604ba845e131d6c680963e",
+                "sha256:8c8d6ca19c8497344b810b0b0344f8375af5f6bb9c98bd42e33f747417ab3f57",
+                "sha256:9ad4fcddcbf5dc67619379782e6aeef41218a79e17979aaed01ed099876c0e62",
+                "sha256:a254b98dbcc744c723a838c03b74a8a34c0558c9ac5c86d5561703362231107d",
+                "sha256:b03c4338d6d3d299e8ca494194c0ae4f611548da59e3c038813f1a43976cb437",
+                "sha256:cc1f78ebc982cd0602c9a7615d878396bec94908db67d4ecddca864d049112f2",
+                "sha256:d6d25c41a009e3c6b7e757338948d0076ee1dd1770d1c09ec131f11946883c54",
+                "sha256:d84cadd7d7998433334c99fa55bcba0d8b4aeff0edb123b2a1dfcface538e474",
+                "sha256:e360cb2299028d0b0d0f65a5c5e51fc16a335f1603aa2357c25766c8dab56938",
+                "sha256:e98d49a5717369d8241d6cf33ecb0ca72deee392414118198a8e5b4c35c56340",
+                "sha256:ed572470af2438b526ea574ff8f05e7f39b44ac37f712105e57fc4d53a6fb660",
+                "sha256:f87b39f4d69cf7d7529d7b1098cb712033b17ea7714aed831b95628f483fd012",
+                "sha256:fa789583fc94a7689b45834453fec095245c7e69c58561dc159b5d5277057e4c"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==1.5.3"
+            "version": "==1.5.4"
+        },
+        "service-identity": {
+            "hashes": [
+                "sha256:001c0707759cb3de7e49c078a7c0c9cd12594161d3bf06b9c254fdcb1a60dc36",
+                "sha256:0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d"
+            ],
+            "version": "==18.1.0"
         },
         "six": {
             "hashes": [
@@ -384,6 +708,46 @@
             "markers": "python_version >= '3.5'",
             "version": "==2.1.0"
         },
+        "twisted": {
+            "extras": [
+                "tls"
+            ],
+            "hashes": [
+                "sha256:040eb6641125d2a9a09cf198ec7b83dd8858c6f51f6770325ed9959c00f5098f",
+                "sha256:147780b8caf21ba2aef3688628eaf13d7e7fe02a86747cd54bfaf2140538f042",
+                "sha256:158ddb80719a4813d292293ac44ba41d8b56555ed009d90994a278237ee63d2c",
+                "sha256:2182000d6ffc05d269e6c03bfcec8b57e20259ca1086180edaedec3f1e689292",
+                "sha256:25ffcf37944bdad4a99981bc74006d735a678d2b5c193781254fbbb6d69e3b22",
+                "sha256:3281d9ce889f7b21bdb73658e887141aa45a102baf3b2320eafcfba954fcefec",
+                "sha256:356e8d8dd3590e790e3dba4db139eb8a17aca64b46629c622e1b1597a4a92478",
+                "sha256:70952c56e4965b9f53b180daecf20a9595cf22b8d0935cd3bd664c90273c3ab2",
+                "sha256:7408c6635ee1b96587289283ebe90ee15dbf9614b05857b446055116bc822d29",
+                "sha256:7c547fd0215db9da8a1bc23182b309e84a232364cc26d829e9ee196ce840b114",
+                "sha256:894f6f3cfa57a15ea0d0714e4283913a5f2511dbd18653dd148eba53b3919797",
+                "sha256:94ac3d55a58c90e2075c5fe1853f2aa3892b73e3bf56395f743aefde8605eeaa",
+                "sha256:a58e61a2a01e5bcbe3b575c0099a2bcb8d70a75b1a087338e0c48dd6e01a5f15",
+                "sha256:c09c47ff9750a8e3aa60ad169c4b95006d455a29b80ad0901f031a103b2991cd",
+                "sha256:ca3a0b8c9110800e576d89b5337373e52018b41069bc879f12fa42b7eb2d0274",
+                "sha256:cd1dc5c85b58494138a3917752b54bb1daa0045d234b7c132c37a61d5483ebad",
+                "sha256:cdbc4c7f0cd7a2218b575844e970f05a1be1861c607b0e048c9bceca0c4d42f7",
+                "sha256:d267125cc0f1e8a0eed6319ba4ac7477da9b78a535601c49ecd20c875576433a",
+                "sha256:d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10",
+                "sha256:d95803193561a243cb0401b0567c6b7987d3f2a67046770e1dccd1c9e49a9780",
+                "sha256:e92703bed0cc21d6cb5c61d66922b3b1564015ca8a51325bd164a5e33798d504",
+                "sha256:f058bd0168271de4dcdc39845b52dd0a4a2fecf5f1246335f13f5e96eaebb467",
+                "sha256:f3c19e5bd42bbe4bf345704ad7c326c74d3fd7a1b3844987853bef180be638d4"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==20.3.0"
+        },
+        "txaio": {
+            "hashes": [
+                "sha256:17938f2bca4a9cabce61346758e482ca4e600160cbc28e861493eac74a19539d",
+                "sha256:38a469daf93c37e5527cb062653d6393ae11663147c42fab7ddc3f6d00d434ae"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==20.4.1"
+        },
         "tzlocal": {
             "hashes": [
                 "sha256:643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44",
@@ -414,6 +778,64 @@
             ],
             "index": "pypi",
             "version": "==2.7.4"
+        },
+        "zope.interface": {
+            "hashes": [
+                "sha256:05a97ba92c1c7c26f25c9f671aa1ef85ffead6cdad13770e5b689cf983adc7e1",
+                "sha256:07d61722dd7d85547b7c6b0f5486b4338001fab349f2ac5cabc0b7182eb3425d",
+                "sha256:0a990dcc97806e5980bbb54b2e46b9cde9e48932d8e6984daf71ef1745516123",
+                "sha256:150e8bcb7253a34a4535aeea3de36c0bb3b1a6a47a183a95d65a194b3e07f232",
+                "sha256:1743bcfe45af8846b775086471c28258f4c6e9ee8ef37484de4495f15a98b549",
+                "sha256:1b5f6c8fff4ed32aa2dd43e84061bc8346f32d3ba6ad6e58f088fe109608f102",
+                "sha256:21e49123f375703cf824214939d39df0af62c47d122d955b2a8d9153ea08cfd5",
+                "sha256:21f579134a47083ffb5ddd1307f0405c91aa8b61ad4be6fd5af0171474fe0c45",
+                "sha256:27c267dc38a0f0079e96a2945ee65786d38ef111e413c702fbaaacbab6361d00",
+                "sha256:299bde0ab9e5c4a92f01a152b7fbabb460f31343f1416f9b7b983167ab1e33bc",
+                "sha256:2ab88d8f228f803fcb8cb7d222c579d13dab2d3622c51e8cf321280da01102a7",
+                "sha256:2ced4c35061eea623bc84c7711eedce8ecc3c2c51cd9c6afa6290df3bae9e104",
+                "sha256:2dcab01c660983ba5e5a612e0c935141ccbee67d2e2e14b833e01c2354bd8034",
+                "sha256:32546af61a9a9b141ca38d971aa6eb9800450fa6620ce6323cc30eec447861f3",
+                "sha256:32b40a4c46d199827d79c86bb8cb88b1bbb764f127876f2cb6f3a47f63dbada3",
+                "sha256:3cc94c69f6bd48ed86e8e24f358cb75095c8129827df1298518ab860115269a4",
+                "sha256:42b278ac0989d6f5cf58d7e0828ea6b5951464e3cf2ff229dd09a96cb6ba0c86",
+                "sha256:495b63fd0302f282ee6c1e6ea0f1c12cb3d1a49c8292d27287f01845ff252a96",
+                "sha256:4af87cdc0d4b14e600e6d3d09793dce3b7171348a094ba818e2a68ae7ee67546",
+                "sha256:4b94df9f2fdde7b9314321bab8448e6ad5a23b80542dcab53e329527d4099dcb",
+                "sha256:4c48ddb63e2b20fba4c6a2bf81b4d49e99b6d4587fb67a6cd33a2c1f003af3e3",
+                "sha256:4df9afd17bd5477e9f8c8b6bb8507e18dd0f8b4efe73bb99729ff203279e9e3b",
+                "sha256:518950fe6a5d56f94ba125107895f938a4f34f704c658986eae8255edb41163b",
+                "sha256:538298e4e113ccb8b41658d5a4b605bebe75e46a30ceca22a5a289cf02c80bec",
+                "sha256:55465121e72e208a7b69b53de791402affe6165083b2ea71b892728bd19ba9ae",
+                "sha256:588384d70a0f19b47409cfdb10e0c27c20e4293b74fc891df3d8eb47782b8b3e",
+                "sha256:6278c080d4afffc9016e14325f8734456831124e8c12caa754fd544435c08386",
+                "sha256:64ea6c221aeee4796860405e1aedec63424cda4202a7ad27a5066876db5b0fd2",
+                "sha256:681dbb33e2b40262b33fd383bae63c36d33fd79fa1a8e4092945430744ffd34a",
+                "sha256:6936aa9da390402d646a32a6a38d5409c2d2afb2950f045a7d02ab25a4e7d08d",
+                "sha256:778d0ec38bbd288b150a3ae363c8ffd88d2207a756842495e9bffd8a8afbc89a",
+                "sha256:8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24",
+                "sha256:83b4aa5344cce005a9cff5d0321b2e318e871cc1dfc793b66c32dd4f59e9770d",
+                "sha256:844fad925ac5c2ad4faaceb3b2520ad016b5280105c6e16e79838cf951903a7b",
+                "sha256:8ceb3667dd13b8133f2e4d637b5b00f240f066448e2aa89a41f4c2d78a26ce50",
+                "sha256:92dc0fb79675882d0b6138be4bf0cec7ea7c7eede60aaca78303d8e8dbdaa523",
+                "sha256:9789bd945e9f5bd026ed3f5b453d640befb8b1fc33a779c1fe8d3eb21fe3fb4a",
+                "sha256:a2b6d6eb693bc2fc6c484f2e5d93bd0b0da803fa77bf974f160533e555e4d095",
+                "sha256:aab9f1e34d810feb00bf841993552b8fcc6ae71d473c505381627143d0018a6a",
+                "sha256:abb61afd84f23099ac6099d804cdba9bd3b902aaaded3ffff47e490b0a495520",
+                "sha256:adf9ee115ae8ff8b6da4b854b4152f253b390ba64407a22d75456fe07dcbda65",
+                "sha256:aedc6c672b351afe6dfe17ff83ee5e7eb6ed44718f879a9328a68bdb20b57e11",
+                "sha256:b7a00ecb1434f8183395fac5366a21ee73d14900082ca37cf74993cf46baa56c",
+                "sha256:ba32f4a91c1cb7314c429b03afbf87b1fff4fb1c8db32260e7310104bd77f0c7",
+                "sha256:cbd0f2cbd8689861209cd89141371d3a22a11613304d1f0736492590aa0ab332",
+                "sha256:e4bc372b953bf6cec65a8d48482ba574f6e051621d157cf224227dbb55486b1e",
+                "sha256:eccac3d9aadc68e994b6d228cb0c8919fc47a5350d85a1b4d3d81d1e98baf40c",
+                "sha256:efd550b3da28195746bb43bd1d815058181a7ca6d9d6aa89dd37f5eefe2cacb7",
+                "sha256:efef581c8ba4d990770875e1a2218e856849d32ada2680e53aebc5d154a17e20",
+                "sha256:f057897711a630a0b7a6a03f1acf379b6ba25d37dc5dc217a97191984ba7f2fc",
+                "sha256:f37d45fab14ffef9d33a0dc3bc59ce0c5313e2253323312d47739192da94f5fd",
+                "sha256:f44906f70205d456d503105023041f1e63aece7623b31c390a0103db4de17537"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==5.2.0"
         }
     },
     "develop": {
@@ -441,11 +863,11 @@
         },
         "attrs": {
             "hashes": [
-                "sha256:26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594",
-                "sha256:fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc"
+                "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
+                "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.2.0"
+            "version": "==20.3.0"
         },
         "babel": {
             "hashes": [
@@ -556,11 +978,11 @@
         },
         "faker": {
             "hashes": [
-                "sha256:30afa8f564350770373f299d2d267bff42aaba699a7ae0a3b6f378b2a8170569",
-                "sha256:a7a36c3c657f06bd1e3e3821b9480f2a92017d8a26e150e464ab6b97743cbc92"
+                "sha256:6afc461ab3f779c9c16e299fc731d775e39ea7e8e063b3053ee359ae198a15ca",
+                "sha256:ce1c38823eb0f927567cde5bf2e7c8ca565c7a70316139342050ce2ca74b4026"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==4.14.0"
+            "version": "==4.14.2"
         },
         "filelock": {
             "hashes": [
@@ -751,10 +1173,10 @@
         },
         "pytz": {
             "hashes": [
-                "sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed",
-                "sha256:c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048"
+                "sha256:3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268",
+                "sha256:5c55e189b682d420be27c6995ba6edce0c0a77dd67bfbe2ae6607134d5851ffd"
             ],
-            "version": "==2020.1"
+            "version": "==2020.4"
         },
         "requests": {
             "hashes": [
@@ -781,11 +1203,11 @@
         },
         "sphinx": {
             "hashes": [
-                "sha256:321d6d9b16fa381a5306e5a0b76cd48ffbc588e6340059a729c6fdd66087e0e8",
-                "sha256:ce6fd7ff5b215af39e2fcd44d4a321f6694b4530b6f2b2109b64d120773faea0"
+                "sha256:1c21e7c5481a31b531e6cbf59c3292852ccde175b504b00ce2ff0b8f4adc3649",
+                "sha256:3abdb2c57a65afaaa4f8573cbabd5465078eb6fd282c1e4f87f006875a7ec0c7"
             ],
             "index": "pypi",
-            "version": "==3.2.1"
+            "version": "==3.3.0"
         },
         "sphinxcontrib-applehelp": {
             "hashes": [
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index f61d11136..3a73fc0cd 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -5,6 +5,8 @@ import os
 import re
 import uuid
 
+from asgiref.sync import async_to_sync
+from channels.layers import get_channel_layer
 from django.conf import settings
 from django.db import transaction
 from django.utils import timezone
@@ -33,6 +35,17 @@ class Consumer:
       5. Delete the document and image(s)
     """
 
+    def _send_progress(self, filename, current_progress, max_progress, status, message, document_id=None):
+        payload = {
+            'filename': os.path.basename(filename),
+            'current_progress': current_progress,
+            'max_progress': max_progress,
+            'status': status,
+            'message': message,
+            'document_id': document_id
+        }
+        async_to_sync(self.channel_layer.group_send)("status_updates", {'type': 'status_update', 'data': payload})
+
     def __init__(self, consume=settings.CONSUMPTION_DIR,
                  scratch=settings.SCRATCH_DIR):
 
@@ -44,6 +57,8 @@ class Consumer:
 
         self.classifier = DocumentClassifier()
 
+        self.channel_layer = get_channel_layer()
+
         os.makedirs(self.scratch, exist_ok=True)
 
         self.storage_type = Document.STORAGE_TYPE_UNENCRYPTED
@@ -60,7 +75,6 @@ class Consumer:
             raise ConsumerError(
                 "Consumption directory {} does not exist".format(self.consume))
 
-
     def log(self, level, message):
         getattr(self.logger, level)(message, extra={
             "group": self.logging_group
@@ -88,6 +102,7 @@ class Consumer:
 
         self.log("info", "Consuming {}".format(doc))
 
+
         parser_class = get_parser_class(doc)
         if not parser_class:
             self.log(
@@ -96,6 +111,7 @@ class Consumer:
         else:
             self.log("info", "Parser: {}".format(parser_class.__name__))
 
+        self._send_progress(file, 0, 100, 'WORKING', 'Consumption started')
 
         document_consumption_started.send(
             sender=self.__class__,
@@ -103,20 +119,37 @@ class Consumer:
             logging_group=self.logging_group
         )
 
-        document_parser = parser_class(doc, self.logging_group)
+        def progress_callback(current_progress, max_progress, message):
+            # recalculate progress to be within 20 and 80
+            p = int((current_progress / max_progress) * 60 + 20)
+            self._send_progress(file, p, 100, "WORKING", message)
+
+        document_parser = parser_class(doc, self.logging_group, progress_callback)
 
         try:
             self.log("info", "Generating thumbnail for {}...".format(doc))
+            self._send_progress(file, 10, 100, 'WORKING',
+                                'Generating thumbnail...')
             thumbnail = document_parser.get_optimised_thumbnail()
+            self._send_progress(file, 20, 100, 'WORKING',
+                                'Getting text from document...')
+            text = document_parser.get_text()
+            self._send_progress(file, 80, 100, 'WORKING',
+                                'Getting date from document...')
             date = document_parser.get_date()
+            self._send_progress(file, 85, 100, 'WORKING',
+                                'Storing the document...')
             document = self._store(
-                document_parser.get_text(),
+                text,
                 doc,
                 thumbnail,
                 date
             )
         except ParseError as e:
             self.log("fatal", "PARSE FAILURE for {}: {}".format(doc, e))
+            self._send_progress(file, 100, 100, 'FAILED',
+                                "Failed: {}".format(e))
+
             document_parser.cleanup()
             return False
         else:
@@ -136,12 +169,17 @@ class Consumer:
             except (FileNotFoundError, IncompatibleClassifierVersionError) as e:
                 logging.getLogger(__name__).warning("Cannot classify documents: {}.".format(e))
 
+            self._send_progress(file, 90, 100, 'WORKING',
+                                'Performing post-consumption tasks...')
+
             document_consumption_finished.send(
                 sender=self.__class__,
                 document=document,
                 logging_group=self.logging_group,
                 classifier=classifier
             )
+            self._send_progress(file, 100, 100, 'SUCCESS',
+                                'Finished.', document.id)
             return True
 
     def _store(self, text, doc, thumbnail, date):
diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index 0cbd13987..7976f4739 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -106,11 +106,12 @@ class DocumentParser:
     `paperless_tesseract.parsers` for inspiration.
     """
 
-    def __init__(self, path, logging_group):
+    def __init__(self, path, logging_group, progress_callback):
         self.document_path = path
         self.tempdir = tempfile.mkdtemp(prefix="paperless-", dir=settings.SCRATCH_DIR)
         self.logger = logging.getLogger(__name__)
         self.logging_group = logging_group
+        self.progress_callback = progress_callback
 
     def get_thumbnail(self):
         """
diff --git a/src/paperless/asgi.py b/src/paperless/asgi.py
new file mode 100644
index 000000000..9c3d17b1b
--- /dev/null
+++ b/src/paperless/asgi.py
@@ -0,0 +1,37 @@
+import json
+import os
+
+from asgiref.sync import async_to_sync
+from channels.auth import AuthMiddlewareStack
+from channels.generic.websocket import WebsocketConsumer
+from channels.routing import ProtocolTypeRouter, URLRouter
+from django.core.asgi import get_asgi_application
+from django.urls import re_path
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'paperless.settings')
+
+
+class StatusConsumer(WebsocketConsumer):
+    def connect(self):
+        self.accept()
+        async_to_sync(self.channel_layer.group_add)('status_updates', self.channel_name)
+
+    def disconnect(self, close_code):
+        async_to_sync(self.channel_layer.group_discard)('status_updates', self.channel_name)
+
+    def status_update(self, event):
+        self.send(json.dumps(event['data']))
+
+
+websocket_urlpatterns = [
+    re_path(r'ws/status/$', StatusConsumer.as_asgi()),
+]
+
+application = ProtocolTypeRouter({
+    "http": get_asgi_application(),
+    "websocket": AuthMiddlewareStack(
+        URLRouter(
+            websocket_urlpatterns
+        )
+    ),
+})
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index bb71e4764..c9db3e4b1 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -69,6 +69,8 @@ INSTALLED_APPS = [
     "rest_framework.authtoken",
     "django_filters",
 
+    "channels",
+
 ]
 
 REST_FRAMEWORK = {
@@ -98,6 +100,7 @@ LOGIN_URL = "admin:login"
 FORCE_SCRIPT_NAME = os.getenv("PAPERLESS_FORCE_SCRIPT_NAME")
 
 WSGI_APPLICATION = 'paperless.wsgi.application'
+ASGI_APPLICATION = "paperless.asgi.application"
 
 STATIC_URL = os.getenv("PAPERLESS_STATIC_URL", "/static/")
 
@@ -299,3 +302,12 @@ FILENAME_DATE_ORDER = os.getenv("PAPERLESS_FILENAME_DATE_ORDER")
 FILENAME_PARSE_TRANSFORMS = []
 for t in json.loads(os.getenv("PAPERLESS_FILENAME_PARSE_TRANSFORMS", "[]")):
     FILENAME_PARSE_TRANSFORMS.append((re.compile(t["pattern"]), t["repl"]))
+
+CHANNEL_LAYERS = {
+    "default": {
+        "BACKEND": "channels_redis.core.RedisChannelLayer",
+        "CONFIG": {
+            "hosts": [("127.0.0.1", 6379)],
+        },
+    },
+}
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index befc9bcd7..535ee501c 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -27,8 +27,8 @@ class RasterisedDocumentParser(DocumentParser):
     image, whether it's a PDF, or other graphical format (JPEG, TIFF, etc.)
     """
 
-    def __init__(self, path, logging_group):
-        super().__init__(path, logging_group)
+    def __init__(self, path, logging_group, progress_callback):
+        super().__init__(path, logging_group, progress_callback)
         self._text = None
 
     def get_thumbnail(self):
@@ -91,6 +91,7 @@ class RasterisedDocumentParser(DocumentParser):
             self._text = get_text_from_pdf(self.document_path)
             return self._text
 
+        self.progress_callback(0,1,"Making greyscale images.")
         images = self._get_greyscale()
 
         if not images:
@@ -100,8 +101,10 @@ class RasterisedDocumentParser(DocumentParser):
 
             sample_page_index = int(len(images) / 2)
             self.log("info", "Attempting language detection on page {} of {}...".format(sample_page_index+1, len(images)))
+            self.progress_callback(0.4, 1, "Language Detection.")
             sample_page_text = self._ocr([images[sample_page_index]], settings.OCR_LANGUAGE)[0]
             guessed_language = self._guess_language(sample_page_text)
+            self.progress_callback(0.6, 1, "OCR all the pages.")
 
             if not guessed_language or guessed_language not in ISO639:
                 self.log("warning", "Language detection failed.")
@@ -117,7 +120,7 @@ class RasterisedDocumentParser(DocumentParser):
 
             else:
                 self.log("info", "Detected language: {}".format(guessed_language))
-                ocr_pages = self._ocr(images, ISO639[guessed_language])
+                ocr_pages = self._ocr(images, ISO639[guessed_language], report_progress=True)
 
             self.log("info", "OCR completed.")
             self._text = strip_excess_whitespace(" ".join(ocr_pages))
@@ -151,6 +154,8 @@ class RasterisedDocumentParser(DocumentParser):
 
         self.log("info", "Running unpaper on {} pages...".format(len(pnms)))
 
+        self.progress_callback(0.2,1, "Running unpaper on {} pages...".format(len(pnms)))
+
         # Run unpaper in parallel on converted images
         with Pool(processes=settings.OCR_THREADS) as pool:
             pnms = pool.map(run_unpaper, pnms)
@@ -165,11 +170,16 @@ class RasterisedDocumentParser(DocumentParser):
             self.log('debug', "Language detection failed with: {}".format(e))
             return None
 
-    def _ocr(self, imgs, lang):
+    def _ocr(self, imgs, lang, report_progress=False):
         self.log("info", "Performing OCR on {} page(s) with language {}".format(len(imgs), lang))
+        r = []
         with Pool(processes=settings.OCR_THREADS) as pool:
-            r = pool.map(image_to_string, itertools.product(imgs, [lang]))
-            return r
+            # r = pool.map(image_to_string, itertools.product(imgs, [lang]))
+            for i, page in enumerate(pool.imap(image_to_string, itertools.product(imgs, [lang]))):
+                if report_progress:
+                    self.progress_callback(0.6 + (i / len(imgs)) * 0.4, 1, "OCR'ed {} pages".format(i+1))
+                r += [page]
+        return r
 
     def _complete_ocr_default_language(self, images, sample_page_index, sample_page):
         """
@@ -182,14 +192,13 @@ class RasterisedDocumentParser(DocumentParser):
         del images_copy[sample_page_index]
         if images_copy:
             self.log('info', 'Continuing ocr with default language.')
-            ocr_pages = self._ocr(images_copy, settings.OCR_LANGUAGE)
+            ocr_pages = self._ocr(images_copy, settings.OCR_LANGUAGE, report_progress=True)
             ocr_pages.insert(sample_page_index, sample_page)
             return ocr_pages
         else:
             return [sample_page]
 
 
-
 def strip_excess_whitespace(text):
     collapsed_spaces = re.sub(r"([^\S\r\n]+)", " ", text)
     no_leading_whitespace = re.sub(

From 036f11acaae7368b322ce62c31d85e3ebbd35ee9 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Sat, 7 Nov 2020 12:05:15 +0100
Subject: [PATCH 0002/1300] better toasts, better dashboard, first
 implementation of consumer status

---
 src-ui/src/app/app.component.ts               | 35 ++++++++-
 src-ui/src/app/app.module.ts                  | 10 ++-
 .../edit-dialog/edit-dialog.component.ts      |  4 +-
 .../common/toasts/toasts.component.html       |  5 +-
 .../dashboard/dashboard.component.html        | 56 ++-------------
 .../dashboard/dashboard.component.ts          | 53 +-------------
 .../consumer-status-widget.component.css      |  0
 .../consumer-status-widget.component.html     | 10 +++
 .../consumer-status-widget.component.spec.ts  | 25 +++++++
 .../consumer-status-widget.component.ts       | 35 +++++++++
 .../file-upload-widget.component.css          |  0
 .../file-upload-widget.component.html         | 11 +++
 .../file-upload-widget.component.spec.ts      | 25 +++++++
 .../file-upload-widget.component.ts           | 44 ++++++++++++
 .../saved-view-widget.component.css           |  0
 .../saved-view-widget.component.html          | 16 +++++
 .../saved-view-widget.component.spec.ts       | 25 +++++++
 .../saved-view-widget.component.ts            | 41 +++++++++++
 .../statistics-widget.component.css           |  0
 .../statistics-widget.component.html          |  3 +
 .../statistics-widget.component.spec.ts       | 25 +++++++
 .../statistics-widget.component.ts            | 32 +++++++++
 .../app/components/login/login.component.ts   |  4 +-
 src-ui/src/app/services/auth.interceptor.ts   |  2 +-
 .../services/consumer-status.service.spec.ts  | 16 +++++
 .../app/services/consumer-status.service.ts   | 71 +++++++++++++++++++
 src-ui/src/app/services/toast.service.ts      | 33 ++++-----
 src-ui/src/environments/environment.ts        |  3 +-
 28 files changed, 450 insertions(+), 134 deletions(-)
 create mode 100644 src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.css
 create mode 100644 src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
 create mode 100644 src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.spec.ts
 create mode 100644 src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.ts
 create mode 100644 src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.css
 create mode 100644 src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.html
 create mode 100644 src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.spec.ts
 create mode 100644 src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.ts
 create mode 100644 src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.css
 create mode 100644 src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
 create mode 100644 src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts
 create mode 100644 src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
 create mode 100644 src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.css
 create mode 100644 src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html
 create mode 100644 src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts
 create mode 100644 src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts
 create mode 100644 src-ui/src/app/services/consumer-status.service.spec.ts
 create mode 100644 src-ui/src/app/services/consumer-status.service.ts

diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts
index a6cd8bebe..5809968e8 100644
--- a/src-ui/src/app/app.component.ts
+++ b/src-ui/src/app/app.component.ts
@@ -1,14 +1,43 @@
-import { Component } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { Subscription } from 'rxjs';
+import { ConsumerStatusService } from './services/consumer-status.service';
+import { Toast, ToastService } from './services/toast.service';
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css']
 })
-export class AppComponent {
+export class AppComponent implements OnInit, OnDestroy {
+
+  successSubscription: Subscription;
+  failedSubscription: Subscription;
   
-  constructor () {
+  constructor ( private consumerStatusService: ConsumerStatusService, private toastService: ToastService, private router: Router ) {
   }
 
+  ngOnDestroy(): void {
+    this.consumerStatusService.disconnect()
+    this.successSubscription.unsubscribe()
+    this.failedSubscription.unsubscribe()
+  }
+
+  ngOnInit(): void {
+    this.consumerStatusService.connect()
+
+    this.successSubscription = this.consumerStatusService.onDocumentConsumptionFinished().subscribe(status => {
+      this.toastService.showToast({title: "Document added", content: `Document ${status.filename} was added to paperless.`, actionName: "Open document", action: () => {
+        this.router.navigate(['documents', status.document_id])
+      }})
+    })
+
+    this.failedSubscription = this.consumerStatusService.onDocumentConsumptionFailed().subscribe(status => {
+      this.toastService.showError(`Could not consume ${status.filename}: ${status.message}`)
+    })
+
+  }
+
+  
 
 }
diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index e10bdbd0c..5cc59d567 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -40,6 +40,10 @@ import { SaveViewConfigDialogComponent } from './components/document-list/save-v
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { DateTimeComponent } from './components/common/input/date-time/date-time.component';
 import { TagsComponent } from './components/common/input/tags/tags.component';
+import { SavedViewWidgetComponent } from './components/dashboard/widgets/saved-view-widget/saved-view-widget.component';
+import { ConsumerStatusWidgetComponent } from './components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component';
+import { StatisticsWidgetComponent } from './components/dashboard/widgets/statistics-widget/statistics-widget.component';
+import { FileUploadWidgetComponent } from './components/dashboard/widgets/file-upload-widget/file-upload-widget.component';
 
 @NgModule({
   declarations: [
@@ -73,7 +77,11 @@ import { TagsComponent } from './components/common/input/tags/tags.component';
     CheckComponent,
     SaveViewConfigDialogComponent,
     DateTimeComponent,
-    TagsComponent
+    TagsComponent,
+    ConsumerStatusWidgetComponent,
+    SavedViewWidgetComponent,
+    StatisticsWidgetComponent,
+    FileUploadWidgetComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
index ba0d90847..04eb1f250 100644
--- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
@@ -5,7 +5,7 @@ import { Observable } from 'rxjs';
 import { MATCHING_ALGORITHMS } from 'src/app/data/matching-model';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
-import { Toast, ToastService } from 'src/app/services/toast.service';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Directive()
 export abstract class EditDialogComponent<T extends ObjectWithId> implements OnInit {
@@ -66,7 +66,7 @@ export abstract class EditDialogComponent<T extends ObjectWithId> implements OnI
       this.activeModal.close()
       this.success.emit(result)
     }, error => {
-      this.toastService.showToast(Toast.makeError(`Could not save ${this.entityName}: ${error.error.name}`))
+      this.toastService.showError(`Could not save ${this.entityName}: ${error.error.name}`)
     })
   }
 
diff --git a/src-ui/src/app/components/common/toasts/toasts.component.html b/src-ui/src/app/components/common/toasts/toasts.component.html
index 04aa15a67..4e920877e 100644
--- a/src-ui/src/app/components/common/toasts/toasts.component.html
+++ b/src-ui/src/app/components/common/toasts/toasts.component.html
@@ -1,7 +1,8 @@
 <ngb-toast
   *ngFor="let toast of toasts"
-  [header]="toast.title" [autohide]="true" [delay]="toast.delay"
+  [header]="toast.title" [autohide]="true" [delay]="toast.delay || 5000"
   [class]="toast.classname"
   (hide)="toastService.closeToast(toast)">
-  {{toast.content}}
+  <p>{{toast.content}}</p>
+  <p *ngIf="toast.action"><button class="btn btn-sm btn-outline-secondary" (click)="toastService.closeToast(toast); toast.action()">{{toast.actionName}}</button></p>
 </ngb-toast>
\ No newline at end of file
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 694b431c4..4b732c9e8 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -6,59 +6,11 @@
 
 <div class='row'>
   <div class="col-lg">
-    <ng-container *ngFor="let v of savedDashboardViews">
-      <h4>{{v.viewConfig.title}}</h4>
-
-      <table class="table table-sm table-hover table-borderless">
-        <thead>
-        <tr>
-          <th>Date created</th>
-          <th scope="col">Document</th>
-        </tr>
-        </thead>
-        <tbody>
-          <tr *ngFor="let doc of v.documents" routerLink="/documents/{{doc.id}}">
-            <td>{{doc.created | date}}</td>
-            <td>{{doc.title}}<app-tag [tag]="t" *ngFor="let t of doc.tags" class="ml-1"></app-tag>
-          </tr>
-        </tbody>
-      </table>
-
-    </ng-container>
-    <ng-container *ngIf="savedDashboardViews.length == 0">
-      <h4>Saved views</h4>
-      <p>This space is reserved to display your saved views. Go to your documents and save a view to have it displayed here!</p>
-    </ng-container>
-
+    <app-saved-view-widget [viewConfig]="conf" *ngFor="let conf of savedViewConfigService.getDashboardConfigs()"></app-saved-view-widget>
   </div>
   <div class="col-lg">
-    <h4>Statistics</h4>
-    <p>Documents in inbox: {{statistics.documents_inbox}}</p>
-    <p>Total documents: {{statistics.documents_total}}</p>
-    <h4>Upload new Document</h4>
-    <form>
-      <ngx-file-drop
-        dropZoneLabel="Drop documents here"
-        (onFileDrop)="dropped($event)"
-        (onFileOver)="fileOver($event)"
-        (onFileLeave)="fileLeave($event)"
-        dropZoneClassName="bg-light mt-4 card">
-
-      </ngx-file-drop>
-    </form>
-    <h5 class="mt-3">Document conumser status</h5>
-    <p>This is what it might look like in the future.</p>
-    <div class="card bg-light mb-2">
-      <div class="card-body">
-        <p class="card-text"><strong>Filename.pdf:</strong> Running tesseract on page 4/8...</p>
-        <p><ngb-progressbar type="info" [value]="50"></ngb-progressbar></p>
-      </div>
-    </div>
-    <div class="card bg-light mb-2">
-      <div class="card-body">
-        <p class="card-text"><strong>Filename2.pdf:</strong> Completed.</p>
-        <p><ngb-progressbar type="success" [value]="100"></ngb-progressbar></p>
-      </div>
-    </div>
+    <app-statistics-widget></app-statistics-widget>
+    <app-file-upload-widget></app-file-upload-widget>
+    <app-consumer-status-widget></app-consumer-status-widget>
   </div>
 </div>
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts
index f8d5fb0ae..a9c72e496 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.ts
+++ b/src-ui/src/app/components/dashboard/dashboard.component.ts
@@ -4,14 +4,9 @@ import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop';
 import { Observable } from 'rxjs';
 import { DocumentService } from 'src/app/services/rest/document.service';
 import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
-import { Toast, ToastService } from 'src/app/services/toast.service';
+import { ToastService } from 'src/app/services/toast.service';
 import { environment } from 'src/environments/environment';
 
-export interface Statistics {
-  documents_total?: number
-  documents_inbox?: number
-}
-
 @Component({
   selector: 'app-dashboard',
   templateUrl: './dashboard.component.html',
@@ -19,53 +14,9 @@ export interface Statistics {
 })
 export class DashboardComponent implements OnInit {
 
-  constructor(private documentService: DocumentService, private toastService: ToastService,
-    public savedViewConfigService: SavedViewConfigService, private http: HttpClient) { }
-
-
-  savedDashboardViews = []
-  statistics: Statistics = {}
+  constructor(public savedViewConfigService: SavedViewConfigService) { }
 
   ngOnInit(): void {
-    this.savedViewConfigService.getDashboardConfigs().forEach(config => {
-      this.documentService.list(1,10,config.sortField,config.sortDirection,config.filterRules).subscribe(result => {
-        this.savedDashboardViews.push({viewConfig: config, documents: result.results})
-      })
-    })
-    this.getStatistics().subscribe(statistics => {
-      this.statistics = statistics
-    })
   }
 
-  getStatistics(): Observable<Statistics> {
-    return this.http.get(`${environment.apiBaseUrl}statistics/`)
-  }
-
-
-  public fileOver(event){
-    console.log(event);
-  }
- 
-  public fileLeave(event){
-    console.log(event);
-  }
- 
-  public dropped(files: NgxFileDropEntry[]) {
-    for (const droppedFile of files) {
-      if (droppedFile.fileEntry.isFile) {
-        const fileEntry = droppedFile.fileEntry as FileSystemFileEntry;
-        console.log(fileEntry)
-        fileEntry.file((file: File) => {
-          console.log(file)
-          const formData = new FormData()
-          formData.append('document', file, file.name)
-          this.documentService.uploadDocument(formData).subscribe(result => {
-            this.toastService.showToast(Toast.make("Information", "The document has been uploaded and will be processed by the consumer shortly."))
-          }, error => {
-            this.toastService.showToast(Toast.makeError("An error has occured while uploading the document. Sorry!"))
-          })
-        });
-      }
-    }
-  }
 }
diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.css b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
new file mode 100644
index 000000000..9f6aa3b87
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
@@ -0,0 +1,10 @@
+<h4 class="mt-3">Document consumer status</h4>
+
+<div class="p-2 mb-1 border bg-light" *ngFor="let s of getStatus()">
+  <div class="mb-1"><strong>{{s.filename}}:</strong> {{s.message}}</div>
+  <ngb-progressbar [type]="getType(s.status)" [value]="s.current_progress" [max]="s.max_progress" class="mb-2"></ngb-progressbar>
+  <div *ngIf="isFinished(s)">
+    <button *ngIf="s.document_id" class="btn btn-sm btn-outline-secondary mr-2" routerLink="/documents/{{s.document_id}}" (click)="dismiss(s)">Open document</button>
+    <button class="btn btn-sm btn-outline-secondary" (click)="dismiss(s)">Dismiss</button>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.spec.ts
new file mode 100644
index 000000000..02aa088f5
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ConsumerStatusWidgetComponent } from './consumer-status-widget.component';
+
+describe('ConsumerStatusWidgetComponent', () => {
+  let component: ConsumerStatusWidgetComponent;
+  let fixture: ComponentFixture<ConsumerStatusWidgetComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ConsumerStatusWidgetComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ConsumerStatusWidgetComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.ts
new file mode 100644
index 000000000..0c4e35682
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.ts
@@ -0,0 +1,35 @@
+import { Component, OnInit } from '@angular/core';
+import { ConsumerStatusService, FileStatus } from 'src/app/services/consumer-status.service';
+
+@Component({
+  selector: 'app-consumer-status-widget',
+  templateUrl: './consumer-status-widget.component.html',
+  styleUrls: ['./consumer-status-widget.component.css']
+})
+export class ConsumerStatusWidgetComponent implements OnInit {
+
+  constructor(private consumerStatusService: ConsumerStatusService) { }
+
+  ngOnInit(): void {
+  }
+
+  getStatus() {
+    return this.consumerStatusService.consumerStatus
+  }
+
+  isFinished(status: FileStatus) {
+    return status.status == "FAILED" || status.status == "SUCCESS"
+  }
+
+  getType(status) {
+    switch (status) {
+      case "WORKING": return "primary"
+      case "FAILED": return "danger"
+      case "SUCCESS": return "success"
+    }
+  }
+
+  dismiss(status: FileStatus) {
+    this.consumerStatusService.dismiss(status)
+  }
+}
diff --git a/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.css b/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.html b/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.html
new file mode 100644
index 000000000..0c5ea634a
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.html
@@ -0,0 +1,11 @@
+<h4>Upload new Document</h4>
+<form>
+  <ngx-file-drop
+    dropZoneLabel="Drop documents here"
+    (onFileDrop)="dropped($event)"
+    (onFileOver)="fileOver($event)"
+    (onFileLeave)="fileLeave($event)"
+    dropZoneClassName="bg-light mt-4 card">
+
+  </ngx-file-drop>
+</form>
\ No newline at end of file
diff --git a/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.spec.ts
new file mode 100644
index 000000000..847f5288b
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FileUploadWidgetComponent } from './file-upload-widget.component';
+
+describe('FileUploadWidgetComponent', () => {
+  let component: FileUploadWidgetComponent;
+  let fixture: ComponentFixture<FileUploadWidgetComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ FileUploadWidgetComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FileUploadWidgetComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.ts
new file mode 100644
index 000000000..5d4bac936
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.ts
@@ -0,0 +1,44 @@
+import { Component, OnInit } from '@angular/core';
+import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop';
+import { DocumentService } from 'src/app/services/rest/document.service';
+import { ToastService } from 'src/app/services/toast.service';
+
+@Component({
+  selector: 'app-file-upload-widget',
+  templateUrl: './file-upload-widget.component.html',
+  styleUrls: ['./file-upload-widget.component.css']
+})
+export class FileUploadWidgetComponent implements OnInit {
+
+  constructor(private documentService: DocumentService, private toastService: ToastService) { }
+
+  ngOnInit(): void {
+  }
+
+  public fileOver(event){
+    console.log(event);
+  }
+ 
+  public fileLeave(event){
+    console.log(event);
+  }
+ 
+  public dropped(files: NgxFileDropEntry[]) {
+    for (const droppedFile of files) {
+      if (droppedFile.fileEntry.isFile) {
+        const fileEntry = droppedFile.fileEntry as FileSystemFileEntry;
+        console.log(fileEntry)
+        fileEntry.file((file: File) => {
+          console.log(file)
+          const formData = new FormData()
+          formData.append('document', file, file.name)
+          this.documentService.uploadDocument(formData).subscribe(result => {
+            this.toastService.showInfo("The document has been uploaded and will be processed by the consumer shortly.")
+          }, error => {
+            this.toastService.showError("An error has occured while uploading the document. Sorry!")
+          })
+        });
+      }
+    }
+  }
+}
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.css b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
new file mode 100644
index 000000000..110464641
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
@@ -0,0 +1,16 @@
+<h4>{{viewConfig.title}}</h4>
+
+<table class="table table-sm table-hover table-borderless">
+  <thead>
+  <tr>
+    <th>Date created</th>
+    <th scope="col">Document</th>
+  </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let doc of documents" routerLink="/documents/{{doc.id}}">
+      <td>{{doc.created | date}}</td>
+      <td>{{doc.title}}<app-tag [tag]="t" *ngFor="let t of doc.tags" class="ml-1"></app-tag>
+    </tr>
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts
new file mode 100644
index 000000000..f0095b618
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SavedViewWidgetComponent } from './saved-view-widget.component';
+
+describe('SavedViewWidgetComponent', () => {
+  let component: SavedViewWidgetComponent;
+  let fixture: ComponentFixture<SavedViewWidgetComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ SavedViewWidgetComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SavedViewWidgetComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
new file mode 100644
index 000000000..eb2d53aee
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
@@ -0,0 +1,41 @@
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Subscription } from 'rxjs';
+import { PaperlessDocument } from 'src/app/data/paperless-document';
+import { SavedViewConfig } from 'src/app/data/saved-view-config';
+import { ConsumerStatusService } from 'src/app/services/consumer-status.service';
+import { DocumentService } from 'src/app/services/rest/document.service';
+
+@Component({
+  selector: 'app-saved-view-widget',
+  templateUrl: './saved-view-widget.component.html',
+  styleUrls: ['./saved-view-widget.component.css']
+})
+export class SavedViewWidgetComponent implements OnInit, OnDestroy {
+
+  constructor(private documentService: DocumentService, private consumerStatusService: ConsumerStatusService) { }
+
+  @Input()
+  viewConfig: SavedViewConfig
+
+  documents: PaperlessDocument[]
+
+  subscription: Subscription
+
+  ngOnInit(): void {
+    this.reload()
+    this.subscription = this.consumerStatusService.onDocumentConsumptionFinished().subscribe(status => {
+      this.reload()
+    })
+  }
+
+  ngOnDestroy(): void {
+    this.subscription.unsubscribe()
+  }
+
+  reload() {
+    this.documentService.list(1,10,this.viewConfig.sortField,this.viewConfig.sortDirection,this.viewConfig.filterRules).subscribe(result => {
+      this.documents = result.results
+    })
+  }
+
+}
diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.css b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html
new file mode 100644
index 000000000..2f89a2b34
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html
@@ -0,0 +1,3 @@
+<h4>Statistics</h4>
+<p>Documents in inbox: {{statistics.documents_inbox}}</p>
+<p>Total documents: {{statistics.documents_total}}</p>
\ No newline at end of file
diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts
new file mode 100644
index 000000000..e8e44ca54
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { StatisticsWidgetComponent } from './statistics-widget.component';
+
+describe('StatisticsWidgetComponent', () => {
+  let component: StatisticsWidgetComponent;
+  let fixture: ComponentFixture<StatisticsWidgetComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ StatisticsWidgetComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(StatisticsWidgetComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts
new file mode 100644
index 000000000..4efb03895
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts
@@ -0,0 +1,32 @@
+import { HttpClient } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
+
+export interface Statistics {
+  documents_total?: number
+  documents_inbox?: number
+}
+
+@Component({
+  selector: 'app-statistics-widget',
+  templateUrl: './statistics-widget.component.html',
+  styleUrls: ['./statistics-widget.component.css']
+})
+export class StatisticsWidgetComponent implements OnInit {
+
+  constructor(private http: HttpClient) { }
+
+  statistics: Statistics = {}
+
+  ngOnInit(): void {
+    this.getStatistics().subscribe(statistics => {
+      this.statistics = statistics
+    })
+  }
+
+  getStatistics(): Observable<Statistics> {
+    return this.http.get(`${environment.apiBaseUrl}statistics/`)
+  }
+
+}
diff --git a/src-ui/src/app/components/login/login.component.ts b/src-ui/src/app/components/login/login.component.ts
index e74dcfb7f..a241543c7 100644
--- a/src-ui/src/app/components/login/login.component.ts
+++ b/src-ui/src/app/components/login/login.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { Router } from '@angular/router';
 import { AuthService } from 'src/app/services/auth.service';
-import { Toast, ToastService } from 'src/app/services/toast.service';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-login',
@@ -26,7 +26,7 @@ export class LoginComponent implements OnInit {
     this.auth.login(this.loginForm.value.username, this.loginForm.value.password, this.loginForm.value.rememberMe).subscribe(result => {
       this.router.navigate([''])
     }, (error) => {
-      this.toastService.showToast(Toast.makeError("Unable to log in with provided credentials."))
+      this.toastService.showError("Unable to log in with provided credentials.")
     }
     )
   }
diff --git a/src-ui/src/app/services/auth.interceptor.ts b/src-ui/src/app/services/auth.interceptor.ts
index 704b558ac..37d9e7906 100644
--- a/src-ui/src/app/services/auth.interceptor.ts
+++ b/src-ui/src/app/services/auth.interceptor.ts
@@ -28,7 +28,7 @@ export class AuthInterceptor implements HttpInterceptor {
       catchError((error: HttpErrorResponse) => {
         if (error.status == 401 && this.authService.isAuthenticated()) {
           this.authService.logout()
-          this.toastService.showToast(Toast.makeError("Your session has expired. Please log in again."))
+          this.toastService.showError("Your session has expired. Please log in again.")
         }
         return throwError(error)
       })
diff --git a/src-ui/src/app/services/consumer-status.service.spec.ts b/src-ui/src/app/services/consumer-status.service.spec.ts
new file mode 100644
index 000000000..d19f455e2
--- /dev/null
+++ b/src-ui/src/app/services/consumer-status.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ConsumerStatusService } from './consumer-status.service';
+
+describe('ConsumerStatusService', () => {
+  let service: ConsumerStatusService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ConsumerStatusService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
new file mode 100644
index 000000000..070420b0f
--- /dev/null
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -0,0 +1,71 @@
+import { Injectable } from '@angular/core';
+import { Subject } from 'rxjs';
+
+export interface FileStatus {
+  filename?: string
+  current_progress?: number
+  max_progress?: number
+  status?: string
+  message?: string
+  document_id?: number
+}
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ConsumerStatusService {
+
+  constructor() { }
+
+  private statusWebSocked: WebSocket
+
+  consumerStatus: FileStatus[] = []
+  private documentConsumptionFinishedSubject = new Subject<FileStatus>()
+  private documentConsumptionFailedSubject = new Subject<FileStatus>()
+
+  connect() {
+    this.disconnect()
+    this.statusWebSocked = new WebSocket("ws://localhost:8000/ws/status/");
+    this.statusWebSocked.onmessage = (ev) => {
+      let statusUpdate: FileStatus = JSON.parse(ev['data'])
+
+      let index = this.consumerStatus.findIndex(fs => fs.filename == statusUpdate.filename)
+      if (index > -1) {
+        this.consumerStatus[index] = statusUpdate
+      } else {
+        this.consumerStatus.push(statusUpdate)
+      }
+
+      if (statusUpdate.status == "SUCCESS") {
+        this.documentConsumptionFinishedSubject.next(statusUpdate)
+      }
+      if (statusUpdate.status == "FAILED") {
+        this.documentConsumptionFailedSubject.next(statusUpdate)
+      }
+    }
+  }
+
+  disconnect() {
+    if (this.statusWebSocked) {
+      this.statusWebSocked.close()
+      this.statusWebSocked = null
+    }
+  }
+
+  dismiss(status: FileStatus) {
+    let index = this.consumerStatus.findIndex(s => s.filename == status.filename)
+
+    if (index > -1) {
+      this.consumerStatus.splice(index, 1)
+    }
+  }
+
+  onDocumentConsumptionFinished() {
+    return this.documentConsumptionFinishedSubject
+  }
+
+  onDocumentConsumptionFailed() {
+    return this.documentConsumptionFailedSubject
+  }
+
+}
diff --git a/src-ui/src/app/services/toast.service.ts b/src-ui/src/app/services/toast.service.ts
index a3ce060a9..d5781139e 100644
--- a/src-ui/src/app/services/toast.service.ts
+++ b/src-ui/src/app/services/toast.service.ts
@@ -1,30 +1,17 @@
 import { Injectable } from '@angular/core';
 import { Subject, zip } from 'rxjs';
 
-export class Toast {
-
-  static make(title: string, content: string, classname?: string, delay?: number): Toast {
-    let t = new Toast()
-    t.title = title
-    t.content = content
-    t.classname = classname
-    if (delay) {
-      t.delay = delay
-    }
-    return t
-  }
-
-  static makeError(content: string) {
-    return Toast.make("Error", content, null, 10000)
-  }
+export interface Toast {
 
   title: string
 
-  classname: string
-
   content: string
 
-  delay: number = 5000
+  delay?: number
+
+  action?: any
+
+  actionName?: string
 
 }
 
@@ -44,6 +31,14 @@ export class ToastService {
     this.toastsSubject.next(this.toasts)
   }
 
+  showInfo(message: string) {
+    this.showToast({title: "Information", content: message, delay: 5000})
+  }
+
+  showError(message: string) {
+    this.showToast({title: "Error", content: message, delay: 10000})
+  }
+
   closeToast(toast: Toast) {
     let index = this.toasts.findIndex(t => t == toast)
     if (index > -1) {
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts
index a0877d69f..c945a0364 100644
--- a/src-ui/src/environments/environment.ts
+++ b/src-ui/src/environments/environment.ts
@@ -4,7 +4,8 @@
 
 export const environment = {
   production: false,
-  apiBaseUrl: "http://localhost:8000/api/"
+  apiBaseUrl: "http://localhost:8000/api/",
+  wsBaseUrl: "ws://localhost:8000/ws/"
 };
 
 /*

From b0465e65c3ac85b58e3cb6c3daa2f755ee386c98 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Sat, 7 Nov 2020 12:10:53 +0100
Subject: [PATCH 0003/1300] nicer status

---
 .../consumer-status-widget.component.html                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
index 9f6aa3b87..d6559e184 100644
--- a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
@@ -1,10 +1,10 @@
 <h4 class="mt-3">Document consumer status</h4>
 
-<div class="p-2 mb-1 border bg-light" *ngFor="let s of getStatus()">
+<div class="mb-2 border-bottom" *ngFor="let s of getStatus()">
   <div class="mb-1"><strong>{{s.filename}}:</strong> {{s.message}}</div>
   <ngb-progressbar [type]="getType(s.status)" [value]="s.current_progress" [max]="s.max_progress" class="mb-2"></ngb-progressbar>
-  <div *ngIf="isFinished(s)">
-    <button *ngIf="s.document_id" class="btn btn-sm btn-outline-secondary mr-2" routerLink="/documents/{{s.document_id}}" (click)="dismiss(s)">Open document</button>
+  <div *ngIf="isFinished(s)" class="mb-2">
+    <button *ngIf="s.document_id" class="btn btn-sm btn-outline-primary mr-2" routerLink="/documents/{{s.document_id}}" (click)="dismiss(s)">Open document</button>
     <button class="btn btn-sm btn-outline-secondary" (click)="dismiss(s)">Dismiss</button>
   </div>
 </div>
\ No newline at end of file

From ae8a048ea6a570e9a15ba67d954297582b4ddeca Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Sat, 7 Nov 2020 12:47:17 +0100
Subject: [PATCH 0004/1300] fixed up the docker

---
 Pipfile                    |  1 +
 Pipfile.lock               |  4 ++--
 scripts/supervisord.conf   |  4 ++--
 src/paperless/asgi.py      | 30 ++++++++----------------------
 src/paperless/consumers.py | 16 ++++++++++++++++
 src/paperless/settings.py  |  2 +-
 src/paperless/urls.py      |  8 +++++++-
 7 files changed, 37 insertions(+), 28 deletions(-)
 create mode 100644 src/paperless/consumers.py

diff --git a/Pipfile b/Pipfile
index d526ae252..09de36334 100644
--- a/Pipfile
+++ b/Pipfile
@@ -28,6 +28,7 @@ django-extensions = ""
 watchdog = "*"
 channels = "~=3.0"
 channels-redis = "*"
+daphne = "~=3.0"
 
 [dev-packages]
 coveralls = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 642e38214..21b4becad 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "192d7419b844e6bb81fed793e7766b2ba15f2a016af1a33fc73cf09e12de5fb7"
+            "sha256": "66530e76de7948d8123529eff0b150926aa46a410da8b31e12b6d468e5996e7a"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -157,7 +157,7 @@
                 "sha256:60856f7efa0b1e1b969efa074e8698bd09de4713ecc06e6a4d19d04c66c4a3bd",
                 "sha256:b43e70d74ff832a634ff6c92badd208824e4530e08b340116517e5aad0aca774"
             ],
-            "markers": "python_version >= '3.6'",
+            "index": "pypi",
             "version": "==3.0.0"
         },
         "dateparser": {
diff --git a/scripts/supervisord.conf b/scripts/supervisord.conf
index d3ff288de..cb6fd1650 100644
--- a/scripts/supervisord.conf
+++ b/scripts/supervisord.conf
@@ -6,8 +6,8 @@ logfile_maxbytes=50MB        ; max main logfile bytes b4 rotation; default 50MB
 logfile_backups=10           ; # of main logfile backups; 0 means none, default 10
 loglevel=info                ; log level; default info; others: debug,warn,trace
 
-[program:gunicorn]
-command=gunicorn -c /usr/src/paperless/gunicorn.conf.py -b 0.0.0.0:8000 paperless.wsgi
+[program:daphne]
+command=daphne -b 0.0.0.0 -p 8000 paperless.asgi:application
 user=paperless
 
 stdout_logfile=/dev/stdout
diff --git a/src/paperless/asgi.py b/src/paperless/asgi.py
index 9c3d17b1b..45565c68a 100644
--- a/src/paperless/asgi.py
+++ b/src/paperless/asgi.py
@@ -1,31 +1,17 @@
-import json
 import os
 
-from asgiref.sync import async_to_sync
-from channels.auth import AuthMiddlewareStack
-from channels.generic.websocket import WebsocketConsumer
-from channels.routing import ProtocolTypeRouter, URLRouter
 from django.core.asgi import get_asgi_application
-from django.urls import re_path
+# Fetch Django ASGI application early to ensure AppRegistry is populated
+# before importing consumers and AuthMiddlewareStack that may import ORM
+# models.
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'paperless.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "paperless.settings")
+django_asgi_app = get_asgi_application()
 
+from channels.auth import AuthMiddlewareStack
+from channels.routing import ProtocolTypeRouter, URLRouter
 
-class StatusConsumer(WebsocketConsumer):
-    def connect(self):
-        self.accept()
-        async_to_sync(self.channel_layer.group_add)('status_updates', self.channel_name)
-
-    def disconnect(self, close_code):
-        async_to_sync(self.channel_layer.group_discard)('status_updates', self.channel_name)
-
-    def status_update(self, event):
-        self.send(json.dumps(event['data']))
-
-
-websocket_urlpatterns = [
-    re_path(r'ws/status/$', StatusConsumer.as_asgi()),
-]
+from paperless.urls import websocket_urlpatterns
 
 application = ProtocolTypeRouter({
     "http": get_asgi_application(),
diff --git a/src/paperless/consumers.py b/src/paperless/consumers.py
new file mode 100644
index 000000000..fbb7b72d0
--- /dev/null
+++ b/src/paperless/consumers.py
@@ -0,0 +1,16 @@
+import json
+
+from asgiref.sync import async_to_sync
+from channels.generic.websocket import WebsocketConsumer
+
+
+class StatusConsumer(WebsocketConsumer):
+    def connect(self):
+        self.accept()
+        async_to_sync(self.channel_layer.group_add)('status_updates', self.channel_name)
+
+    def disconnect(self, close_code):
+        async_to_sync(self.channel_layer.group_discard)('status_updates', self.channel_name)
+
+    def status_update(self, event):
+        self.send(json.dumps(event['data']))
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index c9db3e4b1..7ef132bff 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -307,7 +307,7 @@ CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels_redis.core.RedisChannelLayer",
         "CONFIG": {
-            "hosts": [("127.0.0.1", 6379)],
+            "hosts": [("broker", 6379)],
         },
     },
 }
diff --git a/src/paperless/urls.py b/src/paperless/urls.py
index 43ba5eb49..4416bc8d5 100755
--- a/src/paperless/urls.py
+++ b/src/paperless/urls.py
@@ -1,11 +1,12 @@
 from django.conf.urls import include, url
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, re_path
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import RedirectView
 from rest_framework.authtoken import views
 from rest_framework.routers import DefaultRouter
 
+from paperless.consumers import StatusConsumer
 from paperless.views import FaviconView
 from documents.views import (
     CorrespondentViewSet,
@@ -65,6 +66,11 @@ urlpatterns = [
 
 ]
 
+
+websocket_urlpatterns = [
+    re_path(r'ws/status/$', StatusConsumer.as_asgi()),
+]
+
 # Text in each page's <h1> (and above login form).
 admin.site.site_header = 'Paperless'
 # Text at the end of each page's <title>.

From 37bd4a7d0edab657488143bcc8427b5d13f1699a Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Sat, 7 Nov 2020 12:56:26 +0100
Subject: [PATCH 0005/1300] added broker to compose file

---
 docker-compose.yml.example | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker-compose.yml.example b/docker-compose.yml.example
index 1130e26a3..3d8ed4719 100644
--- a/docker-compose.yml.example
+++ b/docker-compose.yml.example
@@ -1,5 +1,10 @@
 version: "3.4"
 services:
+  broker:
+    image: redis:latest
+    ports:
+      - 6379:6379
+
   db:
     image: postgres:13
     #restart: always

From 9e81c82452db80ced437228f62e6713f925adb9f Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Tue, 10 Nov 2020 01:26:27 +0100
Subject: [PATCH 0006/1300] Pipfile update

---
 Pipfile.lock | 75 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 64 insertions(+), 11 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 21b4becad..932dc380e 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "66530e76de7948d8123529eff0b150926aa46a410da8b31e12b6d468e5996e7a"
+            "sha256": "65b67f06b1ad7d6541a1f84552f1c24a0353ed03aa4c382f8638c9d112b41eda"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -21,13 +21,21 @@
             ],
             "version": "==1.3.1"
         },
+        "arrow": {
+            "hashes": [
+                "sha256:e098abbd9af3665aea81bdd6c869e93af4feb078e98468dd351c383af187aac5",
+                "sha256:ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==0.17.0"
+        },
         "asgiref": {
             "hashes": [
-                "sha256:a5098bc870b80e7b872bff60bb363c7f2c2c89078759f6c47b53ff8c525a152e",
-                "sha256:cd88907ecaec59d78e4ac00ea665b03e571cb37e3a0e37b3702af1a9e86c365a"
+                "sha256:5ee950735509d04eb673bd7f7120f8fa1c9e2df495394992c73234d526907e17",
+                "sha256:7162a3cb30ab0609f1a4c95938fd73e8604f63bdba516a7f7d64b83ff09478f0"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==3.3.0"
+            "version": "==3.3.1"
         },
         "async-timeout": {
             "hashes": [
@@ -60,6 +68,13 @@
             ],
             "version": "==20.2.0"
         },
+        "blessed": {
+            "hashes": [
+                "sha256:7d4914079a6e8e14fbe080dcaf14dee596a088057cdc598561080e3266123b48",
+                "sha256:81125aa5b84cb9dfc09ff451886f64b4b923b75c5eaf51fde9d1c48a135eb797"
+            ],
+            "version": "==1.17.11"
+        },
         "cffi": {
             "hashes": [
                 "sha256:005f2bfe11b6745d726dbb07ace4d53f057de66e336ff92d61b8c7e9c8f4777d",
@@ -103,11 +118,11 @@
         },
         "channels": {
             "hashes": [
-                "sha256:5cdd9c6b9ee663cdf1bbb00de7cdab885a3c418f9d32a29f04b09498828020f6",
-                "sha256:b02e150b48704ec3607d4168402ac5c26138dd183fcdb7f2aeb965e6e19fd558"
+                "sha256:74db79c9eca616be69d38013b22083ab5d3f9ccda1ab5e69096b1bb7da2d9b18",
+                "sha256:f50a6e79757a64c1e45e95e144a2ac5f1e99ee44a0718ab182c501f5e5abd268"
             ],
             "index": "pypi",
-            "version": "==3.0.1"
+            "version": "==3.0.2"
         },
         "channels-redis": {
             "hashes": [
@@ -190,7 +205,6 @@
                 "sha256:dc663652ac9460fd06580a973576820430c6d428720e874ae46b041fa63e0efa"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.5'",
             "version": "==3.0.9"
         },
         "django-filter": {
@@ -201,6 +215,22 @@
             "index": "pypi",
             "version": "==2.4.0"
         },
+        "django-picklefield": {
+            "hashes": [
+                "sha256:15ccba592ca953b9edf9532e64640329cd47b136b7f8f10f2939caa5f9ce4287",
+                "sha256:3c702a54fde2d322fe5b2f39b8f78d9f655b8f77944ab26f703be6c0ed335a35"
+            ],
+            "markers": "python_version >= '3'",
+            "version": "==3.0.1"
+        },
+        "django-q": {
+            "hashes": [
+                "sha256:523d54dcf1b66152c1b658f914f00ed3b518a3432a9decd4898738ca8dbbe10f",
+                "sha256:7e5c5c021a15cff6807044a3aa48f5757789ccfef839d71c575f5512931a3e33"
+            ],
+            "index": "pypi",
+            "version": "==1.3.4"
+        },
         "djangorestframework": {
             "hashes": [
                 "sha256:0209bafcb7b5010fdfec784034f059d512256424de2a0f084cb82b096d6dd6a7"
@@ -390,6 +420,14 @@
             ],
             "version": "==0.1.2"
         },
+        "pathvalidate": {
+            "hashes": [
+                "sha256:1697c8ea71ff4c48e7aa0eda72fe4581404be8f41e51a17363ef682dd6824d35",
+                "sha256:32d30dbacb711c16bb188b12ce7e9a46b41785f50a12f64500f747480a4b6ee3"
+            ],
+            "index": "pypi",
+            "version": "==2.3.0"
+        },
         "pdftotext": {
             "hashes": [
                 "sha256:98aeb8b07a4127e1a30223bd933ef080bbd29aa88f801717ca6c5618380b8aa6"
@@ -576,6 +614,14 @@
             ],
             "version": "==2020.4"
         },
+        "redis": {
+            "hashes": [
+                "sha256:0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2",
+                "sha256:432b788c4530cfe16d8d943a09d40ca6c16149727e4afe8c2c9d5580c59d9f24"
+            ],
+            "index": "pypi",
+            "version": "==3.5.3"
+        },
         "regex": {
             "hashes": [
                 "sha256:03855ee22980c3e4863dc84c42d6d2901133362db5daf4c36b710dd895d78f0a",
@@ -762,6 +808,13 @@
             "index": "pypi",
             "version": "==0.10.3"
         },
+        "wcwidth": {
+            "hashes": [
+                "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784",
+                "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"
+            ],
+            "version": "==0.2.5"
+        },
         "whitenoise": {
             "hashes": [
                 "sha256:05ce0be39ad85740a78750c86a93485c40f08ad8c62a6006de0233765996e5c7",
@@ -879,10 +932,10 @@
         },
         "certifi": {
             "hashes": [
-                "sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3",
-                "sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41"
+                "sha256:1f422849db327d534e3d0c5f02a263458c3955ec0aae4ff09b95f195c59f4edd",
+                "sha256:f05def092c44fbf25834a51509ef6e631dc19765ab8a57b4e7ab85531f0a9cf4"
             ],
-            "version": "==2020.6.20"
+            "version": "==2020.11.8"
         },
         "chardet": {
             "hashes": [

From cb2340539ded2e6044e5386b79198d4539d0383a Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Thu, 19 Nov 2020 22:14:11 +0100
Subject: [PATCH 0007/1300] updated pipenv

---
 Pipfile.lock | 86 +++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 69 insertions(+), 17 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 932dc380e..ebe2c4095 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "65b67f06b1ad7d6541a1f84552f1c24a0353ed03aa4c382f8638c9d112b41eda"
+            "sha256": "ef3638ed4905e0809823dc1cfefd8e5ee415cd9d33ec3f23e483fb60b87d6fe6"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -10,6 +10,11 @@
                 "name": "pypi",
                 "url": "https://pypi.python.org/simple",
                 "verify_ssl": true
+            },
+            {
+                "name": "piwheels",
+                "url": "https://www.piwheels.org/simple",
+                "verify_ssl": true
             }
         ]
     },
@@ -55,6 +60,7 @@
         },
         "autobahn": {
             "hashes": [
+                "sha256:1eafbbe363a7924fd21bb0b94ece9f3ac2a9aa9c2046e8a85e044f94e8ba2028",
                 "sha256:24ce276d313e84d68241c3aef30d484f352b90a40168981b3640312c821df77b",
                 "sha256:86bbce30cdd407137c57670993a8f9bfdfe3f8e994b889181d85e844d5aa8dfb"
             ],
@@ -64,7 +70,8 @@
         "automat": {
             "hashes": [
                 "sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33",
-                "sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111"
+                "sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111",
+                "sha256:d6d976cf8da698fc85fa7def46e2544493f78cb7ee72d2f4acd1a5c759a3060e"
             ],
             "version": "==20.2.0"
         },
@@ -82,6 +89,7 @@
                 "sha256:0b1ad452cc824665ddc682400b62c9e4f5b64736a2ba99110712fdee5f2505c4",
                 "sha256:0ef488305fdce2580c8b2708f22d7785ae222d9825d3094ab073e22e93dfe51f",
                 "sha256:15f351bed09897fbda218e4db5a3d5c06328862f6198d4fb385f3e14e19decb3",
+                "sha256:178a2db1589cb9b0b5b28a74ee0c9d4438bd96f8c6c0ac85662ff3c98f7f8d20",
                 "sha256:22399ff4870fb4c7ef19fff6eeb20a8bbf15571913c181c78cb361024d574579",
                 "sha256:23e5d2040367322824605bc29ae8ee9175200b92cb5483ac7d466927a9b3d537",
                 "sha256:2791f68edc5749024b4722500e86303a10d342527e1e3bcac47f35fbd25b764e",
@@ -108,6 +116,7 @@
                 "sha256:cc75f58cdaf043fe6a7a6c04b3b5a0e694c6a9e24050967747251fb80d7bce0d",
                 "sha256:d80998ed59176e8cba74028762fbd9b9153b9afc71ea118e63bbf5d4d0f9552b",
                 "sha256:de31b5164d44ef4943db155b3e8e17929707cac1e5bd2f363e67a56e3af4af6e",
+                "sha256:df90c0c9e383e8c3bdced39f113ecc36fa9c623dd04dd1b5199e9edc53389a95",
                 "sha256:e66399cf0fc07de4dce4f588fc25bfe84a6d1285cc544e67987d22663393926d",
                 "sha256:f0620511387790860b249b9241c2f13c3a80e21a73e0b861a2df24e9d6f56730",
                 "sha256:f4eae045e6ab2bb54ca279733fe4eb85f1effda392666308250714e01907f394",
@@ -143,12 +152,14 @@
             "hashes": [
                 "sha256:07ca431b788249af92764e3be9a488aa1d39a0bc3be313d826bbec690417e538",
                 "sha256:13b88a0bd044b4eae1ef40e265d006e34dbcde0c2f1e15eb9896501b2d8f6c6f",
+                "sha256:257dab4f368fae15f378ea9a4d2799bf3696668062de0e9fa0ebb7a738a6917d",
                 "sha256:32434673d8505b42c0de4de86da8c1620651abd24afe91ae0335597683ed1b77",
                 "sha256:3cd75a683b15576cfc822c7c5742b3276e50b21a06672dc3a800a2d5da4ecd1b",
                 "sha256:4e7268a0ca14536fecfdf2b00297d4e407da904718658c1ff1961c713f90fd33",
                 "sha256:545a8550782dda68f8cdc75a6e3bf252017aa8f75f19f5a9ca940772fc0cb56e",
                 "sha256:55d0b896631412b6f0c7de56e12eb3e261ac347fbaa5d5e705291a9016e5f8cb",
                 "sha256:5849d59358547bf789ee7e0d7a9036b2d29e9a4ddf1ce5e06bb45634f995c53e",
+                "sha256:59f7d4cfea9ef12eb9b14b83d79b432162a0a24a91ddc15c2c9bf76a68d96f2b",
                 "sha256:6dc59630ecce8c1f558277ceb212c751d6730bd12c80ea96b4ac65637c4f55e7",
                 "sha256:7117319b44ed1842c617d0a452383a5a052ec6aa726dfbaffa8b94c910444297",
                 "sha256:75e8e6684cf0034f6bf2a97095cb95f81537b12b36a8fedf06e73050bb171c2d",
@@ -291,6 +302,7 @@
                 "sha256:969843fbdfbf56cdb71da6f0bdf50f9985b8b8aeb630102945306cf10a9c6af2",
                 "sha256:996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132",
                 "sha256:9e9c9078a7ce07e6fce366bd818be89365a35d2e4b163268f0ca9ba7e13bb2f6",
+                "sha256:9f4e67f87e072de981570eaf7cb41444bbac7e92b05c8651dbab6eb1fb8d5a14",
                 "sha256:a04901757cb0fb0f5602ac11dda48f5510f94372144d06c2563ba56c480b467c",
                 "sha256:a7bf1492429f18d205f3a818da3ff1f242f60aa59006e53dee00b4ef592a3363",
                 "sha256:aa0af2deb166a5e26e0d554b824605e660039b161e37ed4f01b8d04beec184f3",
@@ -298,6 +310,7 @@
                 "sha256:b253fe4df2afea4dfa6b1fa8c5fef212aff8bcaaeb4207e81eed05cb5e4a7919",
                 "sha256:b27f082f47d23cffc4cf1388b84fdc45c4ef6015f906cd7e0d988d9e35d36349",
                 "sha256:b33aea449e7f46738811fbc6f0b3177c6777a572207412bbbf6f525ffed001ae",
+                "sha256:b39989b49e8aca9d224324d2650029eda410a4faf43f6afb0eb4f9acb7be6097",
                 "sha256:b44f9421c4505c548435244d74037618f452844c5d3c67719d8a55e2613549da",
                 "sha256:bcc371151d1512201d0214c36c0c150b1dc64f19c2b1a8c9cb1d7c7c15ebd93f",
                 "sha256:c2851deeabd96d3f6283e9c6b26e0bfed4de2dc6fb15edf913e78b79fc5909ed",
@@ -315,6 +328,7 @@
         },
         "hyperlink": {
             "hashes": [
+                "sha256:402c1b5fa066ea368f3118fc5a6f8505440b4d1a4ef12a844ca39332a4a29944",
                 "sha256:47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af",
                 "sha256:c528d405766f15a2c536230de7e160b65a08e20264d8891b3eb03307b0df3c63"
             ],
@@ -322,12 +336,21 @@
         },
         "idna": {
             "hashes": [
+                "sha256:4a57a6379512ade94fa99e2fa46d3cd0f2f553040548d0e2958c6ed90ee48226",
                 "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
                 "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.10"
         },
+        "imap-tools": {
+            "hashes": [
+                "sha256:070929b8ec429c0aad94588a37a2962eed656a119ab61dcf91489f20fe983f5d",
+                "sha256:6232cd43748741496446871e889eb137351fc7a7e7f4c7888cd8c0fa28e20cda"
+            ],
+            "index": "pypi",
+            "version": "==0.31.0"
+        },
         "incremental": {
             "hashes": [
                 "sha256:717e12246dddf231a349175f48d74d93e2897244939173b01974ab6661406b9f",
@@ -354,12 +377,14 @@
         "msgpack": {
             "hashes": [
                 "sha256:002a0d813e1f7b60da599bdf969e632074f9eec1b96cbed8fb0973a63160a408",
+                "sha256:0e7b5a69ec5645b0a85baaa354c29acd89eb879aaa89e7f4b37ed4d9c5abafe0",
                 "sha256:25b3bc3190f3d9d965b818123b7752c5dfb953f0d774b454fd206c18fe384fb8",
                 "sha256:271b489499a43af001a2e42f42d876bb98ccaa7e20512ff37ca78c8e12e68f84",
                 "sha256:39c54fdebf5fa4dda733369012c59e7d085ebdfe35b6cf648f09d16708f1be5d",
                 "sha256:4233b7f86c1208190c78a525cd3828ca1623359ef48f78a6fea4b91bb995775a",
                 "sha256:5bea44181fc8e18eed1d0cd76e355073f00ce232ff9653a0ae88cb7d9e643322",
                 "sha256:5dba6d074fac9b24f29aaf1d2d032306c27f04187651511257e7831733293ec2",
+                "sha256:71604047feea609ad65f5b837ec89a4de084d55a80f8af7331745a075c3dbd23",
                 "sha256:7a22c965588baeb07242cb561b63f309db27a07382825fc98aecaf0827c1538e",
                 "sha256:908944e3f038bca67fcfedb7845c4a257c7749bf9818632586b53bcf06ba4b97",
                 "sha256:9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0",
@@ -370,7 +395,8 @@
                 "sha256:db685187a415f51d6b937257474ca72199f393dad89534ebbdd7d7a3b000080e",
                 "sha256:e35b051077fc2f3ce12e7c6a34cf309680c63a842db3a0616ea6ed25ad20d272",
                 "sha256:e7bbdd8e2b277b77782f3ce34734b0dfde6cbe94ddb74de8d733d603c7f9e2b1",
-                "sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140"
+                "sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140",
+                "sha256:f7c80ff32171193f18a127ea357118b920020cc0acb0730016bbda02b892a2d2"
             ],
             "version": "==1.0.0"
         },
@@ -389,6 +415,7 @@
                 "sha256:448ebb1b3bf64c0267d6b09a7cba26b5ae61b6d2dbabff7c91b660c7eccf2bdb",
                 "sha256:50e86c076611212ca62e5a59f518edafe0c0730f7d9195fec718da1a5c2bb1fc",
                 "sha256:5734bdc0342aba9dfc6f04920988140fb41234db42381cf7ccba64169f9fe7ac",
+                "sha256:5ddd1dfa2be066595c1993165b4cae84b9866b12339d0c903db7f21a094324a3",
                 "sha256:64324f64f90a9e4ef732be0928be853eee378fd6a01be21a0a8469c4f2682c83",
                 "sha256:6ae6c680f3ebf1cf7ad1d7748868b39d9f900836df774c453c11c5440bc15b36",
                 "sha256:6d7593a705d662be5bfe24111af14763016765f43cb6923ed86223f965f52387",
@@ -416,7 +443,8 @@
         },
         "pathtools": {
             "hashes": [
-                "sha256:7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0"
+                "sha256:7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0",
+                "sha256:d77d982475e87f32b82157a43b09f0a5ef3e66c1d8f3c7eb8d2580e783cd8202"
             ],
             "version": "==0.1.2"
         },
@@ -711,6 +739,7 @@
                 "sha256:9ad4fcddcbf5dc67619379782e6aeef41218a79e17979aaed01ed099876c0e62",
                 "sha256:a254b98dbcc744c723a838c03b74a8a34c0558c9ac5c86d5561703362231107d",
                 "sha256:b03c4338d6d3d299e8ca494194c0ae4f611548da59e3c038813f1a43976cb437",
+                "sha256:b5e9d3e4474644915809d6aa1416ff20430a3ed9ae723a5d295da5ddb24985e2",
                 "sha256:cc1f78ebc982cd0602c9a7615d878396bec94908db67d4ecddca864d049112f2",
                 "sha256:d6d25c41a009e3c6b7e757338948d0076ee1dd1770d1c09ec131f11946883c54",
                 "sha256:d84cadd7d7998433334c99fa55bcba0d8b4aeff0edb123b2a1dfcface538e474",
@@ -759,9 +788,11 @@
                 "tls"
             ],
             "hashes": [
+                "sha256:0150dae5adc962d15e00054cc6926f1e64763fb8dd26e1632593ac06e592104b",
                 "sha256:040eb6641125d2a9a09cf198ec7b83dd8858c6f51f6770325ed9959c00f5098f",
                 "sha256:147780b8caf21ba2aef3688628eaf13d7e7fe02a86747cd54bfaf2140538f042",
                 "sha256:158ddb80719a4813d292293ac44ba41d8b56555ed009d90994a278237ee63d2c",
+                "sha256:15e52271f08f62e2230ff093e0278aa01c9dac057c4557cadadd2429eed86a3e",
                 "sha256:2182000d6ffc05d269e6c03bfcec8b57e20259ca1086180edaedec3f1e689292",
                 "sha256:25ffcf37944bdad4a99981bc74006d735a678d2b5c193781254fbbb6d69e3b22",
                 "sha256:3281d9ce889f7b21bdb73658e887141aa45a102baf3b2320eafcfba954fcefec",
@@ -836,6 +867,7 @@
             "hashes": [
                 "sha256:05a97ba92c1c7c26f25c9f671aa1ef85ffead6cdad13770e5b689cf983adc7e1",
                 "sha256:07d61722dd7d85547b7c6b0f5486b4338001fab349f2ac5cabc0b7182eb3425d",
+                "sha256:09fc3922f235703c0b76f8234867685eee68a24a49fffa2220975f6142db45f1",
                 "sha256:0a990dcc97806e5980bbb54b2e46b9cde9e48932d8e6984daf71ef1745516123",
                 "sha256:150e8bcb7253a34a4535aeea3de36c0bb3b1a6a47a183a95d65a194b3e07f232",
                 "sha256:1743bcfe45af8846b775086471c28258f4c6e9ee8ef37484de4495f15a98b549",
@@ -870,6 +902,7 @@
                 "sha256:844fad925ac5c2ad4faaceb3b2520ad016b5280105c6e16e79838cf951903a7b",
                 "sha256:8ceb3667dd13b8133f2e4d637b5b00f240f066448e2aa89a41f4c2d78a26ce50",
                 "sha256:92dc0fb79675882d0b6138be4bf0cec7ea7c7eede60aaca78303d8e8dbdaa523",
+                "sha256:974f5957e66a7524ea81df7b2686a456bfaf0408dbb7353ddfbedb594eadfef6",
                 "sha256:9789bd945e9f5bd026ed3f5b453d640befb8b1fc33a779c1fe8d3eb21fe3fb4a",
                 "sha256:a2b6d6eb693bc2fc6c484f2e5d93bd0b0da803fa77bf974f160533e555e4d095",
                 "sha256:aab9f1e34d810feb00bf841993552b8fcc6ae71d473c505381627143d0018a6a",
@@ -924,11 +957,11 @@
         },
         "babel": {
             "hashes": [
-                "sha256:1aac2ae2d0d8ea368fa90906567f5c08463d98ade155c0c4bfedd6a0f7160e38",
-                "sha256:d670ea0b10f8b723672d3a6abeb87b565b244da220d76b4dba1b66269ec152d4"
+                "sha256:9d35c22fcc79893c3ecc85ac4a56cde1ecf3f19c540bba0922308a6c06ca6fa5",
+                "sha256:da031ab54472314f210b0adcff1588ee5d1d1d0ba4dbd07b94dba82bde791e05"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==2.8.0"
+            "version": "==2.9.0"
         },
         "certifi": {
             "hashes": [
@@ -954,6 +987,7 @@
                 "sha256:29a6272fec10623fcbe158fdf9abc7a5fa032048ac1d8631f14b50fbfc10d17f",
                 "sha256:2b31f46bf7b31e6aa690d4c7a3d51bb262438c6dcb0d528adde446531d0d3bb7",
                 "sha256:2d43af2be93ffbad25dd959899b5b809618a496926146ce98ee0b23683f8c51c",
+                "sha256:3188a7dfd96f734a7498f37cde6598b1e9c084f1ca68bc1aa04e88db31168ab6",
                 "sha256:381ead10b9b9af5f64646cd27107fb27b614ee7040bb1226f9c07ba96625cbb5",
                 "sha256:47a11bdbd8ada9b7ee628596f9d97fbd3851bd9999d398e9436bd67376dbece7",
                 "sha256:4d6a42744139a7fa5b46a264874a781e8694bb32f1d76d8137b68138686f1729",
@@ -979,7 +1013,8 @@
                 "sha256:c851b35fc078389bc16b915a0a7c1d5923e12e2c5aeec58c52f4aa8085ac8237",
                 "sha256:cb7df71de0af56000115eafd000b867d1261f786b5eebd88a0ca6360cccfaca7",
                 "sha256:cedb2f9e1f990918ea061f28a0f0077a07702e3819602d3507e2ff98c8d20636",
-                "sha256:e8caf961e1b1a945db76f1b5fa9c91498d15f545ac0ababbe575cfab185d3bd8"
+                "sha256:e8caf961e1b1a945db76f1b5fa9c91498d15f545ac0ababbe575cfab185d3bd8",
+                "sha256:ef221855191457fffeb909d5787d1807800ab4d0111f089e6c93ee68f577634d"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
             "version": "==5.3"
@@ -1001,6 +1036,7 @@
         },
         "docopt": {
             "hashes": [
+                "sha256:15fde8252aa9f2804171014d50d069ffbf42c7a50b7d74bcbb82bfd5700fcfc2",
                 "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"
             ],
             "version": "==0.6.2"
@@ -1031,11 +1067,11 @@
         },
         "faker": {
             "hashes": [
-                "sha256:6afc461ab3f779c9c16e299fc731d775e39ea7e8e063b3053ee359ae198a15ca",
-                "sha256:ce1c38823eb0f927567cde5bf2e7c8ca565c7a70316139342050ce2ca74b4026"
+                "sha256:3f5d379e4b5ce92a8afe3c2ce59d7c43886370dd3bf9495a936b91888debfc81",
+                "sha256:8c0e8a06acef4b9312902e2ce18becabe62badd3a6632180bd0680c6ee111473"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==4.14.2"
+            "version": "==4.17.0"
         },
         "filelock": {
             "hashes": [
@@ -1046,6 +1082,7 @@
         },
         "idna": {
             "hashes": [
+                "sha256:4a57a6379512ade94fa99e2fa46d3cd0f2f553040548d0e2958c6ed90ee48226",
                 "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
                 "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
             ],
@@ -1063,12 +1100,14 @@
         "iniconfig": {
             "hashes": [
                 "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3",
+                "sha256:8647b85c03813b8680f4ae9c9db2fd7293f8591ea536a10d73d90f6eb4b10aac",
                 "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"
             ],
             "version": "==1.1.1"
         },
         "jinja2": {
             "hashes": [
+                "sha256:3f172970d5670703bd3812e8ca6459a9a7e069fa8e51b40195f83c81db191ec4",
                 "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0",
                 "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035"
             ],
@@ -1082,8 +1121,10 @@
                 "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235",
                 "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5",
                 "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42",
+                "sha256:19536834abffb3fa155017053c607cb835b2ecc6a3a2554a88043d991dffb736",
                 "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff",
                 "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b",
+                "sha256:3d61f15e39611aacd91b7e71d903787da86d9e80896e683c0103fced9add7834",
                 "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1",
                 "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e",
                 "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183",
@@ -1093,6 +1134,7 @@
                 "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15",
                 "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1",
                 "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e",
+                "sha256:7952deddf24b85c88dab48f6ec366ac6e39d2761b5280f2f9594911e03fcd064",
                 "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b",
                 "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905",
                 "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735",
@@ -1195,6 +1237,7 @@
         },
         "pytest-forked": {
             "hashes": [
+                "sha256:2d1bfc93ab65a28324eb0a63503bfb500c2da6916efede7a24b43a04970fe63c",
                 "sha256:6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca",
                 "sha256:dc4147784048e70ef5d437951728825a131b81714b398d5d52f17c7c144d8815"
             ],
@@ -1233,11 +1276,11 @@
         },
         "requests": {
             "hashes": [
-                "sha256:b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b",
-                "sha256:fe75cc94a9443b9246fc7049224f75604b113c36acb93f87b80ed42c44cbb898"
+                "sha256:7f1a0b932f4a60a1a65caa4263921bb7d9ee911957e0ae4a23a6dd08185ad5f8",
+                "sha256:e786fa28d8c9154e6a4de5d46a1d921b8749f8b74e28bde23768e5e16eece998"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==2.24.0"
+            "version": "==2.25.0"
         },
         "six": {
             "hashes": [
@@ -1262,6 +1305,14 @@
             "index": "pypi",
             "version": "==3.3.0"
         },
+        "sphinx-rtd-theme": {
+            "hashes": [
+                "sha256:22c795ba2832a169ca301cd0a083f7a434e09c538c70beb42782c073651b707d",
+                "sha256:373413d0f82425aaa28fb288009bf0d0964711d347763af2f1b65cafcb028c82"
+            ],
+            "index": "pypi",
+            "version": "==0.5.0"
+        },
         "sphinxcontrib-applehelp": {
             "hashes": [
                 "sha256:806111e5e962be97c29ec4c1e7fe277bfd19e9652fb1a4392105b43e01af885a",
@@ -1312,6 +1363,7 @@
         },
         "termcolor": {
             "hashes": [
+                "sha256:19b1225d03bfb56571484caaa8521d8ec6e2473ae1640c9f48a48dda49417706",
                 "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"
             ],
             "version": "==1.1.0"
@@ -1341,11 +1393,11 @@
         },
         "urllib3": {
             "hashes": [
-                "sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2",
-                "sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e"
+                "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08",
+                "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
-            "version": "==1.25.11"
+            "version": "==1.26.2"
         },
         "virtualenv": {
             "hashes": [

From 391020a2b064bff95fa9116599a36fb11129a214 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Fri, 20 Nov 2020 10:58:17 +0100
Subject: [PATCH 0008/1300] small changes

---
 src/documents/consumer.py          |  6 +++---
 src/paperless/settings.py          | 18 +++++++++---------
 src/paperless_tesseract/parsers.py |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 973fff925..8edbb00a3 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -223,9 +223,9 @@ class Consumer(LoggingMixin):
                 self.log("debug", "Deleting file {}".format(self.path))
                 os.unlink(self.path)
         except Exception as e:
-            raise ConsumerError(e)
-            self._send_progress(file, 100, 100, 'FAILED',
+            self._send_progress(self.filename, 100, 100, 'FAILED',
                                 "Failed: {}".format(e))
+            raise ConsumerError(e)
         finally:
             document_parser.cleanup()
 
@@ -234,7 +234,7 @@ class Consumer(LoggingMixin):
             "Document {} consumption finished".format(document)
         )
 
-        self._send_progress(file, 100, 100, 'SUCCESS',
+        self._send_progress(self.filename, 100, 100, 'SUCCESS',
                             'Finished.', document.id)
 
         return document
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index cb115739b..37b046b2a 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -143,6 +143,15 @@ TEMPLATES = [
     },
 ]
 
+CHANNEL_LAYERS = {
+    "default": {
+        "BACKEND": "channels_redis.core.RedisChannelLayer",
+        "CONFIG": {
+            "hosts": ["redis://localhost:6379"],
+        },
+    },
+}
+
 ###############################################################################
 # Security                                                                    #
 ###############################################################################
@@ -376,12 +385,3 @@ for t in json.loads(os.getenv("PAPERLESS_FILENAME_PARSE_TRANSFORMS", "[]")):
 # TODO: this should not have a prefix.
 # Specify the filename format for out files
 PAPERLESS_FILENAME_FORMAT = os.getenv("PAPERLESS_FILENAME_FORMAT")
-
-CHANNEL_LAYERS = {
-    "default": {
-        "BACKEND": "channels_redis.core.RedisChannelLayer",
-        "CONFIG": {
-            "hosts": [("broker", 6379)],
-        },
-    },
-}
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index c3715c83a..11a6c8b37 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -90,7 +90,7 @@ class RasterisedDocumentParser(DocumentParser):
             self._text = get_text_from_pdf(self.document_path)
             return self._text
 
-        self.progress_callback(0,1,"Making greyscale images.")
+        self.progress_callback(0, 1, "Making greyscale images.")
         images = self._get_greyscale()
 
         if not images:

From 6cf0b851b7011d86afeced9deb777fdbf374cfc4 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Sun, 22 Nov 2020 23:12:24 +0100
Subject: [PATCH 0009/1300] post-merge changes

---
 Pipfile.lock                                  | 430 +++++++++++++++++-
 src-ui/src/app/app.module.ts                  |   2 +
 .../consumer-status-widget.component.html     |  18 +-
 ... => consumer-status-widget.component.scss} |   0
 .../consumer-status-widget.component.ts       |   2 +-
 .../file-upload-widget.component.css          |   0
 .../file-upload-widget.component.html         |  11 -
 .../file-upload-widget.component.spec.ts      |  25 -
 .../file-upload-widget.component.ts           |  44 --
 .../upload-file-widget.component.ts           |   4 +-
 10 files changed, 437 insertions(+), 99 deletions(-)
 rename src-ui/src/app/components/dashboard/widgets/consumer-status-widget/{consumer-status-widget.component.css => consumer-status-widget.component.scss} (100%)
 delete mode 100644 src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.css
 delete mode 100644 src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.html
 delete mode 100644 src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.spec.ts
 delete mode 100644 src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.ts

diff --git a/Pipfile.lock b/Pipfile.lock
index 6ecca3c34..2dd198e14 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "ae2643b9cf0cf5741ae149fb6bc0c480de41329ce48e773eb4b5d760bc5e2244"
+            "sha256": "83cb61d0f0de0ad70aa02e8424deb743331c3578a67ee17ed06394506fdb2c14"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -19,6 +19,13 @@
         ]
     },
     "default": {
+        "aioredis": {
+            "hashes": [
+                "sha256:15f8af30b044c771aee6787e5ec24694c048184c7b9e54c3b60c750a4b93273a",
+                "sha256:b61808d7e97b7cd5a92ed574937a079c9387fdadd22bfbfa7ad2fd319ecc26e3"
+            ],
+            "version": "==1.3.1"
+        },
         "arrow": {
             "hashes": [
                 "sha256:e098abbd9af3665aea81bdd6c869e93af4feb078e98468dd351c383af187aac5",
@@ -35,6 +42,39 @@
             "markers": "python_version >= '3.5'",
             "version": "==3.3.1"
         },
+        "async-timeout": {
+            "hashes": [
+                "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f",
+                "sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3"
+            ],
+            "markers": "python_full_version >= '3.5.3'",
+            "version": "==3.0.1"
+        },
+        "attrs": {
+            "hashes": [
+                "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
+                "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==20.3.0"
+        },
+        "autobahn": {
+            "hashes": [
+                "sha256:1eafbbe363a7924fd21bb0b94ece9f3ac2a9aa9c2046e8a85e044f94e8ba2028",
+                "sha256:24ce276d313e84d68241c3aef30d484f352b90a40168981b3640312c821df77b",
+                "sha256:86bbce30cdd407137c57670993a8f9bfdfe3f8e994b889181d85e844d5aa8dfb"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==20.7.1"
+        },
+        "automat": {
+            "hashes": [
+                "sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33",
+                "sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111",
+                "sha256:d6d976cf8da698fc85fa7def46e2544493f78cb7ee72d2f4acd1a5c759a3060e"
+            ],
+            "version": "==20.2.0"
+        },
         "blessed": {
             "hashes": [
                 "sha256:7d4914079a6e8e14fbe080dcaf14dee596a088057cdc598561080e3266123b48",
@@ -42,6 +82,110 @@
             ],
             "version": "==1.17.11"
         },
+        "cffi": {
+            "hashes": [
+                "sha256:005f2bfe11b6745d726dbb07ace4d53f057de66e336ff92d61b8c7e9c8f4777d",
+                "sha256:09e96138280241bd355cd585148dec04dbbedb4f46128f340d696eaafc82dd7b",
+                "sha256:0b1ad452cc824665ddc682400b62c9e4f5b64736a2ba99110712fdee5f2505c4",
+                "sha256:0ef488305fdce2580c8b2708f22d7785ae222d9825d3094ab073e22e93dfe51f",
+                "sha256:15f351bed09897fbda218e4db5a3d5c06328862f6198d4fb385f3e14e19decb3",
+                "sha256:178a2db1589cb9b0b5b28a74ee0c9d4438bd96f8c6c0ac85662ff3c98f7f8d20",
+                "sha256:22399ff4870fb4c7ef19fff6eeb20a8bbf15571913c181c78cb361024d574579",
+                "sha256:23e5d2040367322824605bc29ae8ee9175200b92cb5483ac7d466927a9b3d537",
+                "sha256:2791f68edc5749024b4722500e86303a10d342527e1e3bcac47f35fbd25b764e",
+                "sha256:2f9674623ca39c9ebe38afa3da402e9326c245f0f5ceff0623dccdac15023e05",
+                "sha256:3363e77a6176afb8823b6e06db78c46dbc4c7813b00a41300a4873b6ba63b171",
+                "sha256:33c6cdc071ba5cd6d96769c8969a0531be2d08c2628a0143a10a7dcffa9719ca",
+                "sha256:3b8eaf915ddc0709779889c472e553f0d3e8b7bdf62dab764c8921b09bf94522",
+                "sha256:3cb3e1b9ec43256c4e0f8d2837267a70b0e1ca8c4f456685508ae6106b1f504c",
+                "sha256:3eeeb0405fd145e714f7633a5173318bd88d8bbfc3dd0a5751f8c4f70ae629bc",
+                "sha256:44f60519595eaca110f248e5017363d751b12782a6f2bd6a7041cba275215f5d",
+                "sha256:4d7c26bfc1ea9f92084a1d75e11999e97b62d63128bcc90c3624d07813c52808",
+                "sha256:529c4ed2e10437c205f38f3691a68be66c39197d01062618c55f74294a4a4828",
+                "sha256:6642f15ad963b5092d65aed022d033c77763515fdc07095208f15d3563003869",
+                "sha256:85ba797e1de5b48aa5a8427b6ba62cf69607c18c5d4eb747604b7302f1ec382d",
+                "sha256:8f0f1e499e4000c4c347a124fa6a27d37608ced4fe9f7d45070563b7c4c370c9",
+                "sha256:a624fae282e81ad2e4871bdb767e2c914d0539708c0f078b5b355258293c98b0",
+                "sha256:b0358e6fefc74a16f745afa366acc89f979040e0cbc4eec55ab26ad1f6a9bfbc",
+                "sha256:bbd2f4dfee1079f76943767fce837ade3087b578aeb9f69aec7857d5bf25db15",
+                "sha256:bf39a9e19ce7298f1bd6a9758fa99707e9e5b1ebe5e90f2c3913a47bc548747c",
+                "sha256:c11579638288e53fc94ad60022ff1b67865363e730ee41ad5e6f0a17188b327a",
+                "sha256:c150eaa3dadbb2b5339675b88d4573c1be3cb6f2c33a6c83387e10cc0bf05bd3",
+                "sha256:c53af463f4a40de78c58b8b2710ade243c81cbca641e34debf3396a9640d6ec1",
+                "sha256:cb763ceceae04803adcc4e2d80d611ef201c73da32d8f2722e9d0ab0c7f10768",
+                "sha256:cc75f58cdaf043fe6a7a6c04b3b5a0e694c6a9e24050967747251fb80d7bce0d",
+                "sha256:d80998ed59176e8cba74028762fbd9b9153b9afc71ea118e63bbf5d4d0f9552b",
+                "sha256:de31b5164d44ef4943db155b3e8e17929707cac1e5bd2f363e67a56e3af4af6e",
+                "sha256:df90c0c9e383e8c3bdced39f113ecc36fa9c623dd04dd1b5199e9edc53389a95",
+                "sha256:e66399cf0fc07de4dce4f588fc25bfe84a6d1285cc544e67987d22663393926d",
+                "sha256:f0620511387790860b249b9241c2f13c3a80e21a73e0b861a2df24e9d6f56730",
+                "sha256:f4eae045e6ab2bb54ca279733fe4eb85f1effda392666308250714e01907f394",
+                "sha256:f92cdecb618e5fa4658aeb97d5eb3d2f47aa94ac6477c6daf0f306c5a3b9e6b1",
+                "sha256:f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591"
+            ],
+            "version": "==1.14.3"
+        },
+        "channels": {
+            "hashes": [
+                "sha256:74db79c9eca616be69d38013b22083ab5d3f9ccda1ab5e69096b1bb7da2d9b18",
+                "sha256:f50a6e79757a64c1e45e95e144a2ac5f1e99ee44a0718ab182c501f5e5abd268"
+            ],
+            "index": "pypi",
+            "version": "==3.0.2"
+        },
+        "channels-redis": {
+            "hashes": [
+                "sha256:18d63f6462a58011740dc8eeb57ea4b31ec220eb551cb71b27de9c6779a549de",
+                "sha256:2fb31a63b05373f6402da2e6a91a22b9e66eb8b56626c6bfc93e156c734c5ae6"
+            ],
+            "index": "pypi",
+            "version": "==3.2.0"
+        },
+        "constantly": {
+            "hashes": [
+                "sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35",
+                "sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d"
+            ],
+            "version": "==15.1.0"
+        },
+        "cryptography": {
+            "hashes": [
+                "sha256:07ca431b788249af92764e3be9a488aa1d39a0bc3be313d826bbec690417e538",
+                "sha256:13b88a0bd044b4eae1ef40e265d006e34dbcde0c2f1e15eb9896501b2d8f6c6f",
+                "sha256:257dab4f368fae15f378ea9a4d2799bf3696668062de0e9fa0ebb7a738a6917d",
+                "sha256:32434673d8505b42c0de4de86da8c1620651abd24afe91ae0335597683ed1b77",
+                "sha256:3cd75a683b15576cfc822c7c5742b3276e50b21a06672dc3a800a2d5da4ecd1b",
+                "sha256:4e7268a0ca14536fecfdf2b00297d4e407da904718658c1ff1961c713f90fd33",
+                "sha256:545a8550782dda68f8cdc75a6e3bf252017aa8f75f19f5a9ca940772fc0cb56e",
+                "sha256:55d0b896631412b6f0c7de56e12eb3e261ac347fbaa5d5e705291a9016e5f8cb",
+                "sha256:5849d59358547bf789ee7e0d7a9036b2d29e9a4ddf1ce5e06bb45634f995c53e",
+                "sha256:59f7d4cfea9ef12eb9b14b83d79b432162a0a24a91ddc15c2c9bf76a68d96f2b",
+                "sha256:6dc59630ecce8c1f558277ceb212c751d6730bd12c80ea96b4ac65637c4f55e7",
+                "sha256:7117319b44ed1842c617d0a452383a5a052ec6aa726dfbaffa8b94c910444297",
+                "sha256:75e8e6684cf0034f6bf2a97095cb95f81537b12b36a8fedf06e73050bb171c2d",
+                "sha256:7b8d9d8d3a9bd240f453342981f765346c87ade811519f98664519696f8e6ab7",
+                "sha256:a035a10686532b0587d58a606004aa20ad895c60c4d029afa245802347fab57b",
+                "sha256:a4e27ed0b2504195f855b52052eadcc9795c59909c9d84314c5408687f933fc7",
+                "sha256:a733671100cd26d816eed39507e585c156e4498293a907029969234e5e634bc4",
+                "sha256:a75f306a16d9f9afebfbedc41c8c2351d8e61e818ba6b4c40815e2b5740bb6b8",
+                "sha256:bd717aa029217b8ef94a7d21632a3bb5a4e7218a4513d2521c2a2fd63011e98b",
+                "sha256:d25cecbac20713a7c3bc544372d42d8eafa89799f492a43b79e1dfd650484851",
+                "sha256:d26a2557d8f9122f9bf445fc7034242f4375bd4e95ecda007667540270965b13",
+                "sha256:d3545829ab42a66b84a9aaabf216a4dce7f16dbc76eb69be5c302ed6b8f4a29b",
+                "sha256:d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3",
+                "sha256:efe15aca4f64f3a7ea0c09c87826490e50ed166ce67368a68f315ea0807a20df"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==3.2.1"
+        },
+        "daphne": {
+            "hashes": [
+                "sha256:0052c9887600c57054a5867d4b0240159fa009faa3bcf6a1627271d9cdcb005a",
+                "sha256:c22b692707f514de9013651ecb687f2abe4f35cf6fe292ece634e9f1737bc7e3"
+            ],
+            "index": "pypi",
+            "version": "==3.0.1"
+        },
         "dateparser": {
             "hashes": [
                 "sha256:7552c994f893b5cb8fcf103b4cd2ff7f57aab9bfd2619fdf0cf571c0740fd90b",
@@ -121,6 +265,77 @@
             "index": "pypi",
             "version": "==20.0.4"
         },
+        "hiredis": {
+            "hashes": [
+                "sha256:06a039208f83744a702279b894c8cf24c14fd63c59cd917dcde168b79eef0680",
+                "sha256:0a909bf501459062aa1552be1461456518f367379fdc9fdb1f2ca5e4a1fdd7c0",
+                "sha256:18402d9e54fb278cb9a8c638df6f1550aca36a009d47ecf5aa263a38600f35b0",
+                "sha256:1e4cbbc3858ec7e680006e5ca590d89a5e083235988f26a004acf7244389ac01",
+                "sha256:23344e3c2177baf6975fbfa361ed92eb7d36d08f454636e5054b3faa7c2aff8a",
+                "sha256:289b31885b4996ce04cadfd5fc03d034dce8e2a8234479f7c9e23b9e245db06b",
+                "sha256:2c1c570ae7bf1bab304f29427e2475fe1856814312c4a1cf1cd0ee133f07a3c6",
+                "sha256:2c227c0ed371771ffda256034427320870e8ea2e4fd0c0a618c766e7c49aad73",
+                "sha256:3bb9b63d319402cead8bbd9dd55dca3b667d2997e9a0d8a1f9b6cc274db4baee",
+                "sha256:3ef2183de67b59930d2db8b8e8d4d58e00a50fcc5e92f4f678f6eed7a1c72d55",
+                "sha256:43b8ed3dbfd9171e44c554cb4acf4ee4505caa84c5e341858b50ea27dd2b6e12",
+                "sha256:47bcf3c5e6c1e87ceb86cdda2ee983fa0fe56a999e6185099b3c93a223f2fa9b",
+                "sha256:5263db1e2e1e8ae30500cdd75a979ff99dcc184201e6b4b820d0de74834d2323",
+                "sha256:5b1451727f02e7acbdf6aae4e06d75f66ee82966ff9114550381c3271a90f56c",
+                "sha256:6996883a8a6ff9117cbb3d6f5b0dcbbae6fb9e31e1a3e4e2f95e0214d9a1c655",
+                "sha256:6c96f64a54f030366657a54bb90b3093afc9c16c8e0dfa29fc0d6dbe169103a5",
+                "sha256:7332d5c3e35154cd234fd79573736ddcf7a0ade7a986db35b6196b9171493e75",
+                "sha256:7885b6f32c4a898e825bb7f56f36a02781ac4a951c63e4169f0afcf9c8c30dfb",
+                "sha256:7b0f63f10a166583ab744a58baad04e0f52cfea1ac27bfa1b0c21a48d1003c23",
+                "sha256:819f95d4eba3f9e484dd115ab7ab72845cf766b84286a00d4ecf76d33f1edca1",
+                "sha256:8968eeaa4d37a38f8ca1f9dbe53526b69628edc9c42229a5b2f56d98bb828c1f",
+                "sha256:89ebf69cb19a33d625db72d2ac589d26e936b8f7628531269accf4a3196e7872",
+                "sha256:8daecd778c1da45b8bd54fd41ffcd471a86beed3d8e57a43acf7a8d63bba4058",
+                "sha256:955ba8ea73cf3ed8bd2f963b4cb9f8f0dcb27becd2f4b3dd536fd24c45533454",
+                "sha256:964f18a59f5a64c0170f684c417f4fe3e695a536612e13074c4dd5d1c6d7c882",
+                "sha256:969843fbdfbf56cdb71da6f0bdf50f9985b8b8aeb630102945306cf10a9c6af2",
+                "sha256:996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132",
+                "sha256:9e9c9078a7ce07e6fce366bd818be89365a35d2e4b163268f0ca9ba7e13bb2f6",
+                "sha256:9f4e67f87e072de981570eaf7cb41444bbac7e92b05c8651dbab6eb1fb8d5a14",
+                "sha256:a04901757cb0fb0f5602ac11dda48f5510f94372144d06c2563ba56c480b467c",
+                "sha256:a7bf1492429f18d205f3a818da3ff1f242f60aa59006e53dee00b4ef592a3363",
+                "sha256:aa0af2deb166a5e26e0d554b824605e660039b161e37ed4f01b8d04beec184f3",
+                "sha256:abfb15a6a7822f0fae681785cb38860e7a2cb1616a708d53df557b3d76c5bfd4",
+                "sha256:b253fe4df2afea4dfa6b1fa8c5fef212aff8bcaaeb4207e81eed05cb5e4a7919",
+                "sha256:b27f082f47d23cffc4cf1388b84fdc45c4ef6015f906cd7e0d988d9e35d36349",
+                "sha256:b33aea449e7f46738811fbc6f0b3177c6777a572207412bbbf6f525ffed001ae",
+                "sha256:b39989b49e8aca9d224324d2650029eda410a4faf43f6afb0eb4f9acb7be6097",
+                "sha256:b44f9421c4505c548435244d74037618f452844c5d3c67719d8a55e2613549da",
+                "sha256:bcc371151d1512201d0214c36c0c150b1dc64f19c2b1a8c9cb1d7c7c15ebd93f",
+                "sha256:c2851deeabd96d3f6283e9c6b26e0bfed4de2dc6fb15edf913e78b79fc5909ed",
+                "sha256:cdfd501c7ac5b198c15df800a3a34c38345f5182e5f80770caf362bccca65628",
+                "sha256:d2c0caffa47606d6d7c8af94ba42547bd2a441f06c74fd90a1ffe328524a6c64",
+                "sha256:dcb2db95e629962db5a355047fb8aefb012df6c8ae608930d391619dbd96fd86",
+                "sha256:e0eeb9c112fec2031927a1745788a181d0eecbacbed941fc5c4f7bc3f7b273bf",
+                "sha256:e154891263306200260d7f3051982774d7b9ef35af3509d5adbbe539afd2610c",
+                "sha256:e2e023a42dcbab8ed31f97c2bcdb980b7fbe0ada34037d87ba9d799664b58ded",
+                "sha256:e64be68255234bb489a574c4f2f8df7029c98c81ec4d160d6cd836e7f0679390",
+                "sha256:e82d6b930e02e80e5109b678c663a9ed210680ded81c1abaf54635d88d1da298"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==1.1.0"
+        },
+        "hyperlink": {
+            "hashes": [
+                "sha256:402c1b5fa066ea368f3118fc5a6f8505440b4d1a4ef12a844ca39332a4a29944",
+                "sha256:47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af",
+                "sha256:c528d405766f15a2c536230de7e160b65a08e20264d8891b3eb03307b0df3c63"
+            ],
+            "version": "==20.0.1"
+        },
+        "idna": {
+            "hashes": [
+                "sha256:4a57a6379512ade94fa99e2fa46d3cd0f2f553040548d0e2958c6ed90ee48226",
+                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
+                "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.10"
+        },
         "imap-tools": {
             "hashes": [
                 "sha256:96e9a4ff6483462635737730a1df28e739faa71967b12a84f4363fb386542246",
@@ -129,6 +344,13 @@
             "index": "pypi",
             "version": "==0.32.0"
         },
+        "incremental": {
+            "hashes": [
+                "sha256:717e12246dddf231a349175f48d74d93e2897244939173b01974ab6661406b9f",
+                "sha256:7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3"
+            ],
+            "version": "==17.5.0"
+        },
         "joblib": {
             "hashes": [
                 "sha256:698c311779f347cf6b7e6b8a39bb682277b8ee4aba8cf9507bc0cf4cd4737b72",
@@ -146,6 +368,32 @@
             "index": "pypi",
             "version": "==1.0.8"
         },
+        "msgpack": {
+            "hashes": [
+                "sha256:002a0d813e1f7b60da599bdf969e632074f9eec1b96cbed8fb0973a63160a408",
+                "sha256:0e7b5a69ec5645b0a85baaa354c29acd89eb879aaa89e7f4b37ed4d9c5abafe0",
+                "sha256:25b3bc3190f3d9d965b818123b7752c5dfb953f0d774b454fd206c18fe384fb8",
+                "sha256:271b489499a43af001a2e42f42d876bb98ccaa7e20512ff37ca78c8e12e68f84",
+                "sha256:39c54fdebf5fa4dda733369012c59e7d085ebdfe35b6cf648f09d16708f1be5d",
+                "sha256:4233b7f86c1208190c78a525cd3828ca1623359ef48f78a6fea4b91bb995775a",
+                "sha256:5bea44181fc8e18eed1d0cd76e355073f00ce232ff9653a0ae88cb7d9e643322",
+                "sha256:5dba6d074fac9b24f29aaf1d2d032306c27f04187651511257e7831733293ec2",
+                "sha256:71604047feea609ad65f5b837ec89a4de084d55a80f8af7331745a075c3dbd23",
+                "sha256:7a22c965588baeb07242cb561b63f309db27a07382825fc98aecaf0827c1538e",
+                "sha256:908944e3f038bca67fcfedb7845c4a257c7749bf9818632586b53bcf06ba4b97",
+                "sha256:9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0",
+                "sha256:aa5c057eab4f40ec47ea6f5a9825846be2ff6bf34102c560bad5cad5a677c5be",
+                "sha256:b3758dfd3423e358bbb18a7cccd1c74228dffa7a697e5be6cb9535de625c0dbf",
+                "sha256:c901e8058dd6653307906c5f157f26ed09eb94a850dddd989621098d347926ab",
+                "sha256:cec8bf10981ed70998d98431cd814db0ecf3384e6b113366e7f36af71a0fca08",
+                "sha256:db685187a415f51d6b937257474ca72199f393dad89534ebbdd7d7a3b000080e",
+                "sha256:e35b051077fc2f3ce12e7c6a34cf309680c63a842db3a0616ea6ed25ad20d272",
+                "sha256:e7bbdd8e2b277b77782f3ce34734b0dfde6cbe94ddb74de8d733d603c7f9e2b1",
+                "sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140",
+                "sha256:f7c80ff32171193f18a127ea357118b920020cc0acb0730016bbda02b892a2d2"
+            ],
+            "version": "==1.0.0"
+        },
         "numpy": {
             "hashes": [
                 "sha256:08308c38e44cc926bdfce99498b21eec1f848d24c302519e64203a8da99a97db",
@@ -287,6 +535,58 @@
             "index": "pypi",
             "version": "==2.8.6"
         },
+        "pyasn1": {
+            "hashes": [
+                "sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359",
+                "sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576",
+                "sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf",
+                "sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7",
+                "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d",
+                "sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00",
+                "sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8",
+                "sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86",
+                "sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12",
+                "sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776",
+                "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba",
+                "sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2",
+                "sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3"
+            ],
+            "version": "==0.4.8"
+        },
+        "pyasn1-modules": {
+            "hashes": [
+                "sha256:0845a5582f6a02bb3e1bde9ecfc4bfcae6ec3210dd270522fee602365430c3f8",
+                "sha256:0fe1b68d1e486a1ed5473f1302bd991c1611d319bba158e98b106ff86e1d7199",
+                "sha256:15b7c67fabc7fc240d87fb9aabf999cf82311a6d6fb2c70d00d3d0604878c811",
+                "sha256:426edb7a5e8879f1ec54a1864f16b882c2837bfd06eee62f2c982315ee2473ed",
+                "sha256:65cebbaffc913f4fe9e4808735c95ea22d7a7775646ab690518c056784bc21b4",
+                "sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e",
+                "sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74",
+                "sha256:a99324196732f53093a84c4369c996713eb8c89d360a496b599fb1a9c47fc3eb",
+                "sha256:b80486a6c77252ea3a3e9b1e360bc9cf28eaac41263d173c032581ad2f20fe45",
+                "sha256:c29a5e5cc7a3f05926aff34e097e84f8589cd790ce0ed41b67aed6857b26aafd",
+                "sha256:cbac4bc38d117f2a49aeedec4407d23e8866ea4ac27ff2cf7fb3e5b570df19e0",
+                "sha256:f39edd8c4ecaa4556e989147ebf219227e2cd2e8a43c7e7fcb1f1c18c5fd6a3d",
+                "sha256:fe0644d9ab041506b62782e92b06b8c68cca799e1a9636ec398675459e031405"
+            ],
+            "version": "==0.2.8"
+        },
+        "pycparser": {
+            "hashes": [
+                "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0",
+                "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.20"
+        },
+        "pyhamcrest": {
+            "hashes": [
+                "sha256:412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316",
+                "sha256:7ead136e03655af85069b6f47b23eb7c3e5c221aa9f022a4fbb499f5b7308f29"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==2.0.2"
+        },
         "pyocr": {
             "hashes": [
                 "sha256:fa15adc7e1cf0d345a2990495fe125a947c6e09a60ddba0256a1c14b2e603179",
@@ -295,6 +595,13 @@
             "index": "pypi",
             "version": "==0.7.2"
         },
+        "pyopenssl": {
+            "hashes": [
+                "sha256:621880965a720b8ece2f1b2f54ea2071966ab00e2970ad2ce11d596102063504",
+                "sha256:9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507"
+            ],
+            "version": "==19.1.0"
+        },
         "python-dateutil": {
             "hashes": [
                 "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c",
@@ -456,6 +763,13 @@
             "markers": "python_version >= '3.6'",
             "version": "==1.5.4"
         },
+        "service-identity": {
+            "hashes": [
+                "sha256:001c0707759cb3de7e49c078a7c0c9cd12594161d3bf06b9c254fdcb1a60dc36",
+                "sha256:0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d"
+            ],
+            "version": "==18.1.0"
+        },
         "six": {
             "hashes": [
                 "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
@@ -480,6 +794,48 @@
             "markers": "python_version >= '3.5'",
             "version": "==2.1.0"
         },
+        "twisted": {
+            "extras": [
+                "tls"
+            ],
+            "hashes": [
+                "sha256:0150dae5adc962d15e00054cc6926f1e64763fb8dd26e1632593ac06e592104b",
+                "sha256:040eb6641125d2a9a09cf198ec7b83dd8858c6f51f6770325ed9959c00f5098f",
+                "sha256:147780b8caf21ba2aef3688628eaf13d7e7fe02a86747cd54bfaf2140538f042",
+                "sha256:158ddb80719a4813d292293ac44ba41d8b56555ed009d90994a278237ee63d2c",
+                "sha256:15e52271f08f62e2230ff093e0278aa01c9dac057c4557cadadd2429eed86a3e",
+                "sha256:2182000d6ffc05d269e6c03bfcec8b57e20259ca1086180edaedec3f1e689292",
+                "sha256:25ffcf37944bdad4a99981bc74006d735a678d2b5c193781254fbbb6d69e3b22",
+                "sha256:3281d9ce889f7b21bdb73658e887141aa45a102baf3b2320eafcfba954fcefec",
+                "sha256:356e8d8dd3590e790e3dba4db139eb8a17aca64b46629c622e1b1597a4a92478",
+                "sha256:70952c56e4965b9f53b180daecf20a9595cf22b8d0935cd3bd664c90273c3ab2",
+                "sha256:7408c6635ee1b96587289283ebe90ee15dbf9614b05857b446055116bc822d29",
+                "sha256:7c547fd0215db9da8a1bc23182b309e84a232364cc26d829e9ee196ce840b114",
+                "sha256:894f6f3cfa57a15ea0d0714e4283913a5f2511dbd18653dd148eba53b3919797",
+                "sha256:94ac3d55a58c90e2075c5fe1853f2aa3892b73e3bf56395f743aefde8605eeaa",
+                "sha256:a58e61a2a01e5bcbe3b575c0099a2bcb8d70a75b1a087338e0c48dd6e01a5f15",
+                "sha256:c09c47ff9750a8e3aa60ad169c4b95006d455a29b80ad0901f031a103b2991cd",
+                "sha256:ca3a0b8c9110800e576d89b5337373e52018b41069bc879f12fa42b7eb2d0274",
+                "sha256:cd1dc5c85b58494138a3917752b54bb1daa0045d234b7c132c37a61d5483ebad",
+                "sha256:cdbc4c7f0cd7a2218b575844e970f05a1be1861c607b0e048c9bceca0c4d42f7",
+                "sha256:d267125cc0f1e8a0eed6319ba4ac7477da9b78a535601c49ecd20c875576433a",
+                "sha256:d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10",
+                "sha256:d95803193561a243cb0401b0567c6b7987d3f2a67046770e1dccd1c9e49a9780",
+                "sha256:e92703bed0cc21d6cb5c61d66922b3b1564015ca8a51325bd164a5e33798d504",
+                "sha256:f058bd0168271de4dcdc39845b52dd0a4a2fecf5f1246335f13f5e96eaebb467",
+                "sha256:f3c19e5bd42bbe4bf345704ad7c326c74d3fd7a1b3844987853bef180be638d4"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==20.3.0"
+        },
+        "txaio": {
+            "hashes": [
+                "sha256:17938f2bca4a9cabce61346758e482ca4e600160cbc28e861493eac74a19539d",
+                "sha256:38a469daf93c37e5527cb062653d6393ae11663147c42fab7ddc3f6d00d434ae"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==20.4.1"
+        },
         "tzlocal": {
             "hashes": [
                 "sha256:643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44",
@@ -518,6 +874,66 @@
             ],
             "index": "pypi",
             "version": "==2.7.4"
+        },
+        "zope.interface": {
+            "hashes": [
+                "sha256:05a97ba92c1c7c26f25c9f671aa1ef85ffead6cdad13770e5b689cf983adc7e1",
+                "sha256:07d61722dd7d85547b7c6b0f5486b4338001fab349f2ac5cabc0b7182eb3425d",
+                "sha256:09fc3922f235703c0b76f8234867685eee68a24a49fffa2220975f6142db45f1",
+                "sha256:0a990dcc97806e5980bbb54b2e46b9cde9e48932d8e6984daf71ef1745516123",
+                "sha256:150e8bcb7253a34a4535aeea3de36c0bb3b1a6a47a183a95d65a194b3e07f232",
+                "sha256:1743bcfe45af8846b775086471c28258f4c6e9ee8ef37484de4495f15a98b549",
+                "sha256:1b5f6c8fff4ed32aa2dd43e84061bc8346f32d3ba6ad6e58f088fe109608f102",
+                "sha256:21e49123f375703cf824214939d39df0af62c47d122d955b2a8d9153ea08cfd5",
+                "sha256:21f579134a47083ffb5ddd1307f0405c91aa8b61ad4be6fd5af0171474fe0c45",
+                "sha256:27c267dc38a0f0079e96a2945ee65786d38ef111e413c702fbaaacbab6361d00",
+                "sha256:299bde0ab9e5c4a92f01a152b7fbabb460f31343f1416f9b7b983167ab1e33bc",
+                "sha256:2ab88d8f228f803fcb8cb7d222c579d13dab2d3622c51e8cf321280da01102a7",
+                "sha256:2ced4c35061eea623bc84c7711eedce8ecc3c2c51cd9c6afa6290df3bae9e104",
+                "sha256:2dcab01c660983ba5e5a612e0c935141ccbee67d2e2e14b833e01c2354bd8034",
+                "sha256:32546af61a9a9b141ca38d971aa6eb9800450fa6620ce6323cc30eec447861f3",
+                "sha256:32b40a4c46d199827d79c86bb8cb88b1bbb764f127876f2cb6f3a47f63dbada3",
+                "sha256:3cc94c69f6bd48ed86e8e24f358cb75095c8129827df1298518ab860115269a4",
+                "sha256:42b278ac0989d6f5cf58d7e0828ea6b5951464e3cf2ff229dd09a96cb6ba0c86",
+                "sha256:495b63fd0302f282ee6c1e6ea0f1c12cb3d1a49c8292d27287f01845ff252a96",
+                "sha256:4af87cdc0d4b14e600e6d3d09793dce3b7171348a094ba818e2a68ae7ee67546",
+                "sha256:4b94df9f2fdde7b9314321bab8448e6ad5a23b80542dcab53e329527d4099dcb",
+                "sha256:4c48ddb63e2b20fba4c6a2bf81b4d49e99b6d4587fb67a6cd33a2c1f003af3e3",
+                "sha256:4df9afd17bd5477e9f8c8b6bb8507e18dd0f8b4efe73bb99729ff203279e9e3b",
+                "sha256:518950fe6a5d56f94ba125107895f938a4f34f704c658986eae8255edb41163b",
+                "sha256:538298e4e113ccb8b41658d5a4b605bebe75e46a30ceca22a5a289cf02c80bec",
+                "sha256:55465121e72e208a7b69b53de791402affe6165083b2ea71b892728bd19ba9ae",
+                "sha256:588384d70a0f19b47409cfdb10e0c27c20e4293b74fc891df3d8eb47782b8b3e",
+                "sha256:6278c080d4afffc9016e14325f8734456831124e8c12caa754fd544435c08386",
+                "sha256:64ea6c221aeee4796860405e1aedec63424cda4202a7ad27a5066876db5b0fd2",
+                "sha256:681dbb33e2b40262b33fd383bae63c36d33fd79fa1a8e4092945430744ffd34a",
+                "sha256:6936aa9da390402d646a32a6a38d5409c2d2afb2950f045a7d02ab25a4e7d08d",
+                "sha256:778d0ec38bbd288b150a3ae363c8ffd88d2207a756842495e9bffd8a8afbc89a",
+                "sha256:8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24",
+                "sha256:83b4aa5344cce005a9cff5d0321b2e318e871cc1dfc793b66c32dd4f59e9770d",
+                "sha256:844fad925ac5c2ad4faaceb3b2520ad016b5280105c6e16e79838cf951903a7b",
+                "sha256:8ceb3667dd13b8133f2e4d637b5b00f240f066448e2aa89a41f4c2d78a26ce50",
+                "sha256:92dc0fb79675882d0b6138be4bf0cec7ea7c7eede60aaca78303d8e8dbdaa523",
+                "sha256:974f5957e66a7524ea81df7b2686a456bfaf0408dbb7353ddfbedb594eadfef6",
+                "sha256:9789bd945e9f5bd026ed3f5b453d640befb8b1fc33a779c1fe8d3eb21fe3fb4a",
+                "sha256:a2b6d6eb693bc2fc6c484f2e5d93bd0b0da803fa77bf974f160533e555e4d095",
+                "sha256:aab9f1e34d810feb00bf841993552b8fcc6ae71d473c505381627143d0018a6a",
+                "sha256:abb61afd84f23099ac6099d804cdba9bd3b902aaaded3ffff47e490b0a495520",
+                "sha256:adf9ee115ae8ff8b6da4b854b4152f253b390ba64407a22d75456fe07dcbda65",
+                "sha256:aedc6c672b351afe6dfe17ff83ee5e7eb6ed44718f879a9328a68bdb20b57e11",
+                "sha256:b7a00ecb1434f8183395fac5366a21ee73d14900082ca37cf74993cf46baa56c",
+                "sha256:ba32f4a91c1cb7314c429b03afbf87b1fff4fb1c8db32260e7310104bd77f0c7",
+                "sha256:cbd0f2cbd8689861209cd89141371d3a22a11613304d1f0736492590aa0ab332",
+                "sha256:e4bc372b953bf6cec65a8d48482ba574f6e051621d157cf224227dbb55486b1e",
+                "sha256:eccac3d9aadc68e994b6d228cb0c8919fc47a5350d85a1b4d3d81d1e98baf40c",
+                "sha256:efd550b3da28195746bb43bd1d815058181a7ca6d9d6aa89dd37f5eefe2cacb7",
+                "sha256:efef581c8ba4d990770875e1a2218e856849d32ada2680e53aebc5d154a17e20",
+                "sha256:f057897711a630a0b7a6a03f1acf379b6ba25d37dc5dc217a97191984ba7f2fc",
+                "sha256:f37d45fab14ffef9d33a0dc3bc59ce0c5313e2253323312d47739192da94f5fd",
+                "sha256:f44906f70205d456d503105023041f1e63aece7623b31c390a0103db4de17537"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==5.2.0"
         }
     },
     "develop": {
@@ -663,11 +1079,11 @@
         },
         "faker": {
             "hashes": [
-                "sha256:3f5d379e4b5ce92a8afe3c2ce59d7c43886370dd3bf9495a936b91888debfc81",
-                "sha256:8c0e8a06acef4b9312902e2ce18becabe62badd3a6632180bd0680c6ee111473"
+                "sha256:5398268e1d751ffdb3ed36b8a790ed98659200599b368eec38a02eed15bce997",
+                "sha256:d4183b8f57316de3be27cd6c3b40e9f9343d27c95c96179f027316c58c2c239e"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==4.17.0"
+            "version": "==4.17.1"
         },
         "filelock": {
             "hashes": [
@@ -999,11 +1415,11 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:b0011228208944ce71052987437d3843e05690b2f23d1c7da4263fde104c97a2",
-                "sha256:b8d6110f493af256a40d65e29846c69340a947669eec8ce784fcf3dd3af28380"
+                "sha256:6af42359fbb33a6c7eab4d3246524b96fd9d8e07e7141b7a65998f96e28b2c57",
+                "sha256:fd4147c5ba3f694e2e4fc3c767407dc2226899623bb9b49c2f15637c2ee335b3"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.1.0"
+            "version": "==20.2.0"
         }
     }
 }
diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 3ccb1c5f1..2a70af813 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -45,6 +45,7 @@ import { SavedViewWidgetComponent } from './components/dashboard/widgets/saved-v
 import { StatisticsWidgetComponent } from './components/dashboard/widgets/statistics-widget/statistics-widget.component';
 import { UploadFileWidgetComponent } from './components/dashboard/widgets/upload-file-widget/upload-file-widget.component';
 import { WidgetFrameComponent } from './components/dashboard/widgets/widget-frame/widget-frame.component';
+import { ConsumerStatusWidgetComponent } from './components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component';
 
 @NgModule({
   declarations: [
@@ -82,6 +83,7 @@ import { WidgetFrameComponent } from './components/dashboard/widgets/widget-fram
     SavedViewWidgetComponent,
     StatisticsWidgetComponent,
     UploadFileWidgetComponent,
+    ConsumerStatusWidgetComponent,
     WidgetFrameComponent
   ],
   imports: [
diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
index d6559e184..ff2117729 100644
--- a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
@@ -1,10 +1,10 @@
-<h4 class="mt-3">Document consumer status</h4>
-
-<div class="mb-2 border-bottom" *ngFor="let s of getStatus()">
-  <div class="mb-1"><strong>{{s.filename}}:</strong> {{s.message}}</div>
-  <ngb-progressbar [type]="getType(s.status)" [value]="s.current_progress" [max]="s.max_progress" class="mb-2"></ngb-progressbar>
-  <div *ngIf="isFinished(s)" class="mb-2">
-    <button *ngIf="s.document_id" class="btn btn-sm btn-outline-primary mr-2" routerLink="/documents/{{s.document_id}}" (click)="dismiss(s)">Open document</button>
-    <button class="btn btn-sm btn-outline-secondary" (click)="dismiss(s)">Dismiss</button>
+<app-widget-frame title="Document consumer status">
+  <div class="mb-2 border-bottom" *ngFor="let s of getStatus()">
+    <div class="mb-1"><strong>{{s.filename}}:</strong> {{s.message}}</div>
+    <ngb-progressbar [type]="getType(s.status)" [value]="s.current_progress" [max]="s.max_progress" class="mb-2"></ngb-progressbar>
+    <div *ngIf="isFinished(s)" class="mb-2">
+      <button *ngIf="s.document_id" class="btn btn-sm btn-outline-primary mr-2" routerLink="/documents/{{s.document_id}}" (click)="dismiss(s)">Open document</button>
+      <button class="btn btn-sm btn-outline-secondary" (click)="dismiss(s)">Dismiss</button>
+    </div>
   </div>
-</div>
\ No newline at end of file
+</app-widget-frame>
diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.css b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.scss
similarity index 100%
rename from src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.css
rename to src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.scss
diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.ts
index 0c4e35682..8e44af6d5 100644
--- a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.ts
@@ -4,7 +4,7 @@ import { ConsumerStatusService, FileStatus } from 'src/app/services/consumer-sta
 @Component({
   selector: 'app-consumer-status-widget',
   templateUrl: './consumer-status-widget.component.html',
-  styleUrls: ['./consumer-status-widget.component.css']
+  styleUrls: ['./consumer-status-widget.component.scss']
 })
 export class ConsumerStatusWidgetComponent implements OnInit {
 
diff --git a/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.css b/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.html b/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.html
deleted file mode 100644
index 0c5ea634a..000000000
--- a/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<h4>Upload new Document</h4>
-<form>
-  <ngx-file-drop
-    dropZoneLabel="Drop documents here"
-    (onFileDrop)="dropped($event)"
-    (onFileOver)="fileOver($event)"
-    (onFileLeave)="fileLeave($event)"
-    dropZoneClassName="bg-light mt-4 card">
-
-  </ngx-file-drop>
-</form>
\ No newline at end of file
diff --git a/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.spec.ts
deleted file mode 100644
index 847f5288b..000000000
--- a/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FileUploadWidgetComponent } from './file-upload-widget.component';
-
-describe('FileUploadWidgetComponent', () => {
-  let component: FileUploadWidgetComponent;
-  let fixture: ComponentFixture<FileUploadWidgetComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ FileUploadWidgetComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FileUploadWidgetComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.ts
deleted file mode 100644
index 5d4bac936..000000000
--- a/src-ui/src/app/components/dashboard/widgets/file-upload-widget/file-upload-widget.component.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop';
-import { DocumentService } from 'src/app/services/rest/document.service';
-import { ToastService } from 'src/app/services/toast.service';
-
-@Component({
-  selector: 'app-file-upload-widget',
-  templateUrl: './file-upload-widget.component.html',
-  styleUrls: ['./file-upload-widget.component.css']
-})
-export class FileUploadWidgetComponent implements OnInit {
-
-  constructor(private documentService: DocumentService, private toastService: ToastService) { }
-
-  ngOnInit(): void {
-  }
-
-  public fileOver(event){
-    console.log(event);
-  }
- 
-  public fileLeave(event){
-    console.log(event);
-  }
- 
-  public dropped(files: NgxFileDropEntry[]) {
-    for (const droppedFile of files) {
-      if (droppedFile.fileEntry.isFile) {
-        const fileEntry = droppedFile.fileEntry as FileSystemFileEntry;
-        console.log(fileEntry)
-        fileEntry.file((file: File) => {
-          console.log(file)
-          const formData = new FormData()
-          formData.append('document', file, file.name)
-          this.documentService.uploadDocument(formData).subscribe(result => {
-            this.toastService.showInfo("The document has been uploaded and will be processed by the consumer shortly.")
-          }, error => {
-            this.toastService.showError("An error has occured while uploading the document. Sorry!")
-          })
-        });
-      }
-    }
-  }
-}
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index a95d5f4db..cb13b2d74 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -33,9 +33,9 @@ export class UploadFileWidgetComponent implements OnInit {
           const formData = new FormData()
           formData.append('document', file, file.name)
           this.documentService.uploadDocument(formData).subscribe(result => {
-            this.toastService.showToast(Toast.make("Information", "The document has been uploaded and will be processed by the consumer shortly."))
+            this.toastService.showInfo("The document has been uploaded and will be processed by the consumer shortly.")
           }, error => {
-            this.toastService.showToast(Toast.makeError("An error has occured while uploading the document. Sorry!"))
+            this.toastService.showError("An error has occured while uploading the document. Sorry!")
           })
         });
       }

From 32186e0de1328e8213edb265c3e1f98b06a6c019 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 29 Nov 2020 16:33:33 +0100
Subject: [PATCH 0010/1300] added a menu for bulk edits.

---
 .../document-list.component.html              | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index cc682b8e3..d142fbb04 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -1,5 +1,31 @@
 <app-page-header [title]="getTitle()">
 
+  <div ngbDropdown class="d-inline-block mr-2">
+    <button class="btn btn-sm btn-outline-primary" id="dropdownBasic1" ngbDropdownToggle>
+      <svg class="toolbaricon" fill="currentColor">
+        <use xlink:href="assets/bootstrap-icons.svg#text-indent-left" />
+      </svg>
+      Bulk edit
+    </button>
+    <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
+      <button ngbDropdownItem>Select page</button>
+      <button ngbDropdownItem>Select all</button>
+      <button ngbDropdownItem>Select none</button>
+      <div class="dropdown-divider"></div>
+      <button ngbDropdownItem>Re-create archived document</button>
+      <div class="dropdown-divider"></div>
+      <button ngbDropdownItem>Set correspondent</button>
+      <button ngbDropdownItem>Remove correspondent</button>
+      <button ngbDropdownItem>Set document type</button>
+      <button ngbDropdownItem>Remove document type</button>
+      <button ngbDropdownItem>Add tag</button>
+      <button ngbDropdownItem>Remove tag</button>
+      <div class="dropdown-divider"></div>
+      <button ngbDropdownItem>Delete</button>
+
+    </div>
+  </div>
+
   <div class="btn-group btn-group-toggle" ngbRadioGroup [(ngModel)]="displayMode"
     (ngModelChange)="saveDisplayMode()">
     <label ngbButtonLabel class="btn-outline-primary btn-sm">

From fd4c9a1758b550218ba7fd62f762cc7313c69923 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 29 Nov 2020 23:00:52 +0100
Subject: [PATCH 0011/1300] not sure if this works

---
 src/documents/forms.py | 12 ++++++++++++
 src/documents/views.py | 11 +++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/documents/forms.py b/src/documents/forms.py
index 63dd307b2..0c73c3810 100644
--- a/src/documents/forms.py
+++ b/src/documents/forms.py
@@ -1,4 +1,5 @@
 import os
+import re
 import tempfile
 from datetime import datetime
 from time import mktime
@@ -11,6 +12,17 @@ from pathvalidate import validate_filename, ValidationError
 
 from documents.parsers import is_mime_type_supported
 
+class BuldEditForm(forms.Form):
+
+    def clean_ids(self):
+        ids = self.cleaned_data.get("ids")
+        if not re.match(r"[0-9,]+", ids):
+            raise forms.ValidationError("id list invalid")
+        id_list = [int(id) for id in ids.split(",")]
+
+
+
+
 
 class UploadForm(forms.Form):
 
diff --git a/src/documents/views.py b/src/documents/views.py
index 84f4a3999..ee45af267 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -93,6 +93,10 @@ class DocumentTypeViewSet(ModelViewSet):
     ordering_fields = ("name", "matching_algorithm", "match", "document_count")
 
 
+class BulkEditForm(object):
+    pass
+
+
 class DocumentViewSet(RetrieveModelMixin,
                       UpdateModelMixin,
                       DestroyModelMixin,
@@ -149,6 +153,13 @@ class DocumentViewSet(RetrieveModelMixin,
         else:
             return HttpResponseBadRequest(str(form.errors))
 
+    @action(methods=['post'], detail=False)
+    def bulk_edit(self, request, pk=None):
+        form = BulkEditForm(data=request.POST)
+        if not form.is_valid():
+            return HttpResponseBadRequest("")
+        return Response({'asd': request.POST['content']})
+
     @action(methods=['get'], detail=True)
     def metadata(self, request, pk=None):
         try:

From 35124023f0a207a6b127210b8661688325aa541e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 30 Nov 2020 13:58:40 +0100
Subject: [PATCH 0012/1300] basic support for bulk editing.

---
 .../src/app/services/rest/document.service.ts |  8 ++++
 src/documents/bulk_edit.py                    | 39 +++++++++++++++++++
 src/documents/forms.py                        | 12 ------
 src/documents/views.py                        |  9 +++--
 4 files changed, 52 insertions(+), 16 deletions(-)
 create mode 100644 src/documents/bulk_edit.py

diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index cdea89914..07e69c87a 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -66,4 +66,12 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     return this.http.post(this.getResourceUrl(null, 'post_document'), formData)
   }
 
+  bulk_edit(ids: number[], method: string, args: any[]) {
+    return this.http.post(this.getResourceUrl(null, 'bulk_edit'), {
+      'ids': ids,
+      'method': method,
+      'args': args
+    })
+  }
+
 }
diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
new file mode 100644
index 000000000..ef5d3f509
--- /dev/null
+++ b/src/documents/bulk_edit.py
@@ -0,0 +1,39 @@
+from documents.models import Document
+
+
+methods_supported = [
+    "set_correspondent"
+]
+
+
+def validate_data(data):
+    if 'ids' not in data or not isinstance(data['ids'], list):
+        raise ValueError()
+    ids = data['ids']
+    if not all([isinstance(i, int) for i in ids]):
+        raise ValueError()
+    count = Document.objects.filter(pk__in=ids).count()
+    if not count == len(ids):
+        raise Document.DoesNotExist()
+
+    if 'method' not in data or not isinstance(data['method'], str):
+        raise ValueError()
+    method = data['method']
+    if method not in methods_supported:
+        raise ValueError()
+
+    if 'args' not in data or not isinstance(data['args'], list):
+        raise ValueError()
+    parameters = data['args']
+
+    return ids, method, parameters
+
+
+def perform_bulk_edit(data):
+    ids, method, args = validate_data(data)
+
+    getattr(__file__, method)(ids, args)
+
+
+def set_correspondent(ids, args):
+    print("WOW")
diff --git a/src/documents/forms.py b/src/documents/forms.py
index 0c73c3810..63dd307b2 100644
--- a/src/documents/forms.py
+++ b/src/documents/forms.py
@@ -1,5 +1,4 @@
 import os
-import re
 import tempfile
 from datetime import datetime
 from time import mktime
@@ -12,17 +11,6 @@ from pathvalidate import validate_filename, ValidationError
 
 from documents.parsers import is_mime_type_supported
 
-class BuldEditForm(forms.Form):
-
-    def clean_ids(self):
-        ids = self.cleaned_data.get("ids")
-        if not re.match(r"[0-9,]+", ids):
-            raise forms.ValidationError("id list invalid")
-        id_list = [int(id) for id in ids.split(",")]
-
-
-
-
 
 class UploadForm(forms.Form):
 
diff --git a/src/documents/views.py b/src/documents/views.py
index ee45af267..95448ad62 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -23,6 +23,7 @@ from rest_framework.viewsets import (
 import documents.index as index
 from paperless.db import GnuPG
 from paperless.views import StandardPagination
+from .bulk_edit import perform_bulk_edit
 from .filters import (
     CorrespondentFilterSet,
     DocumentFilterSet,
@@ -155,10 +156,10 @@ class DocumentViewSet(RetrieveModelMixin,
 
     @action(methods=['post'], detail=False)
     def bulk_edit(self, request, pk=None):
-        form = BulkEditForm(data=request.POST)
-        if not form.is_valid():
-            return HttpResponseBadRequest("")
-        return Response({'asd': request.POST['content']})
+        try:
+            return Response(perform_bulk_edit(request.data))
+        except Exception as e:
+            return HttpResponseBadRequest(str(e))
 
     @action(methods=['get'], detail=True)
     def metadata(self, request, pk=None):

From 802e3891981c567f397966e6214130d5f094c7dc Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 3 Dec 2020 01:24:57 +0100
Subject: [PATCH 0013/1300] document count

---
 .../components/document-list/document-list.component.html    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index cc682b8e3..26a323276 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -74,7 +74,8 @@
   </div>
 </div>
 
-<div class="row m-0 justify-content-end">
+<div class="d-flex justify-content-between align-items-center">
+  <p>{{list.collectionSize || 0}} document(s)</p>
   <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
   [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
 </div>
@@ -126,5 +127,3 @@
 <div class=" m-n2 row" *ngIf="displayMode == 'smallCards'">
   <app-document-card-small [document]="d" *ngFor="let d of list.documents" (clickTag)="filterByTag($event)" (clickCorrespondent)="filterByCorrespondent($event)"></app-document-card-small>    
 </div>
-
-<p *ngIf="list.documents.length == 0" class="mx-auto">No results</p>

From 20fc065567b321abc6b57ea69128d1a0a4efcc44 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 3 Dec 2020 15:02:27 +0100
Subject: [PATCH 0014/1300] hide the filter when it's cleared.

---
 .../components/document-list/document-list.component.html    | 2 +-
 .../app/components/document-list/document-list.component.ts  | 5 +++++
 .../app/components/filter-editor/filter-editor.component.ts  | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 26a323276..48387b3e3 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -70,7 +70,7 @@
 <div class="card w-100 mb-3" [hidden]="!showFilter">
   <div class="card-body">
     <h5 class="card-title">Filter</h5>
-    <app-filter-editor [(filterRules)]="filterRules" (apply)="applyFilterRules()"></app-filter-editor>
+    <app-filter-editor [(filterRules)]="filterRules" (apply)="applyFilterRules()" (clear)="clearFilterRules()"></app-filter-editor>
   </div>
 </div>
 
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 3942fcd0c..84f4bc09e 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -66,6 +66,11 @@ export class DocumentListComponent implements OnInit {
     this.list.filterRules = this.filterRules
   }
 
+  clearFilterRules() {
+    this.list.filterRules = this.filterRules
+    this.showFilter = false
+  }
+
   loadViewConfig(config: SavedViewConfig) {
     this.filterRules = cloneFilterRules(config.filterRules)
     this.list.load(config)
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index 9a104c465..2eeac7dcd 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -18,6 +18,9 @@ export class FilterEditorComponent implements OnInit {
 
   constructor(private documentTypeService: DocumentTypeService, private tagService: TagService, private correspondentService: CorrespondentService) { }
 
+  @Output()
+  clear = new EventEmitter()
+
   @Input()
   filterRules: FilterRule[] = []
 
@@ -48,7 +51,7 @@ export class FilterEditorComponent implements OnInit {
 
   clearClicked() {
     this.filterRules.splice(0,this.filterRules.length)
-    this.apply.next()
+    this.clear.next()
   }
 
   ngOnInit(): void {

From 8b16cd99dc9dd259a73f28cdfe3a141107c2d2f7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 3 Dec 2020 18:36:23 +0100
Subject: [PATCH 0015/1300] updated the API, it now supports tags,
 correspondents, types and title when uploading documents.

---
 docs/api.rst                    | 63 ++++++++++++++++++++--
 src/documents/forms.py          | 59 ---------------------
 src/documents/serialisers.py    | 85 +++++++++++++++++++++++++++++
 src/documents/tests/test_api.py | 94 +++++++++++++++++++++++++++++++--
 src/documents/views.py          | 70 +++++++++++++++++++-----
 src/paperless/settings.py       |  4 +-
 src/paperless/urls.py           |  9 +++-
 7 files changed, 302 insertions(+), 82 deletions(-)
 delete mode 100644 src/documents/forms.py

diff --git a/docs/api.rst b/docs/api.rst
index 4f41832de..523ca1b45 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -38,6 +38,50 @@ individual documents:
     are in place. However, if you use these old URLs to access documents, you
     should update your app or script to use the new URLs.
 
+.. note::
+
+    The document endpoint provides tags, document types and correspondents as
+    ids in their corresponding fields. These are writeable. Paperless also
+    offers read-only objects for assigned tags, types and correspondents,
+    however, these might be removed in the future. As for now, the front end
+    requires them.
+
+Authorization
+#############
+
+The REST api provides three different forms of authentication.
+
+1.  Basic authentication
+
+    Authorize by providing a HTTP header in the form
+    
+    .. code::
+
+        Authorization: Basic <credentials>
+    
+    where ``credentials`` is a base64-encoded string of ``<username>:<password>``
+
+2.  Session authentication
+
+    When you're logged into paperless in your browser, you're automatically
+    logged into the API as well and don't need to provide any authorization
+    headers.
+
+3.  Token authentication
+
+    Paperless also offers an endpoint to acquire authentication tokens.
+
+    POST a username and password as a form or json string to ``/api/token/``
+    and paperless will respond with a token, if the login data is correct.
+    This token can be used to authenticate other requests with the
+    following HTTP header:
+
+    .. code::
+
+        Authorization: Token <token>
+    
+    Tokens can be managed and revoked in the paperless admin.
+
 Searching for documents
 #######################
 
@@ -166,8 +210,19 @@ The API provides a special endpoint for file uploads:
 
 POST a multipart form to this endpoint, where the form field ``document`` contains
 the document that you want to upload to paperless. The filename is sanitized and
-then used to store the document in the consumption folder, where the consumer will
-detect the document and process it as any other document.
+then used to store the document in a temporary directory, and the consumer will
+be instructed to consume the document from there.
 
-The endpoint will immediately return "OK." if the document was stored in the
-consumption directory.
+The endpoint supports the following optional form fields:
+
+*   ``title``: Specify a title that the consumer should use for the document.
+*   ``correspondent``: Specify a correspondent that the consumer should use for the document.
+    Case sensitive. If the specified correspondent does not exist, it will be created with this
+    name and default settings.
+*   ``document_type``: Similar to correspondent.
+*   ``tags``: Similar to correspondent. Specify this multiple times to have multiple tags added
+    to the document.
+
+The endpoint will immediately return "OK" if the document consumption process
+was started successfully. No additional status information about the consumption
+process itself is available, since that happens in a different process.
diff --git a/src/documents/forms.py b/src/documents/forms.py
deleted file mode 100644
index 63dd307b2..000000000
--- a/src/documents/forms.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import os
-import tempfile
-from datetime import datetime
-from time import mktime
-
-import magic
-from django import forms
-from django.conf import settings
-from django_q.tasks import async_task
-from pathvalidate import validate_filename, ValidationError
-
-from documents.parsers import is_mime_type_supported
-
-
-class UploadForm(forms.Form):
-
-    document = forms.FileField()
-
-    def clean_document(self):
-        document_name = self.cleaned_data.get("document").name
-
-        try:
-            validate_filename(document_name)
-        except ValidationError:
-            raise forms.ValidationError("That filename is suspicious.")
-
-        document_data = self.cleaned_data.get("document").read()
-
-        mime_type = magic.from_buffer(document_data, mime=True)
-
-        if not is_mime_type_supported(mime_type):
-            raise forms.ValidationError("This mime type is not supported.")
-
-        return document_name, document_data
-
-    def save(self):
-        """
-        Since the consumer already does a lot of work, it's easier just to save
-        to-be-consumed files to the consumption directory rather than have the
-        form do that as well.  Think of it as a poor-man's queue server.
-        """
-
-        original_filename, data = self.cleaned_data.get("document")
-
-        t = int(mktime(datetime.now().timetuple()))
-
-        os.makedirs(settings.SCRATCH_DIR, exist_ok=True)
-
-        with tempfile.NamedTemporaryFile(prefix="paperless-upload-",
-                                         dir=settings.SCRATCH_DIR,
-                                         delete=False) as f:
-
-            f.write(data)
-            os.utime(f.name, times=(t, t))
-
-            async_task("documents.tasks.consume_file",
-                       f.name,
-                       override_filename=original_filename,
-                       task_name=os.path.basename(original_filename)[:100])
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index c86aa8c83..14102df5c 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -1,6 +1,9 @@
+import magic
+from pathvalidate import validate_filename, ValidationError
 from rest_framework import serializers
 
 from .models import Correspondent, Tag, Document, Log, DocumentType
+from .parsers import is_mime_type_supported
 
 
 class CorrespondentSerializer(serializers.HyperlinkedModelSerializer):
@@ -113,3 +116,85 @@ class LogSerializer(serializers.ModelSerializer):
             "group",
             "level"
         )
+
+
+class PostDocumentSerializer(serializers.Serializer):
+
+    document = serializers.FileField(
+        label="Document",
+        write_only=True,
+    )
+
+    title = serializers.CharField(
+        label="Title",
+        write_only=True,
+        required=False,
+    )
+
+    correspondent = serializers.CharField(
+        label="Correspondent",
+        write_only=True,
+        required=False,
+    )
+
+    document_type = serializers.CharField(
+        label="Document type",
+        write_only=True,
+        required=False,
+    )
+
+    tags = serializers.ListField(
+        child=serializers.CharField(),
+        label="Tags",
+        source="tag",
+        write_only=True,
+        required=False,
+    )
+
+    def validate(self, attrs):
+        document = attrs.get('document')
+
+        try:
+            validate_filename(document.name)
+        except ValidationError:
+            raise serializers.ValidationError("Invalid filename.")
+
+        document_data = document.file.read()
+        mime_type = magic.from_buffer(document_data, mime=True)
+
+        if not is_mime_type_supported(mime_type):
+            raise serializers.ValidationError(
+                "This mime type is not supported.")
+
+        attrs['document_data'] = document_data
+
+        title = attrs.get('title')
+
+        if not title:
+            attrs['title'] = None
+
+        correspondent = attrs.get('correspondent')
+        if correspondent:
+            c, _ = Correspondent.objects.get_or_create(name=correspondent)
+            attrs['correspondent_id'] = c.id
+        else:
+            attrs['correspondent_id'] = None
+
+        document_type = attrs.get('document_type')
+        if document_type:
+            dt, _ = DocumentType.objects.get_or_create(name=document_type)
+            attrs['document_type_id'] = dt.id
+        else:
+            attrs['document_type_id'] = None
+
+        tags = attrs.get('tag')
+        if tags:
+            tag_ids = []
+            for tag in tags:
+                tag, _ = Tag.objects.get_or_create(name=tag)
+                tag_ids.append(tag.id)
+            attrs['tag_ids'] = tag_ids
+        else:
+            attrs['tag_ids'] = None
+
+        return attrs
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 01eb17b49..e2e1b254e 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -358,7 +358,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.data['documents_total'], 3)
         self.assertEqual(response.data['documents_inbox'], 1)
 
-    @mock.patch("documents.forms.async_task")
+    @mock.patch("documents.views.async_task")
     def test_upload(self, m):
 
         with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
@@ -370,8 +370,12 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
 
         args, kwargs = m.call_args
         self.assertEqual(kwargs['override_filename'], "simple.pdf")
+        self.assertIsNone(kwargs['override_title'])
+        self.assertIsNone(kwargs['override_correspondent_id'])
+        self.assertIsNone(kwargs['override_document_type_id'])
+        self.assertIsNone(kwargs['override_tag_ids'])
 
-    @mock.patch("documents.forms.async_task")
+    @mock.patch("documents.views.async_task")
     def test_upload_invalid_form(self, m):
 
         with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
@@ -379,7 +383,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 400)
         m.assert_not_called()
 
-    @mock.patch("documents.forms.async_task")
+    @mock.patch("documents.views.async_task")
     def test_upload_invalid_file(self, m):
 
         with open(os.path.join(os.path.dirname(__file__), "samples", "simple.zip"), "rb") as f:
@@ -387,8 +391,8 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 400)
         m.assert_not_called()
 
-    @mock.patch("documents.forms.async_task")
-    @mock.patch("documents.forms.validate_filename")
+    @mock.patch("documents.views.async_task")
+    @mock.patch("documents.serialisers.validate_filename")
     def test_upload_invalid_filename(self, validate_filename, async_task):
         validate_filename.side_effect = ValidationError()
         with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
@@ -396,3 +400,83 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 400)
 
         async_task.assert_not_called()
+
+    @mock.patch("documents.views.async_task")
+    def test_upload_with_title(self, async_task):
+        with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
+            response = self.client.post("/api/documents/post_document/", {"document": f, "title": "my custom title"})
+        self.assertEqual(response.status_code, 200)
+
+        async_task.assert_called_once()
+
+        args, kwargs = async_task.call_args
+
+        self.assertEqual(kwargs['override_title'], "my custom title")
+
+    @mock.patch("documents.views.async_task")
+    def test_upload_with_correspondent(self, async_task):
+        c = Correspondent.objects.create(name="test-corres")
+        with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
+            response = self.client.post("/api/documents/post_document/", {"document": f, "correspondent": "test-corres"})
+        self.assertEqual(response.status_code, 200)
+
+        async_task.assert_called_once()
+
+        args, kwargs = async_task.call_args
+
+        self.assertEqual(kwargs['override_correspondent_id'], c.id)
+
+    @mock.patch("documents.views.async_task")
+    def test_upload_with_new_correspondent(self, async_task):
+        with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
+            response = self.client.post("/api/documents/post_document/", {"document": f, "correspondent": "test-corres2"})
+        self.assertEqual(response.status_code, 200)
+
+        async_task.assert_called_once()
+
+        args, kwargs = async_task.call_args
+
+        c = Correspondent.objects.get(name="test-corres2")
+        self.assertEqual(kwargs['override_correspondent_id'], c.id)
+
+    @mock.patch("documents.views.async_task")
+    def test_upload_with_document_type(self, async_task):
+        dt = DocumentType.objects.create(name="invoice")
+        with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
+            response = self.client.post("/api/documents/post_document/", {"document": f, "document_type": "invoice"})
+        self.assertEqual(response.status_code, 200)
+
+        async_task.assert_called_once()
+
+        args, kwargs = async_task.call_args
+
+        self.assertEqual(kwargs['override_document_type_id'], dt.id)
+
+    @mock.patch("documents.views.async_task")
+    def test_upload_with_new_document_type(self, async_task):
+        with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
+            response = self.client.post("/api/documents/post_document/", {"document": f, "document_type": "invoice2"})
+        self.assertEqual(response.status_code, 200)
+
+        async_task.assert_called_once()
+
+        args, kwargs = async_task.call_args
+
+        dt = DocumentType.objects.get(name="invoice2")
+        self.assertEqual(kwargs['override_document_type_id'], dt.id)
+
+    @mock.patch("documents.views.async_task")
+    def test_upload_with_tags(self, async_task):
+        t1 = Tag.objects.create(name="tag1")
+        with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
+            response = self.client.post(
+                "/api/documents/post_document/",
+                {"document": f, "tags": ["tag1", "tag2"]})
+        self.assertEqual(response.status_code, 200)
+
+        async_task.assert_called_once()
+
+        args, kwargs = async_task.call_args
+
+        t2 = Tag.objects.get(name="tag2")
+        self.assertCountEqual(kwargs['override_tag_ids'], [t1.id, t2.id])
diff --git a/src/documents/views.py b/src/documents/views.py
index 922854f57..adef757ef 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -1,10 +1,16 @@
 import os
+import tempfile
+from datetime import datetime
+from time import mktime
 
+from django.conf import settings
 from django.db.models import Count, Max
 from django.http import HttpResponse, HttpResponseBadRequest, Http404
 from django.views.decorators.cache import cache_control
 from django.views.generic import TemplateView
 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.filters import OrderingFilter, SearchFilter
 from rest_framework.mixins import (
@@ -32,14 +38,14 @@ from .filters import (
     DocumentTypeFilterSet,
     LogFilterSet
 )
-from .forms import UploadForm
 from .models import Correspondent, Document, Log, Tag, DocumentType
 from .serialisers import (
     CorrespondentSerializer,
     DocumentSerializer,
     LogSerializer,
     TagSerializer,
-    DocumentTypeSerializer
+    DocumentTypeSerializer,
+    PostDocumentSerializer
 )
 
 
@@ -154,16 +160,6 @@ class DocumentViewSet(RetrieveModelMixin,
             disposition, filename)
         return response
 
-    @action(methods=['post'], detail=False)
-    def post_document(self, request, pk=None):
-        # TODO: is this a good implementation?
-        form = UploadForm(data=request.POST, files=request.FILES)
-        if form.is_valid():
-            form.save()
-            return Response("OK")
-        else:
-            return HttpResponseBadRequest(str(form.errors))
-
     @action(methods=['get'], detail=True)
     def metadata(self, request, pk=None):
         try:
@@ -217,6 +213,56 @@ class LogViewSet(ReadOnlyModelViewSet):
     ordering_fields = ("created",)
 
 
+class PostDocumentView(APIView):
+
+    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)
+        serializer.is_valid(raise_exception=True)
+
+        document = serializer.validated_data['document']
+        document_data = serializer.validated_data['document_data']
+        correspondent_id = serializer.validated_data['correspondent_id']
+        document_type_id = serializer.validated_data['document_type_id']
+        tag_ids = serializer.validated_data['tag_ids']
+        title = serializer.validated_data['title']
+
+        t = int(mktime(datetime.now().timetuple()))
+
+        os.makedirs(settings.SCRATCH_DIR, exist_ok=True)
+
+        with tempfile.NamedTemporaryFile(prefix="paperless-upload-",
+                                         dir=settings.SCRATCH_DIR,
+                                         delete=False) as f:
+            f.write(document_data)
+            os.utime(f.name, times=(t, t))
+
+            async_task("documents.tasks.consume_file",
+                       f.name,
+                       override_filename=document.name,
+                       override_title=title,
+                       override_correspondent_id=correspondent_id,
+                       override_document_type_id=document_type_id,
+                       override_tag_ids=tag_ids,
+                       task_name=os.path.basename(document.name)[:100])
+        return Response("OK")
+
+
 class SearchView(APIView):
 
     permission_classes = (IsAuthenticated,)
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 410b8454a..88915c7c5 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -86,6 +86,7 @@ INSTALLED_APPS = [
     "django.contrib.admin",
 
     "rest_framework",
+    "rest_framework.authtoken",
     "django_filters",
 
     "django_q",
@@ -95,7 +96,8 @@ INSTALLED_APPS = [
 REST_FRAMEWORK = {
     'DEFAULT_AUTHENTICATION_CLASSES': [
         'rest_framework.authentication.BasicAuthentication',
-        'rest_framework.authentication.SessionAuthentication'
+        'rest_framework.authentication.SessionAuthentication',
+        'rest_framework.authentication.TokenAuthentication'
     ]
 }
 
diff --git a/src/paperless/urls.py b/src/paperless/urls.py
index dd5e6a379..9b390b139 100755
--- a/src/paperless/urls.py
+++ b/src/paperless/urls.py
@@ -4,6 +4,7 @@ from django.contrib.auth.decorators import login_required
 from django.urls import path, re_path
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import RedirectView
+from rest_framework.authtoken import views
 from rest_framework.routers import DefaultRouter
 
 from documents.views import (
@@ -15,7 +16,8 @@ from documents.views import (
     SearchView,
     IndexView,
     SearchAutoCompleteView,
-    StatisticsView
+    StatisticsView,
+    PostDocumentView
 )
 from paperless.views import FaviconView
 
@@ -45,6 +47,11 @@ urlpatterns = [
                 StatisticsView.as_view(),
                 name="statistics"),
 
+        re_path(r"^documents/post_document/", PostDocumentView.as_view(),
+                name="post_document"),
+
+        path('token/', views.obtain_auth_token)
+
     ] + api_router.urls)),
 
     re_path(r"^favicon.ico$", FaviconView.as_view(), name="favicon"),

From 1b5b07a02023177f2f49b3f5d89410c2dc5c07a3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 3 Dec 2020 18:37:25 +0100
Subject: [PATCH 0016/1300] bugfix

---
 src-ui/src/app/components/app-frame/app-frame.component.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts
index c1f5e9479..34e804db4 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.ts
+++ b/src-ui/src/app/components/app-frame/app-frame.component.ts
@@ -90,7 +90,9 @@ export class AppFrameComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy() {
-    this.openDocumentsSubscription.unsubscribe()
+    if (this.openDocumentsSubscription) {
+      this.openDocumentsSubscription.unsubscribe()
+    }
   }
 
 }

From c02813623d4a084f1a5ab8f92b4c23b56caaafbd Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 3 Dec 2020 18:37:58 +0100
Subject: [PATCH 0017/1300] layout changes

---
 src-ui/src/app/components/dashboard/dashboard.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index c24d633a9..3e6438181 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -3,7 +3,7 @@
 </app-page-header>
 
 <div class='row'>
-  <div class="col-lg">
+  <div class="col-lg-8">
     <app-widget-frame title="Saved views" *ngIf="savedViews.length == 0">
       <p class="card-text">This space is reserved to display your saved views. Go to your documents and save a view
         to have it displayed
@@ -15,7 +15,7 @@
     </ng-container>
 
   </div>
-  <div class="col-lg">
+  <div class="col-lg-4">
 
     <app-statistics-widget></app-statistics-widget>
 

From 2a9e6f7a584d34fab933cbfba605d194303f979e Mon Sep 17 00:00:00 2001
From: jonaswinkler <dev@jpwinkler.de>
Date: Thu, 3 Dec 2020 18:59:43 +0100
Subject: [PATCH 0018/1300] Update README.md

---
 README.md | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 5c1953469..36c365f17 100644
--- a/README.md
+++ b/README.md
@@ -25,23 +25,26 @@ Here's what you get:
 
 ![Dashboard](https://github.com/jonaswinkler/paperless-ng/raw/master/docs/_static/screenshots/dashboard.png)
 
-# Why Paperless-ng?
+# Features
 
-I wanted to make big changes to the project that will impact the way it is used by its users greatly. Among the users who currently use paperless in production there are probably many that don't want these changes right away. I also wanted to have more control over what goes into the code and what does not. Therefore, paperless-ng was created. NG stands for both Angular (the framework used for the Frontend) and next-gen. Publishing this project under a different name also avoids confusion between paperless and paperless-ng.
-
-The gist of the changes is the following:
-
-* New front end. This will eventually be mobile friendly as well.
-* New full text search.
-* New email processing.
+* Performs OCR on your documents, adds selectable text to image only documents and adds tags, correspondents and document types to your documents.
+* Single page application front end. Should be pretty snappy. Will be mobile friendly in the future.
+	* Includes a dashboard that shows basic statistics and has document upload.
+	* Filtering by tags, correspondents, types, and more.
+	* Customizable views can be saved and displayed on the dashboard.
+	* Full text search with auto completion, scored results and query highlighting allows you to quickly find what you need.
+* Email processing: Paperless adds documents from your email accounts.
+	* Configure multiple accounts and filters for each account.
+	* When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them or delete them.
 * Machine learning powered document matching.
-* A task processor that processes documents in parallel and also tells you when something goes wrong.
-* Code cleanup in many, MANY areas. Some of the code was just overly complicated.
+	* Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless.
+* A task processor that processes documents in parallel and also tells you when something goes wrong. On modern multi core systems, consumption is blazing fast.
+* Code cleanup in many, MANY areas. Some of the code from OG paperless was just overly complicated.
 * More tests, more stability.
 
 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).
 
-For a complete list of changes, check out the [changelog](https://paperless-ng.readthedocs.io/en/latest/changelog.html)
+For a complete list of changes from paperless, check out the [changelog](https://paperless-ng.readthedocs.io/en/latest/changelog.html)
 
 # Roadmap for 1.0
 
@@ -55,6 +58,8 @@ For a complete list of changes, check out the [changelog](https://paperless-ng.r
 - **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like:
   - Group and limit search results by correspondent, show “more from this” links in the results.
   - Ability to search for “Similar documents” in the search results
+- **Bulk editing**. Add/remove metadata from multiple documents at once.
+- **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system.
 - **An interactive consumer** that shows its progress for documents it processes on the web page.
 	- With live updates ans websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particular happy about.
 	- Notifications when a document was added with buttons to open the new document right away.
@@ -86,7 +91,7 @@ Please open an issue and start a discussion about it!
 
 ## Feel like helping out?
 
-There's still lots of things to be done, just have a look at that issue log. If you feel like conctributing 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.
+There's still lots of things to be done, just have a look at that issue log. 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.
 
@@ -94,7 +99,7 @@ If you want to implement something big: Please start a discussion about that in
 
 Paperless has been around a while now, and people are starting to build stuff on top of it.  If you're one of those people, we can add your project to this list:
 
-* [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless.
+* [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless. We're working on making this compatible.
 * [Paperless Desktop](https://github.com/thomasbrueggemann/paperless-desktop): A desktop UI for your Paperless installation.  Runs on Mac, Linux, and Windows.
 * [ansible-role-paperless](https://github.com/ovv/ansible-role-paperless): An easy way to get Paperless running via Ansible.
 * [paperless-cli](https://github.com/stgarf/paperless-cli): A golang command line binary to interact with a Paperless instance.

From c263d8e8f166478b8beb7c9d47159f4a18e22889 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 3 Dec 2020 19:02:46 +0100
Subject: [PATCH 0019/1300] docs

---
 docs/changelog.rst | 13 ++++++++++++-
 docs/faq.rst       |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5ded39699..9ccc7bd6a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -17,7 +17,7 @@ paperless-ng 0.9.5
   * Many of the configuration options regarding OCR have changed. See :ref:`configuration-ocr` for details.
   * Paperless no longer guesses the language of your documents. It always uses the language that you
     specified with ``PAPERLESS_OCR_LANGUAGE``. Be sure to set this to the language the majority of your
-    documents are in.
+    documents are in. Multiple languages can be specified, but that requires more CPU time.
   * The management command :ref:`document_archiver <utilities-archiver>` can be used to create archived versions for already
     existing documents.
 
@@ -27,6 +27,17 @@ paperless-ng 0.9.5
     based on the sub folders a document was found in. This can be configured with ``PAPERLESS_CONSUMER_RECURSIVE`` and
     ``PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS``.
 
+* API
+
+  * The API now offers token authentication.
+  * The endpoint for uploading documents now supports specifying custom titles, correspondents, tags and types.
+    This can be used by clients to override the default behavior of paperless.
+  * The document endpoint of API now serves document in this form:
+    * correspondents, document types and tags are referenced by their ID in the fields ``correspondent``, ``document_type`` and ``tags``. The ``*_id`` versions are gone. These fields are read/write.
+    * in addition to that, ``*_object`` fields serve nested objects. Read only. Don't rely on these, they will probably get removed once I figure out how to better handle asynchronous data in the front end.
+
+* Some minor improvements to the front end, such as document count in the document list, better visibility of the current view, and improvements to the filter behavior.
+
 * Fixes:
 
   * A bug with the generation of filenames for files with unsupported types caused the exporter and
diff --git a/docs/faq.rst b/docs/faq.rst
index 74e99c6c7..9a5e73ea5 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -49,7 +49,7 @@ out of that folder to use them elsewhere. Here are a couple notes about that.
 
 **A:** Currently, the following files are supported:
 
-*   PDF documents, PNG images and JPEG images are processed with OCR.
+*   PDF documents, PNG images, JPEG images, TIFF images and GIF images are processed with OCR and converted into PDF documents.
 *   Plain text documents are supported as well and are added verbatim
     to paperless.
 

From c4d13b5802671a03f0573c02457ceceffc53cfc2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 3 Dec 2020 19:55:42 +0100
Subject: [PATCH 0020/1300] improvements to the filter.

---
 .../app/components/document-list/document-list.component.ts | 5 ++---
 src-ui/src/app/services/document-list-view.service.ts       | 6 ++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 84f4bc09e..153b31d8c 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -53,11 +53,10 @@ export class DocumentListComponent implements OnInit {
         this.list.savedView = this.savedViewConfigService.getConfig(params.get('id'))
       } else {
         this.list.savedView = null
+        this.showFilter = this.filterRules.length > 0
       }
       this.filterRules = this.list.filterRules
-      this.showFilter = this.filterRules.length > 0
-      // prevents temporarily visible results from previous views
-      this.list.documents = []
+      this.list.clear()
       this.list.reload()
     })
   }
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 9c7e244f4..811ac3c4b 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -82,6 +82,12 @@ export class DocumentListViewService {
     this.reload()
   }
 
+  clear() {
+    this.collectionSize = null
+    this.documents = []
+    this.currentPage = 1
+  }
+
   reload(onFinish?) {
     this.isReloading = true
     this.documentService.list(

From 6d3e5b0a1b37e358f9be42b7a297878017f1f0c6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 3 Dec 2020 19:56:24 +0100
Subject: [PATCH 0021/1300] update dependencies.

---
 Pipfile.lock | 128 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 85 insertions(+), 43 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 8d111379f..71b6c0811 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -68,6 +68,7 @@
                 "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35",
                 "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26",
                 "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b",
+                "sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01",
                 "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb",
                 "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293",
                 "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd",
@@ -75,6 +76,7 @@
                 "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3",
                 "sha256:be8661bcee1bc2fc4b033a6ab65bd1f87ce5008492601695d0b9a4e820c3bde5",
                 "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d",
+                "sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e",
                 "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca",
                 "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d",
                 "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775",
@@ -234,6 +236,14 @@
             ],
             "version": "==0.4.0"
         },
+        "importlib-metadata": {
+            "hashes": [
+                "sha256:6112e21359ef8f344e7178aa5b72dc6e62b38b0d008e6d3cb212c5b84df72013",
+                "sha256:b0c2d3b226157ae4517d9625decf63591461c66b3a808c2666d538946519d170"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==3.1.1"
+        },
         "inotify-simple": {
             "hashes": [
                 "sha256:8440ffe49c4ae81a8df57c1ae1eb4b6bfa7acb830099bfb3e305b383005cc128",
@@ -620,50 +630,50 @@
         },
         "reportlab": {
             "hashes": [
-                "sha256:06be7f04a631f02cd0202f7dee0d3e61dc265223f4ff861525ed7784b5552540",
-                "sha256:0a788a537c48915eda083485b59ac40ac012fa7c43070069bde6eb5ea588313c",
-                "sha256:1a7a38810e79653d0ea8e61db4f0517ac2a0e76edd2497cf6d4969dd3be30030",
-                "sha256:22301773db730545b44d4c77d8f29baf5683ccabec9883d978e8b8eda6d2175f",
-                "sha256:2906321b3d2779faafe47e2c13f9c69e1fb4ddb907f5a49cab3f9b0ea95df1f5",
-                "sha256:2d65f9cc5c0d3f63b5d024e6cf92234f1ab1f267cc9e5a847ab5d3efe1c3cf3e",
-                "sha256:2e012f7b845ef9f1f5bd63461d5201fa624b019a65ff5a93d0002b4f915bbc89",
-                "sha256:31ccfdbf5bb5ec85f0397661085ce4c9e52537ca0d2bf4220259666a4dcc55c2",
-                "sha256:3e10bd20c8ada9f7e1113157aa73b8e0048f2624e74794b73799c3deb13d7a3f",
-                "sha256:440d5f86c2b822abdb7981d691a78bdcf56f4710174830283034235ab2af2969",
-                "sha256:4f307accda32c9f17015ed77c7424f904514e349dff063f78d2462d715963e53",
-                "sha256:59659ee8897950fd1acd41a9cc61f4afdfda52dc2bb69a1924ce68089491849d",
-                "sha256:6216b11313467989ac9d9578ea3756d0af46e97184ee4e11a6b7ef652458f70d",
-                "sha256:6268a9a3d75e714b22beeb7687270956b06b232ccfdf37b1c6462961eab04457",
-                "sha256:6b226830f80df066d5986a3fdb3eb4d1b6320048f3d9ade539a6c03a5bc8b3ec",
-                "sha256:6e10eba6a0e330096f4200b18824b3194c399329b7830e34baee1c04ea07f99f",
-                "sha256:6e224c16c3d6fafdb2fb67b33c4b84d984ec34869834b3a137809f2fe5b84778",
-                "sha256:7da162fa677b90bd14f19b20ff80fec18c24a31ac44e5342ba49e198b13c4f92",
-                "sha256:8406e960a974a65b765c9ff74b269aa64718b4af1e8c511ebdbd9a5b44b0c7e6",
-                "sha256:8999bb075102d1b8ca4aada6ca14653d52bf02e37fd064e477eb180741f75077",
-                "sha256:8ae21aa94e405bf5171718f11ebc702a0edf18c91d88b14c5c5724cabd664673",
-                "sha256:8f6163729612e815b89649aed2e237505362a78014199f819fd92f9e5c96769b",
-                "sha256:9699fa8f0911ad56b46cc60bbaebe1557fd1c9e8da98185a7a1c0c40193eba48",
-                "sha256:9a53d76eec33abda11617aad1c9f5f4a2d906dd2f92a03a3f1ea370efbb52c95",
-                "sha256:9ed4d761b726ff411565eddb10cb37a6bca0ec873d9a18a83cf078f4502a2d94",
-                "sha256:a020d308e7c2de284d5407e3c6c13e3977a62b314f7bfe19bcc69677931da589",
-                "sha256:a2e6c15aecbe631245aab639751a58671312cced7e17de1ed9c45fb37036f6c9",
-                "sha256:b10cb48606d97b70edb094576e3d493d40467395e4fc267655135a2c92defbe8",
-                "sha256:b8d6e9df5181ed07b7ae145258eb69e686133afc97930af51a3c0c9d784d834d",
-                "sha256:bbb297754f5cf25eb8fcb817752984252a7feb0ca83e383718e4eec2fb67ea32",
-                "sha256:be90599e5e78c1ddfcfee8c752108def58b4c672ebcc4d3d9aa7fe65e7d3f16b",
-                "sha256:bfdfad9b8ae00bd0752b77f954c7405327fd99b2cc6d5e4273e65be61429d56a",
-                "sha256:c1e5ef5089e16b249388f65d8c8f8b74989e72eb8332060dc580a2ecb967cfc2",
-                "sha256:c5ed342e29a5fd7eeb0f2ccf7e5b946b5f750f05633b2d6a94b1c02094a77967",
-                "sha256:c7087a26b26aa82a3ba27e13e66f507cc697f9ceb4c046c0f758876b55f040a5",
-                "sha256:cf589e980d92b0bf343fa512b9d3ae9ed0469cbffd99cb270b6c83da143cb437",
-                "sha256:e6fb762e524a4fb118be9f44dbd9456cf80e42253ee8f1bdb0ea5c1f882d4ba8",
-                "sha256:e961d3a84c65ca030963ca934a4faad2ac9fee75af36ba2f98733da7d3f7efab",
-                "sha256:f2fde5abb6f21c1eff5430f380cdbbee7fdeda6af935a83730ddce9f0c4e504e",
-                "sha256:f585b3bf7062c228306acd7f40b2ad915b32603228c19bb225952cc98fd2015a",
-                "sha256:f955a6366cf8e6729776c96e281bede468acd74f6eb49a5bbb048646adaa43d8",
-                "sha256:fe882fd348d8429debbdac4518d6a42888a7f4ad613dc596ce94788169caeb08"
+                "sha256:0008b5baa39d7e3a8132c4b47ecae88d6858ad386518e754e5e7b8025ee4722b",
+                "sha256:0ad5a540c336941272fe161ef3a9830da3d4b3a65a195531cebd3cad5db58b2a",
+                "sha256:0c965a5691686d746f558ee1c52aa9c63a01a0e13cba61ffc661573948e32f61",
+                "sha256:0fd568fa5615ae99f76289c52ff230207852ee942d4934f6c893c93d2a79544e",
+                "sha256:1117d905a3404c696869c7aabec9454b43ed6acbbc73f9256c6fcea23e7ae93e",
+                "sha256:1ea7c388e91ad9d823655ad6a13751ff67e8a0e7cf4065cf051b4c931cdd9450",
+                "sha256:26c0ee8f62652cc7fcdc47a1cb3b34775a4d625738025c1a7edb8718bda5a315",
+                "sha256:368c5b3fc3d5a541cb9dcacefa563fdb445365f517e3cbf64b4326631d1cf13c",
+                "sha256:451d42fdcdd7d84587d6d9c8f5d9a7d0e997305efb606705063ca1fe8bcca551",
+                "sha256:47394acba4da8e56ef8e55d8eb483b868521696ba49ab0f0fcf8a1a4a5ac6e49",
+                "sha256:51b16e297f7b937fc530dd151e4b38f1d305b01c9aa10657bc32a5d2901b8ad7",
+                "sha256:51c0cdcf606ded0a7b4b50050400f25125ea797fbfc3c817135993b38f8b764e",
+                "sha256:55c672c579618843e0fd00140fb71f1ffebc4f1c542ac385c4f4999f2f5398d9",
+                "sha256:5c34a96ecfbf595caf16178a06abcd26a5f8720e01fe1285d4c97333382cfaeb",
+                "sha256:61aa89a00754b18c4f2956b8bff831f1fd3affef6476dc63462d92211941605e",
+                "sha256:62234d29c97279917903e4587faf240a5dea4617be250db55386ff268eb5a7c5",
+                "sha256:670f2a8dcc23bf798c39b95c64bf76ee387549b962f76783670821978a226663",
+                "sha256:69387f171f6c7b55109caa6d061b17a18f2f9e724a0212c07cd692aeb369dd19",
+                "sha256:6c5c8871b659f7c2975382d7b61f3c182701fa9eb62cf649c3c73ba8fc5e2595",
+                "sha256:80139ceb3a568f5be908094f1701fd05391b71425e8b69aaed0d30db647ca2aa",
+                "sha256:80661a76d0019b5e2c315ccd3bc7093d754067d6142b36a3a0ec4f416073d23b",
+                "sha256:85a2236f324ae336da7f4b183fa99bed261bcc00ac1255ee91a504e68b086d00",
+                "sha256:89a3acd98bd4478d6bbc5cb32e0665ea546c98bff8b58d5e1014659daa6ef75a",
+                "sha256:8a39119fcab146bde41fd1c6d148f9ee1e2cca10c6f9c2b7eb4dd710a3a2c6ac",
+                "sha256:9c31c2526401da6cc92018f68483f2aac0a731cb98435445ea4b72d46b438c84",
+                "sha256:9e8ae1c3b8a1697147c5c97f00d66ab1c54d88c4615b0cdd9b1a667d7baf3eb7",
+                "sha256:a479c38ab2b997ce05d3bef906783ac20cf4cb224a154e80c9018c5e4d943a35",
+                "sha256:a79aab8d069543d5085d58260f18705a08acd92a4501a41261913fddc2137d46",
+                "sha256:b0a8314383de853599ca531dfe55eaa49bb8d6b0bb663b2f8479b7a0f3385ea2",
+                "sha256:b3d9926e64bd8008007b2d9819d7b30179b069ce95431d5060f71afc36885389",
+                "sha256:c2a9a77ce4f25ffb52d705be82a9f41b47f6b0da23870ebc3587709e7242da30",
+                "sha256:c578dd0799f70fb577474cd383f035c6e1057e4fe837278113f9cfa6eee4b076",
+                "sha256:c5abd9d0023ad20030524ab0d5fa39d77aed025519b1fa426304ab2dd0328b89",
+                "sha256:ced96125525ba21311e9512adf391170b9e149f89e27e45b06ff07b70f97a0b2",
+                "sha256:d692fb88d6ef5e75242b00009b54953a0425eaa8bd3a36db9db8b396785e1f57",
+                "sha256:d70c2104286459658e61388af9eee838b612986bd8a36e1d21ba36152983ac15",
+                "sha256:de47c65c10ac6f0d2addb28f1b1657b1c707aca014d09d01b3b728cf19e8f791",
+                "sha256:e6e7592527791841db0820a72c6afae52655a05b0b6d4df184fd2bafe82ee1ee",
+                "sha256:e8a7e95ee6ea5566291b59ede5b9fadce809dca43ebfbfe11e3ff3d6492c6f0e",
+                "sha256:f041759138b3a95508c4281b3db3bf9bb28636d84c554272a58a5ca7c9f9bbf4",
+                "sha256:f39c7fc1fa2e4a1d9747a3effd70731a9d0e9eb5738247fa089c059eff19d43e",
+                "sha256:f65ac89ee0ba569f5279360eae08783f7f2e95c9810a9846c957fbd5950f4896"
             ],
-            "version": "==3.5.55"
+            "version": "==3.5.56"
         },
         "scikit-learn": {
             "hashes": [
@@ -797,6 +807,14 @@
             ],
             "index": "pypi",
             "version": "==2.7.4"
+        },
+        "zipp": {
+            "hashes": [
+                "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108",
+                "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==3.4.0"
         }
     },
     "develop": {
@@ -973,6 +991,22 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.2.0"
         },
+        "importlib-metadata": {
+            "hashes": [
+                "sha256:6112e21359ef8f344e7178aa5b72dc6e62b38b0d008e6d3cb212c5b84df72013",
+                "sha256:b0c2d3b226157ae4517d9625decf63591461c66b3a808c2666d538946519d170"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==3.1.1"
+        },
+        "importlib-resources": {
+            "hashes": [
+                "sha256:7b51f0106c8ec564b1bef3d9c588bc694ce2b92125bbb6278f4f2f5b54ec3592",
+                "sha256:a3d34a8464ce1d5d7c92b0ea4e921e696d86f2aa212e684451cb1482c8d84ed5"
+            ],
+            "markers": "python_version < '3.7'",
+            "version": "==3.3.0"
+        },
         "iniconfig": {
             "hashes": [
                 "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3",
@@ -1284,6 +1318,14 @@
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==20.2.1"
+        },
+        "zipp": {
+            "hashes": [
+                "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108",
+                "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==3.4.0"
         }
     }
 }

From 62cc4a7a54106688a2a87f53ae896fb86c393fc4 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 3 Dec 2020 19:56:33 +0100
Subject: [PATCH 0022/1300] docs

---
 docs/setup.rst | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index e2b3d1ab9..3cd1cf60a 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -553,12 +553,10 @@ configuring some options in paperless can help improve performance immensely:
     sluggish response times during consumption, so you might want to lower these
     settings (example: 2 workers and 1 thread to always have some computing power
     left for other tasks).
-*   Keep ``PAPERLESS_OCR_ALWAYS`` at its default value 'false' and consider OCR'ing
+*   Keep ``PAPERLESS_OCR_MODE`` at its default value ``skip`` and consider OCR'ing
     your documents before feeding them into paperless. Some scanners are able to
-    do this!
-*   Lower ``PAPERLESS_CONVERT_DENSITY`` from its default value 300 to 200. This
-    will still result in rather accurate OCR, but will decrease consumption time
-    by quite a bit.
+    do this! You might want to even specify ``skip_noarchive`` to skip archive
+    file generation for already ocr'ed documents entirely.
 *   Set ``PAPERLESS_OPTIMIZE_THUMBNAILS`` to 'false' if you want faster consumption
     times. Thumbnails will be about 20% larger.
 

From 68c233005ef5654620a0ab5f2a014cb7b935d84e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 3 Dec 2020 19:56:52 +0100
Subject: [PATCH 0023/1300] api changes.

---
 src/documents/serialisers.py    | 20 ++++++++++++--------
 src/documents/tests/test_api.py | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 14102df5c..e6f278f93 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -79,11 +79,15 @@ class DocumentTypeField(serializers.PrimaryKeyRelatedField):
 
 class DocumentSerializer(serializers.ModelSerializer):
 
-    correspondent_id = CorrespondentField(
-        allow_null=True, source='correspondent')
-    tags_id = TagsField(many=True, source='tags')
-    document_type_id = DocumentTypeField(
-        allow_null=True, source='document_type')
+    correspondent = CorrespondentField(allow_null=True)
+    tags = TagsField(many=True)
+    document_type = DocumentTypeField(allow_null=True)
+
+    correspondent_object = TagSerializer(
+        read_only=True, source="correspondent")
+    document_type_object = TagSerializer(
+        read_only=True, source="document_type")
+    tags_objects = TagSerializer(many=True, read_only=True, source="tags")
 
     class Meta:
         model = Document
@@ -91,13 +95,13 @@ class DocumentSerializer(serializers.ModelSerializer):
         fields = (
             "id",
             "correspondent",
-            "correspondent_id",
+            "correspondent_object",
             "document_type",
-            "document_type_id",
+            "document_type_object",
             "title",
             "content",
             "tags",
-            "tags_id",
+            "tags_objects",
             "created",
             "modified",
             "added",
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index e2e1b254e..adfce313f 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -41,20 +41,20 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         returned_doc = response.data['results'][0]
         self.assertEqual(returned_doc['id'], doc.id)
         self.assertEqual(returned_doc['title'], doc.title)
-        self.assertEqual(returned_doc['correspondent']['name'], c.name)
-        self.assertEqual(returned_doc['document_type']['name'], dt.name)
-        self.assertEqual(returned_doc['correspondent']['id'], c.id)
-        self.assertEqual(returned_doc['document_type']['id'], dt.id)
-        self.assertEqual(returned_doc['correspondent']['id'], returned_doc['correspondent_id'])
-        self.assertEqual(returned_doc['document_type']['id'], returned_doc['document_type_id'])
+        self.assertEqual(returned_doc['correspondent_object']['name'], c.name)
+        self.assertEqual(returned_doc['document_type_object']['name'], dt.name)
+        self.assertEqual(returned_doc['correspondent_object']['id'], c.id)
+        self.assertEqual(returned_doc['document_type_object']['id'], dt.id)
+        self.assertEqual(returned_doc['correspondent_object']['id'], returned_doc['correspondent'])
+        self.assertEqual(returned_doc['document_type_object']['id'], returned_doc['document_type'])
         self.assertEqual(len(returned_doc['tags']), 1)
-        self.assertEqual(returned_doc['tags'][0]['name'], tag.name)
-        self.assertEqual(returned_doc['tags'][0]['id'], tag.id)
-        self.assertListEqual(returned_doc['tags_id'], [tag.id])
+        self.assertEqual(returned_doc['tags_objects'][0]['name'], tag.name)
+        self.assertEqual(returned_doc['tags_objects'][0]['id'], tag.id)
+        self.assertListEqual(returned_doc['tags'], [tag.id])
 
         c2 = Correspondent.objects.create(name="c2")
 
-        returned_doc['correspondent_id'] = c2.pk
+        returned_doc['correspondent'] = c2.pk
         returned_doc['title'] = "the new title"
 
         response = self.client.put('/api/documents/{}/'.format(doc.pk), returned_doc, format='json')

From 982ea84906cf237fdcf130cd86c8c3b78570e0a0 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 3 Dec 2020 20:28:17 +0100
Subject: [PATCH 0024/1300] adjustments of the front end for API changes.

---
 .../saved-view-widget.component.html          |  2 +-
 .../document-detail.component.html            |  6 ++---
 .../document-detail.component.ts              | 10 ++++-----
 .../document-card-large.component.html        |  8 +++----
 .../document-card-large.component.ts          |  4 ++--
 .../document-card-small.component.html        |  8 +++----
 .../document-card-small.component.ts          |  4 ++--
 .../document-list.component.html              | 10 ++++-----
 .../document-list/document-list.component.ts  | 22 +++++++++----------
 src-ui/src/app/data/paperless-document.ts     | 12 +++++-----
 10 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
index 2dfbe4481..a444474ea 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
@@ -13,7 +13,7 @@
     <tbody>
       <tr *ngFor="let doc of documents" routerLink="/documents/{{doc.id}}">
         <td>{{doc.created | date}}</td>
-        <td>{{doc.title}}<app-tag [tag]="t" *ngFor="let t of doc.tags" class="ml-1"></app-tag>
+        <td>{{doc.title}}<app-tag [tag]="t" *ngFor="let t of doc.tags_objects" class="ml-1"></app-tag>
       </tr>
     </tbody>
   </table>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 474c1376d..5a5563571 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -53,11 +53,11 @@
                 <textarea class="form-control" id="content" rows="5" formControlName='content'></textarea>
             </div>
 
-            <app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent_id" allowNull="true" (createNew)="createCorrespondent()"></app-input-select>
+            <app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent" allowNull="true" (createNew)="createCorrespondent()"></app-input-select>
 
-            <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type_id" allowNull="true" (createNew)="createDocumentType()"></app-input-select>
+            <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type" allowNull="true" (createNew)="createDocumentType()"></app-input-select>
 
-            <app-input-tags formControlName="tags_id" title="Tags"></app-input-tags>
+            <app-input-tags formControlName="tags" title="Tags"></app-input-tags>
 
             <button type="button" class="btn btn-outline-secondary" (click)="discard()">Discard</button>&nbsp;
             <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()">Save & edit next</button>&nbsp;
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 7c396692e..253833792 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -37,10 +37,10 @@ export class DocumentDetailComponent implements OnInit {
     title: new FormControl(''),
     content: new FormControl(''),
     created: new FormControl(),
-    correspondent_id: new FormControl(),
-    document_type_id: new FormControl(),
+    correspondent: new FormControl(),
+    document_type: new FormControl(),
     archive_serial_number: new FormControl(),
-    tags_id: new FormControl([])
+    tags: new FormControl([])
   })
 
   constructor(
@@ -93,7 +93,7 @@ export class DocumentDetailComponent implements OnInit {
     modal.componentInstance.success.subscribe(newDocumentType => {
       this.documentTypeService.listAll().subscribe(documentTypes => {
         this.documentTypes = documentTypes.results
-        this.documentForm.get('document_type_id').setValue(newDocumentType.id)
+        this.documentForm.get('document_type').setValue(newDocumentType.id)
       })
     })
   }
@@ -104,7 +104,7 @@ export class DocumentDetailComponent implements OnInit {
     modal.componentInstance.success.subscribe(newCorrespondent => {
       this.correspondentService.listAll().subscribe(correspondents => {
         this.correspondents = correspondents.results
-        this.documentForm.get('correspondent_id').setValue(newCorrespondent.id)
+        this.documentForm.get('correspondent').setValue(newCorrespondent.id)
       })
     })
   }
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index 4e86b6ddc..cf821b643 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -8,12 +8,12 @@
 
         <div class="d-flex justify-content-between align-items-center">
           <h5 class="card-title">    
-            <ng-container *ngIf="document.correspondent">
-              <a *ngIf="clickCorrespondent.observers.length ; else nolink" [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{document.correspondent.name}}</a>
-              <ng-template #nolink>{{document.correspondent.name}}</ng-template>:
+            <ng-container *ngIf="document.correspondent_object">
+              <a *ngIf="clickCorrespondent.observers.length ; else nolink" [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{document.correspondent_object.name}}</a>
+              <ng-template #nolink>{{document.correspondent_object.name}}</ng-template>:
             </ng-container>
             {{document.title}}
-            <app-tag [tag]="t" linkTitle="Filter by tag" *ngFor="let t of document.tags" class="ml-1" (click)="clickTag.emit(t)" [clickable]="clickTag.observers.length"></app-tag>
+            <app-tag [tag]="t" linkTitle="Filter by tag" *ngFor="let t of document.tags_objects" class="ml-1" (click)="clickTag.emit(t.id)" [clickable]="clickTag.observers.length"></app-tag>
           </h5>
           <h5 class="card-title" *ngIf="document.archive_serial_number">#{{document.archive_serial_number}}</h5>
         </div>
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
index 4a44909ec..ac2fdba27 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
@@ -20,10 +20,10 @@ export class DocumentCardLargeComponent implements OnInit {
   details: any
 
   @Output()
-  clickTag = new EventEmitter<PaperlessTag>()
+  clickTag = new EventEmitter<number>()
 
   @Output()
-  clickCorrespondent = new EventEmitter<PaperlessDocument>()
+  clickCorrespondent = new EventEmitter<number>()
 
   ngOnInit(): void {
   }
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 4da5cdf9b..4ab48d5e6 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,15 +1,15 @@
 <div class="col p-2 h-100" style="width: 16rem;">
   <div class="card h-100 shadow-sm">
     <div class=" border-bottom doc-img pr-1" [ngStyle]="{'background-image': 'url(' + getThumbUrl() + ')'}">
-      <div class="row" *ngFor="let t of document.tags">
-        <app-tag style="font-size: large;" [tag]="t" class="col text-right" (click)="clickTag.emit(t)" [clickable]="true" linkTitle="Filter by tag"></app-tag>
+      <div class="row" *ngFor="let t of document.tags_objects">
+        <app-tag style="font-size: large;" [tag]="t" class="col text-right" (click)="clickTag.emit(t.id)" [clickable]="true" linkTitle="Filter by tag"></app-tag>
       </div>
     </div>
     
     <div class="card-body p-2">
       <p class="card-text">
-        <ng-container *ngIf="document.correspondent">
-          <a [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{document.correspondent.name}}</a>:
+        <ng-container *ngIf="document.correspondent_object">
+          <a [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{document.correspondent_object.name}}</a>:
         </ng-container>
         {{document.title}}
       </p>
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
index 2c0ca8dfb..08202bfc9 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
@@ -16,10 +16,10 @@ export class DocumentCardSmallComponent implements OnInit {
   document: PaperlessDocument
 
   @Output()
-  clickTag = new EventEmitter<PaperlessTag>()
+  clickTag = new EventEmitter<number>()
 
   @Output()
-  clickCorrespondent = new EventEmitter<PaperlessDocument>()
+  clickCorrespondent = new EventEmitter<number>()
 
   ngOnInit(): void {
   }
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 48387b3e3..af7a049c7 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -100,17 +100,17 @@
         {{d.archive_serial_number}}
       </td>
       <td class="d-none d-md-table-cell">
-        <ng-container *ngIf="d.correspondent">
-          <a [routerLink]="" (click)="filterByCorrespondent(d.correspondent)" title="Filter by correspondent">{{d.correspondent.name}}</a>
+        <ng-container *ngIf="d.correspondent_object">
+          <a [routerLink]="" (click)="filterByCorrespondent(d.correspondent)" title="Filter by correspondent">{{d.correspondent_object.name}}</a>
         </ng-container>
       </td>
       <td>
         <a routerLink="/documents/{{d.id}}" title="Edit document">{{d.title}}</a>
-        <app-tag [tag]="t" *ngFor="let t of d.tags" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="filterByTag(t)"></app-tag>
+        <app-tag [tag]="t" *ngFor="let t of d.tags_objects" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="filterByTag(t.id)"></app-tag>
       </td>
       <td class="d-none d-xl-table-cell">
-        <ng-container *ngIf="d.document_type">
-          <a [routerLink]="" (click)="filterByDocumentType(d.document_type)" title="Filter by document type">{{d.document_type.name}}</a>
+        <ng-container *ngIf="d.document_type_object">
+          <a [routerLink]="" (click)="filterByDocumentType(d.document_type)" title="Filter by document type">{{d.document_type_object.name}}</a>
         </ng-container>
       </td>
       <td>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 153b31d8c..c3550a856 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -95,40 +95,40 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
-  filterByTag(t: PaperlessTag) {
+  filterByTag(tag_id: number) {
     let filterRules = this.list.filterRules
-    if (filterRules.find(rule => rule.type.id == FILTER_HAS_TAG && rule.value == t.id)) {
+    if (filterRules.find(rule => rule.type.id == FILTER_HAS_TAG && rule.value == tag_id)) {
       return
     }
 
-    filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_HAS_TAG), value: t.id})
+    filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_HAS_TAG), value: tag_id})
     this.filterRules = filterRules
     this.applyFilterRules()
   }
 
-  filterByCorrespondent(c: PaperlessCorrespondent) {
+  filterByCorrespondent(correspondent_id: number) {
     let filterRules = this.list.filterRules
     let existing_rule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT)
-    if (existing_rule && existing_rule.value == c.id) {
+    if (existing_rule && existing_rule.value == correspondent_id) {
       return
     } else if (existing_rule) {
-      existing_rule.value = c.id
+      existing_rule.value = correspondent_id
     } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_CORRESPONDENT), value: c.id})
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_CORRESPONDENT), value: correspondent_id})
     }
     this.filterRules = filterRules
     this.applyFilterRules()
   }
 
-  filterByDocumentType(dt: PaperlessDocumentType) {
+  filterByDocumentType(document_type_id: number) {
     let filterRules = this.list.filterRules
     let existing_rule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE)
-    if (existing_rule && existing_rule.value == dt.id) {
+    if (existing_rule && existing_rule.value == document_type_id) {
       return
     } else if (existing_rule) {
-      existing_rule.value = dt.id
+      existing_rule.value = document_type_id
     } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_DOCUMENT_TYPE), value: dt.id})
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_DOCUMENT_TYPE), value: document_type_id})
     }
     this.filterRules = filterRules
     this.applyFilterRules()
diff --git a/src-ui/src/app/data/paperless-document.ts b/src-ui/src/app/data/paperless-document.ts
index 31a24bcad..b69a35495 100644
--- a/src-ui/src/app/data/paperless-document.ts
+++ b/src-ui/src/app/data/paperless-document.ts
@@ -5,13 +5,13 @@ import { PaperlessDocumentType } from './paperless-document-type'
 
 export interface PaperlessDocument extends ObjectWithId {
 
-    correspondent?: PaperlessCorrespondent
+    correspondent_object?: PaperlessCorrespondent
 
-    correspondent_id?: number
+    correspondent?: number
 
-    document_type?: PaperlessDocumentType
+    document_type_object?: PaperlessDocumentType
 
-    document_type_id?: number
+    document_type?: number
 
     title?: string
 
@@ -19,9 +19,9 @@ export interface PaperlessDocument extends ObjectWithId {
 
     file_type?: string
 
-    tags?: PaperlessTag[]
+    tags_objects?: PaperlessTag[]
 
-    tags_id?: number[]
+    tags?: number[]
 
     checksum?: string
 

From 0a18c819d4f7d436b3f3ebd33ca8fda5801cd64d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 01:17:55 +0100
Subject: [PATCH 0025/1300] remove _object from document results, which makes
 the API about 33% faster.

---
 src/documents/serialisers.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index e6f278f93..973ed2ae5 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -83,25 +83,16 @@ class DocumentSerializer(serializers.ModelSerializer):
     tags = TagsField(many=True)
     document_type = DocumentTypeField(allow_null=True)
 
-    correspondent_object = TagSerializer(
-        read_only=True, source="correspondent")
-    document_type_object = TagSerializer(
-        read_only=True, source="document_type")
-    tags_objects = TagSerializer(many=True, read_only=True, source="tags")
-
     class Meta:
         model = Document
         depth = 1
         fields = (
             "id",
             "correspondent",
-            "correspondent_object",
             "document_type",
-            "document_type_object",
             "title",
             "content",
             "tags",
-            "tags_objects",
             "created",
             "modified",
             "added",

From 5bdb57a392b6831563c0b3056dbe59640552fa4c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 01:18:06 +0100
Subject: [PATCH 0026/1300] fix a test case.

---
 src/documents/tests/test_api.py                   | 11 ++---------
 src/documents/tests/test_post_consume_handlers.py |  3 +--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index adfce313f..70b8bb9eb 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -41,15 +41,8 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         returned_doc = response.data['results'][0]
         self.assertEqual(returned_doc['id'], doc.id)
         self.assertEqual(returned_doc['title'], doc.title)
-        self.assertEqual(returned_doc['correspondent_object']['name'], c.name)
-        self.assertEqual(returned_doc['document_type_object']['name'], dt.name)
-        self.assertEqual(returned_doc['correspondent_object']['id'], c.id)
-        self.assertEqual(returned_doc['document_type_object']['id'], dt.id)
-        self.assertEqual(returned_doc['correspondent_object']['id'], returned_doc['correspondent'])
-        self.assertEqual(returned_doc['document_type_object']['id'], returned_doc['document_type'])
-        self.assertEqual(len(returned_doc['tags']), 1)
-        self.assertEqual(returned_doc['tags_objects'][0]['name'], tag.name)
-        self.assertEqual(returned_doc['tags_objects'][0]['id'], tag.id)
+        self.assertEqual(returned_doc['correspondent'], c.id)
+        self.assertEqual(returned_doc['document_type'], dt.id)
         self.assertListEqual(returned_doc['tags'], [tag.id])
 
         c2 = Correspondent.objects.create(name="c2")
diff --git a/src/documents/tests/test_post_consume_handlers.py b/src/documents/tests/test_post_consume_handlers.py
index fb4c9fc12..b4357448c 100644
--- a/src/documents/tests/test_post_consume_handlers.py
+++ b/src/documents/tests/test_post_consume_handlers.py
@@ -53,5 +53,4 @@ class PostConsumeTestCase(TestCase):
         self.assertEqual(command[5], f"/api/documents/{doc.pk}/download/")
         self.assertEqual(command[6], f"/api/documents/{doc.pk}/thumb/")
         self.assertEqual(command[7], "my_bank")
-        # TODO: tags are unordered by default.
-        self.assertEqual(command[8], "a,b")
+        self.assertCountEqual(command[8].split(","), ["a", "b"])

From 1d8765100c7d35ee92cb9f1a87d6e03d9869206d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 01:22:14 +0100
Subject: [PATCH 0027/1300] caching for listAll methods

---
 .../rest/abstract-paperless-service.ts        | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/services/rest/abstract-paperless-service.ts b/src-ui/src/app/services/rest/abstract-paperless-service.ts
index 16064c702..3feed320e 100644
--- a/src-ui/src/app/services/rest/abstract-paperless-service.ts
+++ b/src-ui/src/app/services/rest/abstract-paperless-service.ts
@@ -1,5 +1,6 @@
 import { HttpClient, HttpParams } from '@angular/common/http'
-import { Observable } from 'rxjs'
+import { Observable, of, Subject } from 'rxjs'
+import { map, publishReplay, refCount } from 'rxjs/operators'
 import { ObjectWithId } from 'src/app/data/object-with-id'
 import { Results } from 'src/app/data/results'
 import { environment } from 'src/environments/environment'
@@ -51,8 +52,28 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
     return this.http.get<Results<T>>(this.getResourceUrl(), {params: httpParams})
   }
 
+  private _listAll: Observable<Results<T>>
+
   listAll(ordering?: string, extraParams?): Observable<Results<T>> {
-    return this.list(1, 100000, ordering, extraParams)
+    if (!this._listAll) {
+      this._listAll = this.list(1, 100000, ordering, extraParams).pipe(
+        publishReplay(1),
+        refCount()
+      )
+    }
+    return this._listAll
+  }
+
+  getCached(id: number): Observable<T> {
+    return this.listAll().pipe(
+      map(list => list.results.find(o => o.id == id))
+    )
+  }
+
+  getCachedMany(ids: number[]): Observable<T[]> {
+    return this.listAll().pipe(
+      map(list => ids.map(id => list.results.find(o => o.id == id)))
+    )
   }
 
   get(id: number): Observable<T> {
@@ -60,14 +81,17 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
   }
 
   create(o: T): Observable<T> {
+    this._listAll = null
     return this.http.post<T>(this.getResourceUrl(), o)
   }
 
   delete(o: T): Observable<any> {
+    this._listAll = null
     return this.http.delete(this.getResourceUrl(o.id))
   }
 
   update(o: T): Observable<T> {
+    this._listAll = null
     return this.http.put<T>(this.getResourceUrl(o.id), o)
   }
 }
\ No newline at end of file

From 34f353f399ab18400f2c49e04c87c75653eb418c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 01:24:07 +0100
Subject: [PATCH 0028/1300] document service adds observables for linked data
 to its results

---
 src-ui/src/app/data/paperless-document.ts     |  7 ++---
 .../src/app/services/rest/document.service.ts | 26 +++++++++++++++++--
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/data/paperless-document.ts b/src-ui/src/app/data/paperless-document.ts
index b69a35495..9d0aeda88 100644
--- a/src-ui/src/app/data/paperless-document.ts
+++ b/src-ui/src/app/data/paperless-document.ts
@@ -2,14 +2,15 @@ import { PaperlessCorrespondent } from './paperless-correspondent'
 import { ObjectWithId } from './object-with-id'
 import { PaperlessTag } from './paperless-tag'
 import { PaperlessDocumentType } from './paperless-document-type'
+import { Observable } from 'rxjs'
 
 export interface PaperlessDocument extends ObjectWithId {
 
-    correspondent_object?: PaperlessCorrespondent
+    correspondent$?: Observable<PaperlessCorrespondent>
 
     correspondent?: number
 
-    document_type_object?: PaperlessDocumentType
+    document_type$?: Observable<PaperlessDocumentType>
 
     document_type?: number
 
@@ -19,7 +20,7 @@ export interface PaperlessDocument extends ObjectWithId {
 
     file_type?: string
 
-    tags_objects?: PaperlessTag[]
+    tags$?: Observable<PaperlessTag[]>
 
     tags?: number[]
 
diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index e27dbeab3..5bf2308d4 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -6,6 +6,10 @@ import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { Results } from 'src/app/data/results';
 import { FilterRule } from 'src/app/data/filter-rule';
+import { map } from 'rxjs/operators';
+import { CorrespondentService } from './correspondent.service';
+import { DocumentTypeService } from './document-type.service';
+import { TagService } from './tag.service';
 
 
 export const DOCUMENT_SORT_FIELDS = [
@@ -27,7 +31,7 @@ export const SORT_DIRECTION_DESCENDING = "des"
 })
 export class DocumentService extends AbstractPaperlessService<PaperlessDocument> {
 
-  constructor(http: HttpClient) {
+  constructor(http: HttpClient, private correspondentService: CorrespondentService, private documentTypeService: DocumentTypeService, private tagService: TagService) {
     super(http, 'documents')
   }
 
@@ -47,8 +51,26 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     }
   }
 
+  addObservablesToDocument(doc: PaperlessDocument) {
+    if (doc.correspondent) {
+      doc.correspondent$ = this.correspondentService.getCached(doc.correspondent)
+    }
+    if (doc.document_type) {
+      doc.document_type$ = this.documentTypeService.getCached(doc.document_type)
+    }
+    if (doc.tags) {
+      doc.tags$ = this.tagService.getCachedMany(doc.tags)
+    }
+    return doc
+  }
+
   list(page?: number, pageSize?: number, sortField?: string, sortDirection?: string, filterRules?: FilterRule[]): Observable<Results<PaperlessDocument>> {
-    return super.list(page, pageSize, sortField, sortDirection, this.filterRulesToQueryParams(filterRules))
+    return super.list(page, pageSize, sortField, sortDirection, this.filterRulesToQueryParams(filterRules)).pipe(
+      map(results => {
+        results.results.forEach(doc => this.addObservablesToDocument(doc))
+        return results
+      })
+    )
   }
 
   getPreviewUrl(id: number, original: boolean = false): string {

From 9a4d410f662f07b2ee082c083ba45d604c06d0ee Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 01:25:52 +0100
Subject: [PATCH 0029/1300] use the observables everywhere in the application.

---
 .../saved-view-widget/saved-view-widget.component.html |  2 +-
 .../document-card-large.component.html                 |  8 ++++----
 .../document-card-small.component.html                 |  6 +++---
 .../document-list/document-list.component.html         | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
index a444474ea..e63ecc47b 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
@@ -13,7 +13,7 @@
     <tbody>
       <tr *ngFor="let doc of documents" routerLink="/documents/{{doc.id}}">
         <td>{{doc.created | date}}</td>
-        <td>{{doc.title}}<app-tag [tag]="t" *ngFor="let t of doc.tags_objects" class="ml-1"></app-tag>
+        <td>{{doc.title}}<app-tag [tag]="t" *ngFor="let t of doc.tags$ | async" class="ml-1"></app-tag>
       </tr>
     </tbody>
   </table>
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index cf821b643..bfc59b526 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -8,12 +8,12 @@
 
         <div class="d-flex justify-content-between align-items-center">
           <h5 class="card-title">    
-            <ng-container *ngIf="document.correspondent_object">
-              <a *ngIf="clickCorrespondent.observers.length ; else nolink" [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{document.correspondent_object.name}}</a>
-              <ng-template #nolink>{{document.correspondent_object.name}}</ng-template>:
+            <ng-container *ngIf="document.correspondent">
+              <a *ngIf="clickCorrespondent.observers.length ; else nolink" [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>
+              <ng-template #nolink>{{(document.correspondent$ | async)?.name}}</ng-template>:
             </ng-container>
             {{document.title}}
-            <app-tag [tag]="t" linkTitle="Filter by tag" *ngFor="let t of document.tags_objects" class="ml-1" (click)="clickTag.emit(t.id)" [clickable]="clickTag.observers.length"></app-tag>
+            <app-tag [tag]="t" linkTitle="Filter by tag" *ngFor="let t of document.tags$ | async" class="ml-1" (click)="clickTag.emit(t.id)" [clickable]="clickTag.observers.length"></app-tag>
           </h5>
           <h5 class="card-title" *ngIf="document.archive_serial_number">#{{document.archive_serial_number}}</h5>
         </div>
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 4ab48d5e6..71a7fb01a 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,15 +1,15 @@
 <div class="col p-2 h-100" style="width: 16rem;">
   <div class="card h-100 shadow-sm">
     <div class=" border-bottom doc-img pr-1" [ngStyle]="{'background-image': 'url(' + getThumbUrl() + ')'}">
-      <div class="row" *ngFor="let t of document.tags_objects">
+      <div class="row" *ngFor="let t of document.tags$ | async">
         <app-tag style="font-size: large;" [tag]="t" class="col text-right" (click)="clickTag.emit(t.id)" [clickable]="true" linkTitle="Filter by tag"></app-tag>
       </div>
     </div>
     
     <div class="card-body p-2">
       <p class="card-text">
-        <ng-container *ngIf="document.correspondent_object">
-          <a [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{document.correspondent_object.name}}</a>:
+        <ng-container *ngIf="document.correspondent">
+          <a [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>:
         </ng-container>
         {{document.title}}
       </p>
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index af7a049c7..cebe7c544 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -100,17 +100,17 @@
         {{d.archive_serial_number}}
       </td>
       <td class="d-none d-md-table-cell">
-        <ng-container *ngIf="d.correspondent_object">
-          <a [routerLink]="" (click)="filterByCorrespondent(d.correspondent)" title="Filter by correspondent">{{d.correspondent_object.name}}</a>
+        <ng-container *ngIf="d.correspondent">
+          <a [routerLink]="" (click)="filterByCorrespondent(d.correspondent)" title="Filter by correspondent">{{(d.correspondent$ | async)?.name}}</a>
         </ng-container>
       </td>
       <td>
         <a routerLink="/documents/{{d.id}}" title="Edit document">{{d.title}}</a>
-        <app-tag [tag]="t" *ngFor="let t of d.tags_objects" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="filterByTag(t.id)"></app-tag>
+        <app-tag [tag]="t" *ngFor="let t of d.tags$ | async" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="filterByTag(t.id)"></app-tag>
       </td>
       <td class="d-none d-xl-table-cell">
-        <ng-container *ngIf="d.document_type_object">
-          <a [routerLink]="" (click)="filterByDocumentType(d.document_type)" title="Filter by document type">{{d.document_type_object.name}}</a>
+        <ng-container *ngIf="d.document_type">
+          <a [routerLink]="" (click)="filterByDocumentType(d.document_type)" title="Filter by document type">{{(d.document_type$ | async)?.name}}</a>
         </ng-container>
       </td>
       <td>

From ceaade29a652c92af42e315c3c66d13c88196e9a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 01:26:12 +0100
Subject: [PATCH 0030/1300] bugfix

---
 .../src/app/components/document-list/document-list.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index c3550a856..3a4f17196 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -49,13 +49,13 @@ export class DocumentListComponent implements OnInit {
       this.displayMode = localStorage.getItem('document-list:displayMode')
     }
     this.route.paramMap.subscribe(params => {
+      this.filterRules = this.list.filterRules
       if (params.has('id')) {
         this.list.savedView = this.savedViewConfigService.getConfig(params.get('id'))
       } else {
         this.list.savedView = null
         this.showFilter = this.filterRules.length > 0
       }
-      this.filterRules = this.list.filterRules
       this.list.clear()
       this.list.reload()
     })

From 57ad485913a68d18b25da0abfea811da6b5da58a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 01:26:27 +0100
Subject: [PATCH 0031/1300] add observables to search results

---
 src-ui/src/app/services/rest/search.service.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/services/rest/search.service.ts b/src-ui/src/app/services/rest/search.service.ts
index 2da5f9a08..b19a55769 100644
--- a/src-ui/src/app/services/rest/search.service.ts
+++ b/src-ui/src/app/services/rest/search.service.ts
@@ -1,9 +1,11 @@
 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';
 
 
 @Injectable({
@@ -11,14 +13,19 @@ import { environment } from 'src/environments/environment';
 })
 export class SearchService {
   
-  constructor(private http: HttpClient) { }
+  constructor(private http: HttpClient, private documentService: DocumentService) { }
 
   search(query: string, page?: number): Observable<SearchResult> {
     let httpParams = new HttpParams().set('query', query)
     if (page) {
       httpParams = httpParams.set('page', page.toString())
     }
-    return this.http.get<SearchResult>(`${environment.apiBaseUrl}search/`, {params: httpParams})
+    return this.http.get<SearchResult>(`${environment.apiBaseUrl}search/`, {params: httpParams}).pipe(
+      map(result => {
+        result.results.forEach(hit => this.documentService.addObservablesToDocument(hit.document))
+        return result
+      })
+    )
   }
 
   autocomplete(term: string): Observable<string[]> {

From 3634dfbcf8595a4f8b58850f4f5beeb1e284e37a Mon Sep 17 00:00:00 2001
From: jonaswinkler <dev@jpwinkler.de>
Date: Fri, 4 Dec 2020 11:12:59 +0100
Subject: [PATCH 0032/1300] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 36c365f17..45427ef66 100644
--- a/README.md
+++ b/README.md
@@ -55,10 +55,12 @@ For a complete list of changes from paperless, check out the [changelog](https:/
 
 ## Roadmap for versions beyond 1.0
 
+These are things that I want to add to paperless eventually. They are sorted by priority.
+
+- **Bulk editing**. Add/remove metadata from multiple documents at once.
 - **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like:
   - Group and limit search results by correspondent, show “more from this” links in the results.
   - Ability to search for “Similar documents” in the search results
-- **Bulk editing**. Add/remove metadata from multiple documents at once.
 - **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system.
 - **An interactive consumer** that shows its progress for documents it processes on the web page.
 	- With live updates ans websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particular happy about.

From eb5bdc48aa29bee235edaad199f561d30a6d32dd Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 12:09:21 +0100
Subject: [PATCH 0033/1300] API now supports setting metadata when POSTing
 documents.

---
 docs/api.rst                    |  4 +--
 docs/changelog.rst              | 14 +++++++---
 src/documents/serialisers.py    | 27 ++++++++++---------
 src/documents/tests/test_api.py | 46 +++++++++++++++++----------------
 4 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/docs/api.rst b/docs/api.rst
index 523ca1b45..4c9ae0b13 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -216,9 +216,7 @@ be instructed to consume the document from there.
 The endpoint supports the following optional form fields:
 
 *   ``title``: Specify a title that the consumer should use for the document.
-*   ``correspondent``: Specify a correspondent that the consumer should use for the document.
-    Case sensitive. If the specified correspondent does not exist, it will be created with this
-    name and default settings.
+*   ``correspondent``: Specify the ID of a correspondent that the consumer should use for the document.
 *   ``document_type``: Similar to correspondent.
 *   ``tags``: Similar to correspondent. Specify this multiple times to have multiple tags added
     to the document.
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9ccc7bd6a..40b45d1b1 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,9 @@ Changelog
 paperless-ng 0.9.5
 ##################
 
+Apart from the API, this finalizes the changes I wanted to get into paperless before 1.0. The next releases will
+focus on fixing bugs, minor changes to the UI, and possibly some changes to the API.
+
 * OCR
 
   * Paperless now uses `OCRmyPDF <https://github.com/jbarlow83/OCRmyPDF>`_ to perform OCR on documents.
@@ -33,10 +36,15 @@ paperless-ng 0.9.5
   * The endpoint for uploading documents now supports specifying custom titles, correspondents, tags and types.
     This can be used by clients to override the default behavior of paperless.
   * The document endpoint of API now serves document in this form:
-    * correspondents, document types and tags are referenced by their ID in the fields ``correspondent``, ``document_type`` and ``tags``. The ``*_id`` versions are gone. These fields are read/write.
-    * in addition to that, ``*_object`` fields serve nested objects. Read only. Don't rely on these, they will probably get removed once I figure out how to better handle asynchronous data in the front end.
 
-* Some minor improvements to the front end, such as document count in the document list, better visibility of the current view, and improvements to the filter behavior.
+    * correspondents, document types and tags are referenced by their ID in the fields ``correspondent``, ``document_type`` and ``tags``. The ``*_id`` versions are gone. These fields are read/write.
+    * paperless does not serve nested tags, correspondents or types anymore.
+
+* Front end
+
+  * Paperless does some basic caching of correspondents, tags and types and will only request them from the server when necessary or when entirely reloading the page.
+  * Document lists should be somewhat faster now, especially when lots of tags/correspondents where present.
+  * Some minor improvements to the front end, such as document count in the document list, better highlighting of the current page, and improvements to the filter behavior.
 
 * Fixes:
 
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 973ed2ae5..c988b2137 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -126,22 +126,26 @@ class PostDocumentSerializer(serializers.Serializer):
         required=False,
     )
 
-    correspondent = serializers.CharField(
+    correspondent = serializers.PrimaryKeyRelatedField(
+        queryset=Correspondent.objects.all(),
         label="Correspondent",
+        allow_null=True,
         write_only=True,
         required=False,
     )
 
-    document_type = serializers.CharField(
+    document_type = serializers.PrimaryKeyRelatedField(
+        queryset=DocumentType.objects.all(),
         label="Document type",
+        allow_null=True,
         write_only=True,
         required=False,
     )
 
-    tags = serializers.ListField(
-        child=serializers.CharField(),
+    tags = serializers.PrimaryKeyRelatedField(
+        many=True,
+        queryset=Tag.objects.all(),
         label="Tags",
-        source="tag",
         write_only=True,
         required=False,
     )
@@ -170,24 +174,19 @@ class PostDocumentSerializer(serializers.Serializer):
 
         correspondent = attrs.get('correspondent')
         if correspondent:
-            c, _ = Correspondent.objects.get_or_create(name=correspondent)
-            attrs['correspondent_id'] = c.id
+            attrs['correspondent_id'] = correspondent.id
         else:
             attrs['correspondent_id'] = None
 
         document_type = attrs.get('document_type')
         if document_type:
-            dt, _ = DocumentType.objects.get_or_create(name=document_type)
-            attrs['document_type_id'] = dt.id
+            attrs['document_type_id'] = document_type.id
         else:
             attrs['document_type_id'] = None
 
-        tags = attrs.get('tag')
+        tags = attrs.get('tags')
         if tags:
-            tag_ids = []
-            for tag in tags:
-                tag, _ = Tag.objects.get_or_create(name=tag)
-                tag_ids.append(tag.id)
+            tag_ids = [tag.id for tag in tags]
             attrs['tag_ids'] = tag_ids
         else:
             attrs['tag_ids'] = None
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 70b8bb9eb..b900ee653 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -410,7 +410,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
     def test_upload_with_correspondent(self, async_task):
         c = Correspondent.objects.create(name="test-corres")
         with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
-            response = self.client.post("/api/documents/post_document/", {"document": f, "correspondent": "test-corres"})
+            response = self.client.post("/api/documents/post_document/", {"document": f, "correspondent": c.id})
         self.assertEqual(response.status_code, 200)
 
         async_task.assert_called_once()
@@ -420,23 +420,18 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(kwargs['override_correspondent_id'], c.id)
 
     @mock.patch("documents.views.async_task")
-    def test_upload_with_new_correspondent(self, async_task):
+    def test_upload_with_invalid_correspondent(self, async_task):
         with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
-            response = self.client.post("/api/documents/post_document/", {"document": f, "correspondent": "test-corres2"})
-        self.assertEqual(response.status_code, 200)
+            response = self.client.post("/api/documents/post_document/", {"document": f, "correspondent": 3456})
+        self.assertEqual(response.status_code, 400)
 
-        async_task.assert_called_once()
-
-        args, kwargs = async_task.call_args
-
-        c = Correspondent.objects.get(name="test-corres2")
-        self.assertEqual(kwargs['override_correspondent_id'], c.id)
+        async_task.assert_not_called()
 
     @mock.patch("documents.views.async_task")
     def test_upload_with_document_type(self, async_task):
         dt = DocumentType.objects.create(name="invoice")
         with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
-            response = self.client.post("/api/documents/post_document/", {"document": f, "document_type": "invoice"})
+            response = self.client.post("/api/documents/post_document/", {"document": f, "document_type": dt.id})
         self.assertEqual(response.status_code, 200)
 
         async_task.assert_called_once()
@@ -446,30 +441,37 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(kwargs['override_document_type_id'], dt.id)
 
     @mock.patch("documents.views.async_task")
-    def test_upload_with_new_document_type(self, async_task):
+    def test_upload_with_invalid_document_type(self, async_task):
         with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
-            response = self.client.post("/api/documents/post_document/", {"document": f, "document_type": "invoice2"})
-        self.assertEqual(response.status_code, 200)
+            response = self.client.post("/api/documents/post_document/", {"document": f, "document_type": 34578})
+        self.assertEqual(response.status_code, 400)
 
-        async_task.assert_called_once()
-
-        args, kwargs = async_task.call_args
-
-        dt = DocumentType.objects.get(name="invoice2")
-        self.assertEqual(kwargs['override_document_type_id'], dt.id)
+        async_task.assert_not_called()
 
     @mock.patch("documents.views.async_task")
     def test_upload_with_tags(self, async_task):
         t1 = Tag.objects.create(name="tag1")
+        t2 = Tag.objects.create(name="tag2")
         with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
             response = self.client.post(
                 "/api/documents/post_document/",
-                {"document": f, "tags": ["tag1", "tag2"]})
+                {"document": f, "tags": [t2.id, t1.id]})
         self.assertEqual(response.status_code, 200)
 
         async_task.assert_called_once()
 
         args, kwargs = async_task.call_args
 
-        t2 = Tag.objects.get(name="tag2")
         self.assertCountEqual(kwargs['override_tag_ids'], [t1.id, t2.id])
+
+    @mock.patch("documents.views.async_task")
+    def test_upload_with_invalid_tags(self, async_task):
+        t1 = Tag.objects.create(name="tag1")
+        t2 = Tag.objects.create(name="tag2")
+        with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
+            response = self.client.post(
+                "/api/documents/post_document/",
+                {"document": f, "tags": [t2.id, t1.id, 734563]})
+        self.assertEqual(response.status_code, 400)
+
+        async_task.assert_not_called()

From 991a46c4f0344f99c22329a6e9b16e505ae6e725 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 12:44:02 +0100
Subject: [PATCH 0034/1300] disabled thumbnail trimming.

---
 src/paperless_tesseract/parsers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 66001286c..454617728 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -31,7 +31,7 @@ class RasterisedDocumentParser(DocumentParser):
                         scale="500x5000>",
                         alpha="remove",
                         strip=True,
-                        trim=True,
+                        trim=False,
                         input_file="{}[0]".format(document_path),
                         output_file=out_path,
                         logging_group=self.logging_group)
@@ -55,7 +55,7 @@ class RasterisedDocumentParser(DocumentParser):
                         scale="500x5000>",
                         alpha="remove",
                         strip=True,
-                        trim=True,
+                        trim=False,
                         input_file=gs_out_path,
                         output_file=out_path,
                         logging_group=self.logging_group)

From 371745b6dc45c22ccf0e9fed7684eb4801d7e76a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 15:42:05 +0100
Subject: [PATCH 0035/1300] mail handling: When exceptions occur during
 account/rule/message handling, paperless will continue with the next
 account/rule/message.

mail handling: When paperless encounters a very long

fixes #82
---
 src/documents/loggers.py              |   4 +-
 src/paperless/settings.py             |   2 +-
 src/paperless_mail/mail.py            | 230 ++++++++++++++------------
 src/paperless_mail/models.py          |   2 +-
 src/paperless_mail/tasks.py           |  14 +-
 src/paperless_mail/tests/test_mail.py |  85 +++++++---
 6 files changed, 197 insertions(+), 140 deletions(-)

diff --git a/src/documents/loggers.py b/src/documents/loggers.py
index 76dbe0163..863bc0c34 100644
--- a/src/documents/loggers.py
+++ b/src/documents/loggers.py
@@ -28,10 +28,10 @@ class LoggingMixin:
     def renew_logging_group(self):
         self.logging_group = uuid.uuid4()
 
-    def log(self, level, message):
+    def log(self, level, message, **kwargs):
         target = ".".join([self.__class__.__module__, self.__class__.__name__])
         logger = logging.getLogger(target)
 
         getattr(logger, level)(message, extra={
             "group": self.logging_group
-        })
+        }, **kwargs)
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 88915c7c5..c7ecf7645 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -274,7 +274,7 @@ LOGGING = {
             "class": "documents.loggers.PaperlessHandler",
         },
         "console": {
-            "level": "WARNING",
+            "level": "INFO",
             "class": "logging.StreamHandler",
             "formatter": "verbose",
         }
diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
index 1ce4fe825..08f7365da 100644
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@ -4,6 +4,7 @@ from datetime import timedelta, date
 
 import magic
 from django.conf import settings
+from django.db import DatabaseError
 from django.utils.text import slugify
 from django_q.tasks import async_task
 from imap_tools import MailBox, MailBoxUnencrypted, AND, MailMessageFlags, \
@@ -86,46 +87,6 @@ def make_criterias(rule):
     return {**criterias, **get_rule_action(rule).get_criteria()}
 
 
-def get_title(message, att, rule):
-    if rule.assign_title_from == MailRule.TITLE_FROM_SUBJECT:
-        title = message.subject
-    elif rule.assign_title_from == MailRule.TITLE_FROM_FILENAME:
-        title = os.path.splitext(os.path.basename(att.filename))[0]
-    else:
-        raise ValueError("Unknown title selector.")
-
-    return title
-
-
-def get_correspondent(message, rule):
-    if rule.assign_correspondent_from == MailRule.CORRESPONDENT_FROM_NOTHING:
-        correspondent = None
-    elif rule.assign_correspondent_from == MailRule.CORRESPONDENT_FROM_EMAIL:
-        correspondent_name = message.from_
-        correspondent = Correspondent.objects.get_or_create(
-            name=correspondent_name, defaults={
-                "slug": slugify(correspondent_name)
-            })[0]
-    elif rule.assign_correspondent_from == MailRule.CORRESPONDENT_FROM_NAME:
-        if message.from_values and \
-           'name' in message.from_values \
-           and message.from_values['name']:
-            correspondent_name = message.from_values['name']
-        else:
-            correspondent_name = message.from_
-
-        correspondent = Correspondent.objects.get_or_create(
-            name=correspondent_name, defaults={
-                "slug": slugify(correspondent_name)
-            })[0]
-    elif rule.assign_correspondent_from == MailRule.CORRESPONDENT_FROM_CUSTOM:
-        correspondent = rule.assign_correspondent
-    else:
-        raise ValueError("Unknwown correspondent selector")
-
-    return correspondent
-
-
 def get_mailbox(server, port, security):
     if security == MailAccount.IMAP_SECURITY_NONE:
         mailbox = MailBoxUnencrypted(server, port)
@@ -140,6 +101,51 @@ def get_mailbox(server, port, security):
 
 class MailAccountHandler(LoggingMixin):
 
+    def _correspondent_from_name(self, name):
+        try:
+            return Correspondent.objects.get_or_create(
+                name=name, defaults={
+                    "slug": slugify(name)
+                })[0]
+        except DatabaseError as e:
+            self.log(
+                "error",
+                f"Error while retrieving correspondent {name}: {e}"
+            )
+            return None
+
+    def get_title(self, message, att, rule):
+        if rule.assign_title_from == MailRule.TITLE_FROM_SUBJECT:
+            return message.subject
+
+        elif rule.assign_title_from == MailRule.TITLE_FROM_FILENAME:
+            return os.path.splitext(os.path.basename(att.filename))[0]
+
+        else:
+            raise ValueError("Unknown title selector.")
+
+    def get_correspondent(self, message, rule):
+        c_from = rule.assign_correspondent_from
+
+        if c_from == MailRule.CORRESPONDENT_FROM_NOTHING:
+            return None
+
+        elif c_from == MailRule.CORRESPONDENT_FROM_EMAIL:
+            return self._correspondent_from_name(message.from_)
+
+        elif c_from == MailRule.CORRESPONDENT_FROM_NAME:
+            if message.from_values and 'name' in message.from_values and message.from_values['name']:  # NOQA: E501
+                return self._correspondent_from_name(
+                    message.from_values['name'])
+            else:
+                return self._correspondent_from_name(message.from_)
+
+        elif c_from == MailRule.CORRESPONDENT_FROM_CUSTOM:
+            return rule.assign_correspondent
+
+        else:
+            raise ValueError("Unknwown correspondent selector")
+
     def handle_mail_account(self, account):
 
         self.renew_logging_group()
@@ -156,79 +162,89 @@ class MailAccountHandler(LoggingMixin):
                 M.login(account.username, account.password)
             except Exception:
                 raise MailError(
-                    f"Error while authenticating account {account.name}")
+                    f"Error while authenticating account {account}")
 
             self.log('debug', f"Account {account}: Processing "
                               f"{account.rules.count()} rule(s)")
 
             for rule in account.rules.order_by('order'):
-                self.log(
-                    'debug',
-                    f"Account {account}: Processing rule {rule.name}")
-
-                self.log(
-                    'debug',
-                    f"Rule {account}.{rule}: Selecting folder {rule.folder}")
-
                 try:
-                    M.folder.set(rule.folder)
-                except MailboxFolderSelectError:
-                    raise MailError(
-                        f"Rule {rule.name}: Folder {rule.folder} "
-                        f"does not exist in account {account.name}")
+                    total_processed_files += self.handle_mail_rule(M, rule)
+                except Exception as e:
+                    self.log(
+                        "error",
+                        f"Rule {rule}: Error while processing rule: {e}",
+                        exc_info=True
+                    )
 
-                criterias = make_criterias(rule)
+        return total_processed_files
 
+    def handle_mail_rule(self, M, rule):
+
+        self.log(
+            'debug',
+            f"Rule {rule}: Selecting folder {rule.folder}")
+
+        try:
+            M.folder.set(rule.folder)
+        except MailboxFolderSelectError:
+            raise MailError(
+                f"Rule {rule}: Folder {rule.folder} "
+                f"does not exist in account {rule.account}")
+
+        criterias = make_criterias(rule)
+
+        self.log(
+            'debug',
+            f"Rule {rule}: Searching folder with criteria "
+            f"{str(AND(**criterias))}")
+
+        try:
+            messages = M.fetch(criteria=AND(**criterias),
+                               mark_seen=False)
+        except Exception:
+            raise MailError(
+                f"Rule {rule}: Error while fetching folder {rule.folder}")
+
+        post_consume_messages = []
+
+        mails_processed = 0
+        total_processed_files = 0
+
+        for message in messages:
+            try:
+                processed_files = self.handle_message(message, rule)
+                if processed_files > 0:
+                    post_consume_messages.append(message.uid)
+
+                total_processed_files += processed_files
+                mails_processed += 1
+            except Exception as e:
                 self.log(
-                    'debug',
-                    f"Rule {account}.{rule}: Searching folder with criteria "
-                    f"{str(AND(**criterias))}")
+                    "error",
+                    f"Rule {rule}: Error while processing mail "
+                    f"{message.uid}: {e}",
+                    exc_info=True)
 
-                try:
-                    messages = M.fetch(criteria=AND(**criterias),
-                                       mark_seen=False)
-                except Exception:
-                    raise MailError(
-                        f"Rule {rule.name}: Error while fetching folder "
-                        f"{rule.folder} of account {account.name}")
+        self.log(
+            'debug',
+            f"Rule {rule}: Processed {mails_processed} matching mail(s)")
 
-                post_consume_messages = []
+        self.log(
+            'debug',
+            f"Rule {rule}: Running mail actions on "
+            f"{len(post_consume_messages)} mails")
 
-                mails_processed = 0
+        try:
+            get_rule_action(rule).post_consume(
+                M,
+                post_consume_messages,
+                rule.action_parameter)
 
-                for message in messages:
-                    try:
-                        processed_files = self.handle_message(message, rule)
-                    except Exception:
-                        raise MailError(
-                            f"Rule {rule.name}: Error while processing mail "
-                            f"{message.uid} of account {account.name}")
-                    if processed_files > 0:
-                        post_consume_messages.append(message.uid)
-
-                    total_processed_files += processed_files
-                    mails_processed += 1
-
-                self.log(
-                    'debug',
-                    f"Rule {account}.{rule}: Processed {mails_processed} "
-                    f"matching mail(s)")
-
-                self.log(
-                    'debug',
-                    f"Rule {account}.{rule}: Running mail actions on "
-                    f"{len(post_consume_messages)} mails")
-
-                try:
-                    get_rule_action(rule).post_consume(
-                        M,
-                        post_consume_messages,
-                        rule.action_parameter)
-
-                except Exception:
-                    raise MailError(
-                        f"Rule {rule.name}: Error while processing "
-                        f"post-consume actions for account {account.name}")
+        except Exception as e:
+            raise MailError(
+                f"Rule {rule}: Error while processing post-consume actions: "
+                f"{e}")
 
         return total_processed_files
 
@@ -238,11 +254,11 @@ class MailAccountHandler(LoggingMixin):
 
         self.log(
             'debug',
-            f"Rule {rule.account}.{rule}: "
+            f"Rule {rule}: "
             f"Processing mail {message.subject} from {message.from_} with "
             f"{len(message.attachments)} attachment(s)")
 
-        correspondent = get_correspondent(message, rule)
+        correspondent = self.get_correspondent(message, rule)
         tag = rule.assign_tag
         doc_type = rule.assign_document_type
 
@@ -253,12 +269,12 @@ class MailAccountHandler(LoggingMixin):
             if not att.content_disposition == "attachment":
                 self.log(
                     'debug',
-                    f"Rule {rule.account}.{rule}: "
+                    f"Rule {rule}: "
                     f"Skipping attachment {att.filename} "
-                    f"with content disposition inline")
+                    f"with content disposition {att.content_disposition}")
                 continue
 
-            title = get_title(message, att, rule)
+            title = self.get_title(message, att, rule)
 
             # don't trust the content type of the attachment. Could be
             # generic application/octet-stream.
@@ -274,7 +290,7 @@ class MailAccountHandler(LoggingMixin):
 
                 self.log(
                     'info',
-                    f"Rule {rule.account}.{rule}: "
+                    f"Rule {rule}: "
                     f"Consuming attachment {att.filename} from mail "
                     f"{message.subject} from {message.from_}")
 
@@ -293,7 +309,7 @@ class MailAccountHandler(LoggingMixin):
             else:
                 self.log(
                     'debug',
-                    f"Rule {rule.account}.{rule}: "
+                    f"Rule {rule}: "
                     f"Skipping attachment {att.filename} "
                     f"since guessed mime type {mime_type} is not supported "
                     f"by paperless")
diff --git a/src/paperless_mail/models.py b/src/paperless_mail/models.py
index fbcfaf980..aa1ac5684 100644
--- a/src/paperless_mail/models.py
+++ b/src/paperless_mail/models.py
@@ -139,4 +139,4 @@ class MailRule(models.Model):
     )
 
     def __str__(self):
-        return self.name
+        return f"{self.account.name}.{self.name}"
diff --git a/src/paperless_mail/tasks.py b/src/paperless_mail/tasks.py
index 2eb4cbf74..68fb859a4 100644
--- a/src/paperless_mail/tasks.py
+++ b/src/paperless_mail/tasks.py
@@ -1,14 +1,20 @@
 import logging
 
-from paperless_mail.mail import MailAccountHandler
+from paperless_mail.mail import MailAccountHandler, MailError
 from paperless_mail.models import MailAccount
 
 
 def process_mail_accounts():
     total_new_documents = 0
     for account in MailAccount.objects.all():
-        total_new_documents += MailAccountHandler().handle_mail_account(
-            account)
+        try:
+            total_new_documents += MailAccountHandler().handle_mail_account(
+                account)
+        except MailError as e:
+            logging.getLogger(__name__).error(
+                f"Error while processing mail account {account}: {e}",
+                exc_info=True
+            )
 
     if total_new_documents > 0:
         return f"Added {total_new_documents} document(s)."
@@ -21,4 +27,4 @@ def process_mail_account(name):
         account = MailAccount.objects.get(name=name)
         MailAccountHandler().handle_mail_account(account)
     except MailAccount.DoesNotExist:
-        logging.error("Unknown mail acccount: {}".format(name))
+        logging.getLogger(__name__).error(f"Unknown mail acccount: {name}")
diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py
index 6a737cfa5..3cd3e8499 100644
--- a/src/paperless_mail/tests/test_mail.py
+++ b/src/paperless_mail/tests/test_mail.py
@@ -4,12 +4,13 @@ from typing import ContextManager
 from unittest import mock
 
 from django.core.management import call_command
+from django.db import DatabaseError
 from django.test import TestCase
 from imap_tools import MailMessageFlags, MailboxFolderSelectError
 
 from documents.models import Correspondent
 from paperless_mail import tasks
-from paperless_mail.mail import MailError, MailAccountHandler, get_correspondent, get_title
+from paperless_mail.mail import MailError, MailAccountHandler
 from paperless_mail.models import MailRule, MailAccount
 
 
@@ -165,28 +166,30 @@ class TestMail(TestCase):
         me_localhost = Correspondent.objects.create(name=message2.from_)
         someone_else = Correspondent.objects.create(name="someone else")
 
+        handler = MailAccountHandler()
+
         rule = MailRule(name="a", assign_correspondent_from=MailRule.CORRESPONDENT_FROM_NOTHING)
-        self.assertIsNone(get_correspondent(message, rule))
+        self.assertIsNone(handler.get_correspondent(message, rule))
 
         rule = MailRule(name="b", assign_correspondent_from=MailRule.CORRESPONDENT_FROM_EMAIL)
-        c = get_correspondent(message, rule)
+        c = handler.get_correspondent(message, rule)
         self.assertIsNotNone(c)
         self.assertEqual(c.name, "someone@somewhere.com")
-        c = get_correspondent(message2, rule)
+        c = handler.get_correspondent(message2, rule)
         self.assertIsNotNone(c)
         self.assertEqual(c.name, "me@localhost.com")
         self.assertEqual(c.id, me_localhost.id)
 
         rule = MailRule(name="c", assign_correspondent_from=MailRule.CORRESPONDENT_FROM_NAME)
-        c = get_correspondent(message, rule)
+        c = handler.get_correspondent(message, rule)
         self.assertIsNotNone(c)
         self.assertEqual(c.name, "Someone!")
-        c = get_correspondent(message2, rule)
+        c = handler.get_correspondent(message2, rule)
         self.assertIsNotNone(c)
         self.assertEqual(c.id, me_localhost.id)
 
         rule = MailRule(name="d", assign_correspondent_from=MailRule.CORRESPONDENT_FROM_CUSTOM, assign_correspondent=someone_else)
-        c = get_correspondent(message, rule)
+        c = handler.get_correspondent(message, rule)
         self.assertEqual(c, someone_else)
 
     def test_get_title(self):
@@ -194,10 +197,13 @@ class TestMail(TestCase):
         message.subject = "the message title"
         att = namedtuple('Attachment', [])
         att.filename = "this_is_the_file.pdf"
+
+        handler = MailAccountHandler()
+
         rule = MailRule(name="a", assign_title_from=MailRule.TITLE_FROM_FILENAME)
-        self.assertEqual(get_title(message, att, rule), "this_is_the_file")
+        self.assertEqual(handler.get_title(message, att, rule), "this_is_the_file")
         rule = MailRule(name="b", assign_title_from=MailRule.TITLE_FROM_SUBJECT)
-        self.assertEqual(get_title(message, att, rule), "the message title")
+        self.assertEqual(handler.get_title(message, att, rule), "the message title")
 
     def test_handle_message(self):
         message = create_message(subject="the message title", from_="Myself", num_attachments=2)
@@ -319,7 +325,7 @@ class TestMail(TestCase):
         self.assertEqual(len(self.bogus_mailbox.messages), 2)
         self.assertEqual(len(self.bogus_mailbox.messages_spam), 1)
 
-    def test_errors(self):
+    def test_error_login(self):
         account = MailAccount.objects.create(name="test", imap_server="", username="admin", password="wrong")
 
         try:
@@ -329,26 +335,55 @@ class TestMail(TestCase):
         else:
             self.fail("Should raise exception")
 
+    def test_error_skip_account(self):
+        account_faulty = MailAccount.objects.create(name="test", imap_server="", username="admin", password="wroasdng")
+
         account = MailAccount.objects.create(name="test2", imap_server="", username="admin", password="secret")
-        rule = MailRule.objects.create(name="testrule", account=account, folder="uuuh")
+        rule = MailRule.objects.create(name="testrule", account=account, action=MailRule.ACTION_MOVE,
+                                       action_parameter="spam", filter_subject="Claim")
 
-        try:
-            self.mail_account_handler.handle_mail_account(account)
-        except MailError as e:
-            self.assertTrue("uuuh does not exist" in str(e))
-        else:
-            self.fail("Should raise exception")
+        tasks.process_mail_accounts()
+        self.assertEqual(self.async_task.call_count, 1)
+        self.assertEqual(len(self.bogus_mailbox.messages), 2)
+        self.assertEqual(len(self.bogus_mailbox.messages_spam), 1)
 
-        account = MailAccount.objects.create(name="test3", imap_server="", username="admin", password="secret")
+    def test_error_skip_rule(self):
 
-        rule = MailRule.objects.create(name="testrule2", account=account, action=MailRule.ACTION_MOVE, action_parameter="doesnotexist", filter_subject="Claim")
+        account = MailAccount.objects.create(name="test2", imap_server="", username="admin", password="secret")
+        rule = MailRule.objects.create(name="testrule", account=account, action=MailRule.ACTION_MOVE,
+                                       action_parameter="spam", filter_subject="Claim", order=1, folder="uuuhhhh")
+        rule2 = MailRule.objects.create(name="testrule2", account=account, action=MailRule.ACTION_MOVE,
+                                       action_parameter="spam", filter_subject="Claim", order=2)
+
+        self.mail_account_handler.handle_mail_account(account)
+        self.assertEqual(self.async_task.call_count, 1)
+        self.assertEqual(len(self.bogus_mailbox.messages), 2)
+        self.assertEqual(len(self.bogus_mailbox.messages_spam), 1)
+
+
+    @mock.patch("paperless_mail.mail.MailAccountHandler.get_correspondent")
+    def test_error_skip_mail(self, m):
+
+        def get_correspondent_fake(message, rule):
+            if message.from_ == 'amazon@amazon.de':
+                raise ValueError("Does not compute.")
+            else:
+                return None
+
+        m.side_effect = get_correspondent_fake
+
+        account = MailAccount.objects.create(name="test2", imap_server="", username="admin", password="secret")
+        rule = MailRule.objects.create(name="testrule", account=account, action=MailRule.ACTION_MOVE, action_parameter="spam")
+
+        self.mail_account_handler.handle_mail_account(account)
+
+        # test that we still consume mail even if some mails throw errors.
+        self.assertEqual(self.async_task.call_count, 2)
+
+        # faulty mail still in inbox, untouched
+        self.assertEqual(len(self.bogus_mailbox.messages), 1)
+        self.assertEqual(self.bogus_mailbox.messages[0].from_, 'amazon@amazon.de')
 
-        try:
-            self.mail_account_handler.handle_mail_account(account)
-        except MailError as e:
-            self.assertTrue("Error while processing post-consume actions" in str(e))
-        else:
-            self.fail("Should raise exception")
 
     def test_filters(self):
 

From ab871d67fcb0f768b3b7ececfba66c2834d5dd82 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 15:56:26 +0100
Subject: [PATCH 0036/1300] more tests

---
 src/paperless_mail/tests/test_mail.py | 29 +++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py
index 3cd3e8499..2a391a268 100644
--- a/src/paperless_mail/tests/test_mail.py
+++ b/src/paperless_mail/tests/test_mail.py
@@ -384,6 +384,35 @@ class TestMail(TestCase):
         self.assertEqual(len(self.bogus_mailbox.messages), 1)
         self.assertEqual(self.bogus_mailbox.messages[0].from_, 'amazon@amazon.de')
 
+    def test_error_create_correspondent(self):
+
+        account = MailAccount.objects.create(name="test2", imap_server="", username="admin", password="secret")
+        rule = MailRule.objects.create(
+            name="testrule", filter_from="amazon@amazon.de",
+            account=account, action=MailRule.ACTION_MOVE, action_parameter="spam",
+            assign_correspondent_from=MailRule.CORRESPONDENT_FROM_EMAIL)
+
+        self.mail_account_handler.handle_mail_account(account)
+
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+
+        c = Correspondent.objects.get(name="amazon@amazon.de")
+        # should work
+        self.assertEquals(kwargs['override_correspondent_id'], c.id)
+
+        self.async_task.reset_mock()
+        self.reset_bogus_mailbox()
+
+        with mock.patch("paperless_mail.mail.Correspondent.objects.get_or_create") as m:
+            m.side_effect = DatabaseError()
+
+            self.mail_account_handler.handle_mail_account(account)
+
+        args, kwargs = self.async_task.call_args
+        self.async_task.assert_called_once()
+        self.assertEquals(kwargs['override_correspondent_id'], None)
+
 
     def test_filters(self):
 

From 34bc4020c9b7622a1c07ee4878bf50836b2dcc59 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 16:07:31 +0100
Subject: [PATCH 0037/1300] documentation

---
 docs/administration.rst | 10 ++++++++--
 docs/changelog.rst      | 15 ++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/docs/administration.rst b/docs/administration.rst
index 2acae86f0..001d608e1 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -349,10 +349,11 @@ This command creates PDF/A documents for your documents.
 
 .. code::
 
-    document_archiver --overwrite
+    document_archiver --overwrite --document <id>
 
 This command will only attempt to create archived documents when no archived
-document exists yet, unless ``--overwrite`` is specified.
+document exists yet, unless ``--overwrite`` is specified. If ``--document <id>``
+is specified, the archiver will only process that document.
 
 .. note::
 
@@ -362,6 +363,11 @@ document exists yet, unless ``--overwrite`` is specified.
     at any time, since this command will skip already archived versions the next time
     it is run.
 
+.. note::
+
+    Some documents will cause errors and cannot be converted into PDF/A documents,
+    such as encrypted PDF documents. The archiver will skip over these Documents
+    each time it sees them.
 
 .. _utilities-encyption:
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 40b45d1b1..d5c48b2dc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,15 +8,14 @@ Changelog
 paperless-ng 0.9.5
 ##################
 
-Apart from the API, this finalizes the changes I wanted to get into paperless before 1.0. The next releases will
-focus on fixing bugs, minor changes to the UI, and possibly some changes to the API.
-
 * OCR
 
   * Paperless now uses `OCRmyPDF <https://github.com/jbarlow83/OCRmyPDF>`_ to perform OCR on documents.
+    It still uses tesseract under the hood, but the PDF parser of Paperless has changed considerably and
+    will behave different for some douments.
   * OCRmyPDF creates archived PDF/A documents with embedded text that can be selected in the front end.
   * Paperless stores archived versions of documents alongside with the originals. The originals can be
-    accessed on the document edit page, if available.
+    accessed on the document edit page. If available, a dropdown menu will appear next to the download button.
   * Many of the configuration options regarding OCR have changed. See :ref:`configuration-ocr` for details.
   * Paperless no longer guesses the language of your documents. It always uses the language that you
     specified with ``PAPERLESS_OCR_LANGUAGE``. Be sure to set this to the language the majority of your
@@ -34,8 +33,8 @@ focus on fixing bugs, minor changes to the UI, and possibly some changes to the
 
   * The API now offers token authentication.
   * The endpoint for uploading documents now supports specifying custom titles, correspondents, tags and types.
-    This can be used by clients to override the default behavior of paperless.
-  * The document endpoint of API now serves document in this form:
+    This can be used by clients to override the default behavior of paperless. See :ref:`api-file_uploads`.
+  * The document endpoint of API now serves documents in this form:
 
     * correspondents, document types and tags are referenced by their ID in the fields ``correspondent``, ``document_type`` and ``tags``. The ``*_id`` versions are gone. These fields are read/write.
     * paperless does not serve nested tags, correspondents or types anymore.
@@ -43,13 +42,15 @@ focus on fixing bugs, minor changes to the UI, and possibly some changes to the
 * Front end
 
   * Paperless does some basic caching of correspondents, tags and types and will only request them from the server when necessary or when entirely reloading the page.
-  * Document lists should be somewhat faster now, especially when lots of tags/correspondents where present.
+  * Document list fetching is about 10%-30% faster now, especially when lots of tags/correspondents are present.
   * Some minor improvements to the front end, such as document count in the document list, better highlighting of the current page, and improvements to the filter behavior.
 
 * Fixes:
 
   * A bug with the generation of filenames for files with unsupported types caused the exporter and
     document saving to crash.
+  * Mail handling no longer exits entirely when encountering errors. It will skip the account/rule/message on which the error occured.
+  * Assigning correspondents from mail sender names failed for very long names. Paperless no longer assigns correspondents in these cases.
 
 paperless-ng 0.9.4
 ##################

From dab4b1253a60c9e71ed3b30062159f6c185a822e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 16:44:34 +0100
Subject: [PATCH 0038/1300] fixes for the parser.

---
 src/paperless_tesseract/parsers.py | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 454617728..ebd706cdd 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -83,13 +83,27 @@ class RasterisedDocumentParser(DocumentParser):
             return None
 
     def parse(self, document_path, mime_type):
+        mode = settings.OCR_MODE
+
         text_original = get_text_from_pdf(document_path)
         has_text = text_original and len(text_original) > 50
 
-        if settings.OCR_MODE == "skip_noarchive" and has_text:
+        if mode == "skip_noarchive" and has_text:
+            self.log("debug",
+                     "Document has text, skipping OCRmyPDF entirely.")
             self.text = text_original
             return
 
+        if mode in ['skip', 'skip_noarchive'] and not has_text:
+            # upgrade to redo, since there appears to be no text in the
+            # document. This happens to some weird encrypted documents or
+            # documents with failed OCR attempts for which OCRmyPDF will
+            # still report that there actually is text in them.
+            self.log("debug",
+                     "No text was found in the document and skip is "
+                     "specified. Upgrading OCR mode to redo.")
+            mode = "redo"
+
         archive_path = os.path.join(self.tempdir, "archive.pdf")
 
         ocr_args = {
@@ -108,12 +122,15 @@ class RasterisedDocumentParser(DocumentParser):
 
         # Mode selection.
 
-        if settings.OCR_MODE in ['skip', 'skip_noarchive']:
+        if mode in ['skip', 'skip_noarchive']:
             ocr_args['skip_text'] = True
-        elif settings.OCR_MODE == 'redo':
+        elif mode == 'redo':
             ocr_args['redo_ocr'] = True
-        elif settings.OCR_MODE == 'force':
+        elif mode == 'force':
             ocr_args['force_ocr'] = True
+        else:
+            raise ParseError(
+                f"Invalid ocr mode: {mode}")
 
         if self.is_image(mime_type):
             dpi = self.get_dpi(document_path)
@@ -153,6 +170,10 @@ class RasterisedDocumentParser(DocumentParser):
             self.text = get_text_from_pdf(archive_path)
 
         except (InputFileError, EncryptedPdfError) as e:
+
+            self.log("debug",
+                     f"Encountered an error: {e}. Trying to use text from "
+                     f"original.")
             # This happens with some PDFs when used with the redo_ocr option.
             # This is not the end of the world, we'll just use what we already
             # have in the document.

From 5456d5eafac5e86814922323ba76999f507242df Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 23:07:11 +0100
Subject: [PATCH 0039/1300] bugfix

---
 .../app/components/document-list/document-list.component.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 3a4f17196..5637bff97 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -3,9 +3,6 @@ import { ActivatedRoute } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { cloneFilterRules, FilterRule } from 'src/app/data/filter-rule';
 import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
-import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
-import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
-import { PaperlessTag } from 'src/app/data/paperless-tag';
 import { SavedViewConfig } from 'src/app/data/saved-view-config';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
@@ -49,11 +46,12 @@ export class DocumentListComponent implements OnInit {
       this.displayMode = localStorage.getItem('document-list:displayMode')
     }
     this.route.paramMap.subscribe(params => {
-      this.filterRules = this.list.filterRules
       if (params.has('id')) {
         this.list.savedView = this.savedViewConfigService.getConfig(params.get('id'))
+        this.filterRules = this.list.filterRules
       } else {
         this.list.savedView = null
+        this.filterRules = this.list.filterRules
         this.showFilter = this.filterRules.length > 0
       }
       this.list.clear()

From e9758d5224d463ff2cac13c2db4de7ca3c743387 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 4 Dec 2020 23:16:04 +0100
Subject: [PATCH 0040/1300] bugfix

---
 .../src/app/components/document-list/document-list.component.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 5637bff97..fe6c8a894 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -49,6 +49,7 @@ export class DocumentListComponent implements OnInit {
       if (params.has('id')) {
         this.list.savedView = this.savedViewConfigService.getConfig(params.get('id'))
         this.filterRules = this.list.filterRules
+        this.showFilter = false
       } else {
         this.list.savedView = null
         this.filterRules = this.list.filterRules

From f88cf691731fed3c0aef5da931df139a52d26a62 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 5 Dec 2020 00:37:05 +0100
Subject: [PATCH 0041/1300] bugfix

---
 src/documents/index.py                          |  5 +++++
 .../management/commands/document_archiver.py    | 17 +++++++++++------
 src/documents/tests/test_management_archiver.py |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/documents/index.py b/src/documents/index.py
index b4d6e1c51..53bf34542 100644
--- a/src/documents/index.py
+++ b/src/documents/index.py
@@ -82,6 +82,10 @@ def open_index(recreate=False):
 
 
 def update_document(writer, doc):
+    # TODO: this line caused many issues all around, since:
+    #  We need to make sure that this method does not get called with
+    #  deserialized documents (i.e, document objects that don't come from
+    #  Django's ORM interfaces directly.
     logger.debug("Indexing {}...".format(doc))
     tags = ",".join([t.name for t in doc.tags.all()])
     writer.update_document(
@@ -98,6 +102,7 @@ def update_document(writer, doc):
 
 
 def remove_document(writer, doc):
+    # TODO: see above.
     logger.debug("Removing {} from index...".format(doc))
     writer.delete_by_term('id', doc.pk)
 
diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index aba2ea693..2e7e7b34d 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -23,7 +23,9 @@ from ...parsers import get_parser_class_for_mime_type
 logger = logging.getLogger(__name__)
 
 
-def handle_document(document):
+def handle_document(document_id):
+    document = Document.objects.get(id=document_id)
+
     mime_type = document.mime_type
 
     parser_class = get_parser_class_for_mime_type(mime_type)
@@ -98,9 +100,12 @@ class Command(Renderable, BaseCommand):
         else:
             documents = Document.objects.all()
 
-        documents_to_process = list(filter(
-            lambda d: overwrite or not d.archive_checksum,
-            documents
+        document_ids = list(map(
+            lambda doc: doc.id,
+            filter(
+                lambda d: overwrite or not d.archive_checksum,
+                documents
+            )
         ))
 
         logging.getLogger().handlers[0].level = logging.ERROR
@@ -108,7 +113,7 @@ class Command(Renderable, BaseCommand):
             list(tqdm.tqdm(
                 pool.imap_unordered(
                     handle_document,
-                    documents_to_process
+                    document_ids
                 ),
-                total=len(documents_to_process)
+                total=len(document_ids)
             ))
diff --git a/src/documents/tests/test_management_archiver.py b/src/documents/tests/test_management_archiver.py
index ec4fc5ac4..fdb588acf 100644
--- a/src/documents/tests/test_management_archiver.py
+++ b/src/documents/tests/test_management_archiver.py
@@ -32,7 +32,7 @@ class TestArchiver(DirectoriesMixin, TestCase):
         shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, "0000001.pdf"))
         self.make_models()
 
-        handle_document(self.d1)
+        handle_document(self.d1.pk)
 
         doc = Document.objects.get(id=self.d1.id)
 

From 316ee72177b3125f422faa30048adb04c5ffb9f6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 5 Dec 2020 01:21:16 +0100
Subject: [PATCH 0042/1300] bugfix

---
 .../management/commands/document_archiver.py  | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index 2e7e7b34d..7b9a123d9 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -5,9 +5,9 @@ import logging
 import os
 import shutil
 import uuid
-from time import sleep
 
 import tqdm
+from django import db
 from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db import transaction
@@ -108,12 +108,21 @@ class Command(Renderable, BaseCommand):
             )
         ))
 
-        logging.getLogger().handlers[0].level = logging.ERROR
-        with multiprocessing.Pool(processes=settings.TASK_WORKERS) as pool:
-            list(tqdm.tqdm(
-                pool.imap_unordered(
-                    handle_document,
-                    document_ids
-                ),
-                total=len(document_ids)
-            ))
+        # Note to future self: this prevents django from reusing database
+        # conncetions between processes, which is bad and does not work
+        # with postgres.
+        db.connections.close_all()
+
+        try:
+
+            logging.getLogger().handlers[0].level = logging.ERROR
+            with multiprocessing.Pool(processes=settings.TASK_WORKERS) as pool:
+                list(tqdm.tqdm(
+                    pool.imap_unordered(
+                        handle_document,
+                        document_ids
+                    ),
+                    total=len(document_ids)
+                ))
+        except KeyboardInterrupt:
+            print("Aborting...")

From 782dbee3a0f43554709af7c2de59e8415f4d079e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 5 Dec 2020 01:23:17 +0100
Subject: [PATCH 0043/1300] removed obsolete option

---
 docker/docker-compose.env | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docker/docker-compose.env b/docker/docker-compose.env
index 9c13e8448..4271bce6e 100644
--- a/docker/docker-compose.env
+++ b/docker/docker-compose.env
@@ -32,8 +32,3 @@
 # The default language to use for OCR. Set this to the language most of your
 # documents are written in.
 #PAPERLESS_OCR_LANGUAGE=eng
-
-# By default Paperless does not OCR a document if the text can be retrieved from
-# the document directly. Set to true to always OCR documents. (i.e., if you
-# know that some of your documents have faulty/bad OCR data)
-#PAPERLESS_OCR_ALWAYS=true

From 1e9e347f15b427830ded3b05978666983b850893 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 5 Dec 2020 12:52:49 +0100
Subject: [PATCH 0044/1300] documentation

---
 docs/api.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/api.rst b/docs/api.rst
index 4c9ae0b13..81334b9ec 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -109,6 +109,7 @@ Result list object returned by the endpoint:
         "count": 1,
         "page": 1,
         "page_count": 1,
+        "corrected_query": "",
         "results": [
             
         ]
@@ -119,6 +120,8 @@ Result list object returned by the endpoint:
     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:

From bfbdd6e198b1537ac563789cdce255d93e09aa36 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 5 Dec 2020 13:19:14 +0100
Subject: [PATCH 0045/1300] testing the importer

---
 .../tests/test_management_exporter.py         | 20 ++++++++++++++-----
 src/documents/tests/utils.py                  | 18 +++++++++++++++--
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index dca2114c2..284d6108d 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -9,10 +9,11 @@ from django.test import TestCase, override_settings
 
 from documents.management.commands import document_exporter
 from documents.models import Document, Tag, DocumentType, Correspondent
-from documents.tests.utils import DirectoriesMixin
+from documents.sanity_checker import check_sanity
+from documents.tests.utils import DirectoriesMixin, paperless_environment
 
 
-class TestExporter(DirectoriesMixin, TestCase):
+class TestExportImport(DirectoriesMixin, TestCase):
 
     @override_settings(
         PASSPHRASE="test"
@@ -23,8 +24,8 @@ class TestExporter(DirectoriesMixin, TestCase):
 
         file = os.path.join(self.dirs.originals_dir, "0000001.pdf")
 
-        Document.objects.create(checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow", filename="0000001.pdf", id=1, mime_type="application/pdf")
-        Document.objects.create(checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg", id=2, mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
+        Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow", filename="0000001.pdf", id=1, mime_type="application/pdf")
+        Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg", id=2, mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
         Tag.objects.create(name="t")
         DocumentType.objects.create(name="dt")
         Correspondent.objects.create(name="c")
@@ -56,6 +57,15 @@ class TestExporter(DirectoriesMixin, TestCase):
                         checksum = hashlib.md5(f.read()).hexdigest()
                     self.assertEqual(checksum, element['fields']['archive_checksum'])
 
-        Document.objects.create(checksum="AAAAAAAAAAAAAAAAA", title="wow", filename="0000004.pdf", id=3, mime_type="application/pdf")
+        with paperless_environment() as dirs:
+            call_command('document_importer', target)
+            messages = check_sanity()
+            # everything is alright after the test
+            self.assertEqual(len(messages), 0, str([str(m) for m in messages]))
 
+    def test_export_missing_files(self):
+
+        target = tempfile.mkdtemp()
+        call_command('document_exporter', target)
+        Document.objects.create(checksum="AAAAAAAAAAAAAAAAA", title="wow", filename="0000004.pdf", id=3, mime_type="application/pdf")
         self.assertRaises(FileNotFoundError, call_command, 'document_exporter', target)
diff --git a/src/documents/tests/utils.py b/src/documents/tests/utils.py
index 38788f6d6..7f9d50ed5 100644
--- a/src/documents/tests/utils.py
+++ b/src/documents/tests/utils.py
@@ -2,6 +2,7 @@ import os
 import shutil
 import tempfile
 from collections import namedtuple
+from contextlib import contextmanager
 
 from django.test import override_settings
 
@@ -24,7 +25,7 @@ def setup_directories():
     os.makedirs(dirs.thumbnail_dir, exist_ok=True)
     os.makedirs(dirs.archive_dir, exist_ok=True)
 
-    override_settings(
+    dirs.settings_override = override_settings(
         DATA_DIR=dirs.data_dir,
         SCRATCH_DIR=dirs.scratch_dir,
         MEDIA_ROOT=dirs.media_dir,
@@ -35,7 +36,8 @@ def setup_directories():
         INDEX_DIR=dirs.index_dir,
         MODEL_FILE=os.path.join(dirs.data_dir, "classification_model.pickle")
 
-    ).enable()
+    )
+    dirs.settings_override.enable()
 
     return dirs
 
@@ -45,6 +47,18 @@ def remove_dirs(dirs):
     shutil.rmtree(dirs.data_dir, ignore_errors=True)
     shutil.rmtree(dirs.scratch_dir, ignore_errors=True)
     shutil.rmtree(dirs.consumption_dir, ignore_errors=True)
+    dirs.settings_override.disable()
+
+
+@contextmanager
+def paperless_environment():
+    dirs = None
+    try:
+        dirs = setup_directories()
+        yield dirs
+    finally:
+        if dirs:
+            remove_dirs(dirs)
 
 
 class DirectoriesMixin:

From 9ee21f081f15b30f3e8de1ea14bf95a0523369e1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 5 Dec 2020 13:22:08 +0100
Subject: [PATCH 0046/1300] versions

---
 docker/hub/docker-compose.postgres.yml | 2 +-
 docker/hub/docker-compose.sqlite.yml   | 2 +-
 src/paperless/version.py               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index 9848b3e05..295d981e1 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.4
+    image: jonaswinkler/paperless-ng:0.9.5
     restart: always
     depends_on:
       - db
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index 7331b64ba..80df40596 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.4
+    image: jonaswinkler/paperless-ng:0.9.5
     restart: always
     depends_on:
       - broker
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 23bd5f157..26e46fea8 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (0, 9, 4)
+__version__ = (0, 9, 5)

From 55cc93e5e96f463fc74ca330b08ecea9ba956eb3 Mon Sep 17 00:00:00 2001
From: Johann Bauer <bauerj@bauerj.eu>
Date: Sat, 5 Dec 2020 13:38:09 +0100
Subject: [PATCH 0047/1300] Add missing step to migration guide

---
 docs/setup.rst | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index 746c0aa0d..d3a063302 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -404,7 +404,14 @@ Migration to paperless-ng is then performed in a few simple steps:
     ``docker-compose.env`` to your needs.
     See `docker route`_ for details on which edits are advised.
 
-6.  In order to find your existing documents with the new search feature, you need
+6.  Since ``docker-compose`` would just use the the old paperless image, we need to
+    manually build a new image:
+
+    .. code:: shell-session
+
+        $ docker-compose build
+
+7.  In order to find your existing documents with the new search feature, you need
     to invoke a one-time operation that will create the search index:
 
     .. code:: shell-session
@@ -414,7 +421,7 @@ Migration to paperless-ng is then performed in a few simple steps:
     This will migrate your database and create the search index. After that,
     paperless will take care of maintaining the index by itself.
 
-7.  Start paperless-ng.
+8.  Start paperless-ng.
 
     .. code:: bash
 
@@ -422,11 +429,11 @@ Migration to paperless-ng is then performed in a few simple steps:
 
     This will run paperless in the background and automatically start it on system boot.
 
-8.  Paperless installed a permanent redirect to ``admin/`` in your browser. This
+9.  Paperless installed a permanent redirect to ``admin/`` in your browser. This
     redirect is still in place and prevents access to the new UI. Clear
     browsing cache in order to fix this.
 
-9.  Optionally, follow the instructions below to migrate your existing data to PostgreSQL.
+10.  Optionally, follow the instructions below to migrate your existing data to PostgreSQL.
 
 
 .. _setup-sqlite_to_psql:

From 38a651c42a774a7aef68582c54d2ca07c20bf1db Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 5 Dec 2020 13:53:03 +0100
Subject: [PATCH 0048/1300] docs

---
 docs/changelog.rst       |  3 ++
 docs/faq.rst             | 12 +++++++
 docs/troubleshooting.rst | 74 ++++++----------------------------------
 3 files changed, 26 insertions(+), 63 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d5c48b2dc..116c2e07c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,9 @@ Changelog
 paperless-ng 0.9.5
 ##################
 
+This release concludes the big changes I wanted to get rolled into paperless. The next releases before 1.0 will
+focus on fixing issues, primarily.
+
 * OCR
 
   * Paperless now uses `OCRmyPDF <https://github.com/jbarlow83/OCRmyPDF>`_ to perform OCR on documents.
diff --git a/docs/faq.rst b/docs/faq.rst
index 9a5e73ea5..887946074 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -86,3 +86,15 @@ the documentation has instructions for bare metal installs. I'm running
 paperless on an i3 processor from 2015 or so. This is also what I use to test
 new releases with. Apart from that, I also have a Raspberry Pi, which I
 occasionally build the image on and see if it works.
+
+**Q:** *How do I proxy this with NGINX?*
+
+.. code::
+
+    location / {
+        proxy_pass http://localhost:8000/
+    }
+
+And that's about it. Paperless serves everything, including static files by itself
+when running the docker image. If you want to do anything fancy, you have to
+install paperless bare metal.
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index 9e1c42f4a..dc5bf7f5d 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -29,75 +29,23 @@ Check for the following issues:
 Consumer fails to pickup any new files
 ######################################
 
-If you notice, that the consumer will only pickup files in the consumption
+If you notice that the consumer will only pickup files in the consumption
 directory at startup, but won't find any other files added later, check out
 the configuration file and enable filesystem polling with the setting
 ``PAPERLESS_CONSUMER_POLLING``.
 
+Operation not permitted
+#######################
 
-Consumer warns ``OCR for XX failed``
-####################################
+You might see errors such as:
 
-If you find the OCR accuracy to be too low, and/or the document consumer warns
-that ``OCR for XX failed, but we're going to stick with what we've got since
-FORGIVING_OCR is enabled``, then you might need to install the
-`Tesseract language files <http://packages.ubuntu.com/search?keywords=tesseract-ocr>`_
-marching your document's languages.
+.. code::
 
-As an example, if you are running Paperless from any Ubuntu or Debian
-box, and your documents are written in Spanish you may need to run::
+    chown: changing ownership of '../export': Operation not permitted
 
-    apt-get install -y tesseract-ocr-spa
+The container tries to set file ownership on the listed directories. This is
+required so that the user running paperless inside docker has write permissions
+to these folders. This happens when pointing these directories to NFS shares,
+for example.
 
-
-
-Consumer dies with ``convert: unable to extent pixel cache``
-############################################################
-
-During the consumption process, Paperless invokes ImageMagick's ``convert``
-program to translate the source document into something that the OCR engine can
-understand and this can burn a Very Large amount of memory if the original
-document is rather long.  Similarly, if your system doesn't have a lot of
-memory to begin with (ie. a Raspberry Pi), then this can happen for even
-medium-sized documents.
-
-The solution is to tell ImageMagick *not* to Use All The RAM, as is its
-default, and instead tell it to used a fixed amount.  ``convert`` will then
-break up the job into hundreds of individual files and use them to slowly
-compile the finished image.  Simply set ``PAPERLESS_CONVERT_MEMORY_LIMIT`` in
-``/etc/paperless.conf`` to something like ``32000000`` and you'll limit
-``convert`` to 32MB.  Fiddle with this value as you like.
-
-**HOWEVER**: Simply setting this value may not be enough on system where
-``/tmp`` is mounted as tmpfs, as this is where ``convert`` will write its
-temporary files.  In these cases (most Systemd machines), you need to tell
-ImageMagick to use a different space for its scratch work.  You do this by
-setting ``PAPERLESS_CONVERT_TMPDIR`` in ``/etc/paperless.conf`` to somewhere
-that's actually on a physical disk (and writable by the user running
-Paperless), like ``/var/tmp/paperless`` or ``/home/my_user/tmp`` in a pinch.
-
-
-DecompressionBombWarning and/or no text in the OCR output
-#########################################################
-
-Some users have had issues using Paperless to consume PDFs that were created
-by merging Very Large Scanned Images into one PDF.  If this happens to you,
-it's likely because the PDF you've created contains some very large pages
-(millions of pixels) and the process of converting the PDF to a OCR-friendly
-image is exploding.
-
-Typically, this happens because the scanned images are created with a high
-DPI and then rolled into the PDF with an assumed DPI of 72 (the default).
-The best solution then is to specify the DPI used in the scan in the
-conversion-to-PDF step.  So for example, if you scanned the original image
-with a DPI of 300, then merging the images into the single PDF with
-``convert`` should look like this:
-
-.. code:: bash
-
-    $ convert -density 300 *.jpg finished.pdf
-
-For more information on this and situations like it, you should take a look
-at `Issue #118`_ as that's where this tip originated.
-
-.. _Issue #118: https://github.com/the-paperless-project/paperless/issues/118
+Ensure that `chown` is possible on these directories.

From aacd3622031a1a765240c0e7e097ca8ded7f46c6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 5 Dec 2020 13:53:11 +0100
Subject: [PATCH 0049/1300] docs config

---
 docs/conf.py | 51 +++++----------------------------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 7ebc82ea7..b2442ddc9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,48 +1,21 @@
-# -*- coding: utf-8 -*-
-#
-# Paperless documentation build configuration file, created by
-# sphinx-quickstart on Mon Oct 26 18:36:52 2015.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
+import sphinx_rtd_theme
+
 
 __version__ = None
 exec(open("../src/paperless/version.py").read())
 
 
-# Believe it or not, this is the officially sanctioned way to add custom CSS.
-def setup(app):
-    app.add_stylesheet("custom.css")
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
     'sphinx.ext.imgmath',
     'sphinx.ext.viewcode',
+    'sphinx_rtd_theme',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+# templates_path = ['_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -115,7 +88,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -195,20 +168,6 @@ html_static_path = ['_static']
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'paperless'
 
-
-#
-# Attempt to use the ReadTheDocs theme.  If it's not installed, fallback to
-# the default.
-#
-
-try:
-    import sphinx_rtd_theme
-    html_theme = "sphinx_rtd_theme"
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-except ImportError as e:
-    print("error " + str(e))
-    pass
-
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {

From d52260468c79641462c86a7e517b09490acfe6f2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 5 Dec 2020 14:00:02 +0100
Subject: [PATCH 0050/1300] docs

---
 docs/setup.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/setup.rst b/docs/setup.rst
index 3cd1cf60a..c11cf9e95 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -231,6 +231,7 @@ writing. Windows is not and will never be supported.
     *   ``unpaper``
     *   ``ghostscript``
     *   ``icc-profiles-free``
+    *   ``qpdf``
     *   ``liblept5``
     *   ``libxml2``
     *   ``pngquant``

From 55cc49cd8843717b56d897ac4eb4168354ae4177 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 5 Dec 2020 14:00:27 +0100
Subject: [PATCH 0051/1300] dependencies

---
 Pipfile                 |  2 +-
 Pipfile.lock            | 20 ++++++++++----------
 docker/local/Dockerfile |  1 +
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Pipfile b/Pipfile
index c0728fddf..2e86f2a42 100644
--- a/Pipfile
+++ b/Pipfile
@@ -37,7 +37,7 @@ scikit-learn="~=0.23.2"
 whitenoise = "~=5.2.0"
 watchdog = "*"
 whoosh="~=2.7.4"
-inotifyrecursive = ">=0.3.4"
+inotifyrecursive = "~=0.3.4"
 ocrmypdf = "*"
 tqdm = "*"
 
diff --git a/Pipfile.lock b/Pipfile.lock
index 71b6c0811..6158a70e0 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "bb0b90c2ee89521c6dcd24375b67b52be5a4a786297923519a5abaafe0fe5d0e"
+            "sha256": "b10db53eb22d917723aa6107ff0970dc4e2aa886ee03d3ae08a994a856d57986"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -365,11 +365,11 @@
         },
         "ocrmypdf": {
             "hashes": [
-                "sha256:20722d89d2f0deeb5b3ffa8622ead59d54af46d44f21848ec0f15ef79ce1a4a3",
-                "sha256:c592e1bb37abafd24f067043bbf98d25405521cbe1e992de30d8b870dbe86928"
+                "sha256:91e7394172cedb3be801a229dbd3d308fb5ae80cbc3a77879fa7954beea407b1",
+                "sha256:e550b8e884150accab7ea41f4a576b5844594cb5cbd6ed514fbf1206720343ad"
             ],
             "index": "pypi",
-            "version": "==11.3.3"
+            "version": "==11.3.4"
         },
         "pathtools": {
             "hashes": [
@@ -763,11 +763,11 @@
         },
         "tqdm": {
             "hashes": [
-                "sha256:5c0d04e06ccc0da1bd3fa5ae4550effcce42fcad947b4a6cafa77bdc9b09ff22",
-                "sha256:9e7b8ab0ecbdbf0595adadd5f0ebbb9e69010e0bd48bbb0c15e550bf2a5292df"
+                "sha256:38b658a3e4ecf9b4f6f8ff75ca16221ae3378b2e175d846b6b33ea3a20852cf5",
+                "sha256:d4f413aecb61c9779888c64ddf0c62910ad56dcbe857d8922bb505d4dbff0df1"
             ],
             "index": "pypi",
-            "version": "==4.54.0"
+            "version": "==4.54.1"
         },
         "tzlocal": {
             "hashes": [
@@ -961,11 +961,11 @@
         },
         "faker": {
             "hashes": [
-                "sha256:2ba20a4438429cb08d729175d7bb0435ef3c2c4cedc7b1ceb703ee6da8dad906",
-                "sha256:6279746aed175a693108238e6d1ab8d7e26d0ec7ff8474f61025b9fdaae15d65"
+                "sha256:7bca5b074299ac6532be2f72979e6793f1a2403ca8105cb4cf0b385a964469c4",
+                "sha256:fb21a76064847561033d8cab1cfd11af436ddf2c6fe72eb51b3cda51dff86bdc"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==4.18.0"
+            "version": "==5.0.0"
         },
         "filelock": {
             "hashes": [
diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index 4df37bbea..9b110c622 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -21,6 +21,7 @@ RUN apt-get update \
 		libxml2 \
 		optipng \
 		pngquant \
+		qpdf \
 		sudo \
 		tesseract-ocr \
 		tesseract-ocr-eng \

From 891bd2de7fd46e2e8525d6e937591ebf2d56d456 Mon Sep 17 00:00:00 2001
From: jonaswinkler <dev@jpwinkler.de>
Date: Sat, 5 Dec 2020 15:37:23 +0100
Subject: [PATCH 0052/1300] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 45427ef66..189fbb53e 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,6 @@ For a complete list of changes from paperless, check out the [changelog](https:/
 
 - Make the front end nice (except mobile).
 - Test coverage at 90%.
-- Store archived documents with an embedded OCR text layer, while keeping originals available. Making good progress in the `feature-ocrmypdf` branch.
 - Fix whatever bugs I and you find.
 
 ## Roadmap for versions beyond 1.0

From e3104d34fa302527ee0477ab8f3c36b1c9800970 Mon Sep 17 00:00:00 2001
From: jonaswinkler <dev@jpwinkler.de>
Date: Sat, 5 Dec 2020 15:40:51 +0100
Subject: [PATCH 0053/1300] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 189fbb53e..aaa4a94c3 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,7 @@ Here's what you get:
 	* When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them or delete them.
 * Machine learning powered document matching.
 	* Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless.
+* We have a mobile app that offers a 'Share with paperless' option over at https://github.com/qcasey/paperless_share. You can use that in combination with any of the mobile scanning apps out there.
 * A task processor that processes documents in parallel and also tells you when something goes wrong. On modern multi core systems, consumption is blazing fast.
 * Code cleanup in many, MANY areas. Some of the code from OG paperless was just overly complicated.
 * More tests, more stability.

From 65816a434c7f49a95a065a60586ef57ecb104cda Mon Sep 17 00:00:00 2001
From: jonaswinkler <dev@jpwinkler.de>
Date: Sat, 5 Dec 2020 15:55:25 +0100
Subject: [PATCH 0054/1300] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aaa4a94c3..e754669a8 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Here's what you get:
 	* When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them or delete them.
 * Machine learning powered document matching.
 	* Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless.
-* We have a mobile app that offers a 'Share with paperless' option over at https://github.com/qcasey/paperless_share. You can use that in combination with any of the mobile scanning apps out there.
+* We have a mobile app that offers a 'Share with paperless' option over at https://github.com/qcasey/paperless_share. You can use that in combination with any of the mobile scanning apps out there. It's still a little rough around the edges, but it works!
 * A task processor that processes documents in parallel and also tells you when something goes wrong. On modern multi core systems, consumption is blazing fast.
 * Code cleanup in many, MANY areas. Some of the code from OG paperless was just overly complicated.
 * More tests, more stability.

From e46353cee8c0986eb042eb66ff25ef093cf988e8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 6 Dec 2020 01:25:12 +0100
Subject: [PATCH 0055/1300] added a welcome widget

---
 src-ui/src/app/app.module.ts                  |   4 ++-
 .../dashboard/dashboard.component.html        |   8 ++----
 .../welcome-widget.component.html             |  16 +++++++++++
 .../welcome-widget.component.scss             |   0
 .../welcome-widget.component.spec.ts          |  25 ++++++++++++++++++
 .../welcome-widget.component.ts               |  15 +++++++++++
 src-ui/src/assets/save-filter.png             | Bin 0 -> 8267 bytes
 7 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html
 create mode 100644 src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.scss
 create mode 100644 src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.spec.ts
 create mode 100644 src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.ts
 create mode 100644 src-ui/src/assets/save-filter.png

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 7f2e8414e..1a2a76908 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -45,6 +45,7 @@ import { SavedViewWidgetComponent } from './components/dashboard/widgets/saved-v
 import { StatisticsWidgetComponent } from './components/dashboard/widgets/statistics-widget/statistics-widget.component';
 import { UploadFileWidgetComponent } from './components/dashboard/widgets/upload-file-widget/upload-file-widget.component';
 import { WidgetFrameComponent } from './components/dashboard/widgets/widget-frame/widget-frame.component';
+import { WelcomeWidgetComponent } from './components/dashboard/widgets/welcome-widget/welcome-widget.component';
 
 @NgModule({
   declarations: [
@@ -82,7 +83,8 @@ import { WidgetFrameComponent } from './components/dashboard/widgets/widget-fram
     SavedViewWidgetComponent,
     StatisticsWidgetComponent,
     UploadFileWidgetComponent,
-    WidgetFrameComponent
+    WidgetFrameComponent,
+    WelcomeWidgetComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 3e6438181..627e7ff22 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -4,11 +4,7 @@
 
 <div class='row'>
   <div class="col-lg-8">
-    <app-widget-frame title="Saved views" *ngIf="savedViews.length == 0">
-      <p class="card-text">This space is reserved to display your saved views. Go to your documents and save a view
-        to have it displayed
-        here!</p>
-    </app-widget-frame>
+    <app-welcome-widget *ngIf="savedViews.length == 0"></app-welcome-widget>
 
     <ng-container *ngFor="let v of savedViews">
       <app-saved-view-widget [savedView]="v"></app-saved-view-widget>
@@ -22,4 +18,4 @@
     <app-upload-file-widget></app-upload-file-widget>
 
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html
new file mode 100644
index 000000000..0caf55f11
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html
@@ -0,0 +1,16 @@
+<app-widget-frame title="First steps">
+
+  <ng-container content>
+    <img src="assets/save-filter.png" class="float-right">
+    <p>Paperless is running! :)</p>
+    <p>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list.
+      After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and have them displayed on the dashboard instead of this message.</p>
+    <p>Paperless offers some more features that try to make your life easier, such as:</p>
+    <ul>
+      <li>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</li>
+      <li>You can configure paperless to read your mails and add documents from attached files.</li>
+    </ul>
+    <p>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</p>
+  </ng-container>
+
+</app-widget-frame>
\ No newline at end of file
diff --git a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.spec.ts
new file mode 100644
index 000000000..5e8c2494b
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { WelcomeWidgetComponent } from './welcome-widget.component';
+
+describe('WelcomeWidgetComponent', () => {
+  let component: WelcomeWidgetComponent;
+  let fixture: ComponentFixture<WelcomeWidgetComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ WelcomeWidgetComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(WelcomeWidgetComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.ts
new file mode 100644
index 000000000..71a87189c
--- /dev/null
+++ b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-welcome-widget',
+  templateUrl: './welcome-widget.component.html',
+  styleUrls: ['./welcome-widget.component.scss']
+})
+export class WelcomeWidgetComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/src-ui/src/assets/save-filter.png b/src-ui/src/assets/save-filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcaa41714c78a70b8568e162a0e8afac86fe8168
GIT binary patch
literal 8267
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
BL(BjG

literal 0
HcmV?d00001


From 45e39d04aed0cfed21fee72060aa1b764c4e21da Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 6 Dec 2020 01:37:44 +0100
Subject: [PATCH 0056/1300] fixes #87

---
 docker/docker-entrypoint.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index dfa7cfc65..e2338842b 100644
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -23,8 +23,9 @@ wait_for_postgres() {
 	echo "Waiting for PostgreSQL to start..."
 
 	host="${PAPERLESS_DBHOST}"
+	port="${PAPERLESS_DBPORT}"
 
-	while !</dev/tcp/$host/5432 ;
+	while !</dev/tcp/$host/$port ;
 	do
 
 		if [ $attempt_num -eq $max_attempts ]

From 5369e0be037b0ea373d655b6f7ecd246efec792d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 6 Dec 2020 14:39:53 +0100
Subject: [PATCH 0057/1300] more bulk edit

---
 src/documents/bulk_edit.py   | 16 +++++++++++++---
 src/documents/serialisers.py | 28 ++++++++++++++++++++++++++++
 src/documents/views.py       | 32 ++++++++++++++++++++++++--------
 3 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index ef5d3f509..f80c55c58 100644
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -1,5 +1,4 @@
-from documents.models import Document
-
+from documents.models import Document, Correspondent
 
 methods_supported = [
     "set_correspondent"
@@ -36,4 +35,15 @@ def perform_bulk_edit(data):
 
 
 def set_correspondent(ids, args):
-    print("WOW")
+    if not len(args) == 1:
+        raise ValueError()
+
+    if not args[0]:
+        correspondent = None
+    else:
+        if not isinstance(args[0], int):
+            raise ValueError()
+
+        correspondent = Correspondent.objects.get(args[0])
+
+    Document.objects.filter(id__in=ids).update(correspondent=correspondent)
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index c988b2137..a8da79cdd 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -113,6 +113,34 @@ class LogSerializer(serializers.ModelSerializer):
         )
 
 
+class BulkEditSerializer(serializers.Serializer):
+
+    documents = serializers.PrimaryKeyRelatedField(
+        many=True,
+        label="Documents",
+        write_only=True,
+        queryset=Document.objects.all()
+    )
+
+    method = serializers.ChoiceField(
+        choices=[
+            "set_correspondent",
+            "set_document_type",
+            "add_tag",
+            "remove_tag",
+            "delete"
+        ],
+        label="Method",
+        write_only=True,
+    )
+
+    parameters = serializers.DictField(allow_empty=True)
+
+    def validate(self, attrs):
+
+        return attrs
+
+
 class PostDocumentSerializer(serializers.Serializer):
 
     document = serializers.FileField(
diff --git a/src/documents/views.py b/src/documents/views.py
index 219cc61b7..88ceb2efd 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -46,7 +46,8 @@ from .serialisers import (
     LogSerializer,
     TagSerializer,
     DocumentTypeSerializer,
-    PostDocumentSerializer
+    PostDocumentSerializer,
+    BulkEditSerializer
 )
 
 
@@ -165,13 +166,6 @@ class DocumentViewSet(RetrieveModelMixin,
             disposition, filename)
         return response
 
-    @action(methods=['post'], detail=False)
-    def bulk_edit(self, request, pk=None):
-        try:
-            return Response(perform_bulk_edit(request.data))
-        except Exception as e:
-            return HttpResponseBadRequest(str(e))
-
     @action(methods=['get'], detail=True)
     def metadata(self, request, pk=None):
         try:
@@ -225,6 +219,28 @@ class LogViewSet(ReadOnlyModelViewSet):
     ordering_fields = ("created",)
 
 
+class BulkEditView(APIView):
+
+    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)
+
+
 class PostDocumentView(APIView):
 
     permission_classes = (IsAuthenticated,)

From 278f6da16afe33198be59761d2a2ac938b050271 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 6 Dec 2020 14:41:14 +0100
Subject: [PATCH 0058/1300] documentation.

---
 docs/administration.rst |  17 +++--
 docs/extending.rst      | 146 +++++++++++++++-------------------------
 docs/faq.rst            |   2 +-
 3 files changed, 67 insertions(+), 98 deletions(-)

diff --git a/docs/administration.rst b/docs/administration.rst
index 001d608e1..8885b7322 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -119,8 +119,11 @@ Updating paperless without docker
 
 After grabbing the new release and unpacking the contents, do the following:
 
-1.  Update python requirements. Paperless uses
-    `Pipenv`_ for managing dependencies:
+1.  Update dependencies. New paperless version may require additional
+    dependencies. The dependencies required are listed in the section about 
+    :ref:`bare metal installations <setup-bare_metal>`.
+
+2.  Update python requirements. If you use Pipenv, this is done with the following steps.
 
     .. code:: shell-session
 
@@ -132,14 +135,14 @@ After grabbing the new release and unpacking the contents, do the following:
     This creates a new virtual environment (or uses your existing environment)
     and installs all dependencies into it.
 
-2.  Collect static files.
+3.  Collect static files.
 
     .. code:: shell-session
 
         $ cd src
         $ pipenv run python3 manage.py collectstatic --clear
     
-3.  Migrate the database.
+4.  Migrate the database.
 
     .. code:: shell-session
 
@@ -153,14 +156,14 @@ Management utilities
 Paperless comes with some management commands that perform various maintenance
 tasks on your paperless instance. You can invoke these commands either by
 
-.. code:: bash
+.. code:: shell-session
 
     $ cd /path/to/paperless
     $ docker-compose run --rm webserver <command> <arguments>
 
 or
 
-.. code:: bash
+.. code:: shell-session
 
     $ cd /path/to/paperless/src
     $ pipenv run python manage.py <command> <arguments>
@@ -366,7 +369,7 @@ is specified, the archiver will only process that document.
 .. note::
 
     Some documents will cause errors and cannot be converted into PDF/A documents,
-    such as encrypted PDF documents. The archiver will skip over these Documents
+    such as encrypted PDF documents. The archiver will skip over these documents
     each time it sees them.
 
 .. _utilities-encyption:
diff --git a/docs/extending.rst b/docs/extending.rst
index a0f14f2aa..28da1f56b 100644
--- a/docs/extending.rst
+++ b/docs/extending.rst
@@ -118,114 +118,80 @@ This will test and assemble everything and also build and tag a docker image.
 Extending Paperless
 ===================
 
-.. warning::
+Paperless does not have any fancy plugin systems and will probably never have. However,
+some parts of the application have been designed to allow easy integration of additional
+features without any modification to the base code.
 
-    This section is not updated to paperless-ng yet.
+Making custom parsers
+---------------------
 
-For the most part, Paperless is monolithic, so extending it is often best
-managed by way of modifying the code directly and issuing a pull request on
-`GitHub`_.  However, over time the project has been evolving to be a little
-more "pluggable" so that users can write their own stuff that talks to it.
+Paperless uses parsers to add documents to paperless. A parser is responsible for:
 
-.. _GitHub: https://github.com/the-paperless-project/paperless
+*   Retrieve the content from the original
+*   Create a thumbnail
+*   Optional: Retrieve a created date from the original
+*   Optional: Create an archived document from the original
 
+Custom parsers can be added to paperless to support more file types. In order to do that,
+you need to write the parser itself and announce its existence to paperless.
 
-.. _extending-parsers:
-
-Parsers
--------
-
-You can leverage Paperless' consumption model to have it consume files *other*
-than ones handled by default like ``.pdf``, ``.jpg``, and ``.tiff``.  To do so,
-you simply follow Django's convention of creating a new app, with a few key
-requirements.
-
-
-.. _extending-parsers-parserspy:
-
-parsers.py
-..........
-
-In this file, you create a class that extends
-``documents.parsers.DocumentParser`` and go about implementing the three
-required methods:
-
-* ``get_thumbnail()``: Returns the path to a file we can use as a thumbnail for
-  this document.
-* ``get_text()``: Returns the text from the document and only the text.
-* ``get_date()``: If possible, this returns the date of the document, otherwise
-  it should return ``None``.
-
-
-.. _extending-parsers-signalspy:
-
-signals.py
-..........
-
-At consumption time, Paperless emits a ``document_consumer_declaration``
-signal which your module has to react to in order to let the consumer know
-whether or not it's capable of handling a particular file.  Think of it like
-this:
-
-1. Consumer finds a file in the consumption directory.
-2. It asks all the available parsers: *"Hey, can you handle this file?"*
-3. Each parser responds with either ``None`` meaning they can't handle the
-   file, or a dictionary in the following format:
+The parser itself must extend ``documents.parsers.DocumentParser`` and must implement the
+methods ``parse`` and ``get_thumbnail``. You can provide your own implementation to
+``get_date`` if you don't want to rely on paperless' default date guessing mechanisms.
 
 .. code:: python
 
-    {
-        "parser": <the class name>,
-        "weight": <an integer>
-    }
+    class MyCustomParser(DocumentParser):
 
-The consumer compares the ``weight`` values from all respondents and uses the
-class with the highest value to consume the document.  The default parser,
-``RasterisedDocumentParser`` has a weight of ``0``.
+        def parse(self, document_path, mime_type):
+            # This method does not return anything. Rather, you should assign
+            # whatever you got from the document to the following fields:
 
+            # The content of the document.
+            self.text = "content"
+            
+            # Optional: path to a PDF document that you created from the original.
+            self.archive_path = os.path.join(self.tempdir, "archived.pdf")
 
-.. _extending-parsers-appspy:
+            # Optional: "created" date of the document.
+            self.date = get_created_from_metadata(document_path)
 
-apps.py
-.......
+        def get_thumbnail(self, document_path, mime_type):
+            # This should return the path to a thumbnail you created for this
+            # document.
+            return os.path.join(self.tempdir, "thumb.png")
 
-This is a standard Django file, but you'll need to add some code to it to
-connect your parser to the ``document_consumer_declaration`` signal.
+If you encounter any issues during parsing, raise a ``documents.parsers.ParseError``.
 
+The ``self.tempdir`` directory is a temporary directory that is guaranteed to be empty
+and removed after consumption finished. You can use that directory to store any
+intermediate files and also use it to store the thumbnail / archived document.
 
-.. _extending-parsers-finally:
-
-Finally
-.......
-
-The last step is to update ``settings.py`` to include your new module.
-Eventually, this will be dynamic, but at the moment, you have to edit the
-``INSTALLED_APPS`` section manually.  Simply add the path to your AppConfig to
-the list like this:
+After that, you need to announce your parser to paperless. You need to connect a
+handler to the ``document_consumer_declaration`` signal. Have a look in the file
+``src/paperless_tesseract/apps.py`` on how that's done. The handler is a method
+that returns information about your parser:
 
 .. code:: python
 
-    INSTALLED_APPS = [
-        ...
-        "my_module.apps.MyModuleConfig",
-        ...
-    ]
+    def myparser_consumer_declaration(sender, **kwargs):
+        return {
+            "parser": MyCustomParser,
+            "weight": 0,
+            "mime_types": {
+                "application/pdf": ".pdf",
+                "image/jpeg": ".jpg",
+            }
+        }
 
-Order doesn't matter, but generally it's a good idea to place your module lower
-in the list so that you don't end up accidentally overriding project defaults
-somewhere.
+*   ``parser`` is a reference to a class that extends ``DocumentParser``.
 
+*   ``weight`` is used whenever two or more parsers are able to parse a file: The parser with
+    the higher weight wins. This can be used to override the parsers provided by
+    paperless.
 
-.. _extending-parsers-example:
-
-An Example
-..........
-
-The core Paperless functionality is based on this design, so if you want to see
-what a parser module should look like, have a look at `parsers.py`_,
-`signals.py`_, and `apps.py`_ in the `paperless_tesseract`_ module.
-
-.. _parsers.py: https://github.com/the-paperless-project/paperless/blob/master/src/paperless_tesseract/parsers.py
-.. _signals.py: https://github.com/the-paperless-project/paperless/blob/master/src/paperless_tesseract/signals.py
-.. _apps.py: https://github.com/the-paperless-project/paperless/blob/master/src/paperless_tesseract/apps.py
-.. _paperless_tesseract: https://github.com/the-paperless-project/paperless/blob/master/src/paperless_tesseract/
+*   ``mime_types`` is a dictionary. The keys are the mime types your parser supports and the value
+    is the default file extension that paperless should use when storing files and serving them for
+    download. We could guess that from the file extensions, but some mime types have many extensions
+    associated with them and the python methods responsible for guessing the extension do not always
+    return the same value.
diff --git a/docs/faq.rst b/docs/faq.rst
index 887946074..6eac18617 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -73,7 +73,7 @@ in your browser and paperless has to do much less work to serve the data.
 
 **Q:** *How do I install paperless-ng on Raspberry Pi?*
 
-**A:** There is not docker image for ARM available. If you know how to build
+**A:** There is no docker image for ARM available. If you know how to build
 that automatically, I'm all ears. For now, you have to grab the latest release
 archive from the project page and build the image yourself. The release comes
 with the front end already compiled, so you don't have to do this on the Pi.

From a079c310b4b152dfb985d1e13d1ae016d309fed1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 6 Dec 2020 16:13:37 +0100
Subject: [PATCH 0059/1300] changes to filename generation, partially addresses
 #90

---
 src/documents/file_handling.py            | 28 +++++++++++++++++++----
 src/documents/tests/test_consumer.py      |  2 +-
 src/documents/tests/test_file_handling.py | 22 +++++++++++++++++-
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index 85ee37d4d..78d0d7efc 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -1,11 +1,14 @@
+import datetime
 import logging
 import os
 from collections import defaultdict
 
+import pathvalidate
 from django.conf import settings
 from django.template.defaultfilters import slugify
 
 
+
 def create_source_path_directory(source_path):
     os.makedirs(os.path.dirname(source_path), exist_ok=True)
 
@@ -75,14 +78,31 @@ def generate_filename(doc):
         if settings.PAPERLESS_FILENAME_FORMAT is not None:
             tags = defaultdict(lambda: slugify(None),
                                many_to_dictionary(doc.tags))
+
+            if doc.correspondent:
+                correspondent = pathvalidate.sanitize_filename(
+                    doc.correspondent.name, replacement_text="-"
+                )
+            else:
+                correspondent = "none"
+
+            if doc.document_type:
+                document_type = pathvalidate.sanitize_filename(
+                    doc.document_type.name, replacement_text="-"
+                )
+            else:
+                document_type = "none"
+
             path = settings.PAPERLESS_FILENAME_FORMAT.format(
-                correspondent=slugify(doc.correspondent),
-                title=slugify(doc.title),
-                created=slugify(doc.created),
+                title=pathvalidate.sanitize_filename(
+                    doc.title, replacement_text="-"),
+                correspondent=correspondent,
+                document_type=document_type,
+                created=datetime.date.isoformat(doc.created),
                 created_year=doc.created.year if doc.created else "none",
                 created_month=doc.created.month if doc.created else "none",
                 created_day=doc.created.day if doc.created else "none",
-                added=slugify(doc.added),
+                added=datetime.date.isoformat(doc.added),
                 added_year=doc.added.year if doc.added else "none",
                 added_month=doc.added.month if doc.added else "none",
                 added_day=doc.added.day if doc.added else "none",
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 992d450db..f785bc695 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -598,7 +598,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self.assertEqual(document.title, "new docs")
         self.assertEqual(document.correspondent.name, "Bank")
-        self.assertEqual(document.filename, "bank/new-docs-0000001.pdf")
+        self.assertEqual(document.filename, "Bank/new docs-0000001.pdf")
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
     @mock.patch("documents.signals.handlers.generate_filename")
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index cc4bf8053..4ed93d1d4 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -1,5 +1,5 @@
+import datetime
 import os
-import shutil
 from pathlib import Path
 from unittest import mock
 
@@ -485,3 +485,23 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(archive))
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(os.path.isfile(doc.archive_path))
+
+class TestFilenameGeneration(TestCase):
+
+    @override_settings(
+        PAPERLESS_FILENAME_FORMAT="{title}"
+    )
+    def test_invalid_characters(self):
+
+        doc = Document.objects.create(title="This. is the title.", mime_type="application/pdf", pk=1, checksum="1")
+        self.assertEqual(generate_filename(doc), "This. is the title-0000001.pdf")
+
+        doc = Document.objects.create(title="my\\invalid/../title:yay", mime_type="application/pdf", pk=2, checksum="2")
+        self.assertEqual(generate_filename(doc), "my-invalid-..-title-yay-0000002.pdf")
+
+    @override_settings(
+        PAPERLESS_FILENAME_FORMAT="{created}"
+    )
+    def test_date(self):
+        doc = Document.objects.create(title="does not matter", created=datetime.datetime(2020,5,21, 7,36,51, 153), mime_type="application/pdf", pk=2, checksum="2")
+        self.assertEqual(generate_filename(doc), "2020-05-21-0000002.pdf")

From 28622d700dbaa94b35e48619ab2248d27ad52771 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 6 Dec 2020 19:03:45 +0100
Subject: [PATCH 0060/1300] changed the way public filenames (i.e., for
 download and exporting) are generated. #94

---
 .../management/commands/document_exporter.py  | 32 +++++++++++------
 src/documents/models.py                       | 34 ++++++++++++-------
 src/documents/signals/handlers.py             |  4 +--
 src/documents/tests/test_document_model.py    | 10 +++---
 .../tests/test_management_exporter.py         |  5 ++-
 src/documents/views.py                        |  4 +--
 6 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py
index f1ee74038..0e0b7901a 100644
--- a/src/documents/management/commands/document_exporter.py
+++ b/src/documents/management/commands/document_exporter.py
@@ -38,6 +38,9 @@ class Command(Renderable, BaseCommand):
         if not os.access(self.target, os.W_OK):
             raise CommandError("That path doesn't appear to be writable")
 
+        if os.listdir(self.target):
+            raise CommandError("That directory is not empty.")
+
         self.dump()
 
     def dump(self):
@@ -48,37 +51,44 @@ class Command(Renderable, BaseCommand):
 
         for index, document_dict in enumerate(manifest):
 
+
             # Force output to unencrypted as that will be the current state.
             # The importer will make the decision to encrypt or not.
             manifest[index]["fields"]["storage_type"] = Document.STORAGE_TYPE_UNENCRYPTED  # NOQA: E501
 
             document = document_map[document_dict["pk"]]
 
-            unique_filename = f"{document.pk:07}_{document.file_name}"
-            file_target = os.path.join(self.target, unique_filename)
+            print(f"Exporting: {document}")
 
-            thumbnail_name = unique_filename + "-thumbnail.png"
+            filename_counter = 0
+            while True:
+                original_name = document.get_public_filename(counter=filename_counter)
+                original_target = os.path.join(self.target, original_name)
+
+                if not os.path.exists(original_target):
+                    break
+                else:
+                    filename_counter += 1
+
+            thumbnail_name = original_name + "-thumbnail.png"
             thumbnail_target = os.path.join(self.target, thumbnail_name)
 
-            document_dict[EXPORTER_FILE_NAME] = unique_filename
+            document_dict[EXPORTER_FILE_NAME] = original_name
             document_dict[EXPORTER_THUMBNAIL_NAME] = thumbnail_name
 
             if os.path.exists(document.archive_path):
-                archive_name = \
-                    f"{document.pk:07}_archive_{document.archive_file_name}"
+                archive_name = document.get_public_filename(archive=True, counter=filename_counter, suffix="_archive")
                 archive_target = os.path.join(self.target, archive_name)
                 document_dict[EXPORTER_ARCHIVE_NAME] = archive_name
             else:
                 archive_target = None
 
-            print(f"Exporting: {file_target}")
-
             t = int(time.mktime(document.created.timetuple()))
             if document.storage_type == Document.STORAGE_TYPE_GPG:
 
-                with open(file_target, "wb") as f:
+                with open(original_target, "wb") as f:
                     f.write(GnuPG.decrypted(document.source_file))
-                    os.utime(file_target, times=(t, t))
+                    os.utime(original_target, times=(t, t))
 
                 with open(thumbnail_target, "wb") as f:
                     f.write(GnuPG.decrypted(document.thumbnail_file))
@@ -90,7 +100,7 @@ class Command(Renderable, BaseCommand):
                         os.utime(archive_target, times=(t, t))
             else:
 
-                shutil.copy(document.source_path, file_target)
+                shutil.copy(document.source_path, original_target)
                 shutil.copy(document.thumbnail_path, thumbnail_target)
 
                 if archive_target:
diff --git a/src/documents/models.py b/src/documents/models.py
index a4f887d77..a410687f7 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -1,10 +1,12 @@
 # coding=utf-8
-
+import datetime
 import logging
 import os
 import re
 from collections import OrderedDict
 
+import pathvalidate
+
 import dateutil.parser
 from django.conf import settings
 from django.db import models
@@ -206,13 +208,11 @@ class Document(models.Model):
         ordering = ("correspondent", "title")
 
     def __str__(self):
-        created = self.created.strftime("%Y%m%d")
+        created = datetime.date.isoformat(self.created)
         if self.correspondent and self.title:
-            return "{}: {} - {}".format(
-                created, self.correspondent, self.title)
-        if self.correspondent or self.title:
-            return "{}: {}".format(created, self.correspondent or self.title)
-        return str(created)
+            return f"{created} {self.correspondent} {self.title}"
+        else:
+            return f"{created} {self.title}"
 
     @property
     def source_path(self):
@@ -248,13 +248,21 @@ class Document(models.Model):
     def archive_file(self):
         return open(self.archive_path, "rb")
 
-    @property
-    def file_name(self):
-        return slugify(str(self)) + self.file_type
+    def get_public_filename(self, archive=False, counter=0, suffix=None):
+        result = str(self)
 
-    @property
-    def archive_file_name(self):
-        return slugify(str(self)) + ".pdf"
+        if counter:
+            result += f"_{counter:02}"
+
+        if suffix:
+            result += suffix
+
+        if archive:
+            result += ".pdf"
+        else:
+            result += self.file_type
+
+        return pathvalidate.sanitize_filename(result, replacement_text="-")
 
     @property
     def file_type(self):
diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 4d9dc9ccd..32119a0a3 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -157,7 +157,7 @@ def run_post_consume_script(sender, document, **kwargs):
     Popen((
         settings.POST_CONSUME_SCRIPT,
         str(document.pk),
-        document.file_name,
+        document.get_public_filename(),
         os.path.normpath(document.source_path),
         os.path.normpath(document.thumbnail_path),
         reverse("document-download", kwargs={"pk": document.pk}),
@@ -179,7 +179,7 @@ def cleanup_document_deletion(sender, instance, using, **kwargs):
                     f"Deleted file {f}.")
             except OSError as e:
                 logging.getLogger(__name__).warning(
-                    f"While deleting document {instance.file_name}, the file "
+                    f"While deleting document {str(instance)}, the file "
                     f"{f} could not be deleted: {e}"
                 )
 
diff --git a/src/documents/tests/test_document_model.py b/src/documents/tests/test_document_model.py
index 8764c7ec8..74bd9a2a7 100644
--- a/src/documents/tests/test_document_model.py
+++ b/src/documents/tests/test_document_model.py
@@ -48,19 +48,19 @@ class TestDocument(TestCase):
     def test_file_name(self):
 
         doc = Document(mime_type="application/pdf", title="test", created=datetime(2020, 12, 25))
-        self.assertEqual(doc.file_name, "20201225-test.pdf")
+        self.assertEqual(doc.get_public_filename(), "2020-12-25 test.pdf")
 
     def test_file_name_jpg(self):
 
         doc = Document(mime_type="image/jpeg", title="test", created=datetime(2020, 12, 25))
-        self.assertEqual(doc.file_name, "20201225-test.jpg")
+        self.assertEqual(doc.get_public_filename(), "2020-12-25 test.jpg")
 
     def test_file_name_unknown(self):
 
         doc = Document(mime_type="application/zip", title="test", created=datetime(2020, 12, 25))
-        self.assertEqual(doc.file_name, "20201225-test.zip")
+        self.assertEqual(doc.get_public_filename(), "2020-12-25 test.zip")
 
-    def test_file_name_invalid(self):
+    def test_file_name_invalid_type(self):
 
         doc = Document(mime_type="image/jpegasd", title="test", created=datetime(2020, 12, 25))
-        self.assertEqual(doc.file_name, "20201225-test")
+        self.assertEqual(doc.get_public_filename(), "2020-12-25 test")
diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index 284d6108d..ab9733dc4 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -66,6 +66,9 @@ class TestExportImport(DirectoriesMixin, TestCase):
     def test_export_missing_files(self):
 
         target = tempfile.mkdtemp()
-        call_command('document_exporter', target)
         Document.objects.create(checksum="AAAAAAAAAAAAAAAAA", title="wow", filename="0000004.pdf", id=3, mime_type="application/pdf")
         self.assertRaises(FileNotFoundError, call_command, 'document_exporter', target)
+
+    def test_duplicate_titles(self):
+        # TODO
+        pass
diff --git a/src/documents/views.py b/src/documents/views.py
index adef757ef..c6b4d4b35 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -145,11 +145,11 @@ class DocumentViewSet(RetrieveModelMixin,
         doc = Document.objects.get(id=pk)
         if not self.original_requested(request) and os.path.isfile(doc.archive_path):  # NOQA: E501
             file_handle = doc.archive_file
-            filename = doc.archive_file_name
+            filename = doc.get_public_filename(archive=True)
             mime_type = 'application/pdf'
         else:
             file_handle = doc.source_file
-            filename = doc.file_name
+            filename = doc.get_public_filename()
             mime_type = doc.mime_type
 
         if doc.storage_type == Document.STORAGE_TYPE_GPG:

From c1fc8b2dac8853a131d4f5cd641567763fa7c8d4 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 6 Dec 2020 19:04:32 +0100
Subject: [PATCH 0061/1300] codestyle

---
 src/documents/file_handling.py                         | 1 -
 src/documents/management/commands/document_exporter.py | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index 78d0d7efc..a6d2f3ef4 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -8,7 +8,6 @@ from django.conf import settings
 from django.template.defaultfilters import slugify
 
 
-
 def create_source_path_directory(source_path):
     os.makedirs(os.path.dirname(source_path), exist_ok=True)
 
diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py
index 0e0b7901a..a7a17f124 100644
--- a/src/documents/management/commands/document_exporter.py
+++ b/src/documents/management/commands/document_exporter.py
@@ -51,7 +51,6 @@ class Command(Renderable, BaseCommand):
 
         for index, document_dict in enumerate(manifest):
 
-
             # Force output to unencrypted as that will be the current state.
             # The importer will make the decision to encrypt or not.
             manifest[index]["fields"]["storage_type"] = Document.STORAGE_TYPE_UNENCRYPTED  # NOQA: E501
@@ -62,7 +61,8 @@ class Command(Renderable, BaseCommand):
 
             filename_counter = 0
             while True:
-                original_name = document.get_public_filename(counter=filename_counter)
+                original_name = document.get_public_filename(
+                    counter=filename_counter)
                 original_target = os.path.join(self.target, original_name)
 
                 if not os.path.exists(original_target):
@@ -77,7 +77,8 @@ class Command(Renderable, BaseCommand):
             document_dict[EXPORTER_THUMBNAIL_NAME] = thumbnail_name
 
             if os.path.exists(document.archive_path):
-                archive_name = document.get_public_filename(archive=True, counter=filename_counter, suffix="_archive")
+                archive_name = document.get_public_filename(
+                    archive=True, counter=filename_counter, suffix="_archive")
                 archive_target = os.path.join(self.target, archive_name)
                 document_dict[EXPORTER_ARCHIVE_NAME] = archive_name
             else:

From eede5595e9b628cdd2355761ca3a3148a0213a54 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 6 Dec 2020 22:30:04 +0100
Subject: [PATCH 0062/1300] better error messages for file uploads. adresses
 #91

---
 .../upload-file-widget.component.ts           | 19 ++++++----
 src/documents/serialisers.py                  | 38 +++++++++----------
 src/documents/views.py                        | 17 ++++-----
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index a95d5f4db..1003f31db 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -16,26 +16,31 @@ export class UploadFileWidgetComponent implements OnInit {
   }
 
   public fileOver(event){
-    console.log(event);
   }
- 
+
   public fileLeave(event){
-    console.log(event);
   }
- 
+
   public dropped(files: NgxFileDropEntry[]) {
     for (const droppedFile of files) {
       if (droppedFile.fileEntry.isFile) {
         const fileEntry = droppedFile.fileEntry as FileSystemFileEntry;
-        console.log(fileEntry)
         fileEntry.file((file: File) => {
-          console.log(file)
           const formData = new FormData()
           formData.append('document', file, file.name)
           this.documentService.uploadDocument(formData).subscribe(result => {
             this.toastService.showToast(Toast.make("Information", "The document has been uploaded and will be processed by the consumer shortly."))
           }, error => {
-            this.toastService.showToast(Toast.makeError("An error has occured while uploading the document. Sorry!"))
+            switch (error.status) {
+              case 400: {
+                this.toastService.showToast(Toast.makeError(`There was an error while uploading the document: ${error.error.document}`))
+                break;
+              }
+              default: {
+                this.toastService.showToast(Toast.makeError("An error has occured while uploading the document. Sorry!"))
+                break;
+              }
+            }
           })
         });
       }
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index c988b2137..95f32094f 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -150,8 +150,7 @@ class PostDocumentSerializer(serializers.Serializer):
         required=False,
     )
 
-    def validate(self, attrs):
-        document = attrs.get('document')
+    def validate_document(self, document):
 
         try:
             validate_filename(document.name)
@@ -163,32 +162,31 @@ class PostDocumentSerializer(serializers.Serializer):
 
         if not is_mime_type_supported(mime_type):
             raise serializers.ValidationError(
-                "This mime type is not supported.")
+                "This file type is not supported.")
 
-        attrs['document_data'] = document_data
+        return document.name, document_data
 
-        title = attrs.get('title')
+    def validate_title(self, title):
+        if title:
+            return title
+        else:
+            # do not return empty strings.
+            return None
 
-        if not title:
-            attrs['title'] = None
-
-        correspondent = attrs.get('correspondent')
+    def validate_correspondent(self, correspondent):
         if correspondent:
-            attrs['correspondent_id'] = correspondent.id
+            return correspondent.id
         else:
-            attrs['correspondent_id'] = None
+            return None
 
-        document_type = attrs.get('document_type')
+    def validate_document_type(self, document_type):
         if document_type:
-            attrs['document_type_id'] = document_type.id
+            return document_type.id
         else:
-            attrs['document_type_id'] = None
+            return None
 
-        tags = attrs.get('tags')
+    def validate_tags(self, tags):
         if tags:
-            tag_ids = [tag.id for tag in tags]
-            attrs['tag_ids'] = tag_ids
+            return [tag.id for tag in tags]
         else:
-            attrs['tag_ids'] = None
-
-        return attrs
+            return None
diff --git a/src/documents/views.py b/src/documents/views.py
index c6b4d4b35..7d587ed3f 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -235,12 +235,11 @@ class PostDocumentView(APIView):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
 
-        document = serializer.validated_data['document']
-        document_data = serializer.validated_data['document_data']
-        correspondent_id = serializer.validated_data['correspondent_id']
-        document_type_id = serializer.validated_data['document_type_id']
-        tag_ids = serializer.validated_data['tag_ids']
-        title = serializer.validated_data['title']
+        doc_name, doc_data = serializer.validated_data.get('document')
+        correspondent_id = serializer.validated_data.get('correspondent')
+        document_type_id = serializer.validated_data.get('document_type')
+        tag_ids = serializer.validated_data.get('tags')
+        title = serializer.validated_data.get('title')
 
         t = int(mktime(datetime.now().timetuple()))
 
@@ -249,17 +248,17 @@ class PostDocumentView(APIView):
         with tempfile.NamedTemporaryFile(prefix="paperless-upload-",
                                          dir=settings.SCRATCH_DIR,
                                          delete=False) as f:
-            f.write(document_data)
+            f.write(doc_data)
             os.utime(f.name, times=(t, t))
 
             async_task("documents.tasks.consume_file",
                        f.name,
-                       override_filename=document.name,
+                       override_filename=doc_name,
                        override_title=title,
                        override_correspondent_id=correspondent_id,
                        override_document_type_id=document_type_id,
                        override_tag_ids=tag_ids,
-                       task_name=os.path.basename(document.name)[:100])
+                       task_name=os.path.basename(doc_name)[:100])
         return Response("OK")
 
 

From fcaaf7ce035d56647097ff8f10ab4c84b03ac8d9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 6 Dec 2020 22:54:11 +0100
Subject: [PATCH 0063/1300] pipfile fix

---
 Pipfile.lock | 337 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 335 insertions(+), 2 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 6158a70e0..13d1d74ea 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "b10db53eb22d917723aa6107ff0970dc4e2aa886ee03d3ae08a994a856d57986"
+            "sha256": "3faa161608e685d788b8921f80b810b176fd2b4ed9020d3e6322dffecbcb5542"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -21,6 +21,13 @@
         ]
     },
     "default": {
+        "aioredis": {
+            "hashes": [
+                "sha256:15f8af30b044c771aee6787e5ec24694c048184c7b9e54c3b60c750a4b93273a",
+                "sha256:b61808d7e97b7cd5a92ed574937a079c9387fdadd22bfbfa7ad2fd319ecc26e3"
+            ],
+            "version": "==1.3.1"
+        },
         "arrow": {
             "hashes": [
                 "sha256:e098abbd9af3665aea81bdd6c869e93af4feb078e98468dd351c383af187aac5",
@@ -37,6 +44,39 @@
             "markers": "python_version >= '3.5'",
             "version": "==3.3.1"
         },
+        "async-timeout": {
+            "hashes": [
+                "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f",
+                "sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3"
+            ],
+            "markers": "python_full_version >= '3.5.3'",
+            "version": "==3.0.1"
+        },
+        "attrs": {
+            "hashes": [
+                "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
+                "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==20.3.0"
+        },
+        "autobahn": {
+            "hashes": [
+                "sha256:1eafbbe363a7924fd21bb0b94ece9f3ac2a9aa9c2046e8a85e044f94e8ba2028",
+                "sha256:24ce276d313e84d68241c3aef30d484f352b90a40168981b3640312c821df77b",
+                "sha256:86bbce30cdd407137c57670993a8f9bfdfe3f8e994b889181d85e844d5aa8dfb"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==20.7.1"
+        },
+        "automat": {
+            "hashes": [
+                "sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33",
+                "sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111",
+                "sha256:d6d976cf8da698fc85fa7def46e2544493f78cb7ee72d2f4acd1a5c759a3060e"
+            ],
+            "version": "==20.2.0"
+        },
         "blessed": {
             "hashes": [
                 "sha256:0a74a8d3f0366db600d061273df77d44f0db07daade7bb7a4d49c8bc22ed9f74",
@@ -87,6 +127,22 @@
             ],
             "version": "==1.14.4"
         },
+        "channels": {
+            "hashes": [
+                "sha256:74db79c9eca616be69d38013b22083ab5d3f9ccda1ab5e69096b1bb7da2d9b18",
+                "sha256:f50a6e79757a64c1e45e95e144a2ac5f1e99ee44a0718ab182c501f5e5abd268"
+            ],
+            "index": "pypi",
+            "version": "==3.0.2"
+        },
+        "channels-redis": {
+            "hashes": [
+                "sha256:18d63f6462a58011740dc8eeb57ea4b31ec220eb551cb71b27de9c6779a549de",
+                "sha256:2fb31a63b05373f6402da2e6a91a22b9e66eb8b56626c6bfc93e156c734c5ae6"
+            ],
+            "index": "pypi",
+            "version": "==3.2.0"
+        },
         "chardet": {
             "hashes": [
                 "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
@@ -104,6 +160,13 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==14.0"
         },
+        "constantly": {
+            "hashes": [
+                "sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35",
+                "sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d"
+            ],
+            "version": "==15.1.0"
+        },
         "cryptography": {
             "hashes": [
                 "sha256:07ca431b788249af92764e3be9a488aa1d39a0bc3be313d826bbec690417e538",
@@ -134,6 +197,14 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==3.2.1"
         },
+        "daphne": {
+            "hashes": [
+                "sha256:0052c9887600c57054a5867d4b0240159fa009faa3bcf6a1627271d9cdcb005a",
+                "sha256:c22b692707f514de9013651ecb687f2abe4f35cf6fe292ece634e9f1737bc7e3"
+            ],
+            "index": "pypi",
+            "version": "==3.0.1"
+        },
         "dateparser": {
             "hashes": [
                 "sha256:7552c994f893b5cb8fcf103b4cd2ff7f57aab9bfd2619fdf0cf571c0740fd90b",
@@ -213,6 +284,60 @@
             "index": "pypi",
             "version": "==20.0.4"
         },
+        "hiredis": {
+            "hashes": [
+                "sha256:06a039208f83744a702279b894c8cf24c14fd63c59cd917dcde168b79eef0680",
+                "sha256:0a909bf501459062aa1552be1461456518f367379fdc9fdb1f2ca5e4a1fdd7c0",
+                "sha256:18402d9e54fb278cb9a8c638df6f1550aca36a009d47ecf5aa263a38600f35b0",
+                "sha256:1e4cbbc3858ec7e680006e5ca590d89a5e083235988f26a004acf7244389ac01",
+                "sha256:23344e3c2177baf6975fbfa361ed92eb7d36d08f454636e5054b3faa7c2aff8a",
+                "sha256:289b31885b4996ce04cadfd5fc03d034dce8e2a8234479f7c9e23b9e245db06b",
+                "sha256:2c1c570ae7bf1bab304f29427e2475fe1856814312c4a1cf1cd0ee133f07a3c6",
+                "sha256:2c227c0ed371771ffda256034427320870e8ea2e4fd0c0a618c766e7c49aad73",
+                "sha256:3bb9b63d319402cead8bbd9dd55dca3b667d2997e9a0d8a1f9b6cc274db4baee",
+                "sha256:3ef2183de67b59930d2db8b8e8d4d58e00a50fcc5e92f4f678f6eed7a1c72d55",
+                "sha256:43b8ed3dbfd9171e44c554cb4acf4ee4505caa84c5e341858b50ea27dd2b6e12",
+                "sha256:47bcf3c5e6c1e87ceb86cdda2ee983fa0fe56a999e6185099b3c93a223f2fa9b",
+                "sha256:5263db1e2e1e8ae30500cdd75a979ff99dcc184201e6b4b820d0de74834d2323",
+                "sha256:5b1451727f02e7acbdf6aae4e06d75f66ee82966ff9114550381c3271a90f56c",
+                "sha256:6996883a8a6ff9117cbb3d6f5b0dcbbae6fb9e31e1a3e4e2f95e0214d9a1c655",
+                "sha256:6c96f64a54f030366657a54bb90b3093afc9c16c8e0dfa29fc0d6dbe169103a5",
+                "sha256:7332d5c3e35154cd234fd79573736ddcf7a0ade7a986db35b6196b9171493e75",
+                "sha256:7885b6f32c4a898e825bb7f56f36a02781ac4a951c63e4169f0afcf9c8c30dfb",
+                "sha256:7b0f63f10a166583ab744a58baad04e0f52cfea1ac27bfa1b0c21a48d1003c23",
+                "sha256:819f95d4eba3f9e484dd115ab7ab72845cf766b84286a00d4ecf76d33f1edca1",
+                "sha256:8968eeaa4d37a38f8ca1f9dbe53526b69628edc9c42229a5b2f56d98bb828c1f",
+                "sha256:89ebf69cb19a33d625db72d2ac589d26e936b8f7628531269accf4a3196e7872",
+                "sha256:8daecd778c1da45b8bd54fd41ffcd471a86beed3d8e57a43acf7a8d63bba4058",
+                "sha256:955ba8ea73cf3ed8bd2f963b4cb9f8f0dcb27becd2f4b3dd536fd24c45533454",
+                "sha256:964f18a59f5a64c0170f684c417f4fe3e695a536612e13074c4dd5d1c6d7c882",
+                "sha256:969843fbdfbf56cdb71da6f0bdf50f9985b8b8aeb630102945306cf10a9c6af2",
+                "sha256:996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132",
+                "sha256:9e9c9078a7ce07e6fce366bd818be89365a35d2e4b163268f0ca9ba7e13bb2f6",
+                "sha256:9f4e67f87e072de981570eaf7cb41444bbac7e92b05c8651dbab6eb1fb8d5a14",
+                "sha256:a04901757cb0fb0f5602ac11dda48f5510f94372144d06c2563ba56c480b467c",
+                "sha256:a7bf1492429f18d205f3a818da3ff1f242f60aa59006e53dee00b4ef592a3363",
+                "sha256:aa0af2deb166a5e26e0d554b824605e660039b161e37ed4f01b8d04beec184f3",
+                "sha256:abfb15a6a7822f0fae681785cb38860e7a2cb1616a708d53df557b3d76c5bfd4",
+                "sha256:b253fe4df2afea4dfa6b1fa8c5fef212aff8bcaaeb4207e81eed05cb5e4a7919",
+                "sha256:b27f082f47d23cffc4cf1388b84fdc45c4ef6015f906cd7e0d988d9e35d36349",
+                "sha256:b33aea449e7f46738811fbc6f0b3177c6777a572207412bbbf6f525ffed001ae",
+                "sha256:b39989b49e8aca9d224324d2650029eda410a4faf43f6afb0eb4f9acb7be6097",
+                "sha256:b44f9421c4505c548435244d74037618f452844c5d3c67719d8a55e2613549da",
+                "sha256:bcc371151d1512201d0214c36c0c150b1dc64f19c2b1a8c9cb1d7c7c15ebd93f",
+                "sha256:c2851deeabd96d3f6283e9c6b26e0bfed4de2dc6fb15edf913e78b79fc5909ed",
+                "sha256:cdfd501c7ac5b198c15df800a3a34c38345f5182e5f80770caf362bccca65628",
+                "sha256:d2c0caffa47606d6d7c8af94ba42547bd2a441f06c74fd90a1ffe328524a6c64",
+                "sha256:dcb2db95e629962db5a355047fb8aefb012df6c8ae608930d391619dbd96fd86",
+                "sha256:e0eeb9c112fec2031927a1745788a181d0eecbacbed941fc5c4f7bc3f7b273bf",
+                "sha256:e154891263306200260d7f3051982774d7b9ef35af3509d5adbbe539afd2610c",
+                "sha256:e2e023a42dcbab8ed31f97c2bcdb980b7fbe0ada34037d87ba9d799664b58ded",
+                "sha256:e64be68255234bb489a574c4f2f8df7029c98c81ec4d160d6cd836e7f0679390",
+                "sha256:e82d6b930e02e80e5109b678c663a9ed210680ded81c1abaf54635d88d1da298"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==1.1.0"
+        },
         "humanfriendly": {
             "hashes": [
                 "sha256:175ffa628aa76da2c17369a5da5856084562cc66dfe7f82ae93ca3ef175277a6",
@@ -221,6 +346,22 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==9.0"
         },
+        "hyperlink": {
+            "hashes": [
+                "sha256:402c1b5fa066ea368f3118fc5a6f8505440b4d1a4ef12a844ca39332a4a29944",
+                "sha256:47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af",
+                "sha256:c528d405766f15a2c536230de7e160b65a08e20264d8891b3eb03307b0df3c63"
+            ],
+            "version": "==20.0.1"
+        },
+        "idna": {
+            "hashes": [
+                "sha256:4a57a6379512ade94fa99e2fa46d3cd0f2f553040548d0e2958c6ed90ee48226",
+                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
+                "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
+            ],
+            "version": "==2.10"
+        },
         "imap-tools": {
             "hashes": [
                 "sha256:72bf46dc135b039a5d5b59f4e079242ac15eac02a30038e8cb2dec7b153cab65",
@@ -244,6 +385,13 @@
             "markers": "python_version < '3.8'",
             "version": "==3.1.1"
         },
+        "incremental": {
+            "hashes": [
+                "sha256:717e12246dddf231a349175f48d74d93e2897244939173b01974ab6661406b9f",
+                "sha256:7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3"
+            ],
+            "version": "==17.5.0"
+        },
         "inotify-simple": {
             "hashes": [
                 "sha256:8440ffe49c4ae81a8df57c1ae1eb4b6bfa7acb830099bfb3e305b383005cc128",
@@ -322,6 +470,32 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==4.6.2"
         },
+        "msgpack": {
+            "hashes": [
+                "sha256:002a0d813e1f7b60da599bdf969e632074f9eec1b96cbed8fb0973a63160a408",
+                "sha256:0e7b5a69ec5645b0a85baaa354c29acd89eb879aaa89e7f4b37ed4d9c5abafe0",
+                "sha256:25b3bc3190f3d9d965b818123b7752c5dfb953f0d774b454fd206c18fe384fb8",
+                "sha256:271b489499a43af001a2e42f42d876bb98ccaa7e20512ff37ca78c8e12e68f84",
+                "sha256:39c54fdebf5fa4dda733369012c59e7d085ebdfe35b6cf648f09d16708f1be5d",
+                "sha256:4233b7f86c1208190c78a525cd3828ca1623359ef48f78a6fea4b91bb995775a",
+                "sha256:5bea44181fc8e18eed1d0cd76e355073f00ce232ff9653a0ae88cb7d9e643322",
+                "sha256:5dba6d074fac9b24f29aaf1d2d032306c27f04187651511257e7831733293ec2",
+                "sha256:71604047feea609ad65f5b837ec89a4de084d55a80f8af7331745a075c3dbd23",
+                "sha256:7a22c965588baeb07242cb561b63f309db27a07382825fc98aecaf0827c1538e",
+                "sha256:908944e3f038bca67fcfedb7845c4a257c7749bf9818632586b53bcf06ba4b97",
+                "sha256:9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0",
+                "sha256:aa5c057eab4f40ec47ea6f5a9825846be2ff6bf34102c560bad5cad5a677c5be",
+                "sha256:b3758dfd3423e358bbb18a7cccd1c74228dffa7a697e5be6cb9535de625c0dbf",
+                "sha256:c901e8058dd6653307906c5f157f26ed09eb94a850dddd989621098d347926ab",
+                "sha256:cec8bf10981ed70998d98431cd814db0ecf3384e6b113366e7f36af71a0fca08",
+                "sha256:db685187a415f51d6b937257474ca72199f393dad89534ebbdd7d7a3b000080e",
+                "sha256:e35b051077fc2f3ce12e7c6a34cf309680c63a842db3a0616ea6ed25ad20d272",
+                "sha256:e7bbdd8e2b277b77782f3ce34734b0dfde6cbe94ddb74de8d733d603c7f9e2b1",
+                "sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140",
+                "sha256:f7c80ff32171193f18a127ea357118b920020cc0acb0730016bbda02b892a2d2"
+            ],
+            "version": "==1.0.0"
+        },
         "numpy": {
             "hashes": [
                 "sha256:08308c38e44cc926bdfce99498b21eec1f848d24c302519e64203a8da99a97db",
@@ -514,6 +688,42 @@
             "index": "pypi",
             "version": "==2.8.6"
         },
+        "pyasn1": {
+            "hashes": [
+                "sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359",
+                "sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576",
+                "sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf",
+                "sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7",
+                "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d",
+                "sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00",
+                "sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8",
+                "sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86",
+                "sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12",
+                "sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776",
+                "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba",
+                "sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2",
+                "sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3"
+            ],
+            "version": "==0.4.8"
+        },
+        "pyasn1-modules": {
+            "hashes": [
+                "sha256:0845a5582f6a02bb3e1bde9ecfc4bfcae6ec3210dd270522fee602365430c3f8",
+                "sha256:0fe1b68d1e486a1ed5473f1302bd991c1611d319bba158e98b106ff86e1d7199",
+                "sha256:15b7c67fabc7fc240d87fb9aabf999cf82311a6d6fb2c70d00d3d0604878c811",
+                "sha256:426edb7a5e8879f1ec54a1864f16b882c2837bfd06eee62f2c982315ee2473ed",
+                "sha256:65cebbaffc913f4fe9e4808735c95ea22d7a7775646ab690518c056784bc21b4",
+                "sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e",
+                "sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74",
+                "sha256:a99324196732f53093a84c4369c996713eb8c89d360a496b599fb1a9c47fc3eb",
+                "sha256:b80486a6c77252ea3a3e9b1e360bc9cf28eaac41263d173c032581ad2f20fe45",
+                "sha256:c29a5e5cc7a3f05926aff34e097e84f8589cd790ce0ed41b67aed6857b26aafd",
+                "sha256:cbac4bc38d117f2a49aeedec4407d23e8866ea4ac27ff2cf7fb3e5b570df19e0",
+                "sha256:f39edd8c4ecaa4556e989147ebf219227e2cd2e8a43c7e7fcb1f1c18c5fd6a3d",
+                "sha256:fe0644d9ab041506b62782e92b06b8c68cca799e1a9636ec398675459e031405"
+            ],
+            "version": "==0.2.8"
+        },
         "pycparser": {
             "hashes": [
                 "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0",
@@ -522,6 +732,21 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.20"
         },
+        "pyhamcrest": {
+            "hashes": [
+                "sha256:412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316",
+                "sha256:7ead136e03655af85069b6f47b23eb7c3e5c221aa9f022a4fbb499f5b7308f29"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==2.0.2"
+        },
+        "pyopenssl": {
+            "hashes": [
+                "sha256:898aefbde331ba718570244c3b01dcddb1b31a3b336613436a45e52e27d9a82d",
+                "sha256:92f08eccbd73701cf744e8ffd6989aa7842d48cbe3fea8a7c031c5647f590ac5"
+            ],
+            "version": "==20.0.0"
+        },
         "python-dateutil": {
             "hashes": [
                 "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c",
@@ -730,6 +955,13 @@
             "markers": "python_version >= '3.6'",
             "version": "==1.5.4"
         },
+        "service-identity": {
+            "hashes": [
+                "sha256:001c0707759cb3de7e49c078a7c0c9cd12594161d3bf06b9c254fdcb1a60dc36",
+                "sha256:0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d"
+            ],
+            "version": "==18.1.0"
+        },
         "six": {
             "hashes": [
                 "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
@@ -769,6 +1001,48 @@
             "index": "pypi",
             "version": "==4.54.1"
         },
+        "twisted": {
+            "extras": [
+                "tls"
+            ],
+            "hashes": [
+                "sha256:0150dae5adc962d15e00054cc6926f1e64763fb8dd26e1632593ac06e592104b",
+                "sha256:040eb6641125d2a9a09cf198ec7b83dd8858c6f51f6770325ed9959c00f5098f",
+                "sha256:147780b8caf21ba2aef3688628eaf13d7e7fe02a86747cd54bfaf2140538f042",
+                "sha256:158ddb80719a4813d292293ac44ba41d8b56555ed009d90994a278237ee63d2c",
+                "sha256:15e52271f08f62e2230ff093e0278aa01c9dac057c4557cadadd2429eed86a3e",
+                "sha256:2182000d6ffc05d269e6c03bfcec8b57e20259ca1086180edaedec3f1e689292",
+                "sha256:25ffcf37944bdad4a99981bc74006d735a678d2b5c193781254fbbb6d69e3b22",
+                "sha256:3281d9ce889f7b21bdb73658e887141aa45a102baf3b2320eafcfba954fcefec",
+                "sha256:356e8d8dd3590e790e3dba4db139eb8a17aca64b46629c622e1b1597a4a92478",
+                "sha256:70952c56e4965b9f53b180daecf20a9595cf22b8d0935cd3bd664c90273c3ab2",
+                "sha256:7408c6635ee1b96587289283ebe90ee15dbf9614b05857b446055116bc822d29",
+                "sha256:7c547fd0215db9da8a1bc23182b309e84a232364cc26d829e9ee196ce840b114",
+                "sha256:894f6f3cfa57a15ea0d0714e4283913a5f2511dbd18653dd148eba53b3919797",
+                "sha256:94ac3d55a58c90e2075c5fe1853f2aa3892b73e3bf56395f743aefde8605eeaa",
+                "sha256:a58e61a2a01e5bcbe3b575c0099a2bcb8d70a75b1a087338e0c48dd6e01a5f15",
+                "sha256:c09c47ff9750a8e3aa60ad169c4b95006d455a29b80ad0901f031a103b2991cd",
+                "sha256:ca3a0b8c9110800e576d89b5337373e52018b41069bc879f12fa42b7eb2d0274",
+                "sha256:cd1dc5c85b58494138a3917752b54bb1daa0045d234b7c132c37a61d5483ebad",
+                "sha256:cdbc4c7f0cd7a2218b575844e970f05a1be1861c607b0e048c9bceca0c4d42f7",
+                "sha256:d267125cc0f1e8a0eed6319ba4ac7477da9b78a535601c49ecd20c875576433a",
+                "sha256:d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10",
+                "sha256:d95803193561a243cb0401b0567c6b7987d3f2a67046770e1dccd1c9e49a9780",
+                "sha256:e92703bed0cc21d6cb5c61d66922b3b1564015ca8a51325bd164a5e33798d504",
+                "sha256:f058bd0168271de4dcdc39845b52dd0a4a2fecf5f1246335f13f5e96eaebb467",
+                "sha256:f3c19e5bd42bbe4bf345704ad7c326c74d3fd7a1b3844987853bef180be638d4"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==20.3.0"
+        },
+        "txaio": {
+            "hashes": [
+                "sha256:17938f2bca4a9cabce61346758e482ca4e600160cbc28e861493eac74a19539d",
+                "sha256:38a469daf93c37e5527cb062653d6393ae11663147c42fab7ddc3f6d00d434ae"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==20.4.1"
+        },
         "tzlocal": {
             "hashes": [
                 "sha256:643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44",
@@ -815,6 +1089,66 @@
             ],
             "markers": "python_version >= '3.6'",
             "version": "==3.4.0"
+        },
+        "zope.interface": {
+            "hashes": [
+                "sha256:05a97ba92c1c7c26f25c9f671aa1ef85ffead6cdad13770e5b689cf983adc7e1",
+                "sha256:07d61722dd7d85547b7c6b0f5486b4338001fab349f2ac5cabc0b7182eb3425d",
+                "sha256:09fc3922f235703c0b76f8234867685eee68a24a49fffa2220975f6142db45f1",
+                "sha256:0a990dcc97806e5980bbb54b2e46b9cde9e48932d8e6984daf71ef1745516123",
+                "sha256:150e8bcb7253a34a4535aeea3de36c0bb3b1a6a47a183a95d65a194b3e07f232",
+                "sha256:1743bcfe45af8846b775086471c28258f4c6e9ee8ef37484de4495f15a98b549",
+                "sha256:1b5f6c8fff4ed32aa2dd43e84061bc8346f32d3ba6ad6e58f088fe109608f102",
+                "sha256:21e49123f375703cf824214939d39df0af62c47d122d955b2a8d9153ea08cfd5",
+                "sha256:21f579134a47083ffb5ddd1307f0405c91aa8b61ad4be6fd5af0171474fe0c45",
+                "sha256:27c267dc38a0f0079e96a2945ee65786d38ef111e413c702fbaaacbab6361d00",
+                "sha256:299bde0ab9e5c4a92f01a152b7fbabb460f31343f1416f9b7b983167ab1e33bc",
+                "sha256:2ab88d8f228f803fcb8cb7d222c579d13dab2d3622c51e8cf321280da01102a7",
+                "sha256:2ced4c35061eea623bc84c7711eedce8ecc3c2c51cd9c6afa6290df3bae9e104",
+                "sha256:2dcab01c660983ba5e5a612e0c935141ccbee67d2e2e14b833e01c2354bd8034",
+                "sha256:32546af61a9a9b141ca38d971aa6eb9800450fa6620ce6323cc30eec447861f3",
+                "sha256:32b40a4c46d199827d79c86bb8cb88b1bbb764f127876f2cb6f3a47f63dbada3",
+                "sha256:3cc94c69f6bd48ed86e8e24f358cb75095c8129827df1298518ab860115269a4",
+                "sha256:42b278ac0989d6f5cf58d7e0828ea6b5951464e3cf2ff229dd09a96cb6ba0c86",
+                "sha256:495b63fd0302f282ee6c1e6ea0f1c12cb3d1a49c8292d27287f01845ff252a96",
+                "sha256:4af87cdc0d4b14e600e6d3d09793dce3b7171348a094ba818e2a68ae7ee67546",
+                "sha256:4b94df9f2fdde7b9314321bab8448e6ad5a23b80542dcab53e329527d4099dcb",
+                "sha256:4c48ddb63e2b20fba4c6a2bf81b4d49e99b6d4587fb67a6cd33a2c1f003af3e3",
+                "sha256:4df9afd17bd5477e9f8c8b6bb8507e18dd0f8b4efe73bb99729ff203279e9e3b",
+                "sha256:518950fe6a5d56f94ba125107895f938a4f34f704c658986eae8255edb41163b",
+                "sha256:538298e4e113ccb8b41658d5a4b605bebe75e46a30ceca22a5a289cf02c80bec",
+                "sha256:55465121e72e208a7b69b53de791402affe6165083b2ea71b892728bd19ba9ae",
+                "sha256:588384d70a0f19b47409cfdb10e0c27c20e4293b74fc891df3d8eb47782b8b3e",
+                "sha256:6278c080d4afffc9016e14325f8734456831124e8c12caa754fd544435c08386",
+                "sha256:64ea6c221aeee4796860405e1aedec63424cda4202a7ad27a5066876db5b0fd2",
+                "sha256:681dbb33e2b40262b33fd383bae63c36d33fd79fa1a8e4092945430744ffd34a",
+                "sha256:6936aa9da390402d646a32a6a38d5409c2d2afb2950f045a7d02ab25a4e7d08d",
+                "sha256:778d0ec38bbd288b150a3ae363c8ffd88d2207a756842495e9bffd8a8afbc89a",
+                "sha256:8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24",
+                "sha256:83b4aa5344cce005a9cff5d0321b2e318e871cc1dfc793b66c32dd4f59e9770d",
+                "sha256:844fad925ac5c2ad4faaceb3b2520ad016b5280105c6e16e79838cf951903a7b",
+                "sha256:8ceb3667dd13b8133f2e4d637b5b00f240f066448e2aa89a41f4c2d78a26ce50",
+                "sha256:92dc0fb79675882d0b6138be4bf0cec7ea7c7eede60aaca78303d8e8dbdaa523",
+                "sha256:974f5957e66a7524ea81df7b2686a456bfaf0408dbb7353ddfbedb594eadfef6",
+                "sha256:9789bd945e9f5bd026ed3f5b453d640befb8b1fc33a779c1fe8d3eb21fe3fb4a",
+                "sha256:a2b6d6eb693bc2fc6c484f2e5d93bd0b0da803fa77bf974f160533e555e4d095",
+                "sha256:aab9f1e34d810feb00bf841993552b8fcc6ae71d473c505381627143d0018a6a",
+                "sha256:abb61afd84f23099ac6099d804cdba9bd3b902aaaded3ffff47e490b0a495520",
+                "sha256:adf9ee115ae8ff8b6da4b854b4152f253b390ba64407a22d75456fe07dcbda65",
+                "sha256:aedc6c672b351afe6dfe17ff83ee5e7eb6ed44718f879a9328a68bdb20b57e11",
+                "sha256:b7a00ecb1434f8183395fac5366a21ee73d14900082ca37cf74993cf46baa56c",
+                "sha256:ba32f4a91c1cb7314c429b03afbf87b1fff4fb1c8db32260e7310104bd77f0c7",
+                "sha256:cbd0f2cbd8689861209cd89141371d3a22a11613304d1f0736492590aa0ab332",
+                "sha256:e4bc372b953bf6cec65a8d48482ba574f6e051621d157cf224227dbb55486b1e",
+                "sha256:eccac3d9aadc68e994b6d228cb0c8919fc47a5350d85a1b4d3d81d1e98baf40c",
+                "sha256:efd550b3da28195746bb43bd1d815058181a7ca6d9d6aa89dd37f5eefe2cacb7",
+                "sha256:efef581c8ba4d990770875e1a2218e856849d32ada2680e53aebc5d154a17e20",
+                "sha256:f057897711a630a0b7a6a03f1acf379b6ba25d37dc5dc217a97191984ba7f2fc",
+                "sha256:f37d45fab14ffef9d33a0dc3bc59ce0c5313e2253323312d47739192da94f5fd",
+                "sha256:f44906f70205d456d503105023041f1e63aece7623b31c390a0103db4de17537"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==5.2.0"
         }
     },
     "develop": {
@@ -980,7 +1314,6 @@
                 "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
                 "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.10"
         },
         "imagesize": {

From 8b637214b45ef82a0388674c7f54984fd75eafe5 Mon Sep 17 00:00:00 2001
From: Wolfhart Feldmeier <wolfhart.feldmeier@gmail.com>
Date: Sun, 6 Dec 2020 23:00:20 +0100
Subject: [PATCH 0064/1300] Dockerfile: Add libqpdf-dev to build dependencies

---
 docker/local/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index 9b110c622..461b9e4fc 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -18,6 +18,7 @@ RUN apt-get update \
 		libmagic-dev \
 		libpoppler-cpp-dev \
 		libpq-dev \
+		libqpdf-dev \
 		libxml2 \
 		optipng \
 		pngquant \
@@ -34,7 +35,7 @@ RUN apt-get update \
 		zlib1g \
 	&& pip3 install --upgrade supervisor setuptools \
 	&& pip install --no-cache-dir -r requirements.txt \
-	&& apt-get -y purge build-essential \
+	&& apt-get -y purge build-essential libqpdf-dev \
 	&& apt-get -y autoremove --purge \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& mkdir /var/log/supervisord /var/run/supervisord

From 2bbeb8ffe0d212eab0542e218fb6358bb2579be1 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Sun, 6 Dec 2020 23:30:51 +0100
Subject: [PATCH 0065/1300] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bd6080d35..a8fb1f8e9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,3 +24,7 @@ feature-X branches is for experimental stuff that will eventually be merged into
 I'm trying to get most of paperless tested, so please do the same for your code! I know its a hassle, but it makes sure that your code works now and will allow us to detect regressions easily.
 
 To test your code, execute `pytest` in the src/ directory. Executing that in the project root is no good. This also generates a html coverage report, which you can use to see if you missed anything important during testing.
+
+## More info:
+
+... is available in the documentation. https://paperless-ng.readthedocs.io/en/latest/extending.html

From e2456f4b3fb586edcb7794915b258fb4aa118489 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 7 Dec 2020 12:44:23 +0100
Subject: [PATCH 0066/1300] changes

---
 .../consumer-status-widget.component.html     | 16 +++++-----
 .../saved-view-widget.component.css           |  0
 .../statistics-widget.component.css           |  0
 .../upload-file-widget.component.ts           |  2 +-
 .../document-list/document-list.component.ts  |  2 +-
 src/documents/consumer.py                     | 29 +++++++++----------
 6 files changed, 25 insertions(+), 24 deletions(-)
 delete mode 100644 src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.css
 delete mode 100644 src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.css

diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
index ff2117729..9ea715043 100644
--- a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
@@ -1,10 +1,12 @@
 <app-widget-frame title="Document consumer status">
-  <div class="mb-2 border-bottom" *ngFor="let s of getStatus()">
-    <div class="mb-1"><strong>{{s.filename}}:</strong> {{s.message}}</div>
-    <ngb-progressbar [type]="getType(s.status)" [value]="s.current_progress" [max]="s.max_progress" class="mb-2"></ngb-progressbar>
-    <div *ngIf="isFinished(s)" class="mb-2">
-      <button *ngIf="s.document_id" class="btn btn-sm btn-outline-primary mr-2" routerLink="/documents/{{s.document_id}}" (click)="dismiss(s)">Open document</button>
-      <button class="btn btn-sm btn-outline-secondary" (click)="dismiss(s)">Dismiss</button>
+  <ng-container content>
+    <div class="mb-2 border-bottom" *ngFor="let s of getStatus()">
+      <div class="mb-1"><strong>{{s.filename}}:</strong> {{s.message}}</div>
+      <ngb-progressbar [type]="getType(s.status)" [value]="s.current_progress" [max]="s.max_progress" class="mb-2"></ngb-progressbar>
+      <div *ngIf="isFinished(s)" class="mb-2">
+        <button *ngIf="s.document_id" class="btn btn-sm btn-outline-primary mr-2" routerLink="/documents/{{s.document_id}}" (click)="dismiss(s)">Open document</button>
+        <button class="btn btn-sm btn-outline-secondary" (click)="dismiss(s)">Dismiss</button>
+      </div>
     </div>
-  </div>
+  </ng-container>
 </app-widget-frame>
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.css b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.css b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index 97b4ffee8..16a220229 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -29,7 +29,7 @@ export class UploadFileWidgetComponent implements OnInit {
           const formData = new FormData()
           formData.append('document', file, file.name)
           this.documentService.uploadDocument(formData).subscribe(result => {
-            this.toastService.showInfo(The document has been uploaded and will be processed by the consumer shortly.")
+            this.toastService.showInfo("The document has been uploaded and will be processed by the consumer shortly.")
           }, error => {
             switch (error.status) {
               case 400: {
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index fe6c8a894..4dc986d51 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -76,7 +76,7 @@ export class DocumentListComponent implements OnInit {
 
   saveViewConfig() {
     this.savedViewConfigService.updateConfig(this.list.savedView)
-    this.toastService.showToast(Toast.make("Information", `View "${this.list.savedView.title}" saved successfully.`))
+    this.toastService.showInfo(`View "${this.list.savedView.title}" saved successfully.`)
   }
 
   saveViewConfigAs() {
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index b57e81d06..30c57e6a0 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -43,6 +43,11 @@ class Consumer(LoggingMixin):
                                                      {'type': 'status_update',
                                                       'data': payload})
 
+    def _fail(self, message):
+        self._send_progress(self.filename, 100, 100, 'FAILED',
+                            message)
+        raise ConsumerError(f"{self.filename}: {message}")
+
     def __init__(self):
         super().__init__()
         self.path = None
@@ -56,8 +61,7 @@ class Consumer(LoggingMixin):
 
     def pre_check_file_exists(self):
         if not os.path.isfile(self.path):
-            raise ConsumerError("Cannot consume {}: It is not a file".format(
-                self.path))
+            self._fail("File not found")
 
     def pre_check_duplicate(self):
         with open(self.path, "rb") as f:
@@ -65,9 +69,7 @@ class Consumer(LoggingMixin):
         if Document.objects.filter(Q(checksum=checksum) | Q(archive_checksum=checksum)).exists():  # NOQA: E501
             if settings.CONSUMER_DELETE_DUPLICATES:
                 os.unlink(self.path)
-            raise ConsumerError(
-                "Not consuming {}: It is a duplicate.".format(self.filename)
-            )
+            self._fail("Document is a duplicate")
 
     def pre_check_directories(self):
         os.makedirs(settings.SCRATCH_DIR, exist_ok=True)
@@ -93,6 +95,9 @@ class Consumer(LoggingMixin):
         self.override_document_type_id = override_document_type_id
         self.override_tag_ids = override_tag_ids
 
+        self._send_progress(self.filename, 0, 100, 'WORKING',
+                            'Received new file.')
+
         # this is for grouping logging entries for this particular file
         # together.
 
@@ -112,7 +117,7 @@ class Consumer(LoggingMixin):
 
         parser_class = get_parser_class_for_mime_type(mime_type)
         if not parser_class:
-            raise ConsumerError(f"No parsers abvailable for {self.filename}")
+            self._fail("No parsers abvailable")
         else:
             self.log("debug",
                      f"Parser: {parser_class.__name__} "
@@ -120,8 +125,6 @@ class Consumer(LoggingMixin):
 
         # Notify all listeners that we're going to do some work.
 
-        self._send_progress(self.filename, 0, 100, 'WORKING', 'Consumption started')
-
         document_consumption_started.send(
             sender=self.__class__,
             filename=self.path,
@@ -130,7 +133,7 @@ class Consumer(LoggingMixin):
 
         def progress_callback(current_progress, max_progress, message):
             # recalculate progress to be within 20 and 80
-            p = int((current_progress / max_progress) * 60 + 20)
+            p = int((current_progress / max_progress) * 50 + 20)
             self._send_progress(self.filename, p, 100, "WORKING", message)
 
         # This doesn't parse the document yet, but gives us a parser.
@@ -167,9 +170,7 @@ class Consumer(LoggingMixin):
             self.log(
                 "error",
                 f"Error while consuming document {self.filename}: {e}")
-            self._send_progress(self.filename, 100, 100, 'FAILED',
-                                "Failed: {}".format(e))
-            raise ConsumerError(e)
+            self._fail(e)
 
         # Prepare the document classifier.
 
@@ -246,9 +247,7 @@ class Consumer(LoggingMixin):
                 f"The following error occured while consuming "
                 f"{self.filename}: {e}"
             )
-            self._send_progress(self.filename, 100, 100, 'FAILED',
-                                "Failed: {}".format(e))
-            raise ConsumerError(e)
+            self._fail(str(e))
         finally:
             document_parser.cleanup()
 

From 56acd4f320167cf463bea6f11ce6356fb2587ec1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 7 Dec 2020 12:46:46 +0100
Subject: [PATCH 0067/1300] fixes #105

---
 .../saved-view-widget/saved-view-widget.component.ts      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
index 413df0ae4..a55bf57fc 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
@@ -29,8 +29,12 @@ export class SavedViewWidgetComponent implements OnInit {
   }
 
   showAll() {
-    this.list.load(this.savedView)
-    this.router.navigate(["documents"])
+    if (this.savedView.showInSideBar) {
+      this.router.navigate(['view', this.savedView.id])
+    } else {
+      this.list.load(this.savedView)
+      this.router.navigate(["documents"])
+      }
   }
 
 }

From 9e46afafd7c6763d4d121e3e5c6fc68674b72e2b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 7 Dec 2020 15:25:06 +0100
Subject: [PATCH 0068/1300] fixes #102

---
 .../filter-editor/filter-editor.component.ts   |  2 +-
 src-ui/src/app/data/filter-rule-type.ts        | 12 ++++++++----
 src/documents/filters.py                       | 12 +++++++++++-
 src/documents/tests/test_api.py                | 18 ++++++++++++++++++
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index 2eeac7dcd..b04127287 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -34,7 +34,7 @@ export class FilterEditorComponent implements OnInit {
   documentTypes: PaperlessDocumentType[] = []
 
   newRuleClicked() {
-    this.filterRules.push({type: this.selectedRuleType, value: null})
+    this.filterRules.push({type: this.selectedRuleType, value: this.selectedRuleType.default})
     this.selectedRuleType = this.getRuleTypes().length > 0 ? this.getRuleTypes()[0] : null
   }
 
diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts
index e1db34298..a35759f69 100644
--- a/src-ui/src/app/data/filter-rule-type.ts
+++ b/src-ui/src/app/data/filter-rule-type.ts
@@ -16,19 +16,22 @@ export const FILTER_ADDED_AFTER = 14
 export const FILTER_MODIFIED_BEFORE = 15
 export const FILTER_MODIFIED_AFTER = 16
 
+export const FILTER_DOES_NOT_HAVE_TAG = 17
+
 export const FILTER_RULE_TYPES: FilterRuleType[] = [
 
-  {id: FILTER_TITLE, name: "Title contains", filtervar: "title__icontains", datatype: "string", multi: false},
-  {id: FILTER_CONTENT, name: "Content contains", filtervar: "content__icontains", datatype: "string", multi: false},
+  {id: FILTER_TITLE, name: "Title contains", filtervar: "title__icontains", datatype: "string", multi: false, default: ""},
+  {id: FILTER_CONTENT, name: "Content contains", filtervar: "content__icontains", datatype: "string", multi: false, default: ""},
   
   {id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false},
   
   {id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", datatype: "correspondent", multi: false},
   {id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", datatype: "document_type", multi: false},
 
-  {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false},  
+  {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},  
   {id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true},  
-  {id: FILTER_HAS_ANY_TAG, name: "Has any tag", filtervar: "is_tagged", datatype: "boolean", multi: false},
+  {id: FILTER_DOES_NOT_HAVE_TAG, name: "Does not have tag", filtervar: "tags__id__none", datatype: "tag", multi: true},  
+  {id: FILTER_HAS_ANY_TAG, name: "Has any tag", filtervar: "is_tagged", datatype: "boolean", multi: false, default: true},
 
   {id: FILTER_CREATED_BEFORE, name: "Created before", filtervar: "created__date__lt", datatype: "date", multi: false},
   {id: FILTER_CREATED_AFTER, name: "Created after", filtervar: "created__date__gt", datatype: "date", multi: false},
@@ -50,4 +53,5 @@ export interface FilterRuleType {
   filtervar: string
   datatype: string //number, string, boolean, date
   multi: boolean
+  default?: any
 }
\ No newline at end of file
diff --git a/src/documents/filters.py b/src/documents/filters.py
index 770e0e5af..64ef826ce 100755
--- a/src/documents/filters.py
+++ b/src/documents/filters.py
@@ -37,6 +37,10 @@ class DocumentTypeFilterSet(FilterSet):
 
 class TagsFilter(Filter):
 
+    def __init__(self, exclude=False):
+        super(TagsFilter, self).__init__()
+        self.exclude = exclude
+
     def filter(self, qs, value):
         if not value:
             return qs
@@ -47,7 +51,11 @@ class TagsFilter(Filter):
             return qs
 
         for tag_id in tag_ids:
-            qs = qs.filter(tags__id=tag_id)
+            print(self.exclude, tag_id)
+            if self.exclude:
+                qs = qs.exclude(tags__id=tag_id)
+            else:
+                qs = qs.filter(tags__id=tag_id)
 
         return qs
 
@@ -74,6 +82,8 @@ class DocumentFilterSet(FilterSet):
 
     tags__id__all = TagsFilter()
 
+    tags__id__none = TagsFilter(exclude=True)
+
     is_in_inbox = InboxFilter()
 
     class Meta:
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index b900ee653..986094db6 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -195,6 +195,24 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         results = response.data['results']
         self.assertEqual(len(results), 3)
 
+        response = self.client.get("/api/documents/?tags__id__none={}".format(tag_3.id))
+        self.assertEqual(response.status_code, 200)
+        results = response.data['results']
+        self.assertEqual(len(results), 2)
+        self.assertEqual(results[0]['id'], doc1.id)
+        self.assertEqual(results[1]['id'], doc2.id)
+
+        response = self.client.get("/api/documents/?tags__id__none={},{}".format(tag_3.id, tag_2.id))
+        self.assertEqual(response.status_code, 200)
+        results = response.data['results']
+        self.assertEqual(len(results), 1)
+        self.assertEqual(results[0]['id'], doc1.id)
+
+        response = self.client.get("/api/documents/?tags__id__none={},{}".format(tag_2.id, tag_inbox.id))
+        self.assertEqual(response.status_code, 200)
+        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']

From 87fa118de00acbafda24dd10f8e3b0128e57e5c3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 7 Dec 2020 21:51:00 +0100
Subject: [PATCH 0069/1300] added filenames to the API #108

---
 docs/api.rst                 | 63 +++++++++++++++++++++++++-----------
 src/documents/admin.py       |  7 +++-
 src/documents/models.py      |  1 +
 src/documents/serialisers.py | 17 +++++++++-
 4 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/docs/api.rst b/docs/api.rst
index 81334b9ec..7d486df7f 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -13,23 +13,55 @@ available filters and ordering fields.
 
 The API provides 5 main endpoints:
 
+*   ``/api/documents/``: Full CRUD support, except POSTing new documents. See below.
 *   ``/api/correspondents/``: Full CRUD support.
 *   ``/api/document_types/``: Full CRUD support.
-*   ``/api/documents/``: Full CRUD support, except POSTing new documents. See below.
 *   ``/api/logs/``: Read-Only.
 *   ``/api/tags/``: Full CRUD support.
 
-All of these endpoints except for the logging endpoint 
+All of these endpoints except for the logging endpoint
 allow you to fetch, edit and delete individual objects
 by appending their primary key to the path, for example ``/api/documents/454/``.
 
+The objects served by the document endpoint contain the following fields:
+
+*   ``id``: ID of the document. Read-only.
+*   ``title``: Title of the document.
+*   ``content``: Plain text content of the document.
+*   ``tags``: List of IDs of tags assigned to this document, or empty list.
+*   ``document_type``: Document type of this document, or null.
+*   ``correspondent``:  Correspondent of this document or null.
+*   ``created``: The date at which this document was created.
+*   ``modified``: The date at which this document was last edited in paperless. Read-only.
+*   ``added``: The date at which this document was added to paperless. Read-only.
+*   ``archive_serial_number``: The identifier of this document in a physical document archive.
+*   ``original_file_name``: Verbose filename of the original document. Read-only.
+*   ``archived_file_name``: Verbose filename of the archived document. Read-only. Null if no archived document is available.
+
+
+Downloading documents
+#####################
+
 In addition to that, the document endpoint offers these additional actions on
 individual documents:
 
-*   ``/api/documents/<pk>/download/``: Download the original document.
-*   ``/api/documents/<pk>/thumb/``: Download the PNG thumbnail of a document.
-*   ``/api/documents/<pk>/preview/``: Display the original document inline,
+*   ``/api/documents/<pk>/download/``: Download the document.
+*   ``/api/documents/<pk>/preview/``: Display the document inline,
     without downloading it.
+*   ``/api/documents/<pk>/thumb/``: Download the PNG thumbnail of a document.
+
+Paperless generates archived PDF/A documents from consumed files and stores both
+the original files as well as the archived files. By default, the endpoints
+for previews and downloads serve the archived file, if it is available.
+Otherwise, the original file is served.
+Some document cannot be archived.
+
+The endpoints correctly serve the response header fields ``Content-Disposition``
+and ``Content-Type`` to indicate the filename for download and the type of content of
+the document.
+
+In order to download or preview the original document when an archied document is available,
+supply the query parameter ``original=true``.
 
 .. hint::
 
@@ -38,13 +70,6 @@ individual documents:
     are in place. However, if you use these old URLs to access documents, you
     should update your app or script to use the new URLs.
 
-.. note::
-
-    The document endpoint provides tags, document types and correspondents as
-    ids in their corresponding fields. These are writeable. Paperless also
-    offers read-only objects for assigned tags, types and correspondents,
-    however, these might be removed in the future. As for now, the front end
-    requires them.
 
 Authorization
 #############
@@ -54,11 +79,11 @@ The REST api provides three different forms of authentication.
 1.  Basic authentication
 
     Authorize by providing a HTTP header in the form
-    
+
     .. code::
 
         Authorization: Basic <credentials>
-    
+
     where ``credentials`` is a base64-encoded string of ``<username>:<password>``
 
 2.  Session authentication
@@ -79,7 +104,7 @@ The REST api provides three different forms of authentication.
     .. code::
 
         Authorization: Token <token>
-    
+
     Tokens can be managed and revoked in the paperless admin.
 
 Searching for documents
@@ -111,7 +136,7 @@ Result list object returned by the endpoint:
         "page_count": 1,
         "corrected_query": "",
         "results": [
-            
+
         ]
     }
 
@@ -131,12 +156,12 @@ Result object:
     {
         "id": 1,
         "highlights": [
-            
+
         ],
         "score": 6.34234,
         "rank": 23,
         "document": {
-            
+
         }
     }
 
@@ -168,7 +193,7 @@ Each fragment contains a list of strings, and some of them are marked as a highl
             {"text": " fragment with a highlight."}
         ]
     ]
-    
+
 
 
 When ``term`` is present within a string, the word within ``text`` should be highlighted.
diff --git a/src/documents/admin.py b/src/documents/admin.py
index 8b9f2fce9..2a4fb0031 100755
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -50,7 +50,12 @@ class DocumentTypeAdmin(admin.ModelAdmin):
 class DocumentAdmin(admin.ModelAdmin):
 
     search_fields = ("correspondent__name", "title", "content", "tags__name")
-    readonly_fields = ("added", "mime_type", "storage_type", "filename")
+    readonly_fields = (
+        "added",
+        "modified",
+        "mime_type",
+        "storage_type",
+        "filename")
 
     list_display_links = ("title",)
 
diff --git a/src/documents/models.py b/src/documents/models.py
index a410687f7..366cb215d 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -174,6 +174,7 @@ class Document(models.Model):
 
     created = models.DateTimeField(
         default=timezone.now, db_index=True)
+
     modified = models.DateTimeField(
         auto_now=True, editable=False, db_index=True)
 
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 95f32094f..5aedeeb58 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -1,6 +1,7 @@
 import magic
 from pathvalidate import validate_filename, ValidationError
 from rest_framework import serializers
+from rest_framework.fields import SerializerMethodField
 
 from .models import Correspondent, Tag, Document, Log, DocumentType
 from .parsers import is_mime_type_supported
@@ -83,6 +84,18 @@ class DocumentSerializer(serializers.ModelSerializer):
     tags = TagsField(many=True)
     document_type = DocumentTypeField(allow_null=True)
 
+    original_file_name = SerializerMethodField()
+    archived_file_name = SerializerMethodField()
+
+    def get_original_file_name(self, obj):
+        return obj.get_public_filename()
+
+    def get_archived_file_name(self, obj):
+        if obj.archive_checksum:
+            return obj.get_public_filename(archive=True)
+        else:
+            return None
+
     class Meta:
         model = Document
         depth = 1
@@ -96,7 +109,9 @@ class DocumentSerializer(serializers.ModelSerializer):
             "created",
             "modified",
             "added",
-            "archive_serial_number"
+            "archive_serial_number",
+            "original_file_name",
+            "archived_file_name",
         )
 
 

From dc36e8566a9d2b56d58be7b5a958669d38b99d84 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 7 Dec 2020 22:15:56 +0100
Subject: [PATCH 0070/1300] addresses #106

---
 .../dashboard/dashboard.component.ts          |  6 ++++-
 .../document-detail.component.ts              |  6 ++++-
 .../document-list/document-list.component.ts  |  7 +++++-
 .../correspondent-list.component.ts           | 25 ++++++++++++-------
 .../document-type-list.component.ts           | 13 +++++++---
 .../components/manage/logs/logs.component.ts  |  5 +++-
 .../manage/settings/settings.component.ts     |  6 ++++-
 .../manage/tag-list/tag-list.component.ts     | 12 +++++++--
 .../app/components/search/search.component.ts |  5 +++-
 src-ui/src/environments/environment.prod.ts   |  3 ++-
 src-ui/src/environments/environment.ts        |  3 ++-
 11 files changed, 69 insertions(+), 22 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts
index aa2426179..c7410c3f2 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.ts
+++ b/src-ui/src/app/components/dashboard/dashboard.component.ts
@@ -1,5 +1,7 @@
 import { Component, OnInit } from '@angular/core';
+import { Title } from '@angular/platform-browser';
 import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
+import { environment } from 'src/environments/environment';
 
 
 @Component({
@@ -10,13 +12,15 @@ import { SavedViewConfigService } from 'src/app/services/saved-view-config.servi
 export class DashboardComponent implements OnInit {
 
   constructor(
-    public savedViewConfigService: SavedViewConfigService) { }
+    public savedViewConfigService: SavedViewConfigService,
+    private titleService: Title) { }
 
 
   savedViews = []
 
   ngOnInit(): void {
     this.savedViews = this.savedViewConfigService.getDashboardConfigs()
+    this.titleService.setTitle(`Dashboard - ${environment.appTitle}`)
   }
 
 }
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 253833792..cf16f01c5 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
+import { Title } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
@@ -11,6 +12,7 @@ import { OpenDocumentsService } from 'src/app/services/open-documents.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { DocumentService } from 'src/app/services/rest/document.service';
+import { environment } from 'src/environments/environment';
 import { DeleteDialogComponent } from '../common/delete-dialog/delete-dialog.component';
 import { CorrespondentEditDialogComponent } from '../manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component';
 import { DocumentTypeEditDialogComponent } from '../manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component';
@@ -51,7 +53,8 @@ export class DocumentDetailComponent implements OnInit {
     private router: Router,
     private modalService: NgbModal,
     private openDocumentService: OpenDocumentsService,
-    private documentListViewService: DocumentListViewService) { }
+    private documentListViewService: DocumentListViewService,
+    private titleService: Title) { }
 
   ngOnInit(): void {
     this.documentForm.valueChanges.subscribe(wow => {
@@ -80,6 +83,7 @@ export class DocumentDetailComponent implements OnInit {
 
   updateComponent(doc: PaperlessDocument) {
     this.document = doc
+    this.titleService.setTitle(`${doc.title} - ${environment.appTitle}`)
     this.documentsService.getMetadata(doc.id).subscribe(result => {
       this.metadata = result
     })
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index fe6c8a894..dd939ac01 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { Title } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { cloneFilterRules, FilterRule } from 'src/app/data/filter-rule';
@@ -8,6 +9,7 @@ import { DocumentListViewService } from 'src/app/services/document-list-view.ser
 import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
 import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
 import { Toast, ToastService } from 'src/app/services/toast.service';
+import { environment } from 'src/environments/environment';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
 
 @Component({
@@ -22,7 +24,8 @@ export class DocumentListComponent implements OnInit {
     public savedViewConfigService: SavedViewConfigService,
     public route: ActivatedRoute,
     private toastService: ToastService,
-    public modalService: NgbModal) { }
+    public modalService: NgbModal,
+    private titleService: Title) { }
 
   displayMode = 'smallCards' // largeCards, smallCards, details
 
@@ -50,10 +53,12 @@ export class DocumentListComponent implements OnInit {
         this.list.savedView = this.savedViewConfigService.getConfig(params.get('id'))
         this.filterRules = this.list.filterRules
         this.showFilter = false
+        this.titleService.setTitle(`${this.list.savedView.title} - ${environment.appTitle}`)
       } else {
         this.list.savedView = null
         this.filterRules = this.list.filterRules
         this.showFilter = this.filterRules.length > 0
+        this.titleService.setTitle(`Documents - ${environment.appTitle}`)
       }
       this.list.clear()
       this.list.reload()
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
index 83aa5d2cc..11027c60f 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
@@ -1,7 +1,9 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { Title } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
+import { environment } from 'src/environments/environment';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/correspondent-edit-dialog.component';
 
@@ -10,14 +12,19 @@ import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/co
   templateUrl: './correspondent-list.component.html',
   styleUrls: ['./correspondent-list.component.scss']
 })
-export class CorrespondentListComponent extends GenericListComponent<PaperlessCorrespondent> {
+export class CorrespondentListComponent extends GenericListComponent<PaperlessCorrespondent> implements OnInit {
 
-  constructor(correspondentsService: CorrespondentService,
-    modalService: NgbModal) { 
-      super(correspondentsService,modalService,CorrespondentEditDialogComponent)
-    }
+  constructor(correspondentsService: CorrespondentService, modalService: NgbModal, private titleService: Title) { 
+    super(correspondentsService,modalService,CorrespondentEditDialogComponent)
+  }
+
+  getObjectName(object: PaperlessCorrespondent) {
+    return `correspondent '${object.name}'`
+  }
+
+  ngOnInit(): void {
+    super.ngOnInit()
+    this.titleService.setTitle(`Correspondents - ${environment.appTitle}`)
+  }
 
-    getObjectName(object: PaperlessCorrespondent) {
-      return `correspondent '${object.name}'`
-    }
 }
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
index 733d2c44b..5276187ab 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
@@ -1,7 +1,9 @@
 import { Component, OnInit } from '@angular/core';
+import { Title } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
+import { environment } from 'src/environments/environment';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/document-type-edit-dialog.component';
 
@@ -12,11 +14,16 @@ import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/doc
 })
 export class DocumentTypeListComponent extends GenericListComponent<PaperlessDocumentType> {
 
-  constructor(service: DocumentTypeService, modalService: NgbModal) {
+  constructor(service: DocumentTypeService, modalService: NgbModal, private titleService: Title) {
     super(service, modalService, DocumentTypeEditDialogComponent)
-   }
+  }
 
-   getObjectName(object: PaperlessDocumentType) {
+  getObjectName(object: PaperlessDocumentType) {
     return `document type '${object.name}'`
   }
+
+  ngOnInit(): void {
+    super.ngOnInit()
+    this.titleService.setTitle(`Document types - ${environment.appTitle}`)
+  }
 }
diff --git a/src-ui/src/app/components/manage/logs/logs.component.ts b/src-ui/src/app/components/manage/logs/logs.component.ts
index d52b90a5a..565b8b9b5 100644
--- a/src-ui/src/app/components/manage/logs/logs.component.ts
+++ b/src-ui/src/app/components/manage/logs/logs.component.ts
@@ -1,7 +1,9 @@
 import { Component, OnInit } from '@angular/core';
+import { Title } from '@angular/platform-browser';
 import { kMaxLength } from 'buffer';
 import { LOG_LEVELS, LOG_LEVEL_INFO, PaperlessLog } from 'src/app/data/paperless-log';
 import { LogService } from 'src/app/services/rest/log.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-logs',
@@ -10,13 +12,14 @@ import { LogService } from 'src/app/services/rest/log.service';
 })
 export class LogsComponent implements OnInit {
 
-  constructor(private logService: LogService) { }
+  constructor(private logService: LogService, private titleService: Title) { }
 
   logs: PaperlessLog[] = []
   level: number = LOG_LEVEL_INFO
 
   ngOnInit(): void {
     this.reload()
+    this.titleService.setTitle(`Logs - ${environment.appTitle}`)
   }
 
   reload() {
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 1b93268fc..c7b976c65 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -1,9 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
+import { Title } from '@angular/platform-browser';
 import { SavedViewConfig } from 'src/app/data/saved-view-config';
 import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-settings',
@@ -18,10 +20,12 @@ export class SettingsComponent implements OnInit {
 
   constructor(
     private savedViewConfigService: SavedViewConfigService,
-    private documentListViewService: DocumentListViewService
+    private documentListViewService: DocumentListViewService,
+    private titleService: Title
   ) { }
 
   ngOnInit(): void {
+    this.titleService.setTitle(`Settings - ${environment.appTitle}`)
   }
 
   deleteViewConfig(config: SavedViewConfig) {
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
index 761a9484c..55a37f194 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
@@ -1,7 +1,9 @@
 import { Component } from '@angular/core';
+import { Title } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag';
 import { TagService } from 'src/app/services/rest/tag.service';
+import { environment } from 'src/environments/environment';
 import { CorrespondentEditDialogComponent } from '../correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.component';
@@ -13,9 +15,15 @@ import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.compon
 })
 export class TagListComponent extends GenericListComponent<PaperlessTag> {
 
-  constructor(tagService: TagService, modalService: NgbModal) {
+  constructor(tagService: TagService, modalService: NgbModal, private titleService: Title) {
     super(tagService, modalService, TagEditDialogComponent)
-   }
+  }
+
+
+  ngOnInit(): void {
+    super.ngOnInit()
+    this.titleService.setTitle(`Tags - ${environment.appTitle}`)
+  }
 
   getColor(id) {
     return TAG_COLOURS.find(c => c.id == id)
diff --git a/src-ui/src/app/components/search/search.component.ts b/src-ui/src/app/components/search/search.component.ts
index de8b4652f..3371debd2 100644
--- a/src-ui/src/app/components/search/search.component.ts
+++ b/src-ui/src/app/components/search/search.component.ts
@@ -1,7 +1,9 @@
 import { Component, OnInit } from '@angular/core';
+import { Title } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { SearchHit } from 'src/app/data/search-result';
 import { SearchService } from 'src/app/services/rest/search.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-search',
@@ -26,7 +28,7 @@ export class SearchComponent implements OnInit {
 
   errorMessage: string
 
-  constructor(private searchService: SearchService, private route: ActivatedRoute, private router: Router) { }
+  constructor(private searchService: SearchService, private route: ActivatedRoute, private router: Router, private titleService: Title) { }
 
   ngOnInit(): void {
     this.route.queryParamMap.subscribe(paramMap => {
@@ -34,6 +36,7 @@ export class SearchComponent implements OnInit {
       this.searching = true
       this.currentPage = 1
       this.loadPage()
+      this.titleService.setTitle(`Search: ${this.query} - ${environment.appTitle}`)
     })
 
   }
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 2d8d5261b..09154dfca 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -1,4 +1,5 @@
 export const environment = {
   production: true,
-  apiBaseUrl: "/api/"
+  apiBaseUrl: "/api/",
+  appTitle: "Paperless-ng"
 };
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts
index a0877d69f..5e4b148dc 100644
--- a/src-ui/src/environments/environment.ts
+++ b/src-ui/src/environments/environment.ts
@@ -4,7 +4,8 @@
 
 export const environment = {
   production: false,
-  apiBaseUrl: "http://localhost:8000/api/"
+  apiBaseUrl: "http://localhost:8000/api/",
+  appTitle: "DEVELOPMENT P-NG"
 };
 
 /*

From d4febbc40f0dfcb2d0bb99b715c726e6e5456e01 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 7 Dec 2020 22:17:47 +0100
Subject: [PATCH 0071/1300] codestyle

---
 .../document-type-list/document-type-list.component.ts       | 2 +-
 src-ui/src/app/components/manage/logs/logs.component.ts      | 1 -
 .../src/app/components/manage/tag-list/tag-list.component.ts | 5 ++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
index 5276187ab..316024514 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
@@ -12,7 +12,7 @@ import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/doc
   templateUrl: './document-type-list.component.html',
   styleUrls: ['./document-type-list.component.scss']
 })
-export class DocumentTypeListComponent extends GenericListComponent<PaperlessDocumentType> {
+export class DocumentTypeListComponent extends GenericListComponent<PaperlessDocumentType> implements OnInit {
 
   constructor(service: DocumentTypeService, modalService: NgbModal, private titleService: Title) {
     super(service, modalService, DocumentTypeEditDialogComponent)
diff --git a/src-ui/src/app/components/manage/logs/logs.component.ts b/src-ui/src/app/components/manage/logs/logs.component.ts
index 565b8b9b5..44d0fa24d 100644
--- a/src-ui/src/app/components/manage/logs/logs.component.ts
+++ b/src-ui/src/app/components/manage/logs/logs.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
-import { kMaxLength } from 'buffer';
 import { LOG_LEVELS, LOG_LEVEL_INFO, PaperlessLog } from 'src/app/data/paperless-log';
 import { LogService } from 'src/app/services/rest/log.service';
 import { environment } from 'src/environments/environment';
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
index 55a37f194..efbe11321 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
@@ -1,10 +1,9 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag';
 import { TagService } from 'src/app/services/rest/tag.service';
 import { environment } from 'src/environments/environment';
-import { CorrespondentEditDialogComponent } from '../correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.component';
 
@@ -13,7 +12,7 @@ import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.compon
   templateUrl: './tag-list.component.html',
   styleUrls: ['./tag-list.component.scss']
 })
-export class TagListComponent extends GenericListComponent<PaperlessTag> {
+export class TagListComponent extends GenericListComponent<PaperlessTag> implements OnInit {
 
   constructor(tagService: TagService, modalService: NgbModal, private titleService: Title) {
     super(tagService, modalService, TagEditDialogComponent)

From dfd844124d8033909ce631dfa426f31ae9ae1e48 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 7 Dec 2020 22:29:51 +0100
Subject: [PATCH 0072/1300] addresses #107

---
 .../document-card-small.component.html          | 12 +++++++++---
 .../document-card-small.component.scss          |  4 ++--
 .../document-card-small.component.ts            | 17 +++++++++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 71a7fb01a..95cf2e191 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,8 +1,14 @@
 <div class="col p-2 h-100" style="width: 16rem;">
   <div class="card h-100 shadow-sm">
-    <div class=" border-bottom doc-img pr-1" [ngStyle]="{'background-image': 'url(' + getThumbUrl() + ')'}">
-      <div class="row" *ngFor="let t of document.tags$ | async">
-        <app-tag style="font-size: large;" [tag]="t" class="col text-right" (click)="clickTag.emit(t.id)" [clickable]="true" linkTitle="Filter by tag"></app-tag>
+    <div class=" border-bottom pr-1">
+      <img class="card-img doc-img" [src]="getThumbUrl()">
+      <div style="top: 0; right: 0; font-size: large" class="text-right position-absolute mr-1">
+        <div *ngFor="let t of getTagsLimited$() | async">
+          <app-tag [tag]="t" (click)="clickTag.emit(t.id)" [clickable]="true" linkTitle="Filter by tag"></app-tag>
+        </div>
+        <div *ngIf="moreTags">
+          <span class="badge badge-secondary">+ {{moreTags}}</span>
+        </div>
       </div>
     </div>
     
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
index ef00ad029..0068667d0 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
@@ -1,5 +1,5 @@
 .doc-img {
-  background-size: cover;
-  background-position: top;
+  object-fit: cover;
+  object-position: top;
   height: 200px;
 }
\ No newline at end of file
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
index 08202bfc9..d60552d4f 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
@@ -1,4 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { map } from 'rxjs/operators';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { PaperlessTag } from 'src/app/data/paperless-tag';
 import { DocumentService } from 'src/app/services/rest/document.service';
@@ -21,6 +22,8 @@ export class DocumentCardSmallComponent implements OnInit {
   @Output()
   clickCorrespondent = new EventEmitter<number>()
 
+  moreTags: number = null
+
   ngOnInit(): void {
   }
 
@@ -35,4 +38,18 @@ export class DocumentCardSmallComponent implements OnInit {
   getPreviewUrl() {
     return this.documentService.getPreviewUrl(this.document.id)
   }
+
+  getTagsLimited$() {
+    return this.document.tags$.pipe(
+      map(tags => {
+        if (tags.length > 7) {
+          this.moreTags = tags.length - 6
+          return tags.slice(0, 6)
+        } else {
+          return tags
+        }
+      })
+    )
+  }
+
 }

From 3f05fe45bbf62d213770098009e37733f5095d96 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 7 Dec 2020 23:42:18 +0100
Subject: [PATCH 0073/1300] Addresses #99 entirely.

---
 src-ui/src/app/app.module.ts                  |  4 +-
 .../input/date-time/date-time.component.html  |  3 +-
 .../input/date-time/date-time.component.ts    |  2 +-
 .../common/input/text/text.component.ts       |  5 +-
 .../document-detail.component.html            | 95 ++++++++++++++-----
 .../document-detail.component.scss            |  4 +
 .../manage/settings/settings.component.html   |  4 +-
 src-ui/src/app/pipes/yes-no.pipe.spec.ts      |  8 ++
 src-ui/src/app/pipes/yes-no.pipe.ts           | 12 +++
 9 files changed, 104 insertions(+), 33 deletions(-)
 create mode 100644 src-ui/src/app/pipes/yes-no.pipe.spec.ts
 create mode 100644 src-ui/src/app/pipes/yes-no.pipe.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 1a2a76908..e186cde50 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -46,6 +46,7 @@ import { StatisticsWidgetComponent } from './components/dashboard/widgets/statis
 import { UploadFileWidgetComponent } from './components/dashboard/widgets/upload-file-widget/upload-file-widget.component';
 import { WidgetFrameComponent } from './components/dashboard/widgets/widget-frame/widget-frame.component';
 import { WelcomeWidgetComponent } from './components/dashboard/widgets/welcome-widget/welcome-widget.component';
+import { YesNoPipe } from './pipes/yes-no.pipe';
 
 @NgModule({
   declarations: [
@@ -84,7 +85,8 @@ import { WelcomeWidgetComponent } from './components/dashboard/widgets/welcome-w
     StatisticsWidgetComponent,
     UploadFileWidgetComponent,
     WidgetFrameComponent,
-    WelcomeWidgetComponent
+    WelcomeWidgetComponent,
+    YesNoPipe
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.html b/src-ui/src/app/components/common/input/date-time/date-time.component.html
index eaed0e185..7c002db1b 100644
--- a/src-ui/src/app/components/common/input/date-time/date-time.component.html
+++ b/src-ui/src/app/components/common/input/date-time/date-time.component.html
@@ -3,11 +3,10 @@
       <label for="created_date">{{titleDate}}</label>
       <input type="date" class="form-control" id="created_date" [(ngModel)]="dateValue" (change)="dateOrTimeChanged()">
   </div>
-  <div class="form-group col">
+  <div class="form-group col" *ngIf="titleTime">
       <label for="created_time">{{titleTime}}</label>
       <input type="time" class="form-control" id="created_time" [(ngModel)]="timeValue" (change)="dateOrTimeChanged()">
   </div>
-
 </div>
 
 
diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.ts b/src-ui/src/app/components/common/input/date-time/date-time.component.ts
index 07238e94f..6a04c5b27 100644
--- a/src-ui/src/app/components/common/input/date-time/date-time.component.ts
+++ b/src-ui/src/app/components/common/input/date-time/date-time.component.ts
@@ -40,7 +40,7 @@ export class DateTimeComponent implements OnInit,ControlValueAccessor  {
   titleDate: string = "Date"
 
   @Input()
-  titleTime: string = "Time"
+  titleTime: string
 
   @Input()
   disabled: boolean = false
diff --git a/src-ui/src/app/components/common/input/text/text.component.ts b/src-ui/src/app/components/common/input/text/text.component.ts
index ffb8c0c3d..0a1a05749 100644
--- a/src-ui/src/app/components/common/input/text/text.component.ts
+++ b/src-ui/src/app/components/common/input/text/text.component.ts
@@ -1,6 +1,5 @@
-import { Component, forwardRef, Input, OnInit } from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { v4 as uuidv4 } from 'uuid';
+import { Component, forwardRef } from '@angular/core';
+import { NG_VALUE_ACCESSOR } from '@angular/forms';
 import { AbstractInputComponent } from '../abstract-input';
 
 @Component({
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 5a5563571..783881583 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -14,15 +14,15 @@
             </svg>
             <span class="d-none d-lg-inline"> Download</span>
         </a>
-    
+
         <div class="btn-group" ngbDropdown role="group" *ngIf="metadata?.paperless__has_archive_version">
-          <button class="btn btn-sm btn-outline-primary dropdown-toggle-split" ngbDropdownToggle></button>
-          <div class="dropdown-menu" ngbDropdownMenu>
-            <a ngbDropdownItem [href]="downloadOriginalUrl">Download original</a>
-          </div>
+            <button class="btn btn-sm btn-outline-primary dropdown-toggle-split" ngbDropdownToggle></button>
+            <div class="dropdown-menu" ngbDropdownMenu>
+                <a ngbDropdownItem [href]="downloadOriginalUrl">Download original</a>
+            </div>
         </div>
-    
-      </div>
+
+    </div>
 
 
     <button type="button" class="btn btn-sm btn-outline-primary" (click)="close()">
@@ -36,28 +36,75 @@
 
 <div class="row">
     <div class="col-xl">
+
         <form [formGroup]='documentForm' (ngSubmit)="save()">
 
-            <app-input-text title="Title" formControlName="title"></app-input-text>
+            <ul ngbNav #nav="ngbNav" class="nav-tabs">
+                <li [ngbNavItem]="1">
+                    <a ngbNavLink>Details</a>
+                    <ng-template ngbNavContent>
 
-            <div class="form-group">
-                <label for="archive_serial_number">Archive Serial Number</label>
-                <input type="number" class="form-control" id="archive_serial_number"
-                    formControlName='archive_serial_number'>
-            </div>
+                        <app-input-text title="Title" formControlName="title"></app-input-text>
+                        <div class="form-group">
+                            <label for="archive_serial_number">Archive Serial Number</label>
+                            <input type="number" class="form-control" id="archive_serial_number"
+                                formControlName='archive_serial_number'>
+                        </div>
+                        <app-input-date-time titleDate="Date created" formControlName="created"></app-input-date-time>
+                        <app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent"
+                            allowNull="true" (createNew)="createCorrespondent()"></app-input-select>
+                        <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type"
+                            allowNull="true" (createNew)="createDocumentType()"></app-input-select>
+                        <app-input-tags formControlName="tags" title="Tags"></app-input-tags>
 
-            <app-input-date-time title="Date created" titleTime="Time created" formControlName="created"></app-input-date-time>
+                    </ng-template>
+                </li>
 
-            <div class="form-group">
-                <label for="content">Content</label>
-                <textarea class="form-control" id="content" rows="5" formControlName='content'></textarea>
-            </div>
+                <li [ngbNavItem]="2">
+                    <a ngbNavLink>Content</a>
+                    <ng-template ngbNavContent>
+                        <div class="form-group">
+                            <textarea class="form-control" id="content" rows="20" formControlName='content'></textarea>
+                        </div>
+                    </ng-template>
+                </li>
 
-            <app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent" allowNull="true" (createNew)="createCorrespondent()"></app-input-select>
+                <li [ngbNavItem]="3">
+                    <a ngbNavLink>Metadata</a>
+                    <ng-template ngbNavContent>
+                        <table class="table table-borderless">
+                            <tbody>
+                                <tr>
+                                    <td>Date modified</td>
+                                    <td>{{document.modified | date}}</td>
+                                </tr>
+                                <tr>
+                                    <td>Date added</td>
+                                    <td>{{document.added | date}}</td>
+                                </tr>
+                                <tr>
+                                    <td>MD5 Checksum</td>
+                                    <td>{{metadata?.paperless__checksum}}</td>
+                                </tr>
+                                <tr>
+                                    <td>Original mime type</td>
+                                    <td>{{metadata?.paperless__mime_type}}</td>
+                                </tr>
+                                <tr>
+                                    <td>Is archived?</td>
+                                    <td>{{metadata?.paperless__has_archive_version | yesno}}</td>
+                                </tr>
+                                <tr>
+                                    <td>Media filename</td>
+                                    <td>{{metadata?.paperless__filename}}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </ng-template>
+                </li>
+            </ul>
 
-            <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type" allowNull="true" (createNew)="createDocumentType()"></app-input-select>
-
-            <app-input-tags formControlName="tags" title="Tags"></app-input-tags>
+            <div [ngbNavOutlet]="nav" class="mt-2"></div>
 
             <button type="button" class="btn btn-outline-secondary" (click)="discard()">Discard</button>&nbsp;
             <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()">Save & edit next</button>&nbsp;
@@ -65,11 +112,11 @@
         </form>
     </div>
 
-    <div class="col-xl">
+    <div class="col-xl d-none d-xl-block document-preview sticky-top">
         <object [data]="previewUrl | safe" type="application/pdf" width="100%" height="100%">
             <p>Your browser does not support PDFs.
                 <a href="previewUrl">Download the PDF</a>.</p>
         </object>
 
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.scss b/src-ui/src/app/components/document-detail/document-detail.component.scss
index e69de29bb..630a31011 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.scss
+++ b/src-ui/src/app/components/document-detail/document-detail.component.scss
@@ -0,0 +1,4 @@
+.document-preview {
+  height: calc(100vh - 180px);
+  top: 70px
+}
\ No newline at end of file
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 91eab807b..7a500e6eb 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -46,8 +46,8 @@
           <tbody>
             <tr *ngFor="let config of savedViewConfigService.getConfigs()">
               <td>{{ config.title }}</td>
-              <td>{{ config.showInDashboard }}</td>
-              <td>{{ config.showInSideBar }}</td>
+              <td>{{ config.showInDashboard | yesno }}</td>
+              <td>{{ config.showInSideBar | yesno }}</td>
               <td><button type="button" class="btn btn-sm btn-outline-danger" (click)="deleteViewConfig(config)">Delete</button></td>
             </tr>
           </tbody>
diff --git a/src-ui/src/app/pipes/yes-no.pipe.spec.ts b/src-ui/src/app/pipes/yes-no.pipe.spec.ts
new file mode 100644
index 000000000..80acd8acd
--- /dev/null
+++ b/src-ui/src/app/pipes/yes-no.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { YesNoPipe } from './yes-no.pipe';
+
+describe('YesNoPipe', () => {
+  it('create an instance', () => {
+    const pipe = new YesNoPipe();
+    expect(pipe).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/pipes/yes-no.pipe.ts b/src-ui/src/app/pipes/yes-no.pipe.ts
new file mode 100644
index 000000000..9a4ed56ef
--- /dev/null
+++ b/src-ui/src/app/pipes/yes-no.pipe.ts
@@ -0,0 +1,12 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'yesno'
+})
+export class YesNoPipe implements PipeTransform {
+
+  transform(value: boolean): unknown {
+    return value ? "Yes" : "No"
+  }
+
+}

From c4a939dbcc363709323ce30785e007c85306bdc8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 00:09:36 +0100
Subject: [PATCH 0074/1300] addresses #104

---
 .../app/components/document-list/document-list.component.html | 4 ++--
 .../app/components/document-list/document-list.component.ts   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index cebe7c544..881a28dbf 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -44,7 +44,7 @@
   </div>
   <div class="btn-group ml-2">
 
-    <button type="button" class="btn btn-sm btn-outline-primary" (click)="showFilter=!showFilter">
+    <button type="button" class="btn btn-sm" [ngClass]="isFiltered ? 'btn-primary' : 'btn-outline-primary'" (click)="showFilter=!showFilter">
       <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#funnel" />
       </svg>
@@ -75,7 +75,7 @@
 </div>
 
 <div class="d-flex justify-content-between align-items-center">
-  <p>{{list.collectionSize || 0}} document(s)</p>
+  <p>{{list.collectionSize || 0}} document(s) <span *ngIf="isFiltered">(filtered)</span></p>
   <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
   [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
 </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index dd939ac01..09e73dd96 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -32,6 +32,10 @@ export class DocumentListComponent implements OnInit {
   filterRules: FilterRule[] = []
   showFilter = false
 
+  get isFiltered() {
+    return this.list.filterRules?.length > 0
+  }
+
   getTitle() {
     return this.list.savedViewTitle || "Documents"
   }

From 5321ff1f207156f747b768703013d62c0e6dcdac Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 00:45:11 +0100
Subject: [PATCH 0075/1300] upload status addresses #100

---
 .../upload-file-widget.component.html         | 25 ++++++------
 .../upload-file-widget.component.ts           | 38 +++++++++++++++++--
 .../src/app/services/rest/document.service.ts |  2 +-
 3 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index cb114e49e..013486a47 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -1,15 +1,18 @@
 <app-widget-frame title="Upload new documents">
 
-  <form content>
-    <ngx-file-drop 
-      dropZoneLabel="Drop documents here or" (onFileDrop)="dropped($event)"
-      (onFileOver)="fileOver($event)" (onFileLeave)="fileLeave($event)"
-      dropZoneClassName="bg-light card"
-      multiple="true"
-      contentClassName="justify-content-center d-flex align-items-center p-5"
-      [showBrowseBtn]=true
-      browseBtnClassName="btn btn-sm btn-outline-primary ml-2">
+  <div content>
+    <form>
+      <ngx-file-drop dropZoneLabel="Drop documents here or" (onFileDrop)="dropped($event)"
+        (onFileOver)="fileOver($event)" (onFileLeave)="fileLeave($event)" dropZoneClassName="bg-light card"
+        multiple="true" contentClassName="justify-content-center d-flex align-items-center p-5" [showBrowseBtn]=true
+        browseBtnClassName="btn btn-sm btn-outline-primary ml-2">
 
-    </ngx-file-drop>
-  </form>
+      </ngx-file-drop>
+    </form>
+    <div *ngIf="uploadVisible" class="mt-3">
+      <p>Uploading {{uploadStatus.length}} file(s)</p>
+      <ngb-progressbar [value]="loadedSum" [max]="totalSum" [striped]="true" [animated]="uploadStatus.length > 0">
+      </ngb-progressbar>
+    </div>
+  </div>
 </app-widget-frame>
\ No newline at end of file
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index 1003f31db..90bfbf1e5 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -1,8 +1,16 @@
+import { HttpEventType } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop';
 import { DocumentService } from 'src/app/services/rest/document.service';
 import { Toast, ToastService } from 'src/app/services/toast.service';
 
+
+interface UploadStatus {
+  file: string
+  loaded: number
+  total: number 
+}
+
 @Component({
   selector: 'app-upload-file-widget',
   templateUrl: './upload-file-widget.component.html',
@@ -21,16 +29,40 @@ export class UploadFileWidgetComponent implements OnInit {
   public fileLeave(event){
   }
 
+  uploadStatus: UploadStatus[] = []
+
+  uploadVisible = false
+
+  get loadedSum() {
+    return this.uploadStatus.map(s => s.loaded).reduce((a,b) => a+b, 1)
+  }
+
+  get totalSum() {
+    return this.uploadStatus.map(s => s.total).reduce((a,b) => a+b, 1)
+  }
+
   public dropped(files: NgxFileDropEntry[]) {
     for (const droppedFile of files) {
       if (droppedFile.fileEntry.isFile) {
         const fileEntry = droppedFile.fileEntry as FileSystemFileEntry;
         fileEntry.file((file: File) => {
-          const formData = new FormData()
+          let formData = new FormData()
           formData.append('document', file, file.name)
-          this.documentService.uploadDocument(formData).subscribe(result => {
-            this.toastService.showToast(Toast.make("Information", "The document has been uploaded and will be processed by the consumer shortly."))
+
+          let uploadStatusObject: UploadStatus = {file: file.name, loaded: 0, total: 1}
+          this.uploadStatus.push(uploadStatusObject)
+          this.uploadVisible = true
+          this.documentService.uploadDocument(formData).subscribe(event => {
+            if (event.type == HttpEventType.UploadProgress) {
+              uploadStatusObject.loaded = event.loaded
+              uploadStatusObject.total = event.total
+            } else if (event.type == HttpEventType.Response) {
+              this.uploadStatus.splice(this.uploadStatus.indexOf(uploadStatusObject), 1)
+              this.toastService.showToast(Toast.make("Information", "The document has been uploaded and will be processed by the consumer shortly."))
+            }
+            
           }, error => {
+            this.uploadStatus.splice(this.uploadStatus.indexOf(uploadStatusObject), 1)
             switch (error.status) {
               case 400: {
                 this.toastService.showToast(Toast.makeError(`There was an error while uploading the document: ${error.error.document}`))
diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index 5bf2308d4..81693ec68 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -94,7 +94,7 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
   }
 
   uploadDocument(formData) {
-    return this.http.post(this.getResourceUrl(null, 'post_document'), formData)
+    return this.http.post(this.getResourceUrl(null, 'post_document'), formData, {reportProgress: true, observe: "events"})
   }
 
   getMetadata(id: number): Observable<PaperlessDocumentMetadata> {

From 30f200ad395f6d4e2a3c284da1c4a8e741390f37 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 00:45:23 +0100
Subject: [PATCH 0076/1300] fix z-order on the edit page.

---
 .../components/document-detail/document-detail.component.html  | 2 +-
 .../components/document-detail/document-detail.component.scss  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 783881583..42619845c 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -112,7 +112,7 @@
         </form>
     </div>
 
-    <div class="col-xl d-none d-xl-block document-preview sticky-top">
+    <div class="col-xl d-none d-xl-block document-preview">
         <object [data]="previewUrl | safe" type="application/pdf" width="100%" height="100%">
             <p>Your browser does not support PDFs.
                 <a href="previewUrl">Download the PDF</a>.</p>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.scss b/src-ui/src/app/components/document-detail/document-detail.component.scss
index 630a31011..b1e9fddfb 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.scss
+++ b/src-ui/src/app/components/document-detail/document-detail.component.scss
@@ -1,4 +1,5 @@
 .document-preview {
   height: calc(100vh - 180px);
-  top: 70px
+  top: 70px;
+  position: sticky;
 }
\ No newline at end of file

From bb33ac5e9e3d81b2c6d86f67b3475f89137061c5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 01:12:03 +0100
Subject: [PATCH 0077/1300] fixees #77

---
 .../app/components/document-list/document-list.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 881a28dbf..8608ed92b 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -105,7 +105,7 @@
         </ng-container>
       </td>
       <td>
-        <a routerLink="/documents/{{d.id}}" title="Edit document">{{d.title}}</a>
+        <a routerLink="/documents/{{d.id}}" title="Edit document" style="overflow-wrap: anywhere;">{{d.title}}</a>
         <app-tag [tag]="t" *ngFor="let t of d.tags$ | async" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="filterByTag(t.id)"></app-tag>
       </td>
       <td class="d-none d-xl-table-cell">

From c240fa18839e9c0a4c4f9bf7000da619565f12aa Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 11:53:58 +0100
Subject: [PATCH 0078/1300] changelog

---
 docs/changelog.rst | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 116c2e07c..b6f4295b1 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,34 @@
 Changelog
 *********
 
+paperless-ng 0.9.6
+##################
+
+This release focusses primarily on many small issues with the UI.
+
+* Front end
+
+  * Paperless now has proper window titles.
+  * Fixed an issue with the small cards when more than 7 tags were used.
+  * Navigation of the "Show all" links adjusted.
+  * Some indication on the document lists that a filter is active was added.
+  * There's a new filter to filter for documents that do *not* have a certain tag.
+  * The file upload box now shows upload progress.
+  * The document edit page was reorganized.
+  * Table issues with too long document titles fixed.
+
+* API
+
+  * The API now serves file names with documents.
+
+* Other
+
+  * Fixed an issue with the docker image when a non-standard PostgreSQL port was used.
+  * ``FILENAME_FORMAT`` placeholder for document types.
+  * The filename formatter is now less restrictive with file names and tries to
+    conserve the original correspondents, types and titles as much as possible.
+
+
 paperless-ng 0.9.5
 ##################
 

From 9da11f29c7ca1f2a9df5feb5e386015ef78c6e3f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 13:54:35 +0100
Subject: [PATCH 0079/1300] fixes #90

---
 Pipfile                                       |   1 +
 Pipfile.lock                                  |  37 +++--
 docs/changelog.rst                            |   2 +
 src/documents/consumer.py                     |  57 +++----
 src/documents/file_handling.py                |  23 ++-
 .../management/commands/document_importer.py  |  25 +--
 src/documents/signals/handlers.py             | 143 ++++++++++--------
 src/documents/tests/test_consumer.py          |   6 +-
 src/documents/tests/test_file_handling.py     |  95 ++++++++----
 src/paperless/settings.py                     |   4 +
 10 files changed, 245 insertions(+), 148 deletions(-)

diff --git a/Pipfile b/Pipfile
index 2e86f2a42..830604a8d 100644
--- a/Pipfile
+++ b/Pipfile
@@ -19,6 +19,7 @@ django-extensions = "*"
 django-filter = "~=2.4.0"
 django-q = "~=1.3.4"
 djangorestframework = "~=3.12.2"
+filelock = "*"
 fuzzywuzzy = "*"
 gunicorn = "*"
 imap-tools = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 6158a70e0..198351237 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "b10db53eb22d917723aa6107ff0970dc4e2aa886ee03d3ae08a994a856d57986"
+            "sha256": "3c187671ead11714d48b56f4714b145f68814e09edea818610b87f18b4f7f6fd"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -197,6 +197,14 @@
             "index": "pypi",
             "version": "==3.12.2"
         },
+        "filelock": {
+            "hashes": [
+                "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59",
+                "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"
+            ],
+            "index": "pypi",
+            "version": "==3.0.12"
+        },
         "fuzzywuzzy": {
             "hashes": [
                 "sha256:45016e92264780e58972dca1b3d939ac864b78437422beecebb3095f8efd00e8",
@@ -858,10 +866,10 @@
         },
         "certifi": {
             "hashes": [
-                "sha256:1f422849db327d534e3d0c5f02a263458c3955ec0aae4ff09b95f195c59f4edd",
-                "sha256:f05def092c44fbf25834a51509ef6e631dc19765ab8a57b4e7ab85531f0a9cf4"
+                "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c",
+                "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"
             ],
-            "version": "==2020.11.8"
+            "version": "==2020.12.5"
         },
         "chardet": {
             "hashes": [
@@ -961,17 +969,18 @@
         },
         "faker": {
             "hashes": [
-                "sha256:7bca5b074299ac6532be2f72979e6793f1a2403ca8105cb4cf0b385a964469c4",
-                "sha256:fb21a76064847561033d8cab1cfd11af436ddf2c6fe72eb51b3cda51dff86bdc"
+                "sha256:1fcb415562ee6e2395b041e85fa6901d4708d30b84d54015226fa754ed0822c3",
+                "sha256:e8beccb398ee9b8cc1a91d9295121d66512b6753b4846eb1e7370545d46b3311"
             ],
-            "markers": "python_version >= '3.5'",
-            "version": "==5.0.0"
+            "markers": "python_version >= '3.6'",
+            "version": "==5.0.1"
         },
         "filelock": {
             "hashes": [
                 "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59",
                 "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"
             ],
+            "index": "pypi",
             "version": "==3.0.12"
         },
         "idna": {
@@ -1100,11 +1109,11 @@
         },
         "pygments": {
             "hashes": [
-                "sha256:381985fcc551eb9d37c52088a32914e00517e57f4a21609f48141ba08e193fa0",
-                "sha256:88a0bbcd659fcb9573703957c6b9cff9fab7295e6e76db54c9d00ae42df32773"
+                "sha256:ccf3acacf3782cbed4a989426012f1c535c9a90d3a7fc3f16d231b9372d2b716",
+                "sha256:f275b6c0909e5dafd2d6269a656aa90fa58ebf4a74f8fcf9053195d226b24a08"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==2.7.2"
+            "version": "==2.7.3"
         },
         "pyparsing": {
             "hashes": [
@@ -1313,11 +1322,11 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:07cff122e9d343140366055f31be4dcd61fd598c69d11cd33a9d9c8df4546dd7",
-                "sha256:e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5"
+                "sha256:54b05fc737ea9c9ee9f8340f579e5da5b09fb64fd010ab5757eb90268616907c",
+                "sha256:b7a8ec323ee02fb2312f098b6b4c9de99559b462775bc8fe3627a73706603c1b"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.2.1"
+            "version": "==20.2.2"
         },
         "zipp": {
             "hashes": [
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b6f4295b1..2e3ed07f6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -31,6 +31,8 @@ This release focusses primarily on many small issues with the UI.
   * ``FILENAME_FORMAT`` placeholder for document types.
   * The filename formatter is now less restrictive with file names and tries to
     conserve the original correspondents, types and titles as much as possible.
+  * The filename formatter does not include the document ID in filenames anymore. It will
+    rather append ``_01``, ``_02``, etc when it detects duplicate filenames.
 
 
 paperless-ng 0.9.5
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 7bae5c2a9..23d17abc9 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -8,13 +8,14 @@ from django.conf import settings
 from django.db import transaction
 from django.db.models import Q
 from django.utils import timezone
+from filelock import FileLock
 
 from .classifier import DocumentClassifier, IncompatibleClassifierVersionError
-from .file_handling import create_source_path_directory
+from .file_handling import create_source_path_directory, \
+    generate_unique_filename
 from .loggers import LoggingMixin
 from .models import Document, FileInfo, Correspondent, DocumentType, Tag
-from .parsers import ParseError, get_parser_class_for_mime_type, \
-    get_supported_file_extensions, parse_date
+from .parsers import ParseError, get_parser_class_for_mime_type, parse_date
 from .signals import (
     document_consumption_finished,
     document_consumption_started
@@ -38,6 +39,10 @@ class Consumer(LoggingMixin):
 
     def pre_check_file_exists(self):
         if not os.path.isfile(self.path):
+            self.log(
+                "error",
+                "Cannot consume {}: It is not a file.".format(self.path)
+            )
             raise ConsumerError("Cannot consume {}: It is not a file".format(
                 self.path))
 
@@ -47,6 +52,10 @@ class Consumer(LoggingMixin):
         if Document.objects.filter(Q(checksum=checksum) | Q(archive_checksum=checksum)).exists():  # NOQA: E501
             if settings.CONSUMER_DELETE_DUPLICATES:
                 os.unlink(self.path)
+            self.log(
+                "error",
+                "Not consuming {}: It is a duplicate.".format(self.filename)
+            )
             raise ConsumerError(
                 "Not consuming {}: It is a duplicate.".format(self.filename)
             )
@@ -148,8 +157,9 @@ class Consumer(LoggingMixin):
             classifier = DocumentClassifier()
             classifier.reload()
         except (FileNotFoundError, IncompatibleClassifierVersionError) as e:
-            logging.getLogger(__name__).warning(
-                "Cannot classify documents: {}.".format(e))
+            self.log(
+                "warning",
+                f"Cannot classify documents: {e}.")
             classifier = None
 
         # now that everything is done, we can start to store the document
@@ -176,31 +186,26 @@ class Consumer(LoggingMixin):
 
                 # After everything is in the database, copy the files into
                 # place. If this fails, we'll also rollback the transaction.
+                with FileLock(settings.MEDIA_LOCK):
+                    document.filename = generate_unique_filename(
+                        document, settings.ORIGINALS_DIR)
+                    create_source_path_directory(document.source_path)
 
-                # TODO: not required, since this is done by the file handling
-                #  logic
-                create_source_path_directory(document.source_path)
-
-                self._write(document.storage_type,
-                            self.path, document.source_path)
-
-                self._write(document.storage_type,
-                            thumbnail, document.thumbnail_path)
-
-                if archive_path and os.path.isfile(archive_path):
                     self._write(document.storage_type,
-                                archive_path, document.archive_path)
+                                self.path, document.source_path)
 
-                    with open(archive_path, 'rb') as f:
-                        document.archive_checksum = hashlib.md5(
-                            f.read()).hexdigest()
-                        document.save()
+                    self._write(document.storage_type,
+                                thumbnail, document.thumbnail_path)
+
+                    if archive_path and os.path.isfile(archive_path):
+                        create_source_path_directory(document.archive_path)
+                        self._write(document.storage_type,
+                                    archive_path, document.archive_path)
+
+                        with open(archive_path, 'rb') as f:
+                            document.archive_checksum = hashlib.md5(
+                                f.read()).hexdigest()
 
-                # Afte performing all database operations and moving files
-                # into place, tell paperless where the file is.
-                document.filename = os.path.basename(document.source_path)
-                # Saving the document now will trigger the filename handling
-                # logic.
                 document.save()
 
                 # Delete the file only if it was successfully consumed
diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index a6d2f3ef4..c5efc33e4 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -70,7 +70,22 @@ def many_to_dictionary(field):
     return mydictionary
 
 
-def generate_filename(doc):
+def generate_unique_filename(doc, root):
+    counter = 0
+
+    while True:
+        new_filename = generate_filename(doc, counter)
+        if new_filename == doc.filename:
+            # still the same as before.
+            return new_filename
+
+        if os.path.exists(os.path.join(root, new_filename)):
+            counter += 1
+        else:
+            return new_filename
+
+
+def generate_filename(doc, counter=0):
     path = ""
 
     try:
@@ -112,11 +127,11 @@ def generate_filename(doc):
             f"Invalid PAPERLESS_FILENAME_FORMAT: "
             f"{settings.PAPERLESS_FILENAME_FORMAT}, falling back to default")
 
-    # Always append the primary key to guarantee uniqueness of filename
+    counter_str = f"_{counter:02}" if counter else ""
     if len(path) > 0:
-        filename = "%s-%07i%s" % (path, doc.pk, doc.file_type)
+        filename = f"{path}{counter_str}{doc.file_type}"
     else:
-        filename = "%07i%s" % (doc.pk, doc.file_type)
+        filename = f"{doc.pk:07}{counter_str}{doc.file_type}"
 
     # Append .gpg for encrypted files
     if doc.storage_type == doc.STORAGE_TYPE_GPG:
diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py
index ca8c8bf06..70d05d98b 100644
--- a/src/documents/management/commands/document_importer.py
+++ b/src/documents/management/commands/document_importer.py
@@ -5,11 +5,13 @@ import shutil
 from django.conf import settings
 from django.core.management import call_command
 from django.core.management.base import BaseCommand, CommandError
+from filelock import FileLock
 
 from documents.models import Document
 from documents.settings import EXPORTER_FILE_NAME, EXPORTER_THUMBNAIL_NAME, \
     EXPORTER_ARCHIVE_NAME
-from ...file_handling import generate_filename, create_source_path_directory
+from ...file_handling import create_source_path_directory, \
+    generate_unique_filename
 from ...mixins import Renderable
 
 
@@ -114,17 +116,20 @@ class Command(Renderable, BaseCommand):
 
             document.storage_type = Document.STORAGE_TYPE_UNENCRYPTED
 
-            document.filename = generate_filename(document)
+            with FileLock(settings.MEDIA_LOCK):
+                document.filename = generate_unique_filename(
+                    document, settings.ORIGINALS_DIR)
 
-            if os.path.isfile(document.source_path):
-                raise FileExistsError(document.source_path)
+                if os.path.isfile(document.source_path):
+                    raise FileExistsError(document.source_path)
 
-            create_source_path_directory(document.source_path)
+                create_source_path_directory(document.source_path)
 
-            print(f"Moving {document_path} to {document.source_path}")
-            shutil.copy(document_path, document.source_path)
-            shutil.copy(thumbnail_path, document.thumbnail_path)
-            if archive_path:
-                shutil.copy(archive_path, document.archive_path)
+                print(f"Moving {document_path} to {document.source_path}")
+                shutil.copy(document_path, document.source_path)
+                shutil.copy(thumbnail_path, document.thumbnail_path)
+                if archive_path:
+                    create_source_path_directory(document.archive_path)
+                    shutil.copy(archive_path, document.archive_path)
 
             document.save()
diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 32119a0a3..8a9ce18d7 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -9,11 +9,13 @@ from django.contrib.contenttypes.models import ContentType
 from django.db import models, DatabaseError
 from django.dispatch import receiver
 from django.utils import timezone
+from filelock import FileLock
 from rest_framework.reverse import reverse
 
 from .. import index, matching
-from ..file_handling import delete_empty_directories, generate_filename, \
-    create_source_path_directory, archive_name_from_filename
+from ..file_handling import delete_empty_directories, \
+    create_source_path_directory, archive_name_from_filename, \
+    generate_unique_filename
 from ..models import Document, Tag
 
 
@@ -226,81 +228,94 @@ def update_filename_and_move_files(sender, instance, **kwargs):
         # This will in turn cause this logic to move the file where it belongs.
         return
 
-    old_filename = instance.filename
-    new_filename = generate_filename(instance)
+    with FileLock(settings.MEDIA_LOCK):
+        old_filename = instance.filename
+        new_filename = generate_unique_filename(
+            instance, settings.ORIGINALS_DIR)
 
-    if new_filename == instance.filename:
-        # Don't do anything if its the same.
-        return
-
-    old_source_path = instance.source_path
-    new_source_path = os.path.join(settings.ORIGINALS_DIR, new_filename)
-
-    if not validate_move(instance, old_source_path, new_source_path):
-        return
-
-    # archive files are optional, archive checksum tells us if we have one,
-    # since this is None for documents without archived files.
-    if instance.archive_checksum:
-        new_archive_filename = archive_name_from_filename(new_filename)
-        old_archive_path = instance.archive_path
-        new_archive_path = os.path.join(settings.ARCHIVE_DIR,
-                                        new_archive_filename)
-
-        if not validate_move(instance, old_archive_path, new_archive_path):
+        if new_filename == instance.filename:
+            # Don't do anything if its the same.
             return
 
-        create_source_path_directory(new_archive_path)
-    else:
-        old_archive_path = None
-        new_archive_path = None
+        old_source_path = instance.source_path
+        new_source_path = os.path.join(settings.ORIGINALS_DIR, new_filename)
 
-    create_source_path_directory(new_source_path)
+        if not validate_move(instance, old_source_path, new_source_path):
+            return
 
-    try:
-        os.rename(old_source_path, new_source_path)
+        # archive files are optional, archive checksum tells us if we have one,
+        # since this is None for documents without archived files.
         if instance.archive_checksum:
-            os.rename(old_archive_path, new_archive_path)
-        instance.filename = new_filename
-        # Don't save here to prevent infinite recursion.
-        Document.objects.filter(pk=instance.pk).update(filename=new_filename)
+            new_archive_filename = archive_name_from_filename(new_filename)
+            old_archive_path = instance.archive_path
+            new_archive_path = os.path.join(settings.ARCHIVE_DIR,
+                                            new_archive_filename)
 
-        logging.getLogger(__name__).debug(
-            f"Moved file {old_source_path} to {new_source_path}.")
+            if not validate_move(instance, old_archive_path, new_archive_path):
+                return
 
-        if instance.archive_checksum:
-            logging.getLogger(__name__).debug(
-                f"Moved file {old_archive_path} to {new_archive_path}.")
+            create_source_path_directory(new_archive_path)
+        else:
+            old_archive_path = None
+            new_archive_path = None
+
+        create_source_path_directory(new_source_path)
 
-    except OSError as e:
-        instance.filename = old_filename
-        # this happens when we can't move a file. If that's the case for the
-        # archive file, we try our best to revert the changes.
         try:
+            os.rename(old_source_path, new_source_path)
+            if instance.archive_checksum:
+                os.rename(old_archive_path, new_archive_path)
+            instance.filename = new_filename
+
+            # Don't save() here to prevent infinite recursion.
+            Document.objects.filter(pk=instance.pk).update(
+                filename=new_filename)
+
+            logging.getLogger(__name__).debug(
+                f"Moved file {old_source_path} to {new_source_path}.")
+
+            if instance.archive_checksum:
+                logging.getLogger(__name__).debug(
+                    f"Moved file {old_archive_path} to {new_archive_path}.")
+
+        except OSError as e:
+            instance.filename = old_filename
+            # this happens when we can't move a file. If that's the case for
+            # the archive file, we try our best to revert the changes.
+            # no need to save the instance, the update() has not happened yet.
+            try:
+                os.rename(new_source_path, old_source_path)
+                os.rename(new_archive_path, old_archive_path)
+            except Exception as e:
+                # This is fine, since:
+                # A: if we managed to move source from A to B, we will also
+                #  manage to move it from B to A. If not, we have a serious
+                #  issue that's going to get caught by the santiy checker.
+                #  All files remain in place and will never be overwritten,
+                #  so this is not the end of the world.
+                # B: if moving the orignal file failed, nothing has changed
+                #  anyway.
+                pass
+        except DatabaseError as e:
+            # this happens after moving files, so move them back into place.
+            # since moving them once succeeded, it's very likely going to
+            # succeed again.
             os.rename(new_source_path, old_source_path)
-            os.rename(new_archive_path, old_archive_path)
-        except Exception as e:
-            # This is fine, since:
-            # A: if we managed to move source from A to B, we will also manage
-            #  to move it from B to A. If not, we have a serious issue
-            #  that's going to get caught by the santiy checker.
-            #  all files remain in place and will never be overwritten,
-            #  so this is not the end of the world.
-            # B: if moving the orignal file failed, nothing has changed anyway.
-            pass
-    except DatabaseError as e:
-        os.rename(new_source_path, old_source_path)
-        if instance.archive_checksum:
-            os.rename(new_archive_path, old_archive_path)
-        instance.filename = old_filename
+            if instance.archive_checksum:
+                os.rename(new_archive_path, old_archive_path)
+            instance.filename = old_filename
+            # again, no need to save the instance, since the actual update()
+            # operation failed.
 
-    if not os.path.isfile(old_source_path):
-        delete_empty_directories(os.path.dirname(old_source_path),
-                                 root=settings.ORIGINALS_DIR)
+        # finally, remove any empty sub folders. This will do nothing if
+        # something has failed above.
+        if not os.path.isfile(old_source_path):
+            delete_empty_directories(os.path.dirname(old_source_path),
+                                     root=settings.ORIGINALS_DIR)
 
-    if old_archive_path and not os.path.isfile(old_archive_path):
-        delete_empty_directories(os.path.dirname(old_archive_path),
-                                 root=settings.ARCHIVE_DIR)
+        if old_archive_path and not os.path.isfile(old_archive_path):
+            delete_empty_directories(os.path.dirname(old_archive_path),
+                                     root=settings.ARCHIVE_DIR)
 
 
 def set_log_entry(sender, document=None, logging_group=None, **kwargs):
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index f785bc695..f828d3e11 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -598,10 +598,10 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self.assertEqual(document.title, "new docs")
         self.assertEqual(document.correspondent.name, "Bank")
-        self.assertEqual(document.filename, "Bank/new docs-0000001.pdf")
+        self.assertEqual(document.filename, "Bank/new docs.pdf")
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
-    @mock.patch("documents.signals.handlers.generate_filename")
+    @mock.patch("documents.signals.handlers.generate_unique_filename")
     def testFilenameHandlingUnstableFormat(self, m):
 
         filenames = ["this", "that", "now this", "i cant decide"]
@@ -611,7 +611,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
             filenames.insert(0, f)
             return f
 
-        m.side_effect = lambda f: get_filename()
+        m.side_effect = lambda f, root: get_filename()
 
         filename = self.get_test_file()
 
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index 4ed93d1d4..f0a74ca4f 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -40,13 +40,13 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         document.filename = generate_filename(document)
 
         # Ensure that filename is properly generated
-        self.assertEqual(document.filename, "none/none-{:07d}.pdf".format(document.pk))
+        self.assertEqual(document.filename, "none/none.pdf")
 
         # Enable encryption and check again
         document.storage_type = Document.STORAGE_TYPE_GPG
         document.filename = generate_filename(document)
         self.assertEqual(document.filename,
-                         "none/none-{:07d}.pdf.gpg".format(document.pk))
+                         "none/none.pdf.gpg")
 
         document.save()
 
@@ -62,7 +62,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         # Check proper handling of files
         self.assertEqual(os.path.isdir(settings.ORIGINALS_DIR + "/test"), True)
         self.assertEqual(os.path.isdir(settings.ORIGINALS_DIR + "/none"), False)
-        self.assertEqual(os.path.isfile(settings.ORIGINALS_DIR + "/test/test-{:07d}.pdf.gpg".format(document.pk)), True)
+        self.assertEqual(os.path.isfile(settings.ORIGINALS_DIR + "/test/test.pdf.gpg"), True)
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}")
     def test_file_renaming_missing_permissions(self):
@@ -74,12 +74,12 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         # Ensure that filename is properly generated
         document.filename = generate_filename(document)
         self.assertEqual(document.filename,
-                         "none/none-{:07d}.pdf".format(document.pk))
+                         "none/none.pdf")
         create_source_path_directory(document.source_path)
         Path(document.source_path).touch()
 
         # Test source_path
-        self.assertEqual(document.source_path, settings.ORIGINALS_DIR + "/none/none-{:07d}.pdf".format(document.pk))
+        self.assertEqual(document.source_path, settings.ORIGINALS_DIR + "/none/none.pdf")
 
         # Make the folder read- and execute-only (no writing and no renaming)
         os.chmod(settings.ORIGINALS_DIR + "/none", 0o555)
@@ -89,8 +89,8 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         document.save()
 
         # Check proper handling of files
-        self.assertEqual(os.path.isfile(settings.ORIGINALS_DIR + "/none/none-{:07d}.pdf".format(document.pk)), True)
-        self.assertEqual(document.filename, "none/none-{:07d}.pdf".format(document.pk))
+        self.assertEqual(os.path.isfile(settings.ORIGINALS_DIR + "/none/none.pdf"), True)
+        self.assertEqual(document.filename, "none/none.pdf")
 
         os.chmod(settings.ORIGINALS_DIR + "/none", 0o777)
 
@@ -108,7 +108,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         # Ensure that filename is properly generated
         document.filename = generate_filename(document)
         self.assertEqual(document.filename,
-                         "none/none-{:07d}.pdf".format(document.pk))
+                         "none/none.pdf")
         create_source_path_directory(document.source_path)
         Path(document.source_path).touch()
 
@@ -125,8 +125,8 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
             # Check proper handling of files
             self.assertTrue(os.path.isfile(document.source_path))
-            self.assertEqual(os.path.isfile(settings.ORIGINALS_DIR + "/none/none-{:07d}.pdf".format(document.pk)), True)
-            self.assertEqual(document.filename, "none/none-{:07d}.pdf".format(document.pk))
+            self.assertEqual(os.path.isfile(settings.ORIGINALS_DIR + "/none/none.pdf"), True)
+            self.assertEqual(document.filename, "none/none.pdf")
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}")
     def test_document_delete(self):
@@ -138,7 +138,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         # Ensure that filename is properly generated
         document.filename = generate_filename(document)
         self.assertEqual(document.filename,
-                         "none/none-{:07d}.pdf".format(document.pk))
+                         "none/none.pdf")
 
         create_source_path_directory(document.source_path)
         Path(document.source_path).touch()
@@ -146,7 +146,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         # Ensure file deletion after delete
         pk = document.pk
         document.delete()
-        self.assertEqual(os.path.isfile(settings.ORIGINALS_DIR + "/none/none-{:07d}.pdf".format(pk)), False)
+        self.assertEqual(os.path.isfile(settings.ORIGINALS_DIR + "/none/none.pdf"), False)
         self.assertEqual(os.path.isdir(settings.ORIGINALS_DIR + "/none"), False)
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}")
@@ -168,7 +168,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         # Ensure that filename is properly generated
         document.filename = generate_filename(document)
         self.assertEqual(document.filename,
-                         "none/none-{:07d}.pdf".format(document.pk))
+                         "none/none.pdf")
 
         create_source_path_directory(document.source_path)
 
@@ -199,7 +199,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         # Ensure that filename is properly generated
         self.assertEqual(generate_filename(document),
-                         "demo-{:07d}.pdf".format(document.pk))
+                         "demo.pdf")
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{tags[type]}")
     def test_tags_with_dash(self):
@@ -215,7 +215,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         # Ensure that filename is properly generated
         self.assertEqual(generate_filename(document),
-                         "demo-{:07d}.pdf".format(document.pk))
+                         "demo.pdf")
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{tags[type]}")
     def test_tags_malformed(self):
@@ -231,7 +231,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         # Ensure that filename is properly generated
         self.assertEqual(generate_filename(document),
-                         "none-{:07d}.pdf".format(document.pk))
+                         "none.pdf")
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{tags[0]}")
     def test_tags_all(self):
@@ -246,7 +246,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         # Ensure that filename is properly generated
         self.assertEqual(generate_filename(document),
-                         "demo-{:07d}.pdf".format(document.pk))
+                         "demo.pdf")
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{tags[1]}")
     def test_tags_out_of_bounds(self):
@@ -261,7 +261,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         # Ensure that filename is properly generated
         self.assertEqual(generate_filename(document),
-                         "none-{:07d}.pdf".format(document.pk))
+                         "none.pdf")
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}/{correspondent}")
     def test_nested_directory_cleanup(self):
@@ -272,7 +272,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         # Ensure that filename is properly generated
         document.filename = generate_filename(document)
-        self.assertEqual(document.filename, "none/none/none-{:07d}.pdf".format(document.pk))
+        self.assertEqual(document.filename, "none/none/none.pdf")
         create_source_path_directory(document.source_path)
         Path(document.source_path).touch()
 
@@ -282,7 +282,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         pk = document.pk
         document.delete()
 
-        self.assertEqual(os.path.isfile(settings.ORIGINALS_DIR + "/none/none/none-{:07d}.pdf".format(pk)), False)
+        self.assertEqual(os.path.isfile(settings.ORIGINALS_DIR + "/none/none/none.pdf"), False)
         self.assertEqual(os.path.isdir(settings.ORIGINALS_DIR + "/none/none"), False)
         self.assertEqual(os.path.isdir(settings.ORIGINALS_DIR + "/none"), False)
         self.assertEqual(os.path.isdir(settings.ORIGINALS_DIR), True)
@@ -330,6 +330,48 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         self.assertEqual(generate_filename(document), "0000001.pdf")
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    def test_duplicates(self):
+        document = Document.objects.create(mime_type="application/pdf", title="qwe", checksum="A", pk=1)
+        document2 = Document.objects.create(mime_type="application/pdf", title="qwe", checksum="B", pk=2)
+        Path(document.source_path).touch()
+        Path(document2.source_path).touch()
+        document.filename = "0000001.pdf"
+        document.save()
+
+        self.assertTrue(os.path.isfile(document.source_path))
+        self.assertEqual(document.filename, "qwe.pdf")
+
+        document2.filename = "0000002.pdf"
+        document2.save()
+
+        self.assertTrue(os.path.isfile(document.source_path))
+        self.assertEqual(document2.filename, "qwe_01.pdf")
+
+        # saving should not change the file names.
+
+        document.save()
+
+        self.assertTrue(os.path.isfile(document.source_path))
+        self.assertEqual(document.filename, "qwe.pdf")
+
+        document2.save()
+
+        self.assertTrue(os.path.isfile(document.source_path))
+        self.assertEqual(document2.filename, "qwe_01.pdf")
+
+        document.delete()
+
+        self.assertFalse(os.path.isfile(document.source_path))
+
+        # filename free, should remove _01 suffix
+
+        document2.save()
+
+        self.assertTrue(os.path.isfile(document.source_path))
+        self.assertEqual(document2.filename, "qwe.pdf")
+
+
 
 class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
 
@@ -358,15 +400,14 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertFalse(os.path.isfile(archive))
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(os.path.isfile(doc.archive_path))
-        self.assertEqual(doc.source_path, os.path.join(settings.ORIGINALS_DIR, "none", "my_doc-0000001.pdf"))
-        self.assertEqual(doc.archive_path, os.path.join(settings.ARCHIVE_DIR, "none", "my_doc-0000001.pdf"))
+        self.assertEqual(doc.source_path, os.path.join(settings.ORIGINALS_DIR, "none", "my_doc.pdf"))
+        self.assertEqual(doc.archive_path, os.path.join(settings.ARCHIVE_DIR, "none", "my_doc.pdf"))
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
     def test_move_archive_gone(self):
         original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
         Path(original).touch()
-        #Path(archive).touch()
         doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B")
 
         self.assertTrue(os.path.isfile(original))
@@ -381,7 +422,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         Path(original).touch()
         Path(archive).touch()
         os.makedirs(os.path.join(settings.ARCHIVE_DIR, "none"))
-        Path(os.path.join(settings.ARCHIVE_DIR, "none", "my_doc-0000001.pdf")).touch()
+        Path(os.path.join(settings.ARCHIVE_DIR, "none", "my_doc.pdf")).touch()
         doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B")
 
         self.assertTrue(os.path.isfile(original))
@@ -494,14 +535,14 @@ class TestFilenameGeneration(TestCase):
     def test_invalid_characters(self):
 
         doc = Document.objects.create(title="This. is the title.", mime_type="application/pdf", pk=1, checksum="1")
-        self.assertEqual(generate_filename(doc), "This. is the title-0000001.pdf")
+        self.assertEqual(generate_filename(doc), "This. is the title.pdf")
 
         doc = Document.objects.create(title="my\\invalid/../title:yay", mime_type="application/pdf", pk=2, checksum="2")
-        self.assertEqual(generate_filename(doc), "my-invalid-..-title-yay-0000002.pdf")
+        self.assertEqual(generate_filename(doc), "my-invalid-..-title-yay.pdf")
 
     @override_settings(
         PAPERLESS_FILENAME_FORMAT="{created}"
     )
     def test_date(self):
         doc = Document.objects.create(title="does not matter", created=datetime.datetime(2020,5,21, 7,36,51, 153), mime_type="application/pdf", pk=2, checksum="2")
-        self.assertEqual(generate_filename(doc), "2020-05-21-0000002.pdf")
+        self.assertEqual(generate_filename(doc), "2020-05-21.pdf")
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index c7ecf7645..cf0c3e28d 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -53,6 +53,10 @@ ARCHIVE_DIR = os.path.join(MEDIA_ROOT, "documents", "archive")
 THUMBNAIL_DIR = os.path.join(MEDIA_ROOT, "documents", "thumbnails")
 
 DATA_DIR = os.getenv('PAPERLESS_DATA_DIR', os.path.join(BASE_DIR, "..", "data"))
+
+# Lock file for synchronizing changes to the MEDIA directory across multiple
+# threads.
+MEDIA_LOCK = os.path.join(MEDIA_ROOT, "media.lock")
 INDEX_DIR = os.path.join(DATA_DIR, "index")
 MODEL_FILE = os.path.join(DATA_DIR, "classification_model.pickle")
 

From ad527fe97ca975d646994af9135cc673e0f6aced Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 15:28:09 +0100
Subject: [PATCH 0080/1300] reading and displaying PDF metadata

---
 Pipfile                                       |  1 +
 Pipfile.lock                                  |  4 +-
 .../document-detail.component.html            | 69 +++++++++++++++++--
 .../document-detail.component.ts              |  3 +
 .../app/data/paperless-document-metadata.ts   | 10 +--
 src/documents/tests/test_api.py               | 32 +++++++++
 src/documents/views.py                        | 46 +++++++++++--
 7 files changed, 147 insertions(+), 18 deletions(-)

diff --git a/Pipfile b/Pipfile
index 830604a8d..48759307c 100644
--- a/Pipfile
+++ b/Pipfile
@@ -27,6 +27,7 @@ langdetect = "*"
 pdftotext = "*"
 pathvalidate = "*"
 pillow = "*"
+pikepdf = "*"
 python-gnupg = "*"
 python-dotenv = "*"
 python-dateutil = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 198351237..1cfccb8ff 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "3c187671ead11714d48b56f4714b145f68814e09edea818610b87f18b4f7f6fd"
+            "sha256": "3d576f289958226a7583e4c471c7f8c11bff6933bf093185f623cfb381a92412"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -433,7 +433,7 @@
                 "sha256:fe0ca120e3347c851c34a91041d574f3c588d832023906d8ae18d66d042e8a52",
                 "sha256:fe8e0152672f24d8bfdecc725f97e9013f2de1b41849150959526ca3562bd3ef"
             ],
-            "markers": "python_version < '3.9'",
+            "index": "pypi",
             "version": "==2.2.0"
         },
         "pillow": {
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 42619845c..e905c35e6 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -15,7 +15,7 @@
             <span class="d-none d-lg-inline"> Download</span>
         </a>
 
-        <div class="btn-group" ngbDropdown role="group" *ngIf="metadata?.paperless__has_archive_version">
+        <div class="btn-group" ngbDropdown role="group" *ngIf="metadata?.has_archive_version">
             <button class="btn btn-sm btn-outline-primary dropdown-toggle-split" ngbDropdownToggle></button>
             <div class="dropdown-menu" ngbDropdownMenu>
                 <a ngbDropdownItem [href]="downloadOriginalUrl">Download original</a>
@@ -72,6 +72,7 @@
                 <li [ngbNavItem]="3">
                     <a ngbNavLink>Metadata</a>
                     <ng-template ngbNavContent>
+
                         <table class="table table-borderless">
                             <tbody>
                                 <tr>
@@ -83,23 +84,76 @@
                                     <td>{{document.added | date}}</td>
                                 </tr>
                                 <tr>
-                                    <td>MD5 Checksum</td>
-                                    <td>{{metadata?.paperless__checksum}}</td>
+                                    <td>Original MD5 Checksum</td>
+                                    <td>{{metadata?.original_checksum}}</td>
+                                </tr>
+                                <tr>
+                                    <td>Archive MD5 Checksum</td>
+                                    <td>{{metadata?.archived_checksum}}</td>
                                 </tr>
                                 <tr>
                                     <td>Original mime type</td>
-                                    <td>{{metadata?.paperless__mime_type}}</td>
+                                    <td>{{metadata?.original_mime_type}}</td>
                                 </tr>
                                 <tr>
                                     <td>Is archived?</td>
-                                    <td>{{metadata?.paperless__has_archive_version | yesno}}</td>
+                                    <td>{{metadata?.has_archive_version | yesno}}</td>
                                 </tr>
                                 <tr>
                                     <td>Media filename</td>
-                                    <td>{{metadata?.paperless__filename}}</td>
+                                    <td>{{metadata?.media_filename}}</td>
                                 </tr>
                             </tbody>
                         </table>
+
+                        <h6 *ngIf="metadata?.original_metadata.length > 0">
+                            <button type="button" class="btn btn-outline-secondary btn-sm mr-2"
+                                (click)="expandOriginalMetadata = !expandOriginalMetadata" aria-controls="collapseExample">
+                                <svg class="buttonicon" fill="currentColor" *ngIf="!expandOriginalMetadata">
+                                    <use xlink:href="assets/bootstrap-icons.svg#caret-down" />
+                                </svg>
+                                <svg class="buttonicon" fill="currentColor" *ngIf="expandOriginalMetadata">
+                                    <use xlink:href="assets/bootstrap-icons.svg#caret-up" />
+                                </svg>
+                            </button>
+                            Original document metadata
+                        </h6>
+
+                        <div #collapse="ngbCollapse" [(ngbCollapse)]="!expandOriginalMetadata">
+                            <table class="table table-borderless">
+                                <tbody>
+                                    <tr *ngFor="let m of metadata?.original_metadata">
+                                        <td>{{m.prefix}}:{{m.key}}</td>
+                                        <td>{{m.value}}</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+
+                        <h6 *ngIf="metadata?.has_archive_version && metadata?.archive_metadata.length > 0">
+                            <button type="button" class="btn btn-outline-secondary btn-sm mr-2"
+                                (click)="expandArchivedMetadata = !expandArchivedMetadata" aria-controls="collapseExample">
+                                <svg class="buttonicon" fill="currentColor" *ngIf="!expandArchivedMetadata">
+                                    <use xlink:href="assets/bootstrap-icons.svg#caret-down" />
+                                </svg>
+                                <svg class="buttonicon" fill="currentColor" *ngIf="expandArchivedMetadata">
+                                    <use xlink:href="assets/bootstrap-icons.svg#caret-up" />
+                                </svg>
+                            </button>
+                            Archived document metadata
+                        </h6>
+
+                        <div #collapse="ngbCollapse" [(ngbCollapse)]="!expandArchivedMetadata">
+                            <table class="table table-borderless">
+                                <tbody>
+                                    <tr *ngFor="let m of metadata?.archive_metadata">
+                                        <td>{{m.prefix}}:{{m.key}}</td>
+                                        <td>{{m.value}}</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+
                     </ng-template>
                 </li>
             </ul>
@@ -107,7 +161,8 @@
             <div [ngbNavOutlet]="nav" class="mt-2"></div>
 
             <button type="button" class="btn btn-outline-secondary" (click)="discard()">Discard</button>&nbsp;
-            <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()">Save & edit next</button>&nbsp;
+            <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()">Save & edit
+                next</button>&nbsp;
             <button type="submit" class="btn btn-primary">Save</button>&nbsp;
         </form>
     </div>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index cf16f01c5..329077693 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -24,6 +24,9 @@ import { DocumentTypeEditDialogComponent } from '../manage/document-type-list/do
 })
 export class DocumentDetailComponent implements OnInit {
 
+  public expandOriginalMetadata = false;
+  public expandArchivedMetadata = false;
+
   documentId: number
   document: PaperlessDocument
   metadata: PaperlessDocumentMetadata
diff --git a/src-ui/src/app/data/paperless-document-metadata.ts b/src-ui/src/app/data/paperless-document-metadata.ts
index 22b3f692a..12f0a78d8 100644
--- a/src-ui/src/app/data/paperless-document-metadata.ts
+++ b/src-ui/src/app/data/paperless-document-metadata.ts
@@ -1,11 +1,13 @@
 export interface PaperlessDocumentMetadata {
     
-  paperless__checksum?: string
+  original_checksum?: string
 
-  paperless__mime_type?: string
+  archived_checksum?: string
 
-  paperless__filename?: string
+  original_mime_type?: string
 
-  paperless__has_archive_version?: boolean
+  media_filename?: string
+
+  has_archive_version?: boolean
 
 }
\ No newline at end of file
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 986094db6..c2f9c950c 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -1,4 +1,5 @@
 import os
+import shutil
 import tempfile
 from unittest import mock
 
@@ -493,3 +494,34 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 400)
 
         async_task.assert_not_called()
+
+    def test_get_metadata(self):
+        doc = Document.objects.create(title="test", filename="file.pdf", mime_type="image/png")
+
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), doc.source_path)
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), doc.archive_path)
+
+        response = self.client.get(f"/api/documents/{doc.pk}/metadata/")
+        self.assertEqual(response.status_code, 200)
+
+        meta = response.data
+
+        self.assertEqual(meta['original_mime_type'], "image/png")
+        self.assertTrue(meta['has_archive_version'])
+        self.assertEqual(len(meta['original_metadata']), 0)
+        self.assertGreater(len(meta['archive_metadata']), 0)
+
+    def test_get_metadata_no_archive(self):
+        doc = Document.objects.create(title="test", filename="file.pdf", mime_type="application/pdf")
+
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), doc.source_path)
+
+        response = self.client.get(f"/api/documents/{doc.pk}/metadata/")
+        self.assertEqual(response.status_code, 200)
+
+        meta = response.data
+
+        self.assertEqual(meta['original_mime_type'], "application/pdf")
+        self.assertFalse(meta['has_archive_version'])
+        self.assertGreater(len(meta['original_metadata']), 0)
+        self.assertIsNone(meta['archive_metadata'])
diff --git a/src/documents/views.py b/src/documents/views.py
index 7d587ed3f..e058b0f56 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -1,8 +1,11 @@
+import logging
 import os
+import re
 import tempfile
 from datetime import datetime
 from time import mktime
 
+import pikepdf
 from django.conf import settings
 from django.db.models import Count, Max
 from django.http import HttpResponse, HttpResponseBadRequest, Http404
@@ -160,16 +163,49 @@ class DocumentViewSet(RetrieveModelMixin,
             disposition, filename)
         return response
 
+    def get_metadata(self, file, type):
+        if not os.path.isfile(file):
+            return None
+
+        namespace_pattern = re.compile(r"\{(.*)\}(.*)")
+
+        result = []
+        if type == 'application/pdf':
+            pdf = pikepdf.open(file)
+            meta = pdf.open_metadata()
+            for key, value in meta.items():
+                if isinstance(value, list):
+                    value = " ".join([str(e) for e in value])
+                value = str(value)
+                try:
+                    m = namespace_pattern.match(key)
+                    result.append({
+                        "namespace": m.group(1),
+                        "prefix": meta.REVERSE_NS[m.group(1)],
+                        "key": m.group(2),
+                        "value": value
+                    })
+                except Exception as e:
+                    logging.getLogger(__name__).warning(
+                        f"Error while reading metadata {key}: {value}. Error: "
+                        f"{e}"
+                    )
+        return result
+
     @action(methods=['get'], detail=True)
     def metadata(self, request, pk=None):
         try:
             doc = Document.objects.get(pk=pk)
             return Response({
-                "paperless__checksum": doc.checksum,
-                "paperless__mime_type": doc.mime_type,
-                "paperless__filename": doc.filename,
-                "paperless__has_archive_version":
-                    os.path.isfile(doc.archive_path)
+                "original_checksum": doc.checksum,
+                "archived_checksum": doc.archive_checksum,
+                "original_mime_type": doc.mime_type,
+                "media_filename": doc.filename,
+                "has_archive_version": os.path.isfile(doc.archive_path),
+                "original_metadata": self.get_metadata(
+                    doc.source_path, doc.mime_type),
+                "archive_metadata": self.get_metadata(
+                    doc.archive_path, "application/pdf")
             })
         except Document.DoesNotExist:
             raise Http404()

From 0028fde2fd4e4d1db64d537a7f784f8ce1272c38 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 16:09:47 +0100
Subject: [PATCH 0081/1300] more metadata #32

---
 docs/changelog.rst                            |  1 +
 src-ui/src/app/app.module.ts                  |  4 +-
 .../document-detail.component.html            | 20 +++--
 src-ui/src/app/pipes/file-size.pipe.spec.ts   |  8 ++
 src-ui/src/app/pipes/file-size.pipe.ts        | 77 +++++++++++++++++++
 src/documents/tests/test_api.py               |  2 +-
 src/documents/views.py                        | 21 +++--
 7 files changed, 118 insertions(+), 15 deletions(-)
 create mode 100644 src-ui/src/app/pipes/file-size.pipe.spec.ts
 create mode 100644 src-ui/src/app/pipes/file-size.pipe.ts

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2e3ed07f6..b6c88be92 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -19,6 +19,7 @@ This release focusses primarily on many small issues with the UI.
   * There's a new filter to filter for documents that do *not* have a certain tag.
   * The file upload box now shows upload progress.
   * The document edit page was reorganized.
+  * The document edit page shows various information about a document.
   * Table issues with too long document titles fixed.
 
 * API
diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index e186cde50..ad12c9c47 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -47,6 +47,7 @@ import { UploadFileWidgetComponent } from './components/dashboard/widgets/upload
 import { WidgetFrameComponent } from './components/dashboard/widgets/widget-frame/widget-frame.component';
 import { WelcomeWidgetComponent } from './components/dashboard/widgets/welcome-widget/welcome-widget.component';
 import { YesNoPipe } from './pipes/yes-no.pipe';
+import { FileSizePipe } from './pipes/file-size.pipe';
 
 @NgModule({
   declarations: [
@@ -86,7 +87,8 @@ import { YesNoPipe } from './pipes/yes-no.pipe';
     UploadFileWidgetComponent,
     WidgetFrameComponent,
     WelcomeWidgetComponent,
-    YesNoPipe
+    YesNoPipe,
+    FileSizePipe
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index e905c35e6..774ea8869 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -83,25 +83,29 @@
                                     <td>Date added</td>
                                     <td>{{document.added | date}}</td>
                                 </tr>
+                                <tr>
+                                    <td>Media filename</td>
+                                    <td>{{metadata?.media_filename}}</td>
+                                </tr>
                                 <tr>
                                     <td>Original MD5 Checksum</td>
                                     <td>{{metadata?.original_checksum}}</td>
                                 </tr>
                                 <tr>
-                                    <td>Archive MD5 Checksum</td>
-                                    <td>{{metadata?.archived_checksum}}</td>
+                                    <td>Original file size</td>
+                                    <td>{{metadata?.original_size | fileSize}}</td>
                                 </tr>
                                 <tr>
                                     <td>Original mime type</td>
                                     <td>{{metadata?.original_mime_type}}</td>
                                 </tr>
-                                <tr>
-                                    <td>Is archived?</td>
-                                    <td>{{metadata?.has_archive_version | yesno}}</td>
+                                <tr *ngIf="metadata?.has_archive_version">
+                                    <td>Archive MD5 Checksum</td>
+                                    <td>{{metadata?.archive_checksum}}</td>
                                 </tr>
-                                <tr>
-                                    <td>Media filename</td>
-                                    <td>{{metadata?.media_filename}}</td>
+                                <tr *ngIf="metadata?.has_archive_version">
+                                    <td>Archive file size</td>
+                                    <td>{{metadata?.archive_size | fileSize}}</td>
                                 </tr>
                             </tbody>
                         </table>
diff --git a/src-ui/src/app/pipes/file-size.pipe.spec.ts b/src-ui/src/app/pipes/file-size.pipe.spec.ts
new file mode 100644
index 000000000..8c7a39d22
--- /dev/null
+++ b/src-ui/src/app/pipes/file-size.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { FileSizePipe } from './file-size.pipe';
+
+describe('FileSizePipe', () => {
+  it('create an instance', () => {
+    const pipe = new FileSizePipe();
+    expect(pipe).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/pipes/file-size.pipe.ts b/src-ui/src/app/pipes/file-size.pipe.ts
new file mode 100644
index 000000000..7d742c876
--- /dev/null
+++ b/src-ui/src/app/pipes/file-size.pipe.ts
@@ -0,0 +1,77 @@
+/**
+ * https://gist.github.com/JonCatmull/ecdf9441aaa37336d9ae2c7f9cb7289a
+ * 
+ * @license
+ * Copyright (c) 2019 Jonathan Catmull.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+import { Pipe, PipeTransform } from '@angular/core';
+
+type unit = 'bytes' | 'KB' | 'MB' | 'GB' | 'TB' | 'PB';
+type unitPrecisionMap = {
+  [u in unit]: number;
+};
+
+const defaultPrecisionMap: unitPrecisionMap = {
+  bytes: 0,
+  KB: 0,
+  MB: 1,
+  GB: 1,
+  TB: 2,
+  PB: 2
+};
+
+/*
+ * Convert bytes into largest possible unit.
+ * Takes an precision argument that can be a number or a map for each unit.
+ * Usage:
+ *   bytes | fileSize:precision
+ * @example
+ * // returns 1 KB
+ * {{ 1500 | fileSize }}
+ * @example
+ * // returns 2.1 GB
+ * {{ 2100000000 | fileSize }}
+ * @example
+ * // returns 1.46 KB
+ * {{ 1500 | fileSize:2 }}
+ */
+@Pipe({ name: 'fileSize' })
+export class FileSizePipe implements PipeTransform {
+  private readonly units: unit[] = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];
+
+  transform(bytes: number = 0, precision: number | unitPrecisionMap = defaultPrecisionMap): string {
+    if (isNaN(parseFloat(String(bytes))) || !isFinite(bytes)) return '?';
+
+    let unitIndex = 0;
+
+    while (bytes >= 1024) {
+      bytes /= 1024;
+      unitIndex++;
+    }
+
+    const unit = this.units[unitIndex];
+
+    if (typeof precision === 'number') {
+      return `${bytes.toFixed(+precision)} ${unit}`;
+    }
+    return `${bytes.toFixed(precision[unit])} ${unit}`;
+  }
+}
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index c2f9c950c..572667406 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -496,7 +496,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         async_task.assert_not_called()
 
     def test_get_metadata(self):
-        doc = Document.objects.create(title="test", filename="file.pdf", mime_type="image/png")
+        doc = Document.objects.create(title="test", filename="file.pdf", mime_type="image/png", archive_checksum="A")
 
         shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), doc.source_path)
         shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), doc.archive_path)
diff --git a/src/documents/views.py b/src/documents/views.py
index e058b0f56..8dbb61dc7 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -196,17 +196,28 @@ class DocumentViewSet(RetrieveModelMixin,
     def metadata(self, request, pk=None):
         try:
             doc = Document.objects.get(pk=pk)
-            return Response({
+
+            meta = {
                 "original_checksum": doc.checksum,
-                "archived_checksum": doc.archive_checksum,
+                "original_size": os.stat(doc.source_path).st_size,
                 "original_mime_type": doc.mime_type,
                 "media_filename": doc.filename,
                 "has_archive_version": os.path.isfile(doc.archive_path),
                 "original_metadata": self.get_metadata(
-                    doc.source_path, doc.mime_type),
-                "archive_metadata": self.get_metadata(
+                    doc.source_path, doc.mime_type)
+            }
+
+            if doc.archive_checksum and os.path.isfile(doc.archive_path):
+                meta['archive_checksum'] = doc.archive_checksum
+                meta['archive_size'] = os.stat(doc.archive_path).st_size,
+                meta['archive_metadata'] = self.get_metadata(
                     doc.archive_path, "application/pdf")
-            })
+            else:
+                meta['archive_checksum'] = None
+                meta['archive_size'] = None
+                meta['archive_metadata'] = None
+
+            return Response(meta)
         except Document.DoesNotExist:
             raise Http404()
 

From 6613104b4fbb6c874742db85c986f13c03dd9006 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 16:21:38 +0100
Subject: [PATCH 0082/1300] date and time in metadata

---
 .../components/document-detail/document-detail.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 774ea8869..9f4c72cdd 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -77,11 +77,11 @@
                             <tbody>
                                 <tr>
                                     <td>Date modified</td>
-                                    <td>{{document.modified | date}}</td>
+                                    <td>{{document.modified | date:'medium'}}</td>
                                 </tr>
                                 <tr>
                                     <td>Date added</td>
-                                    <td>{{document.added | date}}</td>
+                                    <td>{{document.added | date:'medium'}}</td>
                                 </tr>
                                 <tr>
                                     <td>Media filename</td>

From bf3b2249c5a7852c234686230b68d70be4d32c2f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 16:36:14 +0100
Subject: [PATCH 0083/1300] Metadata documentation

---
 docs/api.rst | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/docs/api.rst b/docs/api.rst
index 7d486df7f..d352758fa 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -71,6 +71,43 @@ supply the query parameter ``original=true``.
     should update your app or script to use the new URLs.
 
 
+Getting document metadata
+#########################
+
+The api also has an endpoint to retrieve read-only metadata about specific documents. this
+information is not served along with the document objects, since it requires reading
+files and would therefore slow down document lists considerably.
+
+Access the metadata of a document with an ID ``id`` at ``/api/documents/<id>/metadata/``.
+
+The endpoint reports the following data:
+
+*   ``original_checksum``: MD5 checksum of the original document.
+*   ``original_size``: Size of the original document, in bytes.
+*   ``original_mime_type``: Mime type of the original document.
+*   ``media_filename``: Current filename of the document, under which it is stored inside the media directory.
+*   ``has_archive_version``: True, if this document is archived, false otherwise.
+*   ``original_metadata``: A list of metadata associated with the original document. See below.
+*   ``archive_checksum``: MD5 checksum of the archived document, or null.
+*   ``archive_size``: Size of the archived document in bytes, or null.
+*   ``archive_metadata``: Metadata associated with the archived document, or null. See below.
+
+File metadata is reported as a list of objects in the following form:
+
+.. code:: json
+
+    [
+        {
+            "namespace": "http://ns.adobe.com/pdf/1.3/",
+            "prefix": "pdf",
+            "key": "Producer",
+            "value": "SparklePDF, Fancy edition"
+        },
+    ]
+
+``namespace`` and ``prefix`` can be null. The actual metadata reported depends on the file type and the metadata
+available in that specific document. Paperless only reports PDF metadata at this point.
+
 Authorization
 #############
 

From 871e22e3a34abbc89c6ed74cd13f76a8b8787177 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 16:45:22 +0100
Subject: [PATCH 0084/1300] documentation

---
 docs/advanced_usage.rst |  2 +-
 docs/changelog.rst      | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst
index fca3ff4df..b5ae254b3 100644
--- a/docs/advanced_usage.rst
+++ b/docs/advanced_usage.rst
@@ -298,6 +298,7 @@ avoids filename clashes.
 Paperless provides the following placeholders withing filenames:
 
 * ``{correspondent}``: The name of the correspondent, or "none".
+* ``{document_type}``: The name of the document type, or "none".
 * ``{title}``: The title of the document.
 * ``{created}``: The full date and time the document was created.
 * ``{created_year}``: Year created only.
@@ -307,7 +308,6 @@ Paperless provides the following placeholders withing filenames:
 * ``{added_year}``: Year added only.
 * ``{added_month}``: Month added only (number 1-12).
 * ``{added_day}``: Day added only (number 1-31).
-* ``{tags}``: I don't know how this works. Look at the source.
 
 Paperless will convert all values for the placeholders into values which are safe
 for use in filenames.
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b6c88be92..96578ac75 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,17 +14,20 @@ This release focusses primarily on many small issues with the UI.
 
   * Paperless now has proper window titles.
   * Fixed an issue with the small cards when more than 7 tags were used.
-  * Navigation of the "Show all" links adjusted.
+  * Navigation of the "Show all" links adjusted. They navigate to the saved view now, if available in the sidebar.
   * Some indication on the document lists that a filter is active was added.
   * There's a new filter to filter for documents that do *not* have a certain tag.
   * The file upload box now shows upload progress.
   * The document edit page was reorganized.
   * The document edit page shows various information about a document.
+  * An issue with the height of the preview was fixed.
   * Table issues with too long document titles fixed.
 
 * API
 
   * The API now serves file names with documents.
+  * The API now serves various metadata about documents.
+  * API documentation updated.
 
 * Other
 
@@ -35,6 +38,12 @@ This release focusses primarily on many small issues with the UI.
   * The filename formatter does not include the document ID in filenames anymore. It will
     rather append ``_01``, ``_02``, etc when it detects duplicate filenames.
 
+.. note::
+
+  The changes to the filename format will apply to newly added documents and changed documents.
+  If you want all files to reflect these changes, execute the ``document_renamer`` management
+  command.
+
 
 paperless-ng 0.9.5
 ##################

From d3cf85b9e970cad298691b23e4dd41cb72d742b8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 17:34:29 +0100
Subject: [PATCH 0085/1300] Added a section on best practices.

---
 docs/usage_overview.rst | 57 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/docs/usage_overview.rst b/docs/usage_overview.rst
index db50d5706..980564cba 100644
--- a/docs/usage_overview.rst
+++ b/docs/usage_overview.rst
@@ -183,6 +183,63 @@ You can also submit a document using the REST API, see :ref:`api-file_uploads` f
 
 .. _basic-searching:
 
+
+Best practices
+##############
+
+Paperless offers a couple tools that help you organize your document collection. However,
+it is up to you to use them in a way that helps you organize documents and find specific
+documents when you need them. This section offers a couple ideas for managing your collection.
+
+Document types allow you to classify documents according to what they are. You can define
+types such as "Receipt", "Invoice", or "Contract". If you used to collect all your receipts
+in a single binder, you can recreate that system in paperless by defining a document type,
+assigning documents to that type and then filtering by that type to only see all receipts.
+
+Not all documents need document types. Sometimes its hard to determine what the type of a
+document is or it is hard to justify creating a document type that you only need once or twice.
+This is okay. As long as the types you define help you organize your collection in the way
+you want, paperless is doing its job.
+
+Tags can be used in many different ways. Think of tags are more versatile folders or binders.
+If you have a binder for documents related to university / your car or health care, you can
+create these binders in paperless by creating tags and assigning them to relevant documents.
+Just as with documents, you can filter the document list by tags and only see documents of
+a certain topic.
+
+With physical documents, you'll often need to decide which folder the document belongs to.
+The advantage of tags over folders and binders is that a single document can have multiple
+tags. A physical document cannot magically appear in two different folders, but with tags,
+this is entirely possible.
+
+.. hint::
+
+  This can be used in many different ways. One example: Imagine you're working on a particular
+  tasks, such as signing up for university. Usually you'll need to collect a bunch of different
+  documents that are already sorted into various folders. With the tag system of paperless,
+  you can create a new group of documents that are relevant to this task without destroying
+  the already existing organization. When you're done with the task, you could delete the
+  task again, which would be equal to sorting documents back into the folder they belong into.
+  Or keep the tag.
+
+All of the logic above applies to correspondents as well. Attach them to documents if you
+feel that they help you organize your collection.
+
+When you've started organizing your documents, create a couple saved views for document collections
+you regularly access. This is equal to having labeled physical binders on your desk, except
+that these saved views are dynamic and simply update themselves as you add documents to the system.
+
+Here are a couple examples of tags and types that you could use in your collection.
+
+* An ``inbox`` tag for newly added documents that you haven't manually edited yet.
+* A tag ``car`` for everything car related (repairs, registration, insurance, etc)
+* A tag ``todo`` for documents that you still need to do something with, such as reply, or
+  perform some task online.
+* A tag ``bank account x`` for all bank statement related to that account.
+* A tag ``mail`` for anything that you added to paperless via its mail processing capabilities.
+* 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.
+
 Searching
 #########
 

From 001ab88fffeb8652adda3bd098396ec449269252 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 17:34:38 +0100
Subject: [PATCH 0086/1300] docs

---
 docs/usage_overview.rst | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/docs/usage_overview.rst b/docs/usage_overview.rst
index 980564cba..bb9ecd452 100644
--- a/docs/usage_overview.rst
+++ b/docs/usage_overview.rst
@@ -57,7 +57,7 @@ Adding documents to paperless
 #############################
 
 Once you've got Paperless setup, you need to start feeding documents into it.
-Currently, there are three options: the consumption directory, IMAP (email), and
+Currently, there are four options: the consumption directory, the dashboard, IMAP (email), and
 HTTP POST.
 
 When adding documents to paperless, it will perform the following operations on
@@ -82,8 +82,7 @@ your documents:
     No matter which options you choose, Paperless will always store the original
     document that it found in the consumption directory or in the mail and
     will never overwrite that document. Archived versions are stored alongside the
-    digital versions.
-
+    original versions.
 
 
 The consumption directory
@@ -107,6 +106,12 @@ files from the scanner.  Typically, you're looking at an FTP server like
 
 .. TODO: hyperref to configuration of the location of this magic folder.
 
+Dashboard upload
+================
+
+The dashboard has a file drop field to upload documents to paperless. Simply drag a file
+onto this field or select a file with the file dialog. Multiple files are supported.
+
 .. _usage-email:
 
 IMAP (Email)
@@ -215,12 +220,12 @@ this is entirely possible.
 .. hint::
 
   This can be used in many different ways. One example: Imagine you're working on a particular
-  tasks, such as signing up for university. Usually you'll need to collect a bunch of different
+  task, such as signing up for university. Usually you'll need to collect a bunch of different
   documents that are already sorted into various folders. With the tag system of paperless,
   you can create a new group of documents that are relevant to this task without destroying
   the already existing organization. When you're done with the task, you could delete the
-  task again, which would be equal to sorting documents back into the folder they belong into.
-  Or keep the tag.
+  tag again, which would be equal to sorting documents back into the folder they belong into.
+  Or keep the tag, up to you.
 
 All of the logic above applies to correspondents as well. Attach them to documents if you
 feel that they help you organize your collection.

From e428a8a0087d4bf067539d44ac0031c30e80c63c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 17:35:51 +0100
Subject: [PATCH 0087/1300] file upload improvements

---
 .../upload-file-widget.component.ts             | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index 90bfbf1e5..2ea4825f1 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -6,7 +6,6 @@ import { Toast, ToastService } from 'src/app/services/toast.service';
 
 
 interface UploadStatus {
-  file: string
   loaded: number
   total: number 
 }
@@ -30,11 +29,12 @@ export class UploadFileWidgetComponent implements OnInit {
   }
 
   uploadStatus: UploadStatus[] = []
+  completedFiles = 0
 
   uploadVisible = false
 
   get loadedSum() {
-    return this.uploadStatus.map(s => s.loaded).reduce((a,b) => a+b, 1)
+    return this.uploadStatus.map(s => s.loaded).reduce((a,b) => a+b, this.completedFiles > 0 ? 1 : 0)
   }
 
   get totalSum() {
@@ -44,32 +44,35 @@ export class UploadFileWidgetComponent implements OnInit {
   public dropped(files: NgxFileDropEntry[]) {
     for (const droppedFile of files) {
       if (droppedFile.fileEntry.isFile) {
-        const fileEntry = droppedFile.fileEntry as FileSystemFileEntry;
+      let uploadStatusObject: UploadStatus = {loaded: 0, total: 1}
+      this.uploadStatus.push(uploadStatusObject)
+      this.uploadVisible = true
+
+      const fileEntry = droppedFile.fileEntry as FileSystemFileEntry;
         fileEntry.file((file: File) => {
           let formData = new FormData()
           formData.append('document', file, file.name)
 
-          let uploadStatusObject: UploadStatus = {file: file.name, loaded: 0, total: 1}
-          this.uploadStatus.push(uploadStatusObject)
-          this.uploadVisible = true
           this.documentService.uploadDocument(formData).subscribe(event => {
             if (event.type == HttpEventType.UploadProgress) {
               uploadStatusObject.loaded = event.loaded
               uploadStatusObject.total = event.total
             } else if (event.type == HttpEventType.Response) {
               this.uploadStatus.splice(this.uploadStatus.indexOf(uploadStatusObject), 1)
+              this.completedFiles += 1
               this.toastService.showToast(Toast.make("Information", "The document has been uploaded and will be processed by the consumer shortly."))
             }
             
           }, error => {
             this.uploadStatus.splice(this.uploadStatus.indexOf(uploadStatusObject), 1)
+            this.completedFiles += 1
             switch (error.status) {
               case 400: {
                 this.toastService.showToast(Toast.makeError(`There was an error while uploading the document: ${error.error.document}`))
                 break;
               }
               default: {
-                this.toastService.showToast(Toast.makeError("An error has occured while uploading the document. Sorry!"))
+                this.toastService.showToast(Toast.makeError("An error has occurred while uploading the document. Sorry!"))
                 break;
               }
             }

From 550a74347c36c260f2bdcd151885468077b83859 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 21:08:44 +0100
Subject: [PATCH 0088/1300] a test that "verifies" that the file renaming lock
 works and no inconsistencies are created.

---
 src/documents/consumer.py                 |  2 +
 src/documents/tests/test_file_handling.py | 47 ++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 23d17abc9..f52dd5a7d 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -206,6 +206,8 @@ class Consumer(LoggingMixin):
                             document.archive_checksum = hashlib.md5(
                                 f.read()).hexdigest()
 
+                # Don't save with the lock active. Saving will cause the file
+                # renaming logic to aquire the lock as well.
                 document.save()
 
                 # Delete the file only if it was successfully consumed
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index f0a74ca4f..6d407a7ab 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -1,5 +1,9 @@
 import datetime
+import hashlib
 import os
+import random
+import uuid
+from concurrent.futures.thread import ThreadPoolExecutor
 from pathlib import Path
 from unittest import mock
 
@@ -8,8 +12,10 @@ from django.db import DatabaseError
 from django.test import TestCase, override_settings
 
 from .utils import DirectoriesMixin
-from ..file_handling import generate_filename, create_source_path_directory, delete_empty_directories
+from ..file_handling import generate_filename, create_source_path_directory, delete_empty_directories, \
+    generate_unique_filename
 from ..models import Document, Correspondent
+from ..sanity_checker import check_sanity
 
 
 class TestFileHandling(DirectoriesMixin, TestCase):
@@ -546,3 +552,42 @@ class TestFilenameGeneration(TestCase):
     def test_date(self):
         doc = Document.objects.create(title="does not matter", created=datetime.datetime(2020,5,21, 7,36,51, 153), mime_type="application/pdf", pk=2, checksum="2")
         self.assertEqual(generate_filename(doc), "2020-05-21.pdf")
+
+
+def run():
+    doc = Document.objects.create(checksum=str(uuid.uuid4()), title=str(uuid.uuid4()), content="wow")
+    doc.filename = generate_unique_filename(doc, settings.ORIGINALS_DIR)
+    Path(doc.thumbnail_path).touch()
+    with open(doc.source_path, "w") as f:
+        f.write(str(uuid.uuid4()))
+    with open(doc.source_path, "rb") as f:
+        doc.checksum = hashlib.md5(f.read()).hexdigest()
+
+    with open(doc.archive_path, "w") as f:
+        f.write(str(uuid.uuid4()))
+    with open(doc.archive_path, "rb") as f:
+        doc.archive_checksum = hashlib.md5(f.read()).hexdigest()
+
+    doc.save()
+
+    for i in range(30):
+        doc.title = str(random.randrange(1, 5))
+        doc.save()
+
+
+class TestSuperMassive(DirectoriesMixin, TestCase):
+
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    def test_super_massive(self):
+        # try to save as many documents in parallel as possible.
+        # try to make the system fail.
+
+        with ThreadPoolExecutor(max_workers=16) as executor:
+            results = [executor.submit(run) for i in range(16)]
+
+        for r in results:
+            if r.exception():
+                raise r.exception()
+
+        # nope, everything still good. Thank you, lockfiles.
+        self.assertEqual(len(check_sanity()), 0)

From 5753c83618a66c68b254499177cfac9354b7c517 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 8 Dec 2020 21:20:05 +0100
Subject: [PATCH 0089/1300] version bump

---
 docker/hub/docker-compose.postgres.yml | 2 +-
 docker/hub/docker-compose.sqlite.yml   | 2 +-
 src/paperless/version.py               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index 295d981e1..24f0e118f 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.5
+    image: jonaswinkler/paperless-ng:0.9.6
     restart: always
     depends_on:
       - db
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index 80df40596..6ae619fd6 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.5
+    image: jonaswinkler/paperless-ng:0.9.6
     restart: always
     depends_on:
       - broker
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 26e46fea8..527e0668d 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (0, 9, 5)
+__version__ = (0, 9, 6)

From 74a99cf33084a0688930f912cd5b2fedb938d527 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 9 Dec 2020 00:04:37 +0100
Subject: [PATCH 0090/1300] removed slugs entirely, since their only purpose
 was purely cosmetic anyway.

---
 src/documents/admin.py                        |  8 +-----
 src/documents/consumer.py                     |  2 +-
 .../management/commands/document_consumer.py  |  5 +---
 .../migrations/1006_auto_20201208_2209.py     | 25 +++++++++++++++++++
 src/documents/models.py                       | 11 ++------
 src/documents/serialisers.py                  | 19 +++++++++++---
 src/documents/signals/handlers.py             |  4 +--
 src/documents/tests/test_consumer.py          | 12 ++++-----
 src/paperless_mail/mail.py                    |  5 +---
 9 files changed, 55 insertions(+), 36 deletions(-)
 create mode 100644 src/documents/migrations/1006_auto_20201208_2209.py

diff --git a/src/documents/admin.py b/src/documents/admin.py
index 2a4fb0031..055a6fd93 100755
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -17,8 +17,6 @@ class CorrespondentAdmin(admin.ModelAdmin):
     list_filter = ("matching_algorithm",)
     list_editable = ("match", "matching_algorithm")
 
-    readonly_fields = ("slug",)
-
 
 class TagAdmin(admin.ModelAdmin):
 
@@ -31,8 +29,6 @@ class TagAdmin(admin.ModelAdmin):
     list_filter = ("colour", "matching_algorithm")
     list_editable = ("colour", "match", "matching_algorithm")
 
-    readonly_fields = ("slug", )
-
 
 class DocumentTypeAdmin(admin.ModelAdmin):
 
@@ -44,8 +40,6 @@ class DocumentTypeAdmin(admin.ModelAdmin):
     list_filter = ("matching_algorithm",)
     list_editable = ("match", "matching_algorithm")
 
-    readonly_fields = ("slug",)
-
 
 class DocumentAdmin(admin.ModelAdmin):
 
@@ -106,7 +100,7 @@ class DocumentAdmin(admin.ModelAdmin):
         for tag in obj.tags.all():
             r += self._html_tag(
                 "span",
-                tag.slug + ", "
+                tag.name + ", "
             )
         return r
 
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index f52dd5a7d..19ca3ed7e 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -259,7 +259,7 @@ class Consumer(LoggingMixin):
 
         relevant_tags = set(file_info.tags)
         if relevant_tags:
-            tag_names = ", ".join([t.slug for t in relevant_tags])
+            tag_names = ", ".join([t.name for t in relevant_tags])
             self.log("debug", "Tagging with {}".format(tag_names))
             document.tags.add(*relevant_tags)
 
diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index 5cecd6bf9..b2f689aed 100644
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -29,10 +29,7 @@ def _tags_from_path(filepath):
     path_parts = Path(filepath).relative_to(
                 settings.CONSUMPTION_DIR).parent.parts
     for part in path_parts:
-        tag_ids.add(Tag.objects.get_or_create(
-            slug=slugify(part),
-            defaults={"name": part},
-        )[0].pk)
+        tag_ids.add(Tag.objects.get_or_create(name=part)[0].pk)
 
     return tag_ids
 
diff --git a/src/documents/migrations/1006_auto_20201208_2209.py b/src/documents/migrations/1006_auto_20201208_2209.py
new file mode 100644
index 000000000..49f8c8dfe
--- /dev/null
+++ b/src/documents/migrations/1006_auto_20201208_2209.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.1.4 on 2020-12-08 22:09
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '1005_checksums'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='correspondent',
+            name='slug',
+        ),
+        migrations.RemoveField(
+            model_name='documenttype',
+            name='slug',
+        ),
+        migrations.RemoveField(
+            model_name='tag',
+            name='slug',
+        ),
+    ]
diff --git a/src/documents/models.py b/src/documents/models.py
index 366cb215d..f0678a843 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -36,7 +36,6 @@ class MatchingModel(models.Model):
     )
 
     name = models.CharField(max_length=128, unique=True)
-    slug = models.SlugField(blank=True, editable=False)
 
     match = models.CharField(max_length=256, blank=True)
     matching_algorithm = models.PositiveIntegerField(
@@ -69,7 +68,6 @@ class MatchingModel(models.Model):
     def save(self, *args, **kwargs):
 
         self.match = self.match.lower()
-        self.slug = slugify(self.name)
 
         models.Model.save(self, *args, **kwargs)
 
@@ -384,9 +382,7 @@ class FileInfo:
     def _get_correspondent(cls, name):
         if not name:
             return None
-        return Correspondent.objects.get_or_create(name=name, defaults={
-            "slug": slugify(name)
-        })[0]
+        return Correspondent.objects.get_or_create(name=name)[0]
 
     @classmethod
     def _get_title(cls, title):
@@ -396,10 +392,7 @@ class FileInfo:
     def _get_tags(cls, tags):
         r = []
         for t in tags.split(","):
-            r.append(Tag.objects.get_or_create(
-                slug=slugify(t),
-                defaults={"name": t}
-            )[0])
+            r.append(Tag.objects.get_or_create(name=t)[0])
         return tuple(r)
 
     @classmethod
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 5aedeeb58..600645061 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -1,4 +1,5 @@
 import magic
+from django.utils.text import slugify
 from pathvalidate import validate_filename, ValidationError
 from rest_framework import serializers
 from rest_framework.fields import SerializerMethodField
@@ -7,12 +8,16 @@ from .models import Correspondent, Tag, Document, Log, DocumentType
 from .parsers import is_mime_type_supported
 
 
-class CorrespondentSerializer(serializers.HyperlinkedModelSerializer):
+class CorrespondentSerializer(serializers.ModelSerializer):
 
     document_count = serializers.IntegerField(read_only=True)
 
     last_correspondence = serializers.DateTimeField(read_only=True)
 
+    def get_slug(self, obj):
+        return slugify(obj.name)
+    slug = SerializerMethodField()
+
     class Meta:
         model = Correspondent
         fields = (
@@ -27,10 +32,14 @@ class CorrespondentSerializer(serializers.HyperlinkedModelSerializer):
         )
 
 
-class DocumentTypeSerializer(serializers.HyperlinkedModelSerializer):
+class DocumentTypeSerializer(serializers.ModelSerializer):
 
     document_count = serializers.IntegerField(read_only=True)
 
+    def get_slug(self, obj):
+        return slugify(obj.name)
+    slug = SerializerMethodField()
+
     class Meta:
         model = DocumentType
         fields = (
@@ -44,10 +53,14 @@ class DocumentTypeSerializer(serializers.HyperlinkedModelSerializer):
         )
 
 
-class TagSerializer(serializers.HyperlinkedModelSerializer):
+class TagSerializer(serializers.ModelSerializer):
 
     document_count = serializers.IntegerField(read_only=True)
 
+    def get_slug(self, obj):
+        return slugify(obj.name)
+    slug = SerializerMethodField()
+
     class Meta:
         model = Tag
         fields = (
diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 8a9ce18d7..8121072bf 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -136,7 +136,7 @@ def set_tags(sender,
 
     message = 'Tagging "{}" with "{}"'
     logger(
-        message.format(document, ", ".join([t.slug for t in relevant_tags])),
+        message.format(document, ", ".join([t.name for t in relevant_tags])),
         logging_group
     )
 
@@ -165,7 +165,7 @@ def run_post_consume_script(sender, document, **kwargs):
         reverse("document-download", kwargs={"pk": document.pk}),
         reverse("document-thumb", kwargs={"pk": document.pk}),
         str(document.correspondent),
-        str(",".join(document.tags.all().values_list("slug", flat=True)))
+        str(",".join(document.tags.all().values_list("name", flat=True)))
     )).wait()
 
 
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index f828d3e11..b4b19be4c 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -27,7 +27,7 @@ class TestAttributes(TestCase):
 
         self.assertEqual(file_info.title, title, filename)
 
-        self.assertEqual(tuple([t.slug for t in file_info.tags]), tags, filename)
+        self.assertEqual(tuple([t.name for t in file_info.tags]), tags, filename)
 
     def test_guess_attributes_from_name0(self):
         self._test_guess_attributes_from_name(
@@ -188,7 +188,7 @@ class TestFieldPermutations(TestCase):
             self.assertEqual(info.tags, (), filename)
         else:
             self.assertEqual(
-                [t.slug for t in info.tags], tags.split(','),
+                [t.name for t in info.tags], tags.split(','),
                 filename
             )
 
@@ -342,8 +342,8 @@ class TestFieldPermutations(TestCase):
             info = FileInfo.from_filename(filename)
             self.assertEqual(info.title, "0001")
             self.assertEqual(len(info.tags), 2)
-            self.assertEqual(info.tags[0].slug, "tag1")
-            self.assertEqual(info.tags[1].slug, "tag2")
+            self.assertEqual(info.tags[0].name, "tag1")
+            self.assertEqual(info.tags[1].name, "tag2")
             self.assertIsNone(info.created)
 
         # Complex transformation with date in replacement string
@@ -356,8 +356,8 @@ class TestFieldPermutations(TestCase):
             info = FileInfo.from_filename(filename)
             self.assertEqual(info.title, "0001")
             self.assertEqual(len(info.tags), 2)
-            self.assertEqual(info.tags[0].slug, "tag1")
-            self.assertEqual(info.tags[1].slug, "tag2")
+            self.assertEqual(info.tags[0].name, "tag1")
+            self.assertEqual(info.tags[1].name, "tag2")
             self.assertEqual(info.created.year, 2019)
             self.assertEqual(info.created.month, 9)
             self.assertEqual(info.created.day, 8)
diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
index 08f7365da..a82c34f15 100644
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@ -103,10 +103,7 @@ class MailAccountHandler(LoggingMixin):
 
     def _correspondent_from_name(self, name):
         try:
-            return Correspondent.objects.get_or_create(
-                name=name, defaults={
-                    "slug": slugify(name)
-                })[0]
+            return Correspondent.objects.get_or_create(name=name)[0]
         except DatabaseError as e:
             self.log(
                 "error",

From 0a0d462938032f70d7dcc4485474f8311475e40f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 9 Dec 2020 00:07:22 +0100
Subject: [PATCH 0091/1300] tags from folders: case insensitive

---
 src/documents/management/commands/document_consumer.py | 4 +++-
 src/documents/tests/test_management_consumer.py        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index b2f689aed..8ac60aa6d 100644
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -29,7 +29,9 @@ def _tags_from_path(filepath):
     path_parts = Path(filepath).relative_to(
                 settings.CONSUMPTION_DIR).parent.parts
     for part in path_parts:
-        tag_ids.add(Tag.objects.get_or_create(name=part)[0].pk)
+        tag_ids.add(Tag.objects.get_or_create(name__iexact=part, defaults={
+            "name": part
+        })[0].pk)
 
     return tag_ids
 
diff --git a/src/documents/tests/test_management_consumer.py b/src/documents/tests/test_management_consumer.py
index 6973fdacf..b6a61a167 100644
--- a/src/documents/tests/test_management_consumer.py
+++ b/src/documents/tests/test_management_consumer.py
@@ -230,7 +230,7 @@ class TestConsumerTags(DirectoriesMixin, ConsumerMixin, TransactionTestCase):
 
         tag_names = ("existingTag", "Space Tag")
         # Create a Tag prior to consuming a file using it in path
-        tag_ids = [Tag.objects.create(name=tag_names[0]).pk,]
+        tag_ids = [Tag.objects.create(name="existingtag").pk,]
 
         self.t_start()
 

From 72706a335da809122c886576f50df4528c15c75f Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Sun, 6 Dec 2020 23:30:51 +0100
Subject: [PATCH 0092/1300] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bd6080d35..a8fb1f8e9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,3 +24,7 @@ feature-X branches is for experimental stuff that will eventually be merged into
 I'm trying to get most of paperless tested, so please do the same for your code! I know its a hassle, but it makes sure that your code works now and will allow us to detect regressions easily.
 
 To test your code, execute `pytest` in the src/ directory. Executing that in the project root is no good. This also generates a html coverage report, which you can use to see if you missed anything important during testing.
+
+## More info:
+
+... is available in the documentation. https://paperless-ng.readthedocs.io/en/latest/extending.html

From f3fd0fcf72f8009e9b67cf18319e37100a97f0bb Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 8 Dec 2020 23:08:02 -0800
Subject: [PATCH 0093/1300] Basic tags, correspondents & document type
 dropdowns

---
 src-ui/src/app/app.module.ts                  |  4 +-
 .../document-list.component.html              | 69 +++++++++++++++++--
 .../document-list/document-list.component.ts  | 30 ++++++--
 src-ui/src/app/pipes/filter.pipe.ts           | 17 +++++
 4 files changed, 107 insertions(+), 13 deletions(-)
 create mode 100644 src-ui/src/app/pipes/filter.pipe.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index ad12c9c47..af2c46492 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -48,6 +48,7 @@ import { WidgetFrameComponent } from './components/dashboard/widgets/widget-fram
 import { WelcomeWidgetComponent } from './components/dashboard/widgets/welcome-widget/welcome-widget.component';
 import { YesNoPipe } from './pipes/yes-no.pipe';
 import { FileSizePipe } from './pipes/file-size.pipe';
+import { FilterPipe } from './pipes/filter.pipe';
 
 @NgModule({
   declarations: [
@@ -88,7 +89,8 @@ import { FileSizePipe } from './pipes/file-size.pipe';
     WidgetFrameComponent,
     WelcomeWidgetComponent,
     YesNoPipe,
-    FileSizePipe
+    FileSizePipe,
+    FilterPipe
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 8608ed92b..886b5832a 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -1,5 +1,4 @@
 <app-page-header [title]="getTitle()">
-
   <div class="btn-group btn-group-toggle" ngbRadioGroup [(ngModel)]="displayMode"
     (ngModelChange)="saveDisplayMode()">
     <label ngbButtonLabel class="btn-outline-primary btn-sm">
@@ -21,6 +20,7 @@
       </svg>
     </label>
   </div>
+
   <div class="btn-group btn-group-toggle ml-2" ngbRadioGroup [(ngModel)]="list.sortDirection">
     <div ngbDropdown class="btn-group">
       <button class="btn btn-outline-primary btn-sm" id="dropdownBasic1" ngbDropdownToggle>Sort by</button>
@@ -42,13 +42,14 @@
       </svg>
     </label>
   </div>
+
   <div class="btn-group ml-2">
 
     <button type="button" class="btn btn-sm" [ngClass]="isFiltered ? 'btn-primary' : 'btn-outline-primary'" (click)="showFilter=!showFilter">
       <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#funnel" />
       </svg>
-      Filter
+      Advanced Filters
     </button>
 
     <div class="btn-group" ngbDropdown role="group">
@@ -58,18 +59,69 @@
           <button ngbDropdownItem *ngFor="let config of savedViewConfigService.getConfigs()" (click)="loadViewConfig(config)">{{config.title}}</button>
           <div class="dropdown-divider" *ngIf="savedViewConfigService.getConfigs().length > 0"></div>
         </ng-container>
-        
+
         <button ngbDropdownItem (click)="saveViewConfig()" *ngIf="list.savedViewId">Save "{{list.savedViewTitle}}"</button>
         <button ngbDropdownItem (click)="saveViewConfigAs()">Save as...</button>
       </div>
     </div>
 
   </div>
+
 </app-page-header>
 
+<div class="row pb-1 mb-3 align-items-right" >
+  <div class="btn-toolbar col-auto">
+    <div class="btn-group ml-2" ngbDropdown role="group">
+      <button class="btn btn-outline-primary btn-sm" id="dropdownTags" ngbDropdownToggle>Tags</button>
+      <div class="dropdown-menu" ngbDropdownMenu aria-labelledby="dropdownTags">
+        <div class="list-group list-group-flush">
+          <input class="list-group-item form-control" type="text" [(ngModel)]="searchText" placeholder="Filter tags">
+          <ng-container *ngIf="(tags | filter: searchText).length > 0">
+            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let tag of tags | filter: searchText; let i = index" (click)="filterByTag(tag.id, true)">
+              {{tag.name}}
+              <span class="badge bg-primary text-light rounded-pill">{{tag.document_count}}</span>
+            </button>
+          </ng-container>
+        </div>
+      </div>
+    </div>
+
+    <div class="btn-group ml-2" ngbDropdown role="group">
+      <button class="btn btn-outline-primary btn-sm" id="dropdownCorrespondents" ngbDropdownToggle>Correspondents</button>
+      <div class="dropdown-menu" ngbDropdownMenu aria-labelledby="dropdownCorrespondents">
+        <div class="list-group list-group-flush">
+          <input class="list-group-item form-control" type="text" [(ngModel)]="searchText" placeholder="Filter correspondents">
+          <ng-container *ngIf="(correspondents | filter: searchText).length > 0">
+            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let correspondent of correspondents | filter: searchText; let i = index" (click)="filterByCorrespondent(correspondent.id, true)">
+              {{correspondent.name}}
+              <span class="badge bg-primary text-light rounded-pill">{{correspondent.document_count}}</span>
+            </button>
+          </ng-container>
+        </div>
+      </div>
+    </div>
+
+    <div class="btn-group ml-2" ngbDropdown role="group">
+      <button class="btn btn-outline-primary btn-sm" id="dropdownDocumentTypes" ngbDropdownToggle>Document Types</button>
+      <div class="dropdown-menu" ngbDropdownMenu aria-labelledby="dropdownDocumentTypes">
+        <div class="list-group list-group-flush">
+          <input class="list-group-item form-control" type="text" [(ngModel)]="searchText" placeholder="Filter tags">
+          <ng-container *ngIf="(documentTypes | filter: searchText).length > 0">
+            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let documentType of documentTypes | filter: searchText; let i = index" (click)="filterByDocumentType(documentType.id, true)">
+              {{documentType.name}}
+              <span class="badge bg-primary text-light rounded-pill">{{documentType.document_count}}</span>
+            </button>
+          </ng-container>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</div>
+
 <div class="card w-100 mb-3" [hidden]="!showFilter">
   <div class="card-body">
-    <h5 class="card-title">Filter</h5>
+    <h5 class="card-title">Advanced Filters</h5>
     <app-filter-editor [(filterRules)]="filterRules" (apply)="applyFilterRules()" (clear)="clearFilterRules()"></app-filter-editor>
   </div>
 </div>
@@ -125,5 +177,12 @@
 
 
 <div class=" m-n2 row" *ngIf="displayMode == 'smallCards'">
-  <app-document-card-small [document]="d" *ngFor="let d of list.documents" (clickTag)="filterByTag($event)" (clickCorrespondent)="filterByCorrespondent($event)"></app-document-card-small>    
+  <app-document-card-small [document]="d" *ngFor="let d of list.documents" (clickTag)="filterByTag($event)" (clickCorrespondent)="filterByCorrespondent($event)"></app-document-card-small>
 </div>
+
+<script type="text/ng-template" id="customTemplate.html">
+  <a>
+      <img ng-src="http://upload.wikimedia.org/wikipedia/commons/thumb/{{match.model.flag}}" width="16">
+      <span ng-bind-html="match.label | uibTypeaheadHighlight:query"></span>
+  </a>
+</script>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 09e73dd96..9870f3dc1 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -11,6 +11,12 @@ import { SavedViewConfigService } from 'src/app/services/saved-view-config.servi
 import { Toast, ToastService } from 'src/app/services/toast.service';
 import { environment } from 'src/environments/environment';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
+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';
+import { TagService } from 'src/app/services/rest/tag.service';
+import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
+import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 
 @Component({
   selector: 'app-document-list',
@@ -25,13 +31,20 @@ export class DocumentListComponent implements OnInit {
     public route: ActivatedRoute,
     private toastService: ToastService,
     public modalService: NgbModal,
-    private titleService: Title) { }
+    private titleService: Title,
+    private tagService: TagService,
+    private correspondentService: CorrespondentService,
+    private documentTypeService: DocumentTypeService) { }
 
   displayMode = 'smallCards' // largeCards, smallCards, details
 
   filterRules: FilterRule[] = []
   showFilter = false
 
+  tags: PaperlessTag[] = []
+  correspondents: PaperlessCorrespondent[] = []
+  documentTypes: PaperlessDocumentType[] = []
+
   get isFiltered() {
     return this.list.filterRules?.length > 0
   }
@@ -67,6 +80,9 @@ export class DocumentListComponent implements OnInit {
       this.list.clear()
       this.list.reload()
     })
+    this.tagService.listAll().subscribe(result => this.tags = result.results)
+    this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
+    this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
   }
 
   applyFilterRules() {
@@ -103,8 +119,8 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
-  filterByTag(tag_id: number) {
-    let filterRules = this.list.filterRules
+  filterByTag(tag_id: number, singleton: boolean = false) {
+    let filterRules = singleton ? [] : this.list.filterRules
     if (filterRules.find(rule => rule.type.id == FILTER_HAS_TAG && rule.value == tag_id)) {
       return
     }
@@ -114,8 +130,8 @@ export class DocumentListComponent implements OnInit {
     this.applyFilterRules()
   }
 
-  filterByCorrespondent(correspondent_id: number) {
-    let filterRules = this.list.filterRules
+  filterByCorrespondent(correspondent_id: number, singleton: boolean = false) {
+    let filterRules = singleton ? [] : this.list.filterRules
     let existing_rule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT)
     if (existing_rule && existing_rule.value == correspondent_id) {
       return
@@ -128,8 +144,8 @@ export class DocumentListComponent implements OnInit {
     this.applyFilterRules()
   }
 
-  filterByDocumentType(document_type_id: number) {
-    let filterRules = this.list.filterRules
+  filterByDocumentType(document_type_id: number, singleton: boolean = false) {
+    let filterRules = singleton ? [] : this.list.filterRules
     let existing_rule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE)
     if (existing_rule && existing_rule.value == document_type_id) {
       return
diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts
new file mode 100644
index 000000000..f799f40cc
--- /dev/null
+++ b/src-ui/src/app/pipes/filter.pipe.ts
@@ -0,0 +1,17 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'filter'
+})
+export class FilterPipe implements PipeTransform {
+  transform(items: any[], searchText: string): any[] {
+    if (!items) return [];
+    if (!searchText) return items;
+
+    return items.filter(item => {
+      return Object.keys(item).some(key => {
+        return String(item[key]).toLowerCase().includes(searchText.toLowerCase());
+      });
+    });
+   }
+}

From 23ba3be68ff56f54abe8bba430d8fafa8ee25840 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 8 Dec 2020 23:39:38 -0800
Subject: [PATCH 0094/1300] Toggling of items

---
 .../document-list.component.html              | 15 ++++-
 .../document-list/document-list.component.ts  | 64 +++++++++++++++++--
 2 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 886b5832a..7c89517be 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -77,7 +77,10 @@
         <div class="list-group list-group-flush">
           <input class="list-group-item form-control" type="text" [(ngModel)]="searchText" placeholder="Filter tags">
           <ng-container *ngIf="(tags | filter: searchText).length > 0">
-            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let tag of tags | filter: searchText; let i = index" (click)="filterByTag(tag.id, true)">
+            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let tag of tags | filter: searchText; let i = index" (click)="toggleFilterByTag(tag.id)">
+              <svg *ngIf="currentViewIncludesTag(tag.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+              </svg>
               {{tag.name}}
               <span class="badge bg-primary text-light rounded-pill">{{tag.document_count}}</span>
             </button>
@@ -92,7 +95,10 @@
         <div class="list-group list-group-flush">
           <input class="list-group-item form-control" type="text" [(ngModel)]="searchText" placeholder="Filter correspondents">
           <ng-container *ngIf="(correspondents | filter: searchText).length > 0">
-            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let correspondent of correspondents | filter: searchText; let i = index" (click)="filterByCorrespondent(correspondent.id, true)">
+            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let correspondent of correspondents | filter: searchText; let i = index" (click)="toggleFilterByCorrespondent(correspondent.id)">
+              <svg *ngIf="currentViewIncludesCorrespondent(correspondent.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+              </svg>
               {{correspondent.name}}
               <span class="badge bg-primary text-light rounded-pill">{{correspondent.document_count}}</span>
             </button>
@@ -107,7 +113,10 @@
         <div class="list-group list-group-flush">
           <input class="list-group-item form-control" type="text" [(ngModel)]="searchText" placeholder="Filter tags">
           <ng-container *ngIf="(documentTypes | filter: searchText).length > 0">
-            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let documentType of documentTypes | filter: searchText; let i = index" (click)="filterByDocumentType(documentType.id, true)">
+            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let documentType of documentTypes | filter: searchText; let i = index" (click)="toggleFilterByDocumentType(documentType.id)">
+              <svg *ngIf="currentViewIncludesDocumentType(documentType.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+              </svg>
               {{documentType.name}}
               <span class="badge bg-primary text-light rounded-pill">{{documentType.document_count}}</span>
             </button>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 9870f3dc1..5e5134dc7 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -119,8 +119,8 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
-  filterByTag(tag_id: number, singleton: boolean = false) {
-    let filterRules = singleton ? [] : this.list.filterRules
+  filterByTag(tag_id: number) {
+    let filterRules = this.list.filterRules
     if (filterRules.find(rule => rule.type.id == FILTER_HAS_TAG && rule.value == tag_id)) {
       return
     }
@@ -130,8 +130,8 @@ export class DocumentListComponent implements OnInit {
     this.applyFilterRules()
   }
 
-  filterByCorrespondent(correspondent_id: number, singleton: boolean = false) {
-    let filterRules = singleton ? [] : this.list.filterRules
+  filterByCorrespondent(correspondent_id: number) {
+    let filterRules = this.list.filterRules
     let existing_rule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT)
     if (existing_rule && existing_rule.value == correspondent_id) {
       return
@@ -144,8 +144,8 @@ export class DocumentListComponent implements OnInit {
     this.applyFilterRules()
   }
 
-  filterByDocumentType(document_type_id: number, singleton: boolean = false) {
-    let filterRules = singleton ? [] : this.list.filterRules
+  filterByDocumentType(document_type_id: number) {
+    let filterRules = this.list.filterRules
     let existing_rule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE)
     if (existing_rule && existing_rule.value == document_type_id) {
       return
@@ -158,4 +158,56 @@ export class DocumentListComponent implements OnInit {
     this.applyFilterRules()
   }
 
+  findRuleIndex(type_id: number, value: any) {
+    return this.list.filterRules.findIndex(rule => rule.type.id == type_id && rule.value == value)
+  }
+
+  toggleFilterByTag(tag_id: number) {
+    let existingRuleIndex = this.findRuleIndex(FILTER_HAS_TAG, tag_id)
+    if (existingRuleIndex !== -1) {
+      let filterRules = this.list.filterRules
+      filterRules.splice(existingRuleIndex, 1)
+      this.filterRules = filterRules
+      this.applyFilterRules()
+    } else {
+      this.filterByTag(tag_id)
+    }
+  }
+
+  toggleFilterByCorrespondent(correspondent_id: number) {
+    let existingRuleIndex = this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id)
+    if (existingRuleIndex !== -1) {
+      let filterRules = this.list.filterRules
+      filterRules.splice(existingRuleIndex, 1)
+      this.filterRules = filterRules
+      this.applyFilterRules()
+    } else {
+      this.filterByCorrespondent(correspondent_id)
+    }
+  }
+
+  toggleFilterByDocumentType(document_type_id: number) {
+    let existingRuleIndex = this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id)
+    if (existingRuleIndex !== -1) {
+      let filterRules = this.list.filterRules
+      filterRules.splice(existingRuleIndex, 1)
+      this.filterRules = filterRules
+      this.applyFilterRules()
+    } else {
+      this.filterByDocumentType(document_type_id)
+    }
+  }
+
+  currentViewIncludesTag(tag_id: number) {
+    return this.findRuleIndex(FILTER_HAS_TAG, tag_id) !== -1
+  }
+
+  currentViewIncludesCorrespondent(correspondent_id: number) {
+    return this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id) !== -1
+  }
+
+  currentViewIncludesDocumentType(document_type_id: number) {
+    return this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) !== -1
+  }
+
 }

From da87542a5204db3244f2c270ac1ee82394110d71 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 8 Dec 2020 23:53:19 -0800
Subject: [PATCH 0095/1300] Change advanced to show / hide

---
 .../components/document-list/document-list.component.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 7c89517be..58fbbcbe8 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -49,13 +49,13 @@
       <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#funnel" />
       </svg>
-      Advanced Filters
+      {{ showFilter ? 'Hide' : 'Show' }} Filter Editor
     </button>
 
     <div class="btn-group" ngbDropdown role="group">
       <button class="btn btn-sm btn-outline-primary dropdown-toggle-split" ngbDropdownToggle></button>
       <div class="dropdown-menu" ngbDropdownMenu>
-        <ng-container *ngIf="!list.savedViewId" >
+        <ng-container *ngIf="!list.savedViewId">
           <button ngbDropdownItem *ngFor="let config of savedViewConfigService.getConfigs()" (click)="loadViewConfig(config)">{{config.title}}</button>
           <div class="dropdown-divider" *ngIf="savedViewConfigService.getConfigs().length > 0"></div>
         </ng-container>
@@ -69,7 +69,7 @@
 
 </app-page-header>
 
-<div class="row pb-1 mb-3 align-items-right" >
+<div class="row pb-1 mb-3 align-items-right">
   <div class="btn-toolbar col-auto">
     <div class="btn-group ml-2" ngbDropdown role="group">
       <button class="btn btn-outline-primary btn-sm" id="dropdownTags" ngbDropdownToggle>Tags</button>
@@ -130,7 +130,7 @@
 
 <div class="card w-100 mb-3" [hidden]="!showFilter">
   <div class="card-body">
-    <h5 class="card-title">Advanced Filters</h5>
+    <h5 class="card-title">Filter Editor</h5>
     <app-filter-editor [(filterRules)]="filterRules" (apply)="applyFilterRules()" (clear)="clearFilterRules()"></app-filter-editor>
   </div>
 </div>

From c28f19c9cfbcda0acd34a50ed5d28c74eb3ae974 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 8 Dec 2020 23:53:56 -0800
Subject: [PATCH 0096/1300] Quick filter styling

---
 .../components/document-list/document-list.component.html   | 6 +++---
 .../components/document-list/document-list.component.scss   | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 58fbbcbe8..f94c2be2c 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -73,7 +73,7 @@
   <div class="btn-toolbar col-auto">
     <div class="btn-group ml-2" ngbDropdown role="group">
       <button class="btn btn-outline-primary btn-sm" id="dropdownTags" ngbDropdownToggle>Tags</button>
-      <div class="dropdown-menu" ngbDropdownMenu aria-labelledby="dropdownTags">
+      <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownTags">
         <div class="list-group list-group-flush">
           <input class="list-group-item form-control" type="text" [(ngModel)]="searchText" placeholder="Filter tags">
           <ng-container *ngIf="(tags | filter: searchText).length > 0">
@@ -91,7 +91,7 @@
 
     <div class="btn-group ml-2" ngbDropdown role="group">
       <button class="btn btn-outline-primary btn-sm" id="dropdownCorrespondents" ngbDropdownToggle>Correspondents</button>
-      <div class="dropdown-menu" ngbDropdownMenu aria-labelledby="dropdownCorrespondents">
+      <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownCorrespondents">
         <div class="list-group list-group-flush">
           <input class="list-group-item form-control" type="text" [(ngModel)]="searchText" placeholder="Filter correspondents">
           <ng-container *ngIf="(correspondents | filter: searchText).length > 0">
@@ -109,7 +109,7 @@
 
     <div class="btn-group ml-2" ngbDropdown role="group">
       <button class="btn btn-outline-primary btn-sm" id="dropdownDocumentTypes" ngbDropdownToggle>Document Types</button>
-      <div class="dropdown-menu" ngbDropdownMenu aria-labelledby="dropdownDocumentTypes">
+      <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownDocumentTypes">
         <div class="list-group list-group-flush">
           <input class="list-group-item form-control" type="text" [(ngModel)]="searchText" placeholder="Filter tags">
           <ng-container *ngIf="(documentTypes | filter: searchText).length > 0">
diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss
index e69de29bb..2d6fc29ef 100644
--- a/src-ui/src/app/components/document-list/document-list.component.scss
+++ b/src-ui/src/app/components/document-list/document-list.component.scss
@@ -0,0 +1,4 @@
+.quick-filter {
+  min-width: 250px;
+  max-height: 400px;
+}

From 06a3fff2bc41edfe9b1bc204e0e09d95ce2fb963 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 8 Dec 2020 23:56:27 -0800
Subject: [PATCH 0097/1300] Refactor clashing filter variable

---
 .../document-list/document-list.component.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index f94c2be2c..672f7c9af 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -75,9 +75,9 @@
       <button class="btn btn-outline-primary btn-sm" id="dropdownTags" ngbDropdownToggle>Tags</button>
       <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownTags">
         <div class="list-group list-group-flush">
-          <input class="list-group-item form-control" type="text" [(ngModel)]="searchText" placeholder="Filter tags">
-          <ng-container *ngIf="(tags | filter: searchText).length > 0">
-            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let tag of tags | filter: searchText; let i = index" (click)="toggleFilterByTag(tag.id)">
+          <input class="list-group-item form-control" type="text" [(ngModel)]="filterTagsText" placeholder="Filter tags">
+          <ng-container *ngIf="(tags | filter: filterTagsText).length > 0">
+            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let tag of tags | filter: filterTagsText; let i = index" (click)="toggleFilterByTag(tag.id)">
               <svg *ngIf="currentViewIncludesTag(tag.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
               </svg>
@@ -93,9 +93,9 @@
       <button class="btn btn-outline-primary btn-sm" id="dropdownCorrespondents" ngbDropdownToggle>Correspondents</button>
       <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownCorrespondents">
         <div class="list-group list-group-flush">
-          <input class="list-group-item form-control" type="text" [(ngModel)]="searchText" placeholder="Filter correspondents">
-          <ng-container *ngIf="(correspondents | filter: searchText).length > 0">
-            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let correspondent of correspondents | filter: searchText; let i = index" (click)="toggleFilterByCorrespondent(correspondent.id)">
+          <input class="list-group-item form-control" type="text" [(ngModel)]="filterCorrespondentsText" placeholder="Filter correspondents">
+          <ng-container *ngIf="(correspondents | filter: filterCorrespondentsText).length > 0">
+            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let correspondent of correspondents | filter: filterCorrespondentsText; let i = index" (click)="toggleFilterByCorrespondent(correspondent.id)">
               <svg *ngIf="currentViewIncludesCorrespondent(correspondent.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
               </svg>
@@ -111,9 +111,9 @@
       <button class="btn btn-outline-primary btn-sm" id="dropdownDocumentTypes" ngbDropdownToggle>Document Types</button>
       <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownDocumentTypes">
         <div class="list-group list-group-flush">
-          <input class="list-group-item form-control" type="text" [(ngModel)]="searchText" placeholder="Filter tags">
-          <ng-container *ngIf="(documentTypes | filter: searchText).length > 0">
-            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let documentType of documentTypes | filter: searchText; let i = index" (click)="toggleFilterByDocumentType(documentType.id)">
+          <input class="list-group-item form-control" type="text" [(ngModel)]="filterDocumentTypesText" placeholder="Filter tags">
+          <ng-container *ngIf="(documentTypes | filter: filterDocumentTypesText).length > 0">
+            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let documentType of documentTypes | filter: filterDocumentTypesText; let i = index" (click)="toggleFilterByDocumentType(documentType.id)">
               <svg *ngIf="currentViewIncludesDocumentType(documentType.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
               </svg>

From 0d48aea3087610ee45f470bc890f2f2f99f7e59f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 8 Dec 2020 23:58:56 -0800
Subject: [PATCH 0098/1300] Label, visual tweaks

---
 .../app/components/document-list/document-list.component.html    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 672f7c9af..586ef8cfb 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -71,6 +71,7 @@
 
 <div class="row pb-1 mb-3 align-items-right">
   <div class="btn-toolbar col-auto">
+    <span class="text-muted mt-1 mr-2">Quick Filters:</span>
     <div class="btn-group ml-2" ngbDropdown role="group">
       <button class="btn btn-outline-primary btn-sm" id="dropdownTags" ngbDropdownToggle>Tags</button>
       <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownTags">

From 0f635d1bb2f51e6bbbe20cc4a00ec43e7ab9cfc2 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 9 Dec 2020 00:40:23 -0800
Subject: [PATCH 0099/1300] Clear button & visual tweaks

---
 .../document-list.component.html              | 49 ++++++++++++-------
 .../document-list.component.scss              |  5 ++
 .../document-list/document-list.component.ts  |  9 +++-
 3 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 586ef8cfb..c0f2332b4 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -78,12 +78,14 @@
         <div class="list-group list-group-flush">
           <input class="list-group-item form-control" type="text" [(ngModel)]="filterTagsText" placeholder="Filter tags">
           <ng-container *ngIf="(tags | filter: filterTagsText).length > 0">
-            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let tag of tags | filter: filterTagsText; let i = index" (click)="toggleFilterByTag(tag.id)">
-              <svg *ngIf="currentViewIncludesTag(tag.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
-              </svg>
-              {{tag.name}}
-              <span class="badge bg-primary text-light rounded-pill">{{tag.document_count}}</span>
+            <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let tag of tags | filter: filterTagsText; let i = index" (click)="toggleFilterByTag(tag.id)">
+              <div class="selected-icon mr-1">
+                <svg *ngIf="currentViewIncludesTag(tag.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                  <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+                </svg>
+              </div>
+              <div>{{tag.name}}</div>
+              <div class="badge bg-primary text-light rounded-pill ml-auto">{{tag.document_count}}</div>
             </button>
           </ng-container>
         </div>
@@ -96,12 +98,14 @@
         <div class="list-group list-group-flush">
           <input class="list-group-item form-control" type="text" [(ngModel)]="filterCorrespondentsText" placeholder="Filter correspondents">
           <ng-container *ngIf="(correspondents | filter: filterCorrespondentsText).length > 0">
-            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let correspondent of correspondents | filter: filterCorrespondentsText; let i = index" (click)="toggleFilterByCorrespondent(correspondent.id)">
-              <svg *ngIf="currentViewIncludesCorrespondent(correspondent.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
-              </svg>
-              {{correspondent.name}}
-              <span class="badge bg-primary text-light rounded-pill">{{correspondent.document_count}}</span>
+            <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let correspondent of correspondents | filter: filterCorrespondentsText; let i = index" (click)="toggleFilterByCorrespondent(correspondent.id)">
+              <div class="selected-icon mr-1">
+                <svg *ngIf="currentViewIncludesCorrespondent(correspondent.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                  <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+                </svg>
+              </div>
+              <div>{{correspondent.name}}</div>
+              <div class="badge bg-primary text-light rounded-pill ml-auto">{{correspondent.document_count}}</div>
             </button>
           </ng-container>
         </div>
@@ -114,18 +118,27 @@
         <div class="list-group list-group-flush">
           <input class="list-group-item form-control" type="text" [(ngModel)]="filterDocumentTypesText" placeholder="Filter tags">
           <ng-container *ngIf="(documentTypes | filter: filterDocumentTypesText).length > 0">
-            <button class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" role="menuitem" *ngFor="let documentType of documentTypes | filter: filterDocumentTypesText; let i = index" (click)="toggleFilterByDocumentType(documentType.id)">
-              <svg *ngIf="currentViewIncludesDocumentType(documentType.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
-              </svg>
-              {{documentType.name}}
-              <span class="badge bg-primary text-light rounded-pill">{{documentType.document_count}}</span>
+            <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let documentType of documentTypes | filter: filterDocumentTypesText; let i = index" (click)="toggleFilterByDocumentType(documentType.id)">
+              <div class="selected-icon mr-1">
+                <svg *ngIf="currentViewIncludesDocumentType(documentType.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                  <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+                </svg>
+              </div>
+              <div>{{documentType.name}}</div>
+              <div class="badge bg-primary text-light rounded-pill ml-auto">{{documentType.document_count}}</div>
             </button>
           </ng-container>
         </div>
       </div>
     </div>
 
+    <button class="btn-link border-0 bg-transparent ml-3 text-muted" *ngIf="currentViewIncludesQuickFilter()" (click)="filterEditor.clearClicked()">
+      <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+        <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+      </svg>
+      Clear
+    </button>
+
   </div>
 </div>
 
diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss
index 2d6fc29ef..ee3736d3d 100644
--- a/src-ui/src/app/components/document-list/document-list.component.scss
+++ b/src-ui/src/app/components/document-list/document-list.component.scss
@@ -1,4 +1,9 @@
 .quick-filter {
   min-width: 250px;
   max-height: 400px;
+
+  .selected-icon {
+    min-width: 1em;
+    min-height: 1em;
+  }
 }
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 5e5134dc7..22ee6ca2d 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -17,6 +17,7 @@ import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 import { TagService } from 'src/app/services/rest/tag.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
+import { FilterEditorComponent } from 'src/app/components/filter-editor/filter-editor.component';
 
 @Component({
   selector: 'app-document-list',
@@ -45,6 +46,8 @@ export class DocumentListComponent implements OnInit {
   correspondents: PaperlessCorrespondent[] = []
   documentTypes: PaperlessDocumentType[] = []
 
+  @ViewChild(FilterEditorComponent) filterEditor;
+  
   get isFiltered() {
     return this.list.filterRules?.length > 0
   }
@@ -210,4 +213,8 @@ export class DocumentListComponent implements OnInit {
     return this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) !== -1
   }
 
+  currentViewIncludesQuickFilter() {
+    return this.list.filterRules.find(rule => rule.type.id == FILTER_HAS_TAG || rule.type.id == FILTER_CORRESPONDENT || rule.type.id == FILTER_DOCUMENT_TYPE) !== undefined
+  }
+
 }

From 4fbb814e5bf822a624446911583fb4b1e26239c1 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 9 Dec 2020 01:25:04 -0800
Subject: [PATCH 0100/1300] Visual tweaks

---
 .../components/document-list/document-list.component.html   | 6 +++---
 .../components/document-list/document-list.component.scss   | 3 ++-
 .../app/components/document-list/document-list.component.ts | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index c0f2332b4..03ce515cd 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -84,7 +84,7 @@
                   <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
                 </svg>
               </div>
-              <div>{{tag.name}}</div>
+              <div class="mr-1">{{tag.name}}</div>
               <div class="badge bg-primary text-light rounded-pill ml-auto">{{tag.document_count}}</div>
             </button>
           </ng-container>
@@ -104,7 +104,7 @@
                   <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
                 </svg>
               </div>
-              <div>{{correspondent.name}}</div>
+              <div class="mr-1">{{correspondent.name}}</div>
               <div class="badge bg-primary text-light rounded-pill ml-auto">{{correspondent.document_count}}</div>
             </button>
           </ng-container>
@@ -124,7 +124,7 @@
                   <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
                 </svg>
               </div>
-              <div>{{documentType.name}}</div>
+              <div class="mr-1">{{documentType.name}}</div>
               <div class="badge bg-primary text-light rounded-pill ml-auto">{{documentType.document_count}}</div>
             </button>
           </ng-container>
diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss
index ee3736d3d..2513a1adc 100644
--- a/src-ui/src/app/components/document-list/document-list.component.scss
+++ b/src-ui/src/app/components/document-list/document-list.component.scss
@@ -1,7 +1,8 @@
 .quick-filter {
   min-width: 250px;
   max-height: 400px;
-
+  overflow-y: scroll;
+  
   .selected-icon {
     min-width: 1em;
     min-height: 1em;
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 22ee6ca2d..91ccfb082 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -45,6 +45,9 @@ export class DocumentListComponent implements OnInit {
   tags: PaperlessTag[] = []
   correspondents: PaperlessCorrespondent[] = []
   documentTypes: PaperlessDocumentType[] = []
+  filterTagsText: string
+  filterCorrespondentsText: string
+  filterDocumentTypesText: string
 
   @ViewChild(FilterEditorComponent) filterEditor;
   

From a4f7c5ddcb77028bc95cc5b80adde837f0ef2cb6 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 9 Dec 2020 01:34:09 -0800
Subject: [PATCH 0101/1300] Unused test code

---
 .../components/document-list/document-list.component.html  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 03ce515cd..767d207ae 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -202,10 +202,3 @@
 <div class=" m-n2 row" *ngIf="displayMode == 'smallCards'">
   <app-document-card-small [document]="d" *ngFor="let d of list.documents" (clickTag)="filterByTag($event)" (clickCorrespondent)="filterByCorrespondent($event)"></app-document-card-small>
 </div>
-
-<script type="text/ng-template" id="customTemplate.html">
-  <a>
-      <img ng-src="http://upload.wikimedia.org/wikipedia/commons/thumb/{{match.model.flag}}" width="16">
-      <span ng-bind-html="match.label | uibTypeaheadHighlight:query"></span>
-  </a>
-</script>

From ed236460b5bd0d3e2cd0f2de342ae547e90e4931 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 9 Dec 2020 01:36:33 -0800
Subject: [PATCH 0102/1300] Fix document type search field placeholder

---
 .../app/components/document-list/document-list.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 767d207ae..e36aa3571 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -116,7 +116,7 @@
       <button class="btn btn-outline-primary btn-sm" id="dropdownDocumentTypes" ngbDropdownToggle>Document Types</button>
       <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownDocumentTypes">
         <div class="list-group list-group-flush">
-          <input class="list-group-item form-control" type="text" [(ngModel)]="filterDocumentTypesText" placeholder="Filter tags">
+          <input class="list-group-item form-control" type="text" [(ngModel)]="filterDocumentTypesText" placeholder="Filter document types">
           <ng-container *ngIf="(documentTypes | filter: filterDocumentTypesText).length > 0">
             <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let documentType of documentTypes | filter: filterDocumentTypesText; let i = index" (click)="toggleFilterByDocumentType(documentType.id)">
               <div class="selected-icon mr-1">

From f0d86130eca3fb926b2e255cdea454acc5723883 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 9 Dec 2020 01:52:44 -0800
Subject: [PATCH 0103/1300] Use tag component for tag colors etc

---
 .../app/components/document-list/document-list.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index e36aa3571..96e13f935 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -84,7 +84,7 @@
                   <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
                 </svg>
               </div>
-              <div class="mr-1">{{tag.name}}</div>
+              <div class="mr-1"><app-tag [tag]="tag" [clickable]="true" linkTitle="Filter by tag"></app-tag></div>
               <div class="badge bg-primary text-light rounded-pill ml-auto">{{tag.document_count}}</div>
             </button>
           </ng-container>

From 2be0ba9f72f407eec35cad51b47c276fa2e3f917 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 9 Dec 2020 13:27:02 +0100
Subject: [PATCH 0104/1300] fixed test case. fixed bug with the decryption
 logic.

---
 .../management/commands/decrypt_documents.py     |  3 ++-
 src/documents/tests/test_management_archiver.py  | 16 +++++++---------
 src/documents/tests/test_management_decrypt.py   | 10 +++++-----
 src/documents/tests/test_management_exporter.py  | 12 +++++-------
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/documents/management/commands/decrypt_documents.py b/src/documents/management/commands/decrypt_documents.py
index 2287bfa72..918f1a175 100644
--- a/src/documents/management/commands/decrypt_documents.py
+++ b/src/documents/management/commands/decrypt_documents.py
@@ -82,7 +82,8 @@ class Command(BaseCommand):
             with open(document.thumbnail_path, "wb") as f:
                 f.write(raw_thumb)
 
-            document.save(update_fields=("storage_type", "filename"))
+            Document.objects.filter(id=document.id).update(
+                storage_type=document.storage_type, filename=document.filename)
 
             for path in old_paths:
                 os.unlink(path)
diff --git a/src/documents/tests/test_management_archiver.py b/src/documents/tests/test_management_archiver.py
index fdb588acf..0828f05ff 100644
--- a/src/documents/tests/test_management_archiver.py
+++ b/src/documents/tests/test_management_archiver.py
@@ -16,25 +16,23 @@ sample_file = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
 class TestArchiver(DirectoriesMixin, TestCase):
 
     def make_models(self):
-        self.d1 = Document.objects.create(checksum="A", title="A", content="first document", pk=1, mime_type="application/pdf")
-        #self.d2 = Document.objects.create(checksum="B", title="B", content="second document")
-        #self.d3 = Document.objects.create(checksum="C", title="C", content="unrelated document")
+        return Document.objects.create(checksum="A", title="A", content="first document", mime_type="application/pdf")
 
     def test_archiver(self):
 
-        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, "0000001.pdf"))
-        self.make_models()
+        doc = self.make_models()
+        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, f"{doc.id:07}.pdf"))
 
         call_command('document_archiver')
 
     def test_handle_document(self):
 
-        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, "0000001.pdf"))
-        self.make_models()
+        doc = self.make_models()
+        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, f"{doc.id:07}.pdf"))
 
-        handle_document(self.d1.pk)
+        handle_document(doc.pk)
 
-        doc = Document.objects.get(id=self.d1.id)
+        doc = Document.objects.get(id=doc.id)
 
         self.assertIsNotNone(doc.checksum)
         self.assertTrue(os.path.isfile(doc.archive_path))
diff --git a/src/documents/tests/test_management_decrypt.py b/src/documents/tests/test_management_decrypt.py
index f68ea7cc1..1d64b1105 100644
--- a/src/documents/tests/test_management_decrypt.py
+++ b/src/documents/tests/test_management_decrypt.py
@@ -35,20 +35,20 @@ class TestDecryptDocuments(TestCase):
             PASSPHRASE="test"
         ).enable()
 
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf.gpg"), os.path.join(originals_dir, "0000002.pdf.gpg"))
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000002.png.gpg"), os.path.join(thumb_dir, "0000002.png.gpg"))
+        doc = Document.objects.create(checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg",  mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
 
-        Document.objects.create(checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg", id=2, mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf.gpg"), os.path.join(originals_dir, "0000002.pdf.gpg"))
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", f"0000002.png.gpg"), os.path.join(thumb_dir, f"{doc.id:07}.png.gpg"))
 
         call_command('decrypt_documents')
 
-        doc = Document.objects.get(id=2)
+        doc.refresh_from_db()
 
         self.assertEqual(doc.storage_type, Document.STORAGE_TYPE_UNENCRYPTED)
         self.assertEqual(doc.filename, "0000002.pdf")
         self.assertTrue(os.path.isfile(os.path.join(originals_dir, "0000002.pdf")))
         self.assertTrue(os.path.isfile(doc.source_path))
-        self.assertTrue(os.path.isfile(os.path.join(thumb_dir, "0000002.png")))
+        self.assertTrue(os.path.isfile(os.path.join(thumb_dir, f"{doc.id:07}.png")))
         self.assertTrue(os.path.isfile(doc.thumbnail_path))
 
         with doc.source_file as f:
diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index ab9733dc4..22d6fc7f6 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -24,13 +24,14 @@ class TestExportImport(DirectoriesMixin, TestCase):
 
         file = os.path.join(self.dirs.originals_dir, "0000001.pdf")
 
-        Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow", filename="0000001.pdf", id=1, mime_type="application/pdf")
-        Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg", id=2, mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
+        Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow", filename="0000001.pdf", mime_type="application/pdf")
+        Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
         Tag.objects.create(name="t")
         DocumentType.objects.create(name="dt")
         Correspondent.objects.create(name="c")
 
         target = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, target)
 
         call_command('document_exporter', target)
 
@@ -66,9 +67,6 @@ class TestExportImport(DirectoriesMixin, TestCase):
     def test_export_missing_files(self):
 
         target = tempfile.mkdtemp()
-        Document.objects.create(checksum="AAAAAAAAAAAAAAAAA", title="wow", filename="0000004.pdf", id=3, mime_type="application/pdf")
+        self.addCleanup(shutil.rmtree, target)
+        Document.objects.create(checksum="AAAAAAAAAAAAAAAAA", title="wow", filename="0000004.pdf", mime_type="application/pdf")
         self.assertRaises(FileNotFoundError, call_command, 'document_exporter', target)
-
-    def test_duplicate_titles(self):
-        # TODO
-        pass

From 8ca97924be54974725ae26f7fe4768197c559262 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 9 Dec 2020 13:44:37 +0100
Subject: [PATCH 0105/1300] shadows

---
 .../app/components/common/input/tags/tags.component.html    | 2 +-
 .../widgets/widget-frame/widget-frame.component.html        | 2 +-
 .../document-detail/document-detail.component.html          | 2 +-
 .../components/document-list/document-list.component.html   | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html
index b2ad0944f..8029dd860 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.html
+++ b/src-ui/src/app/components/common/input/tags/tags.component.html
@@ -8,7 +8,7 @@
 
     <div class="input-group-append" ngbDropdown placement="top-right">
       <button class="btn btn-outline-secondary" type="button" ngbDropdownToggle></button>
-      <div ngbDropdownMenu class="scrollable-menu">
+      <div ngbDropdownMenu class="scrollable-menu shadow">
         <button type="button" *ngFor="let tag of tags" ngbDropdownItem (click)="addTag(tag.id)">
           <app-tag [tag]="tag"></app-tag>
         </button>
diff --git a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html
index d0f637935..1d7d2d906 100644
--- a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html
@@ -1,4 +1,4 @@
-<div class="card mb-3 shadow">
+<div class="card mb-3 shadow-sm">
   <div class="card-header">
     <div class="d-flex justify-content-between align-items-center">
       <h5 class="card-title mb-0">{{title}}</h5>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 9f4c72cdd..e0b5c6da9 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -17,7 +17,7 @@
 
         <div class="btn-group" ngbDropdown role="group" *ngIf="metadata?.has_archive_version">
             <button class="btn btn-sm btn-outline-primary dropdown-toggle-split" ngbDropdownToggle></button>
-            <div class="dropdown-menu" ngbDropdownMenu>
+            <div class="dropdown-menu shadow" ngbDropdownMenu>
                 <a ngbDropdownItem [href]="downloadOriginalUrl">Download original</a>
             </div>
         </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 8608ed92b..1a8c7a781 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -24,7 +24,7 @@
   <div class="btn-group btn-group-toggle ml-2" ngbRadioGroup [(ngModel)]="list.sortDirection">
     <div ngbDropdown class="btn-group">
       <button class="btn btn-outline-primary btn-sm" id="dropdownBasic1" ngbDropdownToggle>Sort by</button>
-      <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
+      <div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="shadow">
         <button *ngFor="let f of getSortFields()" ngbDropdownItem (click)="list.sortField = f.field"
           [class.active]="list.sortField == f.field">{{f.name}}</button>
       </div>
@@ -53,7 +53,7 @@
 
     <div class="btn-group" ngbDropdown role="group">
       <button class="btn btn-sm btn-outline-primary dropdown-toggle-split" ngbDropdownToggle></button>
-      <div class="dropdown-menu" ngbDropdownMenu>
+      <div class="dropdown-menu" ngbDropdownMenu class="shadow">
         <ng-container *ngIf="!list.savedViewId" >
           <button ngbDropdownItem *ngFor="let config of savedViewConfigService.getConfigs()" (click)="loadViewConfig(config)">{{config.title}}</button>
           <div class="dropdown-divider" *ngIf="savedViewConfigService.getConfigs().length > 0"></div>
@@ -85,7 +85,7 @@
   </app-document-card-large>
 </div>
 
-<table class="table table-sm border shadow" *ngIf="displayMode == 'details'">
+<table class="table table-sm border shadow-sm" *ngIf="displayMode == 'details'">
   <thead>
     <th class="d-none d-lg-table-cell">ASN</th>
     <th class="d-none d-md-table-cell">Correspondent</th>

From 6003122b0684450993efd7c82c7cace927473e08 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 9 Dec 2020 22:16:57 +0100
Subject: [PATCH 0106/1300] fixes #112

---
 src/documents/consumer.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 19ca3ed7e..e4da51f1d 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -248,7 +248,7 @@ class Consumer(LoggingMixin):
         with open(self.path, "rb") as f:
             document = Document.objects.create(
                 correspondent=file_info.correspondent,
-                title=file_info.title,
+                title=(self.override_title or file_info.title)[:127],
                 content=text,
                 mime_type=mime_type,
                 checksum=hashlib.md5(f.read()).hexdigest(),
@@ -265,12 +265,11 @@ class Consumer(LoggingMixin):
 
         self.apply_overrides(document)
 
+        document.save()
+
         return document
 
     def apply_overrides(self, document):
-        if self.override_title:
-            document.title = self.override_title
-
         if self.override_correspondent_id:
             document.correspondent = Correspondent.objects.get(
                 pk=self.override_correspondent_id)

From 70cbdbf23b026ce09c54e2fc3d4e832f80355c41 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 9 Dec 2020 22:17:17 +0100
Subject: [PATCH 0107/1300] locking media directory while deleting files

---
 src/documents/signals/handlers.py | 43 ++++++++++++++++---------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 8121072bf..4fbbe8f8a 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -171,29 +171,30 @@ def run_post_consume_script(sender, document, **kwargs):
 
 @receiver(models.signals.post_delete, sender=Document)
 def cleanup_document_deletion(sender, instance, using, **kwargs):
-    for f in (instance.source_path,
-              instance.archive_path,
-              instance.thumbnail_path):
-        if os.path.isfile(f):
-            try:
-                os.unlink(f)
-                logging.getLogger(__name__).debug(
-                    f"Deleted file {f}.")
-            except OSError as e:
-                logging.getLogger(__name__).warning(
-                    f"While deleting document {str(instance)}, the file "
-                    f"{f} could not be deleted: {e}"
-                )
+    with FileLock(settings.MEDIA_LOCK):
+        for f in (instance.source_path,
+                  instance.archive_path,
+                  instance.thumbnail_path):
+            if os.path.isfile(f):
+                try:
+                    os.unlink(f)
+                    logging.getLogger(__name__).debug(
+                        f"Deleted file {f}.")
+                except OSError as e:
+                    logging.getLogger(__name__).warning(
+                        f"While deleting document {str(instance)}, the file "
+                        f"{f} could not be deleted: {e}"
+                    )
 
-    delete_empty_directories(
-        os.path.dirname(instance.source_path),
-        root=settings.ORIGINALS_DIR
-    )
+        delete_empty_directories(
+            os.path.dirname(instance.source_path),
+            root=settings.ORIGINALS_DIR
+        )
 
-    delete_empty_directories(
-        os.path.dirname(instance.archive_path),
-        root=settings.ARCHIVE_DIR
-    )
+        delete_empty_directories(
+            os.path.dirname(instance.archive_path),
+            root=settings.ARCHIVE_DIR
+        )
 
 
 def validate_move(instance, old_path, new_path):

From 20c46278dcfcb00770b34476acd15f2245da0b0a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 9 Dec 2020 22:18:03 +0100
Subject: [PATCH 0108/1300] removed a janky test case that caused other test
 cases to fail

---
 src/documents/tests/test_file_handling.py | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index 6d407a7ab..719b0078a 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -3,7 +3,6 @@ import hashlib
 import os
 import random
 import uuid
-from concurrent.futures.thread import ThreadPoolExecutor
 from pathlib import Path
 from unittest import mock
 
@@ -15,7 +14,6 @@ from .utils import DirectoriesMixin
 from ..file_handling import generate_filename, create_source_path_directory, delete_empty_directories, \
     generate_unique_filename
 from ..models import Document, Correspondent
-from ..sanity_checker import check_sanity
 
 
 class TestFileHandling(DirectoriesMixin, TestCase):
@@ -573,21 +571,3 @@ def run():
     for i in range(30):
         doc.title = str(random.randrange(1, 5))
         doc.save()
-
-
-class TestSuperMassive(DirectoriesMixin, TestCase):
-
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
-    def test_super_massive(self):
-        # try to save as many documents in parallel as possible.
-        # try to make the system fail.
-
-        with ThreadPoolExecutor(max_workers=16) as executor:
-            results = [executor.submit(run) for i in range(16)]
-
-        for r in results:
-            if r.exception():
-                raise r.exception()
-
-        # nope, everything still good. Thank you, lockfiles.
-        self.assertEqual(len(check_sanity()), 0)

From 0b1b9de3cc925708cf3479974087418541602811 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 9 Dec 2020 22:38:52 +0100
Subject: [PATCH 0109/1300] layout fix

---
 .../document-card-small/document-card-small.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 95cf2e191..da469ebc4 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,6 +1,6 @@
 <div class="col p-2 h-100" style="width: 16rem;">
   <div class="card h-100 shadow-sm">
-    <div class=" border-bottom pr-1">
+    <div class="border-bottom">
       <img class="card-img doc-img" [src]="getThumbUrl()">
       <div style="top: 0; right: 0; font-size: large" class="text-right position-absolute mr-1">
         <div *ngFor="let t of getTagsLimited$() | async">

From 2b57b8065654800d3ddd86201210f7d091b4ba25 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 9 Dec 2020 23:45:53 +0100
Subject: [PATCH 0110/1300] fixes #113

---
 docker/docker-entrypoint.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index e2338842b..4832675ab 100644
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -114,13 +114,13 @@ install_languages() {
     done
 }
 
-initialize
-
 # Install additional languages if specified
 if [[ ! -z "$PAPERLESS_OCR_LANGUAGES"  ]]; then
 		install_languages "$PAPERLESS_OCR_LANGUAGES"
 fi
 
+initialize
+
 if [[ "$1" != "/"* ]]; then
 	exec sudo -HEu paperless python3 manage.py "$@"
 else

From 46c0ab943f22157378ea20243d093f6b8ae87ad1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 10 Dec 2020 00:02:45 +0100
Subject: [PATCH 0111/1300] added a progress bar to the reindex command.

---
 src/documents/tasks.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index 65d767efc..8c9b00dd6 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -1,5 +1,6 @@
 import logging
 
+import tqdm
 from django.conf import settings
 from whoosh.writing import AsyncWriter
 
@@ -23,7 +24,7 @@ def index_reindex():
     ix = index.open_index(recreate=True)
 
     with AsyncWriter(ix) as writer:
-        for document in documents:
+        for document in tqdm.tqdm(documents):
             index.update_document(writer, document)
 
 

From b3daf0efc33106f1e92122d5d50bf06d7596a84d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 10 Dec 2020 00:10:36 +0100
Subject: [PATCH 0112/1300] added progress bar to the document renamer.

---
 src/documents/management/commands/document_renamer.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/documents/management/commands/document_renamer.py b/src/documents/management/commands/document_renamer.py
index ba9e74de5..5d7d0d90c 100644
--- a/src/documents/management/commands/document_renamer.py
+++ b/src/documents/management/commands/document_renamer.py
@@ -1,3 +1,6 @@
+import logging
+
+import tqdm
 from django.core.management.base import BaseCommand
 
 from documents.models import Document
@@ -18,6 +21,8 @@ class Command(Renderable, BaseCommand):
 
         self.verbosity = options["verbosity"]
 
-        for document in Document.objects.all():
+        logging.getLogger().handlers[0].level = logging.ERROR
+
+        for document in tqdm.tqdm(Document.objects.all()):
             # Saving the document again will generate a new filename and rename
             document.save()

From 3f03cbf66c446ecb04ebea84491eb78d912a56aa Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 10 Dec 2020 00:29:47 +0100
Subject: [PATCH 0113/1300] excluded the lockfile from the sanity checker.

---
 src/documents/sanity_checker.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/documents/sanity_checker.py b/src/documents/sanity_checker.py
index e3c4b1aec..bc0b689d4 100644
--- a/src/documents/sanity_checker.py
+++ b/src/documents/sanity_checker.py
@@ -46,6 +46,10 @@ def check_sanity():
         for f in files:
             present_files.append(os.path.normpath(os.path.join(root, f)))
 
+    lockfile = os.path.normpath(settings.MEDIA_LOCK)
+    if lockfile in present_files:
+        present_files.remove(lockfile)
+
     for doc in Document.objects.all():
         # Check sanity of the thumbnail
         if not os.path.isfile(doc.thumbnail_path):

From 2df1894683ae3b4aa4a64e216436b31062332234 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 10 Dec 2020 00:30:35 +0100
Subject: [PATCH 0114/1300] changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 96578ac75..ce5cfe59a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -37,6 +37,7 @@ This release focusses primarily on many small issues with the UI.
     conserve the original correspondents, types and titles as much as possible.
   * The filename formatter does not include the document ID in filenames anymore. It will
     rather append ``_01``, ``_02``, etc when it detects duplicate filenames.
+  * The docker image was trying check for installed languages before actually installing them.
 
 .. note::
 

From 24d8a50f0174ff78fbbae9eda6eea0eca1fa80aa Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 10 Dec 2020 00:54:37 +0100
Subject: [PATCH 0115/1300] fixed an issue with the docker entrypoint script.

---
 docker/docker-entrypoint.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 4832675ab..13a0ba035 100644
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -25,6 +25,11 @@ wait_for_postgres() {
 	host="${PAPERLESS_DBHOST}"
 	port="${PAPERLESS_DBPORT}"
 
+	if [[ -z $port ]] ;
+	then
+		port="5432"
+	fi
+
 	while !</dev/tcp/$host/$port ;
 	do
 

From 69c6d682194708736818fe523b7e05f9234a3619 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 10 Dec 2020 00:59:03 +0100
Subject: [PATCH 0116/1300] a print() command somehow sneaked past my commit
 checks.

---
 src/documents/filters.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/documents/filters.py b/src/documents/filters.py
index 64ef826ce..b3c92eba3 100755
--- a/src/documents/filters.py
+++ b/src/documents/filters.py
@@ -51,7 +51,6 @@ class TagsFilter(Filter):
             return qs
 
         for tag_id in tag_ids:
-            print(self.exclude, tag_id)
             if self.exclude:
                 qs = qs.exclude(tags__id=tag_id)
             else:

From 476beacd7f9d5f28c9a437b8ed761e6e67f226ff Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 10 Dec 2020 01:12:30 +0100
Subject: [PATCH 0117/1300] changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ce5cfe59a..a50fc31d5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -32,12 +32,12 @@ This release focusses primarily on many small issues with the UI.
 * Other
 
   * Fixed an issue with the docker image when a non-standard PostgreSQL port was used.
+  * The docker image was trying check for installed languages before actually installing them.
   * ``FILENAME_FORMAT`` placeholder for document types.
   * The filename formatter is now less restrictive with file names and tries to
     conserve the original correspondents, types and titles as much as possible.
   * The filename formatter does not include the document ID in filenames anymore. It will
     rather append ``_01``, ``_02``, etc when it detects duplicate filenames.
-  * The docker image was trying check for installed languages before actually installing them.
 
 .. note::
 

From 3584f732a78ee2edfa125f0f4070dd1399f7c3d2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 10 Dec 2020 02:14:26 +0100
Subject: [PATCH 0118/1300] added another library that's required to get this
 running on raspberry pi

---
 docker/local/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index 461b9e4fc..d6e77da1d 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get update \
 		libpq-dev \
 		libqpdf-dev \
 		libxml2 \
+		libxslt-dev \
 		optipng \
 		pngquant \
 		qpdf \

From 0cc22017deb8695e45cb99fc49e587cdb87d438f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 10 Dec 2020 02:24:36 +0100
Subject: [PATCH 0119/1300] revert last commit.

---
 docker/local/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index d6e77da1d..461b9e4fc 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -20,7 +20,6 @@ RUN apt-get update \
 		libpq-dev \
 		libqpdf-dev \
 		libxml2 \
-		libxslt-dev \
 		optipng \
 		pngquant \
 		qpdf \

From fa5121082de93cb0971304d887cdb05a4bce81be Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 9 Dec 2020 23:12:51 -0800
Subject: [PATCH 0120/1300] Moved quick filters to filter editor

---
 .../document-list.component.html              |  85 +-----------
 .../document-list.component.scss              |  10 --
 .../document-list/document-list.component.ts  |  82 +-----------
 .../filter-editor.component.html              | 123 +++++++++++-------
 .../filter-editor.component.scss              |  10 ++
 .../filter-editor/filter-editor.component.ts  |  69 +++++++++-
 6 files changed, 154 insertions(+), 225 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 96e13f935..13e1718ce 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -45,15 +45,8 @@
 
   <div class="btn-group ml-2">
 
-    <button type="button" class="btn btn-sm" [ngClass]="isFiltered ? 'btn-primary' : 'btn-outline-primary'" (click)="showFilter=!showFilter">
-      <svg class="toolbaricon" fill="currentColor">
-        <use xlink:href="assets/bootstrap-icons.svg#funnel" />
-      </svg>
-      {{ showFilter ? 'Hide' : 'Show' }} Filter Editor
-    </button>
-
     <div class="btn-group" ngbDropdown role="group">
-      <button class="btn btn-sm btn-outline-primary dropdown-toggle-split" ngbDropdownToggle></button>
+      <button class="btn btn-sm btn-outline-primary dropdown-toggle" ngbDropdownToggle>Saved Views</button>
       <div class="dropdown-menu" ngbDropdownMenu>
         <ng-container *ngIf="!list.savedViewId">
           <button ngbDropdownItem *ngFor="let config of savedViewConfigService.getConfigs()" (click)="loadViewConfig(config)">{{config.title}}</button>
@@ -69,82 +62,8 @@
 
 </app-page-header>
 
-<div class="row pb-1 mb-3 align-items-right">
-  <div class="btn-toolbar col-auto">
-    <span class="text-muted mt-1 mr-2">Quick Filters:</span>
-    <div class="btn-group ml-2" ngbDropdown role="group">
-      <button class="btn btn-outline-primary btn-sm" id="dropdownTags" ngbDropdownToggle>Tags</button>
-      <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownTags">
-        <div class="list-group list-group-flush">
-          <input class="list-group-item form-control" type="text" [(ngModel)]="filterTagsText" placeholder="Filter tags">
-          <ng-container *ngIf="(tags | filter: filterTagsText).length > 0">
-            <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let tag of tags | filter: filterTagsText; let i = index" (click)="toggleFilterByTag(tag.id)">
-              <div class="selected-icon mr-1">
-                <svg *ngIf="currentViewIncludesTag(tag.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                  <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
-                </svg>
-              </div>
-              <div class="mr-1"><app-tag [tag]="tag" [clickable]="true" linkTitle="Filter by tag"></app-tag></div>
-              <div class="badge bg-primary text-light rounded-pill ml-auto">{{tag.document_count}}</div>
-            </button>
-          </ng-container>
-        </div>
-      </div>
-    </div>
-
-    <div class="btn-group ml-2" ngbDropdown role="group">
-      <button class="btn btn-outline-primary btn-sm" id="dropdownCorrespondents" ngbDropdownToggle>Correspondents</button>
-      <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownCorrespondents">
-        <div class="list-group list-group-flush">
-          <input class="list-group-item form-control" type="text" [(ngModel)]="filterCorrespondentsText" placeholder="Filter correspondents">
-          <ng-container *ngIf="(correspondents | filter: filterCorrespondentsText).length > 0">
-            <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let correspondent of correspondents | filter: filterCorrespondentsText; let i = index" (click)="toggleFilterByCorrespondent(correspondent.id)">
-              <div class="selected-icon mr-1">
-                <svg *ngIf="currentViewIncludesCorrespondent(correspondent.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                  <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
-                </svg>
-              </div>
-              <div class="mr-1">{{correspondent.name}}</div>
-              <div class="badge bg-primary text-light rounded-pill ml-auto">{{correspondent.document_count}}</div>
-            </button>
-          </ng-container>
-        </div>
-      </div>
-    </div>
-
-    <div class="btn-group ml-2" ngbDropdown role="group">
-      <button class="btn btn-outline-primary btn-sm" id="dropdownDocumentTypes" ngbDropdownToggle>Document Types</button>
-      <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownDocumentTypes">
-        <div class="list-group list-group-flush">
-          <input class="list-group-item form-control" type="text" [(ngModel)]="filterDocumentTypesText" placeholder="Filter document types">
-          <ng-container *ngIf="(documentTypes | filter: filterDocumentTypesText).length > 0">
-            <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let documentType of documentTypes | filter: filterDocumentTypesText; let i = index" (click)="toggleFilterByDocumentType(documentType.id)">
-              <div class="selected-icon mr-1">
-                <svg *ngIf="currentViewIncludesDocumentType(documentType.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                  <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
-                </svg>
-              </div>
-              <div class="mr-1">{{documentType.name}}</div>
-              <div class="badge bg-primary text-light rounded-pill ml-auto">{{documentType.document_count}}</div>
-            </button>
-          </ng-container>
-        </div>
-      </div>
-    </div>
-
-    <button class="btn-link border-0 bg-transparent ml-3 text-muted" *ngIf="currentViewIncludesQuickFilter()" (click)="filterEditor.clearClicked()">
-      <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-        <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
-      </svg>
-      Clear
-    </button>
-
-  </div>
-</div>
-
-<div class="card w-100 mb-3" [hidden]="!showFilter">
+<div class="card w-100 mb-3">
   <div class="card-body">
-    <h5 class="card-title">Filter Editor</h5>
     <app-filter-editor [(filterRules)]="filterRules" (apply)="applyFilterRules()" (clear)="clearFilterRules()"></app-filter-editor>
   </div>
 </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss
index 2513a1adc..e69de29bb 100644
--- a/src-ui/src/app/components/document-list/document-list.component.scss
+++ b/src-ui/src/app/components/document-list/document-list.component.scss
@@ -1,10 +0,0 @@
-.quick-filter {
-  min-width: 250px;
-  max-height: 400px;
-  overflow-y: scroll;
-  
-  .selected-icon {
-    min-width: 1em;
-    min-height: 1em;
-  }
-}
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 91ccfb082..d6b7c1d29 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -14,9 +14,6 @@ import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-vi
 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';
-import { TagService } from 'src/app/services/rest/tag.service';
-import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
-import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { FilterEditorComponent } from 'src/app/components/filter-editor/filter-editor.component';
 
 @Component({
@@ -32,25 +29,12 @@ export class DocumentListComponent implements OnInit {
     public route: ActivatedRoute,
     private toastService: ToastService,
     public modalService: NgbModal,
-    private titleService: Title,
-    private tagService: TagService,
-    private correspondentService: CorrespondentService,
-    private documentTypeService: DocumentTypeService) { }
+    private titleService: Title) { }
 
   displayMode = 'smallCards' // largeCards, smallCards, details
 
   filterRules: FilterRule[] = []
-  showFilter = false
 
-  tags: PaperlessTag[] = []
-  correspondents: PaperlessCorrespondent[] = []
-  documentTypes: PaperlessDocumentType[] = []
-  filterTagsText: string
-  filterCorrespondentsText: string
-  filterDocumentTypesText: string
-
-  @ViewChild(FilterEditorComponent) filterEditor;
-  
   get isFiltered() {
     return this.list.filterRules?.length > 0
   }
@@ -75,20 +59,15 @@ export class DocumentListComponent implements OnInit {
       if (params.has('id')) {
         this.list.savedView = this.savedViewConfigService.getConfig(params.get('id'))
         this.filterRules = this.list.filterRules
-        this.showFilter = false
         this.titleService.setTitle(`${this.list.savedView.title} - ${environment.appTitle}`)
       } else {
         this.list.savedView = null
         this.filterRules = this.list.filterRules
-        this.showFilter = this.filterRules.length > 0
         this.titleService.setTitle(`Documents - ${environment.appTitle}`)
       }
       this.list.clear()
       this.list.reload()
     })
-    this.tagService.listAll().subscribe(result => this.tags = result.results)
-    this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
-    this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
   }
 
   applyFilterRules() {
@@ -97,7 +76,6 @@ export class DocumentListComponent implements OnInit {
 
   clearFilterRules() {
     this.list.filterRules = this.filterRules
-    this.showFilter = false
   }
 
   loadViewConfig(config: SavedViewConfig) {
@@ -164,60 +142,4 @@ export class DocumentListComponent implements OnInit {
     this.applyFilterRules()
   }
 
-  findRuleIndex(type_id: number, value: any) {
-    return this.list.filterRules.findIndex(rule => rule.type.id == type_id && rule.value == value)
-  }
-
-  toggleFilterByTag(tag_id: number) {
-    let existingRuleIndex = this.findRuleIndex(FILTER_HAS_TAG, tag_id)
-    if (existingRuleIndex !== -1) {
-      let filterRules = this.list.filterRules
-      filterRules.splice(existingRuleIndex, 1)
-      this.filterRules = filterRules
-      this.applyFilterRules()
-    } else {
-      this.filterByTag(tag_id)
-    }
-  }
-
-  toggleFilterByCorrespondent(correspondent_id: number) {
-    let existingRuleIndex = this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id)
-    if (existingRuleIndex !== -1) {
-      let filterRules = this.list.filterRules
-      filterRules.splice(existingRuleIndex, 1)
-      this.filterRules = filterRules
-      this.applyFilterRules()
-    } else {
-      this.filterByCorrespondent(correspondent_id)
-    }
-  }
-
-  toggleFilterByDocumentType(document_type_id: number) {
-    let existingRuleIndex = this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id)
-    if (existingRuleIndex !== -1) {
-      let filterRules = this.list.filterRules
-      filterRules.splice(existingRuleIndex, 1)
-      this.filterRules = filterRules
-      this.applyFilterRules()
-    } else {
-      this.filterByDocumentType(document_type_id)
-    }
-  }
-
-  currentViewIncludesTag(tag_id: number) {
-    return this.findRuleIndex(FILTER_HAS_TAG, tag_id) !== -1
-  }
-
-  currentViewIncludesCorrespondent(correspondent_id: number) {
-    return this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id) !== -1
-  }
-
-  currentViewIncludesDocumentType(document_type_id: number) {
-    return this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) !== -1
-  }
-
-  currentViewIncludesQuickFilter() {
-    return this.list.filterRules.find(rule => rule.type.id == FILTER_HAS_TAG || rule.type.id == FILTER_CORRESPONDENT || rule.type.id == FILTER_DOCUMENT_TYPE) !== undefined
-  }
-
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 48780e950..925b216bd 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -1,52 +1,83 @@
-<div *ngFor="let rule of filterRules" class="form-row form-group">
-  <div class="col-md-3 col-form-label">
-    <span>{{rule.type.name}}</span>
+<div class="form-row form-group mb-0">
+  <div class="col-auto">
+    <div class="text-muted mt-1">Filter by:</div>
   </div>
   <div class="col">
-    <input *ngIf="rule.type.datatype == 'string'" type="text" class="form-control form-control-sm" [(ngModel)]="rule.value">
-    <input *ngIf="rule.type.datatype == 'number'" type="number" class="form-control form-control-sm" [(ngModel)]="rule.value">
-    <input *ngIf="rule.type.datatype == 'date'" type="date" class="form-control form-control-sm" [(ngModel)]="rule.value">
-
-    <select *ngIf="rule.type.datatype == 'tag'" class="form-control form-control-sm" [(ngModel)]="rule.value">
-      <option *ngFor="let t of tags" [ngValue]="t.id">{{t.name}}</option>
-    </select>
-
-    <select *ngIf="rule.type.datatype == 'document_type'" class="form-control form-control-sm" [(ngModel)]="rule.value">
-      <option *ngFor="let dt of documentTypes" [ngValue]="dt.id">{{dt.name}}</option>
-    </select>
-
-    <select *ngIf="rule.type.datatype == 'correspondent'" class="form-control form-control-sm" [(ngModel)]="rule.value">
-      <option *ngFor="let c of correspondents" [ngValue]="c.id">{{c.name}}</option>
-    </select>
-
-    <select *ngIf="rule.type.datatype == 'boolean'" class="form-control form-control-sm" [(ngModel)]="rule.value">
-      <option [ngValue]="true">Yes</option>
-      <option [ngValue]="false">No</option>
-    </select>
-
+    <input class="form-control form-control-sm" type="text" placeholder="Title / content">
   </div>
-  <div class="col-auto">
-    <button class="btn btn-sm btn-outline-secondary" (click)="removeRuleClicked(rule)">
-      <svg class="toolbaricon" fill="currentColor">
-        <use xlink:href="assets/bootstrap-icons.svg#x"/>
-      </svg>
-    </button>
+
+  <div class="btn-group col-auto" ngbDropdown role="group">
+    <button class="btn btn-outline-primary btn-sm" id="dropdownTags" ngbDropdownToggle>Tags</button>
+    <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownTags">
+      <div class="list-group list-group-flush">
+        <input class="list-group-item form-control" type="text" [(ngModel)]="filterTagsText" placeholder="Filter tags">
+        <ng-container *ngIf="(tags | filter: filterTagsText).length > 0">
+          <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let tag of tags | filter: filterTagsText; let i = index" (click)="toggleFilterByTag(tag.id)">
+            <div class="selected-icon mr-1">
+              <svg *ngIf="currentViewIncludesTag(tag.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+              </svg>
+            </div>
+            <div class="mr-1"><app-tag [tag]="tag" [clickable]="true" linkTitle="Filter by tag"></app-tag></div>
+            <div class="badge bg-primary text-light rounded-pill ml-auto">{{tag.document_count}}</div>
+          </button>
+        </ng-container>
+      </div>
+    </div>
+  </div>
+
+  <div class="btn-group col-auto" ngbDropdown role="group">
+    <button class="btn btn-outline-primary btn-sm" id="dropdownCorrespondents" ngbDropdownToggle>Correspondents</button>
+    <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownCorrespondents">
+      <div class="list-group list-group-flush">
+        <input class="list-group-item form-control" type="text" [(ngModel)]="filterCorrespondentsText" placeholder="Filter correspondents">
+        <ng-container *ngIf="(correspondents | filter: filterCorrespondentsText).length > 0">
+          <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let correspondent of correspondents | filter: filterCorrespondentsText; let i = index" (click)="toggleFilterByCorrespondent(correspondent.id)">
+            <div class="selected-icon mr-1">
+              <svg *ngIf="currentViewIncludesCorrespondent(correspondent.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+              </svg>
+            </div>
+            <div class="mr-1">{{correspondent.name}}</div>
+            <div class="badge bg-primary text-light rounded-pill ml-auto">{{correspondent.document_count}}</div>
+          </button>
+        </ng-container>
+      </div>
+    </div>
+  </div>
+
+  <div class="btn-group col-auto" ngbDropdown role="group">
+    <button class="btn btn-outline-primary btn-sm" id="dropdownDocumentTypes" ngbDropdownToggle>Document Types</button>
+    <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownDocumentTypes">
+      <div class="list-group list-group-flush">
+        <input class="list-group-item form-control" type="text" [(ngModel)]="filterDocumentTypesText" placeholder="Filter document types">
+        <ng-container *ngIf="(documentTypes | filter: filterDocumentTypesText).length > 0">
+          <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let documentType of documentTypes | filter: filterDocumentTypesText; let i = index" (click)="toggleFilterByDocumentType(documentType.id)">
+            <div class="selected-icon mr-1">
+              <svg *ngIf="currentViewIncludesDocumentType(documentType.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+              </svg>
+            </div>
+            <div class="mr-1">{{documentType.name}}</div>
+            <div class="badge bg-primary text-light rounded-pill ml-auto">{{documentType.document_count}}</div>
+          </button>
+        </ng-container>
+      </div>
+    </div>
+  </div>
+
+  <div class="btn-group col-auto" ngbDropdown role="group">
+    <button class="btn btn-outline-primary btn-sm" id="dropdownCreated" ngbDropdownToggle>Created</button>
+  </div>
+
+  <div class="btn-group col-auto" ngbDropdown role="group">
+    <button class="btn btn-outline-primary btn-sm" id="dropdownAdded" ngbDropdownToggle>Added</button>
   </div>
 </div>
 
-<div class="form-row form-group">
-  <div class="col">
-    <select [(ngModel)]="selectedRuleType" class="form-control form-control-sm">
-      <option *ngFor="let ruleType of getRuleTypes()" [ngValue]="ruleType">{{ruleType.name}}</option>
-    </select>
-  </div>
-  <div class="col-auto">
-    <button (click)="newRuleClicked()" class="btn btn-sm btn-outline-secondary">Add</button>
-  </div>
-  <div class="col-auto">
-    <button (click)="clearClicked()" class="btn btn-sm btn-outline-secondary">Clear</button>
-  </div>
-  <div class="col-auto">
-    <button (click)="applyClicked()" class="btn btn-sm btn-outline-secondary">Apply</button>
-  </div>
-</div>
+<button class="btn-link border-0 bg-transparent ml-3 text-muted" *ngIf="hasFilters()" (click)="clearClicked()">
+  <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+  </svg>
+  Clear
+</button>
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.scss b/src-ui/src/app/components/filter-editor/filter-editor.component.scss
index e69de29bb..05df7b213 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.scss
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.scss
@@ -0,0 +1,10 @@
+.quick-filter {
+  min-width: 250px;
+  max-height: 400px;
+  overflow-y: scroll;
+
+  .selected-icon {
+    min-width: 1em;
+    min-height: 1em;
+  }
+}
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index b04127287..ac0133f16 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FilterRule } from 'src/app/data/filter-rule';
-import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
+import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 import { PaperlessTag } from 'src/app/data/paperless-tag';
@@ -27,15 +27,16 @@ export class FilterEditorComponent implements OnInit {
   @Output()
   apply = new EventEmitter()
 
-  selectedRuleType: FilterRuleType = FILTER_RULE_TYPES[0]
-
   correspondents: PaperlessCorrespondent[] = []
   tags: PaperlessTag[] = []
   documentTypes: PaperlessDocumentType[] = []
 
+  filterTagsText: string
+  filterCorrespondentsText: string
+  filterDocumentTypesText: string
+
   newRuleClicked() {
     this.filterRules.push({type: this.selectedRuleType, value: this.selectedRuleType.default})
-    this.selectedRuleType = this.getRuleTypes().length > 0 ? this.getRuleTypes()[0] : null
   }
 
   removeRuleClicked(rule) {
@@ -54,14 +55,70 @@ export class FilterEditorComponent implements OnInit {
     this.clear.next()
   }
 
+  hasFilters() {
+    return this.filterRules.length > 0
+  }
+
   ngOnInit(): void {
     this.correspondentService.listAll().subscribe(result => {this.correspondents = result.results})
     this.tagService.listAll().subscribe(result => this.tags = result.results)
     this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
   }
 
-  getRuleTypes() {
-    return FILTER_RULE_TYPES.filter(rt => rt.multi || !this.filterRules.find(r => r.type == rt))
+  findRuleIndex(type_id: number, value: any) {
+    return this.filterRules.findIndex(rule => rule.type.id == type_id && rule.value == value)
+  }
+
+  toggleFilterByTag(tag_id: number) {
+    let existingRuleIndex = this.findRuleIndex(FILTER_HAS_TAG, tag_id)
+    if (existingRuleIndex !== -1) {
+      let filterRules = this.filterRules
+      filterRules.splice(existingRuleIndex, 1)
+      this.filterRules = filterRules
+      this.applyFilterRules()
+    } else {
+      this.filterByTag(tag_id)
+    }
+  }
+
+  toggleFilterByCorrespondent(correspondent_id: number) {
+    let existingRuleIndex = this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id)
+    if (existingRuleIndex !== -1) {
+      let filterRules = this.filterRules
+      filterRules.splice(existingRuleIndex, 1)
+      this.filterRules = filterRules
+      this.applyFilterRules()
+    } else {
+      this.filterByCorrespondent(correspondent_id)
+    }
+  }
+
+  toggleFilterByDocumentType(document_type_id: number) {
+    let existingRuleIndex = this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id)
+    if (existingRuleIndex !== -1) {
+      let filterRules = this.filterRules
+      filterRules.splice(existingRuleIndex, 1)
+      this.filterRules = filterRules
+      this.applyFilterRules()
+    } else {
+      this.filterByDocumentType(document_type_id)
+    }
+  }
+
+  currentViewIncludesTag(tag_id: number) {
+    return this.findRuleIndex(FILTER_HAS_TAG, tag_id) !== -1
+  }
+
+  currentViewIncludesCorrespondent(correspondent_id: number) {
+    return this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id) !== -1
+  }
+
+  currentViewIncludesDocumentType(document_type_id: number) {
+    return this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) !== -1
+  }
+
+  currentViewIncludesQuickFilter() {
+    return this.filterRules.find(rule => rule.type.id == FILTER_HAS_TAG || rule.type.id == FILTER_CORRESPONDENT || rule.type.id == FILTER_DOCUMENT_TYPE) !== undefined
   }
 
 }

From ab8a1cfded4c442965991f90c1639368b9dd70e0 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 10 Dec 2020 00:46:13 -0800
Subject: [PATCH 0121/1300] Working moved dropdowns

---
 .../document-list/document-list.component.ts  | 45 +--------------
 .../filter-editor.component.html              | 14 ++---
 .../filter-editor/filter-editor.component.ts  | 55 ++++++++-----------
 3 files changed, 33 insertions(+), 81 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index d6b7c1d29..3fb933fb7 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -11,10 +11,6 @@ import { SavedViewConfigService } from 'src/app/services/saved-view-config.servi
 import { Toast, ToastService } from 'src/app/services/toast.service';
 import { environment } from 'src/environments/environment';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
-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';
-import { FilterEditorComponent } from 'src/app/components/filter-editor/filter-editor.component';
 
 @Component({
   selector: 'app-document-list',
@@ -71,6 +67,8 @@ export class DocumentListComponent implements OnInit {
   }
 
   applyFilterRules() {
+    console.log('applyFilterRules');
+
     this.list.filterRules = this.filterRules
   }
 
@@ -103,43 +101,4 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
-  filterByTag(tag_id: number) {
-    let filterRules = this.list.filterRules
-    if (filterRules.find(rule => rule.type.id == FILTER_HAS_TAG && rule.value == tag_id)) {
-      return
-    }
-
-    filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_HAS_TAG), value: tag_id})
-    this.filterRules = filterRules
-    this.applyFilterRules()
-  }
-
-  filterByCorrespondent(correspondent_id: number) {
-    let filterRules = this.list.filterRules
-    let existing_rule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT)
-    if (existing_rule && existing_rule.value == correspondent_id) {
-      return
-    } else if (existing_rule) {
-      existing_rule.value = correspondent_id
-    } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_CORRESPONDENT), value: correspondent_id})
-    }
-    this.filterRules = filterRules
-    this.applyFilterRules()
-  }
-
-  filterByDocumentType(document_type_id: number) {
-    let filterRules = this.list.filterRules
-    let existing_rule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE)
-    if (existing_rule && existing_rule.value == document_type_id) {
-      return
-    } else if (existing_rule) {
-      existing_rule.value = document_type_id
-    } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_DOCUMENT_TYPE), value: document_type_id})
-    }
-    this.filterRules = filterRules
-    this.applyFilterRules()
-  }
-
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 925b216bd..756110d13 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -73,11 +73,11 @@
   <div class="btn-group col-auto" ngbDropdown role="group">
     <button class="btn btn-outline-primary btn-sm" id="dropdownAdded" ngbDropdownToggle>Added</button>
   </div>
-</div>
 
-<button class="btn-link border-0 bg-transparent ml-3 text-muted" *ngIf="hasFilters()" (click)="clearClicked()">
-  <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
-  </svg>
-  Clear
-</button>
+  <button class="btn btn-outline-secondary btn-sm" [disabled]="!hasFilters()" (click)="clearSelected()">
+    <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+      <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+    </svg>
+    Clear all filters
+  </button>
+</div>
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index ac0133f16..f4dc7162b 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -35,22 +35,11 @@ export class FilterEditorComponent implements OnInit {
   filterCorrespondentsText: string
   filterDocumentTypesText: string
 
-  newRuleClicked() {
-    this.filterRules.push({type: this.selectedRuleType, value: this.selectedRuleType.default})
-  }
-
-  removeRuleClicked(rule) {
-    let index = this.filterRules.findIndex(r => r == rule)
-    if (index > -1) {
-      this.filterRules.splice(index, 1)
-    }
-  }
-
-  applyClicked() {
+  applySelected() {
     this.apply.next()
   }
 
-  clearClicked() {
+  clearSelected() {
     this.filterRules.splice(0,this.filterRules.length)
     this.clear.next()
   }
@@ -71,38 +60,42 @@ export class FilterEditorComponent implements OnInit {
 
   toggleFilterByTag(tag_id: number) {
     let existingRuleIndex = this.findRuleIndex(FILTER_HAS_TAG, tag_id)
+    let filterRules = this.filterRules
     if (existingRuleIndex !== -1) {
-      let filterRules = this.filterRules
       filterRules.splice(existingRuleIndex, 1)
-      this.filterRules = filterRules
-      this.applyFilterRules()
     } else {
-      this.filterByTag(tag_id)
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_HAS_TAG), value: tag_id})
     }
+    this.filterRules = filterRules
+    this.applySelected()
   }
 
   toggleFilterByCorrespondent(correspondent_id: number) {
-    let existingRuleIndex = this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id)
-    if (existingRuleIndex !== -1) {
-      let filterRules = this.filterRules
-      filterRules.splice(existingRuleIndex, 1)
-      this.filterRules = filterRules
-      this.applyFilterRules()
+    let filterRules = this.filterRules
+    let existingRule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT)
+    if (existingRule && existingRule.value == correspondent_id) {
+      return
+    } else if (existingRule) {
+      existingRule.value = correspondent_id
     } else {
-      this.filterByCorrespondent(correspondent_id)
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_CORRESPONDENT), value: correspondent_id})
     }
+    this.filterRules = filterRules
+    this.applySelected()
   }
 
   toggleFilterByDocumentType(document_type_id: number) {
-    let existingRuleIndex = this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id)
-    if (existingRuleIndex !== -1) {
-      let filterRules = this.filterRules
-      filterRules.splice(existingRuleIndex, 1)
-      this.filterRules = filterRules
-      this.applyFilterRules()
+    let filterRules = this.filterRules
+    let existingRule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE)
+    if (existingRule && existingRule.value == document_type_id) {
+      return
+    } else if (existingRule) {
+      existingRule.value = document_type_id
     } else {
-      this.filterByDocumentType(document_type_id)
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_DOCUMENT_TYPE), value: document_type_id})
     }
+    this.filterRules = filterRules
+    this.applySelected()
   }
 
   currentViewIncludesTag(tag_id: number) {

From 25e1177198eb6d62c3af0b0b2d7edea16c4432b5 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 10 Dec 2020 01:42:40 -0800
Subject: [PATCH 0122/1300] Title filtering

---
 .../document-list/document-list.component.ts  |  2 -
 .../filter-editor.component.html              |  2 +-
 .../filter-editor/filter-editor.component.ts  | 48 +++++++++++++++++--
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 3fb933fb7..3ce00beab 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -67,8 +67,6 @@ export class DocumentListComponent implements OnInit {
   }
 
   applyFilterRules() {
-    console.log('applyFilterRules');
-
     this.list.filterRules = this.filterRules
   }
 
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 756110d13..586e23a98 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -3,7 +3,7 @@
     <div class="text-muted mt-1">Filter by:</div>
   </div>
   <div class="col">
-    <input class="form-control form-control-sm" type="text" placeholder="Title / content">
+    <input class="form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Title" #filterTextInput>
   </div>
 
   <div class="btn-group col-auto" ngbDropdown role="group">
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index f4dc7162b..e470a8400 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -1,20 +1,21 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ElementRef, AfterViewInit, ViewChild } from '@angular/core';
 import { FilterRule } from 'src/app/data/filter-rule';
-import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
+import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 import { PaperlessTag } from 'src/app/data/paperless-tag';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { TagService } from 'src/app/services/rest/tag.service';
-
+import { fromEvent } from 'rxjs';
+import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
 
 @Component({
   selector: 'app-filter-editor',
   templateUrl: './filter-editor.component.html',
   styleUrls: ['./filter-editor.component.scss']
 })
-export class FilterEditorComponent implements OnInit {
+export class FilterEditorComponent implements OnInit, AfterViewInit {
 
   constructor(private documentTypeService: DocumentTypeService, private tagService: TagService, private correspondentService: CorrespondentService) { }
 
@@ -27,10 +28,13 @@ export class FilterEditorComponent implements OnInit {
   @Output()
   apply = new EventEmitter()
 
+  @ViewChild('filterTextInput') input: ElementRef;
+
   correspondents: PaperlessCorrespondent[] = []
   tags: PaperlessTag[] = []
   documentTypes: PaperlessDocumentType[] = []
 
+  filterText: string
   filterTagsText: string
   filterCorrespondentsText: string
   filterDocumentTypesText: string
@@ -41,6 +45,7 @@ export class FilterEditorComponent implements OnInit {
 
   clearSelected() {
     this.filterRules.splice(0,this.filterRules.length)
+    this.updateTextFilterInput()
     this.clear.next()
   }
 
@@ -52,12 +57,47 @@ export class FilterEditorComponent implements OnInit {
     this.correspondentService.listAll().subscribe(result => {this.correspondents = result.results})
     this.tagService.listAll().subscribe(result => this.tags = result.results)
     this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
+    this.updateTextFilterInput()
+  }
+
+  ngAfterViewInit() {
+    fromEvent(this.input.nativeElement,'keyup')
+        .pipe(
+            debounceTime(150),
+            distinctUntilChanged(),
+            tap()
+        )
+        .subscribe(event => {
+          this.filterText = event.target.value
+          this.onTextFilterInput()
+        });
   }
 
   findRuleIndex(type_id: number, value: any) {
     return this.filterRules.findIndex(rule => rule.type.id == type_id && rule.value == value)
   }
 
+  updateTextFilterInput() {
+    let existingTextRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
+    if (existingTextRule) this.filterText = existingTextRule.value
+    else this.filterText = ''
+  }
+
+  onTextFilterInput(event) {
+    let text = this.filterText
+    let filterRules = this.filterRules
+    let existingRule = filterRules.find(rule => rule.type.id == FILTER_TITLE)
+    if (existingRule && existingRule.value == text) {
+      return
+    } else if (existingRule) {
+      existingRule.value = text
+    } else {
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_TITLE), value: text})
+    }
+    this.filterRules = filterRules
+    this.applySelected()
+  }
+
   toggleFilterByTag(tag_id: number) {
     let existingRuleIndex = this.findRuleIndex(FILTER_HAS_TAG, tag_id)
     let filterRules = this.filterRules

From 2f7bb01f3494175ef480b47d7e3ba5be7fab16a0 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 10 Dec 2020 14:57:53 +0100
Subject: [PATCH 0123/1300] moved metadata extraction to the parsers

---
 src/documents/parsers.py           |  4 ++++
 src/documents/views.py             | 36 +++++++-----------------------
 src/paperless_tesseract/parsers.py | 28 +++++++++++++++++++++++
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index 36ede3cce..228e2c86e 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -210,6 +210,7 @@ class DocumentParser(LoggingMixin):
     def __init__(self, logging_group):
         super().__init__()
         self.logging_group = logging_group
+        os.makedirs(settings.SCRATCH_DIR, exist_ok=True)
         self.tempdir = tempfile.mkdtemp(
             prefix="paperless-", dir=settings.SCRATCH_DIR)
 
@@ -217,6 +218,9 @@ class DocumentParser(LoggingMixin):
         self.text = None
         self.date = None
 
+    def extract_metadata(self, document_path, mime_type):
+        return []
+
     def parse(self, document_path, mime_type):
         raise NotImplementedError()
 
diff --git a/src/documents/views.py b/src/documents/views.py
index 8dbb61dc7..b42ae1f96 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -1,11 +1,8 @@
-import logging
 import os
-import re
 import tempfile
 from datetime import datetime
 from time import mktime
 
-import pikepdf
 from django.conf import settings
 from django.db.models import Count, Max
 from django.http import HttpResponse, HttpResponseBadRequest, Http404
@@ -42,6 +39,7 @@ from .filters import (
     LogFilterSet
 )
 from .models import Correspondent, Document, Log, Tag, DocumentType
+from .parsers import get_parser_class_for_mime_type
 from .serialisers import (
     CorrespondentSerializer,
     DocumentSerializer,
@@ -163,34 +161,16 @@ class DocumentViewSet(RetrieveModelMixin,
             disposition, filename)
         return response
 
-    def get_metadata(self, file, type):
+    def get_metadata(self, file, mime_type):
         if not os.path.isfile(file):
             return None
 
-        namespace_pattern = re.compile(r"\{(.*)\}(.*)")
-
-        result = []
-        if type == 'application/pdf':
-            pdf = pikepdf.open(file)
-            meta = pdf.open_metadata()
-            for key, value in meta.items():
-                if isinstance(value, list):
-                    value = " ".join([str(e) for e in value])
-                value = str(value)
-                try:
-                    m = namespace_pattern.match(key)
-                    result.append({
-                        "namespace": m.group(1),
-                        "prefix": meta.REVERSE_NS[m.group(1)],
-                        "key": m.group(2),
-                        "value": value
-                    })
-                except Exception as e:
-                    logging.getLogger(__name__).warning(
-                        f"Error while reading metadata {key}: {value}. Error: "
-                        f"{e}"
-                    )
-        return result
+        parser_class = get_parser_class_for_mime_type(mime_type)
+        if parser_class:
+            parser = parser_class(logging_group=None)
+            return parser.extract_metadata(file, mime_type)
+        else:
+            return []
 
     @action(methods=['get'], detail=True)
     def metadata(self, request, pk=None):
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index ebd706cdd..1cf6a769c 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -5,6 +5,7 @@ import subprocess
 
 import ocrmypdf
 import pdftotext
+import pikepdf
 from PIL import Image
 from django.conf import settings
 from ocrmypdf import InputFileError, EncryptedPdfError
@@ -18,6 +19,33 @@ class RasterisedDocumentParser(DocumentParser):
     image, whether it's a PDF, or other graphical format (JPEG, TIFF, etc.)
     """
 
+    def extract_metadata(self, document_path, mime_type):
+        namespace_pattern = re.compile(r"\{(.*)\}(.*)")
+
+        result = []
+        if mime_type == 'application/pdf':
+            pdf = pikepdf.open(document_path)
+            meta = pdf.open_metadata()
+            for key, value in meta.items():
+                if isinstance(value, list):
+                    value = " ".join([str(e) for e in value])
+                value = str(value)
+                try:
+                    m = namespace_pattern.match(key)
+                    result.append({
+                        "namespace": m.group(1),
+                        "prefix": meta.REVERSE_NS[m.group(1)],
+                        "key": m.group(2),
+                        "value": value
+                    })
+                except Exception as e:
+                    self.log(
+                        "warning",
+                        f"Error while reading metadata {key}: {value}. Error: "
+                        f"{e}"
+                    )
+        return result
+
     def get_thumbnail(self, document_path, mime_type):
         """
         The thumbnail of a PDF is just a 500px wide image of the first page.

From defa80d05ac264df2cbbd8d2485d2d7a999a19c5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 10 Dec 2020 16:25:27 +0100
Subject: [PATCH 0124/1300] fixes #91

---
 src/documents/serialisers.py    |  7 -------
 src/documents/tests/test_api.py | 10 ----------
 2 files changed, 17 deletions(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 600645061..db0e610d1 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -1,6 +1,5 @@
 import magic
 from django.utils.text import slugify
-from pathvalidate import validate_filename, ValidationError
 from rest_framework import serializers
 from rest_framework.fields import SerializerMethodField
 
@@ -179,12 +178,6 @@ class PostDocumentSerializer(serializers.Serializer):
     )
 
     def validate_document(self, document):
-
-        try:
-            validate_filename(document.name)
-        except ValidationError:
-            raise serializers.ValidationError("Invalid filename.")
-
         document_data = document.file.read()
         mime_type = magic.from_buffer(document_data, mime=True)
 
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 572667406..ab1716366 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -403,16 +403,6 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 400)
         m.assert_not_called()
 
-    @mock.patch("documents.views.async_task")
-    @mock.patch("documents.serialisers.validate_filename")
-    def test_upload_invalid_filename(self, validate_filename, async_task):
-        validate_filename.side_effect = ValidationError()
-        with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
-            response = self.client.post("/api/documents/post_document/", {"document": f})
-        self.assertEqual(response.status_code, 400)
-
-        async_task.assert_not_called()
-
     @mock.patch("documents.views.async_task")
     def test_upload_with_title(self, async_task):
         with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:

From 3a82b7806ac229b7c943de4b6aa02ec023ad863b Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Thu, 10 Dec 2020 16:28:02 +0100
Subject: [PATCH 0125/1300] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e754669a8..41f85af19 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ Here's what you get:
 # Features
 
 * Performs OCR on your documents, adds selectable text to image only documents and adds tags, correspondents and document types to your documents.
+* Paperless stores your documents plain on disk. Filenames and folders are managed by paperless and can be configured freely.
 * Single page application front end. Should be pretty snappy. Will be mobile friendly in the future.
 	* Includes a dashboard that shows basic statistics and has document upload.
 	* Filtering by tags, correspondents, types, and more.

From edcb62476bdc2683066089c35e35290be8e6c9cb Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 10 Dec 2020 09:13:26 -0800
Subject: [PATCH 0126/1300] Remove clear button outline

---
 .../app/components/filter-editor/filter-editor.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 586e23a98..5e2077116 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -74,7 +74,7 @@
     <button class="btn btn-outline-primary btn-sm" id="dropdownAdded" ngbDropdownToggle>Added</button>
   </div>
 
-  <button class="btn btn-outline-secondary btn-sm" [disabled]="!hasFilters()" (click)="clearSelected()">
+  <button class="btn btn-link btn-sm" [disabled]="!hasFilters()" (click)="clearSelected()">
     <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
       <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
     </svg>

From 9a189546869a5b877ed845decf7cce5771674f5e Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 10 Dec 2020 09:24:07 -0800
Subject: [PATCH 0127/1300] Fix unused method event parameter

---
 .../app/components/filter-editor/filter-editor.component.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index e470a8400..ac89d9b88 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -67,8 +67,8 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
             distinctUntilChanged(),
             tap()
         )
-        .subscribe(event => {
-          this.filterText = event.target.value
+        .subscribe((event: Event) => {
+          this.filterText = (event.target as HTMLInputElement).value
           this.onTextFilterInput()
         });
   }
@@ -83,7 +83,7 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
     else this.filterText = ''
   }
 
-  onTextFilterInput(event) {
+  onTextFilterInput() {
     let text = this.filterText
     let filterRules = this.filterRules
     let existingRule = filterRules.find(rule => rule.type.id == FILTER_TITLE)

From db02d68a5a89272e4d30caf8e74065991a9cca48 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 10 Dec 2020 14:41:37 -0800
Subject: [PATCH 0128/1300] Refactored dropdowns to separate component

---
 src-ui/src/app/app.module.ts                  |   2 +
 .../filter-dropdown.component.html            |  19 +++
 .../filter-dropdown.component.scss            |  10 ++
 .../filter-dropdown.component.spec.ts         |  25 ++++
 .../filter-dropdown.component.ts              |  34 ++++++
 .../filter-editor.component.html              |  63 +---------
 .../filter-editor/filter-editor.component.ts  | 109 +++++++-----------
 src-ui/src/app/data/filter-rule-type.ts       |  20 ++--
 8 files changed, 146 insertions(+), 136 deletions(-)
 create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
 create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
 create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.spec.ts
 create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index af2c46492..6a847494a 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -28,6 +28,7 @@ import { PageHeaderComponent } from './components/common/page-header/page-header
 import { AppFrameComponent } from './components/app-frame/app-frame.component';
 import { ToastsComponent } from './components/common/toasts/toasts.component';
 import { FilterEditorComponent } from './components/filter-editor/filter-editor.component';
+import { FilterDropdownComponent } from './components/filter-editor/filter-dropdown/filter-dropdown.component';
 import { DocumentCardLargeComponent } from './components/document-list/document-card-large/document-card-large.component';
 import { DocumentCardSmallComponent } from './components/document-list/document-card-small/document-card-small.component';
 import { NgxFileDropModule } from 'ngx-file-drop';
@@ -74,6 +75,7 @@ import { FilterPipe } from './pipes/filter.pipe';
     AppFrameComponent,
     ToastsComponent,
     FilterEditorComponent,
+    FilterDropdownComponent,
     DocumentCardLargeComponent,
     DocumentCardSmallComponent,
     TextComponent,
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
new file mode 100644
index 000000000..b135caff0
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -0,0 +1,19 @@
+  <div class="btn-group" ngbDropdown role="group">
+  <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>{{title}}</button>
+  <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdown{{title}}">
+    <div class="list-group list-group-flush">
+      <input class="list-group-item form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}">
+      <ng-container *ngIf="(items | filter: filterText).length > 0">
+        <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let item of items | filter: filterText; let i = index" (click)="toggleItem(item)">
+          <div class="selected-icon mr-1">
+            <svg *ngIf="itemsActive.includes(item)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+              <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+            </svg>
+          </div>
+          <div class="mr-1">{{item.name}}</div>
+          <div class="badge bg-primary text-light rounded-pill ml-auto">{{item.document_count}}</div>
+        </button>
+      </ng-container>
+    </div>
+  </div>
+</div>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
new file mode 100644
index 000000000..05df7b213
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
@@ -0,0 +1,10 @@
+.quick-filter {
+  min-width: 250px;
+  max-height: 400px;
+  overflow-y: scroll;
+
+  .selected-icon {
+    min-width: 1em;
+    min-height: 1em;
+  }
+}
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.spec.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.spec.ts
new file mode 100644
index 000000000..29edd7c45
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FilterDropodownComponent } from './filter-dropdown.component';
+
+describe('FilterDropodownComponent', () => {
+  let component: FilterDropodownComponent;
+  let fixture: ComponentFixture<FilterDropodownComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ FilterDropodownComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FilterDropodownComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
new file mode 100644
index 000000000..443fd30e4
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -0,0 +1,34 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { FilterRuleType, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
+import { ObjectWithId } from 'src/app/data/object-with-id';
+import { MatchingModel } from 'src/app/data/matching-model';
+
+@Component({
+  selector: 'app-filter-dropdown',
+  templateUrl: './filter-dropdown.component.html',
+  styleUrls: ['./filter-dropdown.component.scss']
+})
+export class FilterDropdownComponent implements OnInit {
+
+  constructor() { }
+
+  @Input()
+  filterRuleTypeID: number
+
+  @Output()
+  toggle = new EventEmitter()
+
+  items: MatchingModel[] = []
+  itemsActive: MatchingModel[] = []
+  title: string
+  filterText: string
+
+  ngOnInit(): void {
+    let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == this.filterRuleTypeID)
+    this.title = filterRuleType.name
+  }
+
+  toggleItem(item: ObjectWithId) {
+    this.toggle.emit(item, this.filterRuleTypeID)
+  }
+}
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 5e2077116..153f32644 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -6,65 +6,10 @@
     <input class="form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Title" #filterTextInput>
   </div>
 
-  <div class="btn-group col-auto" ngbDropdown role="group">
-    <button class="btn btn-outline-primary btn-sm" id="dropdownTags" ngbDropdownToggle>Tags</button>
-    <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownTags">
-      <div class="list-group list-group-flush">
-        <input class="list-group-item form-control" type="text" [(ngModel)]="filterTagsText" placeholder="Filter tags">
-        <ng-container *ngIf="(tags | filter: filterTagsText).length > 0">
-          <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let tag of tags | filter: filterTagsText; let i = index" (click)="toggleFilterByTag(tag.id)">
-            <div class="selected-icon mr-1">
-              <svg *ngIf="currentViewIncludesTag(tag.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
-              </svg>
-            </div>
-            <div class="mr-1"><app-tag [tag]="tag" [clickable]="true" linkTitle="Filter by tag"></app-tag></div>
-            <div class="badge bg-primary text-light rounded-pill ml-auto">{{tag.document_count}}</div>
-          </button>
-        </ng-container>
-      </div>
-    </div>
-  </div>
-
-  <div class="btn-group col-auto" ngbDropdown role="group">
-    <button class="btn btn-outline-primary btn-sm" id="dropdownCorrespondents" ngbDropdownToggle>Correspondents</button>
-    <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownCorrespondents">
-      <div class="list-group list-group-flush">
-        <input class="list-group-item form-control" type="text" [(ngModel)]="filterCorrespondentsText" placeholder="Filter correspondents">
-        <ng-container *ngIf="(correspondents | filter: filterCorrespondentsText).length > 0">
-          <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let correspondent of correspondents | filter: filterCorrespondentsText; let i = index" (click)="toggleFilterByCorrespondent(correspondent.id)">
-            <div class="selected-icon mr-1">
-              <svg *ngIf="currentViewIncludesCorrespondent(correspondent.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
-              </svg>
-            </div>
-            <div class="mr-1">{{correspondent.name}}</div>
-            <div class="badge bg-primary text-light rounded-pill ml-auto">{{correspondent.document_count}}</div>
-          </button>
-        </ng-container>
-      </div>
-    </div>
-  </div>
-
-  <div class="btn-group col-auto" ngbDropdown role="group">
-    <button class="btn btn-outline-primary btn-sm" id="dropdownDocumentTypes" ngbDropdownToggle>Document Types</button>
-    <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdownDocumentTypes">
-      <div class="list-group list-group-flush">
-        <input class="list-group-item form-control" type="text" [(ngModel)]="filterDocumentTypesText" placeholder="Filter document types">
-        <ng-container *ngIf="(documentTypes | filter: filterDocumentTypesText).length > 0">
-          <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let documentType of documentTypes | filter: filterDocumentTypesText; let i = index" (click)="toggleFilterByDocumentType(documentType.id)">
-            <div class="selected-icon mr-1">
-              <svg *ngIf="currentViewIncludesDocumentType(documentType.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
-              </svg>
-            </div>
-            <div class="mr-1">{{documentType.name}}</div>
-            <div class="badge bg-primary text-light rounded-pill ml-auto">{{documentType.document_count}}</div>
-          </button>
-        </ng-container>
-      </div>
-    </div>
-  </div>
+  <app-filter-dropdown class="col-auto" *ngFor="let quickFilterRuleTypeID of quickFilterRuleTypeIDs"
+    [filterRuleTypeID]="quickFilterRuleTypeID"
+    (toggle)="toggleFilterByItem($event, quickFilterRuleTypeID)">
+  </app-filter-dropdown>
 
   <div class="btn-group col-auto" ngbDropdown role="group">
     <button class="btn btn-outline-primary btn-sm" id="dropdownCreated" ngbDropdownToggle>Created</button>
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index ac89d9b88..b79fbaf12 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -1,12 +1,15 @@
-import { Component, EventEmitter, Input, OnInit, Output, ElementRef, AfterViewInit, ViewChild } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ElementRef, AfterViewInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
 import { FilterRule } from 'src/app/data/filter-rule';
-import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
+import { FilterRuleType, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 import { PaperlessTag } from 'src/app/data/paperless-tag';
+import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
+import { ObjectWithId } from 'src/app/data/object-with-id';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { TagService } from 'src/app/services/rest/tag.service';
+import { FilterDropdownComponent } from './filter-dropdown/filter-dropdown.component'
 import { fromEvent } from 'rxjs';
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
 
@@ -29,6 +32,9 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
   apply = new EventEmitter()
 
   @ViewChild('filterTextInput') input: ElementRef;
+  @ViewChildren(FilterDropdownComponent) quickFilterDropdowns!: QueryList<FilterDropdownComponent>;
+
+  quickFilterRuleTypeIDs: number[] = [FILTER_HAS_TAG, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE]
 
   correspondents: PaperlessCorrespondent[] = []
   tags: PaperlessTag[] = []
@@ -39,25 +45,11 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
   filterCorrespondentsText: string
   filterDocumentTypesText: string
 
-  applySelected() {
-    this.apply.next()
-  }
-
-  clearSelected() {
-    this.filterRules.splice(0,this.filterRules.length)
-    this.updateTextFilterInput()
-    this.clear.next()
-  }
-
-  hasFilters() {
-    return this.filterRules.length > 0
-  }
-
   ngOnInit(): void {
-    this.correspondentService.listAll().subscribe(result => {this.correspondents = result.results})
-    this.tagService.listAll().subscribe(result => this.tags = result.results)
-    this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
     this.updateTextFilterInput()
+    this.tagService.listAll().subscribe(result => this.setDropdownItems(result.results, FILTER_HAS_TAG))
+    this.correspondentService.listAll().subscribe(result => this.setDropdownItems(result.results, FILTER_CORRESPONDENT))
+    this.documentTypeService.listAll().subscribe(result => this.setDropdownItems(result.results, FILTER_DOCUMENT_TYPE))
   }
 
   ngAfterViewInit() {
@@ -73,8 +65,29 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
         });
   }
 
-  findRuleIndex(type_id: number, value: any) {
-    return this.filterRules.findIndex(rule => rule.type.id == type_id && rule.value == value)
+  setDropdownItems(items: ObjectWithId[], filterRuleTypeID: number) {
+    let dropdown: FilterDropdownComponent = this.getDropdownByFilterRuleTypeID(filterRuleTypeID)
+    if (dropdown) {
+      dropdown.items = items
+    }
+  }
+
+  getDropdownByFilterRuleTypeID(filterRuleTypeID: number): FilterDropdownComponent {
+    return this.quickFilterDropdowns.find(d => d.filterRuleTypeID == filterRuleTypeID)
+  }
+
+  applySelected() {
+    this.apply.next()
+  }
+
+  clearSelected() {
+    this.filterRules.splice(0,this.filterRules.length)
+    this.updateTextFilterInput()
+    this.clear.next()
+  }
+
+  hasFilters() {
+    return this.filterRules.length > 0
   }
 
   updateTextFilterInput() {
@@ -98,60 +111,22 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
     this.applySelected()
   }
 
-  toggleFilterByTag(tag_id: number) {
-    let existingRuleIndex = this.findRuleIndex(FILTER_HAS_TAG, tag_id)
+  toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) {
     let filterRules = this.filterRules
-    if (existingRuleIndex !== -1) {
-      filterRules.splice(existingRuleIndex, 1)
-    } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_HAS_TAG), value: tag_id})
-    }
-    this.filterRules = filterRules
-    this.applySelected()
-  }
+    let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
+    let existingRule = filterRules.find(rule => rule.type.id == filterRuleType.id)
 
-  toggleFilterByCorrespondent(correspondent_id: number) {
-    let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT)
-    if (existingRule && existingRule.value == correspondent_id) {
+    if (existingRule && existingRule.value == item.id && filterRuleType.id == FILTER_HAS_TAG) {
+      filterRules.splice(filterRules.indexOf(existingRule), 1)
+    } else if (existingRule && existingRule.value == item.id) {
       return
     } else if (existingRule) {
-      existingRule.value = correspondent_id
+      existingRule.value = item.id
     } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_CORRESPONDENT), value: correspondent_id})
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id})
     }
     this.filterRules = filterRules
     this.applySelected()
   }
 
-  toggleFilterByDocumentType(document_type_id: number) {
-    let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE)
-    if (existingRule && existingRule.value == document_type_id) {
-      return
-    } else if (existingRule) {
-      existingRule.value = document_type_id
-    } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_DOCUMENT_TYPE), value: document_type_id})
-    }
-    this.filterRules = filterRules
-    this.applySelected()
-  }
-
-  currentViewIncludesTag(tag_id: number) {
-    return this.findRuleIndex(FILTER_HAS_TAG, tag_id) !== -1
-  }
-
-  currentViewIncludesCorrespondent(correspondent_id: number) {
-    return this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id) !== -1
-  }
-
-  currentViewIncludesDocumentType(document_type_id: number) {
-    return this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) !== -1
-  }
-
-  currentViewIncludesQuickFilter() {
-    return this.filterRules.find(rule => rule.type.id == FILTER_HAS_TAG || rule.type.id == FILTER_CORRESPONDENT || rule.type.id == FILTER_DOCUMENT_TYPE) !== undefined
-  }
-
 }
diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts
index a35759f69..1a174ce57 100644
--- a/src-ui/src/app/data/filter-rule-type.ts
+++ b/src-ui/src/app/data/filter-rule-type.ts
@@ -22,15 +22,15 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
 
   {id: FILTER_TITLE, name: "Title contains", filtervar: "title__icontains", datatype: "string", multi: false, default: ""},
   {id: FILTER_CONTENT, name: "Content contains", filtervar: "content__icontains", datatype: "string", multi: false, default: ""},
-  
-  {id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false},
-  
-  {id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", datatype: "correspondent", multi: false},
-  {id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", datatype: "document_type", multi: false},
 
-  {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},  
-  {id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true},  
-  {id: FILTER_DOES_NOT_HAVE_TAG, name: "Does not have tag", filtervar: "tags__id__none", datatype: "tag", multi: true},  
+  {id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false},
+
+  {id: FILTER_CORRESPONDENT, name: "Correspondents", filtervar: "correspondent__id", datatype: "correspondent", multi: false},
+  {id: FILTER_DOCUMENT_TYPE, name: "Document types", filtervar: "document_type__id", datatype: "document_type", multi: false},
+
+  {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},
+  {id: FILTER_HAS_TAG, name: "Tags", filtervar: "tags__id__all", datatype: "tag", multi: true},
+  {id: FILTER_DOES_NOT_HAVE_TAG, name: "Does not have tag", filtervar: "tags__id__none", datatype: "tag", multi: true},
   {id: FILTER_HAS_ANY_TAG, name: "Has any tag", filtervar: "is_tagged", datatype: "boolean", multi: false, default: true},
 
   {id: FILTER_CREATED_BEFORE, name: "Created before", filtervar: "created__date__lt", datatype: "date", multi: false},
@@ -42,7 +42,7 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
 
   {id: FILTER_ADDED_BEFORE, name: "Added before", filtervar: "added__date__lt", datatype: "date", multi: false},
   {id: FILTER_ADDED_AFTER, name: "Added after", filtervar: "added__date__gt", datatype: "date", multi: false},
-  
+
   {id: FILTER_MODIFIED_BEFORE, name: "Modified before", filtervar: "modified__date__lt", datatype: "date", multi: false},
   {id: FILTER_MODIFIED_AFTER, name: "Modified after", filtervar: "modified__date__gt", datatype: "date", multi: false},
 ]
@@ -54,4 +54,4 @@ export interface FilterRuleType {
   datatype: string //number, string, boolean, date
   multi: boolean
   default?: any
-}
\ No newline at end of file
+}

From f83185bfe46f6a2b118cb05d39cffae931d1518e Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 10 Dec 2020 15:36:17 -0800
Subject: [PATCH 0129/1300] Refactored dropdowns allow clearing, active
 checkmarks

---
 .../filter-dropdown.component.html            |  2 +-
 .../filter-dropdown.component.ts              |  7 +++----
 .../filter-editor/filter-editor.component.ts  | 19 ++++++++++++++++++-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index b135caff0..4552406b1 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="btn-group" ngbDropdown role="group">
   <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>{{title}}</button>
-  <div class="dropdown-menu quick-filter" ngbDropdownMenu aria-labelledby="dropdown{{title}}">
+  <div class="dropdown-menu quick-filter" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
       <input class="list-group-item form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}">
       <ng-container *ngIf="(items | filter: filterText).length > 0">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index 443fd30e4..070689bd2 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -1,7 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FilterRuleType, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { ObjectWithId } from 'src/app/data/object-with-id';
-import { MatchingModel } from 'src/app/data/matching-model';
 
 @Component({
   selector: 'app-filter-dropdown',
@@ -18,8 +17,8 @@ export class FilterDropdownComponent implements OnInit {
   @Output()
   toggle = new EventEmitter()
 
-  items: MatchingModel[] = []
-  itemsActive: MatchingModel[] = []
+  items: ObjectWithId[] = []
+  itemsActive: ObjectWithId[] = []
   title: string
   filterText: string
 
@@ -29,6 +28,6 @@ export class FilterDropdownComponent implements OnInit {
   }
 
   toggleItem(item: ObjectWithId) {
-    this.toggle.emit(item, this.filterRuleTypeID)
+    this.toggle.emit(item)
   }
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index b79fbaf12..d45732717 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -65,11 +65,21 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
         });
   }
 
-  setDropdownItems(items: ObjectWithId[], filterRuleTypeID: number) {
+  setDropdownItems(items: ObjectWithId[], filterRuleTypeID: number): void {
     let dropdown: FilterDropdownComponent = this.getDropdownByFilterRuleTypeID(filterRuleTypeID)
     if (dropdown) {
       dropdown.items = items
     }
+    this.updateDropdownActiveItems(dropdown)
+  }
+
+  updateDropdownActiveItems(dropdown: FilterDropdownComponent): void {
+    let activeRulesValues = this.filterRules.filter(r => r.type.id == dropdown.filterRuleTypeID).map(r => r.value)
+    let activeItems = []
+    if (activeRulesValues.length > 0) {
+      activeItems = dropdown.items.filter(i => activeRulesValues.includes(i.id))
+    }
+    dropdown.itemsActive = activeItems
   }
 
   getDropdownByFilterRuleTypeID(filterRuleTypeID: number): FilterDropdownComponent {
@@ -83,6 +93,7 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
   clearSelected() {
     this.filterRules.splice(0,this.filterRules.length)
     this.updateTextFilterInput()
+    this.quickFilterDropdowns.forEach(d => this.updateDropdownActiveItems(d))
     this.clear.next()
   }
 
@@ -118,6 +129,8 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
 
     if (existingRule && existingRule.value == item.id && filterRuleType.id == FILTER_HAS_TAG) {
       filterRules.splice(filterRules.indexOf(existingRule), 1)
+    } else if (existingRule  && filterRuleType.id == FILTER_HAS_TAG) {
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id})
     } else if (existingRule && existingRule.value == item.id) {
       return
     } else if (existingRule) {
@@ -125,6 +138,10 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
     } else {
       filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id})
     }
+
+    let dropdown = this.getDropdownByFilterRuleTypeID(filterRuleTypeID)
+    this.updateDropdownActiveItems(dropdown)
+
     this.filterRules = filterRules
     this.applySelected()
   }

From 364df5c050c4be7fa72f9ef49bcfedf8869e050e Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 10 Dec 2020 15:37:56 -0800
Subject: [PATCH 0130/1300] Fix toggling off active items

---
 .../app/components/filter-editor/filter-editor.component.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index d45732717..d3e8eb244 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -127,9 +127,9 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
     let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
     let existingRule = filterRules.find(rule => rule.type.id == filterRuleType.id)
 
-    if (existingRule && existingRule.value == item.id && filterRuleType.id == FILTER_HAS_TAG) {
+    if (existingRule && existingRule.value == item.id) {
       filterRules.splice(filterRules.indexOf(existingRule), 1)
-    } else if (existingRule  && filterRuleType.id == FILTER_HAS_TAG) {
+    } else if (existingRule && filterRuleType.id == FILTER_HAS_TAG) {
       filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id})
     } else if (existingRule && existingRule.value == item.id) {
       return

From 57504b7ee6c8acbda931c85674faa40684fbd132 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 10 Dec 2020 15:49:00 -0800
Subject: [PATCH 0131/1300] Display tags with color pills

---
 .../filter-dropdown/filter-dropdown.component.html           | 5 ++++-
 .../filter-dropdown/filter-dropdown.component.ts             | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 4552406b1..0dc56db2e 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -10,7 +10,10 @@
               <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
             </svg>
           </div>
-          <div class="mr-1">{{item.name}}</div>
+          <div class="mr-1">
+            <app-tag *ngIf="display == 'tag'; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
+            <ng-template #displayName>{{item.name}}</ng-template>
+          </div>
           <div class="badge bg-primary text-light rounded-pill ml-auto">{{item.document_count}}</div>
         </button>
       </ng-container>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index 070689bd2..1885884cd 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { FilterRuleType, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
+import { FilterRuleType, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 
 @Component({
@@ -21,10 +21,12 @@ export class FilterDropdownComponent implements OnInit {
   itemsActive: ObjectWithId[] = []
   title: string
   filterText: string
+  display: string
 
   ngOnInit(): void {
     let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == this.filterRuleTypeID)
     this.title = filterRuleType.name
+    this.display = filterRuleType.datatype
   }
 
   toggleItem(item: ObjectWithId) {

From 4146955f4a7ed8ad0a2a6ddbcff15c9bbb7d871c Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 10 Dec 2020 15:51:11 -0800
Subject: [PATCH 0132/1300] Shadows!

---
 .../app/components/document-list/document-list.component.html   | 2 +-
 .../filter-dropdown/filter-dropdown.component.html              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 13e1718ce..f8c3445c5 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -47,7 +47,7 @@
 
     <div class="btn-group" ngbDropdown role="group">
       <button class="btn btn-sm btn-outline-primary dropdown-toggle" ngbDropdownToggle>Saved Views</button>
-      <div class="dropdown-menu" ngbDropdownMenu>
+      <div class="dropdown-menu shadow" ngbDropdownMenu>
         <ng-container *ngIf="!list.savedViewId">
           <button ngbDropdownItem *ngFor="let config of savedViewConfigService.getConfigs()" (click)="loadViewConfig(config)">{{config.title}}</button>
           <div class="dropdown-divider" *ngIf="savedViewConfigService.getConfigs().length > 0"></div>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 0dc56db2e..f3c3b020c 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="btn-group" ngbDropdown role="group">
   <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>{{title}}</button>
-  <div class="dropdown-menu quick-filter" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
+  <div class="dropdown-menu quick-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
       <input class="list-group-item form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}">
       <ng-container *ngIf="(items | filter: filterText).length > 0">

From 66aa7319aba16860b980f6085abe50b5af3c201a Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 11 Dec 2020 00:07:26 -0800
Subject: [PATCH 0133/1300] Small text

---
 .../filter-dropdown/filter-dropdown.component.html            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index f3c3b020c..14d71a393 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -2,7 +2,7 @@
   <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>{{title}}</button>
   <div class="dropdown-menu quick-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
-      <input class="list-group-item form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}">
+      <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}">
       <ng-container *ngIf="(items | filter: filterText).length > 0">
         <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let item of items | filter: filterText; let i = index" (click)="toggleItem(item)">
           <div class="selected-icon mr-1">
@@ -12,7 +12,7 @@
           </div>
           <div class="mr-1">
             <app-tag *ngIf="display == 'tag'; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
-            <ng-template #displayName>{{item.name}}</ng-template>
+            <ng-template #displayName><small>{{item.name}}</small></ng-template>
           </div>
           <div class="badge bg-primary text-light rounded-pill ml-auto">{{item.document_count}}</div>
         </button>

From ed480f62e3d67362c56e1a86dfa34c68dd03d132 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 11 Dec 2020 00:08:06 -0800
Subject: [PATCH 0134/1300] filter-rule-type displayName property

---
 .../filter-dropdown/filter-dropdown.component.ts  |  4 ++--
 src-ui/src/app/data/filter-rule-type.ts           | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index 1885884cd..0522583c0 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { FilterRuleType, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
+import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 
 @Component({
@@ -25,7 +25,7 @@ export class FilterDropdownComponent implements OnInit {
 
   ngOnInit(): void {
     let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == this.filterRuleTypeID)
-    this.title = filterRuleType.name
+    this.title = filterRuleType.displayName
     this.display = filterRuleType.datatype
   }
 
diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts
index 1a174ce57..cf155daf1 100644
--- a/src-ui/src/app/data/filter-rule-type.ts
+++ b/src-ui/src/app/data/filter-rule-type.ts
@@ -25,23 +25,23 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
 
   {id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false},
 
-  {id: FILTER_CORRESPONDENT, name: "Correspondents", filtervar: "correspondent__id", datatype: "correspondent", multi: false},
-  {id: FILTER_DOCUMENT_TYPE, name: "Document types", filtervar: "document_type__id", datatype: "document_type", multi: false},
+  {id: FILTER_CORRESPONDENT, name: "Correspondent is", displayName: "Correspondents", filtervar: "correspondent__id", datatype: "correspondent", multi: false},
+  {id: FILTER_DOCUMENT_TYPE, name: "Document type is", displayName: "Document types", filtervar: "document_type__id", datatype: "document_type", multi: false},
 
   {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},
-  {id: FILTER_HAS_TAG, name: "Tags", filtervar: "tags__id__all", datatype: "tag", multi: true},
+  {id: FILTER_HAS_TAG, name: "Has tag", displayName: "Tags", filtervar: "tags__id__all", datatype: "tag", multi: true},
   {id: FILTER_DOES_NOT_HAVE_TAG, name: "Does not have tag", filtervar: "tags__id__none", datatype: "tag", multi: true},
   {id: FILTER_HAS_ANY_TAG, name: "Has any tag", filtervar: "is_tagged", datatype: "boolean", multi: false, default: true},
 
-  {id: FILTER_CREATED_BEFORE, name: "Created before", filtervar: "created__date__lt", datatype: "date", multi: false},
-  {id: FILTER_CREATED_AFTER, name: "Created after", filtervar: "created__date__gt", datatype: "date", multi: false},
+  {id: FILTER_CREATED_BEFORE, name: "Created before", displayName: "Created", filtervar: "created__date__lt", datatype: "date", multi: false},
+  {id: FILTER_CREATED_AFTER, name: "Created after", displayName: "Created", filtervar: "created__date__gt", datatype: "date", multi: false},
 
   {id: FILTER_CREATED_YEAR, name: "Year created is", filtervar: "created__year", datatype: "number", multi: false},
   {id: FILTER_CREATED_MONTH, name: "Month created is", filtervar: "created__month", datatype: "number", multi: false},
   {id: FILTER_CREATED_DAY, name: "Day created is", filtervar: "created__day", datatype: "number", multi: false},
 
-  {id: FILTER_ADDED_BEFORE, name: "Added before", filtervar: "added__date__lt", datatype: "date", multi: false},
-  {id: FILTER_ADDED_AFTER, name: "Added after", filtervar: "added__date__gt", datatype: "date", multi: false},
+  {id: FILTER_ADDED_BEFORE, name: "Added before", displayName: "Added", filtervar: "added__date__lt", datatype: "date", multi: false},
+  {id: FILTER_ADDED_AFTER, name: "Added after", displayName: "Added", filtervar: "added__date__gt", datatype: "date", multi: false},
 
   {id: FILTER_MODIFIED_BEFORE, name: "Modified before", filtervar: "modified__date__lt", datatype: "date", multi: false},
   {id: FILTER_MODIFIED_AFTER, name: "Modified after", filtervar: "modified__date__gt", datatype: "date", multi: false},
@@ -53,5 +53,6 @@ export interface FilterRuleType {
   filtervar: string
   datatype: string //number, string, boolean, date
   multi: boolean
+  displayName?: string
   default?: any
 }

From c24bfd4d2bdf72ceed3393a338aca443e67cb695 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 11 Dec 2020 01:03:05 -0800
Subject: [PATCH 0135/1300] filter-dropdown-date rough implementation

---
 src-ui/src/app/app.module.ts                  |  2 +
 .../filter-dropdown-date.component.html       | 41 ++++++++++++++
 .../filter-dropdown-date.component.scss       |  3 ++
 .../filter-dropdown-date.component.spec.ts    | 25 +++++++++
 .../filter-dropdown-date.component.ts         | 53 +++++++++++++++++++
 .../filter-editor.component.html              | 13 +----
 .../filter-editor/filter-editor.component.ts  |  7 +--
 7 files changed, 130 insertions(+), 14 deletions(-)
 create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html
 create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.scss
 create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.spec.ts
 create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 6a847494a..394e3ba58 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -29,6 +29,7 @@ import { AppFrameComponent } from './components/app-frame/app-frame.component';
 import { ToastsComponent } from './components/common/toasts/toasts.component';
 import { FilterEditorComponent } from './components/filter-editor/filter-editor.component';
 import { FilterDropdownComponent } from './components/filter-editor/filter-dropdown/filter-dropdown.component';
+import { FilterDropdownDateComponent } from './components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component';
 import { DocumentCardLargeComponent } from './components/document-list/document-card-large/document-card-large.component';
 import { DocumentCardSmallComponent } from './components/document-list/document-card-small/document-card-small.component';
 import { NgxFileDropModule } from 'ngx-file-drop';
@@ -76,6 +77,7 @@ import { FilterPipe } from './pipes/filter.pipe';
     ToastsComponent,
     FilterEditorComponent,
     FilterDropdownComponent,
+    FilterDropdownDateComponent,
     DocumentCardLargeComponent,
     DocumentCardSmallComponent,
     TextComponent,
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html
new file mode 100644
index 000000000..74d508390
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html
@@ -0,0 +1,41 @@
+  <div class="btn-group" ngbDropdown role="group">
+  <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>{{title}}</button>
+  <div class="dropdown-menu date-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
+    <div class="list-group list-group-flush">
+        <div class="list-group-item d-flex flex-column align-items-start">
+          <button class="btn btn-sm btn-link pl-0" (click)="setQuickFilter(7)">Last 7 days</button>
+          <button class="btn btn-sm btn-link pl-0" (click)="setQuickFilter(30)">Last 30 days</button>
+          <button class="btn btn-sm btn-link pl-0" *ngIf="showMonth" (click)="setQuickFilter('month')">This month</button>
+          <button class="btn btn-sm btn-link pl-0" *ngIf="showYear" (click)="setQuickFilter('year')">This year</button>
+        </div>
+        <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
+          <div class="mb-1"><small>Before</small></div>
+          <div class="input-group input-group-sm">
+            <input class="form-control" type="text" placeholder="yyyy-mm-dd" name="before" [(ngModel)]="dateBefore" ngbDatepicker #dpBefore="ngbDatepicker">
+            <div class="input-group-append">
+              <button class="btn btn-outline-secondary btn-sm" (click)="dpBefore.toggle()" type="button">
+                <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                  <path fill-rule="evenodd" 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"/>
+                  <path d="M6.445 11.688V6.354h-.633A12.6 12.6 0 0 0 4.5 7.16v.695c.375-.257.969-.62 1.258-.777h.012v4.61h.675zm1.188-1.305c.047.64.594 1.406 1.703 1.406 1.258 0 2-1.066 2-2.871 0-1.934-.781-2.668-1.953-2.668-.926 0-1.797.672-1.797 1.809 0 1.16.824 1.77 1.676 1.77.746 0 1.23-.376 1.383-.79h.027c-.004 1.316-.461 2.164-1.305 2.164-.664 0-1.008-.45-1.05-.82h-.684zm2.953-2.317c0 .696-.559 1.18-1.184 1.18-.601 0-1.144-.383-1.144-1.2 0-.823.582-1.21 1.168-1.21.633 0 1.16.398 1.16 1.23z"/>
+                </svg>
+              </button>
+            </div>
+          </div>
+        </div>
+        <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
+          <div class="mb-1"><small>After</small></div>
+          <div class="input-group">
+            <input class="form-control form-control-sm" type="text" placeholder="yyyy-mm-dd" name="after" [(ngModel)]="dateAfter" ngbDatepicker #dpAfter="ngbDatepicker">
+            <div class="input-group-append">
+              <button class="btn btn-outline-secondary btn-sm" (click)="dpAfter.toggle()" type="button">
+                <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                  <path fill-rule="evenodd" 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"/>
+                  <path d="M6.445 11.688V6.354h-.633A12.6 12.6 0 0 0 4.5 7.16v.695c.375-.257.969-.62 1.258-.777h.012v4.61h.675zm1.188-1.305c.047.64.594 1.406 1.703 1.406 1.258 0 2-1.066 2-2.871 0-1.934-.781-2.668-1.953-2.668-.926 0-1.797.672-1.797 1.809 0 1.16.824 1.77 1.676 1.77.746 0 1.23-.376 1.383-.79h.027c-.004 1.316-.461 2.164-1.305 2.164-.664 0-1.008-.45-1.05-.82h-.684zm2.953-2.317c0 .696-.559 1.18-1.184 1.18-.601 0-1.144-.383-1.144-1.2 0-.823.582-1.21 1.168-1.21.633 0 1.16.398 1.16 1.23z"/>
+                </svg>
+              </button>
+            </div>
+          </div>
+        </div>
+    </div>
+  </div>
+</div>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.scss b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.scss
new file mode 100644
index 000000000..67edb9bf8
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.scss
@@ -0,0 +1,3 @@
+.date-filter {
+  min-width: 250px;
+}
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.spec.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.spec.ts
new file mode 100644
index 000000000..6bf59e2e7
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FilterDropdownDateComponent } from './filter-dropdown-date.component';
+
+describe('FilterDropdownDateComponent', () => {
+  let component: FilterDropdownDateComponent;
+  let fixture: ComponentFixture<FilterDropdownDateComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ FilterDropdownDateComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FilterDropdownDateComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
new file mode 100644
index 000000000..37ea2cd09
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -0,0 +1,53 @@
+import { Component, EventEmitter, Input, OnInit, Output, ElementRef, ViewChild } from '@angular/core';
+import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
+import { ObjectWithId } from 'src/app/data/object-with-id';
+import { FilterDropdownComponent } from '../filter-dropdown.component'
+import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+
+@Component({
+  selector: 'app-filter-dropdown-date',
+  templateUrl: './filter-dropdown-date.component.html',
+  styleUrls: ['./filter-dropdown-date.component.scss']
+})
+export class FilterDropdownDateComponent extends FilterDropdownComponent {
+
+  @Input()
+  filterRuleTypeIDs: number[] = []
+
+  @Output()
+  selected = new EventEmitter()
+
+  filterRuleTypes: FilterRuleType[] = []
+  showYear: boolean = false
+  showMonth: boolean = false
+  dateAfter: NgbDateStruct
+  dateBefore: NgbDateStruct
+
+  ngOnInit(): void {
+    this.filterRuleTypes = this.filterRuleTypeIDs.map(id => FILTER_RULE_TYPES.find(rt => rt.id == id))
+    this.filterRuleTypeID = this.filterRuleTypeIDs[0]
+    super.ngOnInit()
+
+    this.showYear = this.filterRuleTypes.find(rt => rt.filtervar.indexOf('year') > -1) !== undefined
+    this.showMonth = this.filterRuleTypes.find(rt => rt.filtervar.indexOf('month') > -1) !== undefined
+  }
+
+  setQuickFilter(range: any) {
+    this.dateAfter = this.dateBefore = undefined
+    switch (typeof range) {
+      case 'number':
+        let date = new Date();
+        date.setDate(date.getDate() - range)
+        this.dateAfter = { year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate() }
+        break;
+
+      case 'string':
+        let filterRuleType = this.filterRuleTypes.find(rt => rt.filtervar.indexOf(range) > -1)
+        console.log(range);
+        break;
+
+      default:
+        break;
+    }
+  }
+}
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 153f32644..d3473337b 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -6,18 +6,9 @@
     <input class="form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Title" #filterTextInput>
   </div>
 
-  <app-filter-dropdown class="col-auto" *ngFor="let quickFilterRuleTypeID of quickFilterRuleTypeIDs"
-    [filterRuleTypeID]="quickFilterRuleTypeID"
-    (toggle)="toggleFilterByItem($event, quickFilterRuleTypeID)">
-  </app-filter-dropdown>
+  <app-filter-dropdown class="col-auto" *ngFor="let quickFilterRuleTypeID of quickFilterRuleTypeIDs" [filterRuleTypeID]="quickFilterRuleTypeID" (toggle)="toggleFilterByItem($event, quickFilterRuleTypeID)"></app-filter-dropdown>
 
-  <div class="btn-group col-auto" ngbDropdown role="group">
-    <button class="btn btn-outline-primary btn-sm" id="dropdownCreated" ngbDropdownToggle>Created</button>
-  </div>
-
-  <div class="btn-group col-auto" ngbDropdown role="group">
-    <button class="btn btn-outline-primary btn-sm" id="dropdownAdded" ngbDropdownToggle>Added</button>
-  </div>
+  <app-filter-dropdown-date class="col-auto" *ngFor="let dateAddedFilterRuleTypeID of dateAddedFilterRuleTypeIDs" [filterRuleTypeIDs]="dateAddedFilterRuleTypeID" (toggle)="toggleFilterByItem($event, quickFilterRuleTypeID)"></app-filter-dropdown-date>
 
   <button class="btn btn-link btn-sm" [disabled]="!hasFilters()" (click)="clearSelected()">
     <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index d3e8eb244..f3d77d44b 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output, ElementRef, AfterViewInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
 import { FilterRule } from 'src/app/data/filter-rule';
-import { FilterRuleType, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
+import { FilterRuleType, FILTER_RULE_TYPES, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_ADDED_BEFORE, FILTER_ADDED_AFTER, FILTER_CREATED_BEFORE, FILTER_CREATED_AFTER, FILTER_CREATED_YEAR, FILTER_CREATED_MONTH, FILTER_CREATED_DAY } from 'src/app/data/filter-rule-type';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 import { PaperlessTag } from 'src/app/data/paperless-tag';
@@ -31,10 +31,11 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
   @Output()
   apply = new EventEmitter()
 
-  @ViewChild('filterTextInput') input: ElementRef;
+  @ViewChild('filterTextInput') filterTextInput: ElementRef;
   @ViewChildren(FilterDropdownComponent) quickFilterDropdowns!: QueryList<FilterDropdownComponent>;
 
   quickFilterRuleTypeIDs: number[] = [FILTER_HAS_TAG, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE]
+  dateAddedFilterRuleTypeIDs: any[] = [[FILTER_ADDED_BEFORE, FILTER_ADDED_AFTER], [FILTER_CREATED_BEFORE, FILTER_CREATED_AFTER, FILTER_CREATED_YEAR, FILTER_CREATED_MONTH, FILTER_CREATED_DAY]]
 
   correspondents: PaperlessCorrespondent[] = []
   tags: PaperlessTag[] = []
@@ -53,7 +54,7 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
   }
 
   ngAfterViewInit() {
-    fromEvent(this.input.nativeElement,'keyup')
+    fromEvent(this.filterTextInput.nativeElement,'keyup')
         .pipe(
             debounceTime(150),
             distinctUntilChanged(),

From a4a08aa667dd43c50d43910129da7a0676505019 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 11 Dec 2020 01:16:58 -0800
Subject: [PATCH 0136/1300] auto-select list filter field & clear on close

---
 .../filter-dropdown.component.html               |  4 ++--
 .../filter-dropdown/filter-dropdown.component.ts | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 14d71a393..fad1b6663 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -1,8 +1,8 @@
-  <div class="btn-group" ngbDropdown role="group">
+  <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)">
   <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>{{title}}</button>
   <div class="dropdown-menu quick-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
-      <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}">
+      <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" #filterTextInput>
       <ng-container *ngIf="(items | filter: filterText).length > 0">
         <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let item of items | filter: filterText; let i = index" (click)="toggleItem(item)">
           <div class="selected-icon mr-1">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index 0522583c0..625c72be8 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ElementRef, ViewChild } from '@angular/core';
 import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 
@@ -17,6 +17,8 @@ export class FilterDropdownComponent implements OnInit {
   @Output()
   toggle = new EventEmitter()
 
+  @ViewChild('filterTextInput') filterTextInput: ElementRef
+
   items: ObjectWithId[] = []
   itemsActive: ObjectWithId[] = []
   title: string
@@ -29,7 +31,17 @@ export class FilterDropdownComponent implements OnInit {
     this.display = filterRuleType.datatype
   }
 
-  toggleItem(item: ObjectWithId) {
+  toggleItem(item: ObjectWithId): void {
     this.toggle.emit(item)
   }
+
+  dropdownOpenChange(open: boolean): void {
+    if (open) {
+      setTimeout(() => {
+        this.filterTextInput.nativeElement.focus();
+      }, 0);
+    } else {
+      this.filterText = ''
+    }
+  }
 }

From 0b4c860354c45fb188f47d808e59fe5a56fff1c2 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 11 Dec 2020 01:19:49 -0800
Subject: [PATCH 0137/1300] refactoring

---
 .../filter-dropdown/filter-dropdown.component.html          | 6 +++---
 .../filter-dropdown/filter-dropdown.component.ts            | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index fad1b6663..6e73b31a7 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -2,9 +2,9 @@
   <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>{{title}}</button>
   <div class="dropdown-menu quick-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
-      <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" #filterTextInput>
-      <ng-container *ngIf="(items | filter: filterText).length > 0">
-        <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let item of items | filter: filterText; let i = index" (click)="toggleItem(item)">
+      <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="listFilterText" placeholder="Filter {{title}}" #listFilterTextInput>
+      <ng-container *ngIf="(items | filter: listFilterText).length > 0">
+        <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let item of items | filter: listFilterText; let i = index" (click)="toggleItem(item)">
           <div class="selected-icon mr-1">
             <svg *ngIf="itemsActive.includes(item)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
               <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index 625c72be8..a57543424 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -17,12 +17,12 @@ export class FilterDropdownComponent implements OnInit {
   @Output()
   toggle = new EventEmitter()
 
-  @ViewChild('filterTextInput') filterTextInput: ElementRef
+  @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef
 
   items: ObjectWithId[] = []
   itemsActive: ObjectWithId[] = []
   title: string
-  filterText: string
+  listFilterText: string
   display: string
 
   ngOnInit(): void {
@@ -38,7 +38,7 @@ export class FilterDropdownComponent implements OnInit {
   dropdownOpenChange(open: boolean): void {
     if (open) {
       setTimeout(() => {
-        this.filterTextInput.nativeElement.focus();
+        this.listFilterTextInput.nativeElement.focus();
       }, 0);
     } else {
       this.filterText = ''

From a37796d0cf7caf1f5f53727521d057188f768b25 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 11 Dec 2020 01:40:42 -0800
Subject: [PATCH 0138/1300] Allow enter key to toggle items in filtered list if
 single item remains

---
 src-ui/src/app/app.module.ts                           |  3 ++-
 .../filter-dropdown/filter-dropdown.component.html     |  6 +++---
 .../filter-dropdown/filter-dropdown.component.ts       | 10 ++++++++--
 .../filter-editor/filter-editor.component.ts           |  3 ---
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 394e3ba58..4c24123e6 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -112,7 +112,8 @@ import { FilterPipe } from './pipes/filter.pipe';
       provide: HTTP_INTERCEPTORS,
       useClass: CsrfInterceptor,
       multi: true
-    }
+    },
+    FilterPipe
   ],
   bootstrap: [AppComponent]
 })
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 6e73b31a7..b43826fb2 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -2,9 +2,9 @@
   <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>{{title}}</button>
   <div class="dropdown-menu quick-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
-      <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="listFilterText" placeholder="Filter {{title}}" #listFilterTextInput>
-      <ng-container *ngIf="(items | filter: listFilterText).length > 0">
-        <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let item of items | filter: listFilterText; let i = index" (click)="toggleItem(item)">
+      <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
+      <ng-container *ngIf="(items | filter: filterText).length > 0">
+        <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let item of items | filter: filterText; let i = index" (click)="toggleItem(item)">
           <div class="selected-icon mr-1">
             <svg *ngIf="itemsActive.includes(item)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
               <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index a57543424..6f346d4b3 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -1,6 +1,7 @@
 import { Component, EventEmitter, Input, OnInit, Output, ElementRef, ViewChild } from '@angular/core';
 import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { ObjectWithId } from 'src/app/data/object-with-id';
+import { FilterPipe } from  'src/app/pipes/filter.pipe';
 
 @Component({
   selector: 'app-filter-dropdown',
@@ -9,7 +10,7 @@ import { ObjectWithId } from 'src/app/data/object-with-id';
 })
 export class FilterDropdownComponent implements OnInit {
 
-  constructor() { }
+  constructor(private filterPipe: FilterPipe) { }
 
   @Input()
   filterRuleTypeID: number
@@ -22,7 +23,7 @@ export class FilterDropdownComponent implements OnInit {
   items: ObjectWithId[] = []
   itemsActive: ObjectWithId[] = []
   title: string
-  listFilterText: string
+  filterText: string
   display: string
 
   ngOnInit(): void {
@@ -44,4 +45,9 @@ export class FilterDropdownComponent implements OnInit {
       this.filterText = ''
     }
   }
+
+  listFilterEnter(): void {
+    let filtered = this.filterPipe.transform(this.items, this.filterText)
+    if (filtered.length == 1) this.toggleItem(filtered.shift())
+  }
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index f3d77d44b..93a91473f 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -42,9 +42,6 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
   documentTypes: PaperlessDocumentType[] = []
 
   filterText: string
-  filterTagsText: string
-  filterCorrespondentsText: string
-  filterDocumentTypesText: string
 
   ngOnInit(): void {
     this.updateTextFilterInput()

From fbb3a069cd20118a75b4cb5b9fe057d474d1fb83 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 14:27:54 +0100
Subject: [PATCH 0139/1300] add bulk editing methods

---
 src/documents/bulk_edit.py | 90 +++++++++++++++++++++++---------------
 src/documents/tasks.py     |  7 +++
 2 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index f80c55c58..1349f9d54 100644
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -1,49 +1,69 @@
-from documents.models import Document, Correspondent
+from django.db.models import Q
+from django_q.tasks import async_task
 
-methods_supported = [
-    "set_correspondent"
-]
+from documents.models import Document, Correspondent, DocumentType
 
 
-def validate_data(data):
-    if 'ids' not in data or not isinstance(data['ids'], list):
-        raise ValueError()
-    ids = data['ids']
-    if not all([isinstance(i, int) for i in ids]):
-        raise ValueError()
-    count = Document.objects.filter(pk__in=ids).count()
-    if not count == len(ids):
-        raise Document.DoesNotExist()
+def set_correspondent(doc_ids, correspondent):
+    if correspondent:
+        correspondent = Correspondent.objects.get(id=correspondent)
 
-    if 'method' not in data or not isinstance(data['method'], str):
-        raise ValueError()
-    method = data['method']
-    if method not in methods_supported:
-        raise ValueError()
+    qs = Document.objects.filter(Q(id__in=doc_ids) & ~Q(correspondent=correspondent))
+    affected_docs = [doc.id for doc in qs]
+    qs.update(correspondent=correspondent)
 
-    if 'args' not in data or not isinstance(data['args'], list):
-        raise ValueError()
-    parameters = data['args']
+    async_task("documents.tasks.bulk_rename_files", affected_docs)
 
-    return ids, method, parameters
+    return "OK"
 
 
-def perform_bulk_edit(data):
-    ids, method, args = validate_data(data)
+def set_document_type(doc_ids, document_type):
+    if document_type:
+        document_type = DocumentType.objects.get(id=document_type)
 
-    getattr(__file__, method)(ids, args)
+    qs = Document.objects.filter(Q(id__in=doc_ids) & ~Q(document_type=document_type))
+    affected_docs = [doc.id for doc in qs]
+    qs.update(document_type=document_type)
+
+    async_task("documents.tasks.bulk_rename_files", affected_docs)
+
+    return "OK"
 
 
-def set_correspondent(ids, args):
-    if not len(args) == 1:
-        raise ValueError()
+def add_tag(doc_ids, tag):
 
-    if not args[0]:
-        correspondent = None
-    else:
-        if not isinstance(args[0], int):
-            raise ValueError()
+    qs = Document.objects.filter(Q(id__in=doc_ids) & ~Q(tags__id=tag))
+    affected_docs = [doc.id for doc in qs]
 
-        correspondent = Correspondent.objects.get(args[0])
+    DocumentTagRelationship = Document.tags.through
 
-    Document.objects.filter(id__in=ids).update(correspondent=correspondent)
+    DocumentTagRelationship.objects.bulk_create([
+        DocumentTagRelationship(document_id=doc, tag_id=tag) for doc in affected_docs
+    ])
+
+    async_task("documents.tasks.bulk_rename_files", affected_docs)
+
+    return "OK"
+
+
+def remove_tag(doc_ids, tag):
+
+    qs = Document.objects.filter(Q(id__in=doc_ids) & Q(tags__id=tag))
+    affected_docs = [doc.id for doc in qs]
+
+    DocumentTagRelationship = Document.tags.through
+
+    DocumentTagRelationship.objects.filter(
+        Q(document_id__in=affected_docs) &
+        Q(tag_id=tag)
+    ).delete()
+
+    async_task("documents.tasks.bulk_rename_files", affected_docs)
+
+    return "OK"
+
+
+def delete(doc_ids):
+    Document.objects.filter(id__in=doc_ids).delete()
+
+    return "OK"
diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index 8c9b00dd6..af4c91448 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -2,6 +2,7 @@ import logging
 
 import tqdm
 from django.conf import settings
+from django.db.models.signals import post_save
 from whoosh.writing import AsyncWriter
 
 from documents import index, sanity_checker
@@ -87,3 +88,9 @@ def sanity_check():
         raise SanityFailedError(messages)
     else:
         return "No issues detected."
+
+
+def bulk_rename_files(ids):
+    qs = Document.objects.filter(id__in=ids)
+    for doc in qs:
+        post_save.send(Document, instance=doc, created=False)

From 66d6d29c239670575c0dc0c100234764f8eeead9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 14:29:43 +0100
Subject: [PATCH 0140/1300] add support to the documents api to only serve
 selected fields

---
 src/documents/serialisers.py | 24 +++++++++++++++++++++++-
 src/documents/views.py       | 11 +++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index faded5125..69cbb4092 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -7,6 +7,28 @@ from .models import Correspondent, Tag, Document, Log, DocumentType
 from .parsers import is_mime_type_supported
 
 
+# https://www.django-rest-framework.org/api-guide/serializers/#example
+class DynamicFieldsModelSerializer(serializers.ModelSerializer):
+    """
+    A ModelSerializer that takes an additional `fields` argument that
+    controls which fields should be displayed.
+    """
+
+    def __init__(self, *args, **kwargs):
+        # Don't pass the 'fields' arg up to the superclass
+        fields = kwargs.pop('fields', None)
+
+        # Instantiate the superclass normally
+        super(DynamicFieldsModelSerializer, self).__init__(*args, **kwargs)
+
+        if fields is not None:
+            # Drop any fields that are not specified in the `fields` argument.
+            allowed = set(fields)
+            existing = set(self.fields)
+            for field_name in existing - allowed:
+                self.fields.pop(field_name)
+
+
 class CorrespondentSerializer(serializers.ModelSerializer):
 
     document_count = serializers.IntegerField(read_only=True)
@@ -90,7 +112,7 @@ class DocumentTypeField(serializers.PrimaryKeyRelatedField):
         return DocumentType.objects.all()
 
 
-class DocumentSerializer(serializers.ModelSerializer):
+class DocumentSerializer(DynamicFieldsModelSerializer):
 
     correspondent = CorrespondentField(allow_null=True)
     tags = TagsField(many=True)
diff --git a/src/documents/views.py b/src/documents/views.py
index b1d93b77b..10cb30eb3 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -131,6 +131,17 @@ class DocumentViewSet(RetrieveModelMixin,
         "added",
         "archive_serial_number")
 
+    def get_serializer(self, *args, **kwargs):
+        fields_param = self.request.query_params.get('fields', None)
+        if fields_param:
+            fields = fields_param.split(",")
+        else:
+            fields = None
+        serializer_class = self.get_serializer_class()
+        kwargs.setdefault('context', self.get_serializer_context())
+        kwargs.setdefault('fields', fields)
+        return serializer_class(*args, **kwargs)
+
     def update(self, request, *args, **kwargs):
         response = super(DocumentViewSet, self).update(
             request, *args, **kwargs)

From 4b0027797a6c70879bc9ce2850c645ca136931c7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 14:30:18 +0100
Subject: [PATCH 0141/1300] bulk edit view

---
 src/documents/serialisers.py | 22 ++++++++++++++++++----
 src/documents/views.py       | 11 +++++++++++
 src/paperless/urls.py        |  7 ++++++-
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 69cbb4092..5418ec0fb 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -3,6 +3,7 @@ from django.utils.text import slugify
 from rest_framework import serializers
 from rest_framework.fields import SerializerMethodField
 
+from . import bulk_edit
 from .models import Correspondent, Tag, Document, Log, DocumentType
 from .parsers import is_mime_type_supported
 
@@ -164,11 +165,10 @@ class LogSerializer(serializers.ModelSerializer):
 
 class BulkEditSerializer(serializers.Serializer):
 
-    documents = serializers.PrimaryKeyRelatedField(
-        many=True,
+    documents = serializers.ListField(
+        child=serializers.IntegerField(),
         label="Documents",
-        write_only=True,
-        queryset=Document.objects.all()
+        write_only=True
     )
 
     method = serializers.ChoiceField(
@@ -185,6 +185,20 @@ class BulkEditSerializer(serializers.Serializer):
 
     parameters = serializers.DictField(allow_empty=True)
 
+    def validate_method(self, method):
+        if method == "set_correspondent":
+            return bulk_edit.set_correspondent
+        elif method == "set_document_type":
+            return bulk_edit.set_document_type
+        elif method == "add_tag":
+            return bulk_edit.add_tag
+        elif method == "remove_tag":
+            return bulk_edit.remove_tag
+        elif method == "delete":
+            return bulk_edit.delete
+        else:
+            raise serializers.ValidationError("Unsupported method.")
+
     def validate(self, attrs):
 
         return attrs
diff --git a/src/documents/views.py b/src/documents/views.py
index 10cb30eb3..4ce78348e 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -278,6 +278,17 @@ class BulkEditView(APIView):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
 
+        method = serializer.validated_data.get("method")
+        parameters = serializer.validated_data.get("parameters")
+        documents = serializer.validated_data.get("documents")
+
+        try:
+            # TODO: parameter validation
+            result = method(documents, **parameters)
+            return Response({"result": result})
+        except Exception as e:
+            return HttpResponseBadRequest(str(e))
+
 
 class PostDocumentView(APIView):
 
diff --git a/src/paperless/urls.py b/src/paperless/urls.py
index 9b390b139..dc416f05f 100755
--- a/src/paperless/urls.py
+++ b/src/paperless/urls.py
@@ -17,7 +17,8 @@ from documents.views import (
     IndexView,
     SearchAutoCompleteView,
     StatisticsView,
-    PostDocumentView
+    PostDocumentView,
+    BulkEditView
 )
 from paperless.views import FaviconView
 
@@ -50,6 +51,10 @@ urlpatterns = [
         re_path(r"^documents/post_document/", PostDocumentView.as_view(),
                 name="post_document"),
 
+
+        re_path(r"^documents/bulk_edit/", BulkEditView.as_view(),
+                name="bulk_edit"),
+
         path('token/', views.obtain_auth_token)
 
     ] + api_router.urls)),

From 63a58ccc38e2da9ed5a02fb3e650c9fb61ba1c2b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 14:30:59 +0100
Subject: [PATCH 0142/1300] a simple dialog that selects
 tags/correspondents/types

---
 src-ui/src/app/app.module.ts                  |  4 ++-
 .../select-dialog.component.html              | 15 ++++++++
 .../select-dialog.component.scss              |  0
 .../select-dialog.component.spec.ts           | 25 ++++++++++++++
 .../select-dialog/select-dialog.component.ts  | 34 +++++++++++++++++++
 5 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 src-ui/src/app/components/common/select-dialog/select-dialog.component.html
 create mode 100644 src-ui/src/app/components/common/select-dialog/select-dialog.component.scss
 create mode 100644 src-ui/src/app/components/common/select-dialog/select-dialog.component.spec.ts
 create mode 100644 src-ui/src/app/components/common/select-dialog/select-dialog.component.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index ad12c9c47..af66993c6 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -48,6 +48,7 @@ import { WidgetFrameComponent } from './components/dashboard/widgets/widget-fram
 import { WelcomeWidgetComponent } from './components/dashboard/widgets/welcome-widget/welcome-widget.component';
 import { YesNoPipe } from './pipes/yes-no.pipe';
 import { FileSizePipe } from './pipes/file-size.pipe';
+import { SelectDialogComponent } from './components/common/select-dialog/select-dialog.component';
 
 @NgModule({
   declarations: [
@@ -88,7 +89,8 @@ import { FileSizePipe } from './pipes/file-size.pipe';
     WidgetFrameComponent,
     WelcomeWidgetComponent,
     YesNoPipe,
-    FileSizePipe
+    FileSizePipe,
+    SelectDialogComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/common/select-dialog/select-dialog.component.html b/src-ui/src/app/components/common/select-dialog/select-dialog.component.html
new file mode 100644
index 000000000..8bde38d61
--- /dev/null
+++ b/src-ui/src/app/components/common/select-dialog/select-dialog.component.html
@@ -0,0 +1,15 @@
+<div class="modal-header">
+  <h4 class="modal-title" id="modal-basic-title">{{title}}</h4>
+  <button type="button" class="close" aria-label="Close" (click)="cancelClicked()">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body">
+
+  <app-input-select [items]="objects" [title]="message" [(ngModel)]="selected"></app-input-select>
+
+</div>
+<div class="modal-footer">
+  <button type="button" class="btn btn-outline-dark" (click)="cancelClicked()">Cancel</button>
+  <button type="button" class="btn btn-primary" (click)="selectClicked.emit(selected)">Select</button>
+</div>
\ No newline at end of file
diff --git a/src-ui/src/app/components/common/select-dialog/select-dialog.component.scss b/src-ui/src/app/components/common/select-dialog/select-dialog.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src-ui/src/app/components/common/select-dialog/select-dialog.component.spec.ts b/src-ui/src/app/components/common/select-dialog/select-dialog.component.spec.ts
new file mode 100644
index 000000000..3810bcbea
--- /dev/null
+++ b/src-ui/src/app/components/common/select-dialog/select-dialog.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SelectDialogComponent } from './select-dialog.component';
+
+describe('SelectDialogComponent', () => {
+  let component: SelectDialogComponent;
+  let fixture: ComponentFixture<SelectDialogComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ SelectDialogComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SelectDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts b/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts
new file mode 100644
index 000000000..76b23491c
--- /dev/null
+++ b/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts
@@ -0,0 +1,34 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { ObjectWithId } from 'src/app/data/object-with-id';
+
+@Component({
+  selector: 'app-select-dialog',
+  templateUrl: './select-dialog.component.html',
+  styleUrls: ['./select-dialog.component.scss']
+})
+
+export class SelectDialogComponent implements OnInit {
+  constructor(public activeModal: NgbActiveModal) { }
+
+  @Output()
+  public selectClicked = new EventEmitter()
+
+  @Input()
+  title = "Select"
+
+  @Input()
+  message = "Please select an object"
+
+  @Input()
+  objects: ObjectWithId[] = []
+
+  selected: number
+
+  ngOnInit(): void {
+  }
+
+  cancelClicked() {
+    this.activeModal.close()
+  }
+}

From 2c702eb568dff1d4d0a3e5cff0b7f07e96abc2a6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 14:46:38 +0100
Subject: [PATCH 0143/1300] fixed some issues with the data access service,
 support for requesting all IDs of filtered documents (required for selection)

---
 .../app/services/document-list-view.service.ts   |  2 +-
 .../services/rest/abstract-paperless-service.ts  |  6 +++---
 src-ui/src/app/services/rest/document.service.ts | 16 +++++++++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 811ac3c4b..149096591 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -90,7 +90,7 @@ export class DocumentListViewService {
 
   reload(onFinish?) {
     this.isReloading = true
-    this.documentService.list(
+    this.documentService.listFiltered(
       this.currentPage,
       this.currentPageSize,
       this.view.sortField,
diff --git a/src-ui/src/app/services/rest/abstract-paperless-service.ts b/src-ui/src/app/services/rest/abstract-paperless-service.ts
index 3feed320e..d05b4aced 100644
--- a/src-ui/src/app/services/rest/abstract-paperless-service.ts
+++ b/src-ui/src/app/services/rest/abstract-paperless-service.ts
@@ -54,9 +54,9 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
 
   private _listAll: Observable<Results<T>>
 
-  listAll(ordering?: string, extraParams?): Observable<Results<T>> {
+  listAll(sortField?: string, sortDirection?: string, extraParams?): Observable<Results<T>> {
     if (!this._listAll) {
-      this._listAll = this.list(1, 100000, ordering, extraParams).pipe(
+      this._listAll = this.list(1, 100000, sortField, sortDirection, extraParams).pipe(
         publishReplay(1),
         refCount()
       )
@@ -94,4 +94,4 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
     this._listAll = null
     return this.http.put<T>(this.getResourceUrl(o.id), o)
   }
-}
\ No newline at end of file
+}
diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index 4979ba8be..99ec1f3ee 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -64,8 +64,8 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     return doc
   }
 
-  list(page?: number, pageSize?: number, sortField?: string, sortDirection?: string, filterRules?: FilterRule[]): Observable<Results<PaperlessDocument>> {
-    return super.list(page, pageSize, sortField, sortDirection, this.filterRulesToQueryParams(filterRules)).pipe(
+  listFiltered(page?: number, pageSize?: number, sortField?: string, sortDirection?: string, filterRules?: FilterRule[], extraParams = {}): Observable<Results<PaperlessDocument>> {
+    return this.list(page, pageSize, sortField, sortDirection, Object.assign(extraParams, this.filterRulesToQueryParams(filterRules))).pipe(
       map(results => {
         results.results.forEach(doc => this.addObservablesToDocument(doc))
         return results
@@ -73,6 +73,12 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     )
   }
 
+  listAllFilteredIds(filterRules?: FilterRule[]): Observable<number[]> {
+    return this.listFiltered(1, 100000, null, null, filterRules, {"fields": "id"}).pipe(
+      map(response => response.results.map(doc => doc.id))
+    )
+  }
+
   getPreviewUrl(id: number, original: boolean = false): string {
     let url = this.getResourceUrl(id, 'preview')
     if (original) {
@@ -101,11 +107,11 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     return this.http.get<PaperlessDocumentMetadata>(this.getResourceUrl(id, 'metadata'))
   }
 
-  bulk_edit(ids: number[], method: string, args: any[]) {
+  bulkEdit(ids: number[], method: string, args: any) {
     return this.http.post(this.getResourceUrl(null, 'bulk_edit'), {
-      'ids': ids,
+      'documents': ids,
       'method': method,
-      'args': args
+      'parameters': args
     })
   }
 

From a8f27f79ddf517b9bcc24a280c7b0077e17f2a9f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 14:47:33 +0100
Subject: [PATCH 0144/1300] delete dialog: delay enable delete button

---
 .../delete-dialog/delete-dialog.component.html    |  2 +-
 .../delete-dialog/delete-dialog.component.ts      | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.html b/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.html
index 2de507549..52287fc69 100644
--- a/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.html
+++ b/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.html
@@ -10,5 +10,5 @@
     </div>
     <div class="modal-footer">
       <button type="button" class="btn btn-outline-dark" (click)="cancelClicked()">Cancel</button>
-      <button type="button" class="btn btn-danger" (click)="deleteClicked.emit()">Delete</button>
+      <button type="button" class="btn btn-danger" (click)="deleteClicked.emit()" [disabled]="!deleteButtonEnabled">Delete<span *ngIf="!deleteButtonEnabled"> ({{seconds}})</span></button>
     </div>
\ No newline at end of file
diff --git a/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.ts b/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.ts
index 20114c78c..38ec93bae 100644
--- a/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.ts
+++ b/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.ts
@@ -22,6 +22,21 @@ export class DeleteDialogComponent implements OnInit {
   @Input()
   message2
 
+  deleteButtonEnabled = true
+  seconds = 0
+
+  delayConfirm(seconds: number) {
+    this.deleteButtonEnabled = false
+    this.seconds = seconds
+    setTimeout(() => {
+      if (this.seconds <= 1) {
+        this.deleteButtonEnabled = true
+      } else {
+        this.delayConfirm(seconds - 1)
+      }
+    }, 1000)
+  }
+
   ngOnInit(): void {
   }
 

From 56dfc71bb9f5c45b58eb338b9deeee8e6b413c4e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 14:48:33 +0100
Subject: [PATCH 0145/1300] document list service: selection model

---
 .../services/document-list-view.service.ts    | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 149096591..b3fe351ac 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -118,6 +118,7 @@ export class DocumentListViewService {
     //want changes in the filter editor to propagate into here right away.
     this.view.filterRules = cloneFilterRules(filterRules)
     this.reload()
+    this.reduceSelectionToFilter()
     this.saveDocumentListView()
   }
 
@@ -192,6 +193,49 @@ export class DocumentListViewService {
     }
   }
 
+  selected = new Set<number>()
+
+  selectNone() {
+    this.selected.clear()
+  }
+
+  private reduceSelectionToFilter() {
+    if (this.selected.size > 0) {
+      this.documentService.listAllFilteredIds(this.filterRules).subscribe(ids => {
+        let subset = new Set<number>()
+        for (let id of ids) {
+          if (this.selected.has(id)) {
+            subset.add(id)
+          }
+        }
+        this.selected = subset
+      })
+    }
+  }
+
+  selectAll() {
+    this.documentService.listAllFilteredIds(this.filterRules).subscribe(ids => ids.forEach(id => this.selected.add(id)))
+  }
+
+  selectPage() {
+    this.selected.clear()
+    this.documents.forEach(doc => {
+      this.selected.add(doc.id)
+    })
+  }
+
+  isSelected(d: PaperlessDocument) {
+    return this.selected.has(d.id)
+  }
+
+  setSelected(d: PaperlessDocument, value: boolean) {
+    if (value) {
+      this.selected.add(d.id)
+    } else if (!value) {
+      this.selected.delete(d.id)
+    }
+  }
+
   constructor(private documentService: DocumentService) { 
     let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
     if (documentListViewConfigJson) {

From d1f285113d2035aebc21a4f91d1e18889b7b78ad Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 14:49:22 +0100
Subject: [PATCH 0146/1300] bulk edit menu and methods

---
 .../document-list.component.html              |  34 +++---
 .../document-list/document-list.component.ts  | 112 +++++++++++++++++-
 2 files changed, 129 insertions(+), 17 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 58c32e9d1..24def7d64 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -7,22 +7,19 @@
       </svg>
       Bulk edit
     </button>
-    <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-      <button ngbDropdownItem>Select page</button>
-      <button ngbDropdownItem>Select all</button>
-      <button ngbDropdownItem>Select none</button>
+    <div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="shadow">
+      <button ngbDropdownItem (click)="list.selectPage()">Select page</button>
+      <button ngbDropdownItem (click)="list.selectAll()">Select all</button>
+      <button ngbDropdownItem (click)="list.selectNone()">Select none</button>
       <div class="dropdown-divider"></div>
-      <button ngbDropdownItem>Re-create archived document</button>
+      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkSetCorrespondent()">Set correspondent</button>
+      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkRemoveCorrespondent()">Remove correspondent</button>
+      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkSetDocumentType()">Set document type</button>
+      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkRemoveDocumentType()">Remove document type</button>
+      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkAddTag()">Add tag</button>
+      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkRemoveTag()">Remove tag</button>
       <div class="dropdown-divider"></div>
-      <button ngbDropdownItem>Set correspondent</button>
-      <button ngbDropdownItem>Remove correspondent</button>
-      <button ngbDropdownItem>Set document type</button>
-      <button ngbDropdownItem>Remove document type</button>
-      <button ngbDropdownItem>Add tag</button>
-      <button ngbDropdownItem>Remove tag</button>
-      <div class="dropdown-divider"></div>
-      <button ngbDropdownItem>Delete</button>
-
+      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkDelete()">Delete</button>
     </div>
   </div>
 
@@ -101,7 +98,7 @@
 </div>
 
 <div class="d-flex justify-content-between align-items-center">
-  <p>{{list.collectionSize || 0}} document(s) <span *ngIf="isFiltered">(filtered)</span></p>
+  <p><span *ngIf="list.selected.size > 0">Selected {{list.selected.size}} of </span>{{list.collectionSize || 0}} document(s) <span *ngIf="isFiltered">(filtered)</span></p>
   <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
   [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
 </div>
@@ -113,6 +110,7 @@
 
 <table class="table table-sm border shadow-sm" *ngIf="displayMode == 'details'">
   <thead>
+    <th></th>
     <th class="d-none d-lg-table-cell">ASN</th>
     <th class="d-none d-md-table-cell">Correspondent</th>
     <th>Title</th>
@@ -122,6 +120,12 @@
   </thead>
   <tbody>
     <tr *ngFor="let d of list.documents">
+      <td>
+        <div class="custom-control custom-checkbox">
+          <input type="checkbox" class="custom-control-input" id="docCheck{{d.id}}" [checked]="list.isSelected(d)" (change)="list.setSelected(d, $event.target.checked)">
+          <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>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 09e73dd96..4d5597220 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -2,14 +2,21 @@ import { Component, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 import { cloneFilterRules, FilterRule } from 'src/app/data/filter-rule';
 import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { SavedViewConfig } from 'src/app/data/saved-view-config';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
-import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
+import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
+import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
+import { DocumentService, DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
+import { TagService } from 'src/app/services/rest/tag.service';
 import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
 import { Toast, ToastService } from 'src/app/services/toast.service';
 import { environment } from 'src/environments/environment';
+import { DeleteDialogComponent } from '../common/delete-dialog/delete-dialog.component';
+import { SelectDialogComponent } from '../common/select-dialog/select-dialog.component';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
 
 @Component({
@@ -25,7 +32,11 @@ export class DocumentListComponent implements OnInit {
     public route: ActivatedRoute,
     private toastService: ToastService,
     public modalService: NgbModal,
-    private titleService: Title) { }
+    private titleService: Title,
+    private correspondentService: CorrespondentService,
+    private documentTypeService: DocumentTypeService,
+    private tagService: TagService,
+    private documentService: DocumentService) { }
 
   displayMode = 'smallCards' // largeCards, smallCards, details
 
@@ -142,4 +153,101 @@ export class DocumentListComponent implements OnInit {
     this.applyFilterRules()
   }
 
+  private executeBulkOperation(method: string, args): Observable<any> {
+    return this.documentService.bulkEdit(Array.from(this.list.selected), method, args).pipe(
+      map(r => {
+
+        this.list.reload()
+        this.list.selectNone()
+
+        return r
+      })
+    )
+  }
+
+  bulkSetCorrespondent() {
+    let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Select correspondent"
+    modal.componentInstance.message = `Select the correspondent you wish to assign to ${this.list.selected.size} selected document(s):`
+    this.correspondentService.listAll().subscribe(response => {
+      modal.componentInstance.objects = response.results
+    })
+    modal.componentInstance.selectClicked.subscribe(selectedId => {
+      this.executeBulkOperation('set_correspondent', {"correspondent": selectedId}).subscribe(
+        response => {
+          modal.close()
+        }
+      )
+    })
+  }
+
+  bulkRemoveCorrespondent() {
+    this.executeBulkOperation('set_correspondent', {"correspondent": null}).subscribe(r => {})
+  }
+
+  bulkSetDocumentType() {
+    let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Select document type"
+    modal.componentInstance.message = `Select the document type you wish to assign to ${this.list.selected.size} selected document(s):`
+    this.documentTypeService.listAll().subscribe(response => {
+      modal.componentInstance.objects = response.results
+    })
+    modal.componentInstance.selectClicked.subscribe(selectedId => {
+      this.executeBulkOperation('set_document_type', {"document_type": selectedId}).subscribe(
+        response => {
+          modal.close()
+        }
+      )
+    })
+  }
+
+  bulkRemoveDocumentType() {
+    this.executeBulkOperation('set_document_type', {"document_type": null}).subscribe(r => {})
+  }
+
+  bulkAddTag() {
+    let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Select tag"
+    modal.componentInstance.message = `Select the tag you wish to assign to ${this.list.selected.size} selected document(s):`
+    this.tagService.listAll().subscribe(response => {
+      modal.componentInstance.objects = response.results
+    })
+    modal.componentInstance.selectClicked.subscribe(selectedId => {
+      this.executeBulkOperation('add_tag', {"tag": selectedId}).subscribe(
+        response => {
+          modal.close()
+        }
+      )
+    })
+  }
+
+  bulkRemoveTag() {
+    let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Select tag"
+    modal.componentInstance.message = `Select the tag you wish to remove from ${this.list.selected.size} selected document(s):`
+    this.tagService.listAll().subscribe(response => {
+      modal.componentInstance.objects = response.results
+    })
+    modal.componentInstance.selectClicked.subscribe(selectedId => {
+      this.executeBulkOperation('remove_tag', {"tag": selectedId}).subscribe(
+        response => {
+          modal.close()
+        }
+      )
+    })
+  }
+
+  bulkDelete() {
+    let modal = this.modalService.open(DeleteDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.delayConfirm(5)
+    modal.componentInstance.message = `This operation will permanently delete all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.message2 = `This operation cannot be undone.`
+    modal.componentInstance.deleteClicked.subscribe(() => {
+      this.executeBulkOperation("delete", {}).subscribe(
+        response => {
+          modal.close()
+        }
+      )
+    })    
+  }
 }

From 66240188c750d215870e9eda6ee0a4fda1cd064d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 14:51:20 +0100
Subject: [PATCH 0147/1300] import fix

---
 src/documents/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/documents/views.py b/src/documents/views.py
index 4ce78348e..5e173d703 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -31,7 +31,6 @@ from rest_framework.viewsets import (
 import documents.index as index
 from paperless.db import GnuPG
 from paperless.views import StandardPagination
-from .bulk_edit import perform_bulk_edit
 from .filters import (
     CorrespondentFilterSet,
     DocumentFilterSet,

From d1d09ac6acf8f8d539483c6af464188cdde322b8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 17:35:21 +0100
Subject: [PATCH 0148/1300] checboxes for small cards. does not work yet.

---
 .../document-card-small.component.html                | 11 ++++++++++-
 .../document-card-small.component.scss                |  8 ++++++++
 .../document-card-small.component.ts                  |  2 ++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index da469ebc4..8993674ba 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,7 +1,16 @@
-<div class="col p-2 h-100" style="width: 16rem;">
+<div class="col p-2 h-100 document-card" style="width: 16rem;">
   <div class="card h-100 shadow-sm">
     <div class="border-bottom">
       <img class="card-img doc-img" [src]="getThumbUrl()">
+
+      <div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
+        <div class="custom-control custom-checkbox">
+          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [(ngModel)]="selected">
+          <label class="custom-control-label" for="smallCardCheck{{document.id}}">L</label>
+        </div>
+      </div>
+
+
       <div style="top: 0; right: 0; font-size: large" class="text-right position-absolute mr-1">
         <div *ngFor="let t of getTagsLimited$() | async">
           <app-tag [tag]="t" (click)="clickTag.emit(t.id)" [clickable]="true" linkTitle="Filter by tag"></app-tag>
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
index 0068667d0..ba7190615 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
@@ -2,4 +2,12 @@
   object-fit: cover;
   object-position: top;
   height: 200px;
+}
+
+.document-card-check {
+  display: none
+}
+
+.document-card:hover .document-card-check {
+  display: block;
 }
\ No newline at end of file
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
index d60552d4f..037c02cf0 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
@@ -13,6 +13,8 @@ export class DocumentCardSmallComponent implements OnInit {
 
   constructor(private documentService: DocumentService) { }
 
+  selected = false
+
   @Input()
   document: PaperlessDocument
 

From b452816a29791e31c531035c76ff15a8b15de514 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 17:49:32 +0100
Subject: [PATCH 0149/1300] fixes #122

---
 docs/configuration.rst    | 10 ++++++++++
 paperless.conf.example    |  1 +
 src/paperless/settings.py |  6 ++++++
 3 files changed, 17 insertions(+)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 2ec34f803..d3f47215b 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -152,6 +152,16 @@ PAPERLESS_AUTO_LOGIN_USERNAME=<username>
 
     Defaults to none, which disables this feature.
 
+
+PAPERLESS_COOKIE_PREFIX=<str>
+    Specify a prefix that is added to the cookies used by paperless to identify
+    the currently logged in user. This is useful for when you're running two
+    instances of paperless on the same host.
+
+    After changing this, you will have to login again.
+
+    Defaults to ``""``, which does not alter the cookie names.
+
 .. _configuration-ocr:
 
 OCR settings
diff --git a/paperless.conf.example b/paperless.conf.example
index 32c0e56b4..910fc22a0 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -30,6 +30,7 @@
 #PAPERLESS_FORCE_SCRIPT_NAME=
 #PAPERLESS_STATIC_URL=/static/
 #PAPERLESS_AUTO_LOGIN_USERNAME=
+#PAPERLESS_COOKIE_PREFIX=
 
 # OCR settings
 
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index cf0c3e28d..1a6b80a0c 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -210,6 +210,12 @@ AUTH_PASSWORD_VALIDATORS = [
 
 DATA_UPLOAD_MAX_NUMBER_FIELDS = None
 
+COOKIE_PREFIX = os.getenv("PAPERLESS_COOKIE_PREFIX", "")
+
+CSRF_COOKIE_NAME = f"{COOKIE_PREFIX}csrftoken"
+SESSION_COOKIE_NAME = f"{COOKIE_PREFIX}sessionid"
+LANGUAGE_COOKIE_NAME = f"{COOKIE_PREFIX}django_language"
+
 ###############################################################################
 # Database                                                                    #
 ###############################################################################

From 0b7ffa31d1f3953a37314555823a396d4241b922 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 17:57:56 +0100
Subject: [PATCH 0150/1300] fixes #115

---
 src-ui/src/app/app.module.ts                     |  4 +++-
 .../document-card-large.component.html           |  2 +-
 .../document-card-small.component.html           |  2 +-
 .../document-list/document-list.component.html   |  2 +-
 src-ui/src/app/pipes/document-title.pipe.spec.ts |  8 ++++++++
 src-ui/src/app/pipes/document-title.pipe.ts      | 16 ++++++++++++++++
 6 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 src-ui/src/app/pipes/document-title.pipe.spec.ts
 create mode 100644 src-ui/src/app/pipes/document-title.pipe.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index ad12c9c47..675c882a7 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -48,6 +48,7 @@ import { WidgetFrameComponent } from './components/dashboard/widgets/widget-fram
 import { WelcomeWidgetComponent } from './components/dashboard/widgets/welcome-widget/welcome-widget.component';
 import { YesNoPipe } from './pipes/yes-no.pipe';
 import { FileSizePipe } from './pipes/file-size.pipe';
+import { DocumentTitlePipe } from './pipes/document-title.pipe';
 
 @NgModule({
   declarations: [
@@ -88,7 +89,8 @@ import { FileSizePipe } from './pipes/file-size.pipe';
     WidgetFrameComponent,
     WelcomeWidgetComponent,
     YesNoPipe,
-    FileSizePipe
+    FileSizePipe,
+    DocumentTitlePipe
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index bfc59b526..8f3fced66 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -12,7 +12,7 @@
               <a *ngIf="clickCorrespondent.observers.length ; else nolink" [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>
               <ng-template #nolink>{{(document.correspondent$ | async)?.name}}</ng-template>:
             </ng-container>
-            {{document.title}}
+            {{document.title | documentTitle}}
             <app-tag [tag]="t" linkTitle="Filter by tag" *ngFor="let t of document.tags$ | async" class="ml-1" (click)="clickTag.emit(t.id)" [clickable]="clickTag.observers.length"></app-tag>
           </h5>
           <h5 class="card-title" *ngIf="document.archive_serial_number">#{{document.archive_serial_number}}</h5>
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index da469ebc4..86e28442c 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -17,7 +17,7 @@
         <ng-container *ngIf="document.correspondent">
           <a [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>:
         </ng-container>
-        {{document.title}}
+        {{document.title | documentTitle}}
       </p>
     </div>
     <div class="card-footer">
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 1a8c7a781..c4fa0d4d7 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -105,7 +105,7 @@
         </ng-container>
       </td>
       <td>
-        <a routerLink="/documents/{{d.id}}" title="Edit document" style="overflow-wrap: anywhere;">{{d.title}}</a>
+        <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)="filterByTag(t.id)"></app-tag>
       </td>
       <td class="d-none d-xl-table-cell">
diff --git a/src-ui/src/app/pipes/document-title.pipe.spec.ts b/src-ui/src/app/pipes/document-title.pipe.spec.ts
new file mode 100644
index 000000000..29835abd6
--- /dev/null
+++ b/src-ui/src/app/pipes/document-title.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { DocumentTitlePipe } from './document-title.pipe';
+
+describe('DocumentTitlePipe', () => {
+  it('create an instance', () => {
+    const pipe = new DocumentTitlePipe();
+    expect(pipe).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/pipes/document-title.pipe.ts b/src-ui/src/app/pipes/document-title.pipe.ts
new file mode 100644
index 000000000..09445f595
--- /dev/null
+++ b/src-ui/src/app/pipes/document-title.pipe.ts
@@ -0,0 +1,16 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'documentTitle'
+})
+export class DocumentTitlePipe implements PipeTransform {
+
+  transform(value: string): unknown {
+    if (value) {
+      return value
+    } else {
+      return "(no title)"
+    }
+  }
+
+}

From de5d360d52d21e3695a929841402cbb22e2fe8bc Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 11 Dec 2020 14:22:02 -0800
Subject: [PATCH 0151/1300] Use ng2-pdf-viewer

And remove now-unused safeUrl pipe
---
 src-ui/package-lock.json                      | 63 ++++++++++++++++++-
 src-ui/package.json                           |  1 +
 src-ui/src/app/app.module.ts                  |  6 +-
 .../document-detail.component.html            | 12 ++--
 .../document-detail.component.scss            |  8 +++
 src-ui/src/app/pipes/safe.pipe.spec.ts        |  8 ---
 src-ui/src/app/pipes/safe.pipe.ts             | 19 ------
 7 files changed, 78 insertions(+), 39 deletions(-)
 delete mode 100644 src-ui/src/app/pipes/safe.pipe.spec.ts
 delete mode 100644 src-ui/src/app/pipes/safe.pipe.ts

diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json
index b6b66e1c6..5eca0b3c0 100644
--- a/src-ui/package-lock.json
+++ b/src-ui/package-lock.json
@@ -2215,6 +2215,11 @@
       "integrity": "sha512-UV1/ZJMC+HcP902wWdpC43cAcGu0IQk/I5bXjP2aSuCjsk3cE74mDvFrLKga7oDC170ugOAYBwfT4DSQW3akDA==",
       "dev": true
     },
+    "@types/pdfjs-dist": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@types/pdfjs-dist/-/pdfjs-dist-2.1.7.tgz",
+      "integrity": "sha512-nQIwcPUhkAIyn7x9NS0lR/qxYfd5unRtfGkMjvpgF4Sh28IXftRymaNmFKTTdejDNY25NDGSIyjwj/BRwAPexg=="
+    },
     "@types/q": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
@@ -3023,6 +3028,16 @@
       "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
       "dev": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "blob": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
@@ -5508,6 +5523,13 @@
         "schema-utils": "^2.6.5"
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -8208,6 +8230,13 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
+    "nan": {
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+      "dev": true,
+      "optional": true
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -8260,6 +8289,23 @@
         "moment": "2.18.1"
       }
     },
+    "ng2-pdf-viewer": {
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/ng2-pdf-viewer/-/ng2-pdf-viewer-6.3.2.tgz",
+      "integrity": "sha512-H2tBhDd+Lq6CUzK2g54HsCcZDR2wTn1sDjYqKY3yF0Ydasl2R5ppCKynZBU/zge4EKvmHglJI120FbQMpJKDYQ==",
+      "requires": {
+        "@types/pdfjs-dist": "^2.1.4",
+        "pdfjs-dist": "^2.4.456",
+        "tslib": "^1.10.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
     "ngx-cookie-service": {
       "version": "10.1.1",
       "resolved": "https://registry.npmjs.org/ngx-cookie-service/-/ngx-cookie-service-10.1.1.tgz",
@@ -9270,6 +9316,11 @@
         "sha.js": "^2.4.8"
       }
     },
+    "pdfjs-dist": {
+      "version": "2.5.207",
+      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.5.207.tgz",
+      "integrity": "sha512-xGDUhnCYPfHy+unMXCLCJtlpZaaZ17Ew3WIL0tnSgKFUZXHAPD49GO9xScyszSsQMoutNDgRb+rfBXIaX/lJbw=="
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -13228,7 +13279,11 @@
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
           "dev": true,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
         },
         "glob-parent": {
           "version": "3.1.0",
@@ -13832,7 +13887,11 @@
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
           "dev": true,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
         },
         "glob-parent": {
           "version": "3.1.0",
diff --git a/src-ui/package.json b/src-ui/package.json
index af3334db9..6293f2672 100644
--- a/src-ui/package.json
+++ b/src-ui/package.json
@@ -23,6 +23,7 @@
     "@ng-bootstrap/ng-bootstrap": "^8.0.0",
     "bootstrap": "^4.5.0",
     "ng-bootstrap": "^1.6.3",
+    "ng2-pdf-viewer": "^6.3.2",
     "ngx-cookie-service": "^10.1.1",
     "ngx-file-drop": "^10.0.0",
     "ngx-infinite-scroll": "^9.1.0",
diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 7f2e8414e..40c0991e7 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -14,7 +14,6 @@ import { LogsComponent } from './components/manage/logs/logs.component';
 import { SettingsComponent } from './components/manage/settings/settings.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { DatePipe } from '@angular/common';
-import { SafePipe } from './pipes/safe.pipe';
 import { NotFoundComponent } from './components/not-found/not-found.component';
 import { CorrespondentListComponent } from './components/manage/correspondent-list/correspondent-list.component';
 import { DeleteDialogComponent } from './components/common/delete-dialog/delete-dialog.component';
@@ -45,6 +44,7 @@ import { SavedViewWidgetComponent } from './components/dashboard/widgets/saved-v
 import { StatisticsWidgetComponent } from './components/dashboard/widgets/statistics-widget/statistics-widget.component';
 import { UploadFileWidgetComponent } from './components/dashboard/widgets/upload-file-widget/upload-file-widget.component';
 import { WidgetFrameComponent } from './components/dashboard/widgets/widget-frame/widget-frame.component';
+import { PdfViewerModule } from 'ng2-pdf-viewer';
 
 @NgModule({
   declarations: [
@@ -57,7 +57,6 @@ import { WidgetFrameComponent } from './components/dashboard/widgets/widget-fram
     DocumentTypeListComponent,
     LogsComponent,
     SettingsComponent,
-    SafePipe,
     NotFoundComponent,
     CorrespondentEditDialogComponent,
     DeleteDialogComponent,
@@ -92,7 +91,8 @@ import { WidgetFrameComponent } from './components/dashboard/widgets/widget-fram
     FormsModule,
     ReactiveFormsModule,
     NgxFileDropModule,
-    InfiniteScrollModule
+    InfiniteScrollModule,
+    PdfViewerModule
   ],
   providers: [
     DatePipe,
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 5a5563571..93aec64bc 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -14,14 +14,14 @@
             </svg>
             <span class="d-none d-lg-inline"> Download</span>
         </a>
-    
+
         <div class="btn-group" ngbDropdown role="group" *ngIf="metadata?.paperless__has_archive_version">
           <button class="btn btn-sm btn-outline-primary dropdown-toggle-split" ngbDropdownToggle></button>
           <div class="dropdown-menu" ngbDropdownMenu>
             <a ngbDropdownItem [href]="downloadOriginalUrl">Download original</a>
           </div>
         </div>
-    
+
       </div>
 
 
@@ -66,10 +66,8 @@
     </div>
 
     <div class="col-xl">
-        <object [data]="previewUrl | safe" type="application/pdf" width="100%" height="100%">
-            <p>Your browser does not support PDFs.
-                <a href="previewUrl">Download the PDF</a>.</p>
-        </object>
-
+      <div class="pdf-viewer-container">
+        <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="false"></pdf-viewer>
+      </div>
     </div>
 </div>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.scss b/src-ui/src/app/components/document-detail/document-detail.component.scss
index e69de29bb..b4d720018 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.scss
+++ b/src-ui/src/app/components/document-detail/document-detail.component.scss
@@ -0,0 +1,8 @@
+.pdf-viewer-container {
+  height: calc(100vh - 160px);
+  top: 70px;
+  position: sticky;
+  padding: 10px;
+  background-color: gray;
+  overflow-y: scroll;
+}
diff --git a/src-ui/src/app/pipes/safe.pipe.spec.ts b/src-ui/src/app/pipes/safe.pipe.spec.ts
deleted file mode 100644
index 49ee0ad14..000000000
--- a/src-ui/src/app/pipes/safe.pipe.spec.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { SafePipe } from './safe.pipe';
-
-describe('SafePipe', () => {
-  it('create an instance', () => {
-    const pipe = new SafePipe();
-    expect(pipe).toBeTruthy();
-  });
-});
diff --git a/src-ui/src/app/pipes/safe.pipe.ts b/src-ui/src/app/pipes/safe.pipe.ts
deleted file mode 100644
index f2d77a72d..000000000
--- a/src-ui/src/app/pipes/safe.pipe.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core';
-import { DomSanitizer } from '@angular/platform-browser';
-
-@Pipe({
-  name: 'safe'
-})
-export class SafePipe implements PipeTransform {
-
-  constructor(private sanitizer: DomSanitizer) { }
-
-  transform(url) {
-    if (url == null) {
-      return this.sanitizer.bypassSecurityTrustResourceUrl("")
-    } else {
-      return this.sanitizer.bypassSecurityTrustResourceUrl(url);
-    }
-  }
-
-}
\ No newline at end of file

From 80b47fa287aaaf637feb31073849996cd54fca0a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 23:33:59 +0100
Subject: [PATCH 0152/1300] codestyle

---
 src/documents/bulk_edit.py | 17 ++++++++++-------
 src/documents/tasks.py     |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index 1349f9d54..aa5b8ea3f 100644
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -8,11 +8,12 @@ def set_correspondent(doc_ids, correspondent):
     if correspondent:
         correspondent = Correspondent.objects.get(id=correspondent)
 
-    qs = Document.objects.filter(Q(id__in=doc_ids) & ~Q(correspondent=correspondent))
+    qs = Document.objects.filter(
+        Q(id__in=doc_ids) & ~Q(correspondent=correspondent))
     affected_docs = [doc.id for doc in qs]
     qs.update(correspondent=correspondent)
 
-    async_task("documents.tasks.bulk_rename_files", affected_docs)
+    async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
 
     return "OK"
 
@@ -21,11 +22,12 @@ def set_document_type(doc_ids, document_type):
     if document_type:
         document_type = DocumentType.objects.get(id=document_type)
 
-    qs = Document.objects.filter(Q(id__in=doc_ids) & ~Q(document_type=document_type))
+    qs = Document.objects.filter(
+        Q(id__in=doc_ids) & ~Q(document_type=document_type))
     affected_docs = [doc.id for doc in qs]
     qs.update(document_type=document_type)
 
-    async_task("documents.tasks.bulk_rename_files", affected_docs)
+    async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
 
     return "OK"
 
@@ -38,10 +40,11 @@ def add_tag(doc_ids, tag):
     DocumentTagRelationship = Document.tags.through
 
     DocumentTagRelationship.objects.bulk_create([
-        DocumentTagRelationship(document_id=doc, tag_id=tag) for doc in affected_docs
+        DocumentTagRelationship(
+            document_id=doc, tag_id=tag) for doc in affected_docs
     ])
 
-    async_task("documents.tasks.bulk_rename_files", affected_docs)
+    async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
 
     return "OK"
 
@@ -58,7 +61,7 @@ def remove_tag(doc_ids, tag):
         Q(tag_id=tag)
     ).delete()
 
-    async_task("documents.tasks.bulk_rename_files", affected_docs)
+    async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
 
     return "OK"
 
diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index af4c91448..fafe6e10f 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -90,7 +90,7 @@ def sanity_check():
         return "No issues detected."
 
 
-def bulk_rename_files(ids):
-    qs = Document.objects.filter(id__in=ids)
+def bulk_rename_files(document_ids):
+    qs = Document.objects.filter(id__in=document_ids)
     for doc in qs:
         post_save.send(Document, instance=doc, created=False)

From f5df9108945cdcfe0c095bcb64903b9269adad2f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 23:34:24 +0100
Subject: [PATCH 0153/1300] document list validation.

---
 src/documents/serialisers.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 5418ec0fb..92fc35719 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -185,6 +185,13 @@ class BulkEditSerializer(serializers.Serializer):
 
     parameters = serializers.DictField(allow_empty=True)
 
+    def validate_documents(self, documents):
+        count = Document.objects.filter(id__in=documents).count()
+        if not count == len(documents):
+            raise serializers.ValidationError(
+                "Some documents don't exist or were specified twice.")
+        return documents
+
     def validate_method(self, method):
         if method == "set_correspondent":
             return bulk_edit.set_correspondent

From a85792e327ffb5604f40c69d72cfce47cfa2b623 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 11 Dec 2020 23:34:34 +0100
Subject: [PATCH 0154/1300] tests.

---
 src/documents/tests/test_api.py | 116 +++++++++++++++++++++++++++++++-
 1 file changed, 115 insertions(+), 1 deletion(-)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index ab1716366..bd0d9a421 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -1,14 +1,16 @@
+import json
 import os
 import shutil
 import tempfile
 from unittest import mock
 
 from django.contrib.auth.models import User
+from django.test import client
 from pathvalidate import ValidationError
 from rest_framework.test import APITestCase
 from whoosh.writing import AsyncWriter
 
-from documents import index
+from documents import index, bulk_edit
 from documents.models import Document, Correspondent, DocumentType, Tag
 from documents.tests.utils import DirectoriesMixin
 
@@ -515,3 +517,115 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertFalse(meta['has_archive_version'])
         self.assertGreater(len(meta['original_metadata']), 0)
         self.assertIsNone(meta['archive_metadata'])
+
+
+class TestBulkEdit(DirectoriesMixin, APITestCase):
+
+    def setUp(self):
+        super(TestBulkEdit, self).setUp()
+
+        user = User.objects.create_superuser(username="temp_admin")
+        self.client.force_login(user=user)
+
+        patcher = mock.patch('documents.bulk_edit.async_task')
+        self.async_task = patcher.start()
+        self.addCleanup(patcher.stop)
+        self.c1 = Correspondent.objects.create(name="c1")
+        self.c2 = Correspondent.objects.create(name="c2")
+        self.dt1 = DocumentType.objects.create(name="dt1")
+        self.dt2 = DocumentType.objects.create(name="dt2")
+        self.t1 = Tag.objects.create(name="t1")
+        self.t2 = Tag.objects.create(name="t2")
+        self.doc1 = Document.objects.create(checksum="A", title="A")
+        self.doc2 = Document.objects.create(checksum="B", title="B", correspondent=self.c1, document_type=self.dt1)
+        self.doc3 = Document.objects.create(checksum="C", title="C", correspondent=self.c2, document_type=self.dt2)
+        self.doc4 = Document.objects.create(checksum="D", title="D")
+        self.doc5 = Document.objects.create(checksum="E", title="E")
+        self.doc2.tags.add(self.t1)
+        self.doc3.tags.add(self.t2)
+        self.doc4.tags.add(self.t1, self.t2)
+
+    def test_set_correspondent(self):
+        self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1)
+        bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], self.c2.id)
+        self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 3)
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id])
+
+    def test_unset_correspondent(self):
+        self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1)
+        bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], None)
+        self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 0)
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id])
+
+    def test_set_document_type(self):
+        self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1)
+        bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], self.dt2.id)
+        self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 3)
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id])
+
+    def test_unset_document_type(self):
+        self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1)
+        bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], None)
+        self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 0)
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id])
+
+    def test_add_tag(self):
+        self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2)
+        bulk_edit.add_tag([self.doc1.id, self.doc2.id, self.doc3.id, self.doc4.id], self.t1.id)
+        self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 4)
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc3.id])
+
+
+    def test_remove_tag(self):
+        self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2)
+        bulk_edit.remove_tag([self.doc1.id, self.doc3.id, self.doc4.id], self.t1.id)
+        self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 1)
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        self.assertCountEqual(kwargs['document_ids'], [self.doc4.id])
+
+    def test_delete(self):
+        self.assertEqual(Document.objects.count(), 5)
+        bulk_edit.delete([self.doc1.id, self.doc2.id])
+        self.assertEqual(Document.objects.count(), 3)
+        self.assertCountEqual([doc.id for doc in Document.objects.all()], [self.doc3.id, self.doc4.id, self.doc5.id])
+
+    def test_api(self):
+        self.assertEqual(Document.objects.count(), 5)
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc1.id],
+            "method": "delete",
+            "parameters": {}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(Document.objects.count(), 4)
+
+    def test_api_invalid_doc(self):
+        self.assertEqual(Document.objects.count(), 5)
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [-235],
+            "method": "delete",
+            "parameters": {}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(Document.objects.count(), 5)
+
+    def test_api_invalid_method(self):
+        self.assertEqual(Document.objects.count(), 5)
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc2.id],
+            "method": "exterminate",
+            "parameters": {}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(Document.objects.count(), 5)

From e7cb35853615791b7f18aeff770b8fcb34abe43e Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 11 Dec 2020 15:20:47 -0800
Subject: [PATCH 0155/1300] Fix broken card tags / correspondent links

---
 .../document-card-large.component.html        |  4 ++--
 .../document-card-small.component.html        |  8 ++++----
 .../document-list.component.html              | 12 +++++------
 .../document-list/document-list.component.ts  | 20 ++++++++++++++++++-
 .../filter-editor/filter-editor.component.ts  |  9 ++++++---
 5 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index bfc59b526..430a76a23 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -7,7 +7,7 @@
       <div class="card-body">
 
         <div class="d-flex justify-content-between align-items-center">
-          <h5 class="card-title">    
+          <h5 class="card-title">
             <ng-container *ngIf="document.correspondent">
               <a *ngIf="clickCorrespondent.observers.length ; else nolink" [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>
               <ng-template #nolink>{{(document.correspondent$ | async)?.name}}</ng-template>:
@@ -52,4 +52,4 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 95cf2e191..b2e7b0218 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -11,7 +11,7 @@
         </div>
       </div>
     </div>
-    
+
     <div class="card-body p-2">
       <p class="card-text">
         <ng-container *ngIf="document.correspondent">
@@ -44,7 +44,7 @@
         </div>
         <small class="text-muted">{{document.created | date}}</small>
       </div>
-      
+
     </div>
-  </div>  
-</div>
\ No newline at end of file
+  </div>
+</div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index f8c3445c5..a6ec1b741 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -64,7 +64,7 @@
 
 <div class="card w-100 mb-3">
   <div class="card-body">
-    <app-filter-editor [(filterRules)]="filterRules" (apply)="applyFilterRules()" (clear)="clearFilterRules()"></app-filter-editor>
+    <app-filter-editor [(filterRules)]="filterRules" (apply)="applyFilterRules()" (clear)="clearFilterRules()" #filterEditor></app-filter-editor>
   </div>
 </div>
 
@@ -75,7 +75,7 @@
 </div>
 
 <div *ngIf="displayMode == 'largeCards'">
-  <app-document-card-large *ngFor="let d of list.documents" [document]="d" [details]="d.content" (clickTag)="filterByTag($event)" (clickCorrespondent)="filterByCorrespondent($event)">
+  <app-document-card-large *ngFor="let d of list.documents" [document]="d" [details]="d.content" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)">
   </app-document-card-large>
 </div>
 
@@ -95,16 +95,16 @@
       </td>
       <td class="d-none d-md-table-cell">
         <ng-container *ngIf="d.correspondent">
-          <a [routerLink]="" (click)="filterByCorrespondent(d.correspondent)" title="Filter by correspondent">{{(d.correspondent$ | async)?.name}}</a>
+          <a [routerLink]="" (click)="clickCorrespondent(d.correspondent)" 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}}</a>
-        <app-tag [tag]="t" *ngFor="let t of d.tags$ | async" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="filterByTag(t.id)"></app-tag>
+        <app-tag [tag]="t" *ngFor="let t of d.tags$ | async" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="clickTag(t)"></app-tag>
       </td>
       <td class="d-none d-xl-table-cell">
         <ng-container *ngIf="d.document_type">
-          <a [routerLink]="" (click)="filterByDocumentType(d.document_type)" title="Filter by document type">{{(d.document_type$ | async)?.name}}</a>
+          <a [routerLink]="" (click)="clickDocumentType(d.document_type)" title="Filter by document type">{{(d.document_type$ | async)?.name}}</a>
         </ng-container>
       </td>
       <td>
@@ -119,5 +119,5 @@
 
 
 <div class=" m-n2 row" *ngIf="displayMode == 'smallCards'">
-  <app-document-card-small [document]="d" *ngFor="let d of list.documents" (clickTag)="filterByTag($event)" (clickCorrespondent)="filterByCorrespondent($event)"></app-document-card-small>
+  <app-document-card-small [document]="d" *ngFor="let d of list.documents" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
 </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 3ce00beab..5bbd5b49d 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -11,6 +11,10 @@ import { SavedViewConfigService } from 'src/app/services/saved-view-config.servi
 import { Toast, ToastService } from 'src/app/services/toast.service';
 import { environment } from 'src/environments/environment';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
+import { FilterEditorComponent } from './filter-editor/filter-editor.component';
+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';
 
 @Component({
   selector: 'app-document-list',
@@ -31,6 +35,8 @@ export class DocumentListComponent implements OnInit {
 
   filterRules: FilterRule[] = []
 
+  @ViewChild('filterEditor') filterEditor: FilterEditorComponent
+
   get isFiltered() {
     return this.list.filterRules?.length > 0
   }
@@ -99,4 +105,16 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
+  clickTag(tagID: number) {
+    this.filterEditor.toggleFilterByItem(tagID, FILTER_HAS_TAG)
+  }
+
+  clickCorrespondent(correspondentID: number) {
+    this.filterEditor.toggleFilterByItem(correspondentID, FILTER_CORRESPONDENT)
+  }
+
+  clickDocumentType(documentTypeID: number) {
+    this.filterEditor.toggleFilterByItem(documentTypeID, FILTER_DOCUMENT_TYPE)
+  }
+
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index 93a91473f..b73b4387b 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -1,9 +1,9 @@
 import { Component, EventEmitter, Input, OnInit, Output, ElementRef, AfterViewInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
 import { FilterRule } from 'src/app/data/filter-rule';
 import { FilterRuleType, FILTER_RULE_TYPES, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_ADDED_BEFORE, FILTER_ADDED_AFTER, FILTER_CREATED_BEFORE, FILTER_CREATED_AFTER, FILTER_CREATED_YEAR, FILTER_CREATED_MONTH, FILTER_CREATED_DAY } from 'src/app/data/filter-rule-type';
+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';
-import { PaperlessTag } from 'src/app/data/paperless-tag';
 import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
@@ -120,7 +120,11 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
     this.applySelected()
   }
 
-  toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) {
+  toggleFilterByItem(item: any, filterRuleTypeID: number) {
+    let dropdown = this.getDropdownByFilterRuleTypeID(filterRuleTypeID)
+    if (typeof item == 'number') {
+      item = dropdown.items.find(i => i.id == item)
+    }
     let filterRules = this.filterRules
     let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
     let existingRule = filterRules.find(rule => rule.type.id == filterRuleType.id)
@@ -137,7 +141,6 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
       filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id})
     }
 
-    let dropdown = this.getDropdownByFilterRuleTypeID(filterRuleTypeID)
     this.updateDropdownActiveItems(dropdown)
 
     this.filterRules = filterRules

From 4f14e0f425957d52ecb213880f37691d575e4165 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 12 Dec 2020 01:19:22 +0100
Subject: [PATCH 0156/1300] fixes #125

---
 src/documents/signals/handlers.py               | 12 ++++++++----
 src/documents/tests/test_management_retagger.py | 14 +++++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 4fbbe8f8a..27aa37908 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -7,6 +7,7 @@ from django.contrib.admin.models import ADDITION, LogEntry
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.db import models, DatabaseError
+from django.db.models import Q
 from django.dispatch import receiver
 from django.utils import timezone
 from filelock import FileLock
@@ -121,11 +122,14 @@ def set_tags(sender,
              classifier=None,
              replace=False,
              **kwargs):
+
     if replace:
-        document.tags.clear()
-        current_tags = set([])
-    else:
-        current_tags = set(document.tags.all())
+        document.tags.exclude(
+            Q(is_inbox_tag=True) |
+            (Q(match="") & ~Q(matching_algorithm=Tag.MATCH_AUTO))
+        ).delete()
+
+    current_tags = set(document.tags.all())
 
     matched_tags = matching.match_tags(document.content, classifier)
 
diff --git a/src/documents/tests/test_management_retagger.py b/src/documents/tests/test_management_retagger.py
index 2346b6527..2397b0cc8 100644
--- a/src/documents/tests/test_management_retagger.py
+++ b/src/documents/tests/test_management_retagger.py
@@ -14,6 +14,11 @@ class TestRetagger(DirectoriesMixin, TestCase):
 
         self.tag_first = Tag.objects.create(name="tag1", match="first", matching_algorithm=Tag.MATCH_ANY)
         self.tag_second = Tag.objects.create(name="tag2", match="second", matching_algorithm=Tag.MATCH_ANY)
+        self.tag_inbox = Tag.objects.create(name="test", is_inbox_tag=True)
+        self.tag_no_match = Tag.objects.create(name="test2")
+
+        self.d3.tags.add(self.tag_inbox)
+        self.d3.tags.add(self.tag_no_match)
 
         self.correspondent_first = Correspondent.objects.create(
             name="c1", match="first", matching_algorithm=Correspondent.MATCH_ANY)
@@ -38,7 +43,7 @@ class TestRetagger(DirectoriesMixin, TestCase):
 
         self.assertEqual(d_first.tags.count(), 1)
         self.assertEqual(d_second.tags.count(), 1)
-        self.assertEqual(d_unrelated.tags.count(), 0)
+        self.assertEqual(d_unrelated.tags.count(), 2)
 
         self.assertEqual(d_first.tags.first(), self.tag_first)
         self.assertEqual(d_second.tags.first(), self.tag_second)
@@ -56,3 +61,10 @@ class TestRetagger(DirectoriesMixin, TestCase):
 
         self.assertEqual(d_first.correspondent, self.correspondent_first)
         self.assertEqual(d_second.correspondent, self.correspondent_second)
+
+    def test_force_preserve_inbox(self):
+        call_command('document_retagger', '--tags', '--overwrite')
+
+        d_first, d_second, d_unrelated = self.get_updated_docs()
+
+        self.assertCountEqual([tag.id for tag in d_unrelated.tags.all()], [self.tag_inbox.id, self.tag_no_match.id])

From ebb39b13f089e94cf224530636b854eb5be40b4c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 12 Dec 2020 01:23:26 +0100
Subject: [PATCH 0157/1300] tests

---
 src/documents/tests/test_management_retagger.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/documents/tests/test_management_retagger.py b/src/documents/tests/test_management_retagger.py
index 2397b0cc8..2d2533341 100644
--- a/src/documents/tests/test_management_retagger.py
+++ b/src/documents/tests/test_management_retagger.py
@@ -67,4 +67,6 @@ class TestRetagger(DirectoriesMixin, TestCase):
 
         d_first, d_second, d_unrelated = self.get_updated_docs()
 
+        self.assertCountEqual([tag.id for tag in d_first.tags.all()], [self.tag_first.id])
+        self.assertCountEqual([tag.id for tag in d_second.tags.all()], [self.tag_second.id])
         self.assertCountEqual([tag.id for tag in d_unrelated.tags.all()], [self.tag_inbox.id, self.tag_no_match.id])

From bf9051e44dba70616007e45636c9a5cc47d415e1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 12 Dec 2020 02:06:43 +0100
Subject: [PATCH 0158/1300] made a serious mistake. fixed.

---
 src/documents/signals/handlers.py               | 6 +++---
 src/documents/tests/test_management_retagger.py | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 27aa37908..586897585 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -124,9 +124,9 @@ def set_tags(sender,
              **kwargs):
 
     if replace:
-        document.tags.exclude(
-            Q(is_inbox_tag=True) |
-            (Q(match="") & ~Q(matching_algorithm=Tag.MATCH_AUTO))
+        Document.tags.through.objects.filter(document=document).exclude(
+            Q(tag__is_inbox_tag=True)).exclude(
+            Q(tag__match="") & ~Q(tag__matching_algorithm=Tag.MATCH_AUTO)
         ).delete()
 
     current_tags = set(document.tags.all())
diff --git a/src/documents/tests/test_management_retagger.py b/src/documents/tests/test_management_retagger.py
index 2d2533341..907a23d09 100644
--- a/src/documents/tests/test_management_retagger.py
+++ b/src/documents/tests/test_management_retagger.py
@@ -20,6 +20,7 @@ class TestRetagger(DirectoriesMixin, TestCase):
         self.d3.tags.add(self.tag_inbox)
         self.d3.tags.add(self.tag_no_match)
 
+
         self.correspondent_first = Correspondent.objects.create(
             name="c1", match="first", matching_algorithm=Correspondent.MATCH_ANY)
         self.correspondent_second = Correspondent.objects.create(
@@ -62,11 +63,16 @@ class TestRetagger(DirectoriesMixin, TestCase):
         self.assertEqual(d_first.correspondent, self.correspondent_first)
         self.assertEqual(d_second.correspondent, self.correspondent_second)
 
-    def test_force_preserve_inbox(self):
+    def test_overwrite_preserve_inbox(self):
+        self.d1.tags.add(self.tag_second)
+
         call_command('document_retagger', '--tags', '--overwrite')
 
         d_first, d_second, d_unrelated = self.get_updated_docs()
 
+        self.assertIsNotNone(Tag.objects.get(id=self.tag_second.id))
+
         self.assertCountEqual([tag.id for tag in d_first.tags.all()], [self.tag_first.id])
         self.assertCountEqual([tag.id for tag in d_second.tags.all()], [self.tag_second.id])
         self.assertCountEqual([tag.id for tag in d_unrelated.tags.all()], [self.tag_inbox.id, self.tag_no_match.id])
+

From 9cd40e96f41100cf0056c5f2b7e912cf381ddc7f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 12 Dec 2020 01:09:52 -0800
Subject: [PATCH 0159/1300] Working date filtering

---
 .../document-list/document-list.component.ts  |  2 +-
 .../filter-dropdown-date.component.html       | 12 ++++----
 .../filter-dropdown-date.component.ts         | 30 ++++++++++++-------
 .../filter-editor.component.html              |  2 +-
 .../filter-editor/filter-editor.component.ts  | 17 ++++++++++-
 5 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 5bbd5b49d..271f6f7e5 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -11,7 +11,7 @@ import { SavedViewConfigService } from 'src/app/services/saved-view-config.servi
 import { Toast, ToastService } from 'src/app/services/toast.service';
 import { environment } from 'src/environments/environment';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
-import { FilterEditorComponent } from './filter-editor/filter-editor.component';
+import { FilterEditorComponent } from 'src/app/components/filter-editor/filter-editor.component';
 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';
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html
index 74d508390..fb514d7df 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html
@@ -3,15 +3,15 @@
   <div class="dropdown-menu date-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
         <div class="list-group-item d-flex flex-column align-items-start">
-          <button class="btn btn-sm btn-link pl-0" (click)="setQuickFilter(7)">Last 7 days</button>
-          <button class="btn btn-sm btn-link pl-0" (click)="setQuickFilter(30)">Last 30 days</button>
-          <button class="btn btn-sm btn-link pl-0" *ngIf="showMonth" (click)="setQuickFilter('month')">This month</button>
-          <button class="btn btn-sm btn-link pl-0" *ngIf="showYear" (click)="setQuickFilter('year')">This year</button>
+          <button class="btn btn-sm btn-link pl-0" (click)="setDateQuickFilter(7)">Last 7 days</button>
+          <button class="btn btn-sm btn-link pl-0" (click)="setDateQuickFilter(30)">Last 30 days</button>
+          <button class="btn btn-sm btn-link pl-0" (click)="setDateQuickFilter('month')">This month</button>
+          <button class="btn btn-sm btn-link pl-0" (click)="setDateQuickFilter('year')">This year</button>
         </div>
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
           <div class="mb-1"><small>Before</small></div>
           <div class="input-group input-group-sm">
-            <input class="form-control" type="text" placeholder="yyyy-mm-dd" name="before" [(ngModel)]="dateBefore" ngbDatepicker #dpBefore="ngbDatepicker">
+            <input class="form-control" type="text" placeholder="yyyy-mm-dd" name="before" [(ngModel)]="dateBefore" ngbDatepicker (dateSelect)="dateSelected($event)" #dpBefore="ngbDatepicker">
             <div class="input-group-append">
               <button class="btn btn-outline-secondary btn-sm" (click)="dpBefore.toggle()" type="button">
                 <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -25,7 +25,7 @@
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
           <div class="mb-1"><small>After</small></div>
           <div class="input-group">
-            <input class="form-control form-control-sm" type="text" placeholder="yyyy-mm-dd" name="after" [(ngModel)]="dateAfter" ngbDatepicker #dpAfter="ngbDatepicker">
+            <input class="form-control form-control-sm" type="text" placeholder="yyyy-mm-dd" name="after" [(ngModel)]="dateAfter" ngbDatepicker (dateSelect)="dateSelected($event)" #dpAfter="ngbDatepicker">
             <div class="input-group-append">
               <button class="btn btn-outline-secondary btn-sm" (click)="dpAfter.toggle()" type="button">
                 <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
index 37ea2cd09..9044f34a9 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -1,4 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ElementRef, ViewChild } from '@angular/core';
+import { FilterRule } from 'src/app/data/filter-rule';
 import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { FilterDropdownComponent } from '../filter-dropdown.component'
@@ -18,8 +19,6 @@ export class FilterDropdownDateComponent extends FilterDropdownComponent {
   selected = new EventEmitter()
 
   filterRuleTypes: FilterRuleType[] = []
-  showYear: boolean = false
-  showMonth: boolean = false
   dateAfter: NgbDateStruct
   dateBefore: NgbDateStruct
 
@@ -27,27 +26,36 @@ export class FilterDropdownDateComponent extends FilterDropdownComponent {
     this.filterRuleTypes = this.filterRuleTypeIDs.map(id => FILTER_RULE_TYPES.find(rt => rt.id == id))
     this.filterRuleTypeID = this.filterRuleTypeIDs[0]
     super.ngOnInit()
-
-    this.showYear = this.filterRuleTypes.find(rt => rt.filtervar.indexOf('year') > -1) !== undefined
-    this.showMonth = this.filterRuleTypes.find(rt => rt.filtervar.indexOf('month') > -1) !== undefined
   }
 
-  setQuickFilter(range: any) {
+  setDateQuickFilter(range: any) {
     this.dateAfter = this.dateBefore = undefined
+    let now = new Date()
     switch (typeof range) {
       case 'number':
-        let date = new Date();
-        date.setDate(date.getDate() - range)
-        this.dateAfter = { year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate() }
+        now.setDate(now.getDate() - range)
+        this.dateAfter = { year: now.getFullYear(), month: now.getMonth() + 1, day: now.getDate() }
+        this.dateSelected(this.dateAfter)
         break;
 
       case 'string':
-        let filterRuleType = this.filterRuleTypes.find(rt => rt.filtervar.indexOf(range) > -1)
-        console.log(range);
+        let date = { year: now.getFullYear(), month: now.getMonth() + 1, day: 1 }
+        if (range == 'year') date.month = 1
+        this.dateAfter = date
+        this.dateSelected(this.dateAfter)
         break;
 
       default:
         break;
     }
   }
+
+  dateSelected(date:NgbDateStruct) {
+    let isAfter = this.dateAfter !== undefined
+    let filterRuleType = this.filterRuleTypes.find(rt => rt.filtervar.indexOf(isAfter ? 'gt' : 'lt') > -1)
+    if (filterRuleType) {
+      let dateFilterRule:FilterRule = {value: `${date.year}-${date.month}-${date.day}`, type: filterRuleType}
+      this.selected.emit(dateFilterRule)
+    }
+  }
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index d3473337b..368eed564 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -8,7 +8,7 @@
 
   <app-filter-dropdown class="col-auto" *ngFor="let quickFilterRuleTypeID of quickFilterRuleTypeIDs" [filterRuleTypeID]="quickFilterRuleTypeID" (toggle)="toggleFilterByItem($event, quickFilterRuleTypeID)"></app-filter-dropdown>
 
-  <app-filter-dropdown-date class="col-auto" *ngFor="let dateAddedFilterRuleTypeID of dateAddedFilterRuleTypeIDs" [filterRuleTypeIDs]="dateAddedFilterRuleTypeID" (toggle)="toggleFilterByItem($event, quickFilterRuleTypeID)"></app-filter-dropdown-date>
+  <app-filter-dropdown-date class="col-auto" *ngFor="let dateAddedFilterRuleTypeID of dateAddedFilterRuleTypeIDs" [filterRuleTypeIDs]="dateAddedFilterRuleTypeID" (selected)="setDateFilter($event)"></app-filter-dropdown-date>
 
   <button class="btn btn-link btn-sm" [disabled]="!hasFilters()" (click)="clearSelected()">
     <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index b73b4387b..4ac7769d5 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -12,6 +12,7 @@ import { TagService } from 'src/app/services/rest/tag.service';
 import { FilterDropdownComponent } from './filter-dropdown/filter-dropdown.component'
 import { fromEvent } from 'rxjs';
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
+import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
   selector: 'app-filter-editor',
@@ -35,7 +36,7 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
   @ViewChildren(FilterDropdownComponent) quickFilterDropdowns!: QueryList<FilterDropdownComponent>;
 
   quickFilterRuleTypeIDs: number[] = [FILTER_HAS_TAG, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE]
-  dateAddedFilterRuleTypeIDs: any[] = [[FILTER_ADDED_BEFORE, FILTER_ADDED_AFTER], [FILTER_CREATED_BEFORE, FILTER_CREATED_AFTER, FILTER_CREATED_YEAR, FILTER_CREATED_MONTH, FILTER_CREATED_DAY]]
+  dateAddedFilterRuleTypeIDs: any[] = [[FILTER_ADDED_BEFORE, FILTER_ADDED_AFTER], [FILTER_CREATED_BEFORE, FILTER_CREATED_AFTER]]
 
   correspondents: PaperlessCorrespondent[] = []
   tags: PaperlessTag[] = []
@@ -147,4 +148,18 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
     this.applySelected()
   }
 
+  setDateFilter(newFilterRule: FilterRule) {
+    let filterRules = this.filterRules
+    let existingRule = filterRules.find(rule => rule.type.id == newFilterRule.type.id)
+
+    if (existingRule) {
+      existingRule.value = newFilterRule.value
+    } else {
+      filterRules.push(newFilterRule)
+    }
+
+    this.filterRules = filterRules
+    this.applySelected()
+  }
+
 }

From 02871e1e22440fba9b6de578abab609a85ef0bce Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 12 Dec 2020 02:07:25 -0800
Subject: [PATCH 0160/1300] Date filter clearing

---
 .../filter-dropdown-date.component.ts         | 28 ++++++++-------
 .../filter-editor/filter-editor.component.ts  | 35 +++++++++++++------
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
index 9044f34a9..baadcc4e6 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -30,31 +30,33 @@ export class FilterDropdownDateComponent extends FilterDropdownComponent {
 
   setDateQuickFilter(range: any) {
     this.dateAfter = this.dateBefore = undefined
-    let now = new Date()
+    let date = new Date()
+    let newDate: NgbDateStruct = { year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate() }
     switch (typeof range) {
       case 'number':
-        now.setDate(now.getDate() - range)
-        this.dateAfter = { year: now.getFullYear(), month: now.getMonth() + 1, day: now.getDate() }
-        this.dateSelected(this.dateAfter)
-        break;
+        date.setDate(date.getDate() - range)
+        newDate.year = date.getFullYear()
+        newDate.month = date.getMonth() + 1
+        newDate.day = date.getDate()
+        break
 
       case 'string':
-        let date = { year: now.getFullYear(), month: now.getMonth() + 1, day: 1 }
-        if (range == 'year') date.month = 1
-        this.dateAfter = date
-        this.dateSelected(this.dateAfter)
-        break;
+        newDate.day = 1
+        if (range == 'year') newDate.month = 1
+        break
 
       default:
-        break;
+        break
     }
+    this.dateAfter = newDate
+    this.dateSelected(this.dateAfter)
   }
 
   dateSelected(date:NgbDateStruct) {
-    let isAfter = this.dateAfter !== undefined
+    let isAfter = this.dateAfter == date
     let filterRuleType = this.filterRuleTypes.find(rt => rt.filtervar.indexOf(isAfter ? 'gt' : 'lt') > -1)
     if (filterRuleType) {
-      let dateFilterRule:FilterRule = {value: `${date.year}-${date.month}-${date.day}`, type: filterRuleType}
+      let dateFilterRule:FilterRule = {value: `${date.year}-${date.month.toString().padStart(2,0)}-${date.day.toString().padStart(2,0)}`, type: filterRuleType}
       this.selected.emit(dateFilterRule)
     }
   }
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index 4ac7769d5..05dd3a92a 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -10,6 +10,7 @@ import { CorrespondentService } from 'src/app/services/rest/correspondent.servic
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { TagService } from 'src/app/services/rest/tag.service';
 import { FilterDropdownComponent } from './filter-dropdown/filter-dropdown.component'
+import { FilterDropdownDateComponent } from './filter-dropdown/filter-dropdown-date/filter-dropdown-date.component'
 import { fromEvent } from 'rxjs';
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
 import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
@@ -34,6 +35,7 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
 
   @ViewChild('filterTextInput') filterTextInput: ElementRef;
   @ViewChildren(FilterDropdownComponent) quickFilterDropdowns!: QueryList<FilterDropdownComponent>;
+  @ViewChildren(FilterDropdownDateComponent) quickDateFilterDropdowns!: QueryList<FilterDropdownDateComponent>;
 
   quickFilterRuleTypeIDs: number[] = [FILTER_HAS_TAG, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE]
   dateAddedFilterRuleTypeIDs: any[] = [[FILTER_ADDED_BEFORE, FILTER_ADDED_AFTER], [FILTER_CREATED_BEFORE, FILTER_CREATED_AFTER]]
@@ -52,16 +54,15 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
   }
 
   ngAfterViewInit() {
-    fromEvent(this.filterTextInput.nativeElement,'keyup')
-        .pipe(
-            debounceTime(150),
-            distinctUntilChanged(),
-            tap()
-        )
-        .subscribe((event: Event) => {
-          this.filterText = (event.target as HTMLInputElement).value
-          this.onTextFilterInput()
-        });
+    fromEvent(this.filterTextInput.nativeElement,'keyup').pipe(
+      debounceTime(150),
+      distinctUntilChanged(),
+      tap()
+    ).subscribe((event: Event) => {
+      this.filterText = (event.target as HTMLInputElement).value
+      this.onTextFilterInput()
+    })
+    this.quickDateFilterDropdowns.forEach(d => this.updateDateDropdown(d))
   }
 
   setDropdownItems(items: ObjectWithId[], filterRuleTypeID: number): void {
@@ -69,7 +70,6 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
     if (dropdown) {
       dropdown.items = items
     }
-    this.updateDropdownActiveItems(dropdown)
   }
 
   updateDropdownActiveItems(dropdown: FilterDropdownComponent): void {
@@ -81,6 +81,18 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
     dropdown.itemsActive = activeItems
   }
 
+  updateDateDropdown(dateDropdown: FilterDropdownDateComponent) {
+    let activeRules = this.filterRules.filter(r => dateDropdown.filterRuleTypeIDs.includes(r.type.id))
+    if (activeRules.length > 0) {
+      activeRules.forEach(rule => {
+        let date = { year: rule.value.substring(0,4), month: rule.value.substring(5,7), day: rule.value.substring(8,10) }
+        rule.type.filtervar.indexOf('gt') > -1 ? dateDropdown.dateAfter = date : dateDropdown.dateBefore = date
+      })
+    } else {
+      dateDropdown.dateAfter = dateDropdown.dateBefore = undefined
+    }
+  }
+
   getDropdownByFilterRuleTypeID(filterRuleTypeID: number): FilterDropdownComponent {
     return this.quickFilterDropdowns.find(d => d.filterRuleTypeID == filterRuleTypeID)
   }
@@ -93,6 +105,7 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
     this.filterRules.splice(0,this.filterRules.length)
     this.updateTextFilterInput()
     this.quickFilterDropdowns.forEach(d => this.updateDropdownActiveItems(d))
+    this.quickDateFilterDropdowns.forEach(d => this.updateDateDropdown(d))
     this.clear.next()
   }
 

From 2a57f9d6e578dcaa99e55f0e041aa07608600c14 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 12 Dec 2020 02:14:15 -0800
Subject: [PATCH 0161/1300] NgbDate comparison error

---
 .../filter-dropdown-date/filter-dropdown-date.component.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
index baadcc4e6..2973a25eb 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -3,7 +3,7 @@ import { FilterRule } from 'src/app/data/filter-rule';
 import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { FilterDropdownComponent } from '../filter-dropdown.component'
-import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
   selector: 'app-filter-dropdown-date',
@@ -53,10 +53,11 @@ export class FilterDropdownDateComponent extends FilterDropdownComponent {
   }
 
   dateSelected(date:NgbDateStruct) {
-    let isAfter = this.dateAfter == date
+    let isAfter = NgbDate.from(this.dateAfter).equals(date)
+
     let filterRuleType = this.filterRuleTypes.find(rt => rt.filtervar.indexOf(isAfter ? 'gt' : 'lt') > -1)
     if (filterRuleType) {
-      let dateFilterRule:FilterRule = {value: `${date.year}-${date.month.toString().padStart(2,0)}-${date.day.toString().padStart(2,0)}`, type: filterRuleType}
+      let dateFilterRule:FilterRule = {value: `${date.year}-${date.month.toString().padStart(2,'0')}-${date.day.toString().padStart(2,'0')}`, type: filterRuleType}
       this.selected.emit(dateFilterRule)
     }
   }

From dfa1f29809efc9a395e7e379ad6e2ba82983cc1f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 12 Dec 2020 15:46:56 +0100
Subject: [PATCH 0162/1300] add backend support for saved views

---
 src/documents/admin.py                        | 17 +++++++-
 .../1007_savedview_savedviewfilterrule.py     | 37 ++++++++++++++++
 src/documents/models.py                       | 42 +++++++++++++++++++
 src/documents/serialisers.py                  | 36 +++++++++++++++-
 src/documents/views.py                        | 21 +++++++++-
 src/paperless/urls.py                         |  4 +-
 6 files changed, 152 insertions(+), 5 deletions(-)
 create mode 100644 src/documents/migrations/1007_savedview_savedviewfilterrule.py

diff --git a/src/documents/admin.py b/src/documents/admin.py
index 055a6fd93..6ec3b736e 100755
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -4,7 +4,8 @@ from django.utils.safestring import mark_safe
 from whoosh.writing import AsyncWriter
 
 from . import index
-from .models import Correspondent, Document, DocumentType, Log, Tag
+from .models import Correspondent, Document, DocumentType, Log, Tag, \
+    SavedView, SavedViewFilterRule
 
 
 class CorrespondentAdmin(admin.ModelAdmin):
@@ -131,8 +132,22 @@ class LogAdmin(admin.ModelAdmin):
     list_display_links = ("created", "message")
 
 
+class RuleInline(admin.TabularInline):
+    model = SavedViewFilterRule
+
+
+class SavedViewAdmin(admin.ModelAdmin):
+
+    list_display = ("name", "user")
+
+    inlines = [
+        RuleInline
+    ]
+
+
 admin.site.register(Correspondent, CorrespondentAdmin)
 admin.site.register(Tag, TagAdmin)
 admin.site.register(DocumentType, DocumentTypeAdmin)
 admin.site.register(Document, DocumentAdmin)
 admin.site.register(Log, LogAdmin)
+admin.site.register(SavedView, SavedViewAdmin)
diff --git a/src/documents/migrations/1007_savedview_savedviewfilterrule.py b/src/documents/migrations/1007_savedview_savedviewfilterrule.py
new file mode 100644
index 000000000..664def5f1
--- /dev/null
+++ b/src/documents/migrations/1007_savedview_savedviewfilterrule.py
@@ -0,0 +1,37 @@
+# Generated by Django 3.1.4 on 2020-12-12 14:41
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('documents', '1006_auto_20201208_2209'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SavedView',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=128)),
+                ('show_on_dashboard', models.BooleanField()),
+                ('show_in_sidebar', models.BooleanField()),
+                ('sort_field', models.CharField(max_length=128)),
+                ('sort_reverse', models.BooleanField(default=False)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='SavedViewFilterRule',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('rule_type', 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')])),
+                ('value', models.CharField(max_length=128)),
+                ('saved_view', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='filter_rules', to='documents.savedview')),
+            ],
+        ),
+    ]
diff --git a/src/documents/models.py b/src/documents/models.py
index f0678a843..1b1f697bc 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -9,6 +9,7 @@ import pathvalidate
 
 import dateutil.parser
 from django.conf import settings
+from django.contrib.auth.models import User
 from django.db import models
 from django.utils import timezone
 from django.utils.text import slugify
@@ -305,6 +306,47 @@ class Log(models.Model):
         return self.message
 
 
+class SavedView(models.Model):
+
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    name = models.CharField(max_length=128)
+
+    show_on_dashboard = models.BooleanField()
+    show_in_sidebar = models.BooleanField()
+
+    sort_field = models.CharField(max_length=128)
+    sort_reverse = models.BooleanField(default=False)
+
+
+class SavedViewFilterRule(models.Model):
+    RULE_TYPES = [
+        (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"),
+    ]
+
+    saved_view = models.ForeignKey(SavedView, on_delete=models.CASCADE, related_name="filter_rules")
+
+    rule_type = models.PositiveIntegerField(choices=RULE_TYPES)
+
+    value = models.CharField(max_length=128)
+
+
 # TODO: why is this in the models file?
 class FileInfo:
 
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index db0e610d1..43b5e5992 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -3,7 +3,8 @@ from django.utils.text import slugify
 from rest_framework import serializers
 from rest_framework.fields import SerializerMethodField
 
-from .models import Correspondent, Tag, Document, Log, DocumentType
+from .models import Correspondent, Tag, Document, Log, DocumentType, \
+    SavedView, SavedViewFilterRule
 from .parsers import is_mime_type_supported
 
 
@@ -140,6 +141,39 @@ class LogSerializer(serializers.ModelSerializer):
         )
 
 
+class SavedViewFilterRuleSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = SavedViewFilterRule
+        fields = ["rule_type", "value"]
+
+
+class SavedViewSerializer(serializers.ModelSerializer):
+
+    filter_rules = SavedViewFilterRuleSerializer(many=True)
+
+    class Meta:
+        model = SavedView
+        depth = 1
+        fields = ["id", "name", "show_on_dashboard", "show_in_sidebar",
+                  "sort_field", "sort_reverse", "filter_rules"]
+
+    def update(self, instance, validated_data):
+        rules_data = validated_data.pop('filter_rules')
+        super(SavedViewSerializer, self).update(instance, validated_data)
+        SavedViewFilterRule.objects.filter(saved_view=instance).delete()
+        for rule_data in rules_data:
+            SavedViewFilterRule.objects.create(saved_view=instance, **rule_data)
+        return instance
+
+    def create(self, validated_data):
+        rules_data = validated_data.pop('filter_rules')
+        saved_view = SavedView.objects.create(**validated_data)
+        for rule_data in rules_data:
+            SavedViewFilterRule.objects.create(saved_view=saved_view, **rule_data)
+        return saved_view
+
+
 class PostDocumentSerializer(serializers.Serializer):
 
     document = serializers.FileField(
diff --git a/src/documents/views.py b/src/documents/views.py
index b42ae1f96..36d3445c4 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -38,7 +38,7 @@ from .filters import (
     DocumentTypeFilterSet,
     LogFilterSet
 )
-from .models import Correspondent, Document, Log, Tag, DocumentType
+from .models import Correspondent, Document, Log, Tag, DocumentType, SavedView
 from .parsers import get_parser_class_for_mime_type
 from .serialisers import (
     CorrespondentSerializer,
@@ -46,7 +46,8 @@ from .serialisers import (
     LogSerializer,
     TagSerializer,
     DocumentTypeSerializer,
-    PostDocumentSerializer
+    PostDocumentSerializer,
+    SavedViewSerializer
 )
 
 
@@ -240,6 +241,22 @@ class LogViewSet(ReadOnlyModelViewSet):
     ordering_fields = ("created",)
 
 
+class SavedViewViewSet(ModelViewSet):
+    model = SavedView
+
+    queryset = SavedView.objects.all()
+    serializer_class = SavedViewSerializer
+    pagination_class = StandardPagination
+    permission_classes = (IsAuthenticated,)
+
+    def get_queryset(self):
+        user = self.request.user
+        return SavedView.objects.filter(user=user)
+
+    def perform_create(self, serializer):
+        serializer.save(user=self.request.user)
+
+
 class PostDocumentView(APIView):
 
     permission_classes = (IsAuthenticated,)
diff --git a/src/paperless/urls.py b/src/paperless/urls.py
index 9b390b139..079971bb3 100755
--- a/src/paperless/urls.py
+++ b/src/paperless/urls.py
@@ -17,7 +17,8 @@ from documents.views import (
     IndexView,
     SearchAutoCompleteView,
     StatisticsView,
-    PostDocumentView
+    PostDocumentView,
+    SavedViewViewSet
 )
 from paperless.views import FaviconView
 
@@ -27,6 +28,7 @@ api_router.register(r"document_types", DocumentTypeViewSet)
 api_router.register(r"documents", DocumentViewSet)
 api_router.register(r"logs", LogViewSet)
 api_router.register(r"tags", TagViewSet)
+api_router.register(r"saved_views", SavedViewViewSet)
 
 
 urlpatterns = [

From beff45a8353cfcfe692aed51c294ecb1a2d25004 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 12 Dec 2020 08:43:03 -0800
Subject: [PATCH 0163/1300] Fix PDF column width layout issues

---
 .../document-detail/document-detail.component.html          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index bec8a59a2..bdd1132fa 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -35,7 +35,7 @@
 
 
 <div class="row">
-    <div class="col-xl">
+    <div class="col-md-6 col-xl-4">
 
         <form [formGroup]='documentForm' (ngSubmit)="save()">
 
@@ -171,9 +171,9 @@
         </form>
     </div>
 
-    <div class="col-xl">
+    <div class="col-md-6 col-xl-8">
       <div class="pdf-viewer-container">
         <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="false"></pdf-viewer>
       </div>
     </div>
-</div>
\ No newline at end of file
+</div>

From f6a50ee7c6bbd9ebc1218aadd1ef73610f4ed549 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 12 Dec 2020 08:50:52 -0800
Subject: [PATCH 0164/1300] Bottom margin on columns for mobile stacking

---
 .../components/document-detail/document-detail.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index bdd1132fa..6f1aacdf5 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -35,7 +35,7 @@
 
 
 <div class="row">
-    <div class="col-md-6 col-xl-4">
+    <div class="col-md-6 col-xl-4 mb-4">
 
         <form [formGroup]='documentForm' (ngSubmit)="save()">
 
@@ -171,7 +171,7 @@
         </form>
     </div>
 
-    <div class="col-md-6 col-xl-8">
+    <div class="col-md-6 col-xl-8 mb-3">
       <div class="pdf-viewer-container">
         <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="false"></pdf-viewer>
       </div>

From 8ce4434ba91aca0d280438ff16cd9c530ec2295b Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 12 Dec 2020 09:01:48 -0800
Subject: [PATCH 0165/1300] Move date dropdown component

---
 src-ui/src/app/app.module.ts                               | 2 +-
 .../filter-dropdown-date.component.html                    | 0
 .../filter-dropdown-date.component.scss                    | 0
 .../filter-dropdown-date.component.spec.ts                 | 0
 .../filter-dropdown-date/filter-dropdown-date.component.ts | 7 +++----
 .../components/filter-editor/filter-editor.component.ts    | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename src-ui/src/app/components/filter-editor/{filter-dropdown => }/filter-dropdown-date/filter-dropdown-date.component.html (100%)
 rename src-ui/src/app/components/filter-editor/{filter-dropdown => }/filter-dropdown-date/filter-dropdown-date.component.scss (100%)
 rename src-ui/src/app/components/filter-editor/{filter-dropdown => }/filter-dropdown-date/filter-dropdown-date.component.spec.ts (100%)
 rename src-ui/src/app/components/filter-editor/{filter-dropdown => }/filter-dropdown-date/filter-dropdown-date.component.ts (89%)

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 4c24123e6..3021e417b 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -29,7 +29,7 @@ import { AppFrameComponent } from './components/app-frame/app-frame.component';
 import { ToastsComponent } from './components/common/toasts/toasts.component';
 import { FilterEditorComponent } from './components/filter-editor/filter-editor.component';
 import { FilterDropdownComponent } from './components/filter-editor/filter-dropdown/filter-dropdown.component';
-import { FilterDropdownDateComponent } from './components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component';
+import { FilterDropdownDateComponent } from './components/filter-editor/filter-dropdown-date/filter-dropdown-date.component';
 import { DocumentCardLargeComponent } from './components/document-list/document-card-large/document-card-large.component';
 import { DocumentCardSmallComponent } from './components/document-list/document-card-small/document-card-small.component';
 import { NgxFileDropModule } from 'ngx-file-drop';
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
similarity index 100%
rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html
rename to src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.scss b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.scss
similarity index 100%
rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.scss
rename to src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.scss
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.spec.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.spec.ts
similarity index 100%
rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.spec.ts
rename to src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.spec.ts
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
similarity index 89%
rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
rename to src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index 2973a25eb..9acfb44f8 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -2,7 +2,6 @@ import { Component, EventEmitter, Input, OnInit, Output, ElementRef, ViewChild }
 import { FilterRule } from 'src/app/data/filter-rule';
 import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { ObjectWithId } from 'src/app/data/object-with-id';
-import { FilterDropdownComponent } from '../filter-dropdown.component'
 import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
@@ -10,7 +9,7 @@ import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
   templateUrl: './filter-dropdown-date.component.html',
   styleUrls: ['./filter-dropdown-date.component.scss']
 })
-export class FilterDropdownDateComponent extends FilterDropdownComponent {
+export class FilterDropdownDateComponent {
 
   @Input()
   filterRuleTypeIDs: number[] = []
@@ -19,13 +18,13 @@ export class FilterDropdownDateComponent extends FilterDropdownComponent {
   selected = new EventEmitter()
 
   filterRuleTypes: FilterRuleType[] = []
+  title: string
   dateAfter: NgbDateStruct
   dateBefore: NgbDateStruct
 
   ngOnInit(): void {
     this.filterRuleTypes = this.filterRuleTypeIDs.map(id => FILTER_RULE_TYPES.find(rt => rt.id == id))
-    this.filterRuleTypeID = this.filterRuleTypeIDs[0]
-    super.ngOnInit()
+    this.title = this.filterRuleTypes[0].displayName
   }
 
   setDateQuickFilter(range: any) {
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index 05dd3a92a..3d006a76e 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -10,7 +10,7 @@ import { CorrespondentService } from 'src/app/services/rest/correspondent.servic
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { TagService } from 'src/app/services/rest/tag.service';
 import { FilterDropdownComponent } from './filter-dropdown/filter-dropdown.component'
-import { FilterDropdownDateComponent } from './filter-dropdown/filter-dropdown-date/filter-dropdown-date.component'
+import { FilterDropdownDateComponent } from './filter-dropdown-date/filter-dropdown-date.component'
 import { fromEvent } from 'rxjs';
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
 import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';

From a0631413d64a427ee682998569fd5fe79f3dc0de Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 12 Dec 2020 18:25:15 +0100
Subject: [PATCH 0166/1300] fixes bauerj/paperless_app#23 and most of all other
 scanner apps out there.

---
 src/paperless_tesseract/parsers.py           | 24 ++++++++++++++++++++
 src/paperless_tesseract/tests/test_parser.py | 15 +++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 1cf6a769c..80e200f27 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -110,6 +110,24 @@ class RasterisedDocumentParser(DocumentParser):
                 f"Error while getting DPI from image {image}: {e}")
             return None
 
+    def calculate_a4_dpi(self, image):
+        try:
+            with Image.open(image) as im:
+                width, height = im.size
+                # divide image width by A4 width (210mm) in inches.
+                dpi = int(width / (21 / 2.54))
+                self.log(
+                    'debug',
+                    f"Estimated DPI {dpi} based on image width {width}"
+                )
+                return dpi
+
+        except Exception as e:
+            self.log(
+                'warning',
+                f"Error while calculating DPI for image {image}: {e}")
+            return None
+
     def parse(self, document_path, mime_type):
         mode = settings.OCR_MODE
 
@@ -162,6 +180,7 @@ class RasterisedDocumentParser(DocumentParser):
 
         if self.is_image(mime_type):
             dpi = self.get_dpi(document_path)
+            a4_dpi = self.calculate_a4_dpi(document_path)
             if dpi:
                 self.log(
                     "debug",
@@ -170,6 +189,8 @@ class RasterisedDocumentParser(DocumentParser):
                 ocr_args['image_dpi'] = dpi
             elif settings.OCR_IMAGE_DPI:
                 ocr_args['image_dpi'] = settings.OCR_IMAGE_DPI
+            elif a4_dpi:
+                ocr_args['image_dpi'] = a4_dpi
             else:
                 raise ParseError(
                     f"Cannot produce archive PDF for image {document_path}, "
@@ -241,6 +262,9 @@ def strip_excess_whitespace(text):
 
 def get_text_from_pdf(pdf_file):
 
+    if not os.path.isfile(pdf_file):
+        return None
+
     with open(pdf_file, "rb") as f:
         try:
             pdf = pdftotext.PDF(f)
diff --git a/src/paperless_tesseract/tests/test_parser.py b/src/paperless_tesseract/tests/test_parser.py
index 8834ec755..7be176663 100644
--- a/src/paperless_tesseract/tests/test_parser.py
+++ b/src/paperless_tesseract/tests/test_parser.py
@@ -164,8 +164,21 @@ class TestParser(DirectoriesMixin, TestCase):
 
         self.assertRaises(ParseError, f)
 
+    @mock.patch("paperless_tesseract.parsers.ocrmypdf.ocr")
+    def test_image_calc_a4_dpi(self, m):
+        parser = RasterisedDocumentParser(None)
 
-    def test_image_no_dpi_fail(self):
+        parser.parse(os.path.join(self.SAMPLE_FILES, "simple-no-dpi.png"), "image/png")
+
+        m.assert_called_once()
+
+        args, kwargs = m.call_args
+
+        self.assertEqual(kwargs['image_dpi'], 62)
+
+    @mock.patch("paperless_tesseract.parsers.RasterisedDocumentParser.calculate_a4_dpi")
+    def test_image_dpi_fail(self, m):
+        m.return_value = None
         parser = RasterisedDocumentParser(None)
 
         def f():

From f5cc5fbaa30d24a50c6d6f187010b30e0ad75fd3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 12 Dec 2020 20:32:11 +0100
Subject: [PATCH 0167/1300] made the file renamer somewhat faster.

---
 src/documents/management/commands/document_renamer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/documents/management/commands/document_renamer.py b/src/documents/management/commands/document_renamer.py
index 5d7d0d90c..745d2d03d 100644
--- a/src/documents/management/commands/document_renamer.py
+++ b/src/documents/management/commands/document_renamer.py
@@ -2,6 +2,7 @@ import logging
 
 import tqdm
 from django.core.management.base import BaseCommand
+from django.db.models.signals import post_save
 
 from documents.models import Document
 from ...mixins import Renderable
@@ -24,5 +25,4 @@ class Command(Renderable, BaseCommand):
         logging.getLogger().handlers[0].level = logging.ERROR
 
         for document in tqdm.tqdm(Document.objects.all()):
-            # Saving the document again will generate a new filename and rename
-            document.save()
+            post_save.send(Document, instance=document)

From 1c4d19198f245c33430b3599deeb266b0875c98a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 12 Dec 2020 22:56:44 +0100
Subject: [PATCH 0168/1300] a couple adjustments for the document viewer.

---
 .../document-detail/document-detail.component.html          | 6 +++---
 .../document-detail/document-detail.component.scss          | 2 --
 .../components/document-detail/document-detail.component.ts | 4 ++++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 6f1aacdf5..f9f6e57ef 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -35,7 +35,7 @@
 
 
 <div class="row">
-    <div class="col-md-6 col-xl-4 mb-4">
+    <div class="col mb-4">
 
         <form [formGroup]='documentForm' (ngSubmit)="save()">
 
@@ -172,8 +172,8 @@
     </div>
 
     <div class="col-md-6 col-xl-8 mb-3">
-      <div class="pdf-viewer-container">
-        <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="false"></pdf-viewer>
+      <div class="pdf-viewer-container" *ngIf="getContentType() == 'application/pdf'">
+        <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true"></pdf-viewer>
       </div>
     </div>
 </div>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.scss b/src-ui/src/app/components/document-detail/document-detail.component.scss
index b4d720018..998653bab 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.scss
+++ b/src-ui/src/app/components/document-detail/document-detail.component.scss
@@ -2,7 +2,5 @@
   height: calc(100vh - 160px);
   top: 70px;
   position: sticky;
-  padding: 10px;
   background-color: gray;
-  overflow-y: scroll;
 }
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 329077693..c80a8b1ce 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -59,6 +59,10 @@ export class DocumentDetailComponent implements OnInit {
     private documentListViewService: DocumentListViewService,
     private titleService: Title) { }
 
+  getContentType() {
+    return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type
+  }
+
   ngOnInit(): void {
     this.documentForm.valueChanges.subscribe(wow => {
       Object.assign(this.document, this.documentForm.value)

From e215e11417448a4294f507260d718d11bd5f9e0e Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 12 Dec 2020 22:53:34 -0800
Subject: [PATCH 0169/1300] Completely refactored because programming

Extracted filter editor to service
Made all components actually reactive
---
 src-ui/src/app/app.module.ts                  |   2 +
 .../document-list.component.html              |   2 +-
 .../document-list/document-list.component.ts  |  34 ++--
 .../filter-dropdown-date.component.html       |   4 +-
 .../filter-dropdown-date.component.ts         |  46 ++---
 .../filter-dropdown-button.component.html     |  12 ++
 .../filter-dropdown-button.component.scss     |   4 +
 .../filter-dropdown-button.component.spec.ts  |  25 +++
 .../filter-dropdown-button.component.ts       |  32 +++
 .../filter-dropdown.component.html            |  17 +-
 .../filter-dropdown.component.scss            |   5 -
 .../filter-dropdown.component.ts              |  29 ++-
 .../filter-editor.component.html              |  11 +-
 .../filter-editor/filter-editor.component.ts  | 164 ++++-----------
 .../services/document-list-view.service.ts    |   6 +-
 .../filter-editor-view.service.spec.ts        |  16 ++
 .../services/filter-editor-view.service.ts    | 188 ++++++++++++++++++
 17 files changed, 395 insertions(+), 202 deletions(-)
 create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
 create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.scss
 create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.spec.ts
 create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts
 create mode 100644 src-ui/src/app/services/filter-editor-view.service.spec.ts
 create mode 100644 src-ui/src/app/services/filter-editor-view.service.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 3021e417b..4d31fff18 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -29,6 +29,7 @@ import { AppFrameComponent } from './components/app-frame/app-frame.component';
 import { ToastsComponent } from './components/common/toasts/toasts.component';
 import { FilterEditorComponent } from './components/filter-editor/filter-editor.component';
 import { FilterDropdownComponent } from './components/filter-editor/filter-dropdown/filter-dropdown.component';
+import { FilterDropdownButtonComponent } from './components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component';
 import { FilterDropdownDateComponent } from './components/filter-editor/filter-dropdown-date/filter-dropdown-date.component';
 import { DocumentCardLargeComponent } from './components/document-list/document-card-large/document-card-large.component';
 import { DocumentCardSmallComponent } from './components/document-list/document-card-small/document-card-small.component';
@@ -77,6 +78,7 @@ import { FilterPipe } from './pipes/filter.pipe';
     ToastsComponent,
     FilterEditorComponent,
     FilterDropdownComponent,
+    FilterDropdownButtonComponent,
     FilterDropdownDateComponent,
     DocumentCardLargeComponent,
     DocumentCardSmallComponent,
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index a6ec1b741..0fd139b89 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -64,7 +64,7 @@
 
 <div class="card w-100 mb-3">
   <div class="card-body">
-    <app-filter-editor [(filterRules)]="filterRules" (apply)="applyFilterRules()" (clear)="clearFilterRules()" #filterEditor></app-filter-editor>
+    <app-filter-editor [(filterEditorService)]="filterEditorService" (apply)="applyFilterRules()" (clear)="clearFilterRules()" #filterEditor></app-filter-editor>
   </div>
 </div>
 
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 271f6f7e5..fe03cae80 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -6,6 +6,7 @@ import { cloneFilterRules, FilterRule } from 'src/app/data/filter-rule';
 import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { SavedViewConfig } from 'src/app/data/saved-view-config';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
+import { FilterEditorViewService } from 'src/app/services/filter-editor-view.service';
 import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
 import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
 import { Toast, ToastService } from 'src/app/services/toast.service';
@@ -26,6 +27,7 @@ export class DocumentListComponent implements OnInit {
   constructor(
     public list: DocumentListViewService,
     public savedViewConfigService: SavedViewConfigService,
+    public filterEditorService: FilterEditorViewService,
     public route: ActivatedRoute,
     private toastService: ToastService,
     public modalService: NgbModal,
@@ -33,14 +35,18 @@ export class DocumentListComponent implements OnInit {
 
   displayMode = 'smallCards' // largeCards, smallCards, details
 
-  filterRules: FilterRule[] = []
-
-  @ViewChild('filterEditor') filterEditor: FilterEditorComponent
-
   get isFiltered() {
     return this.list.filterRules?.length > 0
   }
 
+  set filterRules(filterRules: FilterRule[]) {
+    this.filterEditorService.filterRules = filterRules
+  }
+
+  get filterRules(): FilterRule[] {
+    return this.filterEditorService.filterRules
+  }
+
   getTitle() {
     return this.list.savedViewTitle || "Documents"
   }
@@ -60,28 +66,29 @@ export class DocumentListComponent implements OnInit {
     this.route.paramMap.subscribe(params => {
       if (params.has('id')) {
         this.list.savedView = this.savedViewConfigService.getConfig(params.get('id'))
-        this.filterRules = this.list.filterRules
+        this.filterEditorService.filterRules = this.list.filterRules
         this.titleService.setTitle(`${this.list.savedView.title} - ${environment.appTitle}`)
       } else {
         this.list.savedView = null
-        this.filterRules = this.list.filterRules
+        this.filterEditorService.filterRules = this.list.filterRules
         this.titleService.setTitle(`Documents - ${environment.appTitle}`)
       }
       this.list.clear()
       this.list.reload()
     })
+    this.filterEditorService.filterRules = this.list.filterRules
   }
 
   applyFilterRules() {
-    this.list.filterRules = this.filterRules
+    this.list.filterRules = this.filterEditorService.filterRules
   }
 
   clearFilterRules() {
-    this.list.filterRules = this.filterRules
+    this.list.filterRules = this.filterEditorService.filterRules
   }
 
   loadViewConfig(config: SavedViewConfig) {
-    this.filterRules = cloneFilterRules(config.filterRules)
+    this.filterEditorService.filterRules = cloneFilterRules(config.filterRules)
     this.list.load(config)
   }
 
@@ -106,15 +113,18 @@ export class DocumentListComponent implements OnInit {
   }
 
   clickTag(tagID: number) {
-    this.filterEditor.toggleFilterByItem(tagID, FILTER_HAS_TAG)
+    this.filterEditorService.toggleFitlerByTagID(tagID)
+    this.applyFilterRules()
   }
 
   clickCorrespondent(correspondentID: number) {
-    this.filterEditor.toggleFilterByItem(correspondentID, FILTER_CORRESPONDENT)
+    this.filterEditorService.toggleFitlerByCorrespondentID(correspondentID)
+    this.applyFilterRules()
   }
 
   clickDocumentType(documentTypeID: number) {
-    this.filterEditor.toggleFilterByItem(documentTypeID, FILTER_DOCUMENT_TYPE)
+    this.filterEditorService.toggleFitlerByDocumentTypeID(documentTypeID)
+    this.applyFilterRules()
   }
 
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
index fb514d7df..a2b395c09 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -11,7 +11,7 @@
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
           <div class="mb-1"><small>Before</small></div>
           <div class="input-group input-group-sm">
-            <input class="form-control" type="text" placeholder="yyyy-mm-dd" name="before" [(ngModel)]="dateBefore" ngbDatepicker (dateSelect)="dateSelected($event)" #dpBefore="ngbDatepicker">
+            <input class="form-control" type="text" placeholder="yyyy-mm-dd" name="before" [(ngModel)]="_dateBefore" ngbDatepicker (dateSelect)="onDateSelected($event)" #dpBefore="ngbDatepicker">
             <div class="input-group-append">
               <button class="btn btn-outline-secondary btn-sm" (click)="dpBefore.toggle()" type="button">
                 <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -25,7 +25,7 @@
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
           <div class="mb-1"><small>After</small></div>
           <div class="input-group">
-            <input class="form-control form-control-sm" type="text" placeholder="yyyy-mm-dd" name="after" [(ngModel)]="dateAfter" ngbDatepicker (dateSelect)="dateSelected($event)" #dpAfter="ngbDatepicker">
+            <input class="form-control form-control-sm" type="text" placeholder="yyyy-mm-dd" name="after" [(ngModel)]="_dateAfter" ngbDatepicker (dateSelect)="onDateSelected($event)" #dpAfter="ngbDatepicker">
             <div class="input-group-append">
               <button class="btn btn-outline-secondary btn-sm" (click)="dpAfter.toggle()" type="button">
                 <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index 9acfb44f8..0d38f5541 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -1,6 +1,5 @@
-import { Component, EventEmitter, Input, OnInit, Output, ElementRef, ViewChild } from '@angular/core';
+import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core';
 import { FilterRule } from 'src/app/data/filter-rule';
-import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
 
@@ -12,23 +11,25 @@ import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
 export class FilterDropdownDateComponent {
 
   @Input()
-  filterRuleTypeIDs: number[] = []
-
-  @Output()
-  selected = new EventEmitter()
-
-  filterRuleTypes: FilterRuleType[] = []
-  title: string
-  dateAfter: NgbDateStruct
   dateBefore: NgbDateStruct
 
-  ngOnInit(): void {
-    this.filterRuleTypes = this.filterRuleTypeIDs.map(id => FILTER_RULE_TYPES.find(rt => rt.id == id))
-    this.title = this.filterRuleTypes[0].displayName
-  }
+  @Input()
+  dateAfter: NgbDateStruct
+
+  @Input()
+  title: string
+
+  @Output()
+  dateBeforeSet = new EventEmitter()
+
+  @Output()
+  dateAfterSet = new EventEmitter()
+
+  _dateBefore: NgbDateStruct
+  _dateAfter: NgbDateStruct
 
   setDateQuickFilter(range: any) {
-    this.dateAfter = this.dateBefore = undefined
+    this._dateAfter = this._dateBefore = undefined
     let date = new Date()
     let newDate: NgbDateStruct = { year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate() }
     switch (typeof range) {
@@ -47,17 +48,12 @@ export class FilterDropdownDateComponent {
       default:
         break
     }
-    this.dateAfter = newDate
-    this.dateSelected(this.dateAfter)
+    this._dateAfter = newDate
+    this.onDateSelected(this._dateAfter)
   }
 
-  dateSelected(date:NgbDateStruct) {
-    let isAfter = NgbDate.from(this.dateAfter).equals(date)
-
-    let filterRuleType = this.filterRuleTypes.find(rt => rt.filtervar.indexOf(isAfter ? 'gt' : 'lt') > -1)
-    if (filterRuleType) {
-      let dateFilterRule:FilterRule = {value: `${date.year}-${date.month.toString().padStart(2,'0')}-${date.day.toString().padStart(2,'0')}`, type: filterRuleType}
-      this.selected.emit(dateFilterRule)
-    }
+  onDateSelected(date:NgbDateStruct) {
+    let emitter = this._dateAfter && NgbDate.from(this._dateAfter).equals(date) ? this.dateAfterSet : this.dateBeforeSet
+    emitter.emit(date)
   }
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
new file mode 100644
index 000000000..5f12a5a17
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
@@ -0,0 +1,12 @@
+<button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" (click)="toggleItem()">
+  <div class="selected-icon mr-1">
+    <svg *ngIf="selected" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+      <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+    </svg>
+  </div>
+  <div class="mr-1">
+    <app-tag *ngIf="display == 'tag'; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
+    <ng-template #displayName><small>{{item.name}}</small></ng-template>
+  </div>
+  <div class="badge bg-primary text-light rounded-pill ml-auto">{{item.document_count}}</div>
+</button>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.scss b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.scss
new file mode 100644
index 000000000..41fc6acc4
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.scss
@@ -0,0 +1,4 @@
+.selected-icon {
+  min-width: 1em;
+  min-height: 1em;
+}
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.spec.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.spec.ts
new file mode 100644
index 000000000..5cf1fefa2
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FilterDropodownButtonComponent } from './filter-dropdown-button.component';
+
+describe('FilterDropodownButtonComponent', () => {
+  let component: FilterDropodownButtonComponent;
+  let fixture: ComponentFixture<FilterDropodownButtonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ FilterDropodownButtonComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FilterDropodownButtonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts
new file mode 100644
index 000000000..847c3f12b
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts
@@ -0,0 +1,32 @@
+import { Component, EventEmitter, Input, Output } 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';
+
+@Component({
+  selector: 'app-filter-dropdown-button',
+  templateUrl: './filter-dropdown-button.component.html',
+  styleUrls: ['./filter-dropdown-button.component.scss']
+})
+export class FilterDropdownButtonComponent {
+
+  constructor() { }
+
+  @Input()
+  item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent
+
+  @Input()
+  display: string
+
+  @Input()
+  selected: boolean
+
+  @Output()
+  toggle = new EventEmitter()
+
+
+  toggleItem(): void {
+    this.selected = !this.selected
+    this.toggle.emit(this.item)
+  }
+}
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index b43826fb2..3d47d23b7 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -3,19 +3,10 @@
   <div class="dropdown-menu quick-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
       <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
-      <ng-container *ngIf="(items | filter: filterText).length > 0">
-        <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let item of items | filter: filterText; let i = index" (click)="toggleItem(item)">
-          <div class="selected-icon mr-1">
-            <svg *ngIf="itemsActive.includes(item)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-              <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
-            </svg>
-          </div>
-          <div class="mr-1">
-            <app-tag *ngIf="display == 'tag'; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
-            <ng-template #displayName><small>{{item.name}}</small></ng-template>
-          </div>
-          <div class="badge bg-primary text-light rounded-pill ml-auto">{{item.document_count}}</div>
-        </button>
+      <ng-container *ngIf="(items$ | async)?.results as items">
+        <ng-container *ngFor="let item of items | filter: filterText; let i = index">
+          <app-filter-dropdown-button [item]="item" [display]="display" [selected]="isItemSelected(item)" (toggle)="toggleItem($event)"></app-filter-dropdown-button>
+        </ng-container>
       </ng-container>
     </div>
   </div>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
index 05df7b213..5551b0329 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
@@ -2,9 +2,4 @@
   min-width: 250px;
   max-height: 400px;
   overflow-y: scroll;
-
-  .selected-icon {
-    min-width: 1em;
-    min-height: 1em;
-  }
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index 6f346d4b3..4c80bfb66 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -1,5 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output, ElementRef, ViewChild } from '@angular/core';
-import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
+import { Observable } from 'rxjs';
+import { Results } from 'src/app/data/results';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { FilterPipe } from  'src/app/pipes/filter.pipe';
 
@@ -13,29 +14,37 @@ export class FilterDropdownComponent implements OnInit {
   constructor(private filterPipe: FilterPipe) { }
 
   @Input()
-  filterRuleTypeID: number
+  items$: Observable<Results<ObjectWithId>>
+
+  @Input()
+  itemsSelected: ObjectWithId[]
+
+  @Input()
+  title: string
+
+  @Input()
+  display: string
 
   @Output()
   toggle = new EventEmitter()
 
   @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef
 
-  items: ObjectWithId[] = []
-  itemsActive: ObjectWithId[] = []
-  title: string
   filterText: string
-  display: string
+  items: ObjectWithId[]
 
-  ngOnInit(): void {
-    let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == this.filterRuleTypeID)
-    this.title = filterRuleType.displayName
-    this.display = filterRuleType.datatype
+  ngOnInit() {
+    this.items$.subscribe(result => this.items = result.results)
   }
 
   toggleItem(item: ObjectWithId): void {
     this.toggle.emit(item)
   }
 
+  isItemSelected(item: ObjectWithId): boolean {
+    return this.itemsSelected?.find(i => i.id == item.id) !== undefined
+  }
+
   dropdownOpenChange(open: boolean): void {
     if (open) {
       setTimeout(() => {
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 368eed564..4c2e61d46 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -3,14 +3,17 @@
     <div class="text-muted mt-1">Filter by:</div>
   </div>
   <div class="col">
-    <input class="form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Title" #filterTextInput>
+    <input class="form-control form-control-sm" type="text" [(ngModel)]="filterEditorService.filterText" placeholder="Title" #filterTextInput>
   </div>
 
-  <app-filter-dropdown class="col-auto" *ngFor="let quickFilterRuleTypeID of quickFilterRuleTypeIDs" [filterRuleTypeID]="quickFilterRuleTypeID" (toggle)="toggleFilterByItem($event, quickFilterRuleTypeID)"></app-filter-dropdown>
+  <app-filter-dropdown class="col-auto" [(items$)]="filterEditorService.tags$" [itemsSelected]="filterEditorService.selectedTags" [title]="'Tags'" [display]="'tag'" (toggle)="onToggleTag($event)"></app-filter-dropdown>
+  <app-filter-dropdown class="col-auto" [(items$)]="filterEditorService.correspondents$" [itemsSelected]="filterEditorService.selectedCorrespondents" [title]="'Correspondents'" (toggle)="onToggleCorrespondent($event)"></app-filter-dropdown>
+  <app-filter-dropdown class="col-auto" [(items$)]="filterEditorService.documentTypes$" [itemsSelected]="filterEditorService.selectedDocumentTypes" [title]="'Document Types'" (toggle)="onToggleDocumentType($event)"></app-filter-dropdown>
 
-  <app-filter-dropdown-date class="col-auto" *ngFor="let dateAddedFilterRuleTypeID of dateAddedFilterRuleTypeIDs" [filterRuleTypeIDs]="dateAddedFilterRuleTypeID" (selected)="setDateFilter($event)"></app-filter-dropdown-date>
+  <app-filter-dropdown-date class="col-auto" [dateBefore]="filterEditorService.dateCreatedBefore" [dateAfter]="filterEditorService.dateCreatedAfter" [title]="'Created'" (dateBeforeSet)="onDateCreatedBeforeSet($event)" (dateAfterSet)="onDateCreatedAfterSet($event)"></app-filter-dropdown-date>
+  <app-filter-dropdown-date class="col-auto" [dateBefore]="filterEditorService.dateAddedBefore" [dateAfter]="filterEditorService.dateAddedAfter" [title]="'Added'"  (dateBeforeSet)="onDateAddedBeforeSet($event)" (dateAfterSet)="onDateAddedAfterSet($event)"></app-filter-dropdown-date>
 
-  <button class="btn btn-link btn-sm" [disabled]="!hasFilters()" (click)="clearSelected()">
+  <button class="btn btn-link btn-sm" [disabled]="!filterEditorService.hasFilters()" (click)="clearSelected()">
     <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
       <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
     </svg>
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index 3d006a76e..bb838f0be 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -1,14 +1,10 @@
-import { Component, EventEmitter, Input, OnInit, Output, ElementRef, AfterViewInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
-import { FilterRule } from 'src/app/data/filter-rule';
-import { FilterRuleType, FILTER_RULE_TYPES, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_ADDED_BEFORE, FILTER_ADDED_AFTER, FILTER_CREATED_BEFORE, FILTER_CREATED_AFTER, FILTER_CREATED_YEAR, FILTER_CREATED_MONTH, FILTER_CREATED_DAY } from 'src/app/data/filter-rule-type';
+import { Component, EventEmitter, Input, Output, ElementRef, AfterViewInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
+import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
+import { ObjectWithId } from 'src/app/data/object-with-id';
+import { FilterEditorViewService } from 'src/app/services/filter-editor-view.service'
 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';
-import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
-import { ObjectWithId } from 'src/app/data/object-with-id';
-import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
-import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
-import { TagService } from 'src/app/services/rest/tag.service';
 import { FilterDropdownComponent } from './filter-dropdown/filter-dropdown.component'
 import { FilterDropdownDateComponent } from './filter-dropdown-date/filter-dropdown-date.component'
 import { fromEvent } from 'rxjs';
@@ -20,38 +16,20 @@ import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
   templateUrl: './filter-editor.component.html',
   styleUrls: ['./filter-editor.component.scss']
 })
-export class FilterEditorComponent implements OnInit, AfterViewInit {
+export class FilterEditorComponent implements AfterViewInit {
 
-  constructor(private documentTypeService: DocumentTypeService, private tagService: TagService, private correspondentService: CorrespondentService) { }
+  constructor() { }
+
+  @Input()
+  filterEditorService: FilterEditorViewService
 
   @Output()
   clear = new EventEmitter()
 
-  @Input()
-  filterRules: FilterRule[] = []
-
   @Output()
   apply = new EventEmitter()
 
   @ViewChild('filterTextInput') filterTextInput: ElementRef;
-  @ViewChildren(FilterDropdownComponent) quickFilterDropdowns!: QueryList<FilterDropdownComponent>;
-  @ViewChildren(FilterDropdownDateComponent) quickDateFilterDropdowns!: QueryList<FilterDropdownDateComponent>;
-
-  quickFilterRuleTypeIDs: number[] = [FILTER_HAS_TAG, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE]
-  dateAddedFilterRuleTypeIDs: any[] = [[FILTER_ADDED_BEFORE, FILTER_ADDED_AFTER], [FILTER_CREATED_BEFORE, FILTER_CREATED_AFTER]]
-
-  correspondents: PaperlessCorrespondent[] = []
-  tags: PaperlessTag[] = []
-  documentTypes: PaperlessDocumentType[] = []
-
-  filterText: string
-
-  ngOnInit(): void {
-    this.updateTextFilterInput()
-    this.tagService.listAll().subscribe(result => this.setDropdownItems(result.results, FILTER_HAS_TAG))
-    this.correspondentService.listAll().subscribe(result => this.setDropdownItems(result.results, FILTER_CORRESPONDENT))
-    this.documentTypeService.listAll().subscribe(result => this.setDropdownItems(result.results, FILTER_DOCUMENT_TYPE))
-  }
 
   ngAfterViewInit() {
     fromEvent(this.filterTextInput.nativeElement,'keyup').pipe(
@@ -59,120 +37,52 @@ export class FilterEditorComponent implements OnInit, AfterViewInit {
       distinctUntilChanged(),
       tap()
     ).subscribe((event: Event) => {
-      this.filterText = (event.target as HTMLInputElement).value
-      this.onTextFilterInput()
+      this.filterEditorService.filterText = (event.target as HTMLInputElement).value
+      this.applyFilters()
     })
-    this.quickDateFilterDropdowns.forEach(d => this.updateDateDropdown(d))
   }
 
-  setDropdownItems(items: ObjectWithId[], filterRuleTypeID: number): void {
-    let dropdown: FilterDropdownComponent = this.getDropdownByFilterRuleTypeID(filterRuleTypeID)
-    if (dropdown) {
-      dropdown.items = items
-    }
-  }
-
-  updateDropdownActiveItems(dropdown: FilterDropdownComponent): void {
-    let activeRulesValues = this.filterRules.filter(r => r.type.id == dropdown.filterRuleTypeID).map(r => r.value)
-    let activeItems = []
-    if (activeRulesValues.length > 0) {
-      activeItems = dropdown.items.filter(i => activeRulesValues.includes(i.id))
-    }
-    dropdown.itemsActive = activeItems
-  }
-
-  updateDateDropdown(dateDropdown: FilterDropdownDateComponent) {
-    let activeRules = this.filterRules.filter(r => dateDropdown.filterRuleTypeIDs.includes(r.type.id))
-    if (activeRules.length > 0) {
-      activeRules.forEach(rule => {
-        let date = { year: rule.value.substring(0,4), month: rule.value.substring(5,7), day: rule.value.substring(8,10) }
-        rule.type.filtervar.indexOf('gt') > -1 ? dateDropdown.dateAfter = date : dateDropdown.dateBefore = date
-      })
-    } else {
-      dateDropdown.dateAfter = dateDropdown.dateBefore = undefined
-    }
-  }
-
-  getDropdownByFilterRuleTypeID(filterRuleTypeID: number): FilterDropdownComponent {
-    return this.quickFilterDropdowns.find(d => d.filterRuleTypeID == filterRuleTypeID)
-  }
-
-  applySelected() {
+  applyFilters() {
     this.apply.next()
   }
 
   clearSelected() {
-    this.filterRules.splice(0,this.filterRules.length)
-    this.updateTextFilterInput()
-    this.quickFilterDropdowns.forEach(d => this.updateDropdownActiveItems(d))
-    this.quickDateFilterDropdowns.forEach(d => this.updateDateDropdown(d))
+    this.filterEditorService.clear()
     this.clear.next()
   }
 
-  hasFilters() {
-    return this.filterRules.length > 0
+  onToggleTag(tag: PaperlessTag) {
+    this.filterEditorService.toggleFitlerByTag(tag)
+    this.applyFilters()
   }
 
-  updateTextFilterInput() {
-    let existingTextRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
-    if (existingTextRule) this.filterText = existingTextRule.value
-    else this.filterText = ''
+  onToggleCorrespondent(correspondent: PaperlessCorrespondent) {
+    this.filterEditorService.toggleFitlerByCorrespondent(correspondent)
+    this.applyFilters()
   }
 
-  onTextFilterInput() {
-    let text = this.filterText
-    let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.type.id == FILTER_TITLE)
-    if (existingRule && existingRule.value == text) {
-      return
-    } else if (existingRule) {
-      existingRule.value = text
-    } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_TITLE), value: text})
-    }
-    this.filterRules = filterRules
-    this.applySelected()
+  onToggleDocumentType(documentType: PaperlessDocumentType) {
+    this.filterEditorService.toggleFitlerByDocumentType(documentType)
+    this.applyFilters()
   }
 
-  toggleFilterByItem(item: any, filterRuleTypeID: number) {
-    let dropdown = this.getDropdownByFilterRuleTypeID(filterRuleTypeID)
-    if (typeof item == 'number') {
-      item = dropdown.items.find(i => i.id == item)
-    }
-    let filterRules = this.filterRules
-    let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
-    let existingRule = filterRules.find(rule => rule.type.id == filterRuleType.id)
-
-    if (existingRule && existingRule.value == item.id) {
-      filterRules.splice(filterRules.indexOf(existingRule), 1)
-    } else if (existingRule && filterRuleType.id == FILTER_HAS_TAG) {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id})
-    } else if (existingRule && existingRule.value == item.id) {
-      return
-    } else if (existingRule) {
-      existingRule.value = item.id
-    } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id})
-    }
-
-    this.updateDropdownActiveItems(dropdown)
-
-    this.filterRules = filterRules
-    this.applySelected()
+  onDateCreatedBeforeSet(date: NgbDateStruct) {
+    this.filterEditorService.setDateCreatedBefore(date)
+    this.applyFilters()
   }
 
-  setDateFilter(newFilterRule: FilterRule) {
-    let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.type.id == newFilterRule.type.id)
-
-    if (existingRule) {
-      existingRule.value = newFilterRule.value
-    } else {
-      filterRules.push(newFilterRule)
-    }
-
-    this.filterRules = filterRules
-    this.applySelected()
+  onDateCreatedAfterSet(date: NgbDateStruct) {
+    this.filterEditorService.setDateCreatedAfter(date)
+    this.applyFilters()
   }
 
+  onDateAddedBeforeSet(date: NgbDateStruct) {
+    this.filterEditorService.setDateAddedBefore(date)
+    this.applyFilters()
+  }
+
+  onDateAddedAfterSet(date: NgbDateStruct) {
+    this.filterEditorService.setDateAddedAfter(date)
+    this.applyFilters()
+  }
 }
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 811ac3c4b..8692ed1c0 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -9,7 +9,7 @@ import { DocumentService } from './rest/document.service';
 
 /**
  * This service manages the document list which is displayed using the document list view.
- * 
+ *
  * This service also serves saved views by transparently switching between the document list
  * and saved views on request. See below.
  */
@@ -25,7 +25,7 @@ export class DocumentListViewService {
   currentPage = 1
   currentPageSize: number = +localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT
   collectionSize: number
-  
+
   /**
    * This is the current config for the document list. The service will always remember the last settings used for the document list.
    */
@@ -192,7 +192,7 @@ export class DocumentListViewService {
     }
   }
 
-  constructor(private documentService: DocumentService) { 
+  constructor(private documentService: DocumentService) {
     let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
     if (documentListViewConfigJson) {
       try {
diff --git a/src-ui/src/app/services/filter-editor-view.service.spec.ts b/src-ui/src/app/services/filter-editor-view.service.spec.ts
new file mode 100644
index 000000000..8051bcf0d
--- /dev/null
+++ b/src-ui/src/app/services/filter-editor-view.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { FilterEditorViewService } from './filter-editor-view.service';
+
+describe('FilterEditorViewService', () => {
+  let service: FilterEditorViewService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(FilterEditorViewService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
new file mode 100644
index 000000000..ba7b6dd24
--- /dev/null
+++ b/src-ui/src/app/services/filter-editor-view.service.ts
@@ -0,0 +1,188 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { TagService } from 'src/app/services/rest/tag.service';
+import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
+import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
+import { ObjectWithId } from 'src/app/data/object-with-id';
+import { FilterRule } from 'src/app/data/filter-rule';
+import { FilterRuleType, FILTER_RULE_TYPES, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_ADDED_BEFORE, FILTER_ADDED_AFTER, FILTER_CREATED_BEFORE, FILTER_CREATED_AFTER, FILTER_CREATED_YEAR, FILTER_CREATED_MONTH, FILTER_CREATED_DAY } from 'src/app/data/filter-rule-type';
+import { Results } from 'src/app/data/results'
+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';
+import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class FilterEditorViewService {
+  tags$: Observable<Results<PaperlessTag>>
+  correspondents$: Observable<Results<PaperlessCorrespondent>>
+  documentTypes$: Observable<Results<PaperlessDocumentType>>
+
+  tags: PaperlessTag[] = []
+  correspondents: PaperlessCorrespondent[]
+  documentTypes: PaperlessDocumentType[] = []
+
+  filterRules: FilterRule[] = []
+
+  constructor(private tagService: TagService, private documentTypeService: DocumentTypeService, private correspondentService: CorrespondentService) {
+    this.tags$ = this.tagService.listAll()
+    this.tags$.subscribe(result => this.tags = result.results)
+    this.correspondents$ = this.correspondentService.listAll()
+    this.correspondents$.subscribe(result => this.correspondents = result.results)
+    this.documentTypes$ = this.documentTypeService.listAll()
+    this.documentTypes$.subscribe(result => this.documentTypes = result.results)
+  }
+
+  clear() {
+    this.filterRules = []
+  }
+
+  hasFilters() {
+    return this.filterRules.length > 0
+  }
+
+  set filterText(text: string) {
+    let filterRules = this.filterRules
+    let existingRule = filterRules.find(rule => rule.type.id == FILTER_TITLE)
+    if (existingRule && existingRule.value == text) {
+      return
+    } else if (existingRule) {
+      existingRule.value = text
+    } else {
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_TITLE), value: text})
+    }
+    this.filterRules = filterRules
+  }
+
+  get filterText(): string {
+    let existingRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
+    return existingRule ? existingRule.value : ''
+  }
+
+  get selectedTags(): PaperlessTag[] {
+    let tagRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_HAS_TAG)
+    return this.tags?.filter(t => tagRules.find(tr => tr.value == t.id))
+  }
+
+  get selectedCorrespondents(): PaperlessCorrespondent[] {
+    let correspondentRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_CORRESPONDENT)
+    return this.correspondents?.filter(c => correspondentRules.find(cr => cr.value == c.id))
+  }
+
+  get selectedDocumentTypes(): PaperlessDocumentType[] {
+    let documentTypeRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_DOCUMENT_TYPE)
+    return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => dtr.value == dt.id))
+  }
+
+  toggleFitlerByTag(tag: PaperlessTag) {
+    this.toggleFilterByItem(tag, FILTER_HAS_TAG)
+  }
+
+  toggleFitlerByCorrespondent(tag: PaperlessCorrespondent) {
+    this.toggleFilterByItem(tag, FILTER_CORRESPONDENT)
+  }
+
+  toggleFitlerByDocumentType(tag: PaperlessDocumentType) {
+    this.toggleFilterByItem(tag, FILTER_DOCUMENT_TYPE)
+  }
+
+  toggleFitlerByTagID(tagID: number) {
+    this.toggleFitlerByTag(this.tags?.find(t => t.id == tagID))
+  }
+
+  toggleFitlerByCorrespondentID(correspondentID: number) {
+    this.toggleFitlerByCorrespondent(this.correspondents?.find(t => t.id == correspondentID))
+  }
+
+  toggleFitlerByDocumentTypeID(documentTypeID: number) {
+    this.toggleFitlerByDocumentType(this.documentTypes?.find(t => t.id == documentTypeID))
+  }
+
+  private toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) {
+    let filterRules = this.filterRules
+    let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
+    let existingRule = filterRules.find(rule => rule.type.id == filterRuleType.id)
+
+    if (existingRule && existingRule.value == item.id) {
+      filterRules.splice(filterRules.indexOf(existingRule), 1)
+    } else if (existingRule && filterRuleType.id == FILTER_HAS_TAG) {
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id})
+    } else if (existingRule && existingRule.value == item.id) {
+      return
+    } else if (existingRule) {
+      existingRule.value = item.id
+    } else {
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id})
+    }
+
+    this.filterRules = filterRules
+  }
+
+  get dateCreatedBefore(): NgbDateStruct {
+    let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_CREATED_BEFORE)
+    return createdBeforeRule ? {
+      year: createdBeforeRule.value.substring(0,4),
+      month: createdBeforeRule.value.substring(5,7),
+      day: createdBeforeRule.value.substring(8,10)
+    } : undefined
+  }
+
+  get dateCreatedAfter(): NgbDateStruct {
+    let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_CREATED_AFTER)
+    return createdAfterRule ? {
+      year: createdAfterRule.value.substring(0,4),
+      month: createdAfterRule.value.substring(5,7),
+      day: createdAfterRule.value.substring(8,10)
+    } : undefined
+  }
+
+  get dateAddedBefore(): NgbDateStruct {
+    let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_ADDED_BEFORE)
+    return addedBeforeRule ? {
+      year: addedBeforeRule.value.substring(0,4),
+      month: addedBeforeRule.value.substring(5,7),
+      day: addedBeforeRule.value.substring(8,10)
+    } : undefined
+  }
+
+  get dateAddedAfter(): NgbDateStruct {
+    let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_ADDED_AFTER)
+    return addedAfterRule ? {
+      year: addedAfterRule.value.substring(0,4),
+      month: addedAfterRule.value.substring(5,7),
+      day: addedAfterRule.value.substring(8,10)
+    } : undefined
+  }
+
+  setDateCreatedBefore(date: NgbDateStruct) {
+    this.setDate(date, FILTER_CREATED_BEFORE)
+  }
+
+  setDateCreatedAfter(date: NgbDateStruct) {
+    this.setDate(date, FILTER_CREATED_AFTER)
+  }
+
+  setDateAddedBefore(date: NgbDateStruct) {
+    this.setDate(date, FILTER_ADDED_BEFORE)
+  }
+
+  setDateAddedAfter(date: NgbDateStruct) {
+    this.setDate(date, FILTER_ADDED_AFTER)
+  }
+
+  setDate(date: NgbDateStruct, dateRuleTypeID: number) {
+    let filterRules = this.filterRules
+    let existingRule = filterRules.find(rule => rule.type.id == dateRuleTypeID)
+    let newValue = `${date.year}-${date.month.toString().padStart(2,'0')}-${date.day.toString().padStart(2,'0')}` // YYYY-MM-DD
+
+    if (existingRule) {
+      existingRule.value = newValue
+    } else {
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == dateRuleTypeID), value: newValue})
+    }
+
+    this.filterRules = filterRules
+  }
+}

From 37c21e518d9d8f2728835c3406aec66fb2f618d2 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 01:27:11 -0800
Subject: [PATCH 0170/1300] set max date for date pickers

---
 .../filter-dropdown-date/filter-dropdown-date.component.html | 4 ++--
 .../filter-dropdown-date/filter-dropdown-date.component.ts   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
index a2b395c09..83d8c6455 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -11,7 +11,7 @@
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
           <div class="mb-1"><small>Before</small></div>
           <div class="input-group input-group-sm">
-            <input class="form-control" type="text" placeholder="yyyy-mm-dd" name="before" [(ngModel)]="_dateBefore" ngbDatepicker (dateSelect)="onDateSelected($event)" #dpBefore="ngbDatepicker">
+            <input class="form-control" type="text" placeholder="yyyy-mm-dd" name="before" [(ngModel)]="_dateBefore" [maxDate]="this._maxDate" ngbDatepicker (dateSelect)="onDateSelected($event)" #dpBefore="ngbDatepicker">
             <div class="input-group-append">
               <button class="btn btn-outline-secondary btn-sm" (click)="dpBefore.toggle()" type="button">
                 <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -25,7 +25,7 @@
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
           <div class="mb-1"><small>After</small></div>
           <div class="input-group">
-            <input class="form-control form-control-sm" type="text" placeholder="yyyy-mm-dd" name="after" [(ngModel)]="_dateAfter" ngbDatepicker (dateSelect)="onDateSelected($event)" #dpAfter="ngbDatepicker">
+            <input class="form-control form-control-sm" type="text" placeholder="yyyy-mm-dd" name="after" [(ngModel)]="_dateAfter" [maxDate]="this._maxDate" ngbDatepicker (dateSelect)="onDateSelected($event)" #dpAfter="ngbDatepicker">
             <div class="input-group-append">
               <button class="btn btn-outline-secondary btn-sm" (click)="dpAfter.toggle()" type="button">
                 <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index 0d38f5541..abe15072e 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -28,6 +28,11 @@ export class FilterDropdownDateComponent {
   _dateBefore: NgbDateStruct
   _dateAfter: NgbDateStruct
 
+  get _maxDate(): NgbDate {
+    let date = new Date()
+    return NgbDate.from({year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate()})
+  }
+
   setDateQuickFilter(range: any) {
     this._dateAfter = this._dateBefore = undefined
     let date = new Date()

From 1379c039b889dbd151ad9abb20b46d7339188716 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 02:03:59 -0800
Subject: [PATCH 0171/1300] Workaround for infinte loop breaks two way binding
 for date picker initialization

---
 .../filter-dropdown-date.component.ts         | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index abe15072e..206dbe2c3 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -1,7 +1,7 @@
-import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core';
+import { Component, EventEmitter, Input, Output, ElementRef, ViewChild, OnChanges, SimpleChange } from '@angular/core';
 import { FilterRule } from 'src/app/data/filter-rule';
 import { ObjectWithId } from 'src/app/data/object-with-id';
-import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+import { NgbDate, NgbDateStruct, NgbDatepicker } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
   selector: 'app-filter-dropdown-date',
@@ -25,6 +25,9 @@ export class FilterDropdownDateComponent {
   @Output()
   dateAfterSet = new EventEmitter()
 
+  @ViewChild('dpAfter') dpAfter: NgbDatepicker
+  @ViewChild('dpBefore') dpBefore: NgbDatepicker
+
   _dateBefore: NgbDateStruct
   _dateAfter: NgbDateStruct
 
@@ -33,6 +36,25 @@ export class FilterDropdownDateComponent {
     return NgbDate.from({year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate()})
   }
 
+  ngOnChanges(changes: SimpleChange) {
+    // this is a hacky workaround perhaps because of https://github.com/angular/angular/issues/11097
+    let dateString: string
+    let dateAfterChange: SimpleChange = changes['dateAfter']
+    let dateBeforeChange: SimpleChange = changes['dateBefore']
+
+    if (dateAfterChange && dateAfterChange.currentValue && this.dpAfter) {
+      let dateAfterDate = dateAfterChange.currentValue as NgbDateStruct
+      let dpAfterElRef: ElementRef = this.dpAfter['_elRef']
+      dateString = `${dateAfterDate.year}-${dateAfterDate.month.toString().padStart(2,'0')}-${dateAfterDate.day.toString().padStart(2,'0')}`
+      dpAfterElRef.nativeElement.value = dateString
+    } else if (dateBeforeChange && dateBeforeChange.currentValue && this.dpBefore) {
+      let dateBeforeDate = dateBeforeChange.currentValue as NgbDateStruct
+      let dpBeforeElRef: ElementRef = this.dpBefore['_elRef']
+      dateString = `${dateBeforeChange.currentValue.year}-${dateBeforeChange.currentValue.month.toString().padStart(2,'0')}-${dateBeforeChange.currentValue.day.toString().padStart(2,'0')}`
+      dpBeforeElRef.nativeElement.value = dateString
+    }
+  }
+
   setDateQuickFilter(range: any) {
     this._dateAfter = this._dateBefore = undefined
     let date = new Date()

From 30853e963efd78c6bbd81e33b0b24879c0655cd1 Mon Sep 17 00:00:00 2001
From: rYR79435 <60985157+rYR79435@users.noreply.github.com>
Date: Sun, 13 Dec 2020 13:30:30 +0100
Subject: [PATCH 0172/1300] Open GitHub and Documentation links in a new tab

---
 src-ui/src/app/components/app-frame/app-frame.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 3f326afdd..1cedeefde 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -132,7 +132,7 @@
         </h6>
         <ul class="nav flex-column mb-2">
           <li class="nav-item">
-            <a class="nav-link" href="https://paperless-ng.readthedocs.io/en/latest/">
+            <a class="nav-link" target="_blank" rel="noopener noreferrer" href="https://paperless-ng.readthedocs.io/en/latest/">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#question-circle"/>
               </svg>
@@ -140,7 +140,7 @@
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="https://github.com/jonaswinkler/paperless-ng">
+            <a class="nav-link" target="_blank" rel="noopener noreferrer" href="https://github.com/jonaswinkler/paperless-ng">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#link"/>
               </svg>

From 7906d8fef15ec985d066e5022120c55448592d36 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 13 Dec 2020 14:10:55 +0100
Subject: [PATCH 0173/1300] selection for small cards

---
 .../document-card-small.component.html            | 10 +++++-----
 .../document-card-small.component.scss            | 11 +++++++++++
 .../document-card-small.component.ts              | 15 ++++++++++++++-
 .../document-list/document-list.component.html    |  2 +-
 src-ui/src/theme.scss                             |  1 +
 5 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 6909a24fb..b78fedfe3 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,12 +1,12 @@
 <div class="col p-2 h-100 document-card" style="width: 16rem;">
-  <div class="card h-100 shadow-sm">
-    <div class="border-bottom">
-      <img class="card-img doc-img" [src]="getThumbUrl()">
+  <div class="card h-100 shadow-sm" [class.card-selected]="selected">
+    <div class="border-bottom" [class.doc-img-background-selected]="selected">
+      <img class="card-img doc-img" [src]="getThumbUrl()" (click)="selected = !selected">
 
       <div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
         <div class="custom-control custom-checkbox">
-          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [(ngModel)]="selected">
-          <label class="custom-control-label" for="smallCardCheck{{document.id}}">L</label>
+          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="selected = $event.target.checked">
+          <label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
         </div>
       </div>
 
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
index ba7190615..36db2203c 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
@@ -1,7 +1,10 @@
+@import "/src/theme";
+
 .doc-img {
   object-fit: cover;
   object-position: top;
   height: 200px;
+  mix-blend-mode: multiply;
 }
 
 .document-card-check {
@@ -10,4 +13,12 @@
 
 .document-card:hover .document-card-check {
   display: block;
+}
+
+.card-selected {
+  border-color: $primary;
+}
+
+.doc-img-background-selected {
+  background-color: $primaryFaded;
 }
\ No newline at end of file
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
index 037c02cf0..5d664697b 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
@@ -13,7 +13,20 @@ export class DocumentCardSmallComponent implements OnInit {
 
   constructor(private documentService: DocumentService) { }
 
-  selected = false
+  _selected = false
+
+  get selected() {
+    return this._selected
+  }
+
+  @Input()
+  set selected(value: boolean) {
+    this._selected = value
+    this.selectedChange.emit(value)
+  }
+
+  @Output()
+  selectedChange = new EventEmitter<boolean>()
 
   @Input()
   document: PaperlessDocument
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index a87a89bbf..0c3674421 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -155,5 +155,5 @@
 
 
 <div class=" m-n2 row" *ngIf="displayMode == 'smallCards'">
-  <app-document-card-small [document]="d" *ngFor="let d of list.documents" (clickTag)="filterByTag($event)" (clickCorrespondent)="filterByCorrespondent($event)"></app-document-card-small>    
+  <app-document-card-small [selected]="list.isSelected(d)" (selectedChange)="list.setSelected(d, $event)"  [document]="d" *ngFor="let d of list.documents" (clickTag)="filterByTag($event)" (clickCorrespondent)="filterByCorrespondent($event)"></app-document-card-small>    
 </div>
diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss
index 88f3ae30f..df2aea003 100644
--- a/src-ui/src/theme.scss
+++ b/src-ui/src/theme.scss
@@ -1,5 +1,6 @@
 $paperless-green: #17541f;
 $primary: #17541f;
+$primaryFaded: #d1ddd2;
 
 $theme-colors: (
   "primary": $primary

From 5bea5e75c0457ad957d6816530feabcb0bc7dad5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 13 Dec 2020 14:28:37 +0100
Subject: [PATCH 0174/1300] Refactored delete dialog into a more generic
 confirm dialog

---
 src-ui/src/app/app.module.ts                  |  4 +-
 .../confirm-dialog.component.html}            |  6 +--
 .../confirm-dialog.component.scss}            |  0
 .../confirm-dialog.component.spec.ts}         | 12 +++---
 .../confirm-dialog.component.ts               | 37 +++++++++++++++++++
 .../delete-dialog/delete-dialog.component.ts  | 31 ----------------
 .../document-detail.component.ts              | 13 ++++---
 .../generic-list/generic-list.component.ts    | 13 ++++---
 8 files changed, 64 insertions(+), 52 deletions(-)
 rename src-ui/src/app/components/common/{delete-dialog/delete-dialog.component.html => confirm-dialog/confirm-dialog.component.html} (67%)
 rename src-ui/src/app/components/common/{delete-dialog/delete-dialog.component.scss => confirm-dialog/confirm-dialog.component.scss} (100%)
 rename src-ui/src/app/components/common/{delete-dialog/delete-dialog.component.spec.ts => confirm-dialog/confirm-dialog.component.spec.ts} (52%)
 create mode 100644 src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts
 delete mode 100644 src-ui/src/app/components/common/delete-dialog/delete-dialog.component.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 0ee36b478..a1ae10d14 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -16,7 +16,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { DatePipe } from '@angular/common';
 import { NotFoundComponent } from './components/not-found/not-found.component';
 import { CorrespondentListComponent } from './components/manage/correspondent-list/correspondent-list.component';
-import { DeleteDialogComponent } from './components/common/delete-dialog/delete-dialog.component';
+import { ConfirmDialogComponent } from './components/common/confirm-dialog/confirm-dialog.component';
 import { CorrespondentEditDialogComponent } from './components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component';
 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';
@@ -63,7 +63,7 @@ import { DocumentTitlePipe } from './pipes/document-title.pipe';
     SettingsComponent,
     NotFoundComponent,
     CorrespondentEditDialogComponent,
-    DeleteDialogComponent,
+    ConfirmDialogComponent,
     TagEditDialogComponent,
     DocumentTypeEditDialogComponent,
     TagComponent,
diff --git a/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.html b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html
similarity index 67%
rename from src-ui/src/app/components/common/delete-dialog/delete-dialog.component.html
rename to src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html
index 2de507549..53b613244 100644
--- a/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.html
+++ b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html
@@ -5,10 +5,10 @@
       </button>
     </div>
     <div class="modal-body">
-      <p><b>{{message}}</b></p>
-      <p *ngIf="message2">{{message2}}</p>
+      <p *ngIf="messageBold"><b>{{messageBold}}</b></p>
+      <p *ngIf="message">{{message}}</p>
     </div>
     <div class="modal-footer">
       <button type="button" class="btn btn-outline-dark" (click)="cancelClicked()">Cancel</button>
-      <button type="button" class="btn btn-danger" (click)="deleteClicked.emit()">Delete</button>
+      <button type="button" class="btn" [class]="btnClass" (click)="confirmClicked.emit()">{{btnCaption}}</button>
     </div>
\ No newline at end of file
diff --git a/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.scss b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.scss
similarity index 100%
rename from src-ui/src/app/components/common/delete-dialog/delete-dialog.component.scss
rename to src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.scss
diff --git a/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.spec.ts b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.spec.ts
similarity index 52%
rename from src-ui/src/app/components/common/delete-dialog/delete-dialog.component.spec.ts
rename to src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.spec.ts
index 33c7d6e88..fe08dc57a 100644
--- a/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.spec.ts
+++ b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.spec.ts
@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { DeleteDialogComponent } from './delete-dialog.component';
+import { ConfirmDialogComponent } from './confirm-dialog.component';
 
-describe('DeleteDialogComponent', () => {
-  let component: DeleteDialogComponent;
-  let fixture: ComponentFixture<DeleteDialogComponent>;
+describe('ConfirmDialogComponent', () => {
+  let component: ConfirmDialogComponent;
+  let fixture: ComponentFixture<ConfirmDialogComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ DeleteDialogComponent ]
+      declarations: [ ConfirmDialogComponent ]
     })
     .compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(DeleteDialogComponent);
+    fixture = TestBed.createComponent(ConfirmDialogComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts
new file mode 100644
index 000000000..e207f4598
--- /dev/null
+++ b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts
@@ -0,0 +1,37 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+@Component({
+  selector: 'app-confirm-dialog',
+  templateUrl: './confirm-dialog.component.html',
+  styleUrls: ['./confirm-dialog.component.scss']
+})
+export class ConfirmDialogComponent implements OnInit {
+
+  constructor(public activeModal: NgbActiveModal) { }
+
+  @Output()
+  public confirmClicked = new EventEmitter()
+
+  @Input()
+  title = "Confirmation"
+
+  @Input()
+  messageBold
+
+  @Input()
+  message
+
+  @Input()
+  btnClass = "btn-primary"
+
+  @Input()
+  btnCaption = "Confirm"
+
+  ngOnInit(): void {
+  }
+
+  cancelClicked() {
+    this.activeModal.close()
+  }
+}
diff --git a/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.ts b/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.ts
deleted file mode 100644
index 20114c78c..000000000
--- a/src-ui/src/app/components/common/delete-dialog/delete-dialog.component.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-
-@Component({
-  selector: 'app-delete-dialog',
-  templateUrl: './delete-dialog.component.html',
-  styleUrls: ['./delete-dialog.component.scss']
-})
-export class DeleteDialogComponent implements OnInit {
-
-  constructor(public activeModal: NgbActiveModal) { }
-
-  @Output()
-  public deleteClicked = new EventEmitter()
-
-  @Input()
-  title = "Delete confirmation"
-
-  @Input()
-  message = "Do you really want to delete this?"
-
-  @Input()
-  message2
-
-  ngOnInit(): void {
-  }
-
-  cancelClicked() {
-    this.activeModal.close()
-  }
-}
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index c80a8b1ce..4aac9c769 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -13,7 +13,7 @@ import { CorrespondentService } from 'src/app/services/rest/correspondent.servic
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { DocumentService } from 'src/app/services/rest/document.service';
 import { environment } from 'src/environments/environment';
-import { DeleteDialogComponent } from '../common/delete-dialog/delete-dialog.component';
+import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component';
 import { CorrespondentEditDialogComponent } from '../manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component';
 import { DocumentTypeEditDialogComponent } from '../manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component';
 
@@ -155,10 +155,13 @@ export class DocumentDetailComponent implements OnInit {
   }
 
   delete() {
-    let modal = this.modalService.open(DeleteDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.message = `Do you really want to delete document '${this.document.title}'?`
-    modal.componentInstance.message2 = `The files for this document will be deleted permanently. This operation cannot be undone.`
-    modal.componentInstance.deleteClicked.subscribe(() => {
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Confirm delete"
+    modal.componentInstance.messageBold = `Do you really want to delete document '${this.document.title}'?`
+    modal.componentInstance.message = `The files for this document will be deleted permanently. This operation cannot be undone.`
+    modal.componentInstance.btnClass = "btn-danger"
+    modal.componentInstance.btnCaption = "Delete document"
+    modal.componentInstance.confirmClicked.subscribe(() => {
       this.documentsService.delete(this.document).subscribe(() => {
         modal.close()  
         this.close()
diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
index d5477d010..59a5f09ed 100644
--- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
+++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
@@ -4,7 +4,7 @@ import { MatchingModel, MATCHING_ALGORITHMS, MATCH_AUTO } from 'src/app/data/mat
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { SortableDirective, SortEvent } from 'src/app/directives/sortable.directive';
 import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
-import { DeleteDialogComponent } from '../../common/delete-dialog/delete-dialog.component';
+import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component';
 
 @Directive()
 export abstract class GenericListComponent<T extends ObjectWithId> implements OnInit {
@@ -88,10 +88,13 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
   }
 
   openDeleteDialog(object: T) {
-    var activeModal = this.modalService.open(DeleteDialogComponent, {backdrop: 'static'})
-    activeModal.componentInstance.message = `Do you really want to delete ${this.getObjectName(object)}?`
-    activeModal.componentInstance.message2 = "Associated documents will not be deleted."
-    activeModal.componentInstance.deleteClicked.subscribe(() => {
+    var activeModal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    activeModal.componentInstance.title = "Confirm delete"
+    activeModal.componentInstance.messageBold = `Do you really want to delete ${this.getObjectName(object)}?`
+    activeModal.componentInstance.message = "Associated documents will not be deleted."
+    activeModal.componentInstance.btnClass = "btn-danger"
+    activeModal.componentInstance.btnCaption = "Delete"
+    activeModal.componentInstance.confirmPressed.subscribe(() => {
       this.service.delete(object).subscribe(_ => {
         activeModal.close()
         this.reloadData()

From 3089b049cfaf8bbe1628671531ef185001db54e7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 13 Dec 2020 14:56:44 +0100
Subject: [PATCH 0175/1300] refactored metadata views

---
 src-ui/src/app/app.module.ts                  |  4 +-
 .../document-detail.component.html            | 49 +------------------
 .../metadata-collapse.component.html          | 23 +++++++++
 .../metadata-collapse.component.scss          |  0
 .../metadata-collapse.component.spec.ts       | 25 ++++++++++
 .../metadata-collapse.component.ts            | 23 +++++++++
 6 files changed, 76 insertions(+), 48 deletions(-)
 create mode 100644 src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html
 create mode 100644 src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.scss
 create mode 100644 src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.spec.ts
 create mode 100644 src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index a1ae10d14..5b92364d2 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -49,6 +49,7 @@ import { WelcomeWidgetComponent } from './components/dashboard/widgets/welcome-w
 import { YesNoPipe } from './pipes/yes-no.pipe';
 import { FileSizePipe } from './pipes/file-size.pipe';
 import { DocumentTitlePipe } from './pipes/document-title.pipe';
+import { MetadataCollapseComponent } from './components/document-detail/metadata-collapse/metadata-collapse.component';
 
 @NgModule({
   declarations: [
@@ -89,7 +90,8 @@ import { DocumentTitlePipe } from './pipes/document-title.pipe';
     WelcomeWidgetComponent,
     YesNoPipe,
     FileSizePipe,
-    DocumentTitlePipe
+    DocumentTitlePipe,
+    MetadataCollapseComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index f9f6e57ef..c0114f709 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -110,53 +110,8 @@
                             </tbody>
                         </table>
 
-                        <h6 *ngIf="metadata?.original_metadata.length > 0">
-                            <button type="button" class="btn btn-outline-secondary btn-sm mr-2"
-                                (click)="expandOriginalMetadata = !expandOriginalMetadata" aria-controls="collapseExample">
-                                <svg class="buttonicon" fill="currentColor" *ngIf="!expandOriginalMetadata">
-                                    <use xlink:href="assets/bootstrap-icons.svg#caret-down" />
-                                </svg>
-                                <svg class="buttonicon" fill="currentColor" *ngIf="expandOriginalMetadata">
-                                    <use xlink:href="assets/bootstrap-icons.svg#caret-up" />
-                                </svg>
-                            </button>
-                            Original document metadata
-                        </h6>
-
-                        <div #collapse="ngbCollapse" [(ngbCollapse)]="!expandOriginalMetadata">
-                            <table class="table table-borderless">
-                                <tbody>
-                                    <tr *ngFor="let m of metadata?.original_metadata">
-                                        <td>{{m.prefix}}:{{m.key}}</td>
-                                        <td>{{m.value}}</td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-
-                        <h6 *ngIf="metadata?.has_archive_version && metadata?.archive_metadata.length > 0">
-                            <button type="button" class="btn btn-outline-secondary btn-sm mr-2"
-                                (click)="expandArchivedMetadata = !expandArchivedMetadata" aria-controls="collapseExample">
-                                <svg class="buttonicon" fill="currentColor" *ngIf="!expandArchivedMetadata">
-                                    <use xlink:href="assets/bootstrap-icons.svg#caret-down" />
-                                </svg>
-                                <svg class="buttonicon" fill="currentColor" *ngIf="expandArchivedMetadata">
-                                    <use xlink:href="assets/bootstrap-icons.svg#caret-up" />
-                                </svg>
-                            </button>
-                            Archived document metadata
-                        </h6>
-
-                        <div #collapse="ngbCollapse" [(ngbCollapse)]="!expandArchivedMetadata">
-                            <table class="table table-borderless">
-                                <tbody>
-                                    <tr *ngFor="let m of metadata?.archive_metadata">
-                                        <td>{{m.prefix}}:{{m.key}}</td>
-                                        <td>{{m.value}}</td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
+                        <app-metadata-collapse title="Original document metadata" [metadata]="metadata.original_metadata" *ngIf="metadata?.original_metadata.length > 0"></app-metadata-collapse>
+                        <app-metadata-collapse title="Archived document metadata" [metadata]="metadata.archive_metadata" *ngIf="metadata?.archive_metadata.length > 0"></app-metadata-collapse>
 
                     </ng-template>
                 </li>
diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html
new file mode 100644
index 000000000..e8fda1d0b
--- /dev/null
+++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html
@@ -0,0 +1,23 @@
+<h6>
+  <button type="button" class="btn btn-outline-secondary btn-sm mr-2"
+      (click)="expand = !expand">
+      <svg class="buttonicon" fill="currentColor" *ngIf="!expand">
+          <use xlink:href="assets/bootstrap-icons.svg#caret-down" />
+      </svg>
+      <svg class="buttonicon" fill="currentColor" *ngIf="expand">
+          <use xlink:href="assets/bootstrap-icons.svg#caret-up" />
+      </svg>
+  </button>
+  {{title}}
+</h6>
+
+<div #collapse="ngbCollapse" [(ngbCollapse)]="!expand">
+  <table class="table table-borderless">
+      <tbody>
+          <tr *ngFor="let m of metadata">
+              <td>{{m.prefix}}:{{m.key}}</td>
+              <td>{{m.value}}</td>
+          </tr>
+      </tbody>
+  </table>
+</div>
\ No newline at end of file
diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.scss b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.spec.ts b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.spec.ts
new file mode 100644
index 000000000..2bd96760b
--- /dev/null
+++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MetadataCollapseComponent } from './metadata-collapse.component';
+
+describe('MetadataCollapseComponent', () => {
+  let component: MetadataCollapseComponent;
+  let fixture: ComponentFixture<MetadataCollapseComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ MetadataCollapseComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MetadataCollapseComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts
new file mode 100644
index 000000000..160274e41
--- /dev/null
+++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts
@@ -0,0 +1,23 @@
+import { Component, Input, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-metadata-collapse',
+  templateUrl: './metadata-collapse.component.html',
+  styleUrls: ['./metadata-collapse.component.scss']
+})
+export class MetadataCollapseComponent implements OnInit {
+
+  constructor() { }
+
+  expand = false
+
+  @Input()
+  metadata
+
+  @Input()
+  title = "Metadata"
+
+  ngOnInit(): void {
+  }
+
+}

From b5a85caa72422763c29dbf6baf10af8b19e0b564 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 13 Dec 2020 15:20:24 +0100
Subject: [PATCH 0176/1300] confirm dialogs for remove operations

---
 .../document-list/document-list.component.ts   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 36c70a00e..ce4ebec73 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -182,7 +182,14 @@ export class DocumentListComponent implements OnInit {
   }
 
   bulkRemoveCorrespondent() {
-    this.executeBulkOperation('set_correspondent', {"correspondent": null}).subscribe(r => {})
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Remove correspondent"
+    modal.componentInstance.message = `This operation will remove the correspondent from all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      this.executeBulkOperation('set_correspondent', {"correspondent": null}).subscribe(r => {
+        modal.close()
+      })
+    })
   }
 
   bulkSetDocumentType() {
@@ -202,7 +209,14 @@ export class DocumentListComponent implements OnInit {
   }
 
   bulkRemoveDocumentType() {
-    this.executeBulkOperation('set_document_type', {"document_type": null}).subscribe(r => {})
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Remove document type"
+    modal.componentInstance.message = `This operation will remove the document type from all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      this.executeBulkOperation('set_document_type', {"document_type": null}).subscribe(r => {
+        modal.close()
+      })
+    })
   }
 
   bulkAddTag() {

From 2dc3019083a5ef7de57df74b2dc3cad8df49eb99 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 13 Dec 2020 15:28:20 +0100
Subject: [PATCH 0177/1300] table selection highlighting

---
 .../components/document-list/document-list.component.html    | 2 +-
 .../components/document-list/document-list.component.scss    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 0c3674421..396e7e12d 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -119,7 +119,7 @@
     <th class="d-none d-xl-table-cell">Added</th>
   </thead>
   <tbody>
-    <tr *ngFor="let d of list.documents">
+    <tr *ngFor="let d of list.documents" [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)" (change)="list.setSelected(d, $event.target.checked)">
diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss
index e69de29bb..b9553930b 100644
--- a/src-ui/src/app/components/document-list/document-list.component.scss
+++ b/src-ui/src/app/components/document-list/document-list.component.scss
@@ -0,0 +1,5 @@
+@import "/src/theme";
+
+.table-row-selected {
+  background-color: $primaryFaded;
+}
\ No newline at end of file

From 771223030005a160d28cd93ddbdadc214136e992 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 10:18:03 -0800
Subject: [PATCH 0178/1300] remove unneeded display Input

---
 .../filter-dropdown-button.component.html          |  2 +-
 .../filter-dropdown-button.component.ts            | 14 +++++++-------
 .../filter-dropdown/filter-dropdown.component.html |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
index 5f12a5a17..10068c675 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
@@ -5,7 +5,7 @@
     </svg>
   </div>
   <div class="mr-1">
-    <app-tag *ngIf="display == 'tag'; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
+    <app-tag *ngIf="isTag; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
     <ng-template #displayName><small>{{item.name}}</small></ng-template>
   </div>
   <div class="badge bg-primary text-light rounded-pill ml-auto">{{item.document_count}}</div>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts
index 847c3f12b..d3ddd3cbf 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, OnInit } 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,22 +8,22 @@ import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
   templateUrl: './filter-dropdown-button.component.html',
   styleUrls: ['./filter-dropdown-button.component.scss']
 })
-export class FilterDropdownButtonComponent {
-
-  constructor() { }
+export class FilterDropdownButtonComponent implements OnInit {
 
   @Input()
   item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent
 
-  @Input()
-  display: string
-
   @Input()
   selected: boolean
 
   @Output()
   toggle = new EventEmitter()
 
+  isTag: boolean
+
+  ngOnInit() {
+    this.isTag = 'is_inbox_tag' in this.item // ~ this.item instanceof PaperlessTag
+  }
 
   toggleItem(): void {
     this.selected = !this.selected
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 3d47d23b7..47a46762d 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -5,7 +5,7 @@
       <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
       <ng-container *ngIf="(items$ | async)?.results as items">
         <ng-container *ngFor="let item of items | filter: filterText; let i = index">
-          <app-filter-dropdown-button [item]="item" [display]="display" [selected]="isItemSelected(item)" (toggle)="toggleItem($event)"></app-filter-dropdown-button>
+          <app-filter-dropdown-button [item]="item" [selected]="isItemSelected(item)" (toggle)="toggleItem($event)"></app-filter-dropdown-button>
         </ng-container>
       </ng-container>
     </div>

From 6f684f80705e715ad36b2c0fc823695c80912865 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 10:24:20 -0800
Subject: [PATCH 0179/1300] Dropdown components now accept lists not
 observables

---
 .../filter-dropdown/filter-dropdown.component.html         | 2 +-
 .../filter-dropdown/filter-dropdown.component.ts           | 7 +------
 .../components/filter-editor/filter-editor.component.html  | 6 +++---
 src-ui/src/app/services/filter-editor-view.service.ts      | 6 +++---
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 47a46762d..8c48f0e2f 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -3,7 +3,7 @@
   <div class="dropdown-menu quick-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
       <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
-      <ng-container *ngIf="(items$ | async)?.results as items">
+      <ng-container *ngIf="items">
         <ng-container *ngFor="let item of items | filter: filterText; let i = index">
           <app-filter-dropdown-button [item]="item" [selected]="isItemSelected(item)" (toggle)="toggleItem($event)"></app-filter-dropdown-button>
         </ng-container>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index 4c80bfb66..a54455153 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -14,7 +14,7 @@ export class FilterDropdownComponent implements OnInit {
   constructor(private filterPipe: FilterPipe) { }
 
   @Input()
-  items$: Observable<Results<ObjectWithId>>
+  items: ObjectWithId[]
 
   @Input()
   itemsSelected: ObjectWithId[]
@@ -31,11 +31,6 @@ export class FilterDropdownComponent implements OnInit {
   @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef
 
   filterText: string
-  items: ObjectWithId[]
-
-  ngOnInit() {
-    this.items$.subscribe(result => this.items = result.results)
-  }
 
   toggleItem(item: ObjectWithId): void {
     this.toggle.emit(item)
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 4c2e61d46..9c55c1e7e 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -6,9 +6,9 @@
     <input class="form-control form-control-sm" type="text" [(ngModel)]="filterEditorService.filterText" placeholder="Title" #filterTextInput>
   </div>
 
-  <app-filter-dropdown class="col-auto" [(items$)]="filterEditorService.tags$" [itemsSelected]="filterEditorService.selectedTags" [title]="'Tags'" [display]="'tag'" (toggle)="onToggleTag($event)"></app-filter-dropdown>
-  <app-filter-dropdown class="col-auto" [(items$)]="filterEditorService.correspondents$" [itemsSelected]="filterEditorService.selectedCorrespondents" [title]="'Correspondents'" (toggle)="onToggleCorrespondent($event)"></app-filter-dropdown>
-  <app-filter-dropdown class="col-auto" [(items$)]="filterEditorService.documentTypes$" [itemsSelected]="filterEditorService.selectedDocumentTypes" [title]="'Document Types'" (toggle)="onToggleDocumentType($event)"></app-filter-dropdown>
+  <app-filter-dropdown class="col-auto" [(items)]="filterEditorService.tags" [itemsSelected]="filterEditorService.selectedTags" [title]="'Tags'" [display]="'tag'" (toggle)="onToggleTag($event)"></app-filter-dropdown>
+  <app-filter-dropdown class="col-auto" [(items)]="filterEditorService.correspondents" [itemsSelected]="filterEditorService.selectedCorrespondents" [title]="'Correspondents'" (toggle)="onToggleCorrespondent($event)"></app-filter-dropdown>
+  <app-filter-dropdown class="col-auto" [(items)]="filterEditorService.documentTypes" [itemsSelected]="filterEditorService.selectedDocumentTypes" [title]="'Document Types'" (toggle)="onToggleDocumentType($event)"></app-filter-dropdown>
 
   <app-filter-dropdown-date class="col-auto" [dateBefore]="filterEditorService.dateCreatedBefore" [dateAfter]="filterEditorService.dateCreatedAfter" [title]="'Created'" (dateBeforeSet)="onDateCreatedBeforeSet($event)" (dateAfterSet)="onDateCreatedAfterSet($event)"></app-filter-dropdown-date>
   <app-filter-dropdown-date class="col-auto" [dateBefore]="filterEditorService.dateAddedBefore" [dateAfter]="filterEditorService.dateAddedAfter" [title]="'Added'"  (dateBeforeSet)="onDateAddedBeforeSet($event)" (dateAfterSet)="onDateAddedAfterSet($event)"></app-filter-dropdown-date>
diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
index ba7b6dd24..b436ecde4 100644
--- a/src-ui/src/app/services/filter-editor-view.service.ts
+++ b/src-ui/src/app/services/filter-editor-view.service.ts
@@ -16,9 +16,9 @@ import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
   providedIn: 'root'
 })
 export class FilterEditorViewService {
-  tags$: Observable<Results<PaperlessTag>>
-  correspondents$: Observable<Results<PaperlessCorrespondent>>
-  documentTypes$: Observable<Results<PaperlessDocumentType>>
+  private tags$: Observable<Results<PaperlessTag>>
+  private correspondents$: Observable<Results<PaperlessCorrespondent>>
+  private documentTypes$: Observable<Results<PaperlessDocumentType>>
 
   tags: PaperlessTag[] = []
   correspondents: PaperlessCorrespondent[]

From bb1725c7dd48f3c018a249b7d28ab25cc83a32f0 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 10:25:51 -0800
Subject: [PATCH 0180/1300] Typescript cleanup

---
 .../filter-dropdown/filter-dropdown.component.ts              | 4 ++--
 .../app/components/filter-editor/filter-editor.component.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index a54455153..720c86a94 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output, ElementRef, ViewChild } from '@angular/core';
+import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core';
 import { Observable } from 'rxjs';
 import { Results } from 'src/app/data/results';
 import { ObjectWithId } from 'src/app/data/object-with-id';
@@ -9,7 +9,7 @@ import { FilterPipe } from  'src/app/pipes/filter.pipe';
   templateUrl: './filter-dropdown.component.html',
   styleUrls: ['./filter-dropdown.component.scss']
 })
-export class FilterDropdownComponent implements OnInit {
+export class FilterDropdownComponent {
 
   constructor(private filterPipe: FilterPipe) { }
 
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 9c55c1e7e..eb322414d 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -6,7 +6,7 @@
     <input class="form-control form-control-sm" type="text" [(ngModel)]="filterEditorService.filterText" placeholder="Title" #filterTextInput>
   </div>
 
-  <app-filter-dropdown class="col-auto" [(items)]="filterEditorService.tags" [itemsSelected]="filterEditorService.selectedTags" [title]="'Tags'" [display]="'tag'" (toggle)="onToggleTag($event)"></app-filter-dropdown>
+  <app-filter-dropdown class="col-auto" [(items)]="filterEditorService.tags" [itemsSelected]="filterEditorService.selectedTags" [title]="'Tags'" (toggle)="onToggleTag($event)"></app-filter-dropdown>
   <app-filter-dropdown class="col-auto" [(items)]="filterEditorService.correspondents" [itemsSelected]="filterEditorService.selectedCorrespondents" [title]="'Correspondents'" (toggle)="onToggleCorrespondent($event)"></app-filter-dropdown>
   <app-filter-dropdown class="col-auto" [(items)]="filterEditorService.documentTypes" [itemsSelected]="filterEditorService.selectedDocumentTypes" [title]="'Document Types'" (toggle)="onToggleDocumentType($event)"></app-filter-dropdown>
 

From d6894d3c647e8ebd40d838154920b5e9abe80124 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 10:28:09 -0800
Subject: [PATCH 0181/1300] Change views menu title

---
 .../app/components/document-list/document-list.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 0fd139b89..f408e1e2a 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -46,7 +46,7 @@
   <div class="btn-group ml-2">
 
     <div class="btn-group" ngbDropdown role="group">
-      <button class="btn btn-sm btn-outline-primary dropdown-toggle" ngbDropdownToggle>Saved Views</button>
+      <button class="btn btn-sm btn-outline-primary dropdown-toggle" ngbDropdownToggle>Views</button>
       <div class="dropdown-menu shadow" ngbDropdownMenu>
         <ng-container *ngIf="!list.savedViewId">
           <button ngbDropdownItem *ngFor="let config of savedViewConfigService.getConfigs()" (click)="loadViewConfig(config)">{{config.title}}</button>

From 2de546fd5285a5cfc30b3c0393bb528e771f20bc Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 11:03:50 -0800
Subject: [PATCH 0182/1300] Fix tag / correspondent / document type toggling
 logic

---
 .../app/services/filter-editor-view.service.ts | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
index b436ecde4..bd25ec83b 100644
--- a/src-ui/src/app/services/filter-editor-view.service.ts
+++ b/src-ui/src/app/services/filter-editor-view.service.ts
@@ -103,18 +103,16 @@ export class FilterEditorViewService {
   private toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) {
     let filterRules = this.filterRules
     let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
-    let existingRule = filterRules.find(rule => rule.type.id == filterRuleType.id)
+    let existingRules = filterRules.filter(rule => rule.type.id == filterRuleType.id)
 
-    if (existingRule && existingRule.value == item.id) {
-      filterRules.splice(filterRules.indexOf(existingRule), 1)
-    } else if (existingRule && filterRuleType.id == FILTER_HAS_TAG) {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id})
-    } else if (existingRule && existingRule.value == item.id) {
-      return
-    } else if (existingRule) {
-      existingRule.value = item.id
+    if (existingRules && filterRuleType.id == FILTER_HAS_TAG) {
+      let existingItemRule = existingRules?.find(rule => rule.value == item.id)
+      if (existingItemRule) filterRules.splice(filterRules.indexOf(existingItemRule), 1)
+      else filterRules.push({type: filterRuleType, value: item.id})
+    } else if (existingRules.length) { // Correspondents & DocumentTypes only one
+      filterRules.find(rule => rule.type.id == filterRuleType.id).value = item.id
     } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id})
+      filterRules.push({type: filterRuleType, value: item.id})
     }
 
     this.filterRules = filterRules

From a61ea3555acde275a80a9de18f0e88a9d0e0d753 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 11:17:10 -0800
Subject: [PATCH 0183/1300] Ok now toggling logic is fixed

---
 src-ui/src/app/services/filter-editor-view.service.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
index bd25ec83b..071a0d577 100644
--- a/src-ui/src/app/services/filter-editor-view.service.ts
+++ b/src-ui/src/app/services/filter-editor-view.service.ts
@@ -104,11 +104,12 @@ export class FilterEditorViewService {
     let filterRules = this.filterRules
     let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
     let existingRules = filterRules.filter(rule => rule.type.id == filterRuleType.id)
+    let existingItemRule = existingRules?.find(rule => rule.value == item.id)
 
-    if (existingRules && filterRuleType.id == FILTER_HAS_TAG) {
-      let existingItemRule = existingRules?.find(rule => rule.value == item.id)
-      if (existingItemRule) filterRules.splice(filterRules.indexOf(existingItemRule), 1)
-      else filterRules.push({type: filterRuleType, value: item.id})
+    if (existingRules && existingItemRule) {
+      filterRules.splice(filterRules.indexOf(existingItemRule), 1) // if exact rule exists just remove
+    } else if (existingItemRule && filterRuleType.multi) { // e.g. tags can have multiple
+      filterRules.push({type: filterRuleType, value: item.id})
     } else if (existingRules.length) { // Correspondents & DocumentTypes only one
       filterRules.find(rule => rule.type.id == filterRuleType.id).value = item.id
     } else {

From bcdbc975d61e50f1a52feab4d7c2a8338b3195a0 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 11:20:28 -0800
Subject: [PATCH 0184/1300] Show filter has items selected

---
 .../filter-dropdown-date.component.html                  | 9 ++++++++-
 .../filter-dropdown/filter-dropdown.component.html       | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
index 83d8c6455..a80e1c491 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -1,5 +1,12 @@
   <div class="btn-group" ngbDropdown role="group">
-  <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>{{title}}</button>
+  <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>
+    <ng-container *ngIf="_dateBefore || _dateAfter">
+      <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+        <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+      </svg>
+    </ng-container>
+    {{title}}
+  </button>
   <div class="dropdown-menu date-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
         <div class="list-group-item d-flex flex-column align-items-start">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 8c48f0e2f..591530ae2 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -1,5 +1,12 @@
   <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)">
-  <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>{{title}}</button>
+  <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>
+    <ng-container *ngIf="itemsSelected?.length > 0">
+      <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+        <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+      </svg>
+    </ng-container>
+    {{title}}
+  </button>
   <div class="dropdown-menu quick-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
       <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>

From 1ddad84985f918fb97b745a406f51c00f4f0d9e4 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 11:23:21 -0800
Subject: [PATCH 0185/1300] Fix visual clearing of date field

---
 .../filter-dropdown-date.component.html       |  2 +-
 .../filter-dropdown-date.component.ts         | 22 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
index a80e1c491..0a3dc7057 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -1,6 +1,6 @@
   <div class="btn-group" ngbDropdown role="group">
   <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>
-    <ng-container *ngIf="_dateBefore || _dateAfter">
+    <ng-container *ngIf="dateBefore || dateAfter">
       <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
         <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
       </svg>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index 206dbe2c3..41cf97bb9 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -38,20 +38,24 @@ export class FilterDropdownDateComponent {
 
   ngOnChanges(changes: SimpleChange) {
     // this is a hacky workaround perhaps because of https://github.com/angular/angular/issues/11097
-    let dateString: string
+    let dateString: string = ''
     let dateAfterChange: SimpleChange = changes['dateAfter']
     let dateBeforeChange: SimpleChange = changes['dateBefore']
 
-    if (dateAfterChange && dateAfterChange.currentValue && this.dpAfter) {
-      let dateAfterDate = dateAfterChange.currentValue as NgbDateStruct
+    if (this.dpBefore && this.dpAfter) {
       let dpAfterElRef: ElementRef = this.dpAfter['_elRef']
-      dateString = `${dateAfterDate.year}-${dateAfterDate.month.toString().padStart(2,'0')}-${dateAfterDate.day.toString().padStart(2,'0')}`
-      dpAfterElRef.nativeElement.value = dateString
-    } else if (dateBeforeChange && dateBeforeChange.currentValue && this.dpBefore) {
-      let dateBeforeDate = dateBeforeChange.currentValue as NgbDateStruct
       let dpBeforeElRef: ElementRef = this.dpBefore['_elRef']
-      dateString = `${dateBeforeChange.currentValue.year}-${dateBeforeChange.currentValue.month.toString().padStart(2,'0')}-${dateBeforeChange.currentValue.day.toString().padStart(2,'0')}`
-      dpBeforeElRef.nativeElement.value = dateString
+
+      if (dateAfterChange && dateAfterChange.currentValue) {
+        let dateAfterDate = dateAfterChange.currentValue as NgbDateStruct
+        dateString = `${dateAfterDate.year}-${dateAfterDate.month.toString().padStart(2,'0')}-${dateAfterDate.day.toString().padStart(2,'0')}`
+      } else if (dateBeforeChange && dateBeforeChange.currentValue) {
+        let dateBeforeDate = dateBeforeChange.currentValue as NgbDateStruct
+        dateString = `${dateBeforeChange.currentValue.year}-${dateBeforeChange.currentValue.month.toString().padStart(2,'0')}-${dateBeforeChange.currentValue.day.toString().padStart(2,'0')}`
+      } else {
+        dpAfterElRef.nativeElement.value = dateString
+        dpBeforeElRef.nativeElement.value = dateString
+      }
     }
   }
 

From 3f719a21e0c777a849e2c406d97c8374c9caa1fc Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 11:29:12 -0800
Subject: [PATCH 0186/1300] Typo from merge

---
 src-ui/src/app/app.module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 4ce212763..f935b7701 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -97,7 +97,7 @@ import { MetadataCollapseComponent } from './components/document-detail/metadata
     WelcomeWidgetComponent,
     YesNoPipe,
     FileSizePipe,
-    FilterPipe
+    FilterPipe,
     DocumentTitlePipe,
     MetadataCollapseComponent
   ],

From 3d8cd0f0d6b98ca5dbc9319ca64113d59c95ca5a Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 11:32:13 -0800
Subject: [PATCH 0187/1300] change tag selected marker to badge

---
 .../filter-dropdown/filter-dropdown.component.html            | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 591530ae2..b2d82f3d0 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -1,9 +1,7 @@
   <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)">
   <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>
     <ng-container *ngIf="itemsSelected?.length > 0">
-      <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-        <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
-      </svg>
+      <div class="badge bg-primary text-light rounded-pill ml-auto">{{itemsSelected?.length}}</div>
     </ng-container>
     {{title}}
   </button>

From 7d212f6e80259190d69cdb8ae8deb03b3948dc17 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 11:33:57 -0800
Subject: [PATCH 0188/1300] Last time fixing the toggling logic, I hope =/

---
 src-ui/src/app/services/filter-editor-view.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
index 071a0d577..3a3b70e9a 100644
--- a/src-ui/src/app/services/filter-editor-view.service.ts
+++ b/src-ui/src/app/services/filter-editor-view.service.ts
@@ -108,9 +108,9 @@ export class FilterEditorViewService {
 
     if (existingRules && existingItemRule) {
       filterRules.splice(filterRules.indexOf(existingItemRule), 1) // if exact rule exists just remove
-    } else if (existingItemRule && filterRuleType.multi) { // e.g. tags can have multiple
+    } else if (existingRules.length > 0 && filterRuleType.multi) { // e.g. tags can have multiple
       filterRules.push({type: filterRuleType, value: item.id})
-    } else if (existingRules.length) { // Correspondents & DocumentTypes only one
+    } else if (existingRules.length > 0) { // Correspondents & DocumentTypes only one
       filterRules.find(rule => rule.type.id == filterRuleType.id).value = item.id
     } else {
       filterRules.push({type: filterRuleType, value: item.id})

From 2c18f6268b20ac93098dec9f5fb3ba6428729464 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 11:34:58 -0800
Subject: [PATCH 0189/1300] Comment cleanup

---
 src-ui/src/app/services/filter-editor-view.service.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
index 3a3b70e9a..ee7961f0f 100644
--- a/src-ui/src/app/services/filter-editor-view.service.ts
+++ b/src-ui/src/app/services/filter-editor-view.service.ts
@@ -106,11 +106,11 @@ export class FilterEditorViewService {
     let existingRules = filterRules.filter(rule => rule.type.id == filterRuleType.id)
     let existingItemRule = existingRules?.find(rule => rule.value == item.id)
 
-    if (existingRules && existingItemRule) {
-      filterRules.splice(filterRules.indexOf(existingItemRule), 1) // if exact rule exists just remove
+    if (existingRules && existingItemRule) { // if exact rule exists just remove
+      filterRules.splice(filterRules.indexOf(existingItemRule), 1)
     } else if (existingRules.length > 0 && filterRuleType.multi) { // e.g. tags can have multiple
       filterRules.push({type: filterRuleType, value: item.id})
-    } else if (existingRules.length > 0) { // Correspondents & DocumentTypes only one
+    } else if (existingRules.length > 0) { // correspondents & documentTypes can only be one
       filterRules.find(rule => rule.type.id == filterRuleType.id).value = item.id
     } else {
       filterRules.push({type: filterRuleType, value: item.id})

From 7ac101d84ee26620cb7a3928b2b8b5daf68eb5ce Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 12:17:01 -0800
Subject: [PATCH 0190/1300] Typo!

---
 .../document-list/document-list.component.ts   |  6 +++---
 .../filter-editor/filter-editor.component.ts   |  6 +++---
 .../app/services/filter-editor-view.service.ts | 18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index fe03cae80..cd60054c7 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -113,17 +113,17 @@ export class DocumentListComponent implements OnInit {
   }
 
   clickTag(tagID: number) {
-    this.filterEditorService.toggleFitlerByTagID(tagID)
+    this.filterEditorService.toggleFilterByTagID(tagID)
     this.applyFilterRules()
   }
 
   clickCorrespondent(correspondentID: number) {
-    this.filterEditorService.toggleFitlerByCorrespondentID(correspondentID)
+    this.filterEditorService.toggleFilterByCorrespondentID(correspondentID)
     this.applyFilterRules()
   }
 
   clickDocumentType(documentTypeID: number) {
-    this.filterEditorService.toggleFitlerByDocumentTypeID(documentTypeID)
+    this.filterEditorService.toggleFilterByDocumentTypeID(documentTypeID)
     this.applyFilterRules()
   }
 
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index bb838f0be..a6940795e 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -52,17 +52,17 @@ export class FilterEditorComponent implements AfterViewInit {
   }
 
   onToggleTag(tag: PaperlessTag) {
-    this.filterEditorService.toggleFitlerByTag(tag)
+    this.filterEditorService.toggleFilterByTag(tag)
     this.applyFilters()
   }
 
   onToggleCorrespondent(correspondent: PaperlessCorrespondent) {
-    this.filterEditorService.toggleFitlerByCorrespondent(correspondent)
+    this.filterEditorService.toggleFilterByCorrespondent(correspondent)
     this.applyFilters()
   }
 
   onToggleDocumentType(documentType: PaperlessDocumentType) {
-    this.filterEditorService.toggleFitlerByDocumentType(documentType)
+    this.filterEditorService.toggleFilterByDocumentType(documentType)
     this.applyFilters()
   }
 
diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
index ee7961f0f..0893fff2e 100644
--- a/src-ui/src/app/services/filter-editor-view.service.ts
+++ b/src-ui/src/app/services/filter-editor-view.service.ts
@@ -76,28 +76,28 @@ export class FilterEditorViewService {
     return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => dtr.value == dt.id))
   }
 
-  toggleFitlerByTag(tag: PaperlessTag) {
+  toggleFilterByTag(tag: PaperlessTag) {
     this.toggleFilterByItem(tag, FILTER_HAS_TAG)
   }
 
-  toggleFitlerByCorrespondent(tag: PaperlessCorrespondent) {
+  toggleFilterByCorrespondent(tag: PaperlessCorrespondent) {
     this.toggleFilterByItem(tag, FILTER_CORRESPONDENT)
   }
 
-  toggleFitlerByDocumentType(tag: PaperlessDocumentType) {
+  toggleFilterByDocumentType(tag: PaperlessDocumentType) {
     this.toggleFilterByItem(tag, FILTER_DOCUMENT_TYPE)
   }
 
-  toggleFitlerByTagID(tagID: number) {
-    this.toggleFitlerByTag(this.tags?.find(t => t.id == tagID))
+  toggleFilterByTagID(tagID: number) {
+    this.toggleFilterByTag(this.tags?.find(t => t.id == tagID))
   }
 
-  toggleFitlerByCorrespondentID(correspondentID: number) {
-    this.toggleFitlerByCorrespondent(this.correspondents?.find(t => t.id == correspondentID))
+  toggleFilterByCorrespondentID(correspondentID: number) {
+    this.toggleFilterByCorrespondent(this.correspondents?.find(t => t.id == correspondentID))
   }
 
-  toggleFitlerByDocumentTypeID(documentTypeID: number) {
-    this.toggleFitlerByDocumentType(this.documentTypes?.find(t => t.id == documentTypeID))
+  toggleFilterByDocumentTypeID(documentTypeID: number) {
+    this.toggleFilterByDocumentType(this.documentTypes?.find(t => t.id == documentTypeID))
   }
 
   private toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) {

From ae51619243b9019902f05a6da26a54a4652a6329 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 14:11:43 -0800
Subject: [PATCH 0191/1300] Make date buttons same as other dropdowns

---
 .../filter-dropdown-date.component.html               | 11 +++++------
 .../filter-dropdown-date.component.ts                 |  4 ++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
index 0a3dc7057..94da65d7c 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -9,12 +9,11 @@
   </button>
   <div class="dropdown-menu date-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
-        <div class="list-group-item d-flex flex-column align-items-start">
-          <button class="btn btn-sm btn-link pl-0" (click)="setDateQuickFilter(7)">Last 7 days</button>
-          <button class="btn btn-sm btn-link pl-0" (click)="setDateQuickFilter(30)">Last 30 days</button>
-          <button class="btn btn-sm btn-link pl-0" (click)="setDateQuickFilter('month')">This month</button>
-          <button class="btn btn-sm btn-link pl-0" (click)="setDateQuickFilter('year')">This year</button>
-        </div>
+        <button *ngFor="let range of [7, 30, 'month', 'year']" class="list-group-item small list-goup list-group-item-action d-flex" role="menuitem" (click)="setDateQuickFilter(range)">
+          <ng-container *ngIf="isStringRange(range)">This </ng-container>
+          {{ range }}
+          <ng-container *ngIf="!isStringRange(range)"> days</ng-container>
+        </button>
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
           <div class="mb-1"><small>Before</small></div>
           <div class="input-group input-group-sm">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index 41cf97bb9..3a85547ea 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -36,6 +36,10 @@ export class FilterDropdownDateComponent {
     return NgbDate.from({year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate()})
   }
 
+  isStringRange(range: any) {
+    return typeof range == 'string'
+  }
+
   ngOnChanges(changes: SimpleChange) {
     // this is a hacky workaround perhaps because of https://github.com/angular/angular/issues/11097
     let dateString: string = ''

From 1fafb9ace6af9da4a977f78dc88cd3f1a6680ca9 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 14:40:17 -0800
Subject: [PATCH 0192/1300] Prettier styling on dropdowns

---
 .../filter-dropdown-date.component.html       |  4 +--
 .../filter-dropdown-button.component.html     |  4 +--
 .../filter-dropdown.component.html            | 28 ++++++++++++++-----
 .../filter-dropdown.component.scss            |  9 ++++--
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
index 94da65d7c..e41f7c7ab 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -7,9 +7,9 @@
     </ng-container>
     {{title}}
   </button>
-  <div class="dropdown-menu date-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
+  <div class="dropdown-menu date-filter shadow pt-0" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
-        <button *ngFor="let range of [7, 30, 'month', 'year']" class="list-group-item small list-goup list-group-item-action d-flex" role="menuitem" (click)="setDateQuickFilter(range)">
+        <button *ngFor="let range of [7, 30, 'month', 'year']" class="list-group-item small list-goup list-group-item-action d-flex p-2 pl-3" role="menuitem" (click)="setDateQuickFilter(range)">
           <ng-container *ngIf="isStringRange(range)">This </ng-container>
           {{ range }}
           <ng-container *ngIf="!isStringRange(range)"> days</ng-container>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
index 10068c675..eef4e2c17 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
@@ -1,4 +1,4 @@
-<button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" (click)="toggleItem()">
+<button class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-left-0 border-right-0 border-bottom" role="menuitem" (click)="toggleItem()">
   <div class="selected-icon mr-1">
     <svg *ngIf="selected" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
       <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
@@ -8,5 +8,5 @@
     <app-tag *ngIf="isTag; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
     <ng-template #displayName><small>{{item.name}}</small></ng-template>
   </div>
-  <div class="badge bg-primary text-light rounded-pill ml-auto">{{item.document_count}}</div>
+  <div class="badge badge-light rounded-pill ml-auto">{{item.document_count}}</div>
 </button>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index b2d82f3d0..99ab629dc 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -1,18 +1,32 @@
   <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)">
   <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>
-    <ng-container *ngIf="itemsSelected?.length > 0">
-      <div class="badge bg-primary text-light rounded-pill ml-auto">{{itemsSelected?.length}}</div>
-    </ng-container>
+      <div class="badge bg-primary text-light rounded-pill ml-auto">
+        <ng-container *ngIf="itemsSelected?.length > 0">
+        {{itemsSelected?.length}}
+      </ng-container>
+      </div>
     {{title}}
   </button>
-  <div class="dropdown-menu quick-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
+  <div class="dropdown-menu py-0 shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
-      <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
-      <ng-container *ngIf="items">
+      <div class="list-group-item">
+        <div class="input-group input-group-sm">
+          <input class="form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
+          <div class="input-group-append">
+            <span class="input-group-text bg-light text-muted">
+              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-search" viewBox="0 0 16 16">
+                <path fill-rule="evenodd" d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"/>
+                <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
+              </svg>
+            </span>
+          </div>
+        </div>
+      </div>
+      <div *ngIf="items" class="items">
         <ng-container *ngFor="let item of items | filter: filterText; let i = index">
           <app-filter-dropdown-button [item]="item" [selected]="isItemSelected(item)" (toggle)="toggleItem($event)"></app-filter-dropdown-button>
         </ng-container>
-      </ng-container>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
index 5551b0329..d34729eee 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
@@ -1,5 +1,8 @@
-.quick-filter {
+.dropdown-menu {
   min-width: 250px;
-  max-height: 400px;
-  overflow-y: scroll;
+
+  .items {
+    max-height: 400px;
+    overflow-y: scroll;
+  }
 }

From 04bb7d48935d034792c12a4fb98e4ca906f1dd2a Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 14:46:10 -0800
Subject: [PATCH 0193/1300] Remove card around filter editor

---
 .../components/document-list/document-list.component.html   | 6 ++----
 .../filter-dropdown/filter-dropdown.component.html          | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index ed54dc3fb..b1b2c8f94 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -62,10 +62,8 @@
 
 </app-page-header>
 
-<div class="card w-100 mb-3">
-  <div class="card-body">
-    <app-filter-editor [(filterEditorService)]="filterEditorService" (apply)="applyFilterRules()" (clear)="clearFilterRules()" #filterEditor></app-filter-editor>
-  </div>
+<div class="w-100 mb-4">
+  <app-filter-editor [(filterEditorService)]="filterEditorService" (apply)="applyFilterRules()" (clear)="clearFilterRules()" #filterEditor></app-filter-editor>
 </div>
 
 <div class="d-flex justify-content-between align-items-center">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 99ab629dc..523dd084a 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -1,10 +1,10 @@
   <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)">
   <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>
-      <div class="badge bg-primary text-light rounded-pill ml-auto">
-        <ng-container *ngIf="itemsSelected?.length > 0">
+    <ng-container *ngIf="itemsSelected?.length > 0">
+      <div class="badge bg-secondary text-light rounded-pill ml-auto">
         {{itemsSelected?.length}}
-      </ng-container>
       </div>
+    </ng-container>
     {{title}}
   </button>
   <div class="dropdown-menu py-0 shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">

From 89cb1211e74bfe8e2b013f5c860c0efcbbcca2bc Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 13 Dec 2020 23:46:48 +0100
Subject: [PATCH 0194/1300] docs

---
 docs/faq.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index 6eac18617..d9efddd0f 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -78,6 +78,12 @@ that automatically, I'm all ears. For now, you have to grab the latest release
 archive from the project page and build the image yourself. The release comes
 with the front end already compiled, so you don't have to do this on the Pi.
 
+**Q:** *How do I run this on unRaid?*
+
+**A:** Head over to `<https://github.com/selfhosters/unRAID-CA-templates>`_,
+`Uli Fahrer <https://github.com/Tooa>`_ created a container template for that.
+I don't exactly know how to use that though, since I don't use unRaid.
+
 **Q:** *How do I run this on my toaster?*
 
 **A:** I honestly don't know! As for all other devices that might be able

From 8e5c2a2b145383203d2fa681c160bec081989673 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 15:08:45 -0800
Subject: [PATCH 0195/1300] Fix date clearing

---
 .../filter-dropdown-date/filter-dropdown-date.component.ts      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index 3a85547ea..e5f9675d1 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -53,9 +53,11 @@ export class FilterDropdownDateComponent {
       if (dateAfterChange && dateAfterChange.currentValue) {
         let dateAfterDate = dateAfterChange.currentValue as NgbDateStruct
         dateString = `${dateAfterDate.year}-${dateAfterDate.month.toString().padStart(2,'0')}-${dateAfterDate.day.toString().padStart(2,'0')}`
+        dpAfterElRef.nativeElement.value = dateString
       } else if (dateBeforeChange && dateBeforeChange.currentValue) {
         let dateBeforeDate = dateBeforeChange.currentValue as NgbDateStruct
         dateString = `${dateBeforeChange.currentValue.year}-${dateBeforeChange.currentValue.month.toString().padStart(2,'0')}-${dateBeforeChange.currentValue.day.toString().padStart(2,'0')}`
+        dpBeforeElRef.nativeElement.value = dateString
       } else {
         dpAfterElRef.nativeElement.value = dateString
         dpBeforeElRef.nativeElement.value = dateString

From ee7492cf52e05c450b64b226aff5392fd4ac69c1 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 15:38:28 -0800
Subject: [PATCH 0196/1300] Clear date filter buttons

---
 .../filter-dropdown-date.component.html       | 22 ++++++++++++--
 .../filter-dropdown-date.component.scss       |  4 +++
 .../filter-dropdown-date.component.ts         | 16 ++++++++--
 .../services/filter-editor-view.service.ts    | 29 +++++++++++++------
 4 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
index e41f7c7ab..7b83f6619 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -15,7 +15,15 @@
           <ng-container *ngIf="!isStringRange(range)"> days</ng-container>
         </button>
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
-          <div class="mb-1"><small>Before</small></div>
+          <div class="mb-2 d-flex flex-row w-100 justify-content-between small">
+            <div>Before</div>
+            <a *ngIf="dateBefore" class="btn btn-link p-0 m-0" (click)="clearBefore()">
+              <svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+              </svg>
+              <small>Clear</small>
+            </a>
+          </div>
           <div class="input-group input-group-sm">
             <input class="form-control" type="text" placeholder="yyyy-mm-dd" name="before" [(ngModel)]="_dateBefore" [maxDate]="this._maxDate" ngbDatepicker (dateSelect)="onDateSelected($event)" #dpBefore="ngbDatepicker">
             <div class="input-group-append">
@@ -29,8 +37,16 @@
           </div>
         </div>
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
-          <div class="mb-1"><small>After</small></div>
-          <div class="input-group">
+          <div class="mb-2 d-flex flex-row w-100 justify-content-between small">
+            <div>After</div>
+            <a *ngIf="dateAfter" class="btn btn-link p-0 m-0" (click)="clearAfter()">
+              <svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+              </svg>
+              <small>Clear</small>
+            </a>
+          </div>
+          <div class="input-group input-group-sm">
             <input class="form-control form-control-sm" type="text" placeholder="yyyy-mm-dd" name="after" [(ngModel)]="_dateAfter" [maxDate]="this._maxDate" ngbDatepicker (dateSelect)="onDateSelected($event)" #dpAfter="ngbDatepicker">
             <div class="input-group-append">
               <button class="btn btn-outline-secondary btn-sm" (click)="dpAfter.toggle()" type="button">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.scss b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.scss
index 67edb9bf8..3bdedd8a0 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.scss
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.scss
@@ -1,3 +1,7 @@
 .date-filter {
   min-width: 250px;
+
+  .btn-link {
+    line-height: 1;
+  }
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index e5f9675d1..f69028bf0 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -43,8 +43,12 @@ export class FilterDropdownDateComponent {
   ngOnChanges(changes: SimpleChange) {
     // this is a hacky workaround perhaps because of https://github.com/angular/angular/issues/11097
     let dateString: string = ''
-    let dateAfterChange: SimpleChange = changes['dateAfter']
-    let dateBeforeChange: SimpleChange = changes['dateBefore']
+    let dateAfterChange: SimpleChange
+    let dateBeforeChange: SimpleChange
+    if (changes) {
+      dateAfterChange = changes['dateAfter']
+      dateBeforeChange = changes['dateBefore']
+    }
 
     if (this.dpBefore && this.dpAfter) {
       let dpAfterElRef: ElementRef = this.dpAfter['_elRef']
@@ -93,4 +97,12 @@ export class FilterDropdownDateComponent {
     let emitter = this._dateAfter && NgbDate.from(this._dateAfter).equals(date) ? this.dateAfterSet : this.dateBeforeSet
     emitter.emit(date)
   }
+
+  clearAfter() {
+    this.dateAfterSet.next()
+  }
+
+  clearBefore() {
+    this.dateBeforeSet.next()
+  }
 }
diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
index 0893fff2e..b50391376 100644
--- a/src-ui/src/app/services/filter-editor-view.service.ts
+++ b/src-ui/src/app/services/filter-editor-view.service.ts
@@ -155,23 +155,27 @@ export class FilterEditorViewService {
     } : undefined
   }
 
-  setDateCreatedBefore(date: NgbDateStruct) {
-    this.setDate(date, FILTER_CREATED_BEFORE)
+  setDateCreatedBefore(date?: NgbDateStruct) {
+    if (date) this.setDateFilter(date, FILTER_CREATED_BEFORE)
+    else this.clearDateFilter(FILTER_CREATED_BEFORE)
   }
 
-  setDateCreatedAfter(date: NgbDateStruct) {
-    this.setDate(date, FILTER_CREATED_AFTER)
+  setDateCreatedAfter(date?: NgbDateStruct) {
+    if (date) this.setDateFilter(date, FILTER_CREATED_AFTER)
+    else this.clearDateFilter(FILTER_CREATED_AFTER)
   }
 
-  setDateAddedBefore(date: NgbDateStruct) {
-    this.setDate(date, FILTER_ADDED_BEFORE)
+  setDateAddedBefore(date?: NgbDateStruct) {
+    if (date) this.setDateFilter(date, FILTER_ADDED_BEFORE)
+    else this.clearDateFilter(FILTER_ADDED_BEFORE)
   }
 
-  setDateAddedAfter(date: NgbDateStruct) {
-    this.setDate(date, FILTER_ADDED_AFTER)
+  setDateAddedAfter(date?: NgbDateStruct) {
+    if (date) this.setDateFilter(date, FILTER_ADDED_AFTER)
+    else this.clearDateFilter(FILTER_ADDED_AFTER)
   }
 
-  setDate(date: NgbDateStruct, dateRuleTypeID: number) {
+  setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) {
     let filterRules = this.filterRules
     let existingRule = filterRules.find(rule => rule.type.id == dateRuleTypeID)
     let newValue = `${date.year}-${date.month.toString().padStart(2,'0')}-${date.day.toString().padStart(2,'0')}` // YYYY-MM-DD
@@ -184,4 +188,11 @@ export class FilterEditorViewService {
 
     this.filterRules = filterRules
   }
+
+  clearDateFilter(dateRuleTypeID: number) {
+    let filterRules = this.filterRules
+    let existingRule = filterRules.find(rule => rule.type.id == dateRuleTypeID)
+    filterRules.splice(filterRules.indexOf(existingRule), 1)
+    this.filterRules = filterRules
+  }
 }

From 245af658419aa5404a4cbba840c2074de2dddccd Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 15:47:46 -0800
Subject: [PATCH 0197/1300] Auto-close menu when single item chosen with Enter
 key

---
 .../filter-dropdown/filter-dropdown.component.html              | 2 +-
 .../filter-editor/filter-dropdown/filter-dropdown.component.ts  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 523dd084a..0a3fe5496 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -1,4 +1,4 @@
-  <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)">
+<div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #filterDropdown="ngbDropdown">
   <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>
     <ng-container *ngIf="itemsSelected?.length > 0">
       <div class="badge bg-secondary text-light rounded-pill ml-auto">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index 720c86a94..d8f9b78c9 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -29,6 +29,7 @@ export class FilterDropdownComponent {
   toggle = new EventEmitter()
 
   @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef
+  @ViewChild('filterDropdown') filterDropdown: NgbDropdown
 
   filterText: string
 
@@ -53,5 +54,6 @@ export class FilterDropdownComponent {
   listFilterEnter(): void {
     let filtered = this.filterPipe.transform(this.items, this.filterText)
     if (filtered.length == 1) this.toggleItem(filtered.shift())
+    this.filterDropdown.close()
   }
 }

From 251fc582e93f30dae7dd3fc5fe83b93c5e863fa6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 02:19:53 +0100
Subject: [PATCH 0198/1300] fixes #130

---
 src/documents/file_handling.py            |  6 +++++-
 src/documents/tests/test_file_handling.py | 22 +++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index c5efc33e4..d28f9ffbb 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -121,7 +121,11 @@ def generate_filename(doc, counter=0):
                 added_month=doc.added.month if doc.added else "none",
                 added_day=doc.added.day if doc.added else "none",
                 tags=tags,
-            )
+                tag_list=",".join([tag.name for tag in doc.tags.all()])
+            ).strip()
+
+            path = path.strip(os.sep)
+
     except (ValueError, KeyError, IndexError):
         logging.getLogger(__name__).warning(
             f"Invalid PAPERLESS_FILENAME_FORMAT: "
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index 719b0078a..2b1022453 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -13,7 +13,7 @@ from django.test import TestCase, override_settings
 from .utils import DirectoriesMixin
 from ..file_handling import generate_filename, create_source_path_directory, delete_empty_directories, \
     generate_unique_filename
-from ..models import Document, Correspondent
+from ..models import Document, Correspondent, Tag
 
 
 class TestFileHandling(DirectoriesMixin, TestCase):
@@ -267,6 +267,26 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         self.assertEqual(generate_filename(document),
                          "none.pdf")
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{title} {tag_list}")
+    def test_tag_list(self):
+        doc = Document.objects.create(title="doc1", mime_type="application/pdf")
+        doc.tags.create(name="tag2")
+        doc.tags.create(name="tag1")
+
+        self.assertEqual(generate_filename(doc), "doc1 tag1,tag2.pdf")
+
+        doc = Document.objects.create(title="doc2", checksum="B", mime_type="application/pdf")
+
+        self.assertEqual(generate_filename(doc), "doc2.pdf")
+
+    @override_settings(PAPERLESS_FILENAME_FORMAT="//etc/something/{title}")
+    def test_filename_relative(self):
+        doc = Document.objects.create(title="doc1", mime_type="application/pdf")
+        doc.filename = generate_filename(doc)
+        doc.save()
+
+        self.assertEqual(doc.source_path, os.path.join(settings.ORIGINALS_DIR, "etc", "something", "doc1.pdf"))
+
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}/{correspondent}")
     def test_nested_directory_cleanup(self):
         document = Document()

From bad7caa8b9cfc9a98f1caf191422a74892148f67 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 02:46:46 +0100
Subject: [PATCH 0199/1300] fixes #117

---
 src/documents/file_handling.py            |  8 ++++----
 src/documents/tests/test_file_handling.py | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index d28f9ffbb..861eb2a37 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -114,12 +114,12 @@ def generate_filename(doc, counter=0):
                 document_type=document_type,
                 created=datetime.date.isoformat(doc.created),
                 created_year=doc.created.year if doc.created else "none",
-                created_month=doc.created.month if doc.created else "none",
-                created_day=doc.created.day if doc.created else "none",
+                created_month=f"{doc.created.month:02}" if doc.created else "none",  # NOQA: E501
+                created_day=f"{doc.created.day:02}" if doc.created else "none",
                 added=datetime.date.isoformat(doc.added),
                 added_year=doc.added.year if doc.added else "none",
-                added_month=doc.added.month if doc.added else "none",
-                added_day=doc.added.day if doc.added else "none",
+                added_month=f"{doc.added.month:02}" if doc.added else "none",
+                added_day=f"{doc.added.day:02}" if doc.added else "none",
                 tags=tags,
                 tag_list=",".join([tag.name for tag in doc.tags.all()])
             ).strip()
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index 2b1022453..2f7f6efcf 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -287,6 +287,28 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         self.assertEqual(doc.source_path, os.path.join(settings.ORIGINALS_DIR, "etc", "something", "doc1.pdf"))
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{created_year}-{created_month}-{created_day}")
+    def test_created_year_month_day(self):
+        d1 = datetime.datetime(2020, 3, 6, 1, 1, 1)
+        doc1 = Document.objects.create(title="doc1", mime_type="application/pdf", created=d1)
+
+        self.assertEqual(generate_filename(doc1), "2020-03-06.pdf")
+
+        doc1.created = datetime.datetime(2020, 11, 16, 1, 1, 1)
+
+        self.assertEqual(generate_filename(doc1), "2020-11-16.pdf")
+
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{added_year}-{added_month}-{added_day}")
+    def test_added_year_month_day(self):
+        d1 = datetime.datetime(232, 1, 9, 1, 1, 1)
+        doc1 = Document.objects.create(title="doc1", mime_type="application/pdf", added=d1)
+
+        self.assertEqual(generate_filename(doc1), "232-01-09.pdf")
+
+        doc1.added = datetime.datetime(2020, 11, 16, 1, 1, 1)
+
+        self.assertEqual(generate_filename(doc1), "2020-11-16.pdf")
+
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}/{correspondent}")
     def test_nested_directory_cleanup(self):
         document = Document()

From 8cc03363381231c2f6d8f45d11da1f78f461b483 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 03:01:50 +0100
Subject: [PATCH 0200/1300] prevent usage of {tags} directly.

---
 src/documents/file_handling.py            | 10 ++++++++--
 src/documents/tests/test_file_handling.py |  9 +++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index 861eb2a37..c49493991 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -8,6 +8,12 @@ from django.conf import settings
 from django.template.defaultfilters import slugify
 
 
+class defaultdictNoStr(defaultdict):
+
+    def __str__(self):
+        raise ValueError("Don't use {tags} directly.")
+
+
 def create_source_path_directory(source_path):
     os.makedirs(os.path.dirname(source_path), exist_ok=True)
 
@@ -90,8 +96,8 @@ def generate_filename(doc, counter=0):
 
     try:
         if settings.PAPERLESS_FILENAME_FORMAT is not None:
-            tags = defaultdict(lambda: slugify(None),
-                               many_to_dictionary(doc.tags))
+            tags = defaultdictNoStr(lambda: slugify(None),
+                                    many_to_dictionary(doc.tags))
 
             if doc.correspondent:
                 correspondent = pathvalidate.sanitize_filename(
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index 2f7f6efcf..dec89c45b 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -267,6 +267,15 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         self.assertEqual(generate_filename(document),
                          "none.pdf")
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{tags}")
+    def test_tags_without_args(self):
+        document = Document()
+        document.mime_type = "application/pdf"
+        document.storage_type = Document.STORAGE_TYPE_UNENCRYPTED
+        document.save()
+
+        self.assertEqual(generate_filename(document), f"{document.pk:07}.pdf")
+
     @override_settings(PAPERLESS_FILENAME_FORMAT="{title} {tag_list}")
     def test_tag_list(self):
         doc = Document.objects.create(title="doc1", mime_type="application/pdf")

From a12ec00827db9bc67414726665e350c3f00f6600 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 20:16:15 -0800
Subject: [PATCH 0201/1300] Remove unused displayName

---
 src-ui/src/app/data/filter-rule-type.ts | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts
index cf155daf1..ea8e60eee 100644
--- a/src-ui/src/app/data/filter-rule-type.ts
+++ b/src-ui/src/app/data/filter-rule-type.ts
@@ -25,23 +25,23 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
 
   {id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false},
 
-  {id: FILTER_CORRESPONDENT, name: "Correspondent is", displayName: "Correspondents", filtervar: "correspondent__id", datatype: "correspondent", multi: false},
-  {id: FILTER_DOCUMENT_TYPE, name: "Document type is", displayName: "Document types", filtervar: "document_type__id", datatype: "document_type", multi: false},
+  {id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", datatype: "correspondent", multi: false},
+  {id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", datatype: "document_type", multi: false},
 
   {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},
-  {id: FILTER_HAS_TAG, name: "Has tag", displayName: "Tags", filtervar: "tags__id__all", datatype: "tag", multi: true},
+  {id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true},
   {id: FILTER_DOES_NOT_HAVE_TAG, name: "Does not have tag", filtervar: "tags__id__none", datatype: "tag", multi: true},
   {id: FILTER_HAS_ANY_TAG, name: "Has any tag", filtervar: "is_tagged", datatype: "boolean", multi: false, default: true},
 
-  {id: FILTER_CREATED_BEFORE, name: "Created before", displayName: "Created", filtervar: "created__date__lt", datatype: "date", multi: false},
-  {id: FILTER_CREATED_AFTER, name: "Created after", displayName: "Created", filtervar: "created__date__gt", datatype: "date", multi: false},
+  {id: FILTER_CREATED_BEFORE, name: "Created before", filtervar: "created__date__lt", datatype: "date", multi: false},
+  {id: FILTER_CREATED_AFTER, name: "Created after", filtervar: "created__date__gt", datatype: "date", multi: false},
 
   {id: FILTER_CREATED_YEAR, name: "Year created is", filtervar: "created__year", datatype: "number", multi: false},
   {id: FILTER_CREATED_MONTH, name: "Month created is", filtervar: "created__month", datatype: "number", multi: false},
   {id: FILTER_CREATED_DAY, name: "Day created is", filtervar: "created__day", datatype: "number", multi: false},
 
-  {id: FILTER_ADDED_BEFORE, name: "Added before", displayName: "Added", filtervar: "added__date__lt", datatype: "date", multi: false},
-  {id: FILTER_ADDED_AFTER, name: "Added after", displayName: "Added", filtervar: "added__date__gt", datatype: "date", multi: false},
+  {id: FILTER_ADDED_BEFORE, name: "Added before", filtervar: "added__date__lt", datatype: "date", multi: false},
+  {id: FILTER_ADDED_AFTER, name: "Added after", filtervar: "added__date__gt", datatype: "date", multi: false},
 
   {id: FILTER_MODIFIED_BEFORE, name: "Modified before", filtervar: "modified__date__lt", datatype: "date", multi: false},
   {id: FILTER_MODIFIED_AFTER, name: "Modified after", filtervar: "modified__date__gt", datatype: "date", multi: false},
@@ -53,6 +53,5 @@ export interface FilterRuleType {
   filtervar: string
   datatype: string //number, string, boolean, date
   multi: boolean
-  displayName?: string
   default?: any
 }

From 9bfc92cf79872d5d0f31e1dca36618f515873fda Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 20:16:23 -0800
Subject: [PATCH 0202/1300] Fix missing NgbDropdown import

---
 .../filter-editor/filter-dropdown/filter-dropdown.component.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index d8f9b78c9..a24e7347d 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -3,6 +3,7 @@ import { Observable } from 'rxjs';
 import { Results } from 'src/app/data/results';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { FilterPipe } from  'src/app/pipes/filter.pipe';
+import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
   selector: 'app-filter-dropdown',

From 54d90a4c4b8215551546447073c662e4df0cef63 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 20:37:13 -0800
Subject: [PATCH 0203/1300] Code cleanup

---
 .../document-list/document-list.component.ts  |  6 ++---
 .../services/filter-editor-view.service.ts    | 25 ++++++-------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index cd60054c7..8d090f001 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -113,17 +113,17 @@ export class DocumentListComponent implements OnInit {
   }
 
   clickTag(tagID: number) {
-    this.filterEditorService.toggleFilterByTagID(tagID)
+    this.filterEditorService.toggleFilterByTag(tagID)
     this.applyFilterRules()
   }
 
   clickCorrespondent(correspondentID: number) {
-    this.filterEditorService.toggleFilterByCorrespondentID(correspondentID)
+    this.filterEditorService.toggleFilterByCorrespondent(correspondentID)
     this.applyFilterRules()
   }
 
   clickDocumentType(documentTypeID: number) {
-    this.filterEditorService.toggleFilterByDocumentTypeID(documentTypeID)
+    this.filterEditorService.toggleFilterByDocumentType(documentTypeID)
     this.applyFilterRules()
   }
 
diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
index b50391376..89f40189c 100644
--- a/src-ui/src/app/services/filter-editor-view.service.ts
+++ b/src-ui/src/app/services/filter-editor-view.service.ts
@@ -76,28 +76,19 @@ export class FilterEditorViewService {
     return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => dtr.value == dt.id))
   }
 
-  toggleFilterByTag(tag: PaperlessTag) {
+  toggleFilterByTag(tag: PaperlessTag | number) {
+    if (typeof tag == 'number') tag = this.tags?.find(t => t.id == tag)
     this.toggleFilterByItem(tag, FILTER_HAS_TAG)
   }
 
-  toggleFilterByCorrespondent(tag: PaperlessCorrespondent) {
-    this.toggleFilterByItem(tag, FILTER_CORRESPONDENT)
+  toggleFilterByCorrespondent(correspondent: PaperlessCorrespondent | number) {
+    if (typeof correspondent == 'number') correspondent = this.correspondents?.find(t => t.id == correspondent)
+    this.toggleFilterByItem(correspondent, FILTER_CORRESPONDENT)
   }
 
-  toggleFilterByDocumentType(tag: PaperlessDocumentType) {
-    this.toggleFilterByItem(tag, FILTER_DOCUMENT_TYPE)
-  }
-
-  toggleFilterByTagID(tagID: number) {
-    this.toggleFilterByTag(this.tags?.find(t => t.id == tagID))
-  }
-
-  toggleFilterByCorrespondentID(correspondentID: number) {
-    this.toggleFilterByCorrespondent(this.correspondents?.find(t => t.id == correspondentID))
-  }
-
-  toggleFilterByDocumentTypeID(documentTypeID: number) {
-    this.toggleFilterByDocumentType(this.documentTypes?.find(t => t.id == documentTypeID))
+  toggleFilterByDocumentType(documentType: PaperlessDocumentType | number) {
+    if (typeof documentType == 'number') documentType = this.documentTypes?.find(t => t.id == documentType)
+    this.toggleFilterByItem(documentType, FILTER_DOCUMENT_TYPE)
   }
 
   private toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) {

From 670b6d3629886fb0dff2667a84da4c527203b9f0 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 20:53:00 -0800
Subject: [PATCH 0204/1300] Change date filter active check to check circle
 filled

---
 .../filter-dropdown-date/filter-dropdown-date.component.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
index 7b83f6619..c4befd701 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -1,8 +1,8 @@
   <div class="btn-group" ngbDropdown role="group">
   <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>
     <ng-container *ngIf="dateBefore || dateAfter">
-      <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-        <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+      <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" class="bi bi-check-circle-fill text-secondary" viewBox="0 0 16 16">
+        <path fill-rule="evenodd" d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"/>
       </svg>
     </ng-container>
     {{title}}

From 32201dd0349829b7603c4b8fce7ceb146988889a Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 20:56:49 -0800
Subject: [PATCH 0205/1300] button badge margin

---
 .../filter-dropdown-button.component.html                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
index eef4e2c17..8dff12a33 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
@@ -8,5 +8,5 @@
     <app-tag *ngIf="isTag; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
     <ng-template #displayName><small>{{item.name}}</small></ng-template>
   </div>
-  <div class="badge badge-light rounded-pill ml-auto">{{item.document_count}}</div>
+  <div class="badge badge-light rounded-pill ml-auto mr-1">{{item.document_count}}</div>
 </button>

From 98ab79ad5ae7d55aa87b15c8212171fdf8c343af Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 11:12:36 +0100
Subject: [PATCH 0206/1300] fix title filter not removing filter rule

---
 .../filter-editor.component.html              |  2 +-
 .../filter-editor/filter-editor.component.ts  | 41 +++++++++++--------
 .../services/filter-editor-view.service.ts    |  4 +-
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index eb322414d..7b11c4d42 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -3,7 +3,7 @@
     <div class="text-muted mt-1">Filter by:</div>
   </div>
   <div class="col">
-    <input class="form-control form-control-sm" type="text" [(ngModel)]="filterEditorService.filterText" placeholder="Title" #filterTextInput>
+    <input class="form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Title">
   </div>
 
   <app-filter-dropdown class="col-auto" [(items)]="filterEditorService.tags" [itemsSelected]="filterEditorService.selectedTags" [title]="'Tags'" (toggle)="onToggleTag($event)"></app-filter-dropdown>
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index a6940795e..320322b53 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -1,14 +1,10 @@
-import { Component, EventEmitter, Input, Output, ElementRef, AfterViewInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
-import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
-import { ObjectWithId } from 'src/app/data/object-with-id';
+import { Component, EventEmitter, Input, Output, OnInit, OnDestroy } from '@angular/core';
 import { FilterEditorViewService } from 'src/app/services/filter-editor-view.service'
 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';
-import { FilterDropdownComponent } from './filter-dropdown/filter-dropdown.component'
-import { FilterDropdownDateComponent } from './filter-dropdown-date/filter-dropdown-date.component'
-import { fromEvent } from 'rxjs';
-import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
+import { Subject, Subscription } from 'rxjs';
+import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
@@ -16,7 +12,7 @@ import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
   templateUrl: './filter-editor.component.html',
   styleUrls: ['./filter-editor.component.scss']
 })
-export class FilterEditorComponent implements AfterViewInit {
+export class FilterEditorComponent implements OnInit, OnDestroy {
 
   constructor() { }
 
@@ -29,19 +25,32 @@ export class FilterEditorComponent implements AfterViewInit {
   @Output()
   apply = new EventEmitter()
 
-  @ViewChild('filterTextInput') filterTextInput: ElementRef;
+  get filterText() {
+    return this.filterEditorService.filterText
+  }
 
-  ngAfterViewInit() {
-    fromEvent(this.filterTextInput.nativeElement,'keyup').pipe(
-      debounceTime(150),
-      distinctUntilChanged(),
-      tap()
-    ).subscribe((event: Event) => {
-      this.filterEditorService.filterText = (event.target as HTMLInputElement).value
+  set filterText(value) {
+    this.filterTextDebounce.next(value)
+  }
+
+  filterTextDebounce: Subject<string>
+  subscription: Subscription
+
+  ngOnInit() {
+    this.filterTextDebounce = new Subject<string>()
+    this.subscription = this.filterTextDebounce.pipe(
+      debounceTime(400),
+      distinctUntilChanged()
+    ).subscribe(title => {
+      this.filterEditorService.filterText = title
       this.applyFilters()
     })
   }
 
+  ngOnDestroy() {
+    this.subscription.unsubscribe()
+  }
+
   applyFilters() {
     this.apply.next()
   }
diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
index 89f40189c..27d089106 100644
--- a/src-ui/src/app/services/filter-editor-view.service.ts
+++ b/src-ui/src/app/services/filter-editor-view.service.ts
@@ -46,7 +46,9 @@ export class FilterEditorViewService {
   set filterText(text: string) {
     let filterRules = this.filterRules
     let existingRule = filterRules.find(rule => rule.type.id == FILTER_TITLE)
-    if (existingRule && existingRule.value == text) {
+    if (existingRule && (!text || text.length == 0)) {
+      filterRules.splice(filterRules.findIndex(rule => rule.type.id == FILTER_TITLE), 1)
+    } else if (existingRule && existingRule.value == text) {
       return
     } else if (existingRule) {
       existingRule.value = text

From 02c1d496d609fbcb11e106ed4a0c71478e8eb725 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 11:22:24 +0100
Subject: [PATCH 0207/1300] some refactoring.

---
 .../filter-editor.component.html              |  2 +-
 .../filter-editor/filter-editor.component.ts  | 18 +++++-----
 .../services/filter-editor-view.service.ts    | 35 +++++++------------
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 7b11c4d42..3452d12b3 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -3,7 +3,7 @@
     <div class="text-muted mt-1">Filter by:</div>
   </div>
   <div class="col">
-    <input class="form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Title">
+    <input class="form-control form-control-sm" type="text" [(ngModel)]="titleFilter" placeholder="Title">
   </div>
 
   <app-filter-dropdown class="col-auto" [(items)]="filterEditorService.tags" [itemsSelected]="filterEditorService.selectedTags" [title]="'Tags'" (toggle)="onToggleTag($event)"></app-filter-dropdown>
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index 320322b53..7177d885c 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -25,29 +25,31 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   @Output()
   apply = new EventEmitter()
 
-  get filterText() {
-    return this.filterEditorService.filterText
+  get titleFilter() {
+    return this.filterEditorService.titleFilter
   }
 
-  set filterText(value) {
-    this.filterTextDebounce.next(value)
+  set titleFilter(value) {
+    this.titleFilterDebounce.next(value)
   }
 
-  filterTextDebounce: Subject<string>
+  titleFilterDebounce: Subject<string>
   subscription: Subscription
 
   ngOnInit() {
-    this.filterTextDebounce = new Subject<string>()
-    this.subscription = this.filterTextDebounce.pipe(
+    this.titleFilterDebounce = new Subject<string>()
+    this.subscription = this.titleFilterDebounce.pipe(
       debounceTime(400),
       distinctUntilChanged()
     ).subscribe(title => {
-      this.filterEditorService.filterText = title
+      this.filterEditorService.titleFilter = title
       this.applyFilters()
     })
   }
 
   ngOnDestroy() {
+    this.titleFilterDebounce.complete()
+    // TODO: not sure if both is necessary
     this.subscription.unsubscribe()
   }
 
diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
index 27d089106..9a6eeef41 100644
--- a/src-ui/src/app/services/filter-editor-view.service.ts
+++ b/src-ui/src/app/services/filter-editor-view.service.ts
@@ -16,9 +16,6 @@ import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
   providedIn: 'root'
 })
 export class FilterEditorViewService {
-  private tags$: Observable<Results<PaperlessTag>>
-  private correspondents$: Observable<Results<PaperlessCorrespondent>>
-  private documentTypes$: Observable<Results<PaperlessDocumentType>>
 
   tags: PaperlessTag[] = []
   correspondents: PaperlessCorrespondent[]
@@ -27,12 +24,9 @@ export class FilterEditorViewService {
   filterRules: FilterRule[] = []
 
   constructor(private tagService: TagService, private documentTypeService: DocumentTypeService, private correspondentService: CorrespondentService) {
-    this.tags$ = this.tagService.listAll()
-    this.tags$.subscribe(result => this.tags = result.results)
-    this.correspondents$ = this.correspondentService.listAll()
-    this.correspondents$.subscribe(result => this.correspondents = result.results)
-    this.documentTypes$ = this.documentTypeService.listAll()
-    this.documentTypes$.subscribe(result => this.documentTypes = result.results)
+    this.tagService.listAll().subscribe(result => this.tags = result.results)
+    this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
+    this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
   }
 
   clear() {
@@ -43,22 +37,19 @@ export class FilterEditorViewService {
     return this.filterRules.length > 0
   }
 
-  set filterText(text: string) {
-    let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.type.id == FILTER_TITLE)
-    if (existingRule && (!text || text.length == 0)) {
-      filterRules.splice(filterRules.findIndex(rule => rule.type.id == FILTER_TITLE), 1)
-    } else if (existingRule && existingRule.value == text) {
-      return
-    } else if (existingRule) {
-      existingRule.value = text
-    } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_TITLE), value: text})
+  set titleFilter(title: string) {
+    let existingRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
+
+    if (!existingRule && title) {
+      this.filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_TITLE), value: title})
+    } else if (existingRule && !title) {
+      this.filterRules.splice(this.filterRules.findIndex(rule => rule.type.id == FILTER_TITLE), 1)
+    } else if (existingRule && title) {
+      existingRule.value = title
     }
-    this.filterRules = filterRules
   }
 
-  get filterText(): string {
+  get titleFilter(): string {
     let existingRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
     return existingRule ? existingRule.value : ''
   }

From 10440ec8203d0ac5a44c89d34416114f65891518 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 11:31:12 +0100
Subject: [PATCH 0208/1300] this button wasn't really doing anything.

---
 .../filter-dropdown/filter-dropdown.component.html        | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 0a3fe5496..975e96ec2 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -12,14 +12,6 @@
       <div class="list-group-item">
         <div class="input-group input-group-sm">
           <input class="form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
-          <div class="input-group-append">
-            <span class="input-group-text bg-light text-muted">
-              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-search" viewBox="0 0 16 16">
-                <path fill-rule="evenodd" d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"/>
-                <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
-              </svg>
-            </span>
-          </div>
         </div>
       </div>
       <div *ngIf="items" class="items">

From 94c07839a4af0adc8be6e35e42d14818cf33b6ba Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 16:51:01 +0100
Subject: [PATCH 0209/1300] refactored filter service

- I wasn't too happy with that in the end.
- The filter editor should not be concerned about managing filter rule state.
- Therefore, it should not access a service for filter rules.
- The editor should simply be given a set of rules, and edit that rule set.
- The only entity that should manage filter state should be the document list service, and the saved view service in the form of filters associated with saved views.
---
 .../document-list.component.html              |   2 +-
 .../document-list/document-list.component.ts  |  41 +---
 .../filter-dropdown-date.component.ts         |   4 +-
 .../filter-editor.component.html              |  12 +-
 .../filter-editor/filter-editor.component.ts  | 195 +++++++++++++++---
 .../filter-editor-view.service.spec.ts        |  16 --
 .../services/filter-editor-view.service.ts    | 182 ----------------
 7 files changed, 186 insertions(+), 266 deletions(-)
 delete mode 100644 src-ui/src/app/services/filter-editor-view.service.spec.ts
 delete mode 100644 src-ui/src/app/services/filter-editor-view.service.ts

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index b1b2c8f94..df86507f0 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -63,7 +63,7 @@
 </app-page-header>
 
 <div class="w-100 mb-4">
-  <app-filter-editor [(filterEditorService)]="filterEditorService" (apply)="applyFilterRules()" (clear)="clearFilterRules()" #filterEditor></app-filter-editor>
+  <app-filter-editor [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
 </div>
 
 <div class="d-flex justify-content-between align-items-center">
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 8d090f001..f04b5d301 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -2,21 +2,14 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { cloneFilterRules, FilterRule } from 'src/app/data/filter-rule';
-import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 import { SavedViewConfig } from 'src/app/data/saved-view-config';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
-import { FilterEditorViewService } from 'src/app/services/filter-editor-view.service';
 import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
 import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
 import { Toast, ToastService } from 'src/app/services/toast.service';
 import { environment } from 'src/environments/environment';
+import { FilterEditorComponent } from '../filter-editor/filter-editor.component';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
-import { FilterEditorComponent } from 'src/app/components/filter-editor/filter-editor.component';
-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';
-
 @Component({
   selector: 'app-document-list',
   templateUrl: './document-list.component.html',
@@ -27,26 +20,20 @@ export class DocumentListComponent implements OnInit {
   constructor(
     public list: DocumentListViewService,
     public savedViewConfigService: SavedViewConfigService,
-    public filterEditorService: FilterEditorViewService,
     public route: ActivatedRoute,
     private toastService: ToastService,
     public modalService: NgbModal,
     private titleService: Title) { }
 
+  @ViewChild("filterEditor")
+  private filterEditor: FilterEditorComponent
+
   displayMode = 'smallCards' // largeCards, smallCards, details
 
   get isFiltered() {
     return this.list.filterRules?.length > 0
   }
 
-  set filterRules(filterRules: FilterRule[]) {
-    this.filterEditorService.filterRules = filterRules
-  }
-
-  get filterRules(): FilterRule[] {
-    return this.filterEditorService.filterRules
-  }
-
   getTitle() {
     return this.list.savedViewTitle || "Documents"
   }
@@ -66,29 +53,18 @@ export class DocumentListComponent implements OnInit {
     this.route.paramMap.subscribe(params => {
       if (params.has('id')) {
         this.list.savedView = this.savedViewConfigService.getConfig(params.get('id'))
-        this.filterEditorService.filterRules = this.list.filterRules
         this.titleService.setTitle(`${this.list.savedView.title} - ${environment.appTitle}`)
       } else {
         this.list.savedView = null
-        this.filterEditorService.filterRules = this.list.filterRules
         this.titleService.setTitle(`Documents - ${environment.appTitle}`)
       }
       this.list.clear()
       this.list.reload()
     })
-    this.filterEditorService.filterRules = this.list.filterRules
   }
 
-  applyFilterRules() {
-    this.list.filterRules = this.filterEditorService.filterRules
-  }
-
-  clearFilterRules() {
-    this.list.filterRules = this.filterEditorService.filterRules
-  }
 
   loadViewConfig(config: SavedViewConfig) {
-    this.filterEditorService.filterRules = cloneFilterRules(config.filterRules)
     this.list.load(config)
   }
 
@@ -113,18 +89,15 @@ export class DocumentListComponent implements OnInit {
   }
 
   clickTag(tagID: number) {
-    this.filterEditorService.toggleFilterByTag(tagID)
-    this.applyFilterRules()
+    this.filterEditor.toggleTag(tagID)
   }
 
   clickCorrespondent(correspondentID: number) {
-    this.filterEditorService.toggleFilterByCorrespondent(correspondentID)
-    this.applyFilterRules()
+    this.filterEditor.toggleCorrespondent(correspondentID)
   }
 
   clickDocumentType(documentTypeID: number) {
-    this.filterEditorService.toggleFilterByDocumentType(documentTypeID)
-    this.applyFilterRules()
+    this.filterEditor.toggleDocumentType(documentTypeID)
   }
 
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index f69028bf0..fbe9bdc14 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -1,6 +1,4 @@
-import { Component, EventEmitter, Input, Output, ElementRef, ViewChild, OnChanges, SimpleChange } from '@angular/core';
-import { FilterRule } from 'src/app/data/filter-rule';
-import { ObjectWithId } from 'src/app/data/object-with-id';
+import { Component, EventEmitter, Input, Output, ElementRef, ViewChild, SimpleChange } from '@angular/core';
 import { NgbDate, NgbDateStruct, NgbDatepicker } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 3452d12b3..b50ed53e3 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -6,14 +6,14 @@
     <input class="form-control form-control-sm" type="text" [(ngModel)]="titleFilter" placeholder="Title">
   </div>
 
-  <app-filter-dropdown class="col-auto" [(items)]="filterEditorService.tags" [itemsSelected]="filterEditorService.selectedTags" [title]="'Tags'" (toggle)="onToggleTag($event)"></app-filter-dropdown>
-  <app-filter-dropdown class="col-auto" [(items)]="filterEditorService.correspondents" [itemsSelected]="filterEditorService.selectedCorrespondents" [title]="'Correspondents'" (toggle)="onToggleCorrespondent($event)"></app-filter-dropdown>
-  <app-filter-dropdown class="col-auto" [(items)]="filterEditorService.documentTypes" [itemsSelected]="filterEditorService.selectedDocumentTypes" [title]="'Document Types'" (toggle)="onToggleDocumentType($event)"></app-filter-dropdown>
+  <app-filter-dropdown class="col-auto" [items]="tags" [itemsSelected]="selectedTags" title="Tags" (toggle)="toggleTag($event.id)"></app-filter-dropdown>
+  <app-filter-dropdown class="col-auto" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" (toggle)="toggleCorrespondent($event.id)"></app-filter-dropdown>
+  <app-filter-dropdown class="col-auto" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document Types" (toggle)="toggleDocumentType($event.id)"></app-filter-dropdown>
 
-  <app-filter-dropdown-date class="col-auto" [dateBefore]="filterEditorService.dateCreatedBefore" [dateAfter]="filterEditorService.dateCreatedAfter" [title]="'Created'" (dateBeforeSet)="onDateCreatedBeforeSet($event)" (dateAfterSet)="onDateCreatedAfterSet($event)"></app-filter-dropdown-date>
-  <app-filter-dropdown-date class="col-auto" [dateBefore]="filterEditorService.dateAddedBefore" [dateAfter]="filterEditorService.dateAddedAfter" [title]="'Added'"  (dateBeforeSet)="onDateAddedBeforeSet($event)" (dateAfterSet)="onDateAddedAfterSet($event)"></app-filter-dropdown-date>
+  <app-filter-dropdown-date class="col-auto" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (dateBeforeSet)="onDateCreatedBeforeSet($event)" (dateAfterSet)="onDateCreatedAfterSet($event)"></app-filter-dropdown-date>
+  <app-filter-dropdown-date class="col-auto" [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (dateBeforeSet)="onDateAddedBeforeSet($event)" (dateAfterSet)="onDateAddedAfterSet($event)"></app-filter-dropdown-date>
 
-  <button class="btn btn-link btn-sm" [disabled]="!filterEditorService.hasFilters()" (click)="clearSelected()">
+  <button class="btn btn-link btn-sm" [disabled]="!hasFilters()" (click)="clearSelected()">
     <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
       <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
     </svg>
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index 7177d885c..a86007e19 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -1,11 +1,15 @@
 import { Component, EventEmitter, Input, Output, OnInit, OnDestroy } from '@angular/core';
-import { FilterEditorViewService } from 'src/app/services/filter-editor-view.service'
 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';
 import { Subject, Subscription } from 'rxjs';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+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_TAG, FILTER_RULE_TYPES, FILTER_TITLE } from 'src/app/data/filter-rule-type';
 
 @Component({
   selector: 'app-filter-editor',
@@ -14,19 +18,44 @@ import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
 })
 export class FilterEditorComponent implements OnInit, OnDestroy {
 
-  constructor() { }
+  constructor(
+    private documentTypeService: DocumentTypeService,
+    private tagService: TagService,
+    private correspondentService: CorrespondentService
+  ) { }
+
+  tags: PaperlessTag[] = []
+  correspondents: PaperlessCorrespondent[]
+  documentTypes: PaperlessDocumentType[] = []
 
   @Input()
-  filterEditorService: FilterEditorViewService
+  filterRules: FilterRule[]
 
   @Output()
-  clear = new EventEmitter()
+  filterRulesChange = new EventEmitter<FilterRule[]>()
+  
+  hasFilters() {
+    return this.filterRules.length > 0
+  }
 
-  @Output()
-  apply = new EventEmitter()
+  get selectedTags(): PaperlessTag[] {
+    let tagRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_HAS_TAG)
+    return this.tags?.filter(t => tagRules.find(tr => tr.value == t.id))
+  }
+
+  get selectedCorrespondents(): PaperlessCorrespondent[] {
+    let correspondentRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_CORRESPONDENT)
+    return this.correspondents?.filter(c => correspondentRules.find(cr => cr.value == c.id))
+  }
+
+  get selectedDocumentTypes(): PaperlessDocumentType[] {
+    let documentTypeRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_DOCUMENT_TYPE)
+    return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => dtr.value == dt.id))
+  }
 
   get titleFilter() {
-    return this.filterEditorService.titleFilter
+    let existingRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
+    return existingRule ? existingRule.value : ''
   }
 
   set titleFilter(value) {
@@ -37,13 +66,18 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   subscription: Subscription
 
   ngOnInit() {
+    this.tagService.listAll().subscribe(result => this.tags = result.results)
+    this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
+    this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
+
     this.titleFilterDebounce = new Subject<string>()
+
     this.subscription = this.titleFilterDebounce.pipe(
       debounceTime(400),
       distinctUntilChanged()
     ).subscribe(title => {
-      this.filterEditorService.titleFilter = title
-      this.applyFilters()
+      
+      this.setTitleRule(title)
     })
   }
 
@@ -54,46 +88,159 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   }
 
   applyFilters() {
-    this.apply.next()
+    this.filterRulesChange.next(this.filterRules)
   }
 
   clearSelected() {
-    this.filterEditorService.clear()
-    this.clear.next()
-  }
-
-  onToggleTag(tag: PaperlessTag) {
-    this.filterEditorService.toggleFilterByTag(tag)
+    this.filterRules = []
     this.applyFilters()
   }
 
-  onToggleCorrespondent(correspondent: PaperlessCorrespondent) {
-    this.filterEditorService.toggleFilterByCorrespondent(correspondent)
+  private toggleFilterRule(filterRuleTypeID: number, value: number) {
+
+    let filterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
+
+    let existingRule = this.filterRules.find(rule => rule.type.id == filterRuleTypeID && rule.value == value)
+    let existingRuleOfSameType = this.filterRules.find(rule => rule.type.id == filterRuleTypeID)
+    
+    if (existingRule) {
+      // if this exact rule already exists, remove it in all cases.
+      this.filterRules.splice(this.filterRules.indexOf(existingRule), 1)
+    } else if (filterRuleType.multi || !existingRuleOfSameType) {
+      // if we allow multiple rules per type, or no rule of this type already exists, push a new rule.
+      this.filterRules.push({type: filterRuleType, value: value})
+    } else {
+      // otherwise (i.e., no multi support AND there's already a rule of this type), update the rule.
+      existingRuleOfSameType.value = value
+    }
     this.applyFilters()
   }
 
-  onToggleDocumentType(documentType: PaperlessDocumentType) {
-    this.filterEditorService.toggleFilterByDocumentType(documentType)
+  private setTitleRule(title: string) {
+    let existingRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
+
+    if (!existingRule && title) {
+      this.filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_TITLE), value: title})
+    } else if (existingRule && !title) {
+      this.filterRules.splice(this.filterRules.findIndex(rule => rule.type.id == FILTER_TITLE), 1)
+    } else if (existingRule && title) {
+      existingRule.value = title
+    }
     this.applyFilters()
   }
 
+  toggleTag(tagId: number) {
+    this.toggleFilterRule(FILTER_HAS_TAG, tagId)
+  }
+
+  toggleCorrespondent(correspondentId: number) {
+    this.toggleFilterRule(FILTER_CORRESPONDENT, correspondentId)
+  }
+
+  toggleDocumentType(documentTypeId: number) {
+    this.toggleFilterRule(FILTER_DOCUMENT_TYPE, documentTypeId)
+  }
+
+
+
+  // Date handling
+
+
   onDateCreatedBeforeSet(date: NgbDateStruct) {
-    this.filterEditorService.setDateCreatedBefore(date)
+    this.setDateCreatedBefore(date)
     this.applyFilters()
   }
 
   onDateCreatedAfterSet(date: NgbDateStruct) {
-    this.filterEditorService.setDateCreatedAfter(date)
+    this.setDateCreatedAfter(date)
     this.applyFilters()
   }
 
   onDateAddedBeforeSet(date: NgbDateStruct) {
-    this.filterEditorService.setDateAddedBefore(date)
+    this.setDateAddedBefore(date)
     this.applyFilters()
   }
 
   onDateAddedAfterSet(date: NgbDateStruct) {
-    this.filterEditorService.setDateAddedAfter(date)
+    this.setDateAddedAfter(date)
     this.applyFilters()
   }
+
+  get dateCreatedBefore(): NgbDateStruct {
+    let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_CREATED_BEFORE)
+    return createdBeforeRule ? {
+      year: createdBeforeRule.value.substring(0,4),
+      month: createdBeforeRule.value.substring(5,7),
+      day: createdBeforeRule.value.substring(8,10)
+    } : undefined
+  }
+
+  get dateCreatedAfter(): NgbDateStruct {
+    let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_CREATED_AFTER)
+    return createdAfterRule ? {
+      year: createdAfterRule.value.substring(0,4),
+      month: createdAfterRule.value.substring(5,7),
+      day: createdAfterRule.value.substring(8,10)
+    } : undefined
+  }
+
+  get dateAddedBefore(): NgbDateStruct {
+    let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_ADDED_BEFORE)
+    return addedBeforeRule ? {
+      year: addedBeforeRule.value.substring(0,4),
+      month: addedBeforeRule.value.substring(5,7),
+      day: addedBeforeRule.value.substring(8,10)
+    } : undefined
+  }
+
+  get dateAddedAfter(): NgbDateStruct {
+    let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_ADDED_AFTER)
+    return addedAfterRule ? {
+      year: addedAfterRule.value.substring(0,4),
+      month: addedAfterRule.value.substring(5,7),
+      day: addedAfterRule.value.substring(8,10)
+    } : undefined
+  }
+
+  setDateCreatedBefore(date?: NgbDateStruct) {
+    if (date) this.setDateFilter(date, FILTER_CREATED_BEFORE)
+    else this.clearDateFilter(FILTER_CREATED_BEFORE)
+  }
+
+  setDateCreatedAfter(date?: NgbDateStruct) {
+    if (date) this.setDateFilter(date, FILTER_CREATED_AFTER)
+    else this.clearDateFilter(FILTER_CREATED_AFTER)
+  }
+
+  setDateAddedBefore(date?: NgbDateStruct) {
+    if (date) this.setDateFilter(date, FILTER_ADDED_BEFORE)
+    else this.clearDateFilter(FILTER_ADDED_BEFORE)
+  }
+
+  setDateAddedAfter(date?: NgbDateStruct) {
+    if (date) this.setDateFilter(date, FILTER_ADDED_AFTER)
+    else this.clearDateFilter(FILTER_ADDED_AFTER)
+  }
+
+  setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) {
+    let filterRules = this.filterRules
+    let existingRule = filterRules.find(rule => rule.type.id == dateRuleTypeID)
+    let newValue = `${date.year}-${date.month.toString().padStart(2,'0')}-${date.day.toString().padStart(2,'0')}` // YYYY-MM-DD
+
+    if (existingRule) {
+      existingRule.value = newValue
+    } else {
+      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == dateRuleTypeID), value: newValue})
+    }
+
+    this.filterRules = filterRules
+  }
+
+  clearDateFilter(dateRuleTypeID: number) {
+    let filterRules = this.filterRules
+    let existingRule = filterRules.find(rule => rule.type.id == dateRuleTypeID)
+    filterRules.splice(filterRules.indexOf(existingRule), 1)
+    this.filterRules = filterRules
+  }
+
 }
diff --git a/src-ui/src/app/services/filter-editor-view.service.spec.ts b/src-ui/src/app/services/filter-editor-view.service.spec.ts
deleted file mode 100644
index 8051bcf0d..000000000
--- a/src-ui/src/app/services/filter-editor-view.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { FilterEditorViewService } from './filter-editor-view.service';
-
-describe('FilterEditorViewService', () => {
-  let service: FilterEditorViewService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(FilterEditorViewService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
deleted file mode 100644
index 9a6eeef41..000000000
--- a/src-ui/src/app/services/filter-editor-view.service.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import { TagService } from 'src/app/services/rest/tag.service';
-import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
-import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
-import { ObjectWithId } from 'src/app/data/object-with-id';
-import { FilterRule } from 'src/app/data/filter-rule';
-import { FilterRuleType, FILTER_RULE_TYPES, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_ADDED_BEFORE, FILTER_ADDED_AFTER, FILTER_CREATED_BEFORE, FILTER_CREATED_AFTER, FILTER_CREATED_YEAR, FILTER_CREATED_MONTH, FILTER_CREATED_DAY } from 'src/app/data/filter-rule-type';
-import { Results } from 'src/app/data/results'
-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';
-import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class FilterEditorViewService {
-
-  tags: PaperlessTag[] = []
-  correspondents: PaperlessCorrespondent[]
-  documentTypes: PaperlessDocumentType[] = []
-
-  filterRules: FilterRule[] = []
-
-  constructor(private tagService: TagService, private documentTypeService: DocumentTypeService, private correspondentService: CorrespondentService) {
-    this.tagService.listAll().subscribe(result => this.tags = result.results)
-    this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
-    this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
-  }
-
-  clear() {
-    this.filterRules = []
-  }
-
-  hasFilters() {
-    return this.filterRules.length > 0
-  }
-
-  set titleFilter(title: string) {
-    let existingRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
-
-    if (!existingRule && title) {
-      this.filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_TITLE), value: title})
-    } else if (existingRule && !title) {
-      this.filterRules.splice(this.filterRules.findIndex(rule => rule.type.id == FILTER_TITLE), 1)
-    } else if (existingRule && title) {
-      existingRule.value = title
-    }
-  }
-
-  get titleFilter(): string {
-    let existingRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
-    return existingRule ? existingRule.value : ''
-  }
-
-  get selectedTags(): PaperlessTag[] {
-    let tagRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_HAS_TAG)
-    return this.tags?.filter(t => tagRules.find(tr => tr.value == t.id))
-  }
-
-  get selectedCorrespondents(): PaperlessCorrespondent[] {
-    let correspondentRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_CORRESPONDENT)
-    return this.correspondents?.filter(c => correspondentRules.find(cr => cr.value == c.id))
-  }
-
-  get selectedDocumentTypes(): PaperlessDocumentType[] {
-    let documentTypeRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_DOCUMENT_TYPE)
-    return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => dtr.value == dt.id))
-  }
-
-  toggleFilterByTag(tag: PaperlessTag | number) {
-    if (typeof tag == 'number') tag = this.tags?.find(t => t.id == tag)
-    this.toggleFilterByItem(tag, FILTER_HAS_TAG)
-  }
-
-  toggleFilterByCorrespondent(correspondent: PaperlessCorrespondent | number) {
-    if (typeof correspondent == 'number') correspondent = this.correspondents?.find(t => t.id == correspondent)
-    this.toggleFilterByItem(correspondent, FILTER_CORRESPONDENT)
-  }
-
-  toggleFilterByDocumentType(documentType: PaperlessDocumentType | number) {
-    if (typeof documentType == 'number') documentType = this.documentTypes?.find(t => t.id == documentType)
-    this.toggleFilterByItem(documentType, FILTER_DOCUMENT_TYPE)
-  }
-
-  private toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) {
-    let filterRules = this.filterRules
-    let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
-    let existingRules = filterRules.filter(rule => rule.type.id == filterRuleType.id)
-    let existingItemRule = existingRules?.find(rule => rule.value == item.id)
-
-    if (existingRules && existingItemRule) { // if exact rule exists just remove
-      filterRules.splice(filterRules.indexOf(existingItemRule), 1)
-    } else if (existingRules.length > 0 && filterRuleType.multi) { // e.g. tags can have multiple
-      filterRules.push({type: filterRuleType, value: item.id})
-    } else if (existingRules.length > 0) { // correspondents & documentTypes can only be one
-      filterRules.find(rule => rule.type.id == filterRuleType.id).value = item.id
-    } else {
-      filterRules.push({type: filterRuleType, value: item.id})
-    }
-
-    this.filterRules = filterRules
-  }
-
-  get dateCreatedBefore(): NgbDateStruct {
-    let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_CREATED_BEFORE)
-    return createdBeforeRule ? {
-      year: createdBeforeRule.value.substring(0,4),
-      month: createdBeforeRule.value.substring(5,7),
-      day: createdBeforeRule.value.substring(8,10)
-    } : undefined
-  }
-
-  get dateCreatedAfter(): NgbDateStruct {
-    let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_CREATED_AFTER)
-    return createdAfterRule ? {
-      year: createdAfterRule.value.substring(0,4),
-      month: createdAfterRule.value.substring(5,7),
-      day: createdAfterRule.value.substring(8,10)
-    } : undefined
-  }
-
-  get dateAddedBefore(): NgbDateStruct {
-    let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_ADDED_BEFORE)
-    return addedBeforeRule ? {
-      year: addedBeforeRule.value.substring(0,4),
-      month: addedBeforeRule.value.substring(5,7),
-      day: addedBeforeRule.value.substring(8,10)
-    } : undefined
-  }
-
-  get dateAddedAfter(): NgbDateStruct {
-    let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_ADDED_AFTER)
-    return addedAfterRule ? {
-      year: addedAfterRule.value.substring(0,4),
-      month: addedAfterRule.value.substring(5,7),
-      day: addedAfterRule.value.substring(8,10)
-    } : undefined
-  }
-
-  setDateCreatedBefore(date?: NgbDateStruct) {
-    if (date) this.setDateFilter(date, FILTER_CREATED_BEFORE)
-    else this.clearDateFilter(FILTER_CREATED_BEFORE)
-  }
-
-  setDateCreatedAfter(date?: NgbDateStruct) {
-    if (date) this.setDateFilter(date, FILTER_CREATED_AFTER)
-    else this.clearDateFilter(FILTER_CREATED_AFTER)
-  }
-
-  setDateAddedBefore(date?: NgbDateStruct) {
-    if (date) this.setDateFilter(date, FILTER_ADDED_BEFORE)
-    else this.clearDateFilter(FILTER_ADDED_BEFORE)
-  }
-
-  setDateAddedAfter(date?: NgbDateStruct) {
-    if (date) this.setDateFilter(date, FILTER_ADDED_AFTER)
-    else this.clearDateFilter(FILTER_ADDED_AFTER)
-  }
-
-  setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) {
-    let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.type.id == dateRuleTypeID)
-    let newValue = `${date.year}-${date.month.toString().padStart(2,'0')}-${date.day.toString().padStart(2,'0')}` // YYYY-MM-DD
-
-    if (existingRule) {
-      existingRule.value = newValue
-    } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == dateRuleTypeID), value: newValue})
-    }
-
-    this.filterRules = filterRules
-  }
-
-  clearDateFilter(dateRuleTypeID: number) {
-    let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.type.id == dateRuleTypeID)
-    filterRules.splice(filterRules.indexOf(existingRule), 1)
-    this.filterRules = filterRules
-  }
-}

From 13d934dc6e39bcc617baa032695dc843f4bd611c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 18:46:11 +0100
Subject: [PATCH 0210/1300] new saved view service replaces old local storage
 based service

---
 src-ui/src/app/data/filter-rule.ts            |  6 +-
 src-ui/src/app/data/paperless-saved-view.ts   | 18 +++++
 src-ui/src/app/data/saved-view-config.ts      | 19 ------
 .../services/rest/saved-view.service.spec.ts  | 16 +++++
 .../app/services/rest/saved-view.service.ts   | 53 +++++++++++++++
 .../saved-view-config.service.spec.ts         | 16 -----
 .../app/services/saved-view-config.service.ts | 66 -------------------
 7 files changed, 89 insertions(+), 105 deletions(-)
 create mode 100644 src-ui/src/app/data/paperless-saved-view.ts
 delete mode 100644 src-ui/src/app/data/saved-view-config.ts
 create mode 100644 src-ui/src/app/services/rest/saved-view.service.spec.ts
 create mode 100644 src-ui/src/app/services/rest/saved-view.service.ts
 delete mode 100644 src-ui/src/app/services/saved-view-config.service.spec.ts
 delete mode 100644 src-ui/src/app/services/saved-view-config.service.ts

diff --git a/src-ui/src/app/data/filter-rule.ts b/src-ui/src/app/data/filter-rule.ts
index 2dc632d9c..a0c6f0086 100644
--- a/src-ui/src/app/data/filter-rule.ts
+++ b/src-ui/src/app/data/filter-rule.ts
@@ -1,10 +1,8 @@
-import { FilterRuleType } from './filter-rule-type';
-
 export function cloneFilterRules(filterRules: FilterRule[]): FilterRule[] {
   if (filterRules) {
     let newRules: FilterRule[] = []
     for (let rule of filterRules) {
-      newRules.push({type: rule.type, value: rule.value})
+      newRules.push({rule_type: rule.rule_type, value: rule.value})
     }
     return newRules      
   } else {
@@ -13,6 +11,6 @@ export function cloneFilterRules(filterRules: FilterRule[]): FilterRule[] {
 }
 
 export interface FilterRule {
-  type: FilterRuleType
+  rule_type: number
   value: any
 }
\ No newline at end of file
diff --git a/src-ui/src/app/data/paperless-saved-view.ts b/src-ui/src/app/data/paperless-saved-view.ts
new file mode 100644
index 000000000..fbc2f5d5e
--- /dev/null
+++ b/src-ui/src/app/data/paperless-saved-view.ts
@@ -0,0 +1,18 @@
+import { FilterRule } from './filter-rule';
+import { ObjectWithId } from './object-with-id';
+
+export interface PaperlessSavedView extends ObjectWithId {
+
+  name?: string
+
+  show_on_dashboard?: boolean
+
+  show_in_sidebar?: boolean
+
+  sort_field: string
+
+  sort_reverse: boolean
+
+  filter_rules: FilterRule[]
+
+}
\ No newline at end of file
diff --git a/src-ui/src/app/data/saved-view-config.ts b/src-ui/src/app/data/saved-view-config.ts
deleted file mode 100644
index 9d7076215..000000000
--- a/src-ui/src/app/data/saved-view-config.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { FilterRule } from './filter-rule';
-
-export interface SavedViewConfig {
-
-  id?: string
-
-  filterRules: FilterRule[]
-
-  sortField: string
-
-  sortDirection: string
-
-  title?: string
-
-  showInSideBar?: boolean
-
-  showInDashboard?: boolean
-
-}
\ No newline at end of file
diff --git a/src-ui/src/app/services/rest/saved-view.service.spec.ts b/src-ui/src/app/services/rest/saved-view.service.spec.ts
new file mode 100644
index 000000000..588cf6347
--- /dev/null
+++ b/src-ui/src/app/services/rest/saved-view.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { SavedViewService } from './saved-view.service';
+
+describe('SavedViewService', () => {
+  let service: SavedViewService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(SavedViewService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/services/rest/saved-view.service.ts b/src-ui/src/app/services/rest/saved-view.service.ts
new file mode 100644
index 000000000..343b1a8f8
--- /dev/null
+++ b/src-ui/src/app/services/rest/saved-view.service.ts
@@ -0,0 +1,53 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Subject } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
+import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
+import { AbstractPaperlessService } from './abstract-paperless-service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class SavedViewService extends AbstractPaperlessService<PaperlessSavedView> {
+
+  constructor(http: HttpClient) {
+    super(http, 'saved_views')
+    this.reload()
+  }
+
+  private reload() {
+    this.listAll().subscribe(r => this.savedViews = r.results)
+  }
+
+  private savedViews: PaperlessSavedView[] = []
+
+  get allViews() {
+    return this.savedViews
+  }
+
+  get sidebarViews() {
+    return this.savedViews.filter(v => v.show_in_sidebar)
+  }
+
+  get dashboardViews() {
+    return this.savedViews.filter(v => v.show_on_dashboard)
+  }
+
+  create(o: PaperlessSavedView) {
+    return super.create(o).pipe(
+      tap(() => this.reload())
+    )
+  }
+
+  update(o: PaperlessSavedView) {
+    return super.update(o).pipe(
+      tap(() => this.reload())
+    )
+  }
+  
+  delete(o: PaperlessSavedView) {
+    return super.delete(o).pipe(
+      tap(() => this.reload())
+    )
+  }
+}
diff --git a/src-ui/src/app/services/saved-view-config.service.spec.ts b/src-ui/src/app/services/saved-view-config.service.spec.ts
deleted file mode 100644
index c67affead..000000000
--- a/src-ui/src/app/services/saved-view-config.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { SavedViewConfigService } from './saved-view-config.service';
-
-describe('SavedViewConfigService', () => {
-  let service: SavedViewConfigService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(SavedViewConfigService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src-ui/src/app/services/saved-view-config.service.ts b/src-ui/src/app/services/saved-view-config.service.ts
deleted file mode 100644
index 41c28216b..000000000
--- a/src-ui/src/app/services/saved-view-config.service.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Injectable } from '@angular/core';
-import { v4 as uuidv4 } from 'uuid';
-import { SavedViewConfig } from '../data/saved-view-config';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class SavedViewConfigService {
-
-  constructor() { 
-    let savedConfigs = localStorage.getItem('saved-view-config-service:savedConfigs')
-    if (savedConfigs) {
-      try {
-        this.configs = JSON.parse(savedConfigs)
-      } catch (e) {
-        this.configs = []
-      }
-    }
-  }
-
-  private configs: SavedViewConfig[] = []
-
-  getConfigs(): SavedViewConfig[] {
-    return this.configs
-  }
-
-  getDashboardConfigs(): SavedViewConfig[] {
-    return this.configs.filter(sf => sf.showInDashboard)
-  }
-
-  getSideBarConfigs(): SavedViewConfig[] {
-    return this.configs.filter(sf => sf.showInSideBar)
-  }
-
-  getConfig(id: string): SavedViewConfig {
-    return this.configs.find(sf => sf.id == id)
-  }
-
-  newConfig(config: SavedViewConfig) {
-    config.id = uuidv4()
-    this.configs.push(config)
-
-    this.save()
-  }
-
-  updateConfig(config: SavedViewConfig) {
-    let savedConfig = this.configs.find(c => c.id == config.id)
-    if (savedConfig) {
-      Object.assign(savedConfig, config)
-      this.save()
-    }
-  }
-
-  private save() {
-    localStorage.setItem('saved-view-config-service:savedConfigs', JSON.stringify(this.configs))
-  }
-
-  deleteConfig(config: SavedViewConfig) {
-    let index = this.configs.findIndex(vc => vc.id == config.id)
-    if (index != -1) {
-      this.configs.splice(index, 1)
-      this.save()
-    }
-
-  }
-}

From b7126030d197db4cae0f8f2ac46226bf4effcfe4 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 19:26:36 +0100
Subject: [PATCH 0211/1300] many changes to support server side saved views

---
 .../app-frame/app-frame.component.html        |  8 +--
 .../app-frame/app-frame.component.ts          |  4 +-
 .../dashboard/dashboard.component.ts          | 11 ++--
 .../saved-view-widget.component.html          |  2 +-
 .../saved-view-widget.component.ts            |  8 +--
 .../document-list.component.html              | 10 ++--
 .../document-list/document-list.component.ts  | 53 ++++++++++++-------
 .../save-view-config-dialog.component.html    |  4 +-
 .../save-view-config-dialog.component.ts      |  4 +-
 .../filter-editor/filter-editor.component.ts  | 34 ++++++------
 .../generic-list/generic-list.component.ts    |  7 +--
 .../components/manage/logs/logs.component.ts  |  4 +-
 .../manage/settings/settings.component.html   | 10 ++--
 .../manage/settings/settings.component.ts     | 11 ++--
 .../services/document-list-view.service.ts    | 49 ++++++++---------
 .../rest/abstract-paperless-service.ts        | 12 ++---
 .../src/app/services/rest/document.service.ts | 17 +++---
 17 files changed, 131 insertions(+), 117 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 1cedeefde..7876150af 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -37,16 +37,16 @@
           </li>
         </ul>
 
-        <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted" *ngIf='viewConfigService.getSideBarConfigs().length > 0'>
+        <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted" *ngIf='savedViewService.sidebarViews.length > 0'>
           <span>Saved views</span>
         </h6>
         <ul class="nav flex-column mb-2">
-          <li class="nav-item w-100" *ngFor='let config of viewConfigService.getSideBarConfigs()'>
-            <a class="nav-link text-truncate" routerLink="view/{{config.id}}" routerLinkActive="active" (click)="closeMenu()">
+          <li class="nav-item w-100" *ngFor="let view of savedViewService.sidebarViews">
+            <a class="nav-link text-truncate" routerLink="view/{{view.id}}" routerLinkActive="active" (click)="closeMenu()">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#funnel"/>
               </svg>
-              {{config.title}}
+              {{view.name}}
             </a>
           </li>
         </ul>
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts
index 34e804db4..ef859bf35 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.ts
+++ b/src-ui/src/app/components/app-frame/app-frame.component.ts
@@ -5,8 +5,8 @@ import { from, Observable, Subscription } from 'rxjs';
 import { debounceTime, distinctUntilChanged, map, switchMap } from 'rxjs/operators';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { OpenDocumentsService } from 'src/app/services/open-documents.service';
+import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { SearchService } from 'src/app/services/rest/search.service';
-import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
 import { DocumentDetailComponent } from '../document-detail/document-detail.component';
   
 @Component({
@@ -21,7 +21,7 @@ export class AppFrameComponent implements OnInit, OnDestroy {
     private activatedRoute: ActivatedRoute,
     private openDocumentsService: OpenDocumentsService,
     private searchService: SearchService,
-    public viewConfigService: SavedViewConfigService
+    public savedViewService: SavedViewService
     ) {
   }
 
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts
index c7410c3f2..57744d194 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.ts
+++ b/src-ui/src/app/components/dashboard/dashboard.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
-import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
+import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
+import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { environment } from 'src/environments/environment';
 
 
@@ -12,14 +13,16 @@ import { environment } from 'src/environments/environment';
 export class DashboardComponent implements OnInit {
 
   constructor(
-    public savedViewConfigService: SavedViewConfigService,
+    private savedViewService: SavedViewService,
     private titleService: Title) { }
 
 
-  savedViews = []
+  savedViews: PaperlessSavedView[] = []
 
   ngOnInit(): void {
-    this.savedViews = this.savedViewConfigService.getDashboardConfigs()
+    this.savedViewService.listAll().subscribe(results => {
+      this.savedViews = results.results.filter(savedView => savedView.show_on_dashboard)
+    })
     this.titleService.setTitle(`Dashboard - ${environment.appTitle}`)
   }
 
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
index e63ecc47b..194497d39 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
@@ -1,4 +1,4 @@
-<app-widget-frame [title]="savedView.title">
+<app-widget-frame [title]="savedView.name">
 
   <a header-buttons [routerLink]="" (click)="showAll()">Show all</a>
 
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
index a55bf57fc..5bfecc640 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
-import { SavedViewConfig } from 'src/app/data/saved-view-config';
+import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { DocumentService } from 'src/app/services/rest/document.service';
 
@@ -18,18 +18,18 @@ export class SavedViewWidgetComponent implements OnInit {
     private list: DocumentListViewService) { }
   
   @Input()
-  savedView: SavedViewConfig
+  savedView: PaperlessSavedView
 
   documents: PaperlessDocument[] = []
 
   ngOnInit(): void {
-    this.documentService.list(1,10,this.savedView.sortField,this.savedView.sortDirection,this.savedView.filterRules).subscribe(result => {
+    this.documentService.list(1,10,this.savedView.sort_field, this.savedView.sort_reverse, this.savedView.filter_rules).subscribe(result => {
       this.documents = result.results
     })
   }
 
   showAll() {
-    if (this.savedView.showInSideBar) {
+    if (this.savedView.show_in_sidebar) {
       this.router.navigate(['view', this.savedView.id])
     } else {
       this.list.load(this.savedView)
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index df86507f0..acbfd3602 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -21,7 +21,7 @@
     </label>
   </div>
 
-  <div class="btn-group btn-group-toggle ml-2" ngbRadioGroup [(ngModel)]="list.sortDirection">
+  <div class="btn-group btn-group-toggle ml-2" ngbRadioGroup [(ngModel)]="list.sortReverse">
     <div ngbDropdown class="btn-group">
       <button class="btn btn-outline-primary btn-sm" id="dropdownBasic1" ngbDropdownToggle>Sort by</button>
       <div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="shadow">
@@ -30,13 +30,13 @@
       </div>
     </div>
     <label ngbButtonLabel class="btn-outline-primary btn-sm">
-      <input ngbButton type="radio" class="btn btn-sm" value="asc">
+      <input ngbButton type="radio" class="btn btn-sm" [value]="false">
       <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#sort-alpha-down" />
       </svg>
     </label>
     <label ngbButtonLabel class="btn-outline-primary btn-sm">
-      <input ngbButton type="radio" class="btn btn-sm" value="des">
+      <input ngbButton type="radio" class="btn btn-sm" [value]="true">
       <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#sort-alpha-up-alt" />
       </svg>
@@ -49,8 +49,8 @@
       <button class="btn btn-sm btn-outline-primary dropdown-toggle" ngbDropdownToggle>Views</button>
       <div class="dropdown-menu shadow" ngbDropdownMenu>
         <ng-container *ngIf="!list.savedViewId">
-          <button ngbDropdownItem *ngFor="let config of savedViewConfigService.getConfigs()" (click)="loadViewConfig(config)">{{config.title}}</button>
-          <div class="dropdown-divider" *ngIf="savedViewConfigService.getConfigs().length > 0"></div>
+          <button ngbDropdownItem *ngFor="let view of savedViewService.allViews" (click)="loadViewConfig(view)">{{view.name}}</button>
+          <div class="dropdown-divider" *ngIf="savedViewService.allViews.length > 0"></div>
         </ng-container>
 
         <button ngbDropdownItem (click)="saveViewConfig()" *ngIf="list.savedViewId">Save "{{list.savedViewTitle}}"</button>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index f04b5d301..eb3b89db1 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,15 +1,16 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Title } from '@angular/platform-browser';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { SavedViewConfig } from 'src/app/data/saved-view-config';
+import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
-import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
+import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { Toast, ToastService } from 'src/app/services/toast.service';
 import { environment } from 'src/environments/environment';
 import { FilterEditorComponent } from '../filter-editor/filter-editor.component';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
+
 @Component({
   selector: 'app-document-list',
   templateUrl: './document-list.component.html',
@@ -19,8 +20,9 @@ export class DocumentListComponent implements OnInit {
 
   constructor(
     public list: DocumentListViewService,
-    public savedViewConfigService: SavedViewConfigService,
+    public savedViewService: SavedViewService,
     public route: ActivatedRoute,
+    private router: Router,
     private toastService: ToastService,
     public modalService: NgbModal,
     private titleService: Title) { }
@@ -51,40 +53,51 @@ export class DocumentListComponent implements OnInit {
       this.displayMode = localStorage.getItem('document-list:displayMode')
     }
     this.route.paramMap.subscribe(params => {
+      this.list.clear()
       if (params.has('id')) {
-        this.list.savedView = this.savedViewConfigService.getConfig(params.get('id'))
-        this.titleService.setTitle(`${this.list.savedView.title} - ${environment.appTitle}`)
+        this.savedViewService.getCached(+params.get('id')).subscribe(view => {
+          if (!view) {
+            this.router.navigate(["404"])
+            return
+          }
+
+          this.list.savedView = view
+          this.titleService.setTitle(`${this.list.savedView.name} - ${environment.appTitle}`)
+          this.list.reload()
+        })
       } else {
         this.list.savedView = null
         this.titleService.setTitle(`Documents - ${environment.appTitle}`)
+        this.list.reload()
       }
-      this.list.clear()
-      this.list.reload()
     })
   }
 
 
-  loadViewConfig(config: SavedViewConfig) {
-    this.list.load(config)
+  loadViewConfig(view: PaperlessSavedView) {
+    this.list.load(view)
   }
 
   saveViewConfig() {
-    this.savedViewConfigService.updateConfig(this.list.savedView)
-    this.toastService.showToast(Toast.make("Information", `View "${this.list.savedView.title}" saved successfully.`))
+    this.savedViewService.update(this.list.savedView).subscribe(result => {
+      this.toastService.showToast(Toast.make("Information", `View "${this.list.savedView.name}" saved successfully.`))
+    })
+
   }
 
   saveViewConfigAs() {
     let modal = this.modalService.open(SaveViewConfigDialogComponent, {backdrop: 'static'})
     modal.componentInstance.saveClicked.subscribe(formValue => {
-      this.savedViewConfigService.newConfig({
-        title: formValue.title,
-        showInDashboard: formValue.showInDashboard,
-        showInSideBar: formValue.showInSideBar,
-        filterRules: this.list.filterRules,
-        sortDirection: this.list.sortDirection,
-        sortField: this.list.sortField
+      this.savedViewService.create({
+        name: formValue.name,
+        show_on_dashboard: formValue.showOnDashboard,
+        show_in_sidebar: formValue.showInSideBar,
+        filter_rules: this.list.filterRules,
+        sort_reverse: this.list.sortReverse,
+        sort_field: this.list.sortField
+      }).subscribe(() => {
+        modal.close()
       })
-      modal.close()
     })
   }
 
diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
index 870431096..8819aa313 100644
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
@@ -6,9 +6,9 @@
     </button>
   </div>
   <div class="modal-body">
-    <app-input-text title="Title" formControlName="title"></app-input-text>
+    <app-input-text title="Name" formControlName="name"></app-input-text>
     <app-input-check title="Show in side bar" formControlName="showInSideBar"></app-input-check>
-    <app-input-check title="Show in dashboard" formControlName="showInDashboard"></app-input-check>
+    <app-input-check title="Show on dashboard" formControlName="showOnDashboard"></app-input-check>
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-outline-dark" (click)="cancel()">Cancel</button>
diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
index 0dd351770..284be49f6 100644
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
@@ -15,9 +15,9 @@ export class SaveViewConfigDialogComponent implements OnInit {
   public saveClicked = new EventEmitter()
 
   saveViewConfigForm = new FormGroup({
-    title: new FormControl(''),
+    name: new FormControl(''),
     showInSideBar: new FormControl(false),
-    showInDashboard: new FormControl(false),
+    showOnDashboard: new FormControl(false),
   })
 
   ngOnInit(): void {
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index a86007e19..c08b12bee 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -39,22 +39,22 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   }
 
   get selectedTags(): PaperlessTag[] {
-    let tagRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_HAS_TAG)
+    let tagRules: FilterRule[] = this.filterRules.filter(fr => fr.rule_type == FILTER_HAS_TAG)
     return this.tags?.filter(t => tagRules.find(tr => tr.value == t.id))
   }
 
   get selectedCorrespondents(): PaperlessCorrespondent[] {
-    let correspondentRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_CORRESPONDENT)
+    let correspondentRules: FilterRule[] = this.filterRules.filter(fr => fr.rule_type == FILTER_CORRESPONDENT)
     return this.correspondents?.filter(c => correspondentRules.find(cr => cr.value == c.id))
   }
 
   get selectedDocumentTypes(): PaperlessDocumentType[] {
-    let documentTypeRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_DOCUMENT_TYPE)
+    let documentTypeRules: FilterRule[] = this.filterRules.filter(fr => fr.rule_type == FILTER_DOCUMENT_TYPE)
     return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => dtr.value == dt.id))
   }
 
   get titleFilter() {
-    let existingRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
+    let existingRule = this.filterRules.find(rule => rule.rule_type == FILTER_TITLE)
     return existingRule ? existingRule.value : ''
   }
 
@@ -100,15 +100,15 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
     let filterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
 
-    let existingRule = this.filterRules.find(rule => rule.type.id == filterRuleTypeID && rule.value == value)
-    let existingRuleOfSameType = this.filterRules.find(rule => rule.type.id == filterRuleTypeID)
+    let existingRule = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID && rule.value == value)
+    let existingRuleOfSameType = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID)
     
     if (existingRule) {
       // if this exact rule already exists, remove it in all cases.
       this.filterRules.splice(this.filterRules.indexOf(existingRule), 1)
     } else if (filterRuleType.multi || !existingRuleOfSameType) {
       // if we allow multiple rules per type, or no rule of this type already exists, push a new rule.
-      this.filterRules.push({type: filterRuleType, value: value})
+      this.filterRules.push({rule_type: filterRuleTypeID, value: value})
     } else {
       // otherwise (i.e., no multi support AND there's already a rule of this type), update the rule.
       existingRuleOfSameType.value = value
@@ -117,12 +117,12 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   }
 
   private setTitleRule(title: string) {
-    let existingRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
+    let existingRule = this.filterRules.find(rule => rule.rule_type == FILTER_TITLE)
 
     if (!existingRule && title) {
-      this.filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_TITLE), value: title})
+      this.filterRules.push({rule_type: FILTER_TITLE, value: title})
     } else if (existingRule && !title) {
-      this.filterRules.splice(this.filterRules.findIndex(rule => rule.type.id == FILTER_TITLE), 1)
+      this.filterRules.splice(this.filterRules.findIndex(rule => rule.rule_type == FILTER_TITLE), 1)
     } else if (existingRule && title) {
       existingRule.value = title
     }
@@ -167,7 +167,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   }
 
   get dateCreatedBefore(): NgbDateStruct {
-    let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_CREATED_BEFORE)
+    let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_BEFORE)
     return createdBeforeRule ? {
       year: createdBeforeRule.value.substring(0,4),
       month: createdBeforeRule.value.substring(5,7),
@@ -176,7 +176,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   }
 
   get dateCreatedAfter(): NgbDateStruct {
-    let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_CREATED_AFTER)
+    let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_AFTER)
     return createdAfterRule ? {
       year: createdAfterRule.value.substring(0,4),
       month: createdAfterRule.value.substring(5,7),
@@ -185,7 +185,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   }
 
   get dateAddedBefore(): NgbDateStruct {
-    let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_ADDED_BEFORE)
+    let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_BEFORE)
     return addedBeforeRule ? {
       year: addedBeforeRule.value.substring(0,4),
       month: addedBeforeRule.value.substring(5,7),
@@ -194,7 +194,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   }
 
   get dateAddedAfter(): NgbDateStruct {
-    let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_ADDED_AFTER)
+    let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_AFTER)
     return addedAfterRule ? {
       year: addedAfterRule.value.substring(0,4),
       month: addedAfterRule.value.substring(5,7),
@@ -224,13 +224,13 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
   setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) {
     let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.type.id == dateRuleTypeID)
+    let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID)
     let newValue = `${date.year}-${date.month.toString().padStart(2,'0')}-${date.day.toString().padStart(2,'0')}` // YYYY-MM-DD
 
     if (existingRule) {
       existingRule.value = newValue
     } else {
-      filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == dateRuleTypeID), value: newValue})
+      filterRules.push({rule_type: dateRuleTypeID, value: newValue})
     }
 
     this.filterRules = filterRules
@@ -238,7 +238,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
   clearDateFilter(dateRuleTypeID: number) {
     let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.type.id == dateRuleTypeID)
+    let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID)
     filterRules.splice(filterRules.indexOf(existingRule), 1)
     this.filterRules = filterRules
   }
diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
index 59a5f09ed..76a92e4e9 100644
--- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
+++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
@@ -8,9 +8,9 @@ import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dial
 
 @Directive()
 export abstract class GenericListComponent<T extends ObjectWithId> implements OnInit {
-  
+
   constructor(
-    private service: AbstractPaperlessService<T>, 
+    private service: AbstractPaperlessService<T>,
     private modalService: NgbModal,
     private editDialogComponent: any) {
     }
@@ -60,7 +60,8 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
   }
 
   reloadData() {
-    this.service.list(this.page, null, this.sortField, this.sortDirection).subscribe(c => {
+    // TODO: this is a hack
+    this.service.list(this.page, null, this.sortField, this.sortDirection == 'des').subscribe(c => {
       this.data = c.results
       this.collectionSize = c.count
     });
diff --git a/src-ui/src/app/components/manage/logs/logs.component.ts b/src-ui/src/app/components/manage/logs/logs.component.ts
index 44d0fa24d..131f91f9c 100644
--- a/src-ui/src/app/components/manage/logs/logs.component.ts
+++ b/src-ui/src/app/components/manage/logs/logs.component.ts
@@ -22,7 +22,7 @@ export class LogsComponent implements OnInit {
   }
 
   reload() {
-    this.logService.list(1, 50, 'created', 'des', {'level__gte': this.level}).subscribe(result => this.logs = result.results)
+    this.logService.list(1, 50, 'created', true, {'level__gte': this.level}).subscribe(result => this.logs = result.results)
   }
 
   getLevelText(level: number) {
@@ -34,7 +34,7 @@ export class LogsComponent implements OnInit {
     if (this.logs.length > 0) {
       lastCreated = new Date(this.logs[this.logs.length-1].created).toISOString()
     }
-    this.logService.list(1, 25, 'created', 'des', {'created__lt': lastCreated, 'level__gte': this.level}).subscribe(result => {
+    this.logService.list(1, 25, 'created', true, {'created__lt': lastCreated, 'level__gte': this.level}).subscribe(result => {
       this.logs.push(...result.results)
     })
   }
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 7a500e6eb..73e4f8194 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -44,11 +44,11 @@
             </tr>
           </thead>
           <tbody>
-            <tr *ngFor="let config of savedViewConfigService.getConfigs()">
-              <td>{{ config.title }}</td>
-              <td>{{ config.showInDashboard | yesno }}</td>
-              <td>{{ config.showInSideBar | yesno }}</td>
-              <td><button type="button" class="btn btn-sm btn-outline-danger" (click)="deleteViewConfig(config)">Delete</button></td>
+            <tr *ngFor="let view of savedViewService.allViews">
+              <td>{{ view.name }}</td>
+              <td>{{ view.show_on_dashboard | yesno }}</td>
+              <td>{{ view.show_in_sidebar | yesno }}</td>
+              <td><button type="button" class="btn btn-sm btn-outline-danger" (click)="deleteSavedView(view)">Delete</button></td>
             </tr>
           </tbody>
         </table>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index c7b976c65..8ceee6e03 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -1,10 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { Title } from '@angular/platform-browser';
-import { SavedViewConfig } from 'src/app/data/saved-view-config';
+import { map, tap } from 'rxjs/operators';
+import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
-import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
+import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { environment } from 'src/environments/environment';
 
 @Component({
@@ -19,7 +20,7 @@ export class SettingsComponent implements OnInit {
   })
 
   constructor(
-    private savedViewConfigService: SavedViewConfigService,
+    public savedViewService: SavedViewService,
     private documentListViewService: DocumentListViewService,
     private titleService: Title
   ) { }
@@ -28,8 +29,8 @@ export class SettingsComponent implements OnInit {
     this.titleService.setTitle(`Settings - ${environment.appTitle}`)
   }
 
-  deleteViewConfig(config: SavedViewConfig) {
-    this.savedViewConfigService.deleteConfig(config)
+  deleteSavedView(savedView: PaperlessSavedView) {
+    this.savedViewService.delete(savedView).subscribe(() => {})
   }
 
   saveSettings() {
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 8692ed1c0..4fa5e23d9 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { cloneFilterRules, FilterRule } from '../data/filter-rule';
 import { PaperlessDocument } from '../data/paperless-document';
-import { SavedViewConfig } from '../data/saved-view-config';
+import { PaperlessSavedView } from '../data/paperless-saved-view';
 import { DOCUMENT_LIST_SERVICE, GENERAL_SETTINGS } from '../data/storage-keys';
 import { DocumentService } from './rest/document.service';
 
@@ -29,17 +29,17 @@ export class DocumentListViewService {
   /**
    * This is the current config for the document list. The service will always remember the last settings used for the document list.
    */
-  private _documentListViewConfig: SavedViewConfig
+  private _documentListViewConfig: PaperlessSavedView
   /**
    * Optionally, this is the currently selected saved view, which might be null.
    */
-  private _savedViewConfig: SavedViewConfig
+  private _savedViewConfig: PaperlessSavedView
 
-  get savedView() {
+  get savedView(): PaperlessSavedView {
     return this._savedViewConfig
   }
 
-  set savedView(value) {
+  set savedView(value: PaperlessSavedView) {
     if (value) {
       //this is here so that we don't modify value, which might be the actual instance of the saved view.
       this._savedViewConfig = Object.assign({}, value)
@@ -53,7 +53,7 @@ export class DocumentListViewService {
   }
 
   get savedViewTitle() {
-    return this.savedView?.title
+    return this.savedView?.name
   }
 
   get documentListView() {
@@ -75,10 +75,11 @@ export class DocumentListViewService {
     return this.savedView || this.documentListView
   }
 
-  load(config: SavedViewConfig) {
-    this.view.filterRules = cloneFilterRules(config.filterRules)
-    this.view.sortDirection = config.sortDirection
-    this.view.sortField = config.sortField
+  load(view: PaperlessSavedView) {
+    this.view.filter_rules = cloneFilterRules(view.filter_rules)
+    this.view.sort_reverse = view.sort_reverse
+    this.view.sort_field = view.sort_field
+    this.saveDocumentListView()
     this.reload()
   }
 
@@ -93,9 +94,9 @@ export class DocumentListViewService {
     this.documentService.list(
       this.currentPage,
       this.currentPageSize,
-      this.view.sortField,
-      this.view.sortDirection,
-      this.view.filterRules).subscribe(
+      this.view.sort_field,
+      this.view.sort_reverse,
+      this.view.filter_rules).subscribe(
         result => {
           this.collectionSize = result.count
           this.documents = result.results
@@ -116,33 +117,33 @@ export class DocumentListViewService {
   set filterRules(filterRules: FilterRule[]) {
     //we're going to clone the filterRules object, since we don't
     //want changes in the filter editor to propagate into here right away.
-    this.view.filterRules = cloneFilterRules(filterRules)
+    this.view.filter_rules = cloneFilterRules(filterRules)
     this.reload()
     this.saveDocumentListView()
   }
 
   get filterRules(): FilterRule[] {
-    return cloneFilterRules(this.view.filterRules)
+    return cloneFilterRules(this.view.filter_rules)
   }
 
   set sortField(field: string) {
-    this.view.sortField = field
+    this.view.sort_field = field
     this.saveDocumentListView()
     this.reload()
   }
 
   get sortField(): string {
-    return this.view.sortField
+    return this.view.sort_field
   }
 
-  set sortDirection(direction: string) {
-    this.view.sortDirection = direction
+  set sortReverse(reverse: boolean) {
+    this.view.sort_reverse = reverse
     this.saveDocumentListView()
     this.reload()
   }
 
-  get sortDirection(): string {
-    return this.view.sortDirection
+  get sortReverse(): boolean {
+    return this.view.sort_reverse
   }
 
   private saveDocumentListView() {
@@ -204,9 +205,9 @@ export class DocumentListViewService {
     }
     if (!this.documentListView) {
       this.documentListView = {
-        filterRules: [],
-        sortDirection: 'des',
-        sortField: 'created'
+        filter_rules: [],
+        sort_reverse: true,
+        sort_field: 'created'
       }
     }
   }
diff --git a/src-ui/src/app/services/rest/abstract-paperless-service.ts b/src-ui/src/app/services/rest/abstract-paperless-service.ts
index 3feed320e..396baa1c5 100644
--- a/src-ui/src/app/services/rest/abstract-paperless-service.ts
+++ b/src-ui/src/app/services/rest/abstract-paperless-service.ts
@@ -22,17 +22,15 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
     return url
   }
 
-  private getOrderingQueryParam(sortField: string, sortDirection: string) {
-    if (sortField && sortDirection) {
-      return (sortDirection == 'des' ? '-' : '') + sortField
-    } else if (sortField) {
-      return sortField
+  private getOrderingQueryParam(sortField: string, sortReverse: boolean) {
+    if (sortField) {
+      return (sortReverse ? '-' : '') + sortField
     } else {
       return null
     }
   }
 
-  list(page?: number, pageSize?: number, sortField?: string, sortDirection?: string, extraParams?): Observable<Results<T>> {
+  list(page?: number, pageSize?: number, sortField?: string, sortReverse?: boolean, extraParams?): Observable<Results<T>> {
     let httpParams = new HttpParams()
     if (page) {
       httpParams = httpParams.set('page', page.toString())
@@ -40,7 +38,7 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
     if (pageSize) {
       httpParams = httpParams.set('page_size', pageSize.toString())
     }
-    let ordering = this.getOrderingQueryParam(sortField, sortDirection)
+    let ordering = this.getOrderingQueryParam(sortField, sortReverse)
     if (ordering) {
       httpParams = httpParams.set('ordering', ordering)
     }
diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index 81693ec68..f50620d23 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -10,7 +10,7 @@ import { map } from 'rxjs/operators';
 import { CorrespondentService } from './correspondent.service';
 import { DocumentTypeService } from './document-type.service';
 import { TagService } from './tag.service';
-
+import { FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 
 export const DOCUMENT_SORT_FIELDS = [
   { field: "correspondent__name", name: "Correspondent" },
@@ -22,10 +22,6 @@ export const DOCUMENT_SORT_FIELDS = [
   { field: 'modified', name: 'Modified' }
 ]
 
-export const SORT_DIRECTION_ASCENDING = "asc"
-export const SORT_DIRECTION_DESCENDING = "des"
-
-
 @Injectable({
   providedIn: 'root'
 })
@@ -39,10 +35,11 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     if (filterRules) {
       let params = {}
       for (let rule of filterRules) {
-        if (rule.type.multi) {
-          params[rule.type.filtervar] = params[rule.type.filtervar] ? params[rule.type.filtervar] + "," + rule.value : rule.value
+        let ruleType = FILTER_RULE_TYPES.find(t => t.id == rule.rule_type)
+        if (ruleType.multi) {
+          params[ruleType.filtervar] = params[ruleType.filtervar] ? params[ruleType.filtervar] + "," + rule.value : rule.value
         } else {
-          params[rule.type.filtervar] = rule.value
+          params[ruleType.filtervar] = rule.value
         }
       }
       return params
@@ -64,8 +61,8 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     return doc
   }
 
-  list(page?: number, pageSize?: number, sortField?: string, sortDirection?: string, filterRules?: FilterRule[]): Observable<Results<PaperlessDocument>> {
-    return super.list(page, pageSize, sortField, sortDirection, this.filterRulesToQueryParams(filterRules)).pipe(
+  list(page?: number, pageSize?: number, sortField?: string, sortReverse?: boolean, filterRules?: FilterRule[]): Observable<Results<PaperlessDocument>> {
+    return super.list(page, pageSize, sortField, sortReverse, this.filterRulesToQueryParams(filterRules)).pipe(
       map(results => {
         results.results.forEach(doc => this.addObservablesToDocument(doc))
         return results

From 381a50394761adf5328d83779d22ab5dc2042d77 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 19:39:16 +0100
Subject: [PATCH 0212/1300] bugfix

---
 .../components/document-list/document-list.component.ts    | 1 +
 src-ui/src/app/services/document-list-view.service.ts      | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index eb3b89db1..1653b0965 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -76,6 +76,7 @@ export class DocumentListComponent implements OnInit {
 
   loadViewConfig(view: PaperlessSavedView) {
     this.list.load(view)
+    this.list.reload()
   }
 
   saveViewConfig() {
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 4fa5e23d9..3353e1d0a 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -76,11 +76,10 @@ export class DocumentListViewService {
   }
 
   load(view: PaperlessSavedView) {
-    this.view.filter_rules = cloneFilterRules(view.filter_rules)
-    this.view.sort_reverse = view.sort_reverse
-    this.view.sort_field = view.sort_field
+    this.documentListView.filter_rules = cloneFilterRules(view.filter_rules)
+    this.documentListView.sort_reverse = view.sort_reverse
+    this.documentListView.sort_field = view.sort_field
     this.saveDocumentListView()
-    this.reload()
   }
 
   clear() {

From 958acd8a36612b0495ea6eade5e37b019a106390 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 20:20:35 +0100
Subject: [PATCH 0213/1300] imports

---
 src-ui/src/app/components/common/input/abstract-input.ts      | 4 ++--
 .../components/common/input/date-time/date-time.component.ts  | 1 -
 .../app/components/common/input/select/select.component.ts    | 2 +-
 src-ui/src/app/components/common/input/tags/tags.component.ts | 2 --
 src-ui/src/app/components/common/tag/tag.component.ts         | 2 +-
 .../document-card-large/document-card-large.component.ts      | 1 -
 .../document-card-small/document-card-small.component.ts      | 1 -
 .../filter-dropdown/filter-dropdown.component.ts              | 2 --
 .../correspondent-edit-dialog.component.ts                    | 2 +-
 .../document-type-edit-dialog.component.ts                    | 2 +-
 .../src/app/components/manage/settings/settings.component.ts  | 1 -
 src-ui/src/app/services/document-list-view.service.ts         | 1 -
 src-ui/src/app/services/rest/abstract-paperless-service.ts    | 2 +-
 src-ui/src/app/services/rest/saved-view.service.ts            | 3 +--
 14 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src-ui/src/app/components/common/input/abstract-input.ts b/src-ui/src/app/components/common/input/abstract-input.ts
index 318b9de9f..78a4a1b69 100644
--- a/src-ui/src/app/components/common/input/abstract-input.ts
+++ b/src-ui/src/app/components/common/input/abstract-input.ts
@@ -1,5 +1,5 @@
-import { Component, Directive, forwardRef, Input, OnInit } from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { Directive, Input, OnInit } from '@angular/core';
+import { ControlValueAccessor } from '@angular/forms';
 import { v4 as uuidv4 } from 'uuid';
 
 @Directive()
diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.ts b/src-ui/src/app/components/common/input/date-time/date-time.component.ts
index 6a04c5b27..bce208ec8 100644
--- a/src-ui/src/app/components/common/input/date-time/date-time.component.ts
+++ b/src-ui/src/app/components/common/input/date-time/date-time.component.ts
@@ -1,7 +1,6 @@
 import { formatDate } from '@angular/common';
 import { Component, forwardRef, Input, OnInit } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { AbstractInputComponent } from '../abstract-input';
 
 @Component({
   providers: [{
diff --git a/src-ui/src/app/components/common/input/select/select.component.ts b/src-ui/src/app/components/common/input/select/select.component.ts
index e6e02ac87..18f30cf6e 100644
--- a/src-ui/src/app/components/common/input/select/select.component.ts
+++ b/src-ui/src/app/components/common/input/select/select.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, forwardRef, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, forwardRef, Input, Output } from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
 import { AbstractInputComponent } from '../abstract-input';
 
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.ts b/src-ui/src/app/components/common/input/tags/tags.component.ts
index 81bd9d470..cca99cc55 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.ts
+++ b/src-ui/src/app/components/common/input/tags/tags.component.ts
@@ -1,8 +1,6 @@
-import { ThrowStmt } from '@angular/compiler';
 import { Component, forwardRef, Input, OnInit } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { Observable } from 'rxjs';
 import { TagEditDialogComponent } from 'src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component';
 import { PaperlessTag } from 'src/app/data/paperless-tag';
 import { TagService } from 'src/app/services/rest/tag.service';
diff --git a/src-ui/src/app/components/common/tag/tag.component.ts b/src-ui/src/app/components/common/tag/tag.component.ts
index c032c51db..0b1186ce0 100644
--- a/src-ui/src/app/components/common/tag/tag.component.ts
+++ b/src-ui/src/app/components/common/tag/tag.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag';
 
 @Component({
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
index ac2fdba27..2e056cc70 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
@@ -1,7 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
-import { PaperlessTag } from 'src/app/data/paperless-tag';
 import { DocumentService } from 'src/app/services/rest/document.service';
 
 @Component({
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
index d60552d4f..d87eb4331 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
@@ -1,7 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { map } from 'rxjs/operators';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
-import { PaperlessTag } from 'src/app/data/paperless-tag';
 import { DocumentService } from 'src/app/services/rest/document.service';
 
 @Component({
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index a24e7347d..d675e14f1 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -1,6 +1,4 @@
 import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core';
-import { Observable } from 'rxjs';
-import { Results } from 'src/app/data/results';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { FilterPipe } from  'src/app/pipes/filter.pipe';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts
index 855fc159c..bc6b2a823 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component';
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts
index 087eede8c..a8052f453 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component';
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 8ceee6e03..3f7afe5b3 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -1,7 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { Title } from '@angular/platform-browser';
-import { map, tap } from 'rxjs/operators';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 3353e1d0a..7405fcd24 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -188,7 +188,6 @@ export class DocumentListViewService {
     let newPageSize = +localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT
     if (newPageSize != this.currentPageSize) {
       this.currentPageSize = newPageSize
-      //this.reload()
     }
   }
 
diff --git a/src-ui/src/app/services/rest/abstract-paperless-service.ts b/src-ui/src/app/services/rest/abstract-paperless-service.ts
index 396baa1c5..6ec4346ed 100644
--- a/src-ui/src/app/services/rest/abstract-paperless-service.ts
+++ b/src-ui/src/app/services/rest/abstract-paperless-service.ts
@@ -1,5 +1,5 @@
 import { HttpClient, HttpParams } from '@angular/common/http'
-import { Observable, of, Subject } from 'rxjs'
+import { Observable } from 'rxjs'
 import { map, publishReplay, refCount } from 'rxjs/operators'
 import { ObjectWithId } from 'src/app/data/object-with-id'
 import { Results } from 'src/app/data/results'
diff --git a/src-ui/src/app/services/rest/saved-view.service.ts b/src-ui/src/app/services/rest/saved-view.service.ts
index 343b1a8f8..14c18b0e2 100644
--- a/src-ui/src/app/services/rest/saved-view.service.ts
+++ b/src-ui/src/app/services/rest/saved-view.service.ts
@@ -1,7 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs';
-import { map, tap } from 'rxjs/operators';
+import { tap } from 'rxjs/operators';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { AbstractPaperlessService } from './abstract-paperless-service';
 

From 889fe5890dfb3c939c9b8d6c445920eeefcdf0ba Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 20:59:18 +0100
Subject: [PATCH 0214/1300] refactored titles

---
 .../page-header/page-header.component.ts      | 22 +++++++++++++------
 .../dashboard/dashboard.component.ts          |  6 +----
 .../document-detail.component.ts              |  6 +----
 .../document-list/document-list.component.ts  |  7 +-----
 .../correspondent-list.component.ts           | 11 ++--------
 .../document-type-list.component.ts           | 12 +++-------
 .../components/manage/logs/logs.component.ts  |  5 +----
 .../manage/settings/settings.component.ts     | 11 ++--------
 .../manage/tag-list/tag-list.component.ts     | 14 +++---------
 .../app/components/search/search.component.ts |  5 +----
 10 files changed, 30 insertions(+), 69 deletions(-)

diff --git a/src-ui/src/app/components/common/page-header/page-header.component.ts b/src-ui/src/app/components/common/page-header/page-header.component.ts
index 93ec3bfb7..153e6bea6 100644
--- a/src-ui/src/app/components/common/page-header/page-header.component.ts
+++ b/src-ui/src/app/components/common/page-header/page-header.component.ts
@@ -1,21 +1,29 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
+import { Title } from '@angular/platform-browser';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-page-header',
   templateUrl: './page-header.component.html',
   styleUrls: ['./page-header.component.scss']
 })
-export class PageHeaderComponent implements OnInit {
+export class PageHeaderComponent {
 
-  constructor() { }
+  constructor(private titleService: Title) { }
+
+  _title = ""
 
   @Input()
-  title: string = ""
+  set title(title: string) {
+    this._title = title
+    this.titleService.setTitle(`${this.title} - ${environment.appTitle}`)
+  }
+
+  get title() {
+    return this._title
+  }
 
   @Input()
   subTitle: string = ""
 
-  ngOnInit(): void {
-  }
-
 }
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts
index 57744d194..a14ec5e90 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.ts
+++ b/src-ui/src/app/components/dashboard/dashboard.component.ts
@@ -1,8 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { Title } from '@angular/platform-browser';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
-import { environment } from 'src/environments/environment';
 
 
 @Component({
@@ -13,8 +11,7 @@ import { environment } from 'src/environments/environment';
 export class DashboardComponent implements OnInit {
 
   constructor(
-    private savedViewService: SavedViewService,
-    private titleService: Title) { }
+    private savedViewService: SavedViewService) { }
 
 
   savedViews: PaperlessSavedView[] = []
@@ -23,7 +20,6 @@ export class DashboardComponent implements OnInit {
     this.savedViewService.listAll().subscribe(results => {
       this.savedViews = results.results.filter(savedView => savedView.show_on_dashboard)
     })
-    this.titleService.setTitle(`Dashboard - ${environment.appTitle}`)
   }
 
 }
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 4aac9c769..5fe9f9250 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { Title } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
@@ -12,7 +11,6 @@ import { OpenDocumentsService } from 'src/app/services/open-documents.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { DocumentService } from 'src/app/services/rest/document.service';
-import { environment } from 'src/environments/environment';
 import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component';
 import { CorrespondentEditDialogComponent } from '../manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component';
 import { DocumentTypeEditDialogComponent } from '../manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component';
@@ -56,8 +54,7 @@ export class DocumentDetailComponent implements OnInit {
     private router: Router,
     private modalService: NgbModal,
     private openDocumentService: OpenDocumentsService,
-    private documentListViewService: DocumentListViewService,
-    private titleService: Title) { }
+    private documentListViewService: DocumentListViewService) { }
 
   getContentType() {
     return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type
@@ -90,7 +87,6 @@ export class DocumentDetailComponent implements OnInit {
 
   updateComponent(doc: PaperlessDocument) {
     this.document = doc
-    this.titleService.setTitle(`${doc.title} - ${environment.appTitle}`)
     this.documentsService.getMetadata(doc.id).subscribe(result => {
       this.metadata = result
     })
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 1653b0965..d31b12e6c 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,5 +1,4 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { Title } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
@@ -7,7 +6,6 @@ import { DocumentListViewService } from 'src/app/services/document-list-view.ser
 import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { Toast, ToastService } from 'src/app/services/toast.service';
-import { environment } from 'src/environments/environment';
 import { FilterEditorComponent } from '../filter-editor/filter-editor.component';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
 
@@ -24,8 +22,7 @@ export class DocumentListComponent implements OnInit {
     public route: ActivatedRoute,
     private router: Router,
     private toastService: ToastService,
-    public modalService: NgbModal,
-    private titleService: Title) { }
+    public modalService: NgbModal) { }
 
   @ViewChild("filterEditor")
   private filterEditor: FilterEditorComponent
@@ -62,12 +59,10 @@ export class DocumentListComponent implements OnInit {
           }
 
           this.list.savedView = view
-          this.titleService.setTitle(`${this.list.savedView.name} - ${environment.appTitle}`)
           this.list.reload()
         })
       } else {
         this.list.savedView = null
-        this.titleService.setTitle(`Documents - ${environment.appTitle}`)
         this.list.reload()
       }
     })
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
index 11027c60f..effae2826 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
@@ -1,9 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { Title } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
-import { environment } from 'src/environments/environment';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/correspondent-edit-dialog.component';
 
@@ -12,9 +10,9 @@ import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/co
   templateUrl: './correspondent-list.component.html',
   styleUrls: ['./correspondent-list.component.scss']
 })
-export class CorrespondentListComponent extends GenericListComponent<PaperlessCorrespondent> implements OnInit {
+export class CorrespondentListComponent extends GenericListComponent<PaperlessCorrespondent> {
 
-  constructor(correspondentsService: CorrespondentService, modalService: NgbModal, private titleService: Title) { 
+  constructor(correspondentsService: CorrespondentService, modalService: NgbModal,) { 
     super(correspondentsService,modalService,CorrespondentEditDialogComponent)
   }
 
@@ -22,9 +20,4 @@ export class CorrespondentListComponent extends GenericListComponent<PaperlessCo
     return `correspondent '${object.name}'`
   }
 
-  ngOnInit(): void {
-    super.ngOnInit()
-    this.titleService.setTitle(`Correspondents - ${environment.appTitle}`)
-  }
-
 }
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
index 316024514..16cdd88a9 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
@@ -1,9 +1,7 @@
-import { Component, OnInit } from '@angular/core';
-import { Title } from '@angular/platform-browser';
+import { Component } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
-import { environment } from 'src/environments/environment';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/document-type-edit-dialog.component';
 
@@ -12,9 +10,9 @@ import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/doc
   templateUrl: './document-type-list.component.html',
   styleUrls: ['./document-type-list.component.scss']
 })
-export class DocumentTypeListComponent extends GenericListComponent<PaperlessDocumentType> implements OnInit {
+export class DocumentTypeListComponent extends GenericListComponent<PaperlessDocumentType> {
 
-  constructor(service: DocumentTypeService, modalService: NgbModal, private titleService: Title) {
+  constructor(service: DocumentTypeService, modalService: NgbModal) {
     super(service, modalService, DocumentTypeEditDialogComponent)
   }
 
@@ -22,8 +20,4 @@ export class DocumentTypeListComponent extends GenericListComponent<PaperlessDoc
     return `document type '${object.name}'`
   }
 
-  ngOnInit(): void {
-    super.ngOnInit()
-    this.titleService.setTitle(`Document types - ${environment.appTitle}`)
-  }
 }
diff --git a/src-ui/src/app/components/manage/logs/logs.component.ts b/src-ui/src/app/components/manage/logs/logs.component.ts
index 131f91f9c..b131796ee 100644
--- a/src-ui/src/app/components/manage/logs/logs.component.ts
+++ b/src-ui/src/app/components/manage/logs/logs.component.ts
@@ -1,8 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { Title } from '@angular/platform-browser';
 import { LOG_LEVELS, LOG_LEVEL_INFO, PaperlessLog } from 'src/app/data/paperless-log';
 import { LogService } from 'src/app/services/rest/log.service';
-import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-logs',
@@ -11,14 +9,13 @@ import { environment } from 'src/environments/environment';
 })
 export class LogsComponent implements OnInit {
 
-  constructor(private logService: LogService, private titleService: Title) { }
+  constructor(private logService: LogService) { }
 
   logs: PaperlessLog[] = []
   level: number = LOG_LEVEL_INFO
 
   ngOnInit(): void {
     this.reload()
-    this.titleService.setTitle(`Logs - ${environment.appTitle}`)
   }
 
   reload() {
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 3f7afe5b3..571f60620 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -1,18 +1,16 @@
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { Title } from '@angular/platform-browser';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
-import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-settings',
   templateUrl: './settings.component.html',
   styleUrls: ['./settings.component.scss']
 })
-export class SettingsComponent implements OnInit {
+export class SettingsComponent {
 
   settingsForm = new FormGroup({
     'documentListItemPerPage': new FormControl(+localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT)
@@ -20,14 +18,9 @@ export class SettingsComponent implements OnInit {
 
   constructor(
     public savedViewService: SavedViewService,
-    private documentListViewService: DocumentListViewService,
-    private titleService: Title
+    private documentListViewService: DocumentListViewService
   ) { }
 
-  ngOnInit(): void {
-    this.titleService.setTitle(`Settings - ${environment.appTitle}`)
-  }
-
   deleteSavedView(savedView: PaperlessSavedView) {
     this.savedViewService.delete(savedView).subscribe(() => {})
   }
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
index efbe11321..32093e0a8 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
@@ -1,9 +1,7 @@
-import { Component, OnInit } from '@angular/core';
-import { Title } from '@angular/platform-browser';
+import { Component } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag';
 import { TagService } from 'src/app/services/rest/tag.service';
-import { environment } from 'src/environments/environment';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.component';
 
@@ -12,18 +10,12 @@ import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.compon
   templateUrl: './tag-list.component.html',
   styleUrls: ['./tag-list.component.scss']
 })
-export class TagListComponent extends GenericListComponent<PaperlessTag> implements OnInit {
+export class TagListComponent extends GenericListComponent<PaperlessTag> {
 
-  constructor(tagService: TagService, modalService: NgbModal, private titleService: Title) {
+  constructor(tagService: TagService, modalService: NgbModal) {
     super(tagService, modalService, TagEditDialogComponent)
   }
 
-
-  ngOnInit(): void {
-    super.ngOnInit()
-    this.titleService.setTitle(`Tags - ${environment.appTitle}`)
-  }
-
   getColor(id) {
     return TAG_COLOURS.find(c => c.id == id)
   }
diff --git a/src-ui/src/app/components/search/search.component.ts b/src-ui/src/app/components/search/search.component.ts
index 3371debd2..de8b4652f 100644
--- a/src-ui/src/app/components/search/search.component.ts
+++ b/src-ui/src/app/components/search/search.component.ts
@@ -1,9 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { Title } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { SearchHit } from 'src/app/data/search-result';
 import { SearchService } from 'src/app/services/rest/search.service';
-import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-search',
@@ -28,7 +26,7 @@ export class SearchComponent implements OnInit {
 
   errorMessage: string
 
-  constructor(private searchService: SearchService, private route: ActivatedRoute, private router: Router, private titleService: Title) { }
+  constructor(private searchService: SearchService, private route: ActivatedRoute, private router: Router) { }
 
   ngOnInit(): void {
     this.route.queryParamMap.subscribe(paramMap => {
@@ -36,7 +34,6 @@ export class SearchComponent implements OnInit {
       this.searching = true
       this.currentPage = 1
       this.loadPage()
-      this.titleService.setTitle(`Search: ${this.query} - ${environment.appTitle}`)
     })
 
   }

From de87efc2912ad058dbc8ca87fbd795feb9467bf5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 21:14:33 +0100
Subject: [PATCH 0215/1300] confirmation messages

---
 .../components/document-list/document-list.component.ts   | 6 ++++--
 .../app/components/manage/settings/settings.component.ts  | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index d31b12e6c..4b711f9dc 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -84,15 +84,17 @@ export class DocumentListComponent implements OnInit {
   saveViewConfigAs() {
     let modal = this.modalService.open(SaveViewConfigDialogComponent, {backdrop: 'static'})
     modal.componentInstance.saveClicked.subscribe(formValue => {
-      this.savedViewService.create({
+      let savedView = {
         name: formValue.name,
         show_on_dashboard: formValue.showOnDashboard,
         show_in_sidebar: formValue.showInSideBar,
         filter_rules: this.list.filterRules,
         sort_reverse: this.list.sortReverse,
         sort_field: this.list.sortField
-      }).subscribe(() => {
+      }
+      this.savedViewService.create(savedView).subscribe(() => {
         modal.close()
+        this.toastService.showToast(Toast.make("Information", `View "${savedView.name}" created successfully.`))
       })
     })
   }
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 571f60620..08275bbb2 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -4,6 +4,7 @@ import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
+import { Toast, ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-settings',
@@ -18,11 +19,14 @@ export class SettingsComponent {
 
   constructor(
     public savedViewService: SavedViewService,
-    private documentListViewService: DocumentListViewService
+    private documentListViewService: DocumentListViewService,
+    private toastService: ToastService
   ) { }
 
   deleteSavedView(savedView: PaperlessSavedView) {
-    this.savedViewService.delete(savedView).subscribe(() => {})
+    this.savedViewService.delete(savedView).subscribe(() => {
+      this.toastService.showToast(Toast.make("Information", `Saved view "${savedView.name} deleted.`))
+    })
   }
 
   saveSettings() {

From cf619d9d31aed8b7cbf9175e3b97bcbf32f3b58e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 22:20:28 +0100
Subject: [PATCH 0216/1300] typing

---
 .../filter-editor/filter-editor.component.ts  | 36 +++++++++----------
 src-ui/src/app/data/filter-rule.ts            |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index c08b12bee..8d30e3d60 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -40,17 +40,17 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
   get selectedTags(): PaperlessTag[] {
     let tagRules: FilterRule[] = this.filterRules.filter(fr => fr.rule_type == FILTER_HAS_TAG)
-    return this.tags?.filter(t => tagRules.find(tr => tr.value == t.id))
+    return this.tags?.filter(t => tagRules.find(tr => +tr.value == t.id))
   }
 
   get selectedCorrespondents(): PaperlessCorrespondent[] {
     let correspondentRules: FilterRule[] = this.filterRules.filter(fr => fr.rule_type == FILTER_CORRESPONDENT)
-    return this.correspondents?.filter(c => correspondentRules.find(cr => cr.value == c.id))
+    return this.correspondents?.filter(c => correspondentRules.find(cr => +cr.value == c.id))
   }
 
   get selectedDocumentTypes(): PaperlessDocumentType[] {
     let documentTypeRules: FilterRule[] = this.filterRules.filter(fr => fr.rule_type == FILTER_DOCUMENT_TYPE)
-    return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => dtr.value == dt.id))
+    return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => +dtr.value == dt.id))
   }
 
   get titleFilter() {
@@ -100,7 +100,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
     let filterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
 
-    let existingRule = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID && rule.value == value)
+    let existingRule = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID && rule.value == value?.toString())
     let existingRuleOfSameType = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID)
     
     if (existingRule) {
@@ -108,10 +108,10 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
       this.filterRules.splice(this.filterRules.indexOf(existingRule), 1)
     } else if (filterRuleType.multi || !existingRuleOfSameType) {
       // if we allow multiple rules per type, or no rule of this type already exists, push a new rule.
-      this.filterRules.push({rule_type: filterRuleTypeID, value: value})
+      this.filterRules.push({rule_type: filterRuleTypeID, value: value?.toString()})
     } else {
       // otherwise (i.e., no multi support AND there's already a rule of this type), update the rule.
-      existingRuleOfSameType.value = value
+      existingRuleOfSameType.value = value?.toString()
     }
     this.applyFilters()
   }
@@ -169,36 +169,36 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   get dateCreatedBefore(): NgbDateStruct {
     let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_BEFORE)
     return createdBeforeRule ? {
-      year: createdBeforeRule.value.substring(0,4),
-      month: createdBeforeRule.value.substring(5,7),
-      day: createdBeforeRule.value.substring(8,10)
+      year: +createdBeforeRule.value.substring(0,4),
+      month: +createdBeforeRule.value.substring(5,7),
+      day: +createdBeforeRule.value.substring(8,10)
     } : undefined
   }
 
   get dateCreatedAfter(): NgbDateStruct {
     let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_AFTER)
     return createdAfterRule ? {
-      year: createdAfterRule.value.substring(0,4),
-      month: createdAfterRule.value.substring(5,7),
-      day: createdAfterRule.value.substring(8,10)
+      year: +createdAfterRule.value.substring(0,4),
+      month: +createdAfterRule.value.substring(5,7),
+      day: +createdAfterRule.value.substring(8,10)
     } : undefined
   }
 
   get dateAddedBefore(): NgbDateStruct {
     let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_BEFORE)
     return addedBeforeRule ? {
-      year: addedBeforeRule.value.substring(0,4),
-      month: addedBeforeRule.value.substring(5,7),
-      day: addedBeforeRule.value.substring(8,10)
+      year: +addedBeforeRule.value.substring(0,4),
+      month: +addedBeforeRule.value.substring(5,7),
+      day: +addedBeforeRule.value.substring(8,10)
     } : undefined
   }
 
   get dateAddedAfter(): NgbDateStruct {
     let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_AFTER)
     return addedAfterRule ? {
-      year: addedAfterRule.value.substring(0,4),
-      month: addedAfterRule.value.substring(5,7),
-      day: addedAfterRule.value.substring(8,10)
+      year: +addedAfterRule.value.substring(0,4),
+      month: +addedAfterRule.value.substring(5,7),
+      day: +addedAfterRule.value.substring(8,10)
     } : undefined
   }
 
diff --git a/src-ui/src/app/data/filter-rule.ts b/src-ui/src/app/data/filter-rule.ts
index a0c6f0086..82d8498f3 100644
--- a/src-ui/src/app/data/filter-rule.ts
+++ b/src-ui/src/app/data/filter-rule.ts
@@ -12,5 +12,5 @@ export function cloneFilterRules(filterRules: FilterRule[]): FilterRule[] {
 
 export interface FilterRule {
   rule_type: number
-  value: any
+  value: string
 }
\ No newline at end of file

From 45848f5e348af304c46d50405a3458403534d0c8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 14 Dec 2020 22:46:50 +0100
Subject: [PATCH 0217/1300] removed manual date formatting/parsing

---
 .../filter-editor/filter-editor.component.ts  | 32 +++++--------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index 8d30e3d60..9822c7db3 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -4,7 +4,7 @@ import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 import { Subject, Subscription } from 'rxjs';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
-import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+import { NgbDateParserFormatter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
 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';
@@ -21,7 +21,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   constructor(
     private documentTypeService: DocumentTypeService,
     private tagService: TagService,
-    private correspondentService: CorrespondentService
+    private correspondentService: CorrespondentService,
+    private dateParser: NgbDateParserFormatter
   ) { }
 
   tags: PaperlessTag[] = []
@@ -76,7 +77,6 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
       debounceTime(400),
       distinctUntilChanged()
     ).subscribe(title => {
-      
       this.setTitleRule(title)
     })
   }
@@ -168,38 +168,22 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
   get dateCreatedBefore(): NgbDateStruct {
     let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_BEFORE)
-    return createdBeforeRule ? {
-      year: +createdBeforeRule.value.substring(0,4),
-      month: +createdBeforeRule.value.substring(5,7),
-      day: +createdBeforeRule.value.substring(8,10)
-    } : undefined
+    return createdBeforeRule ? this.dateParser.parse(createdBeforeRule.value) : null
   }
 
   get dateCreatedAfter(): NgbDateStruct {
     let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_AFTER)
-    return createdAfterRule ? {
-      year: +createdAfterRule.value.substring(0,4),
-      month: +createdAfterRule.value.substring(5,7),
-      day: +createdAfterRule.value.substring(8,10)
-    } : undefined
+    return createdAfterRule ? this.dateParser.parse(createdAfterRule.value) : null
   }
 
   get dateAddedBefore(): NgbDateStruct {
     let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_BEFORE)
-    return addedBeforeRule ? {
-      year: +addedBeforeRule.value.substring(0,4),
-      month: +addedBeforeRule.value.substring(5,7),
-      day: +addedBeforeRule.value.substring(8,10)
-    } : undefined
+    return addedBeforeRule ? this.dateParser.parse(addedBeforeRule.value) : null
   }
 
   get dateAddedAfter(): NgbDateStruct {
     let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_AFTER)
-    return addedAfterRule ? {
-      year: +addedAfterRule.value.substring(0,4),
-      month: +addedAfterRule.value.substring(5,7),
-      day: +addedAfterRule.value.substring(8,10)
-    } : undefined
+    return addedAfterRule ? this.dateParser.parse(addedAfterRule.value) : null
   }
 
   setDateCreatedBefore(date?: NgbDateStruct) {
@@ -225,7 +209,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) {
     let filterRules = this.filterRules
     let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID)
-    let newValue = `${date.year}-${date.month.toString().padStart(2,'0')}-${date.day.toString().padStart(2,'0')}` // YYYY-MM-DD
+    let newValue = this.dateParser.format(date)
 
     if (existingRule) {
       existingRule.value = newValue

From 4ed56e460338cf4000dfbf47af9a4cf087851b24 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 00:00:40 +0100
Subject: [PATCH 0218/1300] fix

---
 .../filter-dropdown-date/filter-dropdown-date.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index fbe9bdc14..55beeb7f4 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -58,7 +58,7 @@ export class FilterDropdownDateComponent {
         dpAfterElRef.nativeElement.value = dateString
       } else if (dateBeforeChange && dateBeforeChange.currentValue) {
         let dateBeforeDate = dateBeforeChange.currentValue as NgbDateStruct
-        dateString = `${dateBeforeChange.currentValue.year}-${dateBeforeChange.currentValue.month.toString().padStart(2,'0')}-${dateBeforeChange.currentValue.day.toString().padStart(2,'0')}`
+        dateString = `${dateBeforeDate.year}-${dateBeforeDate.month.toString().padStart(2,'0')}-${dateBeforeDate.day.toString().padStart(2,'0')}`
         dpBeforeElRef.nativeElement.value = dateString
       } else {
         dpAfterElRef.nativeElement.value = dateString

From 533be7e96e2a4c919304e914c60127f742d8bbd6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 00:30:36 +0100
Subject: [PATCH 0219/1300] better highlight of active filters

---
 .../filter-dropdown-date.component.html                    | 7 +------
 .../filter-dropdown/filter-dropdown.component.html         | 7 +------
 .../components/filter-editor/filter-editor.component.html  | 2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
index c4befd701..ad292b182 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -1,10 +1,5 @@
   <div class="btn-group" ngbDropdown role="group">
-  <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>
-    <ng-container *ngIf="dateBefore || dateAfter">
-      <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" class="bi bi-check-circle-fill text-secondary" viewBox="0 0 16 16">
-        <path fill-rule="evenodd" d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"/>
-      </svg>
-    </ng-container>
+  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="dateBefore || dateAfter ? 'btn-primary' : 'btn-outline-primary'">
     {{title}}
   </button>
   <div class="dropdown-menu date-filter shadow pt-0" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 975e96ec2..5de9228bd 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -1,10 +1,5 @@
 <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #filterDropdown="ngbDropdown">
-  <button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>
-    <ng-container *ngIf="itemsSelected?.length > 0">
-      <div class="badge bg-secondary text-light rounded-pill ml-auto">
-        {{itemsSelected?.length}}
-      </div>
-    </ng-container>
+  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="itemsSelected?.length > 0 ? 'btn-primary' : 'btn-outline-primary'">
     {{title}}
   </button>
   <div class="dropdown-menu py-0 shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index b50ed53e3..6e64264db 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -8,7 +8,7 @@
 
   <app-filter-dropdown class="col-auto" [items]="tags" [itemsSelected]="selectedTags" title="Tags" (toggle)="toggleTag($event.id)"></app-filter-dropdown>
   <app-filter-dropdown class="col-auto" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" (toggle)="toggleCorrespondent($event.id)"></app-filter-dropdown>
-  <app-filter-dropdown class="col-auto" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document Types" (toggle)="toggleDocumentType($event.id)"></app-filter-dropdown>
+  <app-filter-dropdown class="col-auto" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document types" (toggle)="toggleDocumentType($event.id)"></app-filter-dropdown>
 
   <app-filter-dropdown-date class="col-auto" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (dateBeforeSet)="onDateCreatedBeforeSet($event)" (dateAfterSet)="onDateCreatedAfterSet($event)"></app-filter-dropdown-date>
   <app-filter-dropdown-date class="col-auto" [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (dateBeforeSet)="onDateAddedBeforeSet($event)" (dateAfterSet)="onDateAddedAfterSet($event)"></app-filter-dropdown-date>

From 67d03c11b9a73d8ec80a031ce0d2e0740edf33b6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 00:48:06 +0100
Subject: [PATCH 0220/1300] fixed the date selection dropdowns.

- They still contain that ugly hack.
---
 .../filter-dropdown-date.component.html       | 25 ++++-------------
 .../filter-dropdown-date.component.ts         | 27 ++++++++++---------
 .../filter-editor.component.html              |  4 +--
 .../filter-editor/filter-editor.component.ts  | 21 +++++----------
 4 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
index ad292b182..6f6a42fe2 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -4,23 +4,16 @@
   </button>
   <div class="dropdown-menu date-filter shadow pt-0" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
+        <button class="list-group-item small list-goup list-group-item-action d-flex p-2 pl-3" (click)="clear()">Clear</button>
         <button *ngFor="let range of [7, 30, 'month', 'year']" class="list-group-item small list-goup list-group-item-action d-flex p-2 pl-3" role="menuitem" (click)="setDateQuickFilter(range)">
           <ng-container *ngIf="isStringRange(range)">This </ng-container>
           {{ range }}
           <ng-container *ngIf="!isStringRange(range)"> days</ng-container>
         </button>
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
-          <div class="mb-2 d-flex flex-row w-100 justify-content-between small">
-            <div>Before</div>
-            <a *ngIf="dateBefore" class="btn btn-link p-0 m-0" (click)="clearBefore()">
-              <svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
-              </svg>
-              <small>Clear</small>
-            </a>
-          </div>
+          <div>Before</div>
           <div class="input-group input-group-sm">
-            <input class="form-control" type="text" placeholder="yyyy-mm-dd" name="before" [(ngModel)]="_dateBefore" [maxDate]="this._maxDate" ngbDatepicker (dateSelect)="onDateSelected($event)" #dpBefore="ngbDatepicker">
+            <input class="form-control" type="text" placeholder="yyyy-mm-dd" name="before" [(ngModel)]="_dateBefore" [maxDate]="this._maxDate" ngbDatepicker (dateSelect)="onBeforeSelected($event)" #dpBefore="ngbDatepicker">
             <div class="input-group-append">
               <button class="btn btn-outline-secondary btn-sm" (click)="dpBefore.toggle()" type="button">
                 <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -32,17 +25,9 @@
           </div>
         </div>
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
-          <div class="mb-2 d-flex flex-row w-100 justify-content-between small">
-            <div>After</div>
-            <a *ngIf="dateAfter" class="btn btn-link p-0 m-0" (click)="clearAfter()">
-              <svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
-              </svg>
-              <small>Clear</small>
-            </a>
-          </div>
+          <div>After</div>
           <div class="input-group input-group-sm">
-            <input class="form-control form-control-sm" type="text" placeholder="yyyy-mm-dd" name="after" [(ngModel)]="_dateAfter" [maxDate]="this._maxDate" ngbDatepicker (dateSelect)="onDateSelected($event)" #dpAfter="ngbDatepicker">
+            <input class="form-control form-control-sm" type="text" placeholder="yyyy-mm-dd" name="after" [(ngModel)]="_dateAfter" [maxDate]="this._maxDate" ngbDatepicker (dateSelect)="onAfterSelected($event)" #dpAfter="ngbDatepicker">
             <div class="input-group-append">
               <button class="btn btn-outline-secondary btn-sm" (click)="dpAfter.toggle()" type="button">
                 <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index 55beeb7f4..806027f9c 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -1,6 +1,13 @@
 import { Component, EventEmitter, Input, Output, ElementRef, ViewChild, SimpleChange } from '@angular/core';
 import { NgbDate, NgbDateStruct, NgbDatepicker } from '@ng-bootstrap/ng-bootstrap';
 
+
+export interface DateSelection {
+  before?: NgbDateStruct
+  after?: NgbDateStruct
+}
+
+
 @Component({
   selector: 'app-filter-dropdown-date',
   templateUrl: './filter-dropdown-date.component.html',
@@ -18,10 +25,7 @@ export class FilterDropdownDateComponent {
   title: string
 
   @Output()
-  dateBeforeSet = new EventEmitter()
-
-  @Output()
-  dateAfterSet = new EventEmitter()
+  datesSet = new EventEmitter<DateSelection>()
 
   @ViewChild('dpAfter') dpAfter: NgbDatepicker
   @ViewChild('dpBefore') dpBefore: NgbDatepicker
@@ -88,19 +92,18 @@ export class FilterDropdownDateComponent {
         break
     }
     this._dateAfter = newDate
-    this.onDateSelected(this._dateAfter)
+    this.datesSet.emit({after: newDate, before: null})
   }
 
-  onDateSelected(date:NgbDateStruct) {
-    let emitter = this._dateAfter && NgbDate.from(this._dateAfter).equals(date) ? this.dateAfterSet : this.dateBeforeSet
-    emitter.emit(date)
+  onBeforeSelected(date: NgbDateStruct) {
+    this.datesSet.emit({after: this._dateAfter, before: date})
   }
 
-  clearAfter() {
-    this.dateAfterSet.next()
+  onAfterSelected(date: NgbDateStruct) {
+    this.datesSet.emit({after: date, before: this._dateBefore})
   }
 
-  clearBefore() {
-    this.dateBeforeSet.next()
+  clear() {
+    this.datesSet.emit({after: null, before: null})
   }
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 6e64264db..80f10407c 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -10,8 +10,8 @@
   <app-filter-dropdown class="col-auto" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" (toggle)="toggleCorrespondent($event.id)"></app-filter-dropdown>
   <app-filter-dropdown class="col-auto" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document types" (toggle)="toggleDocumentType($event.id)"></app-filter-dropdown>
 
-  <app-filter-dropdown-date class="col-auto" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (dateBeforeSet)="onDateCreatedBeforeSet($event)" (dateAfterSet)="onDateCreatedAfterSet($event)"></app-filter-dropdown-date>
-  <app-filter-dropdown-date class="col-auto" [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (dateBeforeSet)="onDateAddedBeforeSet($event)" (dateAfterSet)="onDateAddedAfterSet($event)"></app-filter-dropdown-date>
+  <app-filter-dropdown-date class="col-auto" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (datesSet)="onDatesCreatedSet($event)"></app-filter-dropdown-date>
+  <app-filter-dropdown-date class="col-auto" [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (datesSet)="onDatesAddedSet($event)"></app-filter-dropdown-date>
 
   <button class="btn btn-link btn-sm" [disabled]="!hasFilters()" (click)="clearSelected()">
     <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index 9822c7db3..f98b9517f 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -10,6 +10,7 @@ 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_TAG, FILTER_RULE_TYPES, FILTER_TITLE } from 'src/app/data/filter-rule-type';
+import { DateSelection } from './filter-dropdown-date/filter-dropdown-date.component';
 
 @Component({
   selector: 'app-filter-editor',
@@ -146,23 +147,15 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   // Date handling
 
 
-  onDateCreatedBeforeSet(date: NgbDateStruct) {
-    this.setDateCreatedBefore(date)
+  onDatesCreatedSet(dates: DateSelection) {
+    this.setDateCreatedBefore(dates.before)
+    this.setDateCreatedAfter(dates.after)
     this.applyFilters()
   }
 
-  onDateCreatedAfterSet(date: NgbDateStruct) {
-    this.setDateCreatedAfter(date)
-    this.applyFilters()
-  }
-
-  onDateAddedBeforeSet(date: NgbDateStruct) {
-    this.setDateAddedBefore(date)
-    this.applyFilters()
-  }
-
-  onDateAddedAfterSet(date: NgbDateStruct) {
-    this.setDateAddedAfter(date)
+  onDatesAddedSet(dates: DateSelection) {
+    this.setDateAddedBefore(dates.before)
+    this.setDateAddedAfter(dates.after)
     this.applyFilters()
   }
 

From ff71b048483b54f237d079d1efad19558237e422 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 02:35:04 +0100
Subject: [PATCH 0221/1300] editable saved views

---
 .../manage/settings/settings.component.html   | 47 ++++++++++++-------
 .../manage/settings/settings.component.ts     | 37 +++++++++++++--
 .../rest/abstract-paperless-service.ts        |  8 +++-
 .../app/services/rest/saved-view.service.ts   |  7 +++
 src/documents/serialisers.py                  | 12 +++--
 5 files changed, 84 insertions(+), 27 deletions(-)

diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 73e4f8194..f71f12238 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -34,24 +34,35 @@
       <a ngbNavLink>Saved views</a>
       <ng-template ngbNavContent>
 
-        <table class="table table-borderless table-sm">
-          <thead>
-            <tr>
-              <th scope="col">Title</th>
-              <th scope="col">Show in dashboard</th>
-              <th scope="col">Show in sidebar</th>
-              <th scope="col">Actions</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr *ngFor="let view of savedViewService.allViews">
-              <td>{{ view.name }}</td>
-              <td>{{ view.show_on_dashboard | yesno }}</td>
-              <td>{{ view.show_in_sidebar | yesno }}</td>
-              <td><button type="button" class="btn btn-sm btn-outline-danger" (click)="deleteSavedView(view)">Delete</button></td>
-            </tr>
-          </tbody>
-        </table>
+        <div formGroupName="savedViews">
+          
+            <div *ngFor="let view of savedViews" [formGroupName]="view.id" class="form-row">
+              <div class="form-group col-4 mr-3">
+                <label for="name_{{view.id}}">Name</label>
+                <input type="text" class="form-control" formControlName="name" id="name_{{view.id}}">
+              </div>
+
+              <div class="form-group col-auto mr-3">
+                <label for="show_on_dashboard_{{view.id}}">Appears on</label>
+                <div class="custom-control custom-switch">
+                  <input type="checkbox" class="custom-control-input" id="show_on_dashboard_{{view.id}}" formControlName="show_on_dashboard">
+                  <label class="custom-control-label" for="show_on_dashboard_{{view.id}}">Show on dashboard</label>
+                </div>
+                <div class="custom-control custom-switch">
+                  <input type="checkbox" class="custom-control-input" id="show_in_sidebar_{{view.id}}" formControlName="show_in_sidebar">
+                  <label class="custom-control-label" for="show_in_sidebar_{{view.id}}">Show in sidebar</label>
+                </div>
+              </div>
+
+              <div class="form-group col-auto">
+                <label for="name_{{view.id}}">Actions</label>
+                <button type="button" class="btn btn-sm btn-outline-danger form-control" (click)="deleteSavedView(view)">Delete</button>
+              </div>
+            </div>
+
+            <div *ngIf="savedViews.length == 0">No saved views defined.</div>
+          
+        </div>
 
       </ng-template>
     </li>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 08275bbb2..41bb21156 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -11,10 +11,13 @@ import { Toast, ToastService } from 'src/app/services/toast.service';
   templateUrl: './settings.component.html',
   styleUrls: ['./settings.component.scss']
 })
-export class SettingsComponent {
+export class SettingsComponent implements OnInit {
+
+  savedViewGroup = new FormGroup({})
 
   settingsForm = new FormGroup({
-    'documentListItemPerPage': new FormControl(+localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT)
+    'documentListItemPerPage': new FormControl(+localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT),
+    'savedViews': this.savedViewGroup
   })
 
   constructor(
@@ -23,14 +26,40 @@ export class SettingsComponent {
     private toastService: ToastService
   ) { }
 
+  savedViews: PaperlessSavedView[]
+
+  ngOnInit() {
+    this.savedViewService.listAll().subscribe(r => {
+      this.savedViews = r.results
+      for (let view of this.savedViews) {
+        this.savedViewGroup.addControl(view.id.toString(), new FormGroup({
+          "id": new FormControl(view.id),
+          "name": new FormControl(view.name),
+          "show_on_dashboard": new FormControl(view.show_on_dashboard),
+          "show_in_sidebar": new FormControl(view.show_in_sidebar)
+        }))
+      }
+    })
+  }
+
   deleteSavedView(savedView: PaperlessSavedView) {
     this.savedViewService.delete(savedView).subscribe(() => {
+      this.savedViewGroup.removeControl(savedView.id.toString())
+      this.savedViews.splice(this.savedViews.indexOf(savedView), 1)
       this.toastService.showToast(Toast.make("Information", `Saved view "${savedView.name} deleted.`))
     })
   }
 
   saveSettings() {
-    localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
-    this.documentListViewService.updatePageSize()
+    let x = []
+    for (let id in this.savedViewGroup.value) {
+      x.push(this.savedViewGroup.value[id])
+    }
+    this.savedViewService.patchMany(x).subscribe(s => {
+      this.toastService.showToast(Toast.make("Information", "Settings saved successfully."))
+      localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
+      this.documentListViewService.updatePageSize()
+    })
+
   }
 }
diff --git a/src-ui/src/app/services/rest/abstract-paperless-service.ts b/src-ui/src/app/services/rest/abstract-paperless-service.ts
index 6ec4346ed..93e1a0c85 100644
--- a/src-ui/src/app/services/rest/abstract-paperless-service.ts
+++ b/src-ui/src/app/services/rest/abstract-paperless-service.ts
@@ -92,4 +92,10 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
     this._listAll = null
     return this.http.put<T>(this.getResourceUrl(o.id), o)
   }
-}
\ No newline at end of file
+
+  patch(o: T): Observable<T> {
+    this._listAll = null
+    return this.http.patch<T>(this.getResourceUrl(o.id), o)
+  }
+
+}
diff --git a/src-ui/src/app/services/rest/saved-view.service.ts b/src-ui/src/app/services/rest/saved-view.service.ts
index 14c18b0e2..9a81e01e5 100644
--- a/src-ui/src/app/services/rest/saved-view.service.ts
+++ b/src-ui/src/app/services/rest/saved-view.service.ts
@@ -1,5 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { combineLatest, Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { AbstractPaperlessService } from './abstract-paperless-service';
@@ -44,6 +45,12 @@ export class SavedViewService extends AbstractPaperlessService<PaperlessSavedVie
     )
   }
   
+  patchMany(objects: PaperlessSavedView[]): Observable<PaperlessSavedView[]> {
+    return combineLatest(objects.map(o => super.patch(o))).pipe(
+      tap(() => this.reload())
+    )
+  }
+
   delete(o: PaperlessSavedView) {
     return super.delete(o).pipe(
       tap(() => this.reload())
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 43b5e5992..2def07fdd 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -159,11 +159,15 @@ class SavedViewSerializer(serializers.ModelSerializer):
                   "sort_field", "sort_reverse", "filter_rules"]
 
     def update(self, instance, validated_data):
-        rules_data = validated_data.pop('filter_rules')
+        if 'filter_rules' in validated_data:
+            rules_data = validated_data.pop('filter_rules')
+        else:
+            rules_data = None
         super(SavedViewSerializer, self).update(instance, validated_data)
-        SavedViewFilterRule.objects.filter(saved_view=instance).delete()
-        for rule_data in rules_data:
-            SavedViewFilterRule.objects.create(saved_view=instance, **rule_data)
+        if rules_data:
+            SavedViewFilterRule.objects.filter(saved_view=instance).delete()
+            for rule_data in rules_data:
+                SavedViewFilterRule.objects.create(saved_view=instance, **rule_data)
         return instance
 
     def create(self, validated_data):

From 999b36473c933c3029fb54c983d05babca9f39a6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 03:29:23 +0100
Subject: [PATCH 0222/1300] more refactoring and bug fixing.

---
 .../filter-editor/filter-editor.component.ts      | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index f98b9517f..a11f0736a 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -200,24 +200,21 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   }
 
   setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) {
-    let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID)
+    let existingRule = this.filterRules.find(rule => rule.rule_type == dateRuleTypeID)
     let newValue = this.dateParser.format(date)
 
     if (existingRule) {
       existingRule.value = newValue
     } else {
-      filterRules.push({rule_type: dateRuleTypeID, value: newValue})
+      this.filterRules.push({rule_type: dateRuleTypeID, value: newValue})
     }
-
-    this.filterRules = filterRules
   }
 
   clearDateFilter(dateRuleTypeID: number) {
-    let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID)
-    filterRules.splice(filterRules.indexOf(existingRule), 1)
-    this.filterRules = filterRules
+    let ruleIndex = this.filterRules.findIndex(rule => rule.rule_type == dateRuleTypeID)
+    if (ruleIndex != -1) {
+      this.filterRules.splice(ruleIndex, 1)
+    }
   }
 
 }

From 6d39dfeb3b096d994d303e8f89faeb09142a2eaa Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 03:53:18 +0100
Subject: [PATCH 0223/1300] forgot to address this.

---
 .../components/document-list/document-list.component.html   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index acbfd3602..1b3596098 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -93,16 +93,16 @@
       </td>
       <td class="d-none d-md-table-cell">
         <ng-container *ngIf="d.correspondent">
-          <a [routerLink]="" (click)="clickCorrespondent(d.correspondent)" title="Filter by correspondent">{{(d.correspondent$ | async)?.name}}</a>
+          <a [routerLink]="" (click)="clickCorrespondent(d.correspondent.id)" 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)"></app-tag>
+        <app-tag [tag]="t" *ngFor="let t of d.tags$ | async" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="clickTag(t.id)"></app-tag>
       </td>
       <td class="d-none d-xl-table-cell">
         <ng-container *ngIf="d.document_type">
-          <a [routerLink]="" (click)="clickDocumentType(d.document_type)" title="Filter by document type">{{(d.document_type$ | async)?.name}}</a>
+          <a [routerLink]="" (click)="clickDocumentType(d.document_type.id)" title="Filter by document type">{{(d.document_type$ | async)?.name}}</a>
         </ng-container>
       </td>
       <td>

From 164755c755a170678bfd648f6f72261eee7c4af6 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 14 Dec 2020 19:45:22 -0800
Subject: [PATCH 0224/1300] Breakpoints for screen sizes, icons for mobile

---
 .../document-list.component.html              |  2 +-
 .../filter-dropdown.component.html            | 14 +++++-
 .../filter-dropdown.component.ts              |  2 +-
 .../filter-editor.component.html              | 45 ++++++++++---------
 4 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index acbfd3602..5f91deb5f 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -62,7 +62,7 @@
 
 </app-page-header>
 
-<div class="w-100 mb-4">
+<div class="w-100 mb-2 mb-sm-4">
   <app-filter-editor [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
 </div>
 
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 5de9228bd..76ef360fd 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -1,6 +1,18 @@
 <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #filterDropdown="ngbDropdown">
   <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="itemsSelected?.length > 0 ? 'btn-primary' : 'btn-outline-primary'">
-    {{title}}
+    <div class="d-none d-md-inline">{{title}}</div>
+    <div class="d-inline-block d-md-none" [ngSwitch]="icon">
+      <svg *ngSwitchCase="'person-fill'" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-person-fill" viewBox="0 0 16 16">
+        <path fill-rule="evenodd" d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z" />
+      </svg>
+      <svg *ngSwitchCase="'tag-fill'" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-tags-fill" viewBox="0 0 16 16">
+        <path fill-rule="evenodd" d="M3 1a1 1 0 0 0-1 1v4.586a1 1 0 0 0 .293.707l7 7a1 1 0 0 0 1.414 0l4.586-4.586a1 1 0 0 0 0-1.414l-7-7A1 1 0 0 0 7.586 1H3zm4 3.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z" />
+        <path d="M1 7.086a1 1 0 0 0 .293.707L8.75 15.25l-.043.043a1 1 0 0 1-1.414 0l-7-7A1 1 0 0 1 0 7.586V3a1 1 0 0 1 1-1v5.086z" />
+      </svg>
+      <svg *ngSwitchCase="'file-earmark-fill'" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-file-earmark-fill" viewBox="0 0 16 16">
+        <path fill-rule="evenodd" d="M4 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V4.707A1 1 0 0 0 13.707 4L10 .293A1 1 0 0 0 9.293 0H4zm5.5 1.5v2a1 1 0 0 0 1 1h2l-3-3z" />
+      </svg>
+    </div>
   </button>
   <div class="dropdown-menu py-0 shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index d675e14f1..b9d3fca6f 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -22,7 +22,7 @@ export class FilterDropdownComponent {
   title: string
 
   @Input()
-  display: string
+  icon: string
 
   @Output()
   toggle = new EventEmitter()
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 80f10407c..5bf23f8bd 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -1,22 +1,27 @@
-<div class="form-row form-group mb-0">
-  <div class="col-auto">
-    <div class="text-muted mt-1">Filter by:</div>
+<div class="row">
+   <div class="col mb-2 mb-xl-0">
+     <div class="form-inline d-flex">
+         <label class="text-muted mr-2">Filter by:</label>
+         <input class="form-control form-control-sm flex-grow-1" type="text" [(ngModel)]="titleFilter" placeholder="Title">
+     </div>
   </div>
-  <div class="col">
-    <input class="form-control form-control-sm" type="text" [(ngModel)]="titleFilter" placeholder="Title">
-  </div>
-
-  <app-filter-dropdown class="col-auto" [items]="tags" [itemsSelected]="selectedTags" title="Tags" (toggle)="toggleTag($event.id)"></app-filter-dropdown>
-  <app-filter-dropdown class="col-auto" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" (toggle)="toggleCorrespondent($event.id)"></app-filter-dropdown>
-  <app-filter-dropdown class="col-auto" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document types" (toggle)="toggleDocumentType($event.id)"></app-filter-dropdown>
-
-  <app-filter-dropdown-date class="col-auto" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (datesSet)="onDatesCreatedSet($event)"></app-filter-dropdown-date>
-  <app-filter-dropdown-date class="col-auto" [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (datesSet)="onDatesAddedSet($event)"></app-filter-dropdown-date>
-
-  <button class="btn btn-link btn-sm" [disabled]="!hasFilters()" (click)="clearSelected()">
-    <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-      <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
-    </svg>
-    Clear all filters
-  </button>
+  <div class="w-100 d-xl-none"></div>
+   <div class="col col-xl-auto mb-2 mb-xl-0">
+     <div class="d-flex">
+       <app-filter-dropdown class="mr-2" [items]="tags" [itemsSelected]="selectedTags" title="Tags" icon="tag-fill" (toggle)="toggleTag($event.id)"></app-filter-dropdown>
+       <app-filter-dropdown class="mr-2" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" icon="person-fill" (toggle)="toggleCorrespondent($event.id)"></app-filter-dropdown>
+       <app-filter-dropdown class="mr-2" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document types" icon="file-earmark-fill" (toggle)="toggleDocumentType($event.id)"></app-filter-dropdown>
+       <app-filter-dropdown-date class="mr-2" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (datesSet)="onDatesCreatedSet($event)"></app-filter-dropdown-date>
+       <app-filter-dropdown-date [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (datesSet)="onDatesAddedSet($event)"></app-filter-dropdown-date>
+     </div>
+   </div>
+   <div class="w-100 d-xl-none"></div>
+   <div class="col col-xl-auto mb-2 mb-xl-0">
+     <button class="btn btn-link btn-sm px-0 mx-0 ml-xl-n4" [disabled]="!hasFilters()" (click)="clearSelected()">
+       <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+         <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+       </svg>
+       Clear all filters
+     </button>
+   </div>
 </div>

From 30185d560ca363b53deed34c747b8a201ef58ab0 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 14 Dec 2020 22:33:50 -0800
Subject: [PATCH 0225/1300] Much cleaner way to set icon

---
 .../filter-dropdown/filter-dropdown.component.html             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 76ef360fd..8f7d14e81 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -11,6 +11,9 @@
       </svg>
       <svg *ngSwitchCase="'file-earmark-fill'" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-file-earmark-fill" viewBox="0 0 16 16">
         <path fill-rule="evenodd" d="M4 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V4.707A1 1 0 0 0 13.707 4L10 .293A1 1 0 0 0 9.293 0H4zm5.5 1.5v2a1 1 0 0 0 1 1h2l-3-3z" />
+    <div class="d-inline-block d-md-none">
+      <svg class="toolbaricon" fill="currentColor">
+        <use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
       </svg>
     </div>
   </button>

From 3b2bc292d80708332f32c903af9a01104ff8a34e Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 14 Dec 2020 23:14:04 -0800
Subject: [PATCH 0226/1300] Tweak checkbox

---
 .../document-card-small.component.html           |  2 +-
 .../document-card-small.component.scss           | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 4ced42bdd..378047602 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -3,7 +3,7 @@
     <div class="border-bottom" [class.doc-img-background-selected]="selected">
       <img class="card-img doc-img" [src]="getThumbUrl()" (click)="selected = !selected">
 
-      <div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
+      <div class="border-right border-bottom bg-light p-1 rounded document-card-check">
         <div class="custom-control custom-checkbox">
           <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="selected = $event.target.checked">
           <label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
index 36db2203c..a4af1bb11 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
@@ -8,7 +8,15 @@
 }
 
 .document-card-check {
-  display: none
+  display: none;
+  position: absolute;
+  top: 0;
+  left: 0;
+
+  .custom-control {
+    margin-left: 4px;
+    margin-right: -3px;
+  }
 }
 
 .document-card:hover .document-card-check {
@@ -17,8 +25,12 @@
 
 .card-selected {
   border-color: $primary;
+
+  .document-card-check {
+    display: block;
+  }
 }
 
 .doc-img-background-selected {
   background-color: $primaryFaded;
-}
\ No newline at end of file
+}

From b45bd665736879afcc776d876a5eacad35000b66 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 14 Dec 2020 23:14:19 -0800
Subject: [PATCH 0227/1300] Basic bulk editor component

---
 src-ui/src/app/app.module.ts                  |  2 +
 .../bulk-editor/bulk-editor.component.html    | 16 +++++++
 .../bulk-editor/bulk-editor.component.scss    |  0
 .../bulk-editor/bulk-editor.component.spec.ts | 25 ++++++++++
 .../bulk-editor/bulk-editor.component.ts      | 46 +++++++++++++++++++
 .../document-list.component.html              | 30 +++++++-----
 .../document-list/document-list.component.ts  |  4 ++
 7 files changed, 111 insertions(+), 12 deletions(-)
 create mode 100644 src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
 create mode 100644 src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss
 create mode 100644 src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts
 create mode 100644 src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 914854892..627d4f6cf 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -32,6 +32,7 @@ import { FilterDropdownButtonComponent } from './components/filter-editor/filter
 import { FilterDropdownDateComponent } from './components/filter-editor/filter-dropdown-date/filter-dropdown-date.component';
 import { DocumentCardLargeComponent } from './components/document-list/document-card-large/document-card-large.component';
 import { DocumentCardSmallComponent } from './components/document-list/document-card-small/document-card-small.component';
+import { BulkEditorComponent } from './components/document-list/bulk-editor/bulk-editor.component';
 import { NgxFileDropModule } from 'ngx-file-drop';
 import { TextComponent } from './components/common/input/text/text.component';
 import { SelectComponent } from './components/common/input/select/select.component';
@@ -84,6 +85,7 @@ import { SelectDialogComponent } from './components/common/select-dialog/select-
     FilterDropdownDateComponent,
     DocumentCardLargeComponent,
     DocumentCardSmallComponent,
+    BulkEditorComponent,
     TextComponent,
     SelectComponent,
     CheckComponent,
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
new file mode 100644
index 000000000..a1574f6f7
--- /dev/null
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -0,0 +1,16 @@
+<div class="btn-group mr-lg-2" role="group" aria-label="Select">
+  <button class="btn btn-sm btn-outline-primary" (click)="this.selectPage.next()">Select page</button>
+  <button class="btn btn-sm btn-outline-primary" (click)="this.selectAll.next()">Select all</button>
+  <button class="btn btn-sm btn-outline-primary" (click)="this.selectNone.next()">Select none</button>
+</div>
+<div class="btn-group mr-lg-2" role="group" aria-label="Actions">
+  <button class="btn btn-sm btn-outline-primary" (click)="this.setCorrespondent.next()">Set correspondent</button>
+  <button class="btn btn-sm btn-outline-primary" (click)="this.removeCorrespondent.next()">Remove correspondent</button>
+  <button class="btn btn-sm btn-outline-primary" (click)="this.setDocumentType.next()">Set document type</button>
+  <button class="btn btn-sm btn-outline-primary" (click)="this.removeDocumentType.next()">Remove document type</button>
+  <button class="btn btn-sm btn-outline-primary" (click)="this.addTag.next()">Add tag</button>
+  <button class="btn btn-sm btn-outline-primary" (click)="this.removeTag.next()">Remove tag</button>
+</div>
+<div class="btn-group mr-lg-2" role="group" aria-label="Delete">
+  <button class="btn btn-sm btn-outline-primary" (click)="this.delete.next()">Delete</button>
+</div>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts
new file mode 100644
index 000000000..140d73301
--- /dev/null
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BulkEditorComponent } from './bulk-editor.component';
+
+describe('BulkEditorComponent', () => {
+  let component: BulkEditorComponent;
+  let fixture: ComponentFixture<BulkEditorComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ BulkEditorComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BulkEditorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
new file mode 100644
index 000000000..7459d62dc
--- /dev/null
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -0,0 +1,46 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { DocumentListViewService } from 'src/app/services/document-list-view.service';
+
+@Component({
+  selector: 'app-bulk-editor',
+  templateUrl: './bulk-editor.component.html',
+  styleUrls: ['./bulk-editor.component.scss']
+})
+export class BulkEditorComponent {
+
+  @Input()
+  list: DocumentListViewService
+
+  @Output()
+  selectPage = new EventEmitter()
+
+  @Output()
+  selectAll = new EventEmitter()
+
+  @Output()
+  selectNone = new EventEmitter()
+
+  @Output()
+  setCorrespondent = new EventEmitter()
+
+  @Output()
+  removeCorresponden = new EventEmitter()
+
+  @Output()
+  setDocumentType = new EventEmitter()
+
+  @Output()
+  removeDocumentType = new EventEmitter()
+
+  @Output()
+  addTag = new EventEmitter()
+
+  @Output()
+  removeTag = new EventEmitter()
+
+  @Output()
+  delete = new EventEmitter()
+
+  constructor( ) { }
+
+}
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index be2ed4847..36e9ff8fd 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -1,25 +1,16 @@
 <app-page-header [title]="getTitle()">
 
   <div ngbDropdown class="d-inline-block mr-2">
-    <button class="btn btn-sm btn-outline-primary" id="dropdownBasic1" ngbDropdownToggle>
+    <button class="btn btn-sm btn-outline-primary" id="dropdownSelect" ngbDropdownToggle>
       <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#text-indent-left" />
       </svg>
-      Bulk edit
+      Select
     </button>
-    <div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="shadow">
+    <div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow">
       <button ngbDropdownItem (click)="list.selectPage()">Select page</button>
       <button ngbDropdownItem (click)="list.selectAll()">Select all</button>
       <button ngbDropdownItem (click)="list.selectNone()">Select none</button>
-      <div class="dropdown-divider"></div>
-      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkSetCorrespondent()">Set correspondent</button>
-      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkRemoveCorrespondent()">Remove correspondent</button>
-      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkSetDocumentType()">Set document type</button>
-      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkRemoveDocumentType()">Remove document type</button>
-      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkAddTag()">Add tag</button>
-      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkRemoveTag()">Remove tag</button>
-      <div class="dropdown-divider"></div>
-      <button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkDelete()">Delete</button>
     </div>
   </div>
 
@@ -96,6 +87,21 @@
   [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
 </div>
 
+<div class="w-100 mb-2" [ngbCollapse]="!isBulkEditing">
+  <app-bulk-editor
+    (selectPage)="list.selectPage()"
+    (selectAll)="list.selectAll()"
+    (selectNone)="list.selectNone()"
+    (setCorrespondent)="bulkSetCorrespondent()"
+    (removeCorrespondent)="bulkRemoveCorrespondent()"
+    (setDocumentType)="bulkSetDocumentType()"
+    (removeDocumentType)="bulkRemoveDocumentType()"
+    (addTag)="bulkAddTag()"
+    (removeTag)="bulkRemoveTag()"
+    (delete)="bulkDelete()">
+  </app-bulk-editor>
+</div>
+
 <div *ngIf="displayMode == 'largeCards'">
   <app-document-card-large *ngFor="let d of list.documents" [document]="d" [details]="d.content" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)">
   </app-document-card-large>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 1bd1e5c7f..0a6fa4352 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -52,6 +52,10 @@ export class DocumentListComponent implements OnInit {
     return DOCUMENT_SORT_FIELDS
   }
 
+  get isBulkEditing(): boolean {
+    return this.list.selected.size > 0
+  }
+
   saveDisplayMode() {
     localStorage.setItem('document-list:displayMode', this.displayMode)
   }

From 34c42c4339a9ef8b7f5d03d76be1eddb6a84d865 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 14 Dec 2020 23:39:10 -0800
Subject: [PATCH 0228/1300] Better svgs

---
 .../filter-dropdown-button.component.html                     | 4 ++--
 .../app/components/filter-editor/filter-editor.component.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
index 8dff12a33..0ea870533 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
@@ -1,7 +1,7 @@
 <button class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-left-0 border-right-0 border-bottom" role="menuitem" (click)="toggleItem()">
   <div class="selected-icon mr-1">
-    <svg *ngIf="selected" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-      <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+    <svg *ngIf="selected" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
+      <use xlink:href="assets/bootstrap-icons.svg#check" />
     </svg>
   </div>
   <div class="mr-1">
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 80f10407c..e07edba14 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -14,8 +14,8 @@
   <app-filter-dropdown-date class="col-auto" [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (datesSet)="onDatesAddedSet($event)"></app-filter-dropdown-date>
 
   <button class="btn btn-link btn-sm" [disabled]="!hasFilters()" (click)="clearSelected()">
-    <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-      <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+    <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
+      <use xlink:href="assets/bootstrap-icons.svg#x" />
     </svg>
     Clear all filters
   </button>

From 03f071fd27c2e7e003655d534a8affe28d48b871 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 15 Dec 2020 00:57:31 -0800
Subject: [PATCH 0229/1300] Styled, organized button UI

---
 .../bulk-editor/bulk-editor.component.html    | 101 +++++++++++++++---
 .../bulk-editor/bulk-editor.component.scss    |   6 ++
 .../bulk-editor/bulk-editor.component.ts      |   2 +-
 .../document-list.component.html              |   2 +-
 4 files changed, 95 insertions(+), 16 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index a1574f6f7..54212923a 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -1,16 +1,89 @@
-<div class="btn-group mr-lg-2" role="group" aria-label="Select">
-  <button class="btn btn-sm btn-outline-primary" (click)="this.selectPage.next()">Select page</button>
-  <button class="btn btn-sm btn-outline-primary" (click)="this.selectAll.next()">Select all</button>
-  <button class="btn btn-sm btn-outline-primary" (click)="this.selectNone.next()">Select none</button>
+<div class="card bg-light">
+<div class="card-body px-2 py-2 d-flex justify-content-between flex-wrap align-items-end">
+  <div class="d-flex flex-grow-1 mb-2 mb-lg-0" role="group" aria-label="Select">
+    <label class="d-flex mt-1 mr-auto mr-lg-2">Select:</label>
+    <div class="btn-group d-flex">
+      <button class="btn btn-sm btn-outline-primary" (click)="selectPage.next()">
+        <svg viewBox="0 0 16 16" fill="currentColor">
+          <use xlink:href="assets/bootstrap-icons.svg#file-earmark-check" />
+        </svg>
+        Page
+      </button>
+      <button class="btn btn-sm btn-outline-primary" (click)="selectAll.next()">
+        <svg viewBox="0 0 16 16" fill="currentColor">
+          <use xlink:href="assets/bootstrap-icons.svg#check-all" />
+        </svg>
+        All
+      </button>
+      <button class="btn btn-sm btn-outline-primary" (click)="selectNone.next()">
+        <svg viewBox="0 0 16 16" fill="currentColor">
+          <use xlink:href="assets/bootstrap-icons.svg#slash-circle" />
+        </svg>
+        None
+      </button>
+    </div>
+  </div>
+  <div class="d-flex flex-grow-1 mb-2 mb-lg-0" role="group" aria-label="Tags">
+    <label class="d-flex mt-1 mr-auto mr-lg-2">Tags:</label>
+    <div class="btn-group d-flex">
+      <button class="btn btn-sm btn-outline-primary" (click)="addTag.next()">
+        <ng-container *ngTemplateOutlet="add"></ng-container>
+      </button>
+      <button class="btn btn-sm btn-outline-primary" (click)="removeTag.next()">
+        <ng-container *ngTemplateOutlet="remove"></ng-container>
+      </button>
+    </div>
+  </div>
+  <div class="d-flex flex-grow-1 mb-2 mb-lg-0" role="group" aria-label="Correspondent">
+    <label class="d-flex mt-1 mr-auto mr-lg-2">Correspondent:</label>
+    <div class="btn-group d-flex">
+      <button class="btn btn-sm btn-outline-primary" (click)="setCorrespondent.next()">
+        <ng-container *ngTemplateOutlet="edit"></ng-container>
+      </button>
+      <button class="btn btn-sm btn-outline-primary" (click)="removeCorrespondent.next()">
+        <ng-container *ngTemplateOutlet="remove"></ng-container>
+      </button>
+    </div>
+  </div>
+  <div class="d-flex flex-grow-1 mb-2 mb-lg-0" role="group" aria-label="Document Type">
+    <label class="d-flex mt-1 mr-auto mr-lg-2">Document Type:</label>
+    <div class="btn-group d-flex">
+      <button class="btn btn-sm btn-outline-primary" (click)="setDocumentType.next()">
+        <ng-container *ngTemplateOutlet="edit"></ng-container>
+      </button>
+      <button class="btn btn-sm btn-outline-primary" (click)="removeDocumentType.next()">
+        <ng-container *ngTemplateOutlet="remove"></ng-container>
+      </button>
+    </div>
+  </div>
+  <div class="d-flex flex-grow-1 mb-2 mb-lg-0" role="group" aria-label="Delete">
+    <button class="btn btn-sm btn-outline-danger ml-auto" (click)="delete.next()">
+      <svg viewBox="0 0 16 16" fill="currentColor">
+        <use xlink:href="assets/bootstrap-icons.svg#trash" />
+      </svg>
+      Delete
+    </button>
+  </div>
 </div>
-<div class="btn-group mr-lg-2" role="group" aria-label="Actions">
-  <button class="btn btn-sm btn-outline-primary" (click)="this.setCorrespondent.next()">Set correspondent</button>
-  <button class="btn btn-sm btn-outline-primary" (click)="this.removeCorrespondent.next()">Remove correspondent</button>
-  <button class="btn btn-sm btn-outline-primary" (click)="this.setDocumentType.next()">Set document type</button>
-  <button class="btn btn-sm btn-outline-primary" (click)="this.removeDocumentType.next()">Remove document type</button>
-  <button class="btn btn-sm btn-outline-primary" (click)="this.addTag.next()">Add tag</button>
-  <button class="btn btn-sm btn-outline-primary" (click)="this.removeTag.next()">Remove tag</button>
-</div>
-<div class="btn-group mr-lg-2" role="group" aria-label="Delete">
-  <button class="btn btn-sm btn-outline-primary" (click)="this.delete.next()">Delete</button>
 </div>
+
+<ng-template #add>
+  <svg viewBox="0 0 16 16" fill="currentColor">
+    <use xlink:href="assets/bootstrap-icons.svg#plus-circle" />
+  </svg>
+  Add
+</ng-template>
+
+<ng-template #edit>
+  <svg viewBox="0 0 16 16" fill="currentColor">
+    <use xlink:href="assets/bootstrap-icons.svg#pencil" />
+  </svg>
+  Edit
+</ng-template>
+
+<ng-template #remove>
+  <svg viewBox="0 0 16 16" fill="currentColor">
+    <use xlink:href="assets/bootstrap-icons.svg#x-circle" />
+  </svg>
+  Remove
+</ng-template>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss
index e69de29bb..3868e7a02 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss
@@ -0,0 +1,6 @@
+.btn svg {
+  width: 0.9em;
+  height: 0.9em;
+  margin-right: 2px;
+  margin-top: -1px;
+}
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 7459d62dc..5c1ad01ae 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -24,7 +24,7 @@ export class BulkEditorComponent {
   setCorrespondent = new EventEmitter()
 
   @Output()
-  removeCorresponden = new EventEmitter()
+  removeCorrespondent = new EventEmitter()
 
   @Output()
   setDocumentType = new EventEmitter()
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 36e9ff8fd..a88ad65b7 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -87,7 +87,7 @@
   [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
 </div>
 
-<div class="w-100 mb-2" [ngbCollapse]="!isBulkEditing">
+<div class="w-100 mb-3" [ngbCollapse]="!isBulkEditing">
   <app-bulk-editor
     (selectPage)="list.selectPage()"
     (selectAll)="list.selectAll()"

From 49be87fe371d1f8a5895f42513a943b5bf2a5a7c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 12:06:24 +0100
Subject: [PATCH 0230/1300] code style

---
 src/documents/models.py      | 6 +++++-
 src/documents/serialisers.py | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/documents/models.py b/src/documents/models.py
index 1b1f697bc..b544f413d 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -340,7 +340,11 @@ class SavedViewFilterRule(models.Model):
         (17, "Does not have tag"),
     ]
 
-    saved_view = models.ForeignKey(SavedView, on_delete=models.CASCADE, related_name="filter_rules")
+    saved_view = models.ForeignKey(
+        SavedView,
+        on_delete=models.CASCADE,
+        related_name="filter_rules"
+    )
 
     rule_type = models.PositiveIntegerField(choices=RULE_TYPES)
 
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 2def07fdd..36878448c 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -167,14 +167,16 @@ class SavedViewSerializer(serializers.ModelSerializer):
         if rules_data:
             SavedViewFilterRule.objects.filter(saved_view=instance).delete()
             for rule_data in rules_data:
-                SavedViewFilterRule.objects.create(saved_view=instance, **rule_data)
+                SavedViewFilterRule.objects.create(
+                    saved_view=instance, **rule_data)
         return instance
 
     def create(self, validated_data):
         rules_data = validated_data.pop('filter_rules')
         saved_view = SavedView.objects.create(**validated_data)
         for rule_data in rules_data:
-            SavedViewFilterRule.objects.create(saved_view=saved_view, **rule_data)
+            SavedViewFilterRule.objects.create(
+                saved_view=saved_view, **rule_data)
         return saved_view
 
 

From 56204933b0c045de0a4b5156c781269cfc40c3c1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 13:16:28 +0100
Subject: [PATCH 0231/1300] bugfix, tests

---
 src/documents/serialisers.py      |  2 +-
 src/documents/tests/test_api.py   | 91 +++++++++++++++++++++++++++++--
 src/documents/tests/test_index.py | 21 +++++++
 3 files changed, 109 insertions(+), 5 deletions(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 36878448c..ee0a42384 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -164,7 +164,7 @@ class SavedViewSerializer(serializers.ModelSerializer):
         else:
             rules_data = None
         super(SavedViewSerializer, self).update(instance, validated_data)
-        if rules_data:
+        if rules_data is not None:
             SavedViewFilterRule.objects.filter(saved_view=instance).delete()
             for rule_data in rules_data:
                 SavedViewFilterRule.objects.create(
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index ab1716366..e0a64664f 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -4,12 +4,11 @@ import tempfile
 from unittest import mock
 
 from django.contrib.auth.models import User
-from pathvalidate import ValidationError
 from rest_framework.test import APITestCase
 from whoosh.writing import AsyncWriter
 
 from documents import index
-from documents.models import Document, Correspondent, DocumentType, Tag
+from documents.models import Document, Correspondent, DocumentType, Tag, SavedView
 from documents.tests.utils import DirectoriesMixin
 
 
@@ -18,8 +17,8 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
     def setUp(self):
         super(TestDocumentApi, self).setUp()
 
-        user = User.objects.create_superuser(username="temp_admin")
-        self.client.force_login(user=user)
+        self.user = User.objects.create_superuser(username="temp_admin")
+        self.client.force_login(user=self.user)
 
     def testDocuments(self):
 
@@ -515,3 +514,87 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertFalse(meta['has_archive_version'])
         self.assertGreater(len(meta['original_metadata']), 0)
         self.assertIsNone(meta['archive_metadata'])
+
+    def test_saved_views(self):
+        u1 = User.objects.create_user("user1")
+        u2 = User.objects.create_user("user2")
+
+        v1 = SavedView.objects.create(user=u1, name="test1", sort_field="", show_on_dashboard=False, show_in_sidebar=False)
+        v2 = SavedView.objects.create(user=u2, name="test2", sort_field="", show_on_dashboard=False, show_in_sidebar=False)
+        v3 = SavedView.objects.create(user=u2, name="test3", sort_field="", show_on_dashboard=False, show_in_sidebar=False)
+
+        response = self.client.get("/api/saved_views/")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 0)
+
+        self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 404)
+
+        self.client.force_login(user=u1)
+
+        response = self.client.get("/api/saved_views/")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 1)
+
+        self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 200)
+
+        self.client.force_login(user=u2)
+
+        response = self.client.get("/api/saved_views/")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 2)
+
+        self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 404)
+
+    def test_create_update_patch(self):
+
+        u1 = User.objects.create_user("user1")
+
+        view = {
+            "name": "test",
+            "show_on_dashboard": True,
+            "show_in_sidebar": True,
+            "sort_field": "created2",
+            "filter_rules": [
+                {
+                    "rule_type": 4,
+                    "value": "test"
+                }
+            ]
+        }
+
+        response = self.client.post("/api/saved_views/", view, format='json')
+        self.assertEqual(response.status_code, 201)
+
+        v1 = SavedView.objects.get(name="test")
+        self.assertEqual(v1.sort_field, "created2")
+        self.assertEqual(v1.filter_rules.count(), 1)
+        self.assertEqual(v1.user, self.user)
+
+        response = self.client.patch(f"/api/saved_views/{v1.id}/", {
+            "show_in_sidebar": False
+        }, format='json')
+
+        v1 = SavedView.objects.get(id=v1.id)
+        self.assertEqual(response.status_code, 200)
+        self.assertFalse(v1.show_in_sidebar)
+        self.assertEqual(v1.filter_rules.count(), 1)
+
+        view['filter_rules'] = [{
+            "rule_type": 12,
+            "value": "secret"
+        }]
+
+        response = self.client.put(f"/api/saved_views/{v1.id}/", view, format='json')
+        self.assertEqual(response.status_code, 200)
+
+        v1 = SavedView.objects.get(id=v1.id)
+        self.assertEqual(v1.filter_rules.count(), 1)
+        self.assertEqual(v1.filter_rules.first().value, "secret")
+
+        view['filter_rules'] = []
+
+        response = self.client.put(f"/api/saved_views/{v1.id}/", view, format='json')
+        self.assertEqual(response.status_code, 200)
+
+        v1 = SavedView.objects.get(id=v1.id)
+        self.assertEqual(v1.filter_rules.count(), 0)
diff --git a/src/documents/tests/test_index.py b/src/documents/tests/test_index.py
index 830fca0e0..2baa9621d 100644
--- a/src/documents/tests/test_index.py
+++ b/src/documents/tests/test_index.py
@@ -1,6 +1,9 @@
 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):
@@ -12,3 +15,21 @@ class JsonFormatterTest(TestCase):
         self.assertListEqual(self.formatter.format([]), [])
 
 
+class TestAutoComplete(DirectoriesMixin, TestCase):
+
+    def test_auto_complete(self):
+
+        doc1 = Document.objects.create(title="doc1", checksum="A", content="test test2 test3")
+        doc2 = Document.objects.create(title="doc2", checksum="B", content="test test2")
+        doc3 = Document.objects.create(title="doc3", checksum="C", content="test2")
+
+        index.add_or_update_document(doc1)
+        index.add_or_update_document(doc2)
+        index.add_or_update_document(doc3)
+
+        ix = index.open_index()
+
+        self.assertListEqual(index.autocomplete(ix, "tes"), [b"test3", b"test", b"test2"])
+        self.assertListEqual(index.autocomplete(ix, "tes", limit=3), [b"test3", b"test", b"test2"])
+        self.assertListEqual(index.autocomplete(ix, "tes", limit=1), [b"test3"])
+        self.assertListEqual(index.autocomplete(ix, "tes", limit=0), [])

From 7e0aa7136aed44d7cf200c5a816a372c282acc4a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 13:26:01 +0100
Subject: [PATCH 0232/1300] more tests

---
 src/paperless_text/tests/samples/test.txt |  1 +
 src/paperless_text/tests/test_parser.py   | 26 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 src/paperless_text/tests/samples/test.txt
 create mode 100644 src/paperless_text/tests/test_parser.py

diff --git a/src/paperless_text/tests/samples/test.txt b/src/paperless_text/tests/samples/test.txt
new file mode 100644
index 000000000..6de7b8c69
--- /dev/null
+++ b/src/paperless_text/tests/samples/test.txt
@@ -0,0 +1 @@
+This is a test file.
diff --git a/src/paperless_text/tests/test_parser.py b/src/paperless_text/tests/test_parser.py
new file mode 100644
index 000000000..413aa91cf
--- /dev/null
+++ b/src/paperless_text/tests/test_parser.py
@@ -0,0 +1,26 @@
+import os
+
+from django.test import TestCase
+
+from documents.tests.utils import DirectoriesMixin
+from paperless_text.parsers import TextDocumentParser
+
+
+class TestTextParser(DirectoriesMixin, TestCase):
+
+    def test_thumbnail(self):
+
+        parser = TextDocumentParser(None)
+
+        # just make sure that it does not crash
+        f = parser.get_thumbnail(os.path.join(os.path.dirname(__file__), "samples", "test.txt"), "text/plain")
+        self.assertTrue(os.path.isfile(f))
+
+    def test_parse(self):
+
+        parser = TextDocumentParser(None)
+
+        parser.parse(os.path.join(os.path.dirname(__file__), "samples", "test.txt"), "text/plain")
+
+        self.assertEqual(parser.get_text(), "This is a test file.\n")
+        self.assertIsNone(parser.get_archive_path())

From b787983e42434daadae4ff0c309329f91efc8781 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 13:47:43 +0100
Subject: [PATCH 0233/1300] more tests

---
 src/documents/models.py                  |  2 +-
 src/documents/tests/test_sanity_check.py | 10 +++++++---
 src/documents/tests/utils.py             |  3 ++-
 src/paperless_mail/mail.py               | 10 +++++-----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/documents/models.py b/src/documents/models.py
index b544f413d..d81343afa 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -221,7 +221,7 @@ class Document(models.Model):
         else:
             fname = "{:07}{}".format(self.pk, self.file_type)
             if self.storage_type == self.STORAGE_TYPE_GPG:
-                fname += ".gpg"
+                fname += ".gpg"  # pragma: no cover
 
         return os.path.join(
             settings.ORIGINALS_DIR,
diff --git a/src/documents/tests/test_sanity_check.py b/src/documents/tests/test_sanity_check.py
index 725e87617..0554cd7cd 100644
--- a/src/documents/tests/test_sanity_check.py
+++ b/src/documents/tests/test_sanity_check.py
@@ -2,6 +2,8 @@ import os
 import shutil
 from pathlib import Path
 
+import filelock
+from django.conf import settings
 from django.test import TestCase
 
 from documents.models import Document
@@ -13,9 +15,11 @@ class TestSanityCheck(DirectoriesMixin, TestCase):
 
     def make_test_data(self):
 
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000001.pdf"), os.path.join(self.dirs.originals_dir, "0000001.pdf"))
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "archive", "0000001.pdf"), os.path.join(self.dirs.archive_dir, "0000001.pdf"))
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), os.path.join(self.dirs.thumbnail_dir, "0000001.png"))
+        with filelock.FileLock(settings.MEDIA_LOCK):
+            # just make sure that the lockfile is present.
+            shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000001.pdf"), os.path.join(self.dirs.originals_dir, "0000001.pdf"))
+            shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "archive", "0000001.pdf"), os.path.join(self.dirs.archive_dir, "0000001.pdf"))
+            shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), os.path.join(self.dirs.thumbnail_dir, "0000001.png"))
 
         return Document.objects.create(title="test", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", content="test", pk=1, filename="0000001.pdf", mime_type="application/pdf")
 
diff --git a/src/documents/tests/utils.py b/src/documents/tests/utils.py
index 7f9d50ed5..dfefc4061 100644
--- a/src/documents/tests/utils.py
+++ b/src/documents/tests/utils.py
@@ -34,7 +34,8 @@ def setup_directories():
         ARCHIVE_DIR=dirs.archive_dir,
         CONSUMPTION_DIR=dirs.consumption_dir,
         INDEX_DIR=dirs.index_dir,
-        MODEL_FILE=os.path.join(dirs.data_dir, "classification_model.pickle")
+        MODEL_FILE=os.path.join(dirs.data_dir, "classification_model.pickle"),
+        MEDIA_LOCK=os.path.join(dirs.media_dir, "media.lock")
 
     )
     dirs.settings_override.enable()
diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
index a82c34f15..3c200362d 100644
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@ -26,7 +26,7 @@ class BaseMailAction:
         return {}
 
     def post_consume(self, M, message_uids, parameter):
-        pass
+        pass  # pragma: nocover
 
 
 class DeleteMailAction(BaseMailAction):
@@ -69,7 +69,7 @@ def get_rule_action(rule):
     elif rule.action == MailRule.ACTION_MARK_READ:
         return MarkReadMailAction()
     else:
-        raise ValueError("Unknown action.")
+        raise NotImplementedError("Unknown action.")  # pragma: nocover
 
 
 def make_criterias(rule):
@@ -95,7 +95,7 @@ def get_mailbox(server, port, security):
     elif security == MailAccount.IMAP_SECURITY_SSL:
         mailbox = MailBox(server, port)
     else:
-        raise ValueError("Unknown IMAP security")
+        raise NotImplementedError("Unknown IMAP security")  # pragma: nocover
     return mailbox
 
 
@@ -119,7 +119,7 @@ class MailAccountHandler(LoggingMixin):
             return os.path.splitext(os.path.basename(att.filename))[0]
 
         else:
-            raise ValueError("Unknown title selector.")
+            raise NotImplementedError("Unknown title selector.")  # pragma: nocover  # NOQA: E501
 
     def get_correspondent(self, message, rule):
         c_from = rule.assign_correspondent_from
@@ -141,7 +141,7 @@ class MailAccountHandler(LoggingMixin):
             return rule.assign_correspondent
 
         else:
-            raise ValueError("Unknwown correspondent selector")
+            raise NotImplementedError("Unknwown correspondent selector")  # pragma: nocover  # NOQA: E501
 
     def handle_mail_account(self, account):
 

From 5894060dc5e63b9109427816d76b94d66a132de5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 13:52:35 +0100
Subject: [PATCH 0234/1300] fixes #25

---
 src/documents/parsers.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index 228e2c86e..cbbb912de 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -163,8 +163,6 @@ def parse_date(filename, text):
 
     date = None
 
-    next_year = timezone.now().year + 5  # Arbitrary 5 year future limit
-
     # if filename date parsing is enabled, search there first:
     if settings.FILENAME_DATE_ORDER:
         for m in re.finditer(DATE_REGEX, filename):
@@ -176,7 +174,7 @@ def parse_date(filename, text):
                 # Skip all matches that do not parse to a proper date
                 continue
 
-            if date is not None and next_year > date.year > 1900:
+            if date and date.year > 1900 and date <= timezone.now():
                 return date
 
     # Iterate through all regex matches in text and try to parse the date
@@ -189,7 +187,7 @@ def parse_date(filename, text):
             # Skip all matches that do not parse to a proper date
             continue
 
-        if date is not None and next_year > date.year > 1900:
+        if date and date.year > 1900 and date <= timezone.now():
             break
         else:
             date = None

From 31bea6a361e24d7ac2e42e70624edf08caaffc3c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 14:11:05 +0100
Subject: [PATCH 0235/1300] path sanitation

---
 src/documents/file_handling.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index c49493991..5643756ac 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -99,6 +99,11 @@ def generate_filename(doc, counter=0):
             tags = defaultdictNoStr(lambda: slugify(None),
                                     many_to_dictionary(doc.tags))
 
+            tag_list = pathvalidate.sanitize_filename(
+                ",".join([tag.name for tag in doc.tags.all()]),
+                replacement_text="-"
+            )
+
             if doc.correspondent:
                 correspondent = pathvalidate.sanitize_filename(
                     doc.correspondent.name, replacement_text="-"
@@ -127,7 +132,7 @@ def generate_filename(doc, counter=0):
                 added_month=f"{doc.added.month:02}" if doc.added else "none",
                 added_day=f"{doc.added.day:02}" if doc.added else "none",
                 tags=tags,
-                tag_list=",".join([tag.name for tag in doc.tags.all()])
+                tag_list=tag_list
             ).strip()
 
             path = path.strip(os.sep)

From a0c74025e3c1cda4b17c044c13f7251f6a7fe96c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 14:30:31 +0100
Subject: [PATCH 0236/1300] changelog and docs

---
 docs/advanced_usage.rst | 36 +++++++++++++++++++++---------------
 docs/changelog.rst      | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst
index b5ae254b3..48a86384c 100644
--- a/docs/advanced_usage.rst
+++ b/docs/advanced_usage.rst
@@ -263,10 +263,10 @@ using the identifier which it has assigned to each document. You will end up get
 files like ``0000123.pdf`` in your media directory. This isn't necessarily a bad
 thing, because you normally don't have to access these files manually. However, if
 you wish to name your files differently, you can do that by adjusting the
-``PAPERLESS_FILENAME_FORMAT`` settings variable.
+``PAPERLESS_FILENAME_FORMAT`` configuration option.
 
-This variable allows you to configure the filename (folders are allowed!) using
-placeholders. For example, setting
+This variable allows you to configure the filename (folders are allowed) using
+placeholders. For example, configuring this to
 
 .. code:: bash
 
@@ -277,17 +277,16 @@ will create a directory structure as follows:
 .. code::
 
     2019/
-      my_bank/
-        statement-january-0000001.pdf
-        statement-february-0000002.pdf
+      My bank/
+        Statement January.pdf
+        Statement February.pdf
     2020/
-      my_bank/
-        statement-january-0000003.pdf
-      shoe_store/
-        my_new_shoes-0000004.pdf
-
-Paperless appends the unique identifier of each document to the filename. This
-avoids filename clashes.
+      My bank/
+        Statement January.pdf
+        Letter.pdf
+        Letter_01.pdf
+      Shoe store/
+        My new shoes.pdf
 
 .. danger::
 
@@ -299,6 +298,7 @@ Paperless provides the following placeholders withing filenames:
 
 * ``{correspondent}``: The name of the correspondent, or "none".
 * ``{document_type}``: The name of the document type, or "none".
+* ``{tag_list}``: A comma separated list of all tags assigned to the document.
 * ``{title}``: The title of the document.
 * ``{created}``: The full date and time the document was created.
 * ``{created_year}``: Year created only.
@@ -309,8 +309,14 @@ Paperless provides the following placeholders withing filenames:
 * ``{added_month}``: Month added only (number 1-12).
 * ``{added_day}``: Day added only (number 1-31).
 
-Paperless will convert all values for the placeholders into values which are safe
-for use in filenames.
+
+Paperless will try to conserve the information from your database as much as possible.
+However, some characters that you can use in document titles and correspondent names (such
+as ``: \ /`` and a couple more) are not allowed in filenames and will be replaced with dashes.
+
+If paperless detects that two documents share the same filename, paperless will automatically
+append ``_01``, ``_02``, etc to the filename. This happens if all the placeholders in a filename
+evaluate to the same value.
 
 .. hint::
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a50fc31d5..0e55cb144 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,40 @@
 Changelog
 *********
 
+
+paperless-ng 0.9.7
+##################
+
+
+* Front end
+
+  * Thanks to the hard work of `Michael Shamoon`_, paperless now comes with a much more streamlined UI for
+    filtering documents.
+  
+  * `Michael Shamoon`_ replaced the document preview with another component. This should fix compatibility with Safari browsers.
+
+  * Paperless now stores your saved views on the server and associates them with your user account. You
+    will have to recreate your views.
+  
+* Other additions and changes
+
+  * The GitHub and documentation links now open in new tabs/windows. Thanks to `rYR79435`_.
+  * The new filename format field ``{tag_list}`` inserts a list of tags into the filename, separated by comma.
+  * The ``document_retagger`` no longer removes inbox tags or tags without matching rules.
+  * The new configuration option ``PAPERLESS_COOKIE_PREFIX`` allows you to run multiple instances of paperless on different ports.
+    This option enables you to be logged in into multiple instances by specifying different cookie names for each instance.
+
+* Fixes
+  
+  * Sometimes paperless would assign dates in the future to newly consumed documents.
+  * The filename format fields ``{created_month}`` and ``{created_day}`` now use a leading zero for single digit values.
+  * The filename format field ``{tags}`` can no longer be used without arguments.
+  * Paperless was not able to consume many images (especially images from mobile scanners) due to missing DPI information.
+    Paperless now assumes A4 paper size for PDF generation if no DPI information is present.
+  * Documents with empty titles could not be opened from the table view due to the link being empty.
+  * Fixed an issue with filenames containing special characters such as ``:`` not being accepted for upload.
+
+
 paperless-ng 0.9.6
 ##################
 
@@ -841,6 +875,8 @@ bulk of the work on this big change.
 
 * Initial release
 
+.. _rYR79435: https://github.com/rYR79435
+.. _Michael Shamoon: https://github.com/shamoon
 .. _jayme-github: http://github.com/jayme-github
 .. _Brian Conn: https://github.com/TheConnMan
 .. _Christopher Luu: https://github.com/nuudles

From 7dce57b9f76a5684f321d175a921fb6a8da0442f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 14:34:48 +0100
Subject: [PATCH 0237/1300] changelog

---
 docs/changelog.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0e55cb144..84d04bc7a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -17,8 +17,9 @@ paperless-ng 0.9.7
   
   * `Michael Shamoon`_ replaced the document preview with another component. This should fix compatibility with Safari browsers.
 
-  * Paperless now stores your saved views on the server and associates them with your user account. You
-    will have to recreate your views.
+  * Paperless now stores your saved views on the server and associates them with your user account. 
+    This means that you can access your views on multiple devices and have separate views for different users.
+    You will have to recreate your views.
   
 * Other additions and changes
 

From 55075619c10fd1dc3f2e607c4e6e418aa95a1146 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 14:43:07 +0100
Subject: [PATCH 0238/1300] documentation

---
 docs/usage_overview.rst | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/usage_overview.rst b/docs/usage_overview.rst
index bb9ecd452..d6f4cf9db 100644
--- a/docs/usage_overview.rst
+++ b/docs/usage_overview.rst
@@ -57,9 +57,6 @@ Adding documents to paperless
 #############################
 
 Once you've got Paperless setup, you need to start feeding documents into it.
-Currently, there are four options: the consumption directory, the dashboard, IMAP (email), and
-HTTP POST.
-
 When adding documents to paperless, it will perform the following operations on
 your documents:
 
@@ -112,6 +109,17 @@ Dashboard upload
 The dashboard has a file drop field to upload documents to paperless. Simply drag a file
 onto this field or select a file with the file dialog. Multiple files are supported.
 
+
+Mobile upload
+=============
+
+The mobile app over at `<https://github.com/qcasey/paperless_share>`_ allows Android users
+to share any documents with paperless. This can be combined with any of the mobile
+scanning apps out there, such as Office Lens.
+
+The app is still a little rough around the edges,
+but it gets the job done. This will eventually be rolled into `Paperless App <https://github.com/bauerj/paperless_app>`_ as well.
+
 .. _usage-email:
 
 IMAP (Email)

From d208ab1e1299c30a9c98cad98c8810a3f18c6314 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Tue, 15 Dec 2020 15:03:00 +0100
Subject: [PATCH 0239/1300] Update README.md

---
 README.md | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 41f85af19..276521f5b 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 [Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and others that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents.
 
-Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, see below.
+Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, have a look at the changelog in the documentation.
 
 This project is still in development and some things may not work as expected.
 
@@ -15,11 +15,13 @@ This project is still in development and some things may not work as expected.
 
 Paperless does not control your scanner, it only helps you deal with what your scanner produces.
 
-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.
-2. 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.
-3. Have the target server run the Paperless consumption script to OCR the file and index it into a local database.
-4. Use the web frontend to sift through the database and find what you want.
-5. Download the PDF you need/want via the web interface and do whatever you like with it.  You can even print it and send it as if it's the original. In most cases, no one will care or notice.
+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.
+
+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.
+4. Download the PDF you need/want via the web interface and do whatever you like with it.  You can even print it and send it as if it's the original. In most cases, no one will care or notice.
 
 Here's what you get:
 
@@ -39,7 +41,6 @@ Here's what you get:
 	* When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them or delete them.
 * Machine learning powered document matching.
 	* Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless.
-* We have a mobile app that offers a 'Share with paperless' option over at https://github.com/qcasey/paperless_share. You can use that in combination with any of the mobile scanning apps out there. It's still a little rough around the edges, but it works!
 * A task processor that processes documents in parallel and also tells you when something goes wrong. On modern multi core systems, consumption is blazing fast.
 * Code cleanup in many, MANY areas. Some of the code from OG paperless was just overly complicated.
 * More tests, more stability.
@@ -78,7 +79,7 @@ The recommended way to deploy paperless is docker-compose. Don't clone the repos
 
 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 information about the individual components of paperless that you need to take care of.
+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.
 
 # Migrating to paperless-ng
 
@@ -102,13 +103,15 @@ If you want to implement something big: Please start a discussion about that in
 
 Paperless has been around a while now, and people are starting to build stuff on top of it.  If you're one of those people, we can add your project to this list:
 
-* [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless. We're working on making this compatible.
+* [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless. Updated to work with paperless-ng.
+* [Paperless Share](https://github.com/qcasey/paperless_share). Share any files from your Android application with paperless. Very simple, but works with all of the mobile scanning apps out there that allow you to share scanned documents.
+
+These projects also exist, but their status and compatibility with paperless is unknown.
+
 * [Paperless Desktop](https://github.com/thomasbrueggemann/paperless-desktop): A desktop UI for your Paperless installation.  Runs on Mac, Linux, and Windows.
 * [ansible-role-paperless](https://github.com/ovv/ansible-role-paperless): An easy way to get Paperless running via Ansible.
 * [paperless-cli](https://github.com/stgarf/paperless-cli): A golang command line binary to interact with a Paperless instance.
 
-Compatibility with Paperless-ng is unknown.
-
 # Important Note
 
 Document scanners are typically used to scan sensitive documents.  Things like your social insurance number, tax records, invoices, etc.  Everything is stored in the clear without encryption by default (it needs to be searchable, so if someone has ideas on how to do that on encrypted data, I'm all ears).  This means that Paperless should never be run on an untrusted host.  Instead, I recommend that if you do want to use it, run it locally on a server in your own home.

From 02e67d25b46ae17614a6d2f474564b1c10f0f87f Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Tue, 15 Dec 2020 15:03:34 +0100
Subject: [PATCH 0240/1300] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 276521f5b..95dd83752 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,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.
+	- 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.
 
 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.

From 71c58c4b05b4f4e62f4a6fe24a4f8677accbc570 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Tue, 15 Dec 2020 15:04:28 +0100
Subject: [PATCH 0241/1300] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 95dd83752..e8ae8feb2 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,7 @@ Paperless has been around a while now, and people are starting to build stuff on
 * [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless. Updated to work with paperless-ng.
 * [Paperless Share](https://github.com/qcasey/paperless_share). Share any files from your Android application with paperless. Very simple, but works with all of the mobile scanning apps out there that allow you to share scanned documents.
 
-These projects also exist, but their status and compatibility with paperless is unknown.
+These projects also exist, but their status and compatibility with paperless-ng is unknown.
 
 * [Paperless Desktop](https://github.com/thomasbrueggemann/paperless-desktop): A desktop UI for your Paperless installation.  Runs on Mac, Linux, and Windows.
 * [ansible-role-paperless](https://github.com/ovv/ansible-role-paperless): An easy way to get Paperless running via Ansible.

From beffde1051669769d1ab38e63372e0f0ba962638 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 15 Dec 2020 07:10:31 -0800
Subject: [PATCH 0242/1300] quick filter button badges

---
 .../filter-dropdown.component.html                | 15 +++++----------
 .../filter-dropdown.component.scss                |  6 ++++++
 .../filter-editor/filter-editor.component.html    |  8 ++++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 8f7d14e81..d0cbfc3c9 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -1,21 +1,16 @@
 <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #filterDropdown="ngbDropdown">
   <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="itemsSelected?.length > 0 ? 'btn-primary' : 'btn-outline-primary'">
     <div class="d-none d-md-inline">{{title}}</div>
-    <div class="d-inline-block d-md-none" [ngSwitch]="icon">
-      <svg *ngSwitchCase="'person-fill'" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-person-fill" viewBox="0 0 16 16">
-        <path fill-rule="evenodd" d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z" />
-      </svg>
-      <svg *ngSwitchCase="'tag-fill'" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-tags-fill" viewBox="0 0 16 16">
-        <path fill-rule="evenodd" d="M3 1a1 1 0 0 0-1 1v4.586a1 1 0 0 0 .293.707l7 7a1 1 0 0 0 1.414 0l4.586-4.586a1 1 0 0 0 0-1.414l-7-7A1 1 0 0 0 7.586 1H3zm4 3.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z" />
-        <path d="M1 7.086a1 1 0 0 0 .293.707L8.75 15.25l-.043.043a1 1 0 0 1-1.414 0l-7-7A1 1 0 0 1 0 7.586V3a1 1 0 0 1 1-1v5.086z" />
-      </svg>
-      <svg *ngSwitchCase="'file-earmark-fill'" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-file-earmark-fill" viewBox="0 0 16 16">
-        <path fill-rule="evenodd" d="M4 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V4.707A1 1 0 0 0 13.707 4L10 .293A1 1 0 0 0 9.293 0H4zm5.5 1.5v2a1 1 0 0 0 1 1h2l-3-3z" />
     <div class="d-inline-block d-md-none">
       <svg class="toolbaricon" fill="currentColor">
         <use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
       </svg>
     </div>
+    <ng-container *ngIf="itemsSelected?.length > 0">
+      <div class="badge bg-secondary text-light rounded-pill badge-corner">
+        {{itemsSelected?.length}}
+      </div>
+    </ng-container>
   </button>
   <div class="dropdown-menu py-0 shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
index d34729eee..40c93838f 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
@@ -1,3 +1,9 @@
+.badge-corner {
+  position: absolute;
+  top: -8px;
+  right: -8px;
+}
+
 .dropdown-menu {
   min-width: 250px;
 
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 5bf23f8bd..6847a2902 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -8,10 +8,10 @@
   <div class="w-100 d-xl-none"></div>
    <div class="col col-xl-auto mb-2 mb-xl-0">
      <div class="d-flex">
-       <app-filter-dropdown class="mr-2" [items]="tags" [itemsSelected]="selectedTags" title="Tags" icon="tag-fill" (toggle)="toggleTag($event.id)"></app-filter-dropdown>
-       <app-filter-dropdown class="mr-2" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" icon="person-fill" (toggle)="toggleCorrespondent($event.id)"></app-filter-dropdown>
-       <app-filter-dropdown class="mr-2" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document types" icon="file-earmark-fill" (toggle)="toggleDocumentType($event.id)"></app-filter-dropdown>
-       <app-filter-dropdown-date class="mr-2" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (datesSet)="onDatesCreatedSet($event)"></app-filter-dropdown-date>
+       <app-filter-dropdown class="mr-2 mr-md-3" [items]="tags" [itemsSelected]="selectedTags" title="Tags" icon="tag-fill" (toggle)="toggleTag($event.id)"></app-filter-dropdown>
+       <app-filter-dropdown class="mr-2 mr-md-3" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" icon="person-fill" (toggle)="toggleCorrespondent($event.id)"></app-filter-dropdown>
+       <app-filter-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document types" icon="file-earmark-fill" (toggle)="toggleDocumentType($event.id)"></app-filter-dropdown>
+       <app-filter-dropdown-date class="mr-2 mr-md-3" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (datesSet)="onDatesCreatedSet($event)"></app-filter-dropdown-date>
        <app-filter-dropdown-date [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (datesSet)="onDatesAddedSet($event)"></app-filter-dropdown-date>
      </div>
    </div>

From b8469946a82b5ddf5253c6cdf9343d45c566a73a Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 15 Dec 2020 11:09:25 -0800
Subject: [PATCH 0243/1300] Smaller editor, cleaned up responsive flow

---
 .../bulk-editor/bulk-editor.component.html    | 54 +++++++++----------
 .../bulk-editor/bulk-editor.component.scss    |  6 ++-
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 54212923a..22724db17 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -1,67 +1,67 @@
 <div class="card bg-light">
-<div class="card-body px-2 py-2 d-flex justify-content-between flex-wrap align-items-end">
-  <div class="d-flex flex-grow-1 mb-2 mb-lg-0" role="group" aria-label="Select">
-    <label class="d-flex mt-1 mr-auto mr-lg-2">Select:</label>
+<div class="card-body small px-2 py-2 d-flex flex-column flex-xl-row justify-content-between justify-content-xl-start">
+  <div class="d-flex flex-grow-1 flex-xl-grow-0 mb-2 mb-xl-0 mr-xl-5" role="group" aria-label="Select">
+    <label class="d-flex align-self-center my-0 mr-auto mr-lg-2">Select:</label>
     <div class="btn-group d-flex">
-      <button class="btn btn-sm btn-outline-primary" (click)="selectPage.next()">
+      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="selectPage.next()">
         <svg viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#file-earmark-check" />
         </svg>
-        Page
+        <small>Page</small>
       </button>
-      <button class="btn btn-sm btn-outline-primary" (click)="selectAll.next()">
+      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="selectAll.next()">
         <svg viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#check-all" />
         </svg>
-        All
+        <small>All</small>
       </button>
-      <button class="btn btn-sm btn-outline-primary" (click)="selectNone.next()">
+      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="selectNone.next()">
         <svg viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#slash-circle" />
         </svg>
-        None
+        <small>None</small>
       </button>
     </div>
   </div>
-  <div class="d-flex flex-grow-1 mb-2 mb-lg-0" role="group" aria-label="Tags">
-    <label class="d-flex mt-1 mr-auto mr-lg-2">Tags:</label>
+  <div class="d-flex flex-grow-1 flex-xl-grow-0 mb-2 mb-xl-0 mr-xl-5" role="group" aria-label="Tags">
+    <label class="d-flex align-self-center my-0 mr-auto mr-lg-2">Tags:</label>
     <div class="btn-group d-flex">
-      <button class="btn btn-sm btn-outline-primary" (click)="addTag.next()">
+      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="addTag.next()">
         <ng-container *ngTemplateOutlet="add"></ng-container>
       </button>
-      <button class="btn btn-sm btn-outline-primary" (click)="removeTag.next()">
+      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="removeTag.next()">
         <ng-container *ngTemplateOutlet="remove"></ng-container>
       </button>
     </div>
   </div>
-  <div class="d-flex flex-grow-1 mb-2 mb-lg-0" role="group" aria-label="Correspondent">
-    <label class="d-flex mt-1 mr-auto mr-lg-2">Correspondent:</label>
+  <div class="d-flex flex-grow-1 flex-xl-grow-0 mb-2 mb-xl-0 mr-xl-5" role="group" aria-label="Correspondent">
+    <label class="d-flex align-self-center my-0 mr-auto mr-lg-2">Correspondent:</label>
     <div class="btn-group d-flex">
-      <button class="btn btn-sm btn-outline-primary" (click)="setCorrespondent.next()">
+      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="setCorrespondent.next()">
         <ng-container *ngTemplateOutlet="edit"></ng-container>
       </button>
-      <button class="btn btn-sm btn-outline-primary" (click)="removeCorrespondent.next()">
+      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="removeCorrespondent.next()">
         <ng-container *ngTemplateOutlet="remove"></ng-container>
       </button>
     </div>
   </div>
-  <div class="d-flex flex-grow-1 mb-2 mb-lg-0" role="group" aria-label="Document Type">
-    <label class="d-flex mt-1 mr-auto mr-lg-2">Document Type:</label>
+  <div class="d-flex flex-grow-1 flex-xl-grow-0 mb-2 mb-xl-0 mr-xl-5" role="group" aria-label="Document Type">
+    <label class="d-flex align-self-center my-0 mr-auto mr-lg-2">Document Type:</label>
     <div class="btn-group d-flex">
-      <button class="btn btn-sm btn-outline-primary" (click)="setDocumentType.next()">
+      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="setDocumentType.next()">
         <ng-container *ngTemplateOutlet="edit"></ng-container>
       </button>
-      <button class="btn btn-sm btn-outline-primary" (click)="removeDocumentType.next()">
+      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="removeDocumentType.next()">
         <ng-container *ngTemplateOutlet="remove"></ng-container>
       </button>
     </div>
   </div>
-  <div class="d-flex flex-grow-1 mb-2 mb-lg-0" role="group" aria-label="Delete">
-    <button class="btn btn-sm btn-outline-danger ml-auto" (click)="delete.next()">
+  <div class="d-flex flex-grow-1 flex-xl-grow-0 mb-2 mb-lg-0 ml-auto ml-lg-0" role="group" aria-label="Delete">
+    <button class="btn btn-sm btn-outline-danger" (click)="delete.next()">
       <svg viewBox="0 0 16 16" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#trash" />
       </svg>
-      Delete
+      <small>Delete</small>
     </button>
   </div>
 </div>
@@ -71,19 +71,19 @@
   <svg viewBox="0 0 16 16" fill="currentColor">
     <use xlink:href="assets/bootstrap-icons.svg#plus-circle" />
   </svg>
-  Add
+  <small>Add</small>
 </ng-template>
 
 <ng-template #edit>
   <svg viewBox="0 0 16 16" fill="currentColor">
     <use xlink:href="assets/bootstrap-icons.svg#pencil" />
   </svg>
-  Edit
+  <small>Edit</small>
 </ng-template>
 
 <ng-template #remove>
   <svg viewBox="0 0 16 16" fill="currentColor">
     <use xlink:href="assets/bootstrap-icons.svg#x-circle" />
   </svg>
-  Remove
+  <small>Remove</small>
 </ng-template>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss
index 3868e7a02..5afd86545 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss
@@ -1,6 +1,10 @@
 .btn svg {
   width: 0.9em;
   height: 0.9em;
-  margin-right: 2px;
+  margin-right: 3px;
   margin-top: -1px;
 }
+
+.btn-sm {
+  line-height: 1;
+}

From fb9d750684092f40b4d5f5cee565d12ecd15f2f5 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 15 Dec 2020 14:19:40 -0800
Subject: [PATCH 0244/1300] Delete button margin-left

---
 .../document-list/bulk-editor/bulk-editor.component.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 22724db17..d330ba228 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -56,7 +56,7 @@
       </button>
     </div>
   </div>
-  <div class="d-flex flex-grow-1 flex-xl-grow-0 mb-2 mb-lg-0 ml-auto ml-lg-0" role="group" aria-label="Delete">
+  <div class="d-flex flex-grow-1 flex-xl-grow-0 mb-2 mb-lg-0 ml-auto ml-lg-0 ml-xl-auto" role="group" aria-label="Delete">
     <button class="btn btn-sm btn-outline-danger" (click)="delete.next()">
       <svg viewBox="0 0 16 16" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#trash" />

From 677cfb7a1e20032b0755a722759e8c88e70c43f2 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 15 Dec 2020 14:31:18 -0800
Subject: [PATCH 0245/1300] Use bootstrap row-cols-* classes to keep card list
 view full width

---
 .../document-card-small/document-card-small.component.html  | 6 +++---
 .../components/document-list/document-list.component.html   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 2647e702c..da0829349 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,4 +1,4 @@
-<div class="col p-2 h-100" style="width: 16rem;">
+<div class="col p-2 h-100">
   <div class="card h-100 shadow-sm">
     <div class="border-bottom">
       <img class="card-img doc-img" [src]="getThumbUrl()">
@@ -22,7 +22,7 @@
     </div>
     <div class="card-footer">
 
-      <div class="d-flex justify-content-between align-items-center ml-n2">
+      <div class="d-flex justify-content-between align-items-center mx-n2">
         <div class="btn-group">
           <a routerLink="/documents/{{document.id}}" class="btn btn-sm btn-outline-secondary" title="Edit">
             <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-pencil" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -42,7 +42,7 @@
             </svg>
           </a>
         </div>
-        <small class="text-muted">{{document.created | date}}</small>
+        <small class="text-muted pl-1">{{document.created | date}}</small>
       </div>
 
     </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 1b3596098..31b00f482 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -116,6 +116,6 @@
 </table>
 
 
-<div class=" m-n2 row" *ngIf="displayMode == 'smallCards'">
+<div class="m-n2 row row row-cols-2 row-cols-md-3 row-cols-lg-4 row-cols-xl-5" *ngIf="displayMode == 'smallCards'">
   <app-document-card-small [document]="d" *ngFor="let d of list.documents" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
 </div>

From b2a9cf47098f06235e42777baf0cec29ef4807bc Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 15 Dec 2020 23:35:10 +0100
Subject: [PATCH 0246/1300] docs

---
 docs/usage_overview.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/usage_overview.rst b/docs/usage_overview.rst
index d6f4cf9db..7a4fd7740 100644
--- a/docs/usage_overview.rst
+++ b/docs/usage_overview.rst
@@ -117,8 +117,8 @@ The mobile app over at `<https://github.com/qcasey/paperless_share>`_ allows And
 to share any documents with paperless. This can be combined with any of the mobile
 scanning apps out there, such as Office Lens.
 
-The app is still a little rough around the edges,
-but it gets the job done. This will eventually be rolled into `Paperless App <https://github.com/bauerj/paperless_app>`_ as well.
+Furthermore, there is the  `Paperless App <https://github.com/bauerj/paperless_app>`_ as well,
+which no only has document upload, but also document editing and browsing.
 
 .. _usage-email:
 

From 22e56f09baf19fd7d3da5d06cbaa247236225fbf Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 00:14:32 +0100
Subject: [PATCH 0247/1300] fixes some issues regarding #139

---
 .../document-card-large/document-card-large.component.scss       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
index d6be8837e..11fb10562 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
@@ -1,5 +1,6 @@
 .result-content {
   color: darkgray;
+  overflow-wrap: anywhere;
 }
 
 .doc-img {

From 1a526ac31e230d46f37926facb4d302170a5d057 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 02:12:58 +0100
Subject: [PATCH 0248/1300] fixes #140

---
 .../correspondent-list.component.html         | 23 ++++++++++++++++---
 .../correspondent-list.component.ts           | 14 ++++++++++-
 .../document-type-list.component.html         | 21 +++++++++++++++--
 .../document-type-list.component.ts           | 14 ++++++++++-
 .../manage/tag-list/tag-list.component.html   | 23 ++++++++++++++++---
 .../manage/tag-list/tag-list.component.ts     | 15 +++++++++++-
 6 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
index 27aa4d366..2efd1c58d 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
@@ -26,9 +26,26 @@
       <td scope="row">{{ correspondent.last_correspondence | date }}</td>
         <td scope="row">
           <div class="btn-group">
-          <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(correspondent)">Edit</button>
-          <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(correspondent)">Delete</button>
-        </div>
+            <button class="btn btn-sm btn-outline-secondary" (click)="filterDocuments(correspondent)">
+              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-funnel" viewBox="0 0 16 16">
+                <path fill-rule="evenodd" d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2zm1 .5v1.308l4.372 4.858A.5.5 0 0 1 7 8.5v5.306l2-.666V8.5a.5.5 0 0 1 .128-.334L13.5 3.308V2h-11z"/>
+              </svg>
+              Documents
+            </button>
+            <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(correspondent)">
+              <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>
+              Edit
+            </button>
+            <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(correspondent)">
+              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
+                <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
+                <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4L4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
+              </svg>
+              Delete
+            </button>
+          </div>
         </td>
     </tr>
     </tbody>
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
index effae2826..a128340b9 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
@@ -1,6 +1,9 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { FILTER_CORRESPONDENT } from 'src/app/data/filter-rule-type';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
+import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/correspondent-edit-dialog.component';
@@ -12,7 +15,10 @@ import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/co
 })
 export class CorrespondentListComponent extends GenericListComponent<PaperlessCorrespondent> {
 
-  constructor(correspondentsService: CorrespondentService, modalService: NgbModal,) { 
+  constructor(correspondentsService: CorrespondentService, modalService: NgbModal,
+    private router: Router,
+    private list: DocumentListViewService
+  ) { 
     super(correspondentsService,modalService,CorrespondentEditDialogComponent)
   }
 
@@ -20,4 +26,10 @@ export class CorrespondentListComponent extends GenericListComponent<PaperlessCo
     return `correspondent '${object.name}'`
   }
 
+  filterDocuments(object: PaperlessCorrespondent) {
+    this.list.documentListView.filter_rules = [
+      {rule_type: FILTER_CORRESPONDENT, value: object.id.toString()}
+    ]
+    this.router.navigate(["documents"])
+  }
 }
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
index 78c86daf3..d2ffab400 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
@@ -25,8 +25,25 @@
       <td scope="row">{{ document_type.document_count }}</td>
       <td scope="row">
         <div class="btn-group">
-          <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(document_type)">Edit</button>
-          <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(document_type)">Delete</button>
+          <button class="btn btn-sm btn-outline-secondary" (click)="filterDocuments(document_type)">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-funnel" viewBox="0 0 16 16">
+              <path fill-rule="evenodd" d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2zm1 .5v1.308l4.372 4.858A.5.5 0 0 1 7 8.5v5.306l2-.666V8.5a.5.5 0 0 1 .128-.334L13.5 3.308V2h-11z"/>
+            </svg>
+            Documents
+          </button>
+          <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(document_type)">
+            <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>
+            Edit
+          </button>
+          <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(document_type)">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
+              <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
+              <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4L4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
+            </svg>
+            Delete
+          </button>
         </div>
       </td>
     </tr>
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
index 16cdd88a9..d18a19226 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
+import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { FILTER_DOCUMENT_TYPE } from 'src/app/data/filter-rule-type';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
+import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/document-type-edit-dialog.component';
@@ -12,7 +15,10 @@ import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/doc
 })
 export class DocumentTypeListComponent extends GenericListComponent<PaperlessDocumentType> {
 
-  constructor(service: DocumentTypeService, modalService: NgbModal) {
+  constructor(service: DocumentTypeService, modalService: NgbModal,
+    private router: Router,
+    private list: DocumentListViewService
+  ) {
     super(service, modalService, DocumentTypeEditDialogComponent)
   }
 
@@ -20,4 +26,10 @@ export class DocumentTypeListComponent extends GenericListComponent<PaperlessDoc
     return `document type '${object.name}'`
   }
 
+  filterDocuments(object: PaperlessDocumentType) {
+    this.list.documentListView.filter_rules = [
+      {rule_type: FILTER_DOCUMENT_TYPE, value: object.id.toString()}
+    ]
+    this.router.navigate(["documents"])
+  }
 }
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.html b/src-ui/src/app/components/manage/tag-list/tag-list.component.html
index e68b997d1..bbe2c6dd2 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.html
@@ -9,7 +9,7 @@
     aria-label="Default pagination"></ngb-pagination>
 </div>
 
-<table class="table table-striped border shadow">
+<table class="table table-striped border shadow-sm">
   <thead>
     <tr>
       <th scope="col" sortable="name" (sort)="onSort($event)">Name</th>
@@ -28,8 +28,25 @@
       <td scope="row">{{ tag.document_count }}</td>
       <td scope="row">
         <div class="btn-group">
-          <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(tag)">Edit</button>
-          <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(tag)">Delete</button>
+          <button class="btn btn-sm btn-outline-secondary" (click)="filterDocuments(tag)">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-funnel" viewBox="0 0 16 16">
+              <path fill-rule="evenodd" d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2zm1 .5v1.308l4.372 4.858A.5.5 0 0 1 7 8.5v5.306l2-.666V8.5a.5.5 0 0 1 .128-.334L13.5 3.308V2h-11z"/>
+            </svg>
+            Documents
+          </button>
+          <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(tag)">
+            <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>
+            Edit
+          </button>
+          <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(tag)">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
+              <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
+              <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4L4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
+            </svg>
+            Delete
+          </button>
         </div>
       </td>
     </tr>
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
index 32093e0a8..e3f151550 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
+import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { FILTER_HAS_TAG } from 'src/app/data/filter-rule-type';
 import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag';
+import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { TagService } from 'src/app/services/rest/tag.service';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.component';
@@ -12,7 +15,10 @@ import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.compon
 })
 export class TagListComponent extends GenericListComponent<PaperlessTag> {
 
-  constructor(tagService: TagService, modalService: NgbModal) {
+  constructor(tagService: TagService, modalService: NgbModal,
+    private router: Router,
+    private list: DocumentListViewService
+  ) {
     super(tagService, modalService, TagEditDialogComponent)
   }
 
@@ -23,4 +29,11 @@ export class TagListComponent extends GenericListComponent<PaperlessTag> {
   getObjectName(object: PaperlessTag) {
     return `tag '${object.name}'`
   }
+
+  filterDocuments(object: PaperlessTag) {
+    this.list.documentListView.filter_rules = [
+      {rule_type: FILTER_HAS_TAG, value: object.id.toString()}
+    ]
+    this.router.navigate(["documents"])
+  }
 }

From e528a587cc89e6529479d34d6fa3f8a53b9b52bc Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 13:41:02 +0100
Subject: [PATCH 0249/1300] fixed some issues with the test cases.

---
 src/paperless_mail/tests/test_mail.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py
index 2a391a268..9c0f52c53 100644
--- a/src/paperless_mail/tests/test_mail.py
+++ b/src/paperless_mail/tests/test_mail.py
@@ -399,7 +399,7 @@ class TestMail(TestCase):
 
         c = Correspondent.objects.get(name="amazon@amazon.de")
         # should work
-        self.assertEquals(kwargs['override_correspondent_id'], c.id)
+        self.assertEqual(kwargs['override_correspondent_id'], c.id)
 
         self.async_task.reset_mock()
         self.reset_bogus_mailbox()
@@ -411,7 +411,7 @@ class TestMail(TestCase):
 
         args, kwargs = self.async_task.call_args
         self.async_task.assert_called_once()
-        self.assertEquals(kwargs['override_correspondent_id'], None)
+        self.assertEqual(kwargs['override_correspondent_id'], None)
 
 
     def test_filters(self):

From 8bd82f5c69fa4de1ac02d4c29741253ee30311ce Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 13:49:48 +0100
Subject: [PATCH 0250/1300] fixing some test case warnings, case insensitive
 sorting for tags, correspondents and types.

---
 src/documents/models.py                   |  7 ++++++-
 src/documents/tests/test_file_handling.py | 11 ++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/documents/models.py b/src/documents/models.py
index d81343afa..245bba6e9 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -11,6 +11,7 @@ import dateutil.parser
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.db import models
+from django.db.models.functions import Lower
 from django.utils import timezone
 from django.utils.text import slugify
 
@@ -61,7 +62,7 @@ class MatchingModel(models.Model):
 
     class Meta:
         abstract = True
-        ordering = ("name",)
+        ordering = (Lower("name"),)
 
     def __str__(self):
         return self.name
@@ -308,6 +309,10 @@ class Log(models.Model):
 
 class SavedView(models.Model):
 
+    class Meta:
+
+        ordering = (Lower("name"),)
+
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     name = models.CharField(max_length=128)
 
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index dec89c45b..2e60065f1 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -9,6 +9,7 @@ from unittest import mock
 from django.conf import settings
 from django.db import DatabaseError
 from django.test import TestCase, override_settings
+from django.utils import timezone
 
 from .utils import DirectoriesMixin
 from ..file_handling import generate_filename, create_source_path_directory, delete_empty_directories, \
@@ -298,23 +299,23 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{created_year}-{created_month}-{created_day}")
     def test_created_year_month_day(self):
-        d1 = datetime.datetime(2020, 3, 6, 1, 1, 1)
+        d1 = timezone.make_aware(datetime.datetime(2020, 3, 6, 1, 1, 1))
         doc1 = Document.objects.create(title="doc1", mime_type="application/pdf", created=d1)
 
         self.assertEqual(generate_filename(doc1), "2020-03-06.pdf")
 
-        doc1.created = datetime.datetime(2020, 11, 16, 1, 1, 1)
+        doc1.created = timezone.make_aware(datetime.datetime(2020, 11, 16, 1, 1, 1))
 
         self.assertEqual(generate_filename(doc1), "2020-11-16.pdf")
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{added_year}-{added_month}-{added_day}")
     def test_added_year_month_day(self):
-        d1 = datetime.datetime(232, 1, 9, 1, 1, 1)
+        d1 = timezone.make_aware(datetime.datetime(232, 1, 9, 1, 1, 1))
         doc1 = Document.objects.create(title="doc1", mime_type="application/pdf", added=d1)
 
         self.assertEqual(generate_filename(doc1), "232-01-09.pdf")
 
-        doc1.added = datetime.datetime(2020, 11, 16, 1, 1, 1)
+        doc1.added = timezone.make_aware(datetime.datetime(2020, 11, 16, 1, 1, 1))
 
         self.assertEqual(generate_filename(doc1), "2020-11-16.pdf")
 
@@ -599,7 +600,7 @@ class TestFilenameGeneration(TestCase):
         PAPERLESS_FILENAME_FORMAT="{created}"
     )
     def test_date(self):
-        doc = Document.objects.create(title="does not matter", created=datetime.datetime(2020,5,21, 7,36,51, 153), mime_type="application/pdf", pk=2, checksum="2")
+        doc = Document.objects.create(title="does not matter", created=timezone.make_aware(datetime.datetime(2020,5,21, 7,36,51, 153)), mime_type="application/pdf", pk=2, checksum="2")
         self.assertEqual(generate_filename(doc), "2020-05-21.pdf")
 
 

From e47b105185912efc08160d9ee28dc57dae58ef3d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 14:17:05 +0100
Subject: [PATCH 0251/1300] fixes #7 and some test cases.

---
 src/paperless_text/parsers.py | 60 ++++++-----------------------------
 1 file changed, 10 insertions(+), 50 deletions(-)

diff --git a/src/paperless_text/parsers.py b/src/paperless_text/parsers.py
index f8f369ab0..646c5c549 100644
--- a/src/paperless_text/parsers.py
+++ b/src/paperless_text/parsers.py
@@ -1,6 +1,7 @@
 import os
 import subprocess
 
+from PIL import ImageDraw, ImageFont, Image
 from django.conf import settings
 
 from documents.parsers import DocumentParser, ParseError
@@ -12,63 +13,22 @@ class TextDocumentParser(DocumentParser):
     """
 
     def get_thumbnail(self, document_path, mime_type):
-        """
-        The thumbnail of a text file is just a 500px wide image of the text
-        rendered onto a letter-sized page.
-        """
-        # The below is heavily cribbed from https://askubuntu.com/a/590951
-
-        bg_color = "white"  # bg color
-        text_color = "black"  # text color
-        psize = [500, 647]  # icon size
-        n_lines = 50  # number of lines to show
-        out_path = os.path.join(self.tempdir, "convert.png")
-
-        temp_bg = os.path.join(self.tempdir, "bg.png")
-        temp_txlayer = os.path.join(self.tempdir, "tx.png")
-        picsize = "x".join([str(n) for n in psize])
-        txsize = "x".join([str(n - 8) for n in psize])
-
-        def create_bg():
-            work_size = ",".join([str(n - 1) for n in psize])
-            r = str(round(psize[0] / 10))
-            rounded = ",".join([r, r])
-            run_command(
-                settings.CONVERT_BINARY,
-                "-size ", picsize,
-                ' xc:none -draw ',
-                '"fill ', bg_color, ' roundrectangle 0,0,', work_size, ",", rounded, '" ',  # NOQA: E501
-                temp_bg
-            )
 
         def read_text():
             with open(document_path, 'r') as src:
                 lines = [line.strip() for line in src.readlines()]
-                text = "\n".join([line for line in lines[:n_lines]])
+                text = "\n".join([line for line in lines[:50]])
                 return text.replace('"', "'")
 
-        def create_txlayer():
-            run_command(
-                settings.CONVERT_BINARY,
-                "-background none",
-                "-fill",
-                text_color,
-                "-pointsize", "12",
-                "-border 4 -bordercolor none",
-                "-size ", txsize,
-                ' caption:"', read_text(), '" ',
-                temp_txlayer
-            )
+        img = Image.new("RGB", (500, 700), color="white")
+        draw = ImageDraw.Draw(img)
+        font = ImageFont.truetype(
+            "/usr/share/fonts/liberation/LiberationSerif-Regular.ttf", 20,
+            layout_engine=ImageFont.LAYOUT_BASIC)
+        draw.text((5, 5), read_text(), font=font, fill="black")
 
-        create_txlayer()
-        create_bg()
-        run_command(
-            settings.CONVERT_BINARY,
-            temp_bg,
-            temp_txlayer,
-            "-background None -layers merge ",
-            out_path
-        )
+        out_path = os.path.join(self.tempdir, "thumb.png")
+        img.save(out_path)
 
         return out_path
 

From b2e0a8c88401c33077192ce6285057e60e1afd74 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 14:19:11 +0100
Subject: [PATCH 0252/1300] thumbnail generation

---
 src/paperless_text/parsers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/paperless_text/parsers.py b/src/paperless_text/parsers.py
index 646c5c549..7e488ca37 100644
--- a/src/paperless_text/parsers.py
+++ b/src/paperless_text/parsers.py
@@ -17,8 +17,8 @@ class TextDocumentParser(DocumentParser):
         def read_text():
             with open(document_path, 'r') as src:
                 lines = [line.strip() for line in src.readlines()]
-                text = "\n".join([line for line in lines[:50]])
-                return text.replace('"', "'")
+                text = "\n".join(lines[:50])
+                return text
 
         img = Image.new("RGB", (500, 700), color="white")
         draw = ImageDraw.Draw(img)

From 9f5e6d1969f5af9742e0399414a297f81324021c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 14:23:10 +0100
Subject: [PATCH 0253/1300] fixes metadata display

---
 .../components/document-detail/document-detail.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index c0114f709..f4a64c2cc 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -110,8 +110,8 @@
                             </tbody>
                         </table>
 
-                        <app-metadata-collapse title="Original document metadata" [metadata]="metadata.original_metadata" *ngIf="metadata?.original_metadata.length > 0"></app-metadata-collapse>
-                        <app-metadata-collapse title="Archived document metadata" [metadata]="metadata.archive_metadata" *ngIf="metadata?.archive_metadata.length > 0"></app-metadata-collapse>
+                        <app-metadata-collapse title="Original document metadata" [metadata]="metadata.original_metadata" *ngIf="metadata?.original_metadata?.length > 0"></app-metadata-collapse>
+                        <app-metadata-collapse title="Archived document metadata" [metadata]="metadata.archive_metadata" *ngIf="metadata?.archive_metadata?.length > 0"></app-metadata-collapse>
 
                     </ng-template>
                 </li>

From b13ec571f84cef60bd54dab2f59b61650a435b92 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 14:41:57 +0100
Subject: [PATCH 0254/1300] fixes #134

---
 docs/changelog.rst                                           | 2 ++
 src-ui/src/app/components/app-frame/app-frame.component.html | 5 +++++
 src-ui/src/app/components/app-frame/app-frame.component.ts   | 3 +++
 src-ui/src/environments/environment.prod.ts                  | 3 ++-
 src-ui/src/environments/environment.ts                       | 3 ++-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 84d04bc7a..b508bae13 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -28,6 +28,7 @@ paperless-ng 0.9.7
   * The ``document_retagger`` no longer removes inbox tags or tags without matching rules.
   * The new configuration option ``PAPERLESS_COOKIE_PREFIX`` allows you to run multiple instances of paperless on different ports.
     This option enables you to be logged in into multiple instances by specifying different cookie names for each instance.
+  * Added a small version indicator to the front end.
 
 * Fixes
   
@@ -38,6 +39,7 @@ paperless-ng 0.9.7
     Paperless now assumes A4 paper size for PDF generation if no DPI information is present.
   * Documents with empty titles could not be opened from the table view due to the link being empty.
   * Fixed an issue with filenames containing special characters such as ``:`` not being accepted for upload.
+  * Fixed issues with thumbnail generation for plain text files.
 
 
 paperless-ng 0.9.6
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 7876150af..3d315ec32 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -17,6 +17,11 @@
 <div class="container-fluid">
   <div class="row">
     <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse" [ngbCollapse]="isMenuCollapsed">
+
+      <div style="position: absolute; bottom: 0; left: 0;" class="text-muted p-1">
+        {{versionString}}
+      </div>
+
       <div class="sidebar-sticky pt-3">
         <ul class="nav flex-column">
           <li class="nav-item">
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts
index ef859bf35..c4c00843d 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.ts
+++ b/src-ui/src/app/components/app-frame/app-frame.component.ts
@@ -7,6 +7,7 @@ import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { OpenDocumentsService } from 'src/app/services/open-documents.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { SearchService } from 'src/app/services/rest/search.service';
+import { environment } from 'src/environments/environment';
 import { DocumentDetailComponent } from '../document-detail/document-detail.component';
   
 @Component({
@@ -25,6 +26,8 @@ export class AppFrameComponent implements OnInit, OnDestroy {
     ) {
   }
 
+  versionString = `${environment.appTitle} ${environment.version}`
+
   isMenuCollapsed: boolean = true
 
   closeMenu() {
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 09154dfca..38699670e 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -1,5 +1,6 @@
 export const environment = {
   production: true,
   apiBaseUrl: "/api/",
-  appTitle: "Paperless-ng"
+  appTitle: "Paperless-ng",
+  version: "0.9.7"
 };
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts
index 5e4b148dc..29a8f3af6 100644
--- a/src-ui/src/environments/environment.ts
+++ b/src-ui/src/environments/environment.ts
@@ -5,7 +5,8 @@
 export const environment = {
   production: false,
   apiBaseUrl: "http://localhost:8000/api/",
-  appTitle: "DEVELOPMENT P-NG"
+  appTitle: "Paperless-ng",
+  version: "DEVELOPMENT"
 };
 
 /*

From 0e78f32009ae97d7b91531f2dabb3b5bd210fc29 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 16:04:20 +0100
Subject: [PATCH 0255/1300] fixed an issue with the settings not saving in case
 no saved views are present

---
 .../manage/settings/settings.component.ts     | 20 ++++++++++++++-----
 .../services/document-list-view.service.ts    |  4 ++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 41bb21156..f839010b1 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -50,16 +50,26 @@ export class SettingsComponent implements OnInit {
     })
   }
 
+  private saveLocalSettings() {
+    localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
+    this.documentListViewService.updatePageSize()
+    this.toastService.showToast(Toast.make("Information", "Settings saved successfully."))
+  }
+
   saveSettings() {
     let x = []
     for (let id in this.savedViewGroup.value) {
       x.push(this.savedViewGroup.value[id])
     }
-    this.savedViewService.patchMany(x).subscribe(s => {
-      this.toastService.showToast(Toast.make("Information", "Settings saved successfully."))
-      localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
-      this.documentListViewService.updatePageSize()
-    })
+    if (x.length > 0) {
+      this.savedViewService.patchMany(x).subscribe(s => {
+        this.saveLocalSettings()
+      }, error => {
+        this.toastService.showToast(Toast.makeError(`Error while storing settings on server: ${JSON.stringify(error.error)}`))
+      })
+    } else {
+      this.saveLocalSettings()
+    }
 
   }
 }
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 7405fcd24..a549f373d 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -116,13 +116,13 @@ export class DocumentListViewService {
   set filterRules(filterRules: FilterRule[]) {
     //we're going to clone the filterRules object, since we don't
     //want changes in the filter editor to propagate into here right away.
-    this.view.filter_rules = cloneFilterRules(filterRules)
+    this.view.filter_rules = filterRules
     this.reload()
     this.saveDocumentListView()
   }
 
   get filterRules(): FilterRule[] {
-    return cloneFilterRules(this.view.filter_rules)
+    return this.view.filter_rules
   }
 
   set sortField(field: string) {

From 6b60501dc7dd060df8ba68b999a7c14fe46ad410 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 16:04:25 +0100
Subject: [PATCH 0256/1300] changelog

---
 docs/changelog.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b508bae13..4c72b45bf 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -17,10 +17,12 @@ paperless-ng 0.9.7
   
   * `Michael Shamoon`_ replaced the document preview with another component. This should fix compatibility with Safari browsers.
 
+  * Added buttons to the management pages to quickly show all documents with one specific tag, correspondent, or title.
+  
   * Paperless now stores your saved views on the server and associates them with your user account. 
     This means that you can access your views on multiple devices and have separate views for different users.
     You will have to recreate your views.
-  
+
 * Other additions and changes
 
   * The GitHub and documentation links now open in new tabs/windows. Thanks to `rYR79435`_.

From dec17a3b9b92b5db8f76d7647cf497ef9273f53b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 16:19:12 +0100
Subject: [PATCH 0257/1300] fixes a one time issue when migrating to the new
 version.

---
 src-ui/src/app/services/document-list-view.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index a549f373d..57d0a3f0e 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -201,7 +201,7 @@ export class DocumentListViewService {
         this.documentListView = null
       }
     }
-    if (!this.documentListView) {
+    if (!this.documentListView || !this.documentListView.filter_rules || !this.documentListView.sort_reverse || !this.documentListView.sort_field) {
       this.documentListView = {
         filter_rules: [],
         sort_reverse: true,

From 8e339789faea8fb32a9113dfaf649fae22f0b8f3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 16:44:54 +0100
Subject: [PATCH 0258/1300] more fixes regarding empty titles

---
 src-ui/src/app/app.module.ts                                | 3 ++-
 .../src/app/components/app-frame/app-frame.component.html   | 2 +-
 .../saved-view-widget/saved-view-widget.component.html      | 2 +-
 .../components/document-detail/document-detail.component.ts | 6 ++++--
 src-ui/src/app/pipes/document-title.pipe.ts                 | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index f935b7701..3c00cd0b7 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -119,7 +119,8 @@ import { MetadataCollapseComponent } from './components/document-detail/metadata
       useClass: CsrfInterceptor,
       multi: true
     },
-    FilterPipe
+    FilterPipe,
+    DocumentTitlePipe
   ],
   bootstrap: [AppComponent]
 })
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 3d315ec32..2458005f4 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -65,7 +65,7 @@
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#file-text"/>
               </svg>
-              {{d.title}}
+              {{d.title | documentTitle}}
             </a>
           </li>
           <li class="nav-item w-100" *ngIf="openDocuments.length > 1">
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
index 194497d39..f50708af3 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
@@ -13,7 +13,7 @@
     <tbody>
       <tr *ngFor="let doc of documents" routerLink="/documents/{{doc.id}}">
         <td>{{doc.created | date}}</td>
-        <td>{{doc.title}}<app-tag [tag]="t" *ngFor="let t of doc.tags$ | async" class="ml-1"></app-tag>
+        <td>{{doc.title | documentTitle}}<app-tag [tag]="t" *ngFor="let t of doc.tags$ | async" class="ml-1"></app-tag>
       </tr>
     </tbody>
   </table>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 5fe9f9250..b4005b920 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -6,6 +6,7 @@ import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { PaperlessDocumentMetadata } from 'src/app/data/paperless-document-metadata';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
+import { DocumentTitlePipe } from 'src/app/pipes/document-title.pipe';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { OpenDocumentsService } from 'src/app/services/open-documents.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
@@ -54,7 +55,8 @@ export class DocumentDetailComponent implements OnInit {
     private router: Router,
     private modalService: NgbModal,
     private openDocumentService: OpenDocumentsService,
-    private documentListViewService: DocumentListViewService) { }
+    private documentListViewService: DocumentListViewService,
+    private documentTitlePipe: DocumentTitlePipe) { }
 
   getContentType() {
     return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type
@@ -90,7 +92,7 @@ export class DocumentDetailComponent implements OnInit {
     this.documentsService.getMetadata(doc.id).subscribe(result => {
       this.metadata = result
     })
-    this.title = doc.title
+    this.title = this.documentTitlePipe.transform(doc.title)
     this.documentForm.patchValue(doc)
   }
 
diff --git a/src-ui/src/app/pipes/document-title.pipe.ts b/src-ui/src/app/pipes/document-title.pipe.ts
index 09445f595..621562d39 100644
--- a/src-ui/src/app/pipes/document-title.pipe.ts
+++ b/src-ui/src/app/pipes/document-title.pipe.ts
@@ -5,7 +5,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 })
 export class DocumentTitlePipe implements PipeTransform {
 
-  transform(value: string): unknown {
+  transform(value: string): string {
     if (value) {
       return value
     } else {

From 28f45d8f159d82e68fe1b10ef2127065de95966a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 16:59:26 +0100
Subject: [PATCH 0259/1300] fixes an issue with the date dropdowns

---
 .../filter-dropdown-date/filter-dropdown-date.component.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index 806027f9c..91402d084 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -1,7 +1,6 @@
 import { Component, EventEmitter, Input, Output, ElementRef, ViewChild, SimpleChange } from '@angular/core';
 import { NgbDate, NgbDateStruct, NgbDatepicker } from '@ng-bootstrap/ng-bootstrap';
 
-
 export interface DateSelection {
   before?: NgbDateStruct
   after?: NgbDateStruct
@@ -72,7 +71,6 @@ export class FilterDropdownDateComponent {
   }
 
   setDateQuickFilter(range: any) {
-    this._dateAfter = this._dateBefore = undefined
     let date = new Date()
     let newDate: NgbDateStruct = { year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate() }
     switch (typeof range) {
@@ -92,18 +90,23 @@ export class FilterDropdownDateComponent {
         break
     }
     this._dateAfter = newDate
+    this._dateBefore = null
     this.datesSet.emit({after: newDate, before: null})
   }
 
   onBeforeSelected(date: NgbDateStruct) {
+    this._dateBefore = date
     this.datesSet.emit({after: this._dateAfter, before: date})
   }
 
   onAfterSelected(date: NgbDateStruct) {
+    this._dateAfter = date
     this.datesSet.emit({after: date, before: this._dateBefore})
   }
 
   clear() {
+    this._dateBefore = null
+    this._dateAfter = null
     this.datesSet.emit({after: null, before: null})
   }
 }

From c813c020253e8dc03db85ebd501ed4c2e7edc7e9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 17:01:20 +0100
Subject: [PATCH 0260/1300] version increment.

---
 docker/hub/docker-compose.postgres.yml | 2 +-
 docker/hub/docker-compose.sqlite.yml   | 2 +-
 scripts/make-release.sh                | 1 +
 src/paperless/version.py               | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index 24f0e118f..6ab4b94a6 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.6
+    image: jonaswinkler/paperless-ng:0.9.7
     restart: always
     depends_on:
       - db
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index 6ae619fd6..4e1da3e10 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.6
+    image: jonaswinkler/paperless-ng:0.9.7
     restart: always
     depends_on:
       - broker
diff --git a/scripts/make-release.sh b/scripts/make-release.sh
index 0a7bc7a9b..f5c9028fa 100755
--- a/scripts/make-release.sh
+++ b/scripts/make-release.sh
@@ -5,6 +5,7 @@
 # adjust src/paperless/version.py
 # changelog in the documentation
 # adjust versions in docker/hub/*
+# adjust version in src-ui/src/environments/prod
 # If docker-compose was modified: all compose files are the same.
 
 # Steps:
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 527e0668d..3c8636a10 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (0, 9, 6)
+__version__ = (0, 9, 7)

From 062f8e5a730b248e638742588dceea16f27968eb Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 17:47:34 +0100
Subject: [PATCH 0261/1300] update save filter picture

---
 src-ui/src/assets/save-filter.png | Bin 8267 -> 8263 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src-ui/src/assets/save-filter.png b/src-ui/src/assets/save-filter.png
index dcaa41714c78a70b8568e162a0e8afac86fe8168..0f011f8127280d88db5970d30e23570765fa5cc9 100644
GIT binary patch
literal 8263
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
W9G(85(c8@c7<p;skJXZ<KmH4vU+PT&

literal 8267
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
BL(BjG


From 50aedc109401cc8707fea87489a98d717c7c515c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 17:52:43 +0100
Subject: [PATCH 0262/1300] fixed an issue with clickable types and
 correspondents on the docment table list

---
 .../app/components/document-list/document-list.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 3bb7e00c7..5c09f6c13 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -93,7 +93,7 @@
       </td>
       <td class="d-none d-md-table-cell">
         <ng-container *ngIf="d.correspondent">
-          <a [routerLink]="" (click)="clickCorrespondent(d.correspondent.id)" title="Filter by correspondent">{{(d.correspondent$ | async)?.name}}</a>
+          <a [routerLink]="" (click)="clickCorrespondent(d.correspondent)" title="Filter by correspondent">{{(d.correspondent$ | async)?.name}}</a>
         </ng-container>
       </td>
       <td>
@@ -102,7 +102,7 @@
       </td>
       <td class="d-none d-xl-table-cell">
         <ng-container *ngIf="d.document_type">
-          <a [routerLink]="" (click)="clickDocumentType(d.document_type.id)" title="Filter by document type">{{(d.document_type$ | async)?.name}}</a>
+          <a [routerLink]="" (click)="clickDocumentType(d.document_type)" title="Filter by document type">{{(d.document_type$ | async)?.name}}</a>
         </ng-container>
       </td>
       <td>

From e4ec52ed29d5c3e5aa6cf3dde8e9119a4b56eae0 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 18:16:14 +0100
Subject: [PATCH 0263/1300] default saved view names

---
 .../document-list/document-list.component.ts  |  2 ++
 .../save-view-config-dialog.component.ts      | 15 +++++++++++++-
 .../filter-editor/filter-editor.component.ts  | 20 +++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 4b711f9dc..25d92e9db 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { FILTER_CORRESPONDENT } from 'src/app/data/filter-rule-type';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
@@ -83,6 +84,7 @@ export class DocumentListComponent implements OnInit {
 
   saveViewConfigAs() {
     let modal = this.modalService.open(SaveViewConfigDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.defaultName = this.filterEditor.generateFilterName()
     modal.componentInstance.saveClicked.subscribe(formValue => {
       let savedView = {
         name: formValue.name,
diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
index 284be49f6..8f0eb26f2 100644
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
@@ -14,6 +14,19 @@ export class SaveViewConfigDialogComponent implements OnInit {
   @Output()
   public saveClicked = new EventEmitter()
 
+  _defaultName = ""
+
+  get defaultName() {
+    return this._defaultName
+  }
+
+  @Input()
+  set defaultName(value: string) {
+    this._defaultName = value
+    this.saveViewConfigForm.patchValue({name: value})
+  }
+  
+
   saveViewConfigForm = new FormGroup({
     name: new FormControl(''),
     showInSideBar: new FormControl(false),
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index a11f0736a..f762c6138 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -19,6 +19,26 @@ import { DateSelection } from './filter-dropdown-date/filter-dropdown-date.compo
 })
 export class FilterEditorComponent implements OnInit, OnDestroy {
 
+  generateFilterName() {
+    if (this.filterRules.length == 1) {
+      let rule = this.filterRules[0]
+      switch(this.filterRules[0].rule_type) {
+        
+        case FILTER_CORRESPONDENT:
+          return `Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}`
+
+        case FILTER_DOCUMENT_TYPE:
+          return `Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}`
+
+        case FILTER_HAS_TAG:
+          return `Tag: ${this.tags.find(t => t.id == +rule.value)?.name}`
+
+      }
+    }
+
+    return ""
+  }
+
   constructor(
     private documentTypeService: DocumentTypeService,
     private tagService: TagService,

From 69c04a209acad8493c69b7450e9d9e06582aae18 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 18:18:01 +0100
Subject: [PATCH 0264/1300] changelog

---
 docs/changelog.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4c72b45bf..330dd4cc9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -23,14 +23,18 @@ paperless-ng 0.9.7
     This means that you can access your views on multiple devices and have separate views for different users.
     You will have to recreate your views.
 
+  * The GitHub and documentation links now open in new tabs/windows. Thanks to `rYR79435`_.
+
+  * Paperless now generates default saved view names when saving views with certain filter rules.
+
+  * Added a small version indicator to the front end.
+
 * Other additions and changes
 
-  * The GitHub and documentation links now open in new tabs/windows. Thanks to `rYR79435`_.
   * The new filename format field ``{tag_list}`` inserts a list of tags into the filename, separated by comma.
   * The ``document_retagger`` no longer removes inbox tags or tags without matching rules.
   * The new configuration option ``PAPERLESS_COOKIE_PREFIX`` allows you to run multiple instances of paperless on different ports.
     This option enables you to be logged in into multiple instances by specifying different cookie names for each instance.
-  * Added a small version indicator to the front end.
 
 * Fixes
   

From ecfae9dadd7a592df2c1a98ac3e1f3f6f03d12cd Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 18:40:19 +0100
Subject: [PATCH 0265/1300] fixed some issues with the ordering, test cases and
 migrations.

---
 src/documents/checks.py                       |  3 +-
 .../migrations/1008_auto_20201216_1736.py     | 34 +++++++++++++++++++
 src/documents/models.py                       |  6 +---
 src/documents/tests/test_api.py               |  9 ++---
 4 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 src/documents/migrations/1008_auto_20201216_1736.py

diff --git a/src/documents/checks.py b/src/documents/checks.py
index 3e3ddb1fb..b6da5bfc9 100644
--- a/src/documents/checks.py
+++ b/src/documents/checks.py
@@ -2,6 +2,7 @@ import textwrap
 
 from django.conf import settings
 from django.core.checks import Error, register
+from django.core.exceptions import FieldError
 from django.db.utils import OperationalError, ProgrammingError
 
 from documents.signals import document_consumer_declaration
@@ -16,7 +17,7 @@ def changed_password_check(app_configs, **kwargs):
     try:
         encrypted_doc = Document.objects.filter(
             storage_type=Document.STORAGE_TYPE_GPG).first()
-    except (OperationalError, ProgrammingError):
+    except (OperationalError, ProgrammingError, FieldError):
         return []  # No documents table yet
 
     if encrypted_doc:
diff --git a/src/documents/migrations/1008_auto_20201216_1736.py b/src/documents/migrations/1008_auto_20201216_1736.py
new file mode 100644
index 000000000..d94f4767f
--- /dev/null
+++ b/src/documents/migrations/1008_auto_20201216_1736.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.1.4 on 2020-12-16 17:36
+
+from django.db import migrations
+import django.db.models.functions.text
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '1007_savedview_savedviewfilterrule'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='correspondent',
+            options={'ordering': (django.db.models.functions.text.Lower('name'),)},
+        ),
+        migrations.AlterModelOptions(
+            name='document',
+            options={'ordering': ('-created',)},
+        ),
+        migrations.AlterModelOptions(
+            name='documenttype',
+            options={'ordering': (django.db.models.functions.text.Lower('name'),)},
+        ),
+        migrations.AlterModelOptions(
+            name='savedview',
+            options={'ordering': (django.db.models.functions.text.Lower('name'),)},
+        ),
+        migrations.AlterModelOptions(
+            name='tag',
+            options={'ordering': (django.db.models.functions.text.Lower('name'),)},
+        ),
+    ]
diff --git a/src/documents/models.py b/src/documents/models.py
index 245bba6e9..02a293eeb 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -13,7 +13,6 @@ from django.contrib.auth.models import User
 from django.db import models
 from django.db.models.functions import Lower
 from django.utils import timezone
-from django.utils.text import slugify
 
 from documents.file_handling import archive_name_from_filename
 from documents.parsers import get_default_file_extension
@@ -80,9 +79,6 @@ class Correspondent(MatchingModel):
     # better safe than sorry.
     SAFE_REGEX = re.compile(r"^[\w\- ,.']+$")
 
-    class Meta:
-        ordering = ("name",)
-
 
 class Tag(MatchingModel):
 
@@ -206,7 +202,7 @@ class Document(models.Model):
     )
 
     class Meta:
-        ordering = ("correspondent", "title")
+        ordering = ("-created",)
 
     def __str__(self):
         created = datetime.date.isoformat(self.created)
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index e0a64664f..49dddee87 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -169,15 +169,13 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 200)
         results = response.data['results']
         self.assertEqual(len(results), 2)
-        self.assertEqual(results[0]['id'], doc2.id)
-        self.assertEqual(results[1]['id'], doc3.id)
+        self.assertCountEqual([results[0]['id'], results[1]['id']], [doc2.id, doc3.id])
 
         response = self.client.get("/api/documents/?tags__id__in={},{}".format(tag_inbox.id, tag_3.id))
         self.assertEqual(response.status_code, 200)
         results = response.data['results']
         self.assertEqual(len(results), 2)
-        self.assertEqual(results[0]['id'], doc1.id)
-        self.assertEqual(results[1]['id'], doc3.id)
+        self.assertCountEqual([results[0]['id'], results[1]['id']], [doc1.id, doc3.id])
 
         response = self.client.get("/api/documents/?tags__id__all={},{}".format(tag_2.id, tag_3.id))
         self.assertEqual(response.status_code, 200)
@@ -199,8 +197,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 200)
         results = response.data['results']
         self.assertEqual(len(results), 2)
-        self.assertEqual(results[0]['id'], doc1.id)
-        self.assertEqual(results[1]['id'], doc2.id)
+        self.assertCountEqual([results[0]['id'], results[1]['id']], [doc1.id, doc2.id])
 
         response = self.client.get("/api/documents/?tags__id__none={},{}".format(tag_3.id, tag_2.id))
         self.assertEqual(response.status_code, 200)

From ece94379d899c9be3e55e8f3462864deb0a5271e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 19:35:21 +0100
Subject: [PATCH 0266/1300] fixes #143

---
 .../components/manage/generic-list/generic-list.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
index 76a92e4e9..783c22b36 100644
--- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
+++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
@@ -95,7 +95,7 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
     activeModal.componentInstance.message = "Associated documents will not be deleted."
     activeModal.componentInstance.btnClass = "btn-danger"
     activeModal.componentInstance.btnCaption = "Delete"
-    activeModal.componentInstance.confirmPressed.subscribe(() => {
+    activeModal.componentInstance.confirmClicked.subscribe(() => {
       this.service.delete(object).subscribe(_ => {
         activeModal.close()
         this.reloadData()

From 7f933d373f4639bf26379a8114013ab74bce6bf9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 19:50:38 +0100
Subject: [PATCH 0267/1300] fixes the decryption command not working.

---
 .../management/commands/decrypt_documents.py        | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/documents/management/commands/decrypt_documents.py b/src/documents/management/commands/decrypt_documents.py
index 918f1a175..8f5c2e123 100644
--- a/src/documents/management/commands/decrypt_documents.py
+++ b/src/documents/management/commands/decrypt_documents.py
@@ -2,7 +2,6 @@ import os
 
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
-from termcolor import colored as coloured
 
 from documents.models import Document
 from paperless.db import GnuPG
@@ -26,16 +25,14 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
 
         try:
-            print(coloured(
+            print(
                 "\n\nWARNING: This script is going to work directly on your "
                 "document originals, so\nWARNING: you probably shouldn't run "
                 "this unless you've got a recent backup\nWARNING: handy.  It "
                 "*should* work without a hitch, but be safe and backup your\n"
                 "WARNING: stuff first.\n\nHit Ctrl+C to exit now, or Enter to "
-                "continue.\n\n",
-                "yellow",
-                attrs=("bold",)
-            ))
+                "continue.\n\n"
+            )
             __ = input()
         except KeyboardInterrupt:
             return
@@ -57,8 +54,8 @@ class Command(BaseCommand):
 
         for document in encrypted_files:
 
-            print(coloured("Decrypting {}".format(
-                document).encode('utf-8'), "green"))
+            print("Decrypting {}".format(
+                document).encode('utf-8'))
 
             old_paths = [document.source_path, document.thumbnail_path]
 

From cf3fa50b55cb1ddd88921fc25b054b8cb5e8b38c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 21:08:03 +0100
Subject: [PATCH 0268/1300] these changes shouldn't have been commited at all.
 my bad.

---
 src/documents/admin.py                        |  2 +-
 .../migrations/1009_auto_20201216_2005.py     | 29 +++++++++++++++++++
 src/documents/models.py                       |  5 ++--
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 src/documents/migrations/1009_auto_20201216_2005.py

diff --git a/src/documents/admin.py b/src/documents/admin.py
index 6ec3b736e..78437f91c 100755
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -69,7 +69,7 @@ class DocumentAdmin(admin.ModelAdmin):
 
     filter_horizontal = ("tags",)
 
-    ordering = ["-created", "correspondent"]
+    ordering = ["-created"]
 
     date_hierarchy = "created"
 
diff --git a/src/documents/migrations/1009_auto_20201216_2005.py b/src/documents/migrations/1009_auto_20201216_2005.py
new file mode 100644
index 000000000..5e8302bb0
--- /dev/null
+++ b/src/documents/migrations/1009_auto_20201216_2005.py
@@ -0,0 +1,29 @@
+# Generated by Django 3.1.4 on 2020-12-16 20:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '1008_auto_20201216_1736'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='correspondent',
+            options={'ordering': ('name',)},
+        ),
+        migrations.AlterModelOptions(
+            name='documenttype',
+            options={'ordering': ('name',)},
+        ),
+        migrations.AlterModelOptions(
+            name='savedview',
+            options={'ordering': ('name',)},
+        ),
+        migrations.AlterModelOptions(
+            name='tag',
+            options={'ordering': ('name',)},
+        ),
+    ]
diff --git a/src/documents/models.py b/src/documents/models.py
index 02a293eeb..cede29b8e 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -11,7 +11,6 @@ import dateutil.parser
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.db import models
-from django.db.models.functions import Lower
 from django.utils import timezone
 
 from documents.file_handling import archive_name_from_filename
@@ -61,7 +60,7 @@ class MatchingModel(models.Model):
 
     class Meta:
         abstract = True
-        ordering = (Lower("name"),)
+        ordering = ("name",)
 
     def __str__(self):
         return self.name
@@ -307,7 +306,7 @@ class SavedView(models.Model):
 
     class Meta:
 
-        ordering = (Lower("name"),)
+        ordering = ("name",)
 
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     name = models.CharField(max_length=128)

From 5c310c51d42c5c69a924e8f4887be25cfbe84e4d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 21:08:41 +0100
Subject: [PATCH 0269/1300] fix up the migration for encrypted documents.

---
 src/documents/migrations/1003_mime_types.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/documents/migrations/1003_mime_types.py b/src/documents/migrations/1003_mime_types.py
index 1038d57b3..e5e613735 100644
--- a/src/documents/migrations/1003_mime_types.py
+++ b/src/documents/migrations/1003_mime_types.py
@@ -6,13 +6,17 @@ import magic
 from django.conf import settings
 from django.db import migrations, models
 
+from paperless.db import GnuPG
+
+STORAGE_TYPE_UNENCRYPTED = "unencrypted"
+STORAGE_TYPE_GPG = "gpg"
 
 def source_path(self):
     if self.filename:
         fname = str(self.filename)
     else:
         fname = "{:07}.{}".format(self.pk, self.file_type)
-        if self.storage_type == self.STORAGE_TYPE_GPG:
+        if self.storage_type == STORAGE_TYPE_GPG:
             fname += ".gpg"
 
     return os.path.join(
@@ -26,9 +30,16 @@ def add_mime_types(apps, schema_editor):
     documents = Document.objects.all()
 
     for d in documents:
-        d.mime_type = magic.from_file(source_path(d), mime=True)
+        if d.storage_type == STORAGE_TYPE_GPG:
+            f = GnuPG.decrypted(open(source_path(d), "rb"))
+        else:
+            f = open(source_path(d), "rb")
+
+        d.mime_type = magic.from_buffer(f.read(1024), mime=True)
         d.save()
 
+        f.close()
+
 
 def add_file_extensions(apps, schema_editor):
     Document = apps.get_model("documents", "Document")

From aa8789ae31c6f4fb0e8060be5618cf44381db6cd Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 21:53:11 +0100
Subject: [PATCH 0270/1300] fix up the migration for encrypted documents and a
 couple other associated issues.

---
 src/documents/migrations/1003_mime_types.py | 10 ++++++----
 src/documents/views.py                      | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/documents/migrations/1003_mime_types.py b/src/documents/migrations/1003_mime_types.py
index e5e613735..78ecced2b 100644
--- a/src/documents/migrations/1003_mime_types.py
+++ b/src/documents/migrations/1003_mime_types.py
@@ -30,12 +30,14 @@ def add_mime_types(apps, schema_editor):
     documents = Document.objects.all()
 
     for d in documents:
+        f = open(source_path(d), "rb")
         if d.storage_type == STORAGE_TYPE_GPG:
-            f = GnuPG.decrypted(open(source_path(d), "rb"))
-        else:
-            f = open(source_path(d), "rb")
 
-        d.mime_type = magic.from_buffer(f.read(1024), mime=True)
+            data = GnuPG.decrypted(f)
+        else:
+            data = f.read(1024)
+
+        d.mime_type = magic.from_buffer(data, mime=True)
         d.save()
 
         f.close()
diff --git a/src/documents/views.py b/src/documents/views.py
index 36d3445c4..bf31c749b 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -169,7 +169,12 @@ class DocumentViewSet(RetrieveModelMixin,
         parser_class = get_parser_class_for_mime_type(mime_type)
         if parser_class:
             parser = parser_class(logging_group=None)
-            return parser.extract_metadata(file, mime_type)
+
+            try:
+                return parser.extract_metadata(file, mime_type)
+            except Exception as e:
+                # TODO: cover GPG errors, remove later.
+                return []
         else:
             return []
 
@@ -215,7 +220,12 @@ class DocumentViewSet(RetrieveModelMixin,
     @cache_control(public=False, max_age=315360000)
     def thumb(self, request, pk=None):
         try:
-            return HttpResponse(Document.objects.get(id=pk).thumbnail_file,
+            doc = Document.objects.get(id=pk)
+            if doc.storage_type == Document.STORAGE_TYPE_GPG:
+                handle = GnuPG.decrypted(doc.thumbnail_file)
+            else:
+                handle = doc.thumbnail_file
+            return HttpResponse(handle,
                                 content_type='image/png')
         except (FileNotFoundError, Document.DoesNotExist):
             raise Http404()

From e9affbc1cf2b7588fceeb75ef4d33df841f43380 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 22:33:03 +0100
Subject: [PATCH 0271/1300] revert the changes that caused issues in the admin.

---
 src/documents/models.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/documents/models.py b/src/documents/models.py
index cede29b8e..3a6d155ed 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -78,6 +78,9 @@ class Correspondent(MatchingModel):
     # better safe than sorry.
     SAFE_REGEX = re.compile(r"^[\w\- ,.']+$")
 
+    class Meta:
+        ordering = ("name",)
+
 
 class Tag(MatchingModel):
 

From eaf11ea134624d387c1c47928344d4d0ce70a2f3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 22:39:13 +0100
Subject: [PATCH 0272/1300] changelog and versions

---
 docker/hub/docker-compose.postgres.yml      | 2 +-
 docker/hub/docker-compose.sqlite.yml        | 2 +-
 docs/changelog.rst                          | 9 +++++++++
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index 6ab4b94a6..d33e4c38d 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.7
+    image: jonaswinkler/paperless-ng:0.9.8
     restart: always
     depends_on:
       - db
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index 4e1da3e10..c130dfef6 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.7
+    image: jonaswinkler/paperless-ng:0.9.8
     restart: always
     depends_on:
       - broker
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 330dd4cc9..a993eb530 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,15 @@ Changelog
 *********
 
 
+paperless-ng 0.9.8
+##################
+
+This release addresses two severe issues with the previous release.
+
+* The delete buttons for document types, correspondents and tags were not working.
+* The document section in the admin was causing internal server errors (500).
+
+
 paperless-ng 0.9.7
 ##################
 
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 38699670e..f12c6a7cb 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,5 +2,5 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "0.9.7"
+  version: "0.9.8"
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 3c8636a10..10283c145 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (0, 9, 7)
+__version__ = (0, 9, 8)

From 70347bb8f3f2e6e91df8a726d94e465621705ab1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 16 Dec 2020 23:26:29 +0100
Subject: [PATCH 0273/1300] added a note to the documentation regarding
 character limits of PostgreSQL

---
 docs/setup.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/setup.rst b/docs/setup.rst
index e5e6526ea..e20b2e54a 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -460,6 +460,15 @@ management commands as below.
     load data from an old database schema in SQLite into a newer database
     schema in PostgreSQL, you will run into trouble.
 
+.. warning::
+
+    On some database fields, PostgreSQL enforces predefined limits on maximum
+    length, whereas SQLite does not. The fields in question are the title of documents
+    (128 characters), names of document types, tags and correspondents (128 characters),
+    and filenames (1024 characters). If you have data in these fields that surpasses these
+    limits, migration to PostgreSQL is not possible and will fail with an error.
+
+
 1.  Stop paperless, if it is running.
 2.  Tell paperless to use PostgreSQL:
 

From fbca412d309725f7dd1b1fc03c94b08b88da8218 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 16 Dec 2020 16:18:41 -0800
Subject: [PATCH 0274/1300] Add more card columns on very large screens

---
 .../document-list.component.html              |  2 +-
 .../document-list.component.scss              | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 31b00f482..0b98a5633 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -116,6 +116,6 @@
 </table>
 
 
-<div class="m-n2 row row row-cols-2 row-cols-md-3 row-cols-lg-4 row-cols-xl-5" *ngIf="displayMode == 'smallCards'">
+<div class="m-n2 row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'">
   <app-document-card-small [document]="d" *ngFor="let d of list.documents" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
 </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss
index e69de29bb..08b88e0d0 100644
--- a/src-ui/src/app/components/document-list/document-list.component.scss
+++ b/src-ui/src/app/components/document-list/document-list.component.scss
@@ -0,0 +1,21 @@
+$paperless-card-breakpoints: (
+  0: 2, // xs
+  768px: 3, //md
+  992px: 4, //lg
+  1200px: 5, //xl
+  1400px: 6, // xxl
+  1600px: 7,
+  1800px: 8,
+  2000px: 9
+);
+
+.row-cols-paperless-cards {
+  @each $width, $n_cols in $paperless-card-breakpoints {
+    @media(min-width: $width) {
+      > * {
+        flex: 0 0 auto;
+        width: 100% / $n_cols;
+      }
+    }
+  }
+}

From 164418880a93301b61e577363d4211b8142dcf0e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 17 Dec 2020 21:36:21 +0100
Subject: [PATCH 0275/1300] more like this searching

---
 .../document-detail.component.html            |  6 +++
 .../document-detail.component.ts              |  4 ++
 .../document-card-large.component.html        | 11 +++++-
 .../document-card-large.component.ts          | 13 +++++++
 .../result-highlight.component.scss           |  2 +-
 .../components/search/search.component.html   | 10 ++++-
 .../app/components/search/search.component.ts | 26 +++++++++++--
 .../src/app/services/rest/search.service.ts   | 10 ++++-
 src/documents/index.py                        | 37 ++++++++++++++-----
 src/documents/views.py                        | 21 +++++++----
 10 files changed, 113 insertions(+), 27 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index f4a64c2cc..f7e1ff855 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -24,6 +24,12 @@
 
     </div>
 
+    <button type="button" class="btn btn-sm btn-outline-primary mr-2" (click)="moreLike()">
+        <svg class="buttonicon" fill="currentColor">
+            <use xlink:href="assets/bootstrap-icons.svg#three-dots" />
+        </svg>
+        <span class="d-none d-lg-inline"> More like this</span>
+    </button>
 
     <button type="button" class="btn btn-sm btn-outline-primary" (click)="close()">
         <svg class="buttonicon" fill="currentColor">
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index b4005b920..90594bd0a 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -168,6 +168,10 @@ export class DocumentDetailComponent implements OnInit {
 
   }
 
+  moreLike() {
+    this.router.navigate(["search"], {queryParams: {more_like:this.document.id}})
+  }
+
   hasNext() {
     return this.documentListViewService.hasNext(this.documentId)
   }
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index c2645db5e..32abaaef1 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -25,6 +25,12 @@
 
         <div class="d-flex justify-content-between align-items-center">
           <div class="btn-group">
+            <a routerLink="/search" [queryParams]="{'more_like': document.id}" class="btn btn-sm btn-outline-secondary">
+              <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>
+              More like this
+            </a>
             <a routerLink="/documents/{{document.id}}" class="btn btn-sm btn-outline-secondary">
               <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"/>
@@ -45,10 +51,13 @@
               </svg>
               Download
             </a>
+            <ngb-progressbar [type]="searchScoreClass" [value]="searchScore" style="width: 100px; height: 5px; margin: 10px;" [max]="1"></ngb-progressbar>
+            
           </div>
+          
           <small class="text-muted">Created: {{document.created | date}}</small>
         </div>
-
+        
       </div>
     </div>
   </div>
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
index 2e056cc70..44f9cb906 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
@@ -24,6 +24,19 @@ export class DocumentCardLargeComponent implements OnInit {
   @Output()
   clickCorrespondent = new EventEmitter<number>()
 
+  @Input()
+  searchScore: number
+
+  get searchScoreClass() {
+    if (this.searchScore > 0.7) {
+      return "success"
+    } else if (this.searchScore > 0.3) {
+      return "warning"
+    } else {
+      return "danger"
+    }
+  }
+
   ngOnInit(): void {
   }
 
diff --git a/src-ui/src/app/components/search/result-highlight/result-highlight.component.scss b/src-ui/src/app/components/search/result-highlight/result-highlight.component.scss
index 645fb0426..e04dd13b2 100644
--- a/src-ui/src/app/components/search/result-highlight/result-highlight.component.scss
+++ b/src-ui/src/app/components/search/result-highlight/result-highlight.component.scss
@@ -1,4 +1,4 @@
 .match {
     color: black;
-    background-color: orange;
+    background-color: rgb(255, 211, 66);
 }
\ No newline at end of file
diff --git a/src-ui/src/app/components/search/search.component.html b/src-ui/src/app/components/search/search.component.html
index 55fcee900..609bea9e5 100644
--- a/src-ui/src/app/components/search/search.component.html
+++ b/src-ui/src/app/components/search/search.component.html
@@ -3,7 +3,12 @@
 
 <div *ngIf="errorMessage" class="alert alert-danger">Invalid search query: {{errorMessage}}</div>
 
-<p>
+<p *ngIf="more_like">
+    Showing documents similar to
+    <a routerLink="/documents/{{more_like}}">{{more_like_doc?.original_file_name}}</a>
+</p>
+
+<p *ngIf="query">
     Search string: <i>{{query}}</i>
     <ng-container *ngIf="correctedQuery">
         - Did you mean "<a [routerLink]="" (click)="searchCorrectedQuery()">{{correctedQuery}}</a>"?
@@ -15,7 +20,8 @@
     <p>{{resultCount}} result(s)</p>
     <app-document-card-large *ngFor="let result of results"
         [document]="result.document"
-        [details]="result.highlights">
+        [details]="result.highlights"
+        [searchScore]="result.score / maxScore">
 
 </app-document-card-large>
 </div>
diff --git a/src-ui/src/app/components/search/search.component.ts b/src-ui/src/app/components/search/search.component.ts
index de8b4652f..b2b10d632 100644
--- a/src-ui/src/app/components/search/search.component.ts
+++ b/src-ui/src/app/components/search/search.component.ts
@@ -1,6 +1,9 @@
 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({
@@ -14,6 +17,10 @@ export class SearchComponent implements OnInit {
 
   query: string = ""
 
+  more_like: number
+
+  more_like_doc: PaperlessDocument
+
   searching = false
 
   currentPage = 1
@@ -26,11 +33,23 @@ export class SearchComponent implements OnInit {
 
   errorMessage: string
 
-  constructor(private searchService: SearchService, private route: ActivatedRoute, private router: Router) { }
+  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 => {
       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()
@@ -39,13 +58,14 @@ export class SearchComponent implements OnInit {
   }
 
   searchCorrectedQuery() {
-    this.router.navigate(["search"], {queryParams: {query: this.correctedQuery}})
+    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).subscribe(result => {
+
+    this.searchService.search(this.query, this.currentPage, this.more_like).subscribe(result => {
       if (append) {
         this.results.push(...result.results)
       } else {
diff --git a/src-ui/src/app/services/rest/search.service.ts b/src-ui/src/app/services/rest/search.service.ts
index b19a55769..3799f3dc7 100644
--- a/src-ui/src/app/services/rest/search.service.ts
+++ b/src-ui/src/app/services/rest/search.service.ts
@@ -15,11 +15,17 @@ export class SearchService {
   
   constructor(private http: HttpClient, private documentService: DocumentService) { }
 
-  search(query: string, page?: number): Observable<SearchResult> {
-    let httpParams = new HttpParams().set('query', query)
+  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 => this.documentService.addObservablesToDocument(hit.document))
diff --git a/src/documents/index.py b/src/documents/index.py
index 53bf34542..7d022182f 100644
--- a/src/documents/index.py
+++ b/src/documents/index.py
@@ -3,7 +3,7 @@ import os
 from contextlib import contextmanager
 
 from django.conf import settings
-from whoosh import highlight
+from whoosh import highlight, classify, query
 from whoosh.fields import Schema, TEXT, NUMERIC, KEYWORD, DATETIME
 from whoosh.highlight import Formatter, get_text
 from whoosh.index import create_in, exists_in, open_dir
@@ -120,22 +120,39 @@ def remove_document_from_index(document):
 
 
 @contextmanager
-def query_page(ix, querystring, page):
+def query_page(ix, page, querystring, more_like_doc_id, more_like_doc_content):
     searcher = ix.searcher()
     try:
-        qp = MultifieldParser(
-            ["content", "title", "correspondent", "tag", "type"],
-            ix.schema)
-        qp.add_plugin(DateParserPlugin())
+        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
+
+        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."
+            )
 
-        q = qp.parse(querystring)
-        result_page = searcher.search_page(q, page)
         result_page.results.fragmenter = highlight.ContextFragmenter(
             surround=50)
         result_page.results.formatter = JsonFormatter()
 
-        corrected = searcher.correct_query(q, querystring)
-        if corrected.query != q:
+        if corrected and corrected.query != str_q:
             corrected_query = corrected.string
         else:
             corrected_query = None
diff --git a/src/documents/views.py b/src/documents/views.py
index bf31c749b..bd9a748e8 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -335,14 +335,19 @@ class SearchView(APIView):
                 }
 
     def get(self, request, format=None):
-        if 'query' not in request.query_params:
-            return Response({
-                'count': 0,
-                'page': 0,
-                'page_count': 0,
-                'results': []})
 
-        query = request.query_params['query']
+        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
+
         try:
             page = int(request.query_params.get('page', 1))
         except (ValueError, TypeError):
@@ -352,7 +357,7 @@ class SearchView(APIView):
             page = 1
 
         try:
-            with index.query_page(self.ix, query, page) as (result_page,
+            with index.query_page(self.ix, page, query, more_like_id, more_like_content) as (result_page,
                                                             corrected_query):
                 return Response(
                     {'count': len(result_page),

From 48796e6961b0f61366e3ff77f2b78a371153768e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 17 Dec 2020 21:46:56 +0100
Subject: [PATCH 0276/1300] fixes #149

---
 src-ui/src/app/interceptors/csrf.interceptor.ts | 7 +++++--
 src/documents/templates/index.html              | 1 +
 src/documents/views.py                          | 5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/interceptors/csrf.interceptor.ts b/src-ui/src/app/interceptors/csrf.interceptor.ts
index 32f3e99dc..2ef03dc56 100644
--- a/src-ui/src/app/interceptors/csrf.interceptor.ts
+++ b/src-ui/src/app/interceptors/csrf.interceptor.ts
@@ -7,16 +7,19 @@ import {
 } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { CookieService } from 'ngx-cookie-service';
+import { Meta } from '@angular/platform-browser';
 
 @Injectable()
 export class CsrfInterceptor implements HttpInterceptor {
 
-  constructor(private cookieService: CookieService) {
+  constructor(private cookieService: CookieService, private meta: Meta) {
 
   }
 
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
-    let csrfToken = this.cookieService.get('csrftoken')
+
+    let prefix = this.meta.getTag('name=cookie_prefix').content
+    let csrfToken = this.cookieService.get(`${prefix?prefix:''}csrftoken`)
     if (csrfToken) {
      request = request.clone({
         setHeaders: {
diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html
index 728f3a0e7..06dbb678e 100644
--- a/src/documents/templates/index.html
+++ b/src/documents/templates/index.html
@@ -8,6 +8,7 @@
   <title>PaperlessUi</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+	<meta name="cookie_prefix" content="{{cookie_prefix}}">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 <link rel="stylesheet" href="{% static 'frontend/styles.css' %}"></head>
 <body>
diff --git a/src/documents/views.py b/src/documents/views.py
index bf31c749b..f90e9f7bc 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -54,6 +54,11 @@ from .serialisers import (
 class IndexView(TemplateView):
     template_name = "index.html"
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['cookie_prefix'] = settings.COOKIE_PREFIX
+        return context
+
 
 class CorrespondentViewSet(ModelViewSet):
     model = Correspondent

From 35dcc54dc875f5015ac003f7701f4f4c04aa8350 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 17 Dec 2020 21:54:05 +0100
Subject: [PATCH 0277/1300] fixes cookie_prefix for development setups

---
 src-ui/src/app/interceptors/csrf.interceptor.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/interceptors/csrf.interceptor.ts b/src-ui/src/app/interceptors/csrf.interceptor.ts
index 2ef03dc56..2c654aa36 100644
--- a/src-ui/src/app/interceptors/csrf.interceptor.ts
+++ b/src-ui/src/app/interceptors/csrf.interceptor.ts
@@ -17,8 +17,10 @@ export class CsrfInterceptor implements HttpInterceptor {
   }
 
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
-
-    let prefix = this.meta.getTag('name=cookie_prefix').content
+    let prefix = ""
+    if (this.meta.getTag('name=cookie_prefix')) {
+      prefix = this.meta.getTag('name=cookie_prefix').content
+    }    
     let csrfToken = this.cookieService.get(`${prefix?prefix:''}csrftoken`)
     if (csrfToken) {
      request = request.clone({

From 2c3eaadbce9fac1a465c0e4c866f9df3ae4216b2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 17 Dec 2020 23:24:28 +0100
Subject: [PATCH 0278/1300] test cases

---
 src/documents/tests/test_api.py | 19 +++++++++++++++++++
 src/documents/views.py          |  8 ++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 49dddee87..ba1ab45ca 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -351,6 +351,25 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
 
         self.assertEqual(correction, None)
 
+    def test_search_more_like(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")
+        d3=Document.objects.create(title="bank statement 3", content="things i paid for in september", pk=3, checksum="C")
+        with AsyncWriter(index.open_index()) as writer:
+            index.update_document(writer, d1)
+            index.update_document(writer, d2)
+            index.update_document(writer, d3)
+
+        response = self.client.get(f"/api/search/?more_like={d2.id}")
+
+        self.assertEqual(response.status_code, 200)
+
+        results = response.data['results']
+
+        self.assertEqual(len(results), 2)
+        self.assertEqual(results[0]['id'], d3.id)
+        self.assertEqual(results[1]['id'], d1.id)
+
     def test_statistics(self):
 
         doc1 = Document.objects.create(title="none1", checksum="A")
diff --git a/src/documents/views.py b/src/documents/views.py
index bd9a748e8..59fbfb213 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -348,6 +348,14 @@ class SearchView(APIView):
             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):

From 659cd3e9d5362d20b44c0f9112aec2e0a5fd7dfe Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 17 Dec 2020 23:41:46 +0100
Subject: [PATCH 0279/1300] hide search controls on document list

---
 .../document-card-large/document-card-large.component.html  | 4 ++--
 .../document-card-large/document-card-large.component.scss  | 6 ++++++
 .../document-card-large/document-card-large.component.ts    | 3 +++
 src-ui/src/app/components/search/search.component.html      | 3 ++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index 32abaaef1..58c0f6241 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -25,7 +25,7 @@
 
         <div class="d-flex justify-content-between align-items-center">
           <div class="btn-group">
-            <a routerLink="/search" [queryParams]="{'more_like': document.id}" class="btn btn-sm btn-outline-secondary">
+            <a routerLink="/search" [queryParams]="{'more_like': document.id}" class="btn btn-sm btn-outline-secondary" *ngIf="moreLikeThis">
               <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>
@@ -51,7 +51,7 @@
               </svg>
               Download
             </a>
-            <ngb-progressbar [type]="searchScoreClass" [value]="searchScore" style="width: 100px; height: 5px; margin: 10px;" [max]="1"></ngb-progressbar>
+            <ngb-progressbar *ngIf="searchScore" [type]="searchScoreClass" [value]="searchScore" class="search-score-bar" [max]="1"></ngb-progressbar>
             
           </div>
           
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
index 11fb10562..438d2c768 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
@@ -9,4 +9,10 @@
   height: 100%;
   position: absolute;
 
+}
+
+.search-score-bar {
+  width: 100px;
+  height: 5px;
+  margin: 10px;
 }
\ No newline at end of file
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
index 44f9cb906..bcc1b1f3c 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
@@ -12,6 +12,9 @@ export class DocumentCardLargeComponent implements OnInit {
 
   constructor(private documentService: DocumentService, private sanitizer: DomSanitizer) { }
 
+  @Input()
+  moreLikeThis: boolean = false
+
   @Input()
   document: PaperlessDocument
 
diff --git a/src-ui/src/app/components/search/search.component.html b/src-ui/src/app/components/search/search.component.html
index 609bea9e5..de6f0133f 100644
--- a/src-ui/src/app/components/search/search.component.html
+++ b/src-ui/src/app/components/search/search.component.html
@@ -21,7 +21,8 @@
     <app-document-card-large *ngFor="let result of results"
         [document]="result.document"
         [details]="result.highlights"
-        [searchScore]="result.score / maxScore">
+        [searchScore]="result.score / maxScore"
+        [moreLikeThis]="true">
 
 </app-document-card-large>
 </div>

From 93be4e98d5ad79e6bf602e866937c8d1192798f7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 17 Dec 2020 23:41:55 +0100
Subject: [PATCH 0280/1300] scroll to top when searching again

---
 src-ui/src/app/components/search/search.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src-ui/src/app/components/search/search.component.ts b/src-ui/src/app/components/search/search.component.ts
index b2b10d632..4570ac3fa 100644
--- a/src-ui/src/app/components/search/search.component.ts
+++ b/src-ui/src/app/components/search/search.component.ts
@@ -41,6 +41,7 @@ export class SearchComponent implements OnInit {
 
   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) {

From ca2cb694d0dbd70c550c8dc9e69a578e9fe6fd4e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 18 Dec 2020 00:10:16 +0100
Subject: [PATCH 0281/1300] code style

---
 src/documents/index.py | 13 ++++++++-----
 src/documents/views.py |  3 +--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/documents/index.py b/src/documents/index.py
index 7d022182f..fdf7d7041 100644
--- a/src/documents/index.py
+++ b/src/documents/index.py
@@ -136,11 +136,14 @@ def query_page(ix, page, querystring, more_like_doc_id, more_like_doc_content):
 
         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})
+            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:
diff --git a/src/documents/views.py b/src/documents/views.py
index 1f5489999..54d0de3f6 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -370,8 +370,7 @@ class SearchView(APIView):
             page = 1
 
         try:
-            with index.query_page(self.ix, page, query, more_like_id, more_like_content) as (result_page,
-                                                            corrected_query):
+            with index.query_page(self.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,

From 1c4e3f682e867d52e795b8b97dc7649c746b1a99 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Fri, 18 Dec 2020 01:31:46 +0100
Subject: [PATCH 0282/1300] Update README.md

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e8ae8feb2..fca1cd2cf 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,8 @@ For a complete list of changes from paperless, check out the [changelog](https:/
 
 # Roadmap for 1.0
 
+- **Bulk editing**. Add/remove metadata from multiple documents at once.
+
 - Make the front end nice (except mobile).
 - Test coverage at 90%.
 - Fix whatever bugs I and you find.
@@ -59,7 +61,6 @@ For a complete list of changes from paperless, check out the [changelog](https:/
 
 These are things that I want to add to paperless eventually. They are sorted by priority.
 
-- **Bulk editing**. Add/remove metadata from multiple documents at once.
 - **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like:
   - Group and limit search results by correspondent, show “more from this” links in the results.
   - Ability to search for “Similar documents” in the search results
@@ -68,6 +69,9 @@ These are things that I want to add to paperless eventually. They are sorted by
 	- With live updates ans websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particular happy about.
 	- Notifications when a document was added with buttons to open the new document right away.
 - **Arbitrary tag colors**. Allow the selection of any color with a color picker.
+- **More file types**. Possibly allow more file types to be processed by paperless, such as office .odt, .doc, .docx documents.
+
+Apart from that, paperless is pretty much feature complete.
 
 ## On the chopping block.
 

From cfc1ca45fc599a273d360078b160f688e5c19a5f Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Fri, 18 Dec 2020 01:35:08 +0100
Subject: [PATCH 0283/1300] Update README.md

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fca1cd2cf..32ff2ab4a 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,10 @@ Here's what you get:
 	* Includes a dashboard that shows basic statistics and has document upload.
 	* Filtering by tags, correspondents, types, and more.
 	* Customizable views can be saved and displayed on the dashboard.
-	* Full text search with auto completion, scored results and query highlighting allows you to quickly find what you need.
+* Full text search helps you find what you need.
+	* Auto completion suggests relevant words from your documents.
+	* Results are sorted by relevance to your search query.
+	* Highlighting shows you which parts of the document matched the query.
 * Email processing: Paperless adds documents from your email accounts.
 	* Configure multiple accounts and filters for each account.
 	* When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them or delete them.

From 9b244d02655c7837323633b71826a89473b6e19a Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 17 Dec 2020 23:09:27 -0800
Subject: [PATCH 0284/1300] Use ng-select for document detail screen

---
 src-ui/package-lock.json                      |  8 +++++++
 src-ui/package.json                           |  1 +
 src-ui/src/app/app.module.ts                  |  4 +++-
 .../common/input/select/select.component.html | 18 +++++++++------
 .../common/input/select/select.component.scss |  1 +
 src-ui/src/styles.scss                        | 23 ++++++++++++++++++-
 6 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json
index 5eca0b3c0..10215a32d 100644
--- a/src-ui/package-lock.json
+++ b/src-ui/package-lock.json
@@ -2056,6 +2056,14 @@
         "tslib": "^2.0.0"
       }
     },
+    "@ng-select/ng-select": {
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/@ng-select/ng-select/-/ng-select-5.0.9.tgz",
+      "integrity": "sha512-YZeSAiS8/Nx/eHZJPmOOYL8YmcvSq+dr1P8WIrsKmRA7mueorBpPc5xlUj+nLQbpLtsiQvdWDQspf/ykOvD/lA==",
+      "requires": {
+        "tslib": "^2.0.0"
+      }
+    },
     "@ngtools/webpack": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.2.0.tgz",
diff --git a/src-ui/package.json b/src-ui/package.json
index 6293f2672..14d828483 100644
--- a/src-ui/package.json
+++ b/src-ui/package.json
@@ -21,6 +21,7 @@
     "@angular/platform-browser-dynamic": "~10.1.5",
     "@angular/router": "~10.1.5",
     "@ng-bootstrap/ng-bootstrap": "^8.0.0",
+    "@ng-select/ng-select": "^5.0.9",
     "bootstrap": "^4.5.0",
     "ng-bootstrap": "^1.6.3",
     "ng2-pdf-viewer": "^6.3.2",
diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 3c00cd0b7..d9c3800d6 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -54,6 +54,7 @@ import { FileSizePipe } from './pipes/file-size.pipe';
 import { FilterPipe } from './pipes/filter.pipe';
 import { DocumentTitlePipe } from './pipes/document-title.pipe';
 import { MetadataCollapseComponent } from './components/document-detail/metadata-collapse/metadata-collapse.component';
+import { NgSelectModule } from '@ng-select/ng-select';
 
 @NgModule({
   declarations: [
@@ -110,7 +111,8 @@ import { MetadataCollapseComponent } from './components/document-detail/metadata
     ReactiveFormsModule,
     NgxFileDropModule,
     InfiniteScrollModule,
-    PdfViewerModule
+    PdfViewerModule,
+    NgSelectModule
   ],
   providers: [
     DatePipe,
diff --git a/src-ui/src/app/components/common/input/select/select.component.html b/src-ui/src/app/components/common/input/select/select.component.html
index 717aa7964..655adbe74 100644
--- a/src-ui/src/app/components/common/input/select/select.component.html
+++ b/src-ui/src/app/components/common/input/select/select.component.html
@@ -1,11 +1,15 @@
-<div class="form-group">
+<div class="form-group paperless-input-select">
   <label [for]="inputId">{{title}}</label>
   <div [class.input-group]="showPlusButton()">
-    <select class="form-control" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)" (blur)="onTouched()"
-      [disabled]="disabled" [style.color]="textColor" [style.background]="backgroundColor">
-      <option *ngIf="allowNull" [ngValue]="null" class="form-control">---</option>
-      <option *ngFor="let i of items" [ngValue]="i.id" class="form-control">{{i.name}}</option>
-    </select>
+    <ng-select name="correspondent" [(ngModel)]="value"
+      [disabled]="disabled"
+      [style.color]="textColor"
+      [style.background]="backgroundColor"
+      (change)="onChange(value)"
+      (blur)="onTouched()">
+      <ng-option *ngFor="let i of items" [value]="i.id">{{i.name}}</ng-option>
+    </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">
@@ -15,4 +19,4 @@
     </div>
   </div>
   <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
-</div>
\ No newline at end of file
+</div>
diff --git a/src-ui/src/app/components/common/input/select/select.component.scss b/src-ui/src/app/components/common/input/select/select.component.scss
index e69de29bb..8faec3bc0 100644
--- a/src-ui/src/app/components/common/input/select/select.component.scss
+++ b/src-ui/src/app/components/common/input/select/select.component.scss
@@ -0,0 +1 @@
+// styles for ng-select child are in styles.scss
diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss
index b0b66b7f9..2eeb40d41 100644
--- a/src-ui/src/styles.scss
+++ b/src-ui/src/styles.scss
@@ -2,6 +2,7 @@
 
 @import "node_modules/bootstrap/scss/bootstrap";
 
+@import "~@ng-select/ng-select/themes/default.theme.css";
 
 .toolbaricon {
   width: 1.2em;
@@ -65,4 +66,24 @@ body {
   display: block;
   background-size: 1rem;
   float: right;
-}
\ No newline at end of file
+}
+
+.paperless-input-select {
+  .ng-select {
+    position: relative;
+    flex: 1 1 auto;
+    margin-bottom: 0;
+    height: calc(1.5em + 0.75rem + 5px);
+    line-height: 1.5;
+
+    .ng-select-container {
+      height: 100%;
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+
+      .ng-value-container .ng-input {
+        top: 8px;
+      }
+    }
+  }
+}

From e10a2391c44dcb48db992b0d477a8f150a0bb481 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 18 Dec 2020 00:53:01 -0800
Subject: [PATCH 0285/1300] Use ng-select for document detail screen tags

---
 .../common/input/tags/tags.component.html     | 36 ++++++++++---------
 .../common/input/tags/tags.component.scss     | 12 ++-----
 .../common/input/tags/tags.component.ts       | 23 ++++++------
 .../document-detail.component.html            |  4 +--
 src-ui/src/styles.scss                        | 15 ++++++--
 5 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html
index 8029dd860..89e391813 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.html
+++ b/src-ui/src/app/components/common/input/tags/tags.component.html
@@ -1,30 +1,34 @@
-<div class="form-group">
-  <label for="exampleFormControlTextarea1">Tags</label>
+<div class="form-group paperless-input-select paperless-input-tags">
+  <label for="tags">Tags</label>
 
   <div class="input-group">
-    <div class="form-control tags-form-control" id="tags">
-      <app-tag class="mr-2" *ngFor="let id of displayValue" [tag]="getTag(id)" (click)="removeTag(id)"></app-tag>
-    </div>
+    <ng-select name="tags" [items]="tags" bindLabel="name" bindValue="id" [(ngModel)]="displayValue"
+      [multiple]="true"
+      [closeOnSelect]="false"
+      [disabled]="disabled"
+      (change)="ngSelectChange()">
 
-    <div class="input-group-append" ngbDropdown placement="top-right">
-      <button class="btn btn-outline-secondary" type="button" ngbDropdownToggle></button>
-      <div ngbDropdownMenu class="scrollable-menu shadow">
-        <button type="button" *ngFor="let tag of tags" ngbDropdownItem (click)="addTag(tag.id)">
-          <app-tag [tag]="tag"></app-tag>
-        </button>
-      </div>
-    </div>
+      <ng-template ng-label-tmp let-item="item">
+          <app-tag style="background-color: none;" [tag]="getTag(item.id)" (click)="removeTag(item.id)"></app-tag>
+      </ng-template>
+      <ng-template ng-option-tmp let-item="item" let-index="index" let-search="searchTerm">
+        <div class="selected-icon d-inline-block mr-1">
+          <svg *ngIf="displayValue.includes(item.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+          </svg>
+        </div>
+        <app-tag class="mr-2" [tag]="getTag(item.id)"></app-tag>
+      </ng-template>
+    </ng-select>
 
     <div class="input-group-append">
-
       <button class="btn btn-outline-secondary" type="button" (click)="createTag()">
         <svg class="buttonicon" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#plus" />
         </svg>
       </button>
     </div>
-
   </div>
   <small class="form-text text-muted" *ngIf="hint">{{hint}}</small>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.scss b/src-ui/src/app/components/common/input/tags/tags.component.scss
index f2635b7f2..41fc6acc4 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.scss
+++ b/src-ui/src/app/components/common/input/tags/tags.component.scss
@@ -1,10 +1,4 @@
-.tags-form-control {
-  height: auto;
+.selected-icon {
+  min-width: 1em;
+  min-height: 1em;
 }
-
-
-.scrollable-menu {
-  height: auto;
-  max-height: 300px;
-  overflow-x: hidden;
-}
\ No newline at end of file
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.ts b/src-ui/src/app/components/common/input/tags/tags.component.ts
index cca99cc55..5501ac5a6 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.ts
+++ b/src-ui/src/app/components/common/input/tags/tags.component.ts
@@ -21,7 +21,7 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
 
 
   onChange = (newValue: number[]) => {};
-  
+
   onTouched = () => {};
 
   writeValue(newValue: number[]): void {
@@ -66,29 +66,28 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
   removeTag(id) {
     let index = this.displayValue.indexOf(id)
     if (index > -1) {
-      this.displayValue.splice(index, 1)
+      let oldValue = this.displayValue
+      oldValue.splice(index, 1)
+      this.displayValue = [...oldValue]
       this.onChange(this.displayValue)
     }
   }
 
-  addTag(id) {
-    let index = this.displayValue.indexOf(id)
-    if (index == -1) {
-      this.displayValue.push(id)
-      this.onChange(this.displayValue)
-    }
-  }
-
-
   createTag() {
     var modal = this.modalService.open(TagEditDialogComponent, {backdrop: 'static'})
     modal.componentInstance.dialogMode = 'create'
     modal.componentInstance.success.subscribe(newTag => {
       this.tagService.listAll().subscribe(tags => {
         this.tags = tags.results
-        this.addTag(newTag.id)
+        this.displayValue = [...this.displayValue, newTag.id]
+        this.onChange(this.displayValue)
       })
     })
   }
 
+  ngSelectChange() {
+    this.value = this.displayValue
+    this.onChange(this.displayValue)
+  }
+
 }
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index f4a64c2cc..a3bc7e1e6 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -52,9 +52,9 @@
                         </div>
                         <app-input-date-time titleDate="Date created" formControlName="created"></app-input-date-time>
                         <app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent"
-                            allowNull="true" (createNew)="createCorrespondent()"></app-input-select>
+                            (createNew)="createCorrespondent()"></app-input-select>
                         <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type"
-                            allowNull="true" (createNew)="createDocumentType()"></app-input-select>
+                            (createNew)="createDocumentType()"></app-input-select>
                         <app-input-tags formControlName="tags" title="Tags"></app-input-tags>
 
                     </ng-template>
diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss
index 2eeb40d41..0dc662e31 100644
--- a/src-ui/src/styles.scss
+++ b/src-ui/src/styles.scss
@@ -1,7 +1,5 @@
 @import "theme";
-
 @import "node_modules/bootstrap/scss/bootstrap";
-
 @import "~@ng-select/ng-select/themes/default.theme.css";
 
 .toolbaricon {
@@ -21,7 +19,7 @@
 }
 
 body {
-  font-size: .875rem;
+  font-size: 0.875rem;
 }
 
 .form-control-dark {
@@ -85,5 +83,16 @@ body {
         top: 8px;
       }
     }
+
+    .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-selected,
+    .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-selected.ng-option-marked {
+      background: none;
+    }
+  }
+}
+
+.paperless-input-tags {
+  .ng-select.ng-select-multiple .ng-select-container .ng-value-container .ng-value {
+    background-color: transparent;
   }
 }

From 55c4c690ef8eec3ba494cd6c3a74dc9b5cd810ec Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 18 Dec 2020 01:13:30 -0800
Subject: [PATCH 0286/1300] Fix wrapping with multiple tags, embiggen tags,
 pretty icons

---
 .../common/input/tags/tags.component.html     | 21 ++++++++++++-------
 .../common/input/tags/tags.component.scss     |  8 +++++++
 src-ui/src/styles.scss                        |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html
index 89e391813..8a5dbc4f2 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.html
+++ b/src-ui/src/app/components/common/input/tags/tags.component.html
@@ -1,7 +1,7 @@
 <div class="form-group paperless-input-select paperless-input-tags">
   <label for="tags">Tags</label>
 
-  <div class="input-group">
+  <div class="input-group flex-nowrap">
     <ng-select name="tags" [items]="tags" bindLabel="name" bindValue="id" [(ngModel)]="displayValue"
       [multiple]="true"
       [closeOnSelect]="false"
@@ -9,15 +9,22 @@
       (change)="ngSelectChange()">
 
       <ng-template ng-label-tmp let-item="item">
-          <app-tag style="background-color: none;" [tag]="getTag(item.id)" (click)="removeTag(item.id)"></app-tag>
+        <span class="tag-wrap tag-wrap-delete" (click)="removeTag(item.id)">
+          <svg width="1.2em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <use xlink:href="assets/bootstrap-icons.svg#x"/>
+          </svg>
+          <app-tag style="background-color: none;" [tag]="getTag(item.id)"></app-tag>
+        </span>
       </ng-template>
       <ng-template ng-option-tmp let-item="item" let-index="index" let-search="searchTerm">
-        <div class="selected-icon d-inline-block mr-1">
-          <svg *ngIf="displayValue.includes(item.id)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
-          </svg>
+        <div class="tag-wrap">
+          <div class="selected-icon d-inline-block mr-1">
+            <svg *ngIf="displayValue.includes(item.id)" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+              <use xlink:href="assets/bootstrap-icons.svg#check"/>
+            </svg>
+          </div>
+          <app-tag class="mr-2" [tag]="getTag(item.id)"></app-tag>
         </div>
-        <app-tag class="mr-2" [tag]="getTag(item.id)"></app-tag>
       </ng-template>
     </ng-select>
 
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.scss b/src-ui/src/app/components/common/input/tags/tags.component.scss
index 41fc6acc4..2eaaa4f6d 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.scss
+++ b/src-ui/src/app/components/common/input/tags/tags.component.scss
@@ -2,3 +2,11 @@
   min-width: 1em;
   min-height: 1em;
 }
+
+.tag-wrap {
+  font-size: 1rem;
+}
+
+.tag-wrap-delete {
+  cursor: pointer;
+}
diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss
index 0dc662e31..ffb296271 100644
--- a/src-ui/src/styles.scss
+++ b/src-ui/src/styles.scss
@@ -71,7 +71,7 @@ body {
     position: relative;
     flex: 1 1 auto;
     margin-bottom: 0;
-    height: calc(1.5em + 0.75rem + 5px);
+    min-height: calc(1.5em + 0.75rem + 5px);
     line-height: 1.5;
 
     .ng-select-container {

From c05de3d57f6148d4abee8f8775d6668f6984ed2d Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 18 Dec 2020 01:18:11 -0800
Subject: [PATCH 0287/1300] Tiny padding fixes

---
 src-ui/src/styles.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss
index ffb296271..6e09db630 100644
--- a/src-ui/src/styles.scss
+++ b/src-ui/src/styles.scss
@@ -80,7 +80,7 @@ body {
       border-bottom-right-radius: 0;
 
       .ng-value-container .ng-input {
-        top: 8px;
+        top: 10px;
       }
     }
 
@@ -95,4 +95,8 @@ body {
   .ng-select.ng-select-multiple .ng-select-container .ng-value-container .ng-value {
     background-color: transparent;
   }
+
+  .ng-select.ng-select-multiple .ng-select-container .ng-value-container {
+    padding-top: 1px;
+  }
 }

From 273c474e3fe00f68898c1dc74256a2f4de7174e9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 18 Dec 2020 14:09:12 +0100
Subject: [PATCH 0288/1300] layout changes

---
 .../document-card-large/document-card-large.component.html | 7 +++++--
 .../document-card-large/document-card-large.component.scss | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index 58c0f6241..5bf0c9af2 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -23,7 +23,7 @@
         </p>
 
 
-        <div class="d-flex justify-content-between align-items-center">
+        <div class="d-flex align-items-center">
           <div class="btn-group">
             <a routerLink="/search" [queryParams]="{'more_like': document.id}" class="btn btn-sm btn-outline-secondary" *ngIf="moreLikeThis">
               <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-three-dots" viewBox="0 0 16 16">
@@ -51,9 +51,12 @@
               </svg>
               Download
             </a>
-            <ngb-progressbar *ngIf="searchScore" [type]="searchScoreClass" [value]="searchScore" class="search-score-bar" [max]="1"></ngb-progressbar>
             
           </div>
+
+          <small class="text-muted ml-auto">Score:</small>
+
+          <ngb-progressbar *ngIf="searchScore" [type]="searchScoreClass" [value]="searchScore" class="search-score-bar mx-2" [max]="1"></ngb-progressbar>
           
           <small class="text-muted">Created: {{document.created | date}}</small>
         </div>
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
index 438d2c768..a20a56672 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
@@ -14,5 +14,5 @@
 .search-score-bar {
   width: 100px;
   height: 5px;
-  margin: 10px;
+  margin-top: 2px;
 }
\ No newline at end of file

From 789abb3bbb3c14b85952e98485cf98c289deb9c0 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 18 Dec 2020 16:42:33 +0100
Subject: [PATCH 0289/1300] changed up the highlight fragment formatter

---
 docs/api.rst                                  | 15 ++++------
 .../result-highlight.component.html           |  2 +-
 src/documents/index.py                        | 29 +++++++++++--------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/docs/api.rst b/docs/api.rst
index d352758fa..cff72a970 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -221,21 +221,16 @@ Each fragment contains a list of strings, and some of them are marked as a highl
 
     [
         [
-            {"text": "This is a sample text with a "},
-            {"text": "highlighted", "term": 0},
-            {"text": " word."}
+            {"text": "This is a sample text with a ", "highlight": false},
+            {"text": "highlighted", "highlight": true},
+            {"text": " word.", "highlight": false}
         ],
         [
-            {"text": "Another", "term": 1},
-            {"text": " fragment with a highlight."}
+            {"text": "Another", "highlight": true},
+            {"text": " fragment with a highlight.", "highlight": false}
         ]
     ]
 
-
-
-When ``term`` is present within a string, the word within ``text`` should be highlighted.
-The term index groups multiple matches together and words with the same index
-should get identical highlighting.
 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. ...
diff --git a/src-ui/src/app/components/search/result-highlight/result-highlight.component.html b/src-ui/src/app/components/search/result-highlight/result-highlight.component.html
index 1842f5cea..5dc5baa94 100644
--- a/src-ui/src/app/components/search/result-highlight/result-highlight.component.html
+++ b/src-ui/src/app/components/search/result-highlight/result-highlight.component.html
@@ -1,3 +1,3 @@
 ... <span *ngFor="let fragment of highlights">
-    <span *ngFor="let token of fragment" [ngClass]="token.term != null ? 'match term'+ token.term : ''">{{token.text}}</span> ... 
+    <span *ngFor="let token of fragment" [class.match]="token.highlight">{{token.text}}</span> ... 
 </span>
\ No newline at end of file
diff --git a/src/documents/index.py b/src/documents/index.py
index fdf7d7041..308ee932e 100644
--- a/src/documents/index.py
+++ b/src/documents/index.py
@@ -20,32 +20,37 @@ class JsonFormatter(Formatter):
         self.seen = {}
 
     def format_token(self, text, token, replace=False):
-        seen = self.seen
         ttext = self._text(get_text(text, token, replace))
-        if ttext in seen:
-            termnum = seen[ttext]
-        else:
-            termnum = len(seen)
-            seen[ttext] = termnum
-
-        return {'text': ttext, 'term': termnum}
+        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:
-                output.append({'text': text[index:t.startchar]})
-            output.append(self.format_token(text, t, replace))
+                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]})
+            output.append({'text': text[index:fragment.endchar],
+                           'highlight': False})
         return output
 
     def format(self, fragments, replace=False):

From dfb88ebf8328ef9ed6b71c9da4b9ddac49768ea5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 18 Dec 2020 20:17:17 +0100
Subject: [PATCH 0290/1300] removed the date hack. fixes #144

also refer to #148
---
 .../filter-dropdown-date.component.html       |  51 +++----
 .../filter-dropdown-date.component.ts         | 139 ++++++++----------
 .../filter-editor/filter-editor.component.ts  |  31 ++--
 3 files changed, 106 insertions(+), 115 deletions(-)

diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
index 6f6a42fe2..aca6e836c 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -4,38 +4,39 @@
   </button>
   <div class="dropdown-menu date-filter shadow pt-0" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
-        <button class="list-group-item small list-goup list-group-item-action d-flex p-2 pl-3" (click)="clear()">Clear</button>
-        <button *ngFor="let range of [7, 30, 'month', 'year']" class="list-group-item small list-goup list-group-item-action d-flex p-2 pl-3" role="menuitem" (click)="setDateQuickFilter(range)">
-          <ng-container *ngIf="isStringRange(range)">This </ng-container>
-          {{ range }}
-          <ng-container *ngIf="!isStringRange(range)"> days</ng-container>
+        <button *ngFor="let qf of quickFilters" class="list-group-item small list-goup list-group-item-action d-flex p-2 pl-3" role="menuitem" (click)="setDateQuickFilter(qf.id)">
+          {{qf.name}}
         </button>
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
-          <div>Before</div>
+
+          <div class="mb-2 d-flex flex-row w-100 justify-content-between small">
+            <div>After</div>
+            <a *ngIf="dateAfter" class="btn btn-link p-0 m-0" (click)="clearAfter()">
+              <svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
+              </svg>
+              <small>Clear</small>
+            </a>
+          </div>
+
           <div class="input-group input-group-sm">
-            <input class="form-control" type="text" placeholder="yyyy-mm-dd" name="before" [(ngModel)]="_dateBefore" [maxDate]="this._maxDate" ngbDatepicker (dateSelect)="onBeforeSelected($event)" #dpBefore="ngbDatepicker">
-            <div class="input-group-append">
-              <button class="btn btn-outline-secondary btn-sm" (click)="dpBefore.toggle()" type="button">
-                <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                  <path fill-rule="evenodd" 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"/>
-                  <path d="M6.445 11.688V6.354h-.633A12.6 12.6 0 0 0 4.5 7.16v.695c.375-.257.969-.62 1.258-.777h.012v4.61h.675zm1.188-1.305c.047.64.594 1.406 1.703 1.406 1.258 0 2-1.066 2-2.871 0-1.934-.781-2.668-1.953-2.668-.926 0-1.797.672-1.797 1.809 0 1.16.824 1.77 1.676 1.77.746 0 1.23-.376 1.383-.79h.027c-.004 1.316-.461 2.164-1.305 2.164-.664 0-1.008-.45-1.05-.82h-.684zm2.953-2.317c0 .696-.559 1.18-1.184 1.18-.601 0-1.144-.383-1.144-1.2 0-.823.582-1.21 1.168-1.21.633 0 1.16.398 1.16 1.23z"/>
-                </svg>
-              </button>
-            </div>
+            <input type="date" class="form-control" id="date_after" [(ngModel)]="dateAfter" (change)="onChangeDebounce()">
           </div>
         </div>
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
-          <div>After</div>
+
+          <div class="mb-2 d-flex flex-row w-100 justify-content-between small">
+            <div>Before</div>
+            <a *ngIf="dateBefore" class="btn btn-link p-0 m-0" (click)="clearBefore()">
+              <svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
+              </svg>
+              <small>Clear</small>
+            </a>
+          </div>
+
           <div class="input-group input-group-sm">
-            <input class="form-control form-control-sm" type="text" placeholder="yyyy-mm-dd" name="after" [(ngModel)]="_dateAfter" [maxDate]="this._maxDate" ngbDatepicker (dateSelect)="onAfterSelected($event)" #dpAfter="ngbDatepicker">
-            <div class="input-group-append">
-              <button class="btn btn-outline-secondary btn-sm" (click)="dpAfter.toggle()" type="button">
-                <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                  <path fill-rule="evenodd" 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"/>
-                  <path d="M6.445 11.688V6.354h-.633A12.6 12.6 0 0 0 4.5 7.16v.695c.375-.257.969-.62 1.258-.777h.012v4.61h.675zm1.188-1.305c.047.64.594 1.406 1.703 1.406 1.258 0 2-1.066 2-2.871 0-1.934-.781-2.668-1.953-2.668-.926 0-1.797.672-1.797 1.809 0 1.16.824 1.77 1.676 1.77.746 0 1.23-.376 1.383-.79h.027c-.004 1.316-.461 2.164-1.305 2.164-.664 0-1.008-.45-1.05-.82h-.684zm2.953-2.317c0 .696-.559 1.18-1.184 1.18-.601 0-1.144-.383-1.144-1.2 0-.823.582-1.21 1.168-1.21.633 0 1.16.398 1.16 1.23z"/>
-                </svg>
-              </button>
-            </div>
+            <input type="date" class="form-control" id="date_before" [(ngModel)]="dateBefore" (change)="onChangeDebounce()">
           </div>
         </div>
     </div>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index 91402d084..e570862cd 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -1,24 +1,37 @@
-import { Component, EventEmitter, Input, Output, ElementRef, ViewChild, SimpleChange } from '@angular/core';
-import { NgbDate, NgbDateStruct, NgbDatepicker } from '@ng-bootstrap/ng-bootstrap';
+import { formatDate } from '@angular/common';
+import { Component, EventEmitter, Input, Output, OnInit, OnDestroy } from '@angular/core';
+import { Subject, Subscription } from 'rxjs';
+import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 
 export interface DateSelection {
-  before?: NgbDateStruct
-  after?: NgbDateStruct
+  before?: string
+  after?: string
 }
 
+const FILTER_LAST_7_DAYS = 0
+const FILTER_LAST_MONTH = 1
+const FILTER_LAST_3_MONTHS = 2
+const FILTER_LAST_YEAR = 3
 
 @Component({
   selector: 'app-filter-dropdown-date',
   templateUrl: './filter-dropdown-date.component.html',
   styleUrls: ['./filter-dropdown-date.component.scss']
 })
-export class FilterDropdownDateComponent {
+export class FilterDropdownDateComponent implements OnInit, OnDestroy {
+
+  quickFilters = [
+    {id: FILTER_LAST_7_DAYS, name: "Last 7 days"}, 
+    {id: FILTER_LAST_MONTH, name: "Last month"},
+    {id: FILTER_LAST_3_MONTHS, name: "Last 3 months"},
+    {id: FILTER_LAST_YEAR, name: "Last year"}
+  ]
 
   @Input()
-  dateBefore: NgbDateStruct
+  dateBefore: string
 
   @Input()
-  dateAfter: NgbDateStruct
+  dateAfter: string
 
   @Input()
   title: string
@@ -26,87 +39,65 @@ export class FilterDropdownDateComponent {
   @Output()
   datesSet = new EventEmitter<DateSelection>()
 
-  @ViewChild('dpAfter') dpAfter: NgbDatepicker
-  @ViewChild('dpBefore') dpBefore: NgbDatepicker
+  private datesSetDebounce$ = new Subject()
 
-  _dateBefore: NgbDateStruct
-  _dateAfter: NgbDateStruct
-
-  get _maxDate(): NgbDate {
-    let date = new Date()
-    return NgbDate.from({year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate()})
+  private sub: Subscription
+  
+  ngOnInit() {
+    this.sub = this.datesSetDebounce$.pipe(
+      debounceTime(400)
+    ).subscribe(() => {
+      this.onChange()
+    })
   }
 
-  isStringRange(range: any) {
-    return typeof range == 'string'
-  }
-
-  ngOnChanges(changes: SimpleChange) {
-    // this is a hacky workaround perhaps because of https://github.com/angular/angular/issues/11097
-    let dateString: string = ''
-    let dateAfterChange: SimpleChange
-    let dateBeforeChange: SimpleChange
-    if (changes) {
-      dateAfterChange = changes['dateAfter']
-      dateBeforeChange = changes['dateBefore']
+  ngOnDestroy() {
+    if (this.sub) {
+      this.sub.unsubscribe()
     }
+  }
 
-    if (this.dpBefore && this.dpAfter) {
-      let dpAfterElRef: ElementRef = this.dpAfter['_elRef']
-      let dpBeforeElRef: ElementRef = this.dpBefore['_elRef']
+  setDateQuickFilter(qf: number) {
+    this.dateBefore = null
+    let date = new Date()
+    switch (qf) {
+      case FILTER_LAST_7_DAYS:
+        date.setDate(date.getDate() - 7)
+        break;
 
-      if (dateAfterChange && dateAfterChange.currentValue) {
-        let dateAfterDate = dateAfterChange.currentValue as NgbDateStruct
-        dateString = `${dateAfterDate.year}-${dateAfterDate.month.toString().padStart(2,'0')}-${dateAfterDate.day.toString().padStart(2,'0')}`
-        dpAfterElRef.nativeElement.value = dateString
-      } else if (dateBeforeChange && dateBeforeChange.currentValue) {
-        let dateBeforeDate = dateBeforeChange.currentValue as NgbDateStruct
-        dateString = `${dateBeforeDate.year}-${dateBeforeDate.month.toString().padStart(2,'0')}-${dateBeforeDate.day.toString().padStart(2,'0')}`
-        dpBeforeElRef.nativeElement.value = dateString
-      } else {
-        dpAfterElRef.nativeElement.value = dateString
-        dpBeforeElRef.nativeElement.value = dateString
+      case FILTER_LAST_MONTH:
+        date.setMonth(date.getMonth() - 1)
+        break;
+
+      case FILTER_LAST_3_MONTHS:
+        date.setMonth(date.getMonth() - 3)
+        break
+
+      case FILTER_LAST_YEAR:
+        date.setFullYear(date.getFullYear() - 1)
+        break
+  
       }
-    }
+    this.dateAfter = formatDate(date, 'yyyy-MM-dd', "en-us", "UTC")
+    this.onChange()
   }
 
-  setDateQuickFilter(range: any) {
-    let date = new Date()
-    let newDate: NgbDateStruct = { year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate() }
-    switch (typeof range) {
-      case 'number':
-        date.setDate(date.getDate() - range)
-        newDate.year = date.getFullYear()
-        newDate.month = date.getMonth() + 1
-        newDate.day = date.getDate()
-        break
-
-      case 'string':
-        newDate.day = 1
-        if (range == 'year') newDate.month = 1
-        break
-
-      default:
-        break
-    }
-    this._dateAfter = newDate
-    this._dateBefore = null
-    this.datesSet.emit({after: newDate, before: null})
+  onChange() {
+    this.datesSet.emit({after: this.dateAfter, before: this.dateBefore})
   }
 
-  onBeforeSelected(date: NgbDateStruct) {
-    this._dateBefore = date
-    this.datesSet.emit({after: this._dateAfter, before: date})
+  onChangeDebounce() {
+    this.datesSetDebounce$.next({after: this.dateAfter, before: this.dateBefore})
   }
 
-  onAfterSelected(date: NgbDateStruct) {
-    this._dateAfter = date
-    this.datesSet.emit({after: date, before: this._dateBefore})
+  clearBefore() {
+    this.dateBefore = null;
+    this.onChange()
   }
 
-  clear() {
-    this._dateBefore = null
-    this._dateAfter = null
-    this.datesSet.emit({after: null, before: null})
+  clearAfter() {
+    this.dateAfter = null;
+    this.onChange()
   }
+
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index f762c6138..913c738a5 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -179,54 +179,53 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     this.applyFilters()
   }
 
-  get dateCreatedBefore(): NgbDateStruct {
+  get dateCreatedBefore(): string {
     let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_BEFORE)
-    return createdBeforeRule ? this.dateParser.parse(createdBeforeRule.value) : null
+    return createdBeforeRule ? createdBeforeRule.value : null
   }
 
-  get dateCreatedAfter(): NgbDateStruct {
+  get dateCreatedAfter(): string {
     let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_AFTER)
-    return createdAfterRule ? this.dateParser.parse(createdAfterRule.value) : null
+    return createdAfterRule ? createdAfterRule.value : null
   }
 
-  get dateAddedBefore(): NgbDateStruct {
+  get dateAddedBefore(): string {
     let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_BEFORE)
-    return addedBeforeRule ? this.dateParser.parse(addedBeforeRule.value) : null
+    return addedBeforeRule ? addedBeforeRule.value : null
   }
 
-  get dateAddedAfter(): NgbDateStruct {
+  get dateAddedAfter(): string {
     let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_AFTER)
-    return addedAfterRule ? this.dateParser.parse(addedAfterRule.value) : null
+    return addedAfterRule ? addedAfterRule.value : null
   }
 
-  setDateCreatedBefore(date?: NgbDateStruct) {
+  setDateCreatedBefore(date?: string) {
     if (date) this.setDateFilter(date, FILTER_CREATED_BEFORE)
     else this.clearDateFilter(FILTER_CREATED_BEFORE)
   }
 
-  setDateCreatedAfter(date?: NgbDateStruct) {
+  setDateCreatedAfter(date?: string) {
     if (date) this.setDateFilter(date, FILTER_CREATED_AFTER)
     else this.clearDateFilter(FILTER_CREATED_AFTER)
   }
 
-  setDateAddedBefore(date?: NgbDateStruct) {
+  setDateAddedBefore(date?: string) {
     if (date) this.setDateFilter(date, FILTER_ADDED_BEFORE)
     else this.clearDateFilter(FILTER_ADDED_BEFORE)
   }
 
-  setDateAddedAfter(date?: NgbDateStruct) {
+  setDateAddedAfter(date?: string) {
     if (date) this.setDateFilter(date, FILTER_ADDED_AFTER)
     else this.clearDateFilter(FILTER_ADDED_AFTER)
   }
 
-  setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) {
+  setDateFilter(date: string, dateRuleTypeID: number) {
     let existingRule = this.filterRules.find(rule => rule.rule_type == dateRuleTypeID)
-    let newValue = this.dateParser.format(date)
 
     if (existingRule) {
-      existingRule.value = newValue
+      existingRule.value = date
     } else {
-      this.filterRules.push({rule_type: dateRuleTypeID, value: newValue})
+      this.filterRules.push({rule_type: dateRuleTypeID, value: date})
     }
   }
 

From e5fe515b69d570b83081d8cc2686635eb2bf8dff Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 18 Dec 2020 14:31:09 -0800
Subject: [PATCH 0291/1300] Add page number to toolbar

---
 .../document-detail.component.html              | 12 +++++++++++-
 .../document-detail.component.ts                | 17 ++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index a3bc7e1e6..0fec2aa44 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -1,4 +1,14 @@
 <app-page-header [(title)]="title">
+    <div class="input-group input-group-sm mr-5">
+      <div class="input-group-prepend">
+        <div class="input-group-text">Page </div>
+      </div>
+      <input class="form-control flex-grow-0 w-auto" type="number" min="1" [max]="previewNumPages" [(ngModel)]="currentPreviewPage" />
+      <div class="input-group-append">
+        <div class="input-group-text">of {{previewNumPages}}</div>
+      </div>
+    </div>
+
     <button type="button" class="btn btn-sm btn-outline-danger mr-2" (click)="delete()">
         <svg class="buttonicon" fill="currentColor">
             <use xlink:href="assets/bootstrap-icons.svg#trash" />
@@ -128,7 +138,7 @@
 
     <div class="col-md-6 col-xl-8 mb-3">
       <div class="pdf-viewer-container" *ngIf="getContentType() == 'application/pdf'">
-        <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true"></pdf-viewer>
+        <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="currentPreviewPage" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer>
       </div>
     </div>
 </div>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index b4005b920..a2f80f786 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -15,6 +15,7 @@ import { DocumentService } from 'src/app/services/rest/document.service';
 import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component';
 import { CorrespondentEditDialogComponent } from '../manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component';
 import { DocumentTypeEditDialogComponent } from '../manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component';
+import { PDFDocumentProxy } from 'ng2-pdf-viewer';
 
 @Component({
   selector: 'app-document-detail',
@@ -47,8 +48,11 @@ export class DocumentDetailComponent implements OnInit {
     tags: new FormControl([])
   })
 
+  currentPreviewPage: number = 1
+  previewNumPages: number
+
   constructor(
-    private documentsService: DocumentService, 
+    private documentsService: DocumentService,
     private route: ActivatedRoute,
     private correspondentService: CorrespondentService,
     private documentTypeService: DocumentTypeService,
@@ -113,6 +117,8 @@ export class DocumentDetailComponent implements OnInit {
     modal.componentInstance.success.subscribe(newCorrespondent => {
       this.correspondentService.listAll().subscribe(correspondents => {
         this.correspondents = correspondents.results
+        console.log(this.documentForm.get('correspondent'), this.documentForm.get('correspondent').setValue);
+
         this.documentForm.get('correspondent').setValue(newCorrespondent.id)
       })
     })
@@ -126,7 +132,7 @@ export class DocumentDetailComponent implements OnInit {
     }, error => {this.router.navigate(['404'])})
   }
 
-  save() {    
+  save() {
     this.documentsService.update(this.document).subscribe(result => {
       this.close()
     })
@@ -161,7 +167,7 @@ export class DocumentDetailComponent implements OnInit {
     modal.componentInstance.btnCaption = "Delete document"
     modal.componentInstance.confirmClicked.subscribe(() => {
       this.documentsService.delete(this.document).subscribe(() => {
-        modal.close()  
+        modal.close()
         this.close()
       })
     })
@@ -171,4 +177,9 @@ export class DocumentDetailComponent implements OnInit {
   hasNext() {
     return this.documentListViewService.hasNext(this.documentId)
   }
+
+  pdfPreviewLoaded(pdf: PDFDocumentProxy) {
+    this.previewNumPages = pdf.numPages
+  }
+
 }

From f214fe1b3eb5b8b319d7fabeeb847d7a96cddb50 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 18 Dec 2020 14:44:17 -0800
Subject: [PATCH 0292/1300] Log line

---
 .../app/components/document-detail/document-detail.component.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index a2f80f786..aa3d4e5b8 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -117,8 +117,6 @@ export class DocumentDetailComponent implements OnInit {
     modal.componentInstance.success.subscribe(newCorrespondent => {
       this.correspondentService.listAll().subscribe(correspondents => {
         this.correspondents = correspondents.results
-        console.log(this.documentForm.get('correspondent'), this.documentForm.get('correspondent').setValue);
-
         this.documentForm.get('correspondent').setValue(newCorrespondent.id)
       })
     })

From 2d841e71673559e8853e4f853ffec96e004f8e0a Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 18 Dec 2020 14:47:06 -0800
Subject: [PATCH 0293/1300] Refactor

---
 .../components/document-detail/document-detail.component.html | 4 ++--
 .../components/document-detail/document-detail.component.ts   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 0fec2aa44..e5dde2ad0 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -3,7 +3,7 @@
       <div class="input-group-prepend">
         <div class="input-group-text">Page </div>
       </div>
-      <input class="form-control flex-grow-0 w-auto" type="number" min="1" [max]="previewNumPages" [(ngModel)]="currentPreviewPage" />
+      <input class="form-control flex-grow-0 w-auto" type="number" min="1" [max]="previewNumPages" [(ngModel)]="previewCurrentPage" />
       <div class="input-group-append">
         <div class="input-group-text">of {{previewNumPages}}</div>
       </div>
@@ -138,7 +138,7 @@
 
     <div class="col-md-6 col-xl-8 mb-3">
       <div class="pdf-viewer-container" *ngIf="getContentType() == 'application/pdf'">
-        <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="currentPreviewPage" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer>
+        <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="previewCurrentPage" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer>
       </div>
     </div>
 </div>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index aa3d4e5b8..2b839e969 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -48,7 +48,7 @@ export class DocumentDetailComponent implements OnInit {
     tags: new FormControl([])
   })
 
-  currentPreviewPage: number = 1
+  previewCurrentPage: number = 1
   previewNumPages: number
 
   constructor(

From fbb2da42dc92cabe2379b890e8c3ea0a1fb7d591 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 18 Dec 2020 14:55:21 -0800
Subject: [PATCH 0294/1300] Merge branch 'dev' into feature-bulk-editor

---
 README.md                                     |  25 ++-
 docker/hub/docker-compose.postgres.yml        |   2 +-
 docker/hub/docker-compose.sqlite.yml          |   2 +-
 docs/advanced_usage.rst                       |  36 ++--
 docs/changelog.rst                            |  54 +++++
 docs/usage_overview.rst                       |  14 +-
 scripts/make-release.sh                       |   1 +
 src-ui/package-lock.json                      |   8 +
 src-ui/package.json                           |   1 +
 src-ui/src/app/app.module.ts                  |   7 +-
 .../app-frame/app-frame.component.html        |   7 +-
 .../app-frame/app-frame.component.ts          |   3 +
 .../common/input/select/select.component.html |  18 +-
 .../common/input/select/select.component.scss |   1 +
 .../common/input/tags/tags.component.html     |  45 ++--
 .../common/input/tags/tags.component.scss     |  16 +-
 .../common/input/tags/tags.component.ts       |  23 +-
 .../saved-view-widget.component.html          |   2 +-
 .../document-detail.component.html            |   8 +-
 .../document-detail.component.ts              |   6 +-
 .../document-card-large.component.scss        |   1 +
 .../document-card-small.component.html        |   4 +-
 .../document-list.component.html              |   6 +-
 .../document-list.component.scss              |  24 ++-
 .../document-list/document-list.component.ts  |   1 +
 .../save-view-config-dialog.component.ts      |  15 +-
 .../filter-dropdown-date.component.html       |  51 ++---
 .../filter-dropdown-date.component.ts         | 136 ++++++------
 .../filter-dropdown.component.html            |  12 +-
 .../filter-dropdown.component.scss            |   6 +
 .../filter-dropdown.component.ts              |   2 +-
 .../filter-editor.component.html              |  45 ++--
 .../filter-editor/filter-editor.component.ts  |  64 +++---
 .../correspondent-list.component.html         |  23 +-
 .../correspondent-list.component.ts           |  14 +-
 .../document-type-list.component.html         |  21 +-
 .../document-type-list.component.ts           |  14 +-
 .../generic-list/generic-list.component.ts    |   2 +-
 .../manage/settings/settings.component.ts     |  20 +-
 .../manage/tag-list/tag-list.component.html   |  23 +-
 .../manage/tag-list/tag-list.component.ts     |  15 +-
 .../src/app/interceptors/csrf.interceptor.ts  |   9 +-
 src-ui/src/app/pipes/document-title.pipe.ts   |   2 +-
 .../services/document-list-view.service.ts    |   6 +-
 src-ui/src/assets/save-filter.png             | Bin 8267 -> 8263 bytes
 src-ui/src/environments/environment.prod.ts   |   3 +-
 src-ui/src/styles.scss                        |  42 +++-
 src/documents/admin.py                        |   2 +-
 src/documents/checks.py                       |   3 +-
 src/documents/file_handling.py                |   7 +-
 .../management/commands/decrypt_documents.py  |  13 +-
 src/documents/migrations/1003_mime_types.py   |  17 +-
 .../migrations/1008_auto_20201216_1736.py     |  34 +++
 .../migrations/1009_auto_20201216_2005.py     |  29 +++
 src/documents/models.py                       |  15 +-
 src/documents/parsers.py                      |   6 +-
 src/documents/serialisers.py                  |   8 +-
 src/documents/templates/index.html            |   1 +
 src/documents/tests/test_api.py               | 203 ++++++++----------
 src/documents/tests/test_file_handling.py     |  11 +-
 src/documents/tests/test_index.py             |  21 ++
 src/documents/tests/test_sanity_check.py      |  10 +-
 src/documents/tests/utils.py                  |   3 +-
 src/documents/views.py                        |  19 +-
 src/paperless/version.py                      |   2 +-
 src/paperless_mail/mail.py                    |  10 +-
 src/paperless_mail/tests/test_mail.py         |   4 +-
 src/paperless_text/parsers.py                 |  62 +-----
 src/paperless_text/tests/samples/test.txt     |   1 +
 src/paperless_text/tests/test_parser.py       |  26 +++
 70 files changed, 874 insertions(+), 473 deletions(-)
 create mode 100644 src/documents/migrations/1008_auto_20201216_1736.py
 create mode 100644 src/documents/migrations/1009_auto_20201216_2005.py
 create mode 100644 src/paperless_text/tests/samples/test.txt
 create mode 100644 src/paperless_text/tests/test_parser.py

diff --git a/README.md b/README.md
index 41f85af19..e8ae8feb2 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 [Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and others that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents.
 
-Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, see below.
+Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, have a look at the changelog in the documentation.
 
 This project is still in development and some things may not work as expected.
 
@@ -15,11 +15,13 @@ This project is still in development and some things may not work as expected.
 
 Paperless does not control your scanner, it only helps you deal with what your scanner produces.
 
-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.
-2. 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.
-3. Have the target server run the Paperless consumption script to OCR the file and index it into a local database.
-4. Use the web frontend to sift through the database and find what you want.
-5. Download the PDF you need/want via the web interface and do whatever you like with it.  You can even print it and send it as if it's the original. In most cases, no one will care or notice.
+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.
+
+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.
+4. Download the PDF you need/want via the web interface and do whatever you like with it.  You can even print it and send it as if it's the original. In most cases, no one will care or notice.
 
 Here's what you get:
 
@@ -39,7 +41,6 @@ Here's what you get:
 	* When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them or delete them.
 * Machine learning powered document matching.
 	* Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless.
-* We have a mobile app that offers a 'Share with paperless' option over at https://github.com/qcasey/paperless_share. You can use that in combination with any of the mobile scanning apps out there. It's still a little rough around the edges, but it works!
 * A task processor that processes documents in parallel and also tells you when something goes wrong. On modern multi core systems, consumption is blazing fast.
 * Code cleanup in many, MANY areas. Some of the code from OG paperless was just overly complicated.
 * More tests, more stability.
@@ -78,7 +79,7 @@ The recommended way to deploy paperless is docker-compose. Don't clone the repos
 
 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 information about the individual components of paperless that you need to take care of.
+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.
 
 # Migrating to paperless-ng
 
@@ -102,13 +103,15 @@ If you want to implement something big: Please start a discussion about that in
 
 Paperless has been around a while now, and people are starting to build stuff on top of it.  If you're one of those people, we can add your project to this list:
 
-* [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless. We're working on making this compatible.
+* [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless. Updated to work with paperless-ng.
+* [Paperless Share](https://github.com/qcasey/paperless_share). Share any files from your Android application with paperless. Very simple, but works with all of the mobile scanning apps out there that allow you to share scanned documents.
+
+These projects also exist, but their status and compatibility with paperless-ng is unknown.
+
 * [Paperless Desktop](https://github.com/thomasbrueggemann/paperless-desktop): A desktop UI for your Paperless installation.  Runs on Mac, Linux, and Windows.
 * [ansible-role-paperless](https://github.com/ovv/ansible-role-paperless): An easy way to get Paperless running via Ansible.
 * [paperless-cli](https://github.com/stgarf/paperless-cli): A golang command line binary to interact with a Paperless instance.
 
-Compatibility with Paperless-ng is unknown.
-
 # Important Note
 
 Document scanners are typically used to scan sensitive documents.  Things like your social insurance number, tax records, invoices, etc.  Everything is stored in the clear without encryption by default (it needs to be searchable, so if someone has ideas on how to do that on encrypted data, I'm all ears).  This means that Paperless should never be run on an untrusted host.  Instead, I recommend that if you do want to use it, run it locally on a server in your own home.
diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index 24f0e118f..d33e4c38d 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.6
+    image: jonaswinkler/paperless-ng:0.9.8
     restart: always
     depends_on:
       - db
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index 6ae619fd6..c130dfef6 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.6
+    image: jonaswinkler/paperless-ng:0.9.8
     restart: always
     depends_on:
       - broker
diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst
index b5ae254b3..48a86384c 100644
--- a/docs/advanced_usage.rst
+++ b/docs/advanced_usage.rst
@@ -263,10 +263,10 @@ using the identifier which it has assigned to each document. You will end up get
 files like ``0000123.pdf`` in your media directory. This isn't necessarily a bad
 thing, because you normally don't have to access these files manually. However, if
 you wish to name your files differently, you can do that by adjusting the
-``PAPERLESS_FILENAME_FORMAT`` settings variable.
+``PAPERLESS_FILENAME_FORMAT`` configuration option.
 
-This variable allows you to configure the filename (folders are allowed!) using
-placeholders. For example, setting
+This variable allows you to configure the filename (folders are allowed) using
+placeholders. For example, configuring this to
 
 .. code:: bash
 
@@ -277,17 +277,16 @@ will create a directory structure as follows:
 .. code::
 
     2019/
-      my_bank/
-        statement-january-0000001.pdf
-        statement-february-0000002.pdf
+      My bank/
+        Statement January.pdf
+        Statement February.pdf
     2020/
-      my_bank/
-        statement-january-0000003.pdf
-      shoe_store/
-        my_new_shoes-0000004.pdf
-
-Paperless appends the unique identifier of each document to the filename. This
-avoids filename clashes.
+      My bank/
+        Statement January.pdf
+        Letter.pdf
+        Letter_01.pdf
+      Shoe store/
+        My new shoes.pdf
 
 .. danger::
 
@@ -299,6 +298,7 @@ Paperless provides the following placeholders withing filenames:
 
 * ``{correspondent}``: The name of the correspondent, or "none".
 * ``{document_type}``: The name of the document type, or "none".
+* ``{tag_list}``: A comma separated list of all tags assigned to the document.
 * ``{title}``: The title of the document.
 * ``{created}``: The full date and time the document was created.
 * ``{created_year}``: Year created only.
@@ -309,8 +309,14 @@ Paperless provides the following placeholders withing filenames:
 * ``{added_month}``: Month added only (number 1-12).
 * ``{added_day}``: Day added only (number 1-31).
 
-Paperless will convert all values for the placeholders into values which are safe
-for use in filenames.
+
+Paperless will try to conserve the information from your database as much as possible.
+However, some characters that you can use in document titles and correspondent names (such
+as ``: \ /`` and a couple more) are not allowed in filenames and will be replaced with dashes.
+
+If paperless detects that two documents share the same filename, paperless will automatically
+append ``_01``, ``_02``, etc to the filename. This happens if all the placeholders in a filename
+evaluate to the same value.
 
 .. hint::
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a50fc31d5..a993eb530 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,58 @@
 Changelog
 *********
 
+
+paperless-ng 0.9.8
+##################
+
+This release addresses two severe issues with the previous release.
+
+* The delete buttons for document types, correspondents and tags were not working.
+* The document section in the admin was causing internal server errors (500).
+
+
+paperless-ng 0.9.7
+##################
+
+
+* Front end
+
+  * Thanks to the hard work of `Michael Shamoon`_, paperless now comes with a much more streamlined UI for
+    filtering documents.
+  
+  * `Michael Shamoon`_ replaced the document preview with another component. This should fix compatibility with Safari browsers.
+
+  * Added buttons to the management pages to quickly show all documents with one specific tag, correspondent, or title.
+  
+  * Paperless now stores your saved views on the server and associates them with your user account. 
+    This means that you can access your views on multiple devices and have separate views for different users.
+    You will have to recreate your views.
+
+  * The GitHub and documentation links now open in new tabs/windows. Thanks to `rYR79435`_.
+
+  * Paperless now generates default saved view names when saving views with certain filter rules.
+
+  * Added a small version indicator to the front end.
+
+* Other additions and changes
+
+  * The new filename format field ``{tag_list}`` inserts a list of tags into the filename, separated by comma.
+  * The ``document_retagger`` no longer removes inbox tags or tags without matching rules.
+  * The new configuration option ``PAPERLESS_COOKIE_PREFIX`` allows you to run multiple instances of paperless on different ports.
+    This option enables you to be logged in into multiple instances by specifying different cookie names for each instance.
+
+* Fixes
+  
+  * Sometimes paperless would assign dates in the future to newly consumed documents.
+  * The filename format fields ``{created_month}`` and ``{created_day}`` now use a leading zero for single digit values.
+  * The filename format field ``{tags}`` can no longer be used without arguments.
+  * Paperless was not able to consume many images (especially images from mobile scanners) due to missing DPI information.
+    Paperless now assumes A4 paper size for PDF generation if no DPI information is present.
+  * Documents with empty titles could not be opened from the table view due to the link being empty.
+  * Fixed an issue with filenames containing special characters such as ``:`` not being accepted for upload.
+  * Fixed issues with thumbnail generation for plain text files.
+
+
 paperless-ng 0.9.6
 ##################
 
@@ -841,6 +893,8 @@ bulk of the work on this big change.
 
 * Initial release
 
+.. _rYR79435: https://github.com/rYR79435
+.. _Michael Shamoon: https://github.com/shamoon
 .. _jayme-github: http://github.com/jayme-github
 .. _Brian Conn: https://github.com/TheConnMan
 .. _Christopher Luu: https://github.com/nuudles
diff --git a/docs/usage_overview.rst b/docs/usage_overview.rst
index bb9ecd452..7a4fd7740 100644
--- a/docs/usage_overview.rst
+++ b/docs/usage_overview.rst
@@ -57,9 +57,6 @@ Adding documents to paperless
 #############################
 
 Once you've got Paperless setup, you need to start feeding documents into it.
-Currently, there are four options: the consumption directory, the dashboard, IMAP (email), and
-HTTP POST.
-
 When adding documents to paperless, it will perform the following operations on
 your documents:
 
@@ -112,6 +109,17 @@ Dashboard upload
 The dashboard has a file drop field to upload documents to paperless. Simply drag a file
 onto this field or select a file with the file dialog. Multiple files are supported.
 
+
+Mobile upload
+=============
+
+The mobile app over at `<https://github.com/qcasey/paperless_share>`_ allows Android users
+to share any documents with paperless. This can be combined with any of the mobile
+scanning apps out there, such as Office Lens.
+
+Furthermore, there is the  `Paperless App <https://github.com/bauerj/paperless_app>`_ as well,
+which no only has document upload, but also document editing and browsing.
+
 .. _usage-email:
 
 IMAP (Email)
diff --git a/scripts/make-release.sh b/scripts/make-release.sh
index 0a7bc7a9b..f5c9028fa 100755
--- a/scripts/make-release.sh
+++ b/scripts/make-release.sh
@@ -5,6 +5,7 @@
 # adjust src/paperless/version.py
 # changelog in the documentation
 # adjust versions in docker/hub/*
+# adjust version in src-ui/src/environments/prod
 # If docker-compose was modified: all compose files are the same.
 
 # Steps:
diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json
index 5eca0b3c0..10215a32d 100644
--- a/src-ui/package-lock.json
+++ b/src-ui/package-lock.json
@@ -2056,6 +2056,14 @@
         "tslib": "^2.0.0"
       }
     },
+    "@ng-select/ng-select": {
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/@ng-select/ng-select/-/ng-select-5.0.9.tgz",
+      "integrity": "sha512-YZeSAiS8/Nx/eHZJPmOOYL8YmcvSq+dr1P8WIrsKmRA7mueorBpPc5xlUj+nLQbpLtsiQvdWDQspf/ykOvD/lA==",
+      "requires": {
+        "tslib": "^2.0.0"
+      }
+    },
     "@ngtools/webpack": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.2.0.tgz",
diff --git a/src-ui/package.json b/src-ui/package.json
index 6293f2672..14d828483 100644
--- a/src-ui/package.json
+++ b/src-ui/package.json
@@ -21,6 +21,7 @@
     "@angular/platform-browser-dynamic": "~10.1.5",
     "@angular/router": "~10.1.5",
     "@ng-bootstrap/ng-bootstrap": "^8.0.0",
+    "@ng-select/ng-select": "^5.0.9",
     "bootstrap": "^4.5.0",
     "ng-bootstrap": "^1.6.3",
     "ng2-pdf-viewer": "^6.3.2",
diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 627d4f6cf..6c4cabe92 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -56,6 +56,7 @@ import { FilterPipe } from './pipes/filter.pipe';
 import { DocumentTitlePipe } from './pipes/document-title.pipe';
 import { MetadataCollapseComponent } from './components/document-detail/metadata-collapse/metadata-collapse.component';
 import { SelectDialogComponent } from './components/common/select-dialog/select-dialog.component';
+import { NgSelectModule } from '@ng-select/ng-select';
 
 @NgModule({
   declarations: [
@@ -114,7 +115,8 @@ import { SelectDialogComponent } from './components/common/select-dialog/select-
     ReactiveFormsModule,
     NgxFileDropModule,
     InfiniteScrollModule,
-    PdfViewerModule
+    PdfViewerModule,
+    NgSelectModule
   ],
   providers: [
     DatePipe,
@@ -123,7 +125,8 @@ import { SelectDialogComponent } from './components/common/select-dialog/select-
       useClass: CsrfInterceptor,
       multi: true
     },
-    FilterPipe
+    FilterPipe,
+    DocumentTitlePipe
   ],
   bootstrap: [AppComponent]
 })
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 7876150af..2458005f4 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -17,6 +17,11 @@
 <div class="container-fluid">
   <div class="row">
     <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse" [ngbCollapse]="isMenuCollapsed">
+
+      <div style="position: absolute; bottom: 0; left: 0;" class="text-muted p-1">
+        {{versionString}}
+      </div>
+
       <div class="sidebar-sticky pt-3">
         <ul class="nav flex-column">
           <li class="nav-item">
@@ -60,7 +65,7 @@
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#file-text"/>
               </svg>
-              {{d.title}}
+              {{d.title | documentTitle}}
             </a>
           </li>
           <li class="nav-item w-100" *ngIf="openDocuments.length > 1">
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts
index ef859bf35..c4c00843d 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.ts
+++ b/src-ui/src/app/components/app-frame/app-frame.component.ts
@@ -7,6 +7,7 @@ import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { OpenDocumentsService } from 'src/app/services/open-documents.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { SearchService } from 'src/app/services/rest/search.service';
+import { environment } from 'src/environments/environment';
 import { DocumentDetailComponent } from '../document-detail/document-detail.component';
   
 @Component({
@@ -25,6 +26,8 @@ export class AppFrameComponent implements OnInit, OnDestroy {
     ) {
   }
 
+  versionString = `${environment.appTitle} ${environment.version}`
+
   isMenuCollapsed: boolean = true
 
   closeMenu() {
diff --git a/src-ui/src/app/components/common/input/select/select.component.html b/src-ui/src/app/components/common/input/select/select.component.html
index 717aa7964..655adbe74 100644
--- a/src-ui/src/app/components/common/input/select/select.component.html
+++ b/src-ui/src/app/components/common/input/select/select.component.html
@@ -1,11 +1,15 @@
-<div class="form-group">
+<div class="form-group paperless-input-select">
   <label [for]="inputId">{{title}}</label>
   <div [class.input-group]="showPlusButton()">
-    <select class="form-control" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)" (blur)="onTouched()"
-      [disabled]="disabled" [style.color]="textColor" [style.background]="backgroundColor">
-      <option *ngIf="allowNull" [ngValue]="null" class="form-control">---</option>
-      <option *ngFor="let i of items" [ngValue]="i.id" class="form-control">{{i.name}}</option>
-    </select>
+    <ng-select name="correspondent" [(ngModel)]="value"
+      [disabled]="disabled"
+      [style.color]="textColor"
+      [style.background]="backgroundColor"
+      (change)="onChange(value)"
+      (blur)="onTouched()">
+      <ng-option *ngFor="let i of items" [value]="i.id">{{i.name}}</ng-option>
+    </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">
@@ -15,4 +19,4 @@
     </div>
   </div>
   <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
-</div>
\ No newline at end of file
+</div>
diff --git a/src-ui/src/app/components/common/input/select/select.component.scss b/src-ui/src/app/components/common/input/select/select.component.scss
index e69de29bb..8faec3bc0 100644
--- a/src-ui/src/app/components/common/input/select/select.component.scss
+++ b/src-ui/src/app/components/common/input/select/select.component.scss
@@ -0,0 +1 @@
+// styles for ng-select child are in styles.scss
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html
index 8029dd860..8a5dbc4f2 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.html
+++ b/src-ui/src/app/components/common/input/tags/tags.component.html
@@ -1,30 +1,41 @@
-<div class="form-group">
-  <label for="exampleFormControlTextarea1">Tags</label>
+<div class="form-group paperless-input-select paperless-input-tags">
+  <label for="tags">Tags</label>
 
-  <div class="input-group">
-    <div class="form-control tags-form-control" id="tags">
-      <app-tag class="mr-2" *ngFor="let id of displayValue" [tag]="getTag(id)" (click)="removeTag(id)"></app-tag>
-    </div>
+  <div class="input-group flex-nowrap">
+    <ng-select name="tags" [items]="tags" bindLabel="name" bindValue="id" [(ngModel)]="displayValue"
+      [multiple]="true"
+      [closeOnSelect]="false"
+      [disabled]="disabled"
+      (change)="ngSelectChange()">
 
-    <div class="input-group-append" ngbDropdown placement="top-right">
-      <button class="btn btn-outline-secondary" type="button" ngbDropdownToggle></button>
-      <div ngbDropdownMenu class="scrollable-menu shadow">
-        <button type="button" *ngFor="let tag of tags" ngbDropdownItem (click)="addTag(tag.id)">
-          <app-tag [tag]="tag"></app-tag>
-        </button>
-      </div>
-    </div>
+      <ng-template ng-label-tmp let-item="item">
+        <span class="tag-wrap tag-wrap-delete" (click)="removeTag(item.id)">
+          <svg width="1.2em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <use xlink:href="assets/bootstrap-icons.svg#x"/>
+          </svg>
+          <app-tag style="background-color: none;" [tag]="getTag(item.id)"></app-tag>
+        </span>
+      </ng-template>
+      <ng-template ng-option-tmp let-item="item" let-index="index" let-search="searchTerm">
+        <div class="tag-wrap">
+          <div class="selected-icon d-inline-block mr-1">
+            <svg *ngIf="displayValue.includes(item.id)" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+              <use xlink:href="assets/bootstrap-icons.svg#check"/>
+            </svg>
+          </div>
+          <app-tag class="mr-2" [tag]="getTag(item.id)"></app-tag>
+        </div>
+      </ng-template>
+    </ng-select>
 
     <div class="input-group-append">
-
       <button class="btn btn-outline-secondary" type="button" (click)="createTag()">
         <svg class="buttonicon" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#plus" />
         </svg>
       </button>
     </div>
-
   </div>
   <small class="form-text text-muted" *ngIf="hint">{{hint}}</small>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.scss b/src-ui/src/app/components/common/input/tags/tags.component.scss
index f2635b7f2..2eaaa4f6d 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.scss
+++ b/src-ui/src/app/components/common/input/tags/tags.component.scss
@@ -1,10 +1,12 @@
-.tags-form-control {
-  height: auto;
+.selected-icon {
+  min-width: 1em;
+  min-height: 1em;
 }
 
+.tag-wrap {
+  font-size: 1rem;
+}
 
-.scrollable-menu {
-  height: auto;
-  max-height: 300px;
-  overflow-x: hidden;
-}
\ No newline at end of file
+.tag-wrap-delete {
+  cursor: pointer;
+}
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.ts b/src-ui/src/app/components/common/input/tags/tags.component.ts
index cca99cc55..5501ac5a6 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.ts
+++ b/src-ui/src/app/components/common/input/tags/tags.component.ts
@@ -21,7 +21,7 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
 
 
   onChange = (newValue: number[]) => {};
-  
+
   onTouched = () => {};
 
   writeValue(newValue: number[]): void {
@@ -66,29 +66,28 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
   removeTag(id) {
     let index = this.displayValue.indexOf(id)
     if (index > -1) {
-      this.displayValue.splice(index, 1)
+      let oldValue = this.displayValue
+      oldValue.splice(index, 1)
+      this.displayValue = [...oldValue]
       this.onChange(this.displayValue)
     }
   }
 
-  addTag(id) {
-    let index = this.displayValue.indexOf(id)
-    if (index == -1) {
-      this.displayValue.push(id)
-      this.onChange(this.displayValue)
-    }
-  }
-
-
   createTag() {
     var modal = this.modalService.open(TagEditDialogComponent, {backdrop: 'static'})
     modal.componentInstance.dialogMode = 'create'
     modal.componentInstance.success.subscribe(newTag => {
       this.tagService.listAll().subscribe(tags => {
         this.tags = tags.results
-        this.addTag(newTag.id)
+        this.displayValue = [...this.displayValue, newTag.id]
+        this.onChange(this.displayValue)
       })
     })
   }
 
+  ngSelectChange() {
+    this.value = this.displayValue
+    this.onChange(this.displayValue)
+  }
+
 }
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
index 194497d39..f50708af3 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
@@ -13,7 +13,7 @@
     <tbody>
       <tr *ngFor="let doc of documents" routerLink="/documents/{{doc.id}}">
         <td>{{doc.created | date}}</td>
-        <td>{{doc.title}}<app-tag [tag]="t" *ngFor="let t of doc.tags$ | async" class="ml-1"></app-tag>
+        <td>{{doc.title | documentTitle}}<app-tag [tag]="t" *ngFor="let t of doc.tags$ | async" class="ml-1"></app-tag>
       </tr>
     </tbody>
   </table>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index c0114f709..a3bc7e1e6 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -52,9 +52,9 @@
                         </div>
                         <app-input-date-time titleDate="Date created" formControlName="created"></app-input-date-time>
                         <app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent"
-                            allowNull="true" (createNew)="createCorrespondent()"></app-input-select>
+                            (createNew)="createCorrespondent()"></app-input-select>
                         <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type"
-                            allowNull="true" (createNew)="createDocumentType()"></app-input-select>
+                            (createNew)="createDocumentType()"></app-input-select>
                         <app-input-tags formControlName="tags" title="Tags"></app-input-tags>
 
                     </ng-template>
@@ -110,8 +110,8 @@
                             </tbody>
                         </table>
 
-                        <app-metadata-collapse title="Original document metadata" [metadata]="metadata.original_metadata" *ngIf="metadata?.original_metadata.length > 0"></app-metadata-collapse>
-                        <app-metadata-collapse title="Archived document metadata" [metadata]="metadata.archive_metadata" *ngIf="metadata?.archive_metadata.length > 0"></app-metadata-collapse>
+                        <app-metadata-collapse title="Original document metadata" [metadata]="metadata.original_metadata" *ngIf="metadata?.original_metadata?.length > 0"></app-metadata-collapse>
+                        <app-metadata-collapse title="Archived document metadata" [metadata]="metadata.archive_metadata" *ngIf="metadata?.archive_metadata?.length > 0"></app-metadata-collapse>
 
                     </ng-template>
                 </li>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 5fe9f9250..b4005b920 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -6,6 +6,7 @@ import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { PaperlessDocumentMetadata } from 'src/app/data/paperless-document-metadata';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
+import { DocumentTitlePipe } from 'src/app/pipes/document-title.pipe';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { OpenDocumentsService } from 'src/app/services/open-documents.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
@@ -54,7 +55,8 @@ export class DocumentDetailComponent implements OnInit {
     private router: Router,
     private modalService: NgbModal,
     private openDocumentService: OpenDocumentsService,
-    private documentListViewService: DocumentListViewService) { }
+    private documentListViewService: DocumentListViewService,
+    private documentTitlePipe: DocumentTitlePipe) { }
 
   getContentType() {
     return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type
@@ -90,7 +92,7 @@ export class DocumentDetailComponent implements OnInit {
     this.documentsService.getMetadata(doc.id).subscribe(result => {
       this.metadata = result
     })
-    this.title = doc.title
+    this.title = this.documentTitlePipe.transform(doc.title)
     this.documentForm.patchValue(doc)
   }
 
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
index d6be8837e..11fb10562 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
@@ -1,5 +1,6 @@
 .result-content {
   color: darkgray;
+  overflow-wrap: anywhere;
 }
 
 .doc-img {
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 378047602..948d585f4 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -31,7 +31,7 @@
     </div>
     <div class="card-footer">
 
-      <div class="d-flex justify-content-between align-items-center ml-n2">
+      <div class="d-flex justify-content-between align-items-center mx-n2">
         <div class="btn-group">
           <a routerLink="/documents/{{document.id}}" class="btn btn-sm btn-outline-secondary" title="Edit">
             <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-pencil" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -51,7 +51,7 @@
             </svg>
           </a>
         </div>
-        <small class="text-muted">{{document.created | date}}</small>
+        <small class="text-muted pl-1">{{document.created | date}}</small>
       </div>
 
     </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index a88ad65b7..5b4511866 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -77,7 +77,7 @@
 
 </app-page-header>
 
-<div class="w-100 mb-4">
+<div class="w-100 mb-2 mb-sm-4">
   <app-filter-editor [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
 </div>
 
@@ -135,7 +135,7 @@
       </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)"></app-tag>
+        <app-tag [tag]="t" *ngFor="let t of d.tags$ | async" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="clickTag(t.id)"></app-tag>
       </td>
       <td class="d-none d-xl-table-cell">
         <ng-container *ngIf="d.document_type">
@@ -154,5 +154,5 @@
 
 
 <div class=" m-n2 row" *ngIf="displayMode == 'smallCards'">
-  <app-document-card-small [selected]="list.isSelected(d)" (selectedChange)="list.setSelected(d, $event)"  [document]="d" *ngFor="let d of list.documents" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
+  <app-document-card-small [selected]="list.isSelected(d)" (selectedChange)="list.setSelected(d, $event)" [document]="d" *ngFor="let d of list.documents" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
 </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss
index b9553930b..d7c08abec 100644
--- a/src-ui/src/app/components/document-list/document-list.component.scss
+++ b/src-ui/src/app/components/document-list/document-list.component.scss
@@ -2,4 +2,26 @@
 
 .table-row-selected {
   background-color: $primaryFaded;
-}
\ No newline at end of file
+}
+
+$paperless-card-breakpoints: (
+  0: 2, // xs
+  768px: 3, //md
+  992px: 4, //lg
+  1200px: 5, //xl
+  1400px: 6, // xxl
+  1600px: 7,
+  1800px: 8,
+  2000px: 9
+);
+
+.row-cols-paperless-cards {
+  @each $width, $n_cols in $paperless-card-breakpoints {
+    @media(min-width: $width) {
+      > * {
+        flex: 0 0 auto;
+        width: 100% / $n_cols;
+      }
+    }
+  }
+}
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 0a6fa4352..a8bdf89d3 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -98,6 +98,7 @@ export class DocumentListComponent implements OnInit {
 
   saveViewConfigAs() {
     let modal = this.modalService.open(SaveViewConfigDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.defaultName = this.filterEditor.generateFilterName()
     modal.componentInstance.saveClicked.subscribe(formValue => {
       let savedView = {
         name: formValue.name,
diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
index 284be49f6..8f0eb26f2 100644
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
@@ -14,6 +14,19 @@ export class SaveViewConfigDialogComponent implements OnInit {
   @Output()
   public saveClicked = new EventEmitter()
 
+  _defaultName = ""
+
+  get defaultName() {
+    return this._defaultName
+  }
+
+  @Input()
+  set defaultName(value: string) {
+    this._defaultName = value
+    this.saveViewConfigForm.patchValue({name: value})
+  }
+  
+
   saveViewConfigForm = new FormGroup({
     name: new FormControl(''),
     showInSideBar: new FormControl(false),
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
index 6f6a42fe2..aca6e836c 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -4,38 +4,39 @@
   </button>
   <div class="dropdown-menu date-filter shadow pt-0" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
-        <button class="list-group-item small list-goup list-group-item-action d-flex p-2 pl-3" (click)="clear()">Clear</button>
-        <button *ngFor="let range of [7, 30, 'month', 'year']" class="list-group-item small list-goup list-group-item-action d-flex p-2 pl-3" role="menuitem" (click)="setDateQuickFilter(range)">
-          <ng-container *ngIf="isStringRange(range)">This </ng-container>
-          {{ range }}
-          <ng-container *ngIf="!isStringRange(range)"> days</ng-container>
+        <button *ngFor="let qf of quickFilters" class="list-group-item small list-goup list-group-item-action d-flex p-2 pl-3" role="menuitem" (click)="setDateQuickFilter(qf.id)">
+          {{qf.name}}
         </button>
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
-          <div>Before</div>
+
+          <div class="mb-2 d-flex flex-row w-100 justify-content-between small">
+            <div>After</div>
+            <a *ngIf="dateAfter" class="btn btn-link p-0 m-0" (click)="clearAfter()">
+              <svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
+              </svg>
+              <small>Clear</small>
+            </a>
+          </div>
+
           <div class="input-group input-group-sm">
-            <input class="form-control" type="text" placeholder="yyyy-mm-dd" name="before" [(ngModel)]="_dateBefore" [maxDate]="this._maxDate" ngbDatepicker (dateSelect)="onBeforeSelected($event)" #dpBefore="ngbDatepicker">
-            <div class="input-group-append">
-              <button class="btn btn-outline-secondary btn-sm" (click)="dpBefore.toggle()" type="button">
-                <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                  <path fill-rule="evenodd" 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"/>
-                  <path d="M6.445 11.688V6.354h-.633A12.6 12.6 0 0 0 4.5 7.16v.695c.375-.257.969-.62 1.258-.777h.012v4.61h.675zm1.188-1.305c.047.64.594 1.406 1.703 1.406 1.258 0 2-1.066 2-2.871 0-1.934-.781-2.668-1.953-2.668-.926 0-1.797.672-1.797 1.809 0 1.16.824 1.77 1.676 1.77.746 0 1.23-.376 1.383-.79h.027c-.004 1.316-.461 2.164-1.305 2.164-.664 0-1.008-.45-1.05-.82h-.684zm2.953-2.317c0 .696-.559 1.18-1.184 1.18-.601 0-1.144-.383-1.144-1.2 0-.823.582-1.21 1.168-1.21.633 0 1.16.398 1.16 1.23z"/>
-                </svg>
-              </button>
-            </div>
+            <input type="date" class="form-control" id="date_after" [(ngModel)]="dateAfter" (change)="onChangeDebounce()">
           </div>
         </div>
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
-          <div>After</div>
+
+          <div class="mb-2 d-flex flex-row w-100 justify-content-between small">
+            <div>Before</div>
+            <a *ngIf="dateBefore" class="btn btn-link p-0 m-0" (click)="clearBefore()">
+              <svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
+              </svg>
+              <small>Clear</small>
+            </a>
+          </div>
+
           <div class="input-group input-group-sm">
-            <input class="form-control form-control-sm" type="text" placeholder="yyyy-mm-dd" name="after" [(ngModel)]="_dateAfter" [maxDate]="this._maxDate" ngbDatepicker (dateSelect)="onAfterSelected($event)" #dpAfter="ngbDatepicker">
-            <div class="input-group-append">
-              <button class="btn btn-outline-secondary btn-sm" (click)="dpAfter.toggle()" type="button">
-                <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                  <path fill-rule="evenodd" 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"/>
-                  <path d="M6.445 11.688V6.354h-.633A12.6 12.6 0 0 0 4.5 7.16v.695c.375-.257.969-.62 1.258-.777h.012v4.61h.675zm1.188-1.305c.047.64.594 1.406 1.703 1.406 1.258 0 2-1.066 2-2.871 0-1.934-.781-2.668-1.953-2.668-.926 0-1.797.672-1.797 1.809 0 1.16.824 1.77 1.676 1.77.746 0 1.23-.376 1.383-.79h.027c-.004 1.316-.461 2.164-1.305 2.164-.664 0-1.008-.45-1.05-.82h-.684zm2.953-2.317c0 .696-.559 1.18-1.184 1.18-.601 0-1.144-.383-1.144-1.2 0-.823.582-1.21 1.168-1.21.633 0 1.16.398 1.16 1.23z"/>
-                </svg>
-              </button>
-            </div>
+            <input type="date" class="form-control" id="date_before" [(ngModel)]="dateBefore" (change)="onChangeDebounce()">
           </div>
         </div>
     </div>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
index 806027f9c..e570862cd 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
@@ -1,25 +1,37 @@
-import { Component, EventEmitter, Input, Output, ElementRef, ViewChild, SimpleChange } from '@angular/core';
-import { NgbDate, NgbDateStruct, NgbDatepicker } from '@ng-bootstrap/ng-bootstrap';
-
+import { formatDate } from '@angular/common';
+import { Component, EventEmitter, Input, Output, OnInit, OnDestroy } from '@angular/core';
+import { Subject, Subscription } from 'rxjs';
+import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 
 export interface DateSelection {
-  before?: NgbDateStruct
-  after?: NgbDateStruct
+  before?: string
+  after?: string
 }
 
+const FILTER_LAST_7_DAYS = 0
+const FILTER_LAST_MONTH = 1
+const FILTER_LAST_3_MONTHS = 2
+const FILTER_LAST_YEAR = 3
 
 @Component({
   selector: 'app-filter-dropdown-date',
   templateUrl: './filter-dropdown-date.component.html',
   styleUrls: ['./filter-dropdown-date.component.scss']
 })
-export class FilterDropdownDateComponent {
+export class FilterDropdownDateComponent implements OnInit, OnDestroy {
+
+  quickFilters = [
+    {id: FILTER_LAST_7_DAYS, name: "Last 7 days"}, 
+    {id: FILTER_LAST_MONTH, name: "Last month"},
+    {id: FILTER_LAST_3_MONTHS, name: "Last 3 months"},
+    {id: FILTER_LAST_YEAR, name: "Last year"}
+  ]
 
   @Input()
-  dateBefore: NgbDateStruct
+  dateBefore: string
 
   @Input()
-  dateAfter: NgbDateStruct
+  dateAfter: string
 
   @Input()
   title: string
@@ -27,83 +39,65 @@ export class FilterDropdownDateComponent {
   @Output()
   datesSet = new EventEmitter<DateSelection>()
 
-  @ViewChild('dpAfter') dpAfter: NgbDatepicker
-  @ViewChild('dpBefore') dpBefore: NgbDatepicker
+  private datesSetDebounce$ = new Subject()
 
-  _dateBefore: NgbDateStruct
-  _dateAfter: NgbDateStruct
-
-  get _maxDate(): NgbDate {
-    let date = new Date()
-    return NgbDate.from({year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate()})
+  private sub: Subscription
+  
+  ngOnInit() {
+    this.sub = this.datesSetDebounce$.pipe(
+      debounceTime(400)
+    ).subscribe(() => {
+      this.onChange()
+    })
   }
 
-  isStringRange(range: any) {
-    return typeof range == 'string'
-  }
-
-  ngOnChanges(changes: SimpleChange) {
-    // this is a hacky workaround perhaps because of https://github.com/angular/angular/issues/11097
-    let dateString: string = ''
-    let dateAfterChange: SimpleChange
-    let dateBeforeChange: SimpleChange
-    if (changes) {
-      dateAfterChange = changes['dateAfter']
-      dateBeforeChange = changes['dateBefore']
+  ngOnDestroy() {
+    if (this.sub) {
+      this.sub.unsubscribe()
     }
+  }
 
-    if (this.dpBefore && this.dpAfter) {
-      let dpAfterElRef: ElementRef = this.dpAfter['_elRef']
-      let dpBeforeElRef: ElementRef = this.dpBefore['_elRef']
+  setDateQuickFilter(qf: number) {
+    this.dateBefore = null
+    let date = new Date()
+    switch (qf) {
+      case FILTER_LAST_7_DAYS:
+        date.setDate(date.getDate() - 7)
+        break;
 
-      if (dateAfterChange && dateAfterChange.currentValue) {
-        let dateAfterDate = dateAfterChange.currentValue as NgbDateStruct
-        dateString = `${dateAfterDate.year}-${dateAfterDate.month.toString().padStart(2,'0')}-${dateAfterDate.day.toString().padStart(2,'0')}`
-        dpAfterElRef.nativeElement.value = dateString
-      } else if (dateBeforeChange && dateBeforeChange.currentValue) {
-        let dateBeforeDate = dateBeforeChange.currentValue as NgbDateStruct
-        dateString = `${dateBeforeDate.year}-${dateBeforeDate.month.toString().padStart(2,'0')}-${dateBeforeDate.day.toString().padStart(2,'0')}`
-        dpBeforeElRef.nativeElement.value = dateString
-      } else {
-        dpAfterElRef.nativeElement.value = dateString
-        dpBeforeElRef.nativeElement.value = dateString
+      case FILTER_LAST_MONTH:
+        date.setMonth(date.getMonth() - 1)
+        break;
+
+      case FILTER_LAST_3_MONTHS:
+        date.setMonth(date.getMonth() - 3)
+        break
+
+      case FILTER_LAST_YEAR:
+        date.setFullYear(date.getFullYear() - 1)
+        break
+  
       }
-    }
+    this.dateAfter = formatDate(date, 'yyyy-MM-dd', "en-us", "UTC")
+    this.onChange()
   }
 
-  setDateQuickFilter(range: any) {
-    this._dateAfter = this._dateBefore = undefined
-    let date = new Date()
-    let newDate: NgbDateStruct = { year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate() }
-    switch (typeof range) {
-      case 'number':
-        date.setDate(date.getDate() - range)
-        newDate.year = date.getFullYear()
-        newDate.month = date.getMonth() + 1
-        newDate.day = date.getDate()
-        break
-
-      case 'string':
-        newDate.day = 1
-        if (range == 'year') newDate.month = 1
-        break
-
-      default:
-        break
-    }
-    this._dateAfter = newDate
-    this.datesSet.emit({after: newDate, before: null})
+  onChange() {
+    this.datesSet.emit({after: this.dateAfter, before: this.dateBefore})
   }
 
-  onBeforeSelected(date: NgbDateStruct) {
-    this.datesSet.emit({after: this._dateAfter, before: date})
+  onChangeDebounce() {
+    this.datesSetDebounce$.next({after: this.dateAfter, before: this.dateBefore})
   }
 
-  onAfterSelected(date: NgbDateStruct) {
-    this.datesSet.emit({after: date, before: this._dateBefore})
+  clearBefore() {
+    this.dateBefore = null;
+    this.onChange()
   }
 
-  clear() {
-    this.datesSet.emit({after: null, before: null})
+  clearAfter() {
+    this.dateAfter = null;
+    this.onChange()
   }
+
 }
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index 5de9228bd..d0cbfc3c9 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -1,6 +1,16 @@
 <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #filterDropdown="ngbDropdown">
   <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="itemsSelected?.length > 0 ? 'btn-primary' : 'btn-outline-primary'">
-    {{title}}
+    <div class="d-none d-md-inline">{{title}}</div>
+    <div class="d-inline-block d-md-none">
+      <svg class="toolbaricon" fill="currentColor">
+        <use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
+      </svg>
+    </div>
+    <ng-container *ngIf="itemsSelected?.length > 0">
+      <div class="badge bg-secondary text-light rounded-pill badge-corner">
+        {{itemsSelected?.length}}
+      </div>
+    </ng-container>
   </button>
   <div class="dropdown-menu py-0 shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
index d34729eee..40c93838f 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
@@ -1,3 +1,9 @@
+.badge-corner {
+  position: absolute;
+  top: -8px;
+  right: -8px;
+}
+
 .dropdown-menu {
   min-width: 250px;
 
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index d675e14f1..b9d3fca6f 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -22,7 +22,7 @@ export class FilterDropdownComponent {
   title: string
 
   @Input()
-  display: string
+  icon: string
 
   @Output()
   toggle = new EventEmitter()
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index e07edba14..6847a2902 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -1,22 +1,27 @@
-<div class="form-row form-group mb-0">
-  <div class="col-auto">
-    <div class="text-muted mt-1">Filter by:</div>
+<div class="row">
+   <div class="col mb-2 mb-xl-0">
+     <div class="form-inline d-flex">
+         <label class="text-muted mr-2">Filter by:</label>
+         <input class="form-control form-control-sm flex-grow-1" type="text" [(ngModel)]="titleFilter" placeholder="Title">
+     </div>
   </div>
-  <div class="col">
-    <input class="form-control form-control-sm" type="text" [(ngModel)]="titleFilter" placeholder="Title">
-  </div>
-
-  <app-filter-dropdown class="col-auto" [items]="tags" [itemsSelected]="selectedTags" title="Tags" (toggle)="toggleTag($event.id)"></app-filter-dropdown>
-  <app-filter-dropdown class="col-auto" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" (toggle)="toggleCorrespondent($event.id)"></app-filter-dropdown>
-  <app-filter-dropdown class="col-auto" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document types" (toggle)="toggleDocumentType($event.id)"></app-filter-dropdown>
-
-  <app-filter-dropdown-date class="col-auto" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (datesSet)="onDatesCreatedSet($event)"></app-filter-dropdown-date>
-  <app-filter-dropdown-date class="col-auto" [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (datesSet)="onDatesAddedSet($event)"></app-filter-dropdown-date>
-
-  <button class="btn btn-link btn-sm" [disabled]="!hasFilters()" (click)="clearSelected()">
-    <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
-      <use xlink:href="assets/bootstrap-icons.svg#x" />
-    </svg>
-    Clear all filters
-  </button>
+  <div class="w-100 d-xl-none"></div>
+   <div class="col col-xl-auto mb-2 mb-xl-0">
+     <div class="d-flex">
+       <app-filter-dropdown class="mr-2 mr-md-3" [items]="tags" [itemsSelected]="selectedTags" title="Tags" icon="tag-fill" (toggle)="toggleTag($event.id)"></app-filter-dropdown>
+       <app-filter-dropdown class="mr-2 mr-md-3" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" icon="person-fill" (toggle)="toggleCorrespondent($event.id)"></app-filter-dropdown>
+       <app-filter-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document types" icon="file-earmark-fill" (toggle)="toggleDocumentType($event.id)"></app-filter-dropdown>
+       <app-filter-dropdown-date class="mr-2 mr-md-3" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (datesSet)="onDatesCreatedSet($event)"></app-filter-dropdown-date>
+       <app-filter-dropdown-date [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (datesSet)="onDatesAddedSet($event)"></app-filter-dropdown-date>
+     </div>
+   </div>
+   <div class="w-100 d-xl-none"></div>
+   <div class="col col-xl-auto mb-2 mb-xl-0">
+     <button class="btn btn-link btn-sm px-0 mx-0 ml-xl-n4" [disabled]="!hasFilters()" (click)="clearSelected()">
+       <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+         <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+       </svg>
+       Clear all filters
+     </button>
+   </div>
 </div>
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index f98b9517f..913c738a5 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -19,6 +19,26 @@ import { DateSelection } from './filter-dropdown-date/filter-dropdown-date.compo
 })
 export class FilterEditorComponent implements OnInit, OnDestroy {
 
+  generateFilterName() {
+    if (this.filterRules.length == 1) {
+      let rule = this.filterRules[0]
+      switch(this.filterRules[0].rule_type) {
+        
+        case FILTER_CORRESPONDENT:
+          return `Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}`
+
+        case FILTER_DOCUMENT_TYPE:
+          return `Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}`
+
+        case FILTER_HAS_TAG:
+          return `Tag: ${this.tags.find(t => t.id == +rule.value)?.name}`
+
+      }
+    }
+
+    return ""
+  }
+
   constructor(
     private documentTypeService: DocumentTypeService,
     private tagService: TagService,
@@ -159,65 +179,61 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     this.applyFilters()
   }
 
-  get dateCreatedBefore(): NgbDateStruct {
+  get dateCreatedBefore(): string {
     let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_BEFORE)
-    return createdBeforeRule ? this.dateParser.parse(createdBeforeRule.value) : null
+    return createdBeforeRule ? createdBeforeRule.value : null
   }
 
-  get dateCreatedAfter(): NgbDateStruct {
+  get dateCreatedAfter(): string {
     let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_AFTER)
-    return createdAfterRule ? this.dateParser.parse(createdAfterRule.value) : null
+    return createdAfterRule ? createdAfterRule.value : null
   }
 
-  get dateAddedBefore(): NgbDateStruct {
+  get dateAddedBefore(): string {
     let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_BEFORE)
-    return addedBeforeRule ? this.dateParser.parse(addedBeforeRule.value) : null
+    return addedBeforeRule ? addedBeforeRule.value : null
   }
 
-  get dateAddedAfter(): NgbDateStruct {
+  get dateAddedAfter(): string {
     let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_AFTER)
-    return addedAfterRule ? this.dateParser.parse(addedAfterRule.value) : null
+    return addedAfterRule ? addedAfterRule.value : null
   }
 
-  setDateCreatedBefore(date?: NgbDateStruct) {
+  setDateCreatedBefore(date?: string) {
     if (date) this.setDateFilter(date, FILTER_CREATED_BEFORE)
     else this.clearDateFilter(FILTER_CREATED_BEFORE)
   }
 
-  setDateCreatedAfter(date?: NgbDateStruct) {
+  setDateCreatedAfter(date?: string) {
     if (date) this.setDateFilter(date, FILTER_CREATED_AFTER)
     else this.clearDateFilter(FILTER_CREATED_AFTER)
   }
 
-  setDateAddedBefore(date?: NgbDateStruct) {
+  setDateAddedBefore(date?: string) {
     if (date) this.setDateFilter(date, FILTER_ADDED_BEFORE)
     else this.clearDateFilter(FILTER_ADDED_BEFORE)
   }
 
-  setDateAddedAfter(date?: NgbDateStruct) {
+  setDateAddedAfter(date?: string) {
     if (date) this.setDateFilter(date, FILTER_ADDED_AFTER)
     else this.clearDateFilter(FILTER_ADDED_AFTER)
   }
 
-  setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) {
-    let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID)
-    let newValue = this.dateParser.format(date)
+  setDateFilter(date: string, dateRuleTypeID: number) {
+    let existingRule = this.filterRules.find(rule => rule.rule_type == dateRuleTypeID)
 
     if (existingRule) {
-      existingRule.value = newValue
+      existingRule.value = date
     } else {
-      filterRules.push({rule_type: dateRuleTypeID, value: newValue})
+      this.filterRules.push({rule_type: dateRuleTypeID, value: date})
     }
-
-    this.filterRules = filterRules
   }
 
   clearDateFilter(dateRuleTypeID: number) {
-    let filterRules = this.filterRules
-    let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID)
-    filterRules.splice(filterRules.indexOf(existingRule), 1)
-    this.filterRules = filterRules
+    let ruleIndex = this.filterRules.findIndex(rule => rule.rule_type == dateRuleTypeID)
+    if (ruleIndex != -1) {
+      this.filterRules.splice(ruleIndex, 1)
+    }
   }
 
 }
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
index 27aa4d366..2efd1c58d 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
@@ -26,9 +26,26 @@
       <td scope="row">{{ correspondent.last_correspondence | date }}</td>
         <td scope="row">
           <div class="btn-group">
-          <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(correspondent)">Edit</button>
-          <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(correspondent)">Delete</button>
-        </div>
+            <button class="btn btn-sm btn-outline-secondary" (click)="filterDocuments(correspondent)">
+              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-funnel" viewBox="0 0 16 16">
+                <path fill-rule="evenodd" d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2zm1 .5v1.308l4.372 4.858A.5.5 0 0 1 7 8.5v5.306l2-.666V8.5a.5.5 0 0 1 .128-.334L13.5 3.308V2h-11z"/>
+              </svg>
+              Documents
+            </button>
+            <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(correspondent)">
+              <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>
+              Edit
+            </button>
+            <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(correspondent)">
+              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
+                <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
+                <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4L4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
+              </svg>
+              Delete
+            </button>
+          </div>
         </td>
     </tr>
     </tbody>
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
index effae2826..a128340b9 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
@@ -1,6 +1,9 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { FILTER_CORRESPONDENT } from 'src/app/data/filter-rule-type';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
+import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/correspondent-edit-dialog.component';
@@ -12,7 +15,10 @@ import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/co
 })
 export class CorrespondentListComponent extends GenericListComponent<PaperlessCorrespondent> {
 
-  constructor(correspondentsService: CorrespondentService, modalService: NgbModal,) { 
+  constructor(correspondentsService: CorrespondentService, modalService: NgbModal,
+    private router: Router,
+    private list: DocumentListViewService
+  ) { 
     super(correspondentsService,modalService,CorrespondentEditDialogComponent)
   }
 
@@ -20,4 +26,10 @@ export class CorrespondentListComponent extends GenericListComponent<PaperlessCo
     return `correspondent '${object.name}'`
   }
 
+  filterDocuments(object: PaperlessCorrespondent) {
+    this.list.documentListView.filter_rules = [
+      {rule_type: FILTER_CORRESPONDENT, value: object.id.toString()}
+    ]
+    this.router.navigate(["documents"])
+  }
 }
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
index 78c86daf3..d2ffab400 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
@@ -25,8 +25,25 @@
       <td scope="row">{{ document_type.document_count }}</td>
       <td scope="row">
         <div class="btn-group">
-          <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(document_type)">Edit</button>
-          <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(document_type)">Delete</button>
+          <button class="btn btn-sm btn-outline-secondary" (click)="filterDocuments(document_type)">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-funnel" viewBox="0 0 16 16">
+              <path fill-rule="evenodd" d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2zm1 .5v1.308l4.372 4.858A.5.5 0 0 1 7 8.5v5.306l2-.666V8.5a.5.5 0 0 1 .128-.334L13.5 3.308V2h-11z"/>
+            </svg>
+            Documents
+          </button>
+          <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(document_type)">
+            <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>
+            Edit
+          </button>
+          <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(document_type)">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
+              <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
+              <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4L4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
+            </svg>
+            Delete
+          </button>
         </div>
       </td>
     </tr>
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
index 16cdd88a9..d18a19226 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
+import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { FILTER_DOCUMENT_TYPE } from 'src/app/data/filter-rule-type';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
+import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/document-type-edit-dialog.component';
@@ -12,7 +15,10 @@ import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/doc
 })
 export class DocumentTypeListComponent extends GenericListComponent<PaperlessDocumentType> {
 
-  constructor(service: DocumentTypeService, modalService: NgbModal) {
+  constructor(service: DocumentTypeService, modalService: NgbModal,
+    private router: Router,
+    private list: DocumentListViewService
+  ) {
     super(service, modalService, DocumentTypeEditDialogComponent)
   }
 
@@ -20,4 +26,10 @@ export class DocumentTypeListComponent extends GenericListComponent<PaperlessDoc
     return `document type '${object.name}'`
   }
 
+  filterDocuments(object: PaperlessDocumentType) {
+    this.list.documentListView.filter_rules = [
+      {rule_type: FILTER_DOCUMENT_TYPE, value: object.id.toString()}
+    ]
+    this.router.navigate(["documents"])
+  }
 }
diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
index 76a92e4e9..783c22b36 100644
--- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
+++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
@@ -95,7 +95,7 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
     activeModal.componentInstance.message = "Associated documents will not be deleted."
     activeModal.componentInstance.btnClass = "btn-danger"
     activeModal.componentInstance.btnCaption = "Delete"
-    activeModal.componentInstance.confirmPressed.subscribe(() => {
+    activeModal.componentInstance.confirmClicked.subscribe(() => {
       this.service.delete(object).subscribe(_ => {
         activeModal.close()
         this.reloadData()
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 41bb21156..f839010b1 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -50,16 +50,26 @@ export class SettingsComponent implements OnInit {
     })
   }
 
+  private saveLocalSettings() {
+    localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
+    this.documentListViewService.updatePageSize()
+    this.toastService.showToast(Toast.make("Information", "Settings saved successfully."))
+  }
+
   saveSettings() {
     let x = []
     for (let id in this.savedViewGroup.value) {
       x.push(this.savedViewGroup.value[id])
     }
-    this.savedViewService.patchMany(x).subscribe(s => {
-      this.toastService.showToast(Toast.make("Information", "Settings saved successfully."))
-      localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
-      this.documentListViewService.updatePageSize()
-    })
+    if (x.length > 0) {
+      this.savedViewService.patchMany(x).subscribe(s => {
+        this.saveLocalSettings()
+      }, error => {
+        this.toastService.showToast(Toast.makeError(`Error while storing settings on server: ${JSON.stringify(error.error)}`))
+      })
+    } else {
+      this.saveLocalSettings()
+    }
 
   }
 }
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.html b/src-ui/src/app/components/manage/tag-list/tag-list.component.html
index e68b997d1..bbe2c6dd2 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.html
@@ -9,7 +9,7 @@
     aria-label="Default pagination"></ngb-pagination>
 </div>
 
-<table class="table table-striped border shadow">
+<table class="table table-striped border shadow-sm">
   <thead>
     <tr>
       <th scope="col" sortable="name" (sort)="onSort($event)">Name</th>
@@ -28,8 +28,25 @@
       <td scope="row">{{ tag.document_count }}</td>
       <td scope="row">
         <div class="btn-group">
-          <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(tag)">Edit</button>
-          <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(tag)">Delete</button>
+          <button class="btn btn-sm btn-outline-secondary" (click)="filterDocuments(tag)">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-funnel" viewBox="0 0 16 16">
+              <path fill-rule="evenodd" d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2zm1 .5v1.308l4.372 4.858A.5.5 0 0 1 7 8.5v5.306l2-.666V8.5a.5.5 0 0 1 .128-.334L13.5 3.308V2h-11z"/>
+            </svg>
+            Documents
+          </button>
+          <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(tag)">
+            <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>
+            Edit
+          </button>
+          <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(tag)">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
+              <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
+              <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4L4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
+            </svg>
+            Delete
+          </button>
         </div>
       </td>
     </tr>
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
index 32093e0a8..e3f151550 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
+import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { FILTER_HAS_TAG } from 'src/app/data/filter-rule-type';
 import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag';
+import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { TagService } from 'src/app/services/rest/tag.service';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.component';
@@ -12,7 +15,10 @@ import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.compon
 })
 export class TagListComponent extends GenericListComponent<PaperlessTag> {
 
-  constructor(tagService: TagService, modalService: NgbModal) {
+  constructor(tagService: TagService, modalService: NgbModal,
+    private router: Router,
+    private list: DocumentListViewService
+  ) {
     super(tagService, modalService, TagEditDialogComponent)
   }
 
@@ -23,4 +29,11 @@ export class TagListComponent extends GenericListComponent<PaperlessTag> {
   getObjectName(object: PaperlessTag) {
     return `tag '${object.name}'`
   }
+
+  filterDocuments(object: PaperlessTag) {
+    this.list.documentListView.filter_rules = [
+      {rule_type: FILTER_HAS_TAG, value: object.id.toString()}
+    ]
+    this.router.navigate(["documents"])
+  }
 }
diff --git a/src-ui/src/app/interceptors/csrf.interceptor.ts b/src-ui/src/app/interceptors/csrf.interceptor.ts
index 32f3e99dc..2c654aa36 100644
--- a/src-ui/src/app/interceptors/csrf.interceptor.ts
+++ b/src-ui/src/app/interceptors/csrf.interceptor.ts
@@ -7,16 +7,21 @@ import {
 } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { CookieService } from 'ngx-cookie-service';
+import { Meta } from '@angular/platform-browser';
 
 @Injectable()
 export class CsrfInterceptor implements HttpInterceptor {
 
-  constructor(private cookieService: CookieService) {
+  constructor(private cookieService: CookieService, private meta: Meta) {
 
   }
 
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
-    let csrfToken = this.cookieService.get('csrftoken')
+    let prefix = ""
+    if (this.meta.getTag('name=cookie_prefix')) {
+      prefix = this.meta.getTag('name=cookie_prefix').content
+    }    
+    let csrfToken = this.cookieService.get(`${prefix?prefix:''}csrftoken`)
     if (csrfToken) {
      request = request.clone({
         setHeaders: {
diff --git a/src-ui/src/app/pipes/document-title.pipe.ts b/src-ui/src/app/pipes/document-title.pipe.ts
index 09445f595..621562d39 100644
--- a/src-ui/src/app/pipes/document-title.pipe.ts
+++ b/src-ui/src/app/pipes/document-title.pipe.ts
@@ -5,7 +5,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 })
 export class DocumentTitlePipe implements PipeTransform {
 
-  transform(value: string): unknown {
+  transform(value: string): string {
     if (value) {
       return value
     } else {
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 05c46750d..00f84048b 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -116,14 +116,14 @@ export class DocumentListViewService {
   set filterRules(filterRules: FilterRule[]) {
     //we're going to clone the filterRules object, since we don't
     //want changes in the filter editor to propagate into here right away.
-    this.view.filter_rules = cloneFilterRules(filterRules)
+    this.view.filter_rules = filterRules
     this.reload()
     this.reduceSelectionToFilter()
     this.saveDocumentListView()
   }
 
   get filterRules(): FilterRule[] {
-    return cloneFilterRules(this.view.filter_rules)
+    return this.view.filter_rules
   }
 
   set sortField(field: string) {
@@ -245,7 +245,7 @@ export class DocumentListViewService {
         this.documentListView = null
       }
     }
-    if (!this.documentListView) {
+    if (!this.documentListView || !this.documentListView.filter_rules || !this.documentListView.sort_reverse || !this.documentListView.sort_field) {
       this.documentListView = {
         filter_rules: [],
         sort_reverse: true,
diff --git a/src-ui/src/assets/save-filter.png b/src-ui/src/assets/save-filter.png
index dcaa41714c78a70b8568e162a0e8afac86fe8168..0f011f8127280d88db5970d30e23570765fa5cc9 100644
GIT binary patch
literal 8263
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
W9G(85(c8@c7<p;skJXZ<KmH4vU+PT&

literal 8267
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
BL(BjG

diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 09154dfca..f12c6a7cb 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -1,5 +1,6 @@
 export const environment = {
   production: true,
   apiBaseUrl: "/api/",
-  appTitle: "Paperless-ng"
+  appTitle: "Paperless-ng",
+  version: "0.9.8"
 };
diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss
index b0b66b7f9..6e09db630 100644
--- a/src-ui/src/styles.scss
+++ b/src-ui/src/styles.scss
@@ -1,7 +1,6 @@
 @import "theme";
-
 @import "node_modules/bootstrap/scss/bootstrap";
-
+@import "~@ng-select/ng-select/themes/default.theme.css";
 
 .toolbaricon {
   width: 1.2em;
@@ -20,7 +19,7 @@
 }
 
 body {
-  font-size: .875rem;
+  font-size: 0.875rem;
 }
 
 .form-control-dark {
@@ -65,4 +64,39 @@ body {
   display: block;
   background-size: 1rem;
   float: right;
-}
\ No newline at end of file
+}
+
+.paperless-input-select {
+  .ng-select {
+    position: relative;
+    flex: 1 1 auto;
+    margin-bottom: 0;
+    min-height: calc(1.5em + 0.75rem + 5px);
+    line-height: 1.5;
+
+    .ng-select-container {
+      height: 100%;
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+
+      .ng-value-container .ng-input {
+        top: 10px;
+      }
+    }
+
+    .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-selected,
+    .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-selected.ng-option-marked {
+      background: none;
+    }
+  }
+}
+
+.paperless-input-tags {
+  .ng-select.ng-select-multiple .ng-select-container .ng-value-container .ng-value {
+    background-color: transparent;
+  }
+
+  .ng-select.ng-select-multiple .ng-select-container .ng-value-container {
+    padding-top: 1px;
+  }
+}
diff --git a/src/documents/admin.py b/src/documents/admin.py
index 6ec3b736e..78437f91c 100755
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -69,7 +69,7 @@ class DocumentAdmin(admin.ModelAdmin):
 
     filter_horizontal = ("tags",)
 
-    ordering = ["-created", "correspondent"]
+    ordering = ["-created"]
 
     date_hierarchy = "created"
 
diff --git a/src/documents/checks.py b/src/documents/checks.py
index 3e3ddb1fb..b6da5bfc9 100644
--- a/src/documents/checks.py
+++ b/src/documents/checks.py
@@ -2,6 +2,7 @@ import textwrap
 
 from django.conf import settings
 from django.core.checks import Error, register
+from django.core.exceptions import FieldError
 from django.db.utils import OperationalError, ProgrammingError
 
 from documents.signals import document_consumer_declaration
@@ -16,7 +17,7 @@ def changed_password_check(app_configs, **kwargs):
     try:
         encrypted_doc = Document.objects.filter(
             storage_type=Document.STORAGE_TYPE_GPG).first()
-    except (OperationalError, ProgrammingError):
+    except (OperationalError, ProgrammingError, FieldError):
         return []  # No documents table yet
 
     if encrypted_doc:
diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index c49493991..5643756ac 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -99,6 +99,11 @@ def generate_filename(doc, counter=0):
             tags = defaultdictNoStr(lambda: slugify(None),
                                     many_to_dictionary(doc.tags))
 
+            tag_list = pathvalidate.sanitize_filename(
+                ",".join([tag.name for tag in doc.tags.all()]),
+                replacement_text="-"
+            )
+
             if doc.correspondent:
                 correspondent = pathvalidate.sanitize_filename(
                     doc.correspondent.name, replacement_text="-"
@@ -127,7 +132,7 @@ def generate_filename(doc, counter=0):
                 added_month=f"{doc.added.month:02}" if doc.added else "none",
                 added_day=f"{doc.added.day:02}" if doc.added else "none",
                 tags=tags,
-                tag_list=",".join([tag.name for tag in doc.tags.all()])
+                tag_list=tag_list
             ).strip()
 
             path = path.strip(os.sep)
diff --git a/src/documents/management/commands/decrypt_documents.py b/src/documents/management/commands/decrypt_documents.py
index 918f1a175..8f5c2e123 100644
--- a/src/documents/management/commands/decrypt_documents.py
+++ b/src/documents/management/commands/decrypt_documents.py
@@ -2,7 +2,6 @@ import os
 
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
-from termcolor import colored as coloured
 
 from documents.models import Document
 from paperless.db import GnuPG
@@ -26,16 +25,14 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
 
         try:
-            print(coloured(
+            print(
                 "\n\nWARNING: This script is going to work directly on your "
                 "document originals, so\nWARNING: you probably shouldn't run "
                 "this unless you've got a recent backup\nWARNING: handy.  It "
                 "*should* work without a hitch, but be safe and backup your\n"
                 "WARNING: stuff first.\n\nHit Ctrl+C to exit now, or Enter to "
-                "continue.\n\n",
-                "yellow",
-                attrs=("bold",)
-            ))
+                "continue.\n\n"
+            )
             __ = input()
         except KeyboardInterrupt:
             return
@@ -57,8 +54,8 @@ class Command(BaseCommand):
 
         for document in encrypted_files:
 
-            print(coloured("Decrypting {}".format(
-                document).encode('utf-8'), "green"))
+            print("Decrypting {}".format(
+                document).encode('utf-8'))
 
             old_paths = [document.source_path, document.thumbnail_path]
 
diff --git a/src/documents/migrations/1003_mime_types.py b/src/documents/migrations/1003_mime_types.py
index 1038d57b3..78ecced2b 100644
--- a/src/documents/migrations/1003_mime_types.py
+++ b/src/documents/migrations/1003_mime_types.py
@@ -6,13 +6,17 @@ import magic
 from django.conf import settings
 from django.db import migrations, models
 
+from paperless.db import GnuPG
+
+STORAGE_TYPE_UNENCRYPTED = "unencrypted"
+STORAGE_TYPE_GPG = "gpg"
 
 def source_path(self):
     if self.filename:
         fname = str(self.filename)
     else:
         fname = "{:07}.{}".format(self.pk, self.file_type)
-        if self.storage_type == self.STORAGE_TYPE_GPG:
+        if self.storage_type == STORAGE_TYPE_GPG:
             fname += ".gpg"
 
     return os.path.join(
@@ -26,9 +30,18 @@ def add_mime_types(apps, schema_editor):
     documents = Document.objects.all()
 
     for d in documents:
-        d.mime_type = magic.from_file(source_path(d), mime=True)
+        f = open(source_path(d), "rb")
+        if d.storage_type == STORAGE_TYPE_GPG:
+
+            data = GnuPG.decrypted(f)
+        else:
+            data = f.read(1024)
+
+        d.mime_type = magic.from_buffer(data, mime=True)
         d.save()
 
+        f.close()
+
 
 def add_file_extensions(apps, schema_editor):
     Document = apps.get_model("documents", "Document")
diff --git a/src/documents/migrations/1008_auto_20201216_1736.py b/src/documents/migrations/1008_auto_20201216_1736.py
new file mode 100644
index 000000000..d94f4767f
--- /dev/null
+++ b/src/documents/migrations/1008_auto_20201216_1736.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.1.4 on 2020-12-16 17:36
+
+from django.db import migrations
+import django.db.models.functions.text
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '1007_savedview_savedviewfilterrule'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='correspondent',
+            options={'ordering': (django.db.models.functions.text.Lower('name'),)},
+        ),
+        migrations.AlterModelOptions(
+            name='document',
+            options={'ordering': ('-created',)},
+        ),
+        migrations.AlterModelOptions(
+            name='documenttype',
+            options={'ordering': (django.db.models.functions.text.Lower('name'),)},
+        ),
+        migrations.AlterModelOptions(
+            name='savedview',
+            options={'ordering': (django.db.models.functions.text.Lower('name'),)},
+        ),
+        migrations.AlterModelOptions(
+            name='tag',
+            options={'ordering': (django.db.models.functions.text.Lower('name'),)},
+        ),
+    ]
diff --git a/src/documents/migrations/1009_auto_20201216_2005.py b/src/documents/migrations/1009_auto_20201216_2005.py
new file mode 100644
index 000000000..5e8302bb0
--- /dev/null
+++ b/src/documents/migrations/1009_auto_20201216_2005.py
@@ -0,0 +1,29 @@
+# Generated by Django 3.1.4 on 2020-12-16 20:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '1008_auto_20201216_1736'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='correspondent',
+            options={'ordering': ('name',)},
+        ),
+        migrations.AlterModelOptions(
+            name='documenttype',
+            options={'ordering': ('name',)},
+        ),
+        migrations.AlterModelOptions(
+            name='savedview',
+            options={'ordering': ('name',)},
+        ),
+        migrations.AlterModelOptions(
+            name='tag',
+            options={'ordering': ('name',)},
+        ),
+    ]
diff --git a/src/documents/models.py b/src/documents/models.py
index 1b1f697bc..3a6d155ed 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -12,7 +12,6 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils import timezone
-from django.utils.text import slugify
 
 from documents.file_handling import archive_name_from_filename
 from documents.parsers import get_default_file_extension
@@ -205,7 +204,7 @@ class Document(models.Model):
     )
 
     class Meta:
-        ordering = ("correspondent", "title")
+        ordering = ("-created",)
 
     def __str__(self):
         created = datetime.date.isoformat(self.created)
@@ -221,7 +220,7 @@ class Document(models.Model):
         else:
             fname = "{:07}{}".format(self.pk, self.file_type)
             if self.storage_type == self.STORAGE_TYPE_GPG:
-                fname += ".gpg"
+                fname += ".gpg"  # pragma: no cover
 
         return os.path.join(
             settings.ORIGINALS_DIR,
@@ -308,6 +307,10 @@ class Log(models.Model):
 
 class SavedView(models.Model):
 
+    class Meta:
+
+        ordering = ("name",)
+
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     name = models.CharField(max_length=128)
 
@@ -340,7 +343,11 @@ class SavedViewFilterRule(models.Model):
         (17, "Does not have tag"),
     ]
 
-    saved_view = models.ForeignKey(SavedView, on_delete=models.CASCADE, related_name="filter_rules")
+    saved_view = models.ForeignKey(
+        SavedView,
+        on_delete=models.CASCADE,
+        related_name="filter_rules"
+    )
 
     rule_type = models.PositiveIntegerField(choices=RULE_TYPES)
 
diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index 228e2c86e..cbbb912de 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -163,8 +163,6 @@ def parse_date(filename, text):
 
     date = None
 
-    next_year = timezone.now().year + 5  # Arbitrary 5 year future limit
-
     # if filename date parsing is enabled, search there first:
     if settings.FILENAME_DATE_ORDER:
         for m in re.finditer(DATE_REGEX, filename):
@@ -176,7 +174,7 @@ def parse_date(filename, text):
                 # Skip all matches that do not parse to a proper date
                 continue
 
-            if date is not None and next_year > date.year > 1900:
+            if date and date.year > 1900 and date <= timezone.now():
                 return date
 
     # Iterate through all regex matches in text and try to parse the date
@@ -189,7 +187,7 @@ def parse_date(filename, text):
             # Skip all matches that do not parse to a proper date
             continue
 
-        if date is not None and next_year > date.year > 1900:
+        if date and date.year > 1900 and date <= timezone.now():
             break
         else:
             date = None
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index e34279b1a..f9fde9ac8 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -187,17 +187,19 @@ class SavedViewSerializer(serializers.ModelSerializer):
         else:
             rules_data = None
         super(SavedViewSerializer, self).update(instance, validated_data)
-        if rules_data:
+        if rules_data is not None:
             SavedViewFilterRule.objects.filter(saved_view=instance).delete()
             for rule_data in rules_data:
-                SavedViewFilterRule.objects.create(saved_view=instance, **rule_data)
+                SavedViewFilterRule.objects.create(
+                    saved_view=instance, **rule_data)
         return instance
 
     def create(self, validated_data):
         rules_data = validated_data.pop('filter_rules')
         saved_view = SavedView.objects.create(**validated_data)
         for rule_data in rules_data:
-            SavedViewFilterRule.objects.create(saved_view=saved_view, **rule_data)
+            SavedViewFilterRule.objects.create(
+                saved_view=saved_view, **rule_data)
         return saved_view
 
 
diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html
index 728f3a0e7..06dbb678e 100644
--- a/src/documents/templates/index.html
+++ b/src/documents/templates/index.html
@@ -8,6 +8,7 @@
   <title>PaperlessUi</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+	<meta name="cookie_prefix" content="{{cookie_prefix}}">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 <link rel="stylesheet" href="{% static 'frontend/styles.css' %}"></head>
 <body>
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index bd0d9a421..43da9c058 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -5,13 +5,11 @@ import tempfile
 from unittest import mock
 
 from django.contrib.auth.models import User
-from django.test import client
-from pathvalidate import ValidationError
 from rest_framework.test import APITestCase
 from whoosh.writing import AsyncWriter
 
-from documents import index, bulk_edit
-from documents.models import Document, Correspondent, DocumentType, Tag
+from documents import index
+from documents.models import Document, Correspondent, DocumentType, Tag, SavedView
 from documents.tests.utils import DirectoriesMixin
 
 
@@ -20,8 +18,8 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
     def setUp(self):
         super(TestDocumentApi, self).setUp()
 
-        user = User.objects.create_superuser(username="temp_admin")
-        self.client.force_login(user=user)
+        self.user = User.objects.create_superuser(username="temp_admin")
+        self.client.force_login(user=self.user)
 
     def testDocuments(self):
 
@@ -172,15 +170,13 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 200)
         results = response.data['results']
         self.assertEqual(len(results), 2)
-        self.assertEqual(results[0]['id'], doc2.id)
-        self.assertEqual(results[1]['id'], doc3.id)
+        self.assertCountEqual([results[0]['id'], results[1]['id']], [doc2.id, doc3.id])
 
         response = self.client.get("/api/documents/?tags__id__in={},{}".format(tag_inbox.id, tag_3.id))
         self.assertEqual(response.status_code, 200)
         results = response.data['results']
         self.assertEqual(len(results), 2)
-        self.assertEqual(results[0]['id'], doc1.id)
-        self.assertEqual(results[1]['id'], doc3.id)
+        self.assertCountEqual([results[0]['id'], results[1]['id']], [doc1.id, doc3.id])
 
         response = self.client.get("/api/documents/?tags__id__all={},{}".format(tag_2.id, tag_3.id))
         self.assertEqual(response.status_code, 200)
@@ -202,8 +198,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 200)
         results = response.data['results']
         self.assertEqual(len(results), 2)
-        self.assertEqual(results[0]['id'], doc1.id)
-        self.assertEqual(results[1]['id'], doc2.id)
+        self.assertCountEqual([results[0]['id'], results[1]['id']], [doc1.id, doc2.id])
 
         response = self.client.get("/api/documents/?tags__id__none={},{}".format(tag_3.id, tag_2.id))
         self.assertEqual(response.status_code, 200)
@@ -518,114 +513,86 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertGreater(len(meta['original_metadata']), 0)
         self.assertIsNone(meta['archive_metadata'])
 
+    def test_saved_views(self):
+        u1 = User.objects.create_user("user1")
+        u2 = User.objects.create_user("user2")
 
-class TestBulkEdit(DirectoriesMixin, APITestCase):
+        v1 = SavedView.objects.create(user=u1, name="test1", sort_field="", show_on_dashboard=False, show_in_sidebar=False)
+        v2 = SavedView.objects.create(user=u2, name="test2", sort_field="", show_on_dashboard=False, show_in_sidebar=False)
+        v3 = SavedView.objects.create(user=u2, name="test3", sort_field="", show_on_dashboard=False, show_in_sidebar=False)
 
-    def setUp(self):
-        super(TestBulkEdit, self).setUp()
-
-        user = User.objects.create_superuser(username="temp_admin")
-        self.client.force_login(user=user)
-
-        patcher = mock.patch('documents.bulk_edit.async_task')
-        self.async_task = patcher.start()
-        self.addCleanup(patcher.stop)
-        self.c1 = Correspondent.objects.create(name="c1")
-        self.c2 = Correspondent.objects.create(name="c2")
-        self.dt1 = DocumentType.objects.create(name="dt1")
-        self.dt2 = DocumentType.objects.create(name="dt2")
-        self.t1 = Tag.objects.create(name="t1")
-        self.t2 = Tag.objects.create(name="t2")
-        self.doc1 = Document.objects.create(checksum="A", title="A")
-        self.doc2 = Document.objects.create(checksum="B", title="B", correspondent=self.c1, document_type=self.dt1)
-        self.doc3 = Document.objects.create(checksum="C", title="C", correspondent=self.c2, document_type=self.dt2)
-        self.doc4 = Document.objects.create(checksum="D", title="D")
-        self.doc5 = Document.objects.create(checksum="E", title="E")
-        self.doc2.tags.add(self.t1)
-        self.doc3.tags.add(self.t2)
-        self.doc4.tags.add(self.t1, self.t2)
-
-    def test_set_correspondent(self):
-        self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1)
-        bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], self.c2.id)
-        self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 3)
-        self.async_task.assert_called_once()
-        args, kwargs = self.async_task.call_args
-        self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id])
-
-    def test_unset_correspondent(self):
-        self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1)
-        bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], None)
-        self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 0)
-        self.async_task.assert_called_once()
-        args, kwargs = self.async_task.call_args
-        self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id])
-
-    def test_set_document_type(self):
-        self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1)
-        bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], self.dt2.id)
-        self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 3)
-        self.async_task.assert_called_once()
-        args, kwargs = self.async_task.call_args
-        self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id])
-
-    def test_unset_document_type(self):
-        self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1)
-        bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], None)
-        self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 0)
-        self.async_task.assert_called_once()
-        args, kwargs = self.async_task.call_args
-        self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id])
-
-    def test_add_tag(self):
-        self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2)
-        bulk_edit.add_tag([self.doc1.id, self.doc2.id, self.doc3.id, self.doc4.id], self.t1.id)
-        self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 4)
-        self.async_task.assert_called_once()
-        args, kwargs = self.async_task.call_args
-        self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc3.id])
-
-
-    def test_remove_tag(self):
-        self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2)
-        bulk_edit.remove_tag([self.doc1.id, self.doc3.id, self.doc4.id], self.t1.id)
-        self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 1)
-        self.async_task.assert_called_once()
-        args, kwargs = self.async_task.call_args
-        self.assertCountEqual(kwargs['document_ids'], [self.doc4.id])
-
-    def test_delete(self):
-        self.assertEqual(Document.objects.count(), 5)
-        bulk_edit.delete([self.doc1.id, self.doc2.id])
-        self.assertEqual(Document.objects.count(), 3)
-        self.assertCountEqual([doc.id for doc in Document.objects.all()], [self.doc3.id, self.doc4.id, self.doc5.id])
-
-    def test_api(self):
-        self.assertEqual(Document.objects.count(), 5)
-        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
-            "documents": [self.doc1.id],
-            "method": "delete",
-            "parameters": {}
-        }), content_type='application/json')
+        response = self.client.get("/api/saved_views/")
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(Document.objects.count(), 4)
+        self.assertEqual(response.data['count'], 0)
 
-    def test_api_invalid_doc(self):
-        self.assertEqual(Document.objects.count(), 5)
-        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
-            "documents": [-235],
-            "method": "delete",
-            "parameters": {}
-        }), content_type='application/json')
-        self.assertEqual(response.status_code, 400)
-        self.assertEqual(Document.objects.count(), 5)
+        self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 404)
 
-    def test_api_invalid_method(self):
-        self.assertEqual(Document.objects.count(), 5)
-        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
-            "documents": [self.doc2.id],
-            "method": "exterminate",
-            "parameters": {}
-        }), content_type='application/json')
-        self.assertEqual(response.status_code, 400)
-        self.assertEqual(Document.objects.count(), 5)
+        self.client.force_login(user=u1)
+
+        response = self.client.get("/api/saved_views/")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 1)
+
+        self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 200)
+
+        self.client.force_login(user=u2)
+
+        response = self.client.get("/api/saved_views/")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 2)
+
+        self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 404)
+
+    def test_create_update_patch(self):
+
+        u1 = User.objects.create_user("user1")
+
+        view = {
+            "name": "test",
+            "show_on_dashboard": True,
+            "show_in_sidebar": True,
+            "sort_field": "created2",
+            "filter_rules": [
+                {
+                    "rule_type": 4,
+                    "value": "test"
+                }
+            ]
+        }
+
+        response = self.client.post("/api/saved_views/", view, format='json')
+        self.assertEqual(response.status_code, 201)
+
+        v1 = SavedView.objects.get(name="test")
+        self.assertEqual(v1.sort_field, "created2")
+        self.assertEqual(v1.filter_rules.count(), 1)
+        self.assertEqual(v1.user, self.user)
+
+        response = self.client.patch(f"/api/saved_views/{v1.id}/", {
+            "show_in_sidebar": False
+        }, format='json')
+
+        v1 = SavedView.objects.get(id=v1.id)
+        self.assertEqual(response.status_code, 200)
+        self.assertFalse(v1.show_in_sidebar)
+        self.assertEqual(v1.filter_rules.count(), 1)
+
+        view['filter_rules'] = [{
+            "rule_type": 12,
+            "value": "secret"
+        }]
+
+        response = self.client.put(f"/api/saved_views/{v1.id}/", view, format='json')
+        self.assertEqual(response.status_code, 200)
+
+        v1 = SavedView.objects.get(id=v1.id)
+        self.assertEqual(v1.filter_rules.count(), 1)
+        self.assertEqual(v1.filter_rules.first().value, "secret")
+
+        view['filter_rules'] = []
+
+        response = self.client.put(f"/api/saved_views/{v1.id}/", view, format='json')
+        self.assertEqual(response.status_code, 200)
+
+        v1 = SavedView.objects.get(id=v1.id)
+        self.assertEqual(v1.filter_rules.count(), 0)
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index dec89c45b..2e60065f1 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -9,6 +9,7 @@ from unittest import mock
 from django.conf import settings
 from django.db import DatabaseError
 from django.test import TestCase, override_settings
+from django.utils import timezone
 
 from .utils import DirectoriesMixin
 from ..file_handling import generate_filename, create_source_path_directory, delete_empty_directories, \
@@ -298,23 +299,23 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{created_year}-{created_month}-{created_day}")
     def test_created_year_month_day(self):
-        d1 = datetime.datetime(2020, 3, 6, 1, 1, 1)
+        d1 = timezone.make_aware(datetime.datetime(2020, 3, 6, 1, 1, 1))
         doc1 = Document.objects.create(title="doc1", mime_type="application/pdf", created=d1)
 
         self.assertEqual(generate_filename(doc1), "2020-03-06.pdf")
 
-        doc1.created = datetime.datetime(2020, 11, 16, 1, 1, 1)
+        doc1.created = timezone.make_aware(datetime.datetime(2020, 11, 16, 1, 1, 1))
 
         self.assertEqual(generate_filename(doc1), "2020-11-16.pdf")
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{added_year}-{added_month}-{added_day}")
     def test_added_year_month_day(self):
-        d1 = datetime.datetime(232, 1, 9, 1, 1, 1)
+        d1 = timezone.make_aware(datetime.datetime(232, 1, 9, 1, 1, 1))
         doc1 = Document.objects.create(title="doc1", mime_type="application/pdf", added=d1)
 
         self.assertEqual(generate_filename(doc1), "232-01-09.pdf")
 
-        doc1.added = datetime.datetime(2020, 11, 16, 1, 1, 1)
+        doc1.added = timezone.make_aware(datetime.datetime(2020, 11, 16, 1, 1, 1))
 
         self.assertEqual(generate_filename(doc1), "2020-11-16.pdf")
 
@@ -599,7 +600,7 @@ class TestFilenameGeneration(TestCase):
         PAPERLESS_FILENAME_FORMAT="{created}"
     )
     def test_date(self):
-        doc = Document.objects.create(title="does not matter", created=datetime.datetime(2020,5,21, 7,36,51, 153), mime_type="application/pdf", pk=2, checksum="2")
+        doc = Document.objects.create(title="does not matter", created=timezone.make_aware(datetime.datetime(2020,5,21, 7,36,51, 153)), mime_type="application/pdf", pk=2, checksum="2")
         self.assertEqual(generate_filename(doc), "2020-05-21.pdf")
 
 
diff --git a/src/documents/tests/test_index.py b/src/documents/tests/test_index.py
index 830fca0e0..2baa9621d 100644
--- a/src/documents/tests/test_index.py
+++ b/src/documents/tests/test_index.py
@@ -1,6 +1,9 @@
 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):
@@ -12,3 +15,21 @@ class JsonFormatterTest(TestCase):
         self.assertListEqual(self.formatter.format([]), [])
 
 
+class TestAutoComplete(DirectoriesMixin, TestCase):
+
+    def test_auto_complete(self):
+
+        doc1 = Document.objects.create(title="doc1", checksum="A", content="test test2 test3")
+        doc2 = Document.objects.create(title="doc2", checksum="B", content="test test2")
+        doc3 = Document.objects.create(title="doc3", checksum="C", content="test2")
+
+        index.add_or_update_document(doc1)
+        index.add_or_update_document(doc2)
+        index.add_or_update_document(doc3)
+
+        ix = index.open_index()
+
+        self.assertListEqual(index.autocomplete(ix, "tes"), [b"test3", b"test", b"test2"])
+        self.assertListEqual(index.autocomplete(ix, "tes", limit=3), [b"test3", b"test", b"test2"])
+        self.assertListEqual(index.autocomplete(ix, "tes", limit=1), [b"test3"])
+        self.assertListEqual(index.autocomplete(ix, "tes", limit=0), [])
diff --git a/src/documents/tests/test_sanity_check.py b/src/documents/tests/test_sanity_check.py
index 725e87617..0554cd7cd 100644
--- a/src/documents/tests/test_sanity_check.py
+++ b/src/documents/tests/test_sanity_check.py
@@ -2,6 +2,8 @@ import os
 import shutil
 from pathlib import Path
 
+import filelock
+from django.conf import settings
 from django.test import TestCase
 
 from documents.models import Document
@@ -13,9 +15,11 @@ class TestSanityCheck(DirectoriesMixin, TestCase):
 
     def make_test_data(self):
 
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000001.pdf"), os.path.join(self.dirs.originals_dir, "0000001.pdf"))
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "archive", "0000001.pdf"), os.path.join(self.dirs.archive_dir, "0000001.pdf"))
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), os.path.join(self.dirs.thumbnail_dir, "0000001.png"))
+        with filelock.FileLock(settings.MEDIA_LOCK):
+            # just make sure that the lockfile is present.
+            shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000001.pdf"), os.path.join(self.dirs.originals_dir, "0000001.pdf"))
+            shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "archive", "0000001.pdf"), os.path.join(self.dirs.archive_dir, "0000001.pdf"))
+            shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), os.path.join(self.dirs.thumbnail_dir, "0000001.png"))
 
         return Document.objects.create(title="test", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", content="test", pk=1, filename="0000001.pdf", mime_type="application/pdf")
 
diff --git a/src/documents/tests/utils.py b/src/documents/tests/utils.py
index 7f9d50ed5..dfefc4061 100644
--- a/src/documents/tests/utils.py
+++ b/src/documents/tests/utils.py
@@ -34,7 +34,8 @@ def setup_directories():
         ARCHIVE_DIR=dirs.archive_dir,
         CONSUMPTION_DIR=dirs.consumption_dir,
         INDEX_DIR=dirs.index_dir,
-        MODEL_FILE=os.path.join(dirs.data_dir, "classification_model.pickle")
+        MODEL_FILE=os.path.join(dirs.data_dir, "classification_model.pickle"),
+        MEDIA_LOCK=os.path.join(dirs.media_dir, "media.lock")
 
     )
     dirs.settings_override.enable()
diff --git a/src/documents/views.py b/src/documents/views.py
index 3924f3d1a..ebe41c9d1 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -55,6 +55,11 @@ from .serialisers import (
 class IndexView(TemplateView):
     template_name = "index.html"
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['cookie_prefix'] = settings.COOKIE_PREFIX
+        return context
+
 
 class CorrespondentViewSet(ModelViewSet):
     model = Correspondent
@@ -185,7 +190,12 @@ class DocumentViewSet(RetrieveModelMixin,
         parser_class = get_parser_class_for_mime_type(mime_type)
         if parser_class:
             parser = parser_class(logging_group=None)
-            return parser.extract_metadata(file, mime_type)
+
+            try:
+                return parser.extract_metadata(file, mime_type)
+            except Exception as e:
+                # TODO: cover GPG errors, remove later.
+                return []
         else:
             return []
 
@@ -231,7 +241,12 @@ class DocumentViewSet(RetrieveModelMixin,
     @cache_control(public=False, max_age=315360000)
     def thumb(self, request, pk=None):
         try:
-            return HttpResponse(Document.objects.get(id=pk).thumbnail_file,
+            doc = Document.objects.get(id=pk)
+            if doc.storage_type == Document.STORAGE_TYPE_GPG:
+                handle = GnuPG.decrypted(doc.thumbnail_file)
+            else:
+                handle = doc.thumbnail_file
+            return HttpResponse(handle,
                                 content_type='image/png')
         except (FileNotFoundError, Document.DoesNotExist):
             raise Http404()
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 527e0668d..10283c145 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (0, 9, 6)
+__version__ = (0, 9, 8)
diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
index a82c34f15..3c200362d 100644
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@ -26,7 +26,7 @@ class BaseMailAction:
         return {}
 
     def post_consume(self, M, message_uids, parameter):
-        pass
+        pass  # pragma: nocover
 
 
 class DeleteMailAction(BaseMailAction):
@@ -69,7 +69,7 @@ def get_rule_action(rule):
     elif rule.action == MailRule.ACTION_MARK_READ:
         return MarkReadMailAction()
     else:
-        raise ValueError("Unknown action.")
+        raise NotImplementedError("Unknown action.")  # pragma: nocover
 
 
 def make_criterias(rule):
@@ -95,7 +95,7 @@ def get_mailbox(server, port, security):
     elif security == MailAccount.IMAP_SECURITY_SSL:
         mailbox = MailBox(server, port)
     else:
-        raise ValueError("Unknown IMAP security")
+        raise NotImplementedError("Unknown IMAP security")  # pragma: nocover
     return mailbox
 
 
@@ -119,7 +119,7 @@ class MailAccountHandler(LoggingMixin):
             return os.path.splitext(os.path.basename(att.filename))[0]
 
         else:
-            raise ValueError("Unknown title selector.")
+            raise NotImplementedError("Unknown title selector.")  # pragma: nocover  # NOQA: E501
 
     def get_correspondent(self, message, rule):
         c_from = rule.assign_correspondent_from
@@ -141,7 +141,7 @@ class MailAccountHandler(LoggingMixin):
             return rule.assign_correspondent
 
         else:
-            raise ValueError("Unknwown correspondent selector")
+            raise NotImplementedError("Unknwown correspondent selector")  # pragma: nocover  # NOQA: E501
 
     def handle_mail_account(self, account):
 
diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py
index 2a391a268..9c0f52c53 100644
--- a/src/paperless_mail/tests/test_mail.py
+++ b/src/paperless_mail/tests/test_mail.py
@@ -399,7 +399,7 @@ class TestMail(TestCase):
 
         c = Correspondent.objects.get(name="amazon@amazon.de")
         # should work
-        self.assertEquals(kwargs['override_correspondent_id'], c.id)
+        self.assertEqual(kwargs['override_correspondent_id'], c.id)
 
         self.async_task.reset_mock()
         self.reset_bogus_mailbox()
@@ -411,7 +411,7 @@ class TestMail(TestCase):
 
         args, kwargs = self.async_task.call_args
         self.async_task.assert_called_once()
-        self.assertEquals(kwargs['override_correspondent_id'], None)
+        self.assertEqual(kwargs['override_correspondent_id'], None)
 
 
     def test_filters(self):
diff --git a/src/paperless_text/parsers.py b/src/paperless_text/parsers.py
index f8f369ab0..7e488ca37 100644
--- a/src/paperless_text/parsers.py
+++ b/src/paperless_text/parsers.py
@@ -1,6 +1,7 @@
 import os
 import subprocess
 
+from PIL import ImageDraw, ImageFont, Image
 from django.conf import settings
 
 from documents.parsers import DocumentParser, ParseError
@@ -12,63 +13,22 @@ class TextDocumentParser(DocumentParser):
     """
 
     def get_thumbnail(self, document_path, mime_type):
-        """
-        The thumbnail of a text file is just a 500px wide image of the text
-        rendered onto a letter-sized page.
-        """
-        # The below is heavily cribbed from https://askubuntu.com/a/590951
-
-        bg_color = "white"  # bg color
-        text_color = "black"  # text color
-        psize = [500, 647]  # icon size
-        n_lines = 50  # number of lines to show
-        out_path = os.path.join(self.tempdir, "convert.png")
-
-        temp_bg = os.path.join(self.tempdir, "bg.png")
-        temp_txlayer = os.path.join(self.tempdir, "tx.png")
-        picsize = "x".join([str(n) for n in psize])
-        txsize = "x".join([str(n - 8) for n in psize])
-
-        def create_bg():
-            work_size = ",".join([str(n - 1) for n in psize])
-            r = str(round(psize[0] / 10))
-            rounded = ",".join([r, r])
-            run_command(
-                settings.CONVERT_BINARY,
-                "-size ", picsize,
-                ' xc:none -draw ',
-                '"fill ', bg_color, ' roundrectangle 0,0,', work_size, ",", rounded, '" ',  # NOQA: E501
-                temp_bg
-            )
 
         def read_text():
             with open(document_path, 'r') as src:
                 lines = [line.strip() for line in src.readlines()]
-                text = "\n".join([line for line in lines[:n_lines]])
-                return text.replace('"', "'")
+                text = "\n".join(lines[:50])
+                return text
 
-        def create_txlayer():
-            run_command(
-                settings.CONVERT_BINARY,
-                "-background none",
-                "-fill",
-                text_color,
-                "-pointsize", "12",
-                "-border 4 -bordercolor none",
-                "-size ", txsize,
-                ' caption:"', read_text(), '" ',
-                temp_txlayer
-            )
+        img = Image.new("RGB", (500, 700), color="white")
+        draw = ImageDraw.Draw(img)
+        font = ImageFont.truetype(
+            "/usr/share/fonts/liberation/LiberationSerif-Regular.ttf", 20,
+            layout_engine=ImageFont.LAYOUT_BASIC)
+        draw.text((5, 5), read_text(), font=font, fill="black")
 
-        create_txlayer()
-        create_bg()
-        run_command(
-            settings.CONVERT_BINARY,
-            temp_bg,
-            temp_txlayer,
-            "-background None -layers merge ",
-            out_path
-        )
+        out_path = os.path.join(self.tempdir, "thumb.png")
+        img.save(out_path)
 
         return out_path
 
diff --git a/src/paperless_text/tests/samples/test.txt b/src/paperless_text/tests/samples/test.txt
new file mode 100644
index 000000000..6de7b8c69
--- /dev/null
+++ b/src/paperless_text/tests/samples/test.txt
@@ -0,0 +1 @@
+This is a test file.
diff --git a/src/paperless_text/tests/test_parser.py b/src/paperless_text/tests/test_parser.py
new file mode 100644
index 000000000..413aa91cf
--- /dev/null
+++ b/src/paperless_text/tests/test_parser.py
@@ -0,0 +1,26 @@
+import os
+
+from django.test import TestCase
+
+from documents.tests.utils import DirectoriesMixin
+from paperless_text.parsers import TextDocumentParser
+
+
+class TestTextParser(DirectoriesMixin, TestCase):
+
+    def test_thumbnail(self):
+
+        parser = TextDocumentParser(None)
+
+        # just make sure that it does not crash
+        f = parser.get_thumbnail(os.path.join(os.path.dirname(__file__), "samples", "test.txt"), "text/plain")
+        self.assertTrue(os.path.isfile(f))
+
+    def test_parse(self):
+
+        parser = TextDocumentParser(None)
+
+        parser.parse(os.path.join(os.path.dirname(__file__), "samples", "test.txt"), "text/plain")
+
+        self.assertEqual(parser.get_text(), "This is a test file.\n")
+        self.assertIsNone(parser.get_archive_path())

From e0293db16dde23829e77717a7e7a4e7432b4a65f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 18 Dec 2020 15:04:52 -0800
Subject: [PATCH 0295/1300] Only show page numbers when content type is
 application/pdf

---
 .../components/document-detail/document-detail.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index e5dde2ad0..d47c07de1 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -1,5 +1,5 @@
 <app-page-header [(title)]="title">
-    <div class="input-group input-group-sm mr-5">
+    <div class="input-group input-group-sm mr-5" *ngIf="getContentType() == 'application/pdf'">
       <div class="input-group-prepend">
         <div class="input-group-text">Page </div>
       </div>

From 55a6dca373660a88931e03b7f80f9b9c10f48404 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 18 Dec 2020 16:03:52 -0800
Subject: [PATCH 0296/1300] Refactor editor and filterable dropdowns to be
 common components in anticipation of bulk editor

---
 src-ui/src/app/app.module.ts                  | 14 ++++----
 .../date-dropdown.component.html}             |  2 +-
 .../date-dropdown.component.scss}             |  2 +-
 .../date-dropdown.component.spec.ts}          | 12 +++----
 .../date-dropdown/date-dropdown.component.ts} | 36 +++++++++----------
 ...filterable-dropdown-button.component.html} |  0
 ...filterable-dropdown-button.component.scss} |  0
 ...lterable-dropdown-button.component.spec.ts | 25 +++++++++++++
 .../filterable-dropdown-button.component.ts}  |  8 ++---
 .../filterable-dropdown.component.html}       |  4 +--
 .../filterable-dropdown.component.scss}       |  0
 .../filterable-dropdown.component.spec.ts     | 25 +++++++++++++
 .../filterable-dropdown.component.ts}         | 12 +++----
 .../document-list/document-list.component.ts  |  2 +-
 .../filter-editor.component.html              | 10 +++---
 .../filter-editor.component.scss              |  0
 .../filter-editor.component.spec.ts           |  0
 .../filter-editor/filter-editor.component.ts  |  8 ++---
 .../filter-dropdown-date.component.spec.ts    | 25 -------------
 .../filter-dropdown-button.component.spec.ts  | 25 -------------
 20 files changed, 105 insertions(+), 105 deletions(-)
 rename src-ui/src/app/components/{filter-editor/filter-dropdown-date/filter-dropdown-date.component.html => common/date-dropdown/date-dropdown.component.html} (95%)
 rename src-ui/src/app/components/{filter-editor/filter-dropdown-date/filter-dropdown-date.component.scss => common/date-dropdown/date-dropdown.component.scss} (78%)
 rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown.component.spec.ts => common/date-dropdown/date-dropdown.component.spec.ts} (51%)
 rename src-ui/src/app/components/{filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts => common/date-dropdown/date-dropdown.component.ts} (70%)
 rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html => common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html} (100%)
 rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.scss => common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.scss} (100%)
 create mode 100644 src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.spec.ts
 rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts => common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts} (74%)
 rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown.component.html => common/filterable-dropdown/filterable-dropdown.component.html} (86%)
 rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown.component.scss => common/filterable-dropdown/filterable-dropdown.component.scss} (100%)
 create mode 100644 src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts
 rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown.component.ts => common/filterable-dropdown/filterable-dropdown.component.ts} (81%)
 rename src-ui/src/app/components/{ => document-list}/filter-editor/filter-editor.component.html (51%)
 rename src-ui/src/app/components/{ => document-list}/filter-editor/filter-editor.component.scss (100%)
 rename src-ui/src/app/components/{ => document-list}/filter-editor/filter-editor.component.spec.ts (100%)
 rename src-ui/src/app/components/{ => document-list}/filter-editor/filter-editor.component.ts (98%)
 delete mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.spec.ts
 delete mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.spec.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 6c4cabe92..97c547038 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -26,10 +26,10 @@ import { ResultHighlightComponent } from './components/search/result-highlight/r
 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';
-import { FilterEditorComponent } from './components/filter-editor/filter-editor.component';
-import { FilterDropdownComponent } from './components/filter-editor/filter-dropdown/filter-dropdown.component';
-import { FilterDropdownButtonComponent } from './components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component';
-import { FilterDropdownDateComponent } from './components/filter-editor/filter-dropdown-date/filter-dropdown-date.component';
+import { FilterEditorComponent } from './components/document-list/filter-editor/filter-editor.component';
+import { FilterableDropdownComponent } from './components/common/filterable-dropdown/filterable-dropdown.component';
+import { FilterableDropdownButtonComponent } from './components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component';
+import { DateDropdownComponent } from './components/common/date-dropdown/date-dropdown.component';
 import { DocumentCardLargeComponent } from './components/document-list/document-card-large/document-card-large.component';
 import { DocumentCardSmallComponent } from './components/document-list/document-card-small/document-card-small.component';
 import { BulkEditorComponent } from './components/document-list/bulk-editor/bulk-editor.component';
@@ -81,9 +81,9 @@ import { NgSelectModule } from '@ng-select/ng-select';
     AppFrameComponent,
     ToastsComponent,
     FilterEditorComponent,
-    FilterDropdownComponent,
-    FilterDropdownButtonComponent,
-    FilterDropdownDateComponent,
+    FilterableDropdownComponent,
+    FilterableDropdownButtonComponent,
+    DateDropdownComponent,
     DocumentCardLargeComponent,
     DocumentCardSmallComponent,
     BulkEditorComponent,
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
similarity index 95%
rename from src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
rename to src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
index aca6e836c..ba9f1fafb 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
+++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
@@ -2,7 +2,7 @@
   <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="dateBefore || dateAfter ? 'btn-primary' : 'btn-outline-primary'">
     {{title}}
   </button>
-  <div class="dropdown-menu date-filter shadow pt-0" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
+  <div class="dropdown-menu date-dropdown shadow pt-0" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
     <div class="list-group list-group-flush">
         <button *ngFor="let qf of quickFilters" class="list-group-item small list-goup list-group-item-action d-flex p-2 pl-3" role="menuitem" (click)="setDateQuickFilter(qf.id)">
           {{qf.name}}
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.scss b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.scss
similarity index 78%
rename from src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.scss
rename to src-ui/src/app/components/common/date-dropdown/date-dropdown.component.scss
index 3bdedd8a0..e6045629b 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.scss
+++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.scss
@@ -1,4 +1,4 @@
-.date-filter {
+.date-dropdown {
   min-width: 250px;
 
   .btn-link {
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.spec.ts b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.spec.ts
similarity index 51%
rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.spec.ts
rename to src-ui/src/app/components/common/date-dropdown/date-dropdown.component.spec.ts
index 29edd7c45..8355db1c4 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.spec.ts
+++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.spec.ts
@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { FilterDropodownComponent } from './filter-dropdown.component';
+import { DateDropdownComponent } from './date-dropdown.component';
 
-describe('FilterDropodownComponent', () => {
-  let component: FilterDropodownComponent;
-  let fixture: ComponentFixture<FilterDropodownComponent>;
+describe('DateDropdownComponent', () => {
+  let component: DateDropdownComponent;
+  let fixture: ComponentFixture<DateDropdownComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ FilterDropodownComponent ]
+      declarations: [ DateDropdownComponent ]
     })
     .compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(FilterDropodownComponent);
+    fixture = TestBed.createComponent(DateDropdownComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
similarity index 70%
rename from src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
rename to src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
index e570862cd..e787ce11e 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
+++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
@@ -8,23 +8,23 @@ export interface DateSelection {
   after?: string
 }
 
-const FILTER_LAST_7_DAYS = 0
-const FILTER_LAST_MONTH = 1
-const FILTER_LAST_3_MONTHS = 2
-const FILTER_LAST_YEAR = 3
+const LAST_7_DAYS = 0
+const LAST_MONTH = 1
+const LAST_3_MONTHS = 2
+const LAST_YEAR = 3
 
 @Component({
-  selector: 'app-filter-dropdown-date',
-  templateUrl: './filter-dropdown-date.component.html',
-  styleUrls: ['./filter-dropdown-date.component.scss']
+  selector: 'app-date-dropdown',
+  templateUrl: './date-dropdown.component.html',
+  styleUrls: ['./date-dropdown.component.scss']
 })
-export class FilterDropdownDateComponent implements OnInit, OnDestroy {
+export class DateDropdownComponent implements OnInit, OnDestroy {
 
   quickFilters = [
-    {id: FILTER_LAST_7_DAYS, name: "Last 7 days"}, 
-    {id: FILTER_LAST_MONTH, name: "Last month"},
-    {id: FILTER_LAST_3_MONTHS, name: "Last 3 months"},
-    {id: FILTER_LAST_YEAR, name: "Last year"}
+    {id: LAST_7_DAYS, name: "Last 7 days"},
+    {id: LAST_MONTH, name: "Last month"},
+    {id: LAST_3_MONTHS, name: "Last 3 months"},
+    {id: LAST_YEAR, name: "Last year"}
   ]
 
   @Input()
@@ -42,7 +42,7 @@ export class FilterDropdownDateComponent implements OnInit, OnDestroy {
   private datesSetDebounce$ = new Subject()
 
   private sub: Subscription
-  
+
   ngOnInit() {
     this.sub = this.datesSetDebounce$.pipe(
       debounceTime(400)
@@ -61,22 +61,22 @@ export class FilterDropdownDateComponent implements OnInit, OnDestroy {
     this.dateBefore = null
     let date = new Date()
     switch (qf) {
-      case FILTER_LAST_7_DAYS:
+      case LAST_7_DAYS:
         date.setDate(date.getDate() - 7)
         break;
 
-      case FILTER_LAST_MONTH:
+      case LAST_MONTH:
         date.setMonth(date.getMonth() - 1)
         break;
 
-      case FILTER_LAST_3_MONTHS:
+      case LAST_3_MONTHS:
         date.setMonth(date.getMonth() - 3)
         break
 
-      case FILTER_LAST_YEAR:
+      case LAST_YEAR:
         date.setFullYear(date.getFullYear() - 1)
         break
-  
+
       }
     this.dateAfter = formatDate(date, 'yyyy-MM-dd', "en-us", "UTC")
     this.onChange()
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html
similarity index 100%
rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html
rename to src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.scss b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.scss
similarity index 100%
rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.scss
rename to src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.scss
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.spec.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.spec.ts
new file mode 100644
index 000000000..c7f0b3293
--- /dev/null
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FilterableDropodownButtonComponent } from './filterable-dropdown-button.component';
+
+describe('FilterableDropodownButtonComponent', () => {
+  let component: FilterableDropodownButtonComponent;
+  let fixture: ComponentFixture<FilterableDropodownButtonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ FilterableDropodownButtonComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FilterableDropodownButtonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
similarity index 74%
rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts
rename to src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
index d3ddd3cbf..b85088191 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
@@ -4,11 +4,11 @@ import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 
 @Component({
-  selector: 'app-filter-dropdown-button',
-  templateUrl: './filter-dropdown-button.component.html',
-  styleUrls: ['./filter-dropdown-button.component.scss']
+  selector: 'app-filterable-dropdown-button',
+  templateUrl: './filterable-dropdown-button.component.html',
+  styleUrls: ['./filterable-dropdown-button.component.scss']
 })
-export class FilterDropdownButtonComponent implements OnInit {
+export class FilterableDropdownButtonComponent implements OnInit {
 
   @Input()
   item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
similarity index 86%
rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
rename to src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index d0cbfc3c9..6553c97a7 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -1,4 +1,4 @@
-<div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #filterDropdown="ngbDropdown">
+<div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown">
   <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="itemsSelected?.length > 0 ? 'btn-primary' : 'btn-outline-primary'">
     <div class="d-none d-md-inline">{{title}}</div>
     <div class="d-inline-block d-md-none">
@@ -21,7 +21,7 @@
       </div>
       <div *ngIf="items" class="items">
         <ng-container *ngFor="let item of items | filter: filterText; let i = index">
-          <app-filter-dropdown-button [item]="item" [selected]="isItemSelected(item)" (toggle)="toggleItem($event)"></app-filter-dropdown-button>
+          <app-filterable-dropdown-button [item]="item" [selected]="isItemSelected(item)" (toggle)="toggleItem($event)"></app-filterable-dropdown-button>
         </ng-container>
       </div>
     </div>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss
similarity index 100%
rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss
rename to src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts
new file mode 100644
index 000000000..3eef95c16
--- /dev/null
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FilterableDropodownComponent } from './filterable-dropdown.component';
+
+describe('FilterableDropodownComponent', () => {
+  let component: FilterableDropodownComponent;
+  let fixture: ComponentFixture<FilterableDropodownComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ FilterableDropodownComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FilterableDropodownComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
similarity index 81%
rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
rename to src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index b9d3fca6f..0f7f937aa 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -4,11 +4,11 @@ import { FilterPipe } from  'src/app/pipes/filter.pipe';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
-  selector: 'app-filter-dropdown',
-  templateUrl: './filter-dropdown.component.html',
-  styleUrls: ['./filter-dropdown.component.scss']
+  selector: 'app-filterable-dropdown',
+  templateUrl: './filterable-dropdown.component.html',
+  styleUrls: ['./filterable-dropdown.component.scss']
 })
-export class FilterDropdownComponent {
+export class FilterableDropdownComponent {
 
   constructor(private filterPipe: FilterPipe) { }
 
@@ -28,7 +28,7 @@ export class FilterDropdownComponent {
   toggle = new EventEmitter()
 
   @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef
-  @ViewChild('filterDropdown') filterDropdown: NgbDropdown
+  @ViewChild('dropdown') dropdown: NgbDropdown
 
   filterText: string
 
@@ -53,6 +53,6 @@ export class FilterDropdownComponent {
   listFilterEnter(): void {
     let filtered = this.filterPipe.transform(this.items, this.filterText)
     if (filtered.length == 1) this.toggleItem(filtered.shift())
-    this.filterDropdown.close()
+    this.dropdown.close()
   }
 }
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index a8bdf89d3..fd0b7ab31 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -11,7 +11,7 @@ import { DocumentService, DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/doc
 import { TagService } from 'src/app/services/rest/tag.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { Toast, ToastService } from 'src/app/services/toast.service';
-import { FilterEditorComponent } from '../filter-editor/filter-editor.component';
+import { FilterEditorComponent } from './filter-editor/filter-editor.component';
 import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component';
 import { SelectDialogComponent } from '../common/select-dialog/select-dialog.component';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
similarity index 51%
rename from src-ui/src/app/components/filter-editor/filter-editor.component.html
rename to src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index 6847a2902..2d480bfed 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -8,11 +8,11 @@
   <div class="w-100 d-xl-none"></div>
    <div class="col col-xl-auto mb-2 mb-xl-0">
      <div class="d-flex">
-       <app-filter-dropdown class="mr-2 mr-md-3" [items]="tags" [itemsSelected]="selectedTags" title="Tags" icon="tag-fill" (toggle)="toggleTag($event.id)"></app-filter-dropdown>
-       <app-filter-dropdown class="mr-2 mr-md-3" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" icon="person-fill" (toggle)="toggleCorrespondent($event.id)"></app-filter-dropdown>
-       <app-filter-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document types" icon="file-earmark-fill" (toggle)="toggleDocumentType($event.id)"></app-filter-dropdown>
-       <app-filter-dropdown-date class="mr-2 mr-md-3" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (datesSet)="onDatesCreatedSet($event)"></app-filter-dropdown-date>
-       <app-filter-dropdown-date [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (datesSet)="onDatesAddedSet($event)"></app-filter-dropdown-date>
+       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="tags" [itemsSelected]="selectedTags" title="Tags" icon="tag-fill" (toggle)="toggleTag($event.id)"></app-filterable-dropdown>
+       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" icon="person-fill" (toggle)="toggleCorrespondent($event.id)"></app-filterable-dropdown>
+       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document types" icon="file-earmark-fill" (toggle)="toggleDocumentType($event.id)"></app-filterable-dropdown>
+       <app-date-dropdown class="mr-2 mr-md-3" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (datesSet)="onDatesCreatedSet($event)"></app-date-dropdown>
+       <app-date-dropdown [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (datesSet)="onDatesAddedSet($event)"></app-date-dropdown>
      </div>
    </div>
    <div class="w-100 d-xl-none"></div>
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.scss b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss
similarity index 100%
rename from src-ui/src/app/components/filter-editor/filter-editor.component.scss
rename to src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.spec.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts
similarity index 100%
rename from src-ui/src/app/components/filter-editor/filter-editor.component.spec.ts
rename to src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
similarity index 98%
rename from src-ui/src/app/components/filter-editor/filter-editor.component.ts
rename to src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index 913c738a5..2d88579f9 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -10,7 +10,7 @@ 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_TAG, FILTER_RULE_TYPES, FILTER_TITLE } from 'src/app/data/filter-rule-type';
-import { DateSelection } from './filter-dropdown-date/filter-dropdown-date.component';
+import { DateSelection } from 'src/app/components/common/date-dropdown/date-dropdown.component';
 
 @Component({
   selector: 'app-filter-editor',
@@ -23,7 +23,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     if (this.filterRules.length == 1) {
       let rule = this.filterRules[0]
       switch(this.filterRules[0].rule_type) {
-        
+
         case FILTER_CORRESPONDENT:
           return `Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}`
 
@@ -55,7 +55,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
   @Output()
   filterRulesChange = new EventEmitter<FilterRule[]>()
-  
+
   hasFilters() {
     return this.filterRules.length > 0
   }
@@ -123,7 +123,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
     let existingRule = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID && rule.value == value?.toString())
     let existingRuleOfSameType = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID)
-    
+
     if (existingRule) {
       // if this exact rule already exists, remove it in all cases.
       this.filterRules.splice(this.filterRules.indexOf(existingRule), 1)
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.spec.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.spec.ts
deleted file mode 100644
index 6bf59e2e7..000000000
--- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FilterDropdownDateComponent } from './filter-dropdown-date.component';
-
-describe('FilterDropdownDateComponent', () => {
-  let component: FilterDropdownDateComponent;
-  let fixture: ComponentFixture<FilterDropdownDateComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ FilterDropdownDateComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FilterDropdownDateComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.spec.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.spec.ts
deleted file mode 100644
index 5cf1fefa2..000000000
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FilterDropodownButtonComponent } from './filter-dropdown-button.component';
-
-describe('FilterDropodownButtonComponent', () => {
-  let component: FilterDropodownButtonComponent;
-  let fixture: ComponentFixture<FilterDropodownButtonComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ FilterDropodownButtonComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FilterDropodownButtonComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

From f184e6b16260f38709c0cc8bb65c4a8b64ab27d2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 19 Dec 2020 01:15:40 +0100
Subject: [PATCH 0297/1300] fix some layout issues

---
 .../app/components/document-detail/document-detail.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 2b839e969..75a64f548 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -49,7 +49,7 @@ export class DocumentDetailComponent implements OnInit {
   })
 
   previewCurrentPage: number = 1
-  previewNumPages: number
+  previewNumPages: number = 1
 
   constructor(
     private documentsService: DocumentService,

From 01d448ecde9dffba833d89bb4c50f59593c8027b Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 18 Dec 2020 21:19:49 -0800
Subject: [PATCH 0298/1300] Bulk editor component skeleton

---
 .../filterable-dropdown.component.ts          |  4 +
 .../bulk-editor/bulk-editor.component.html    | 95 ++++---------------
 .../bulk-editor/bulk-editor.component.scss    | 10 --
 .../bulk-editor/bulk-editor.component.ts      | 75 ++++++++++++++-
 .../document-list.component.html              | 22 ++---
 5 files changed, 107 insertions(+), 99 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 0f7f937aa..cecbdf9fa 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -27,6 +27,9 @@ export class FilterableDropdownComponent {
   @Output()
   toggle = new EventEmitter()
 
+  @Output()
+  close = new EventEmitter()
+
   @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef
   @ViewChild('dropdown') dropdown: NgbDropdown
 
@@ -47,6 +50,7 @@ export class FilterableDropdownComponent {
       }, 0);
     } else {
       this.filterText = ''
+      this.close.emit(this.itemsSelected)
     }
   }
 
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index d330ba228..bf8f7b732 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -1,89 +1,34 @@
-<div class="card bg-light">
-<div class="card-body small px-2 py-2 d-flex flex-column flex-xl-row justify-content-between justify-content-xl-start">
-  <div class="d-flex flex-grow-1 flex-xl-grow-0 mb-2 mb-xl-0 mr-xl-5" role="group" aria-label="Select">
-    <label class="d-flex align-self-center my-0 mr-auto mr-lg-2">Select:</label>
-    <div class="btn-group d-flex">
-      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="selectPage.next()">
-        <svg viewBox="0 0 16 16" fill="currentColor">
+<div class="row">
+  <div class="col mb-2 mb-xl-0" role="group" aria-label="Select">
+    <label class="mr-lg-2">Select:</label>
+    <div class="btn-group">
+      <button class="btn btn-sm btn-outline-primary" (click)="selectPage.next()">
+        <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#file-earmark-check" />
         </svg>
-        <small>Page</small>
+        Page
       </button>
-      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="selectAll.next()">
-        <svg viewBox="0 0 16 16" fill="currentColor">
+      <button class="btn btn-sm btn-outline-primary" (click)="selectAll.next()">
+        <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#check-all" />
         </svg>
-        <small>All</small>
+        All
       </button>
-      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="selectNone.next()">
-        <svg viewBox="0 0 16 16" fill="currentColor">
+      <button class="btn btn-sm btn-outline-primary" (click)="selectNone.next()">
+        <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#slash-circle" />
         </svg>
-        <small>None</small>
+        None
       </button>
     </div>
   </div>
-  <div class="d-flex flex-grow-1 flex-xl-grow-0 mb-2 mb-xl-0 mr-xl-5" role="group" aria-label="Tags">
-    <label class="d-flex align-self-center my-0 mr-auto mr-lg-2">Tags:</label>
-    <div class="btn-group d-flex">
-      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="addTag.next()">
-        <ng-container *ngTemplateOutlet="add"></ng-container>
-      </button>
-      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="removeTag.next()">
-        <ng-container *ngTemplateOutlet="remove"></ng-container>
-      </button>
+  <div class="w-100 d-xl-none"></div>
+  <div class="col mb-2 mb-xl-0">
+    <div class="d-flex">
+      <label class="ml-auto mt-1 mr-2">Apply:</label>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Apply Tags" icon="tag-fill" [items]="tags" [itemsSelected]="selectedTags" (close)="applyTags($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Set Correspondent" icon="person-fill" [items]="correspondents" [itemsSelected]="selectedCorrespondents" (close)="applyCorrespondent($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Set Document Type" icon="file-earmark-fill" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" (close)="applyDocumentType($event)"></app-filterable-dropdown>
     </div>
   </div>
-  <div class="d-flex flex-grow-1 flex-xl-grow-0 mb-2 mb-xl-0 mr-xl-5" role="group" aria-label="Correspondent">
-    <label class="d-flex align-self-center my-0 mr-auto mr-lg-2">Correspondent:</label>
-    <div class="btn-group d-flex">
-      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="setCorrespondent.next()">
-        <ng-container *ngTemplateOutlet="edit"></ng-container>
-      </button>
-      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="removeCorrespondent.next()">
-        <ng-container *ngTemplateOutlet="remove"></ng-container>
-      </button>
-    </div>
-  </div>
-  <div class="d-flex flex-grow-1 flex-xl-grow-0 mb-2 mb-xl-0 mr-xl-5" role="group" aria-label="Document Type">
-    <label class="d-flex align-self-center my-0 mr-auto mr-lg-2">Document Type:</label>
-    <div class="btn-group d-flex">
-      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="setDocumentType.next()">
-        <ng-container *ngTemplateOutlet="edit"></ng-container>
-      </button>
-      <button class="btn btn-sm btn-outline-primary py-1 px-2" (click)="removeDocumentType.next()">
-        <ng-container *ngTemplateOutlet="remove"></ng-container>
-      </button>
-    </div>
-  </div>
-  <div class="d-flex flex-grow-1 flex-xl-grow-0 mb-2 mb-lg-0 ml-auto ml-lg-0 ml-xl-auto" role="group" aria-label="Delete">
-    <button class="btn btn-sm btn-outline-danger" (click)="delete.next()">
-      <svg viewBox="0 0 16 16" fill="currentColor">
-        <use xlink:href="assets/bootstrap-icons.svg#trash" />
-      </svg>
-      <small>Delete</small>
-    </button>
-  </div>
 </div>
-</div>
-
-<ng-template #add>
-  <svg viewBox="0 0 16 16" fill="currentColor">
-    <use xlink:href="assets/bootstrap-icons.svg#plus-circle" />
-  </svg>
-  <small>Add</small>
-</ng-template>
-
-<ng-template #edit>
-  <svg viewBox="0 0 16 16" fill="currentColor">
-    <use xlink:href="assets/bootstrap-icons.svg#pencil" />
-  </svg>
-  <small>Edit</small>
-</ng-template>
-
-<ng-template #remove>
-  <svg viewBox="0 0 16 16" fill="currentColor">
-    <use xlink:href="assets/bootstrap-icons.svg#x-circle" />
-  </svg>
-  <small>Remove</small>
-</ng-template>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss
index 5afd86545..e69de29bb 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss
@@ -1,10 +0,0 @@
-.btn svg {
-  width: 0.9em;
-  height: 0.9em;
-  margin-right: 3px;
-  margin-top: -1px;
-}
-
-.btn-sm {
-  line-height: 1;
-}
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 5c1ad01ae..e5f722dc7 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -1,5 +1,12 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { DocumentListViewService } from 'src/app/services/document-list-view.service';
+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';
+import { PaperlessDocument } from 'src/app/data/paperless-document';
+import { TagService } from 'src/app/services/rest/tag.service';
+import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
+import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
+import { DocumentService } from 'src/app/services/rest/document.service';
 
 @Component({
   selector: 'app-bulk-editor',
@@ -9,7 +16,10 @@ import { DocumentListViewService } from 'src/app/services/document-list-view.ser
 export class BulkEditorComponent {
 
   @Input()
-  list: DocumentListViewService
+  documentsSelected: Set<number>
+
+  @Input()
+  allDocuments: PaperlessDocument[]
 
   @Output()
   selectPage = new EventEmitter()
@@ -41,6 +51,65 @@ export class BulkEditorComponent {
   @Output()
   delete = new EventEmitter()
 
-  constructor( ) { }
+  tags: PaperlessTag[]
+  correspondents: PaperlessCorrespondent[]
+  documentTypes: PaperlessDocumentType[]
 
+  get selectedTags(): PaperlessTag[] {
+    let selectedTags = []
+    this.allDocuments.forEach(d => {
+      if (this.documentsSelected.has(d.id)) {
+        if (d.tags && !d.tags.every(t => selectedTags.find(st => st.id == t) !== undefined)) d.tags$.subscribe(t => selectedTags = selectedTags.concat(t))
+      }
+    })
+    return selectedTags
+  }
+
+  get selectedCorrespondents(): PaperlessCorrespondent[]  {
+    let selectedCorrespondents = []
+    this.allDocuments.forEach(d => {
+      if (this.documentsSelected.has(d.id)) {
+        if (d.correspondent && selectedCorrespondents.find(sc => sc.id == d.correspondent) == undefined) d.correspondent$.subscribe(c => selectedCorrespondents.push(c))
+      }
+    })
+    return selectedCorrespondents
+  }
+
+  get selectedDocumentTypes(): PaperlessDocumentType[] {
+    let selectedDocumentTypes = []
+    this.allDocuments.forEach(d => {
+      if (this.documentsSelected.has(d.id)) {
+        if (d.document_type && selectedDocumentTypes.find(sdt => sdt.id == d.document_type) == undefined) d.document_type$.subscribe(dt => selectedDocumentTypes.push(dt))
+      }
+    })
+    return selectedDocumentTypes
+  }
+
+  constructor(
+    private documentTypeService: DocumentTypeService,
+    private tagService: TagService,
+    private correspondentService: CorrespondentService,
+    private documentService: DocumentService
+  ) { }
+
+  ngOnInit() {
+    this.tagService.listAll().subscribe(result => this.tags = result.results)
+    this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
+    this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
+  }
+
+  applyTags(tags) {
+    console.log(tags);
+
+  }
+
+  applyCorrespondent(correspondent) {
+    console.log(correspondent);
+
+  }
+
+  applyDocumentType(documentType) {
+    console.log(documentType);
+
+  }
 }
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 5b4511866..beb779636 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -78,17 +78,11 @@
 </app-page-header>
 
 <div class="w-100 mb-2 mb-sm-4">
-  <app-filter-editor [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
-</div>
+  <app-filter-editor *ngIf="!isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
 
-<div class="d-flex justify-content-between align-items-center">
-  <p><span *ngIf="list.selected.size > 0">Selected {{list.selected.size}} of </span>{{list.collectionSize || 0}} document(s) <span *ngIf="isFiltered">(filtered)</span></p>
-  <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
-  [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
-</div>
-
-<div class="w-100 mb-3" [ngbCollapse]="!isBulkEditing">
-  <app-bulk-editor
+  <app-bulk-editor *ngIf="isBulkEditing"
+    [allDocuments]="list.documents"
+    [(documentsSelected)]="list.selected"
     (selectPage)="list.selectPage()"
     (selectAll)="list.selectAll()"
     (selectNone)="list.selectNone()"
@@ -99,7 +93,13 @@
     (addTag)="bulkAddTag()"
     (removeTag)="bulkRemoveTag()"
     (delete)="bulkDelete()">
-  </app-bulk-editor>
+</app-bulk-editor>
+</div>
+
+<div class="d-flex justify-content-between align-items-center">
+  <p><span *ngIf="list.selected.size > 0">Selected {{list.selected.size}} of </span>{{list.collectionSize || 0}} document(s) <span *ngIf="isFiltered">(filtered)</span></p>
+  <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
+  [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
 </div>
 
 <div *ngIf="displayMode == 'largeCards'">

From 275bd96ba85778769a787c6da3562df610c13529 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 00:13:08 -0800
Subject: [PATCH 0299/1300] Refactor filterable dropdowns to allow intermediate
 state

---
 .../filterable-dropdown-button.component.html |  4 +-
 .../filterable-dropdown-button.component.ts   | 19 ++++++--
 .../filterable-dropdown.component.html        |  6 +--
 .../filterable-dropdown.component.ts          | 46 +++++++++++++++----
 src-ui/src/app/pipes/filter.pipe.ts           | 13 +++---
 5 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html
index 0ea870533..5b58025d1 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html
@@ -1,7 +1,7 @@
 <button class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-left-0 border-right-0 border-bottom" role="menuitem" (click)="toggleItem()">
   <div class="selected-icon mr-1">
-    <svg *ngIf="selected" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
-      <use xlink:href="assets/bootstrap-icons.svg#check" />
+    <svg *ngIf="getSelectedIconName() !== ''" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
+      <use attr.xlink:href="assets/bootstrap-icons.svg#{{getSelectedIconName()}}" />
     </svg>
   </div>
   <div class="mr-1">
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
index b85088191..366bd19b4 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
@@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, Output, OnInit } 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';
+import { SelectableItem, SelectableItemState } from '../filterable-dropdown.component';
 
 @Component({
   selector: 'app-filterable-dropdown-button',
@@ -11,10 +12,11 @@ import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 export class FilterableDropdownButtonComponent implements OnInit {
 
   @Input()
-  item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent
+  selectableItem: SelectableItem
 
-  @Input()
-  selected: boolean
+  get item(): PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent {
+    return this.selectableItem?.item
+  }
 
   @Output()
   toggle = new EventEmitter()
@@ -26,7 +28,14 @@ export class FilterableDropdownButtonComponent implements OnInit {
   }
 
   toggleItem(): void {
-    this.selected = !this.selected
-    this.toggle.emit(this.item)
+    this.selectableItem.state = (this.selectableItem.state == SelectableItemState.NotSelected || this.selectableItem.state == SelectableItemState.PartiallySelected) ? SelectableItemState.Selected : SelectableItemState.NotSelected
+    this.toggle.emit(this.selectableItem)
+  }
+
+  getSelectedIconName() {
+    let iconName = ''
+    if (this.selectableItem?.state == SelectableItemState.Selected) iconName = 'check'
+    else if (this.selectableItem?.state == SelectableItemState.PartiallySelected) iconName = 'minus'
+    return iconName
   }
 }
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 6553c97a7..257cec1e5 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -19,9 +19,9 @@
           <input class="form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
         </div>
       </div>
-      <div *ngIf="items" class="items">
-        <ng-container *ngFor="let item of items | filter: filterText; let i = index">
-          <app-filterable-dropdown-button [item]="item" [selected]="isItemSelected(item)" (toggle)="toggleItem($event)"></app-filterable-dropdown-button>
+      <div *ngIf="selectableItems" class="items">
+        <ng-container *ngFor="let selectableItem of selectableItems | filter: filterText">
+          <app-filterable-dropdown-button [selectableItem]="selectableItem" (toggle)="toggleItem($event)"></app-filterable-dropdown-button>
         </ng-container>
       </div>
     </div>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index cecbdf9fa..8a6ed7c8b 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -1,8 +1,22 @@
 import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core';
 import { ObjectWithId } from 'src/app/data/object-with-id';
+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';
 import { FilterPipe } from  'src/app/pipes/filter.pipe';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
 
+export interface SelectableItem {
+  item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent,
+  state: SelectableItemState
+}
+
+export enum SelectableItemState {
+  NotSelected = 0,
+  Selected = 1,
+  PartiallySelected = 2
+}
+
 @Component({
   selector: 'app-filterable-dropdown',
   templateUrl: './filterable-dropdown.component.html',
@@ -13,10 +27,26 @@ export class FilterableDropdownComponent {
   constructor(private filterPipe: FilterPipe) { }
 
   @Input()
-  items: ObjectWithId[]
+  set items(items: ObjectWithId[]) {
+    if (items) {
+      this.selectableItems = items.map(i => {
+        return {item: i, state: SelectableItemState.NotSelected}
+      })
+    }
+  }
+
+  selectableItems: SelectableItem[] = []
 
   @Input()
-  itemsSelected: ObjectWithId[]
+  set itemsSelected(itemsSelected: ObjectWithId[]) {
+    this.selectableItems.forEach(i => {
+      i.state = (itemsSelected.find(is => is.id == i.item.id)) ? SelectableItemState.Selected : SelectableItemState.NotSelected
+    })
+  }
+
+  get itemsSelected() :ObjectWithId[] {
+    return this.selectableItems.filter(si => si.state == SelectableItemState.Selected).map(si => si.item)
+  }
 
   @Input()
   title: string
@@ -35,12 +65,8 @@ export class FilterableDropdownComponent {
 
   filterText: string
 
-  toggleItem(item: ObjectWithId): void {
-    this.toggle.emit(item)
-  }
-
-  isItemSelected(item: ObjectWithId): boolean {
-    return this.itemsSelected?.find(i => i.id == item.id) !== undefined
+  toggleItem(selectableItem: SelectableItem): void {
+    this.toggle.emit(selectableItem.item)
   }
 
   dropdownOpenChange(open: boolean): void {
@@ -50,12 +76,12 @@ export class FilterableDropdownComponent {
       }, 0);
     } else {
       this.filterText = ''
-      this.close.emit(this.itemsSelected)
+      this.close.next()
     }
   }
 
   listFilterEnter(): void {
-    let filtered = this.filterPipe.transform(this.items, this.filterText)
+    let filtered = this.filterPipe.transform(this.selectableItems, this.filterText)
     if (filtered.length == 1) this.toggleItem(filtered.shift())
     this.dropdown.close()
   }
diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts
index f799f40cc..51d1924b8 100644
--- a/src-ui/src/app/pipes/filter.pipe.ts
+++ b/src-ui/src/app/pipes/filter.pipe.ts
@@ -1,16 +1,17 @@
 import { Pipe, PipeTransform } from '@angular/core';
+import { SelectableItem } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
 
 @Pipe({
   name: 'filter'
 })
 export class FilterPipe implements PipeTransform {
-  transform(items: any[], searchText: string): any[] {
-    if (!items) return [];
-    if (!searchText) return items;
+  transform(selectableItems: SelectableItem[], searchText: string): any[] {
+    if (!selectableItems) return [];
+    if (!searchText) return selectableItems;
 
-    return items.filter(item => {
-      return Object.keys(item).some(key => {
-        return String(item[key]).toLowerCase().includes(searchText.toLowerCase());
+    return selectableItems.filter(selectableItem => {
+      return Object.keys(selectableItem.item).some(key => {
+        return String(selectableItem.item[key]).toLowerCase().includes(searchText.toLowerCase());
       });
     });
    }

From 24c53e78a74234fa281958a64e6f85cd25f49789 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 02:08:33 -0800
Subject: [PATCH 0300/1300] Working bulk editor component

---
 .../filterable-dropdown-button.component.ts   |  2 +-
 .../filterable-dropdown.component.html        |  4 +-
 .../filterable-dropdown.component.ts          | 40 +++++++--
 .../bulk-editor/bulk-editor.component.html    | 15 +++-
 .../bulk-editor/bulk-editor.component.ts      | 86 ++++++++++---------
 .../document-list.component.html              | 11 +--
 .../document-list/document-list.component.ts  | 13 ++-
 7 files changed, 109 insertions(+), 62 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
index 366bd19b4..a928d715e 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
@@ -35,7 +35,7 @@ export class FilterableDropdownButtonComponent implements OnInit {
   getSelectedIconName() {
     let iconName = ''
     if (this.selectableItem?.state == SelectableItemState.Selected) iconName = 'check'
-    else if (this.selectableItem?.state == SelectableItemState.PartiallySelected) iconName = 'minus'
+    else if (this.selectableItem?.state == SelectableItemState.PartiallySelected) iconName = 'dash'
     return iconName
   }
 }
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 257cec1e5..870ea41e4 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -1,12 +1,12 @@
 <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown">
-  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="itemsSelected?.length > 0 ? 'btn-primary' : 'btn-outline-primary'">
+  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="type !== 'actions' && itemsSelected?.length > 0 ? 'btn-primary' : 'btn-outline-primary'">
     <div class="d-none d-md-inline">{{title}}</div>
     <div class="d-inline-block d-md-none">
       <svg class="toolbaricon" fill="currentColor">
         <use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
       </svg>
     </div>
-    <ng-container *ngIf="itemsSelected?.length > 0">
+    <ng-container *ngIf="type !== 'actions' && itemsSelected?.length > 0">
       <div class="badge bg-secondary text-light rounded-pill badge-corner">
         {{itemsSelected?.length}}
       </div>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 8a6ed7c8b..4f694ed49 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -17,6 +17,11 @@ export enum SelectableItemState {
   PartiallySelected = 2
 }
 
+export enum FilterableDropdownType {
+  Filtering = 'filtering',
+  Actions = 'actions'
+}
+
 @Component({
   selector: 'app-filterable-dropdown',
   templateUrl: './filterable-dropdown.component.html',
@@ -24,7 +29,10 @@ export enum SelectableItemState {
 })
 export class FilterableDropdownComponent {
 
-  constructor(private filterPipe: FilterPipe) { }
+  @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef
+  @ViewChild('dropdown') dropdown: NgbDropdown
+
+  filterText: string
 
   @Input()
   set items(items: ObjectWithId[]) {
@@ -35,7 +43,17 @@ export class FilterableDropdownComponent {
     }
   }
 
-  selectableItems: SelectableItem[] = []
+  _selectableItems: SelectableItem[] = []
+
+  @Input()
+  set selectableItems (selectableItems: SelectableItem[]) {
+    if (this.type == FilterableDropdownType.Actions && this.dropdown?.isOpen()) return
+    else this._selectableItems = selectableItems
+  }
+
+  get selectableItems(): SelectableItem[] {
+    return this._selectableItems
+  }
 
   @Input()
   set itemsSelected(itemsSelected: ObjectWithId[]) {
@@ -54,18 +72,26 @@ export class FilterableDropdownComponent {
   @Input()
   icon: string
 
+  @Input()
+  type: FilterableDropdownType = FilterableDropdownType.Filtering
+
+  @Input()
+  singular: boolean = false
+
   @Output()
   toggle = new EventEmitter()
 
   @Output()
   close = new EventEmitter()
 
-  @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef
-  @ViewChild('dropdown') dropdown: NgbDropdown
-
-  filterText: string
+  constructor(private filterPipe: FilterPipe) { }
 
   toggleItem(selectableItem: SelectableItem): void {
+    if (this.singular && selectableItem.state == SelectableItemState.Selected) {
+      this._selectableItems.forEach(si => {
+        if (si.state == SelectableItemState.Selected && si.item.id !== selectableItem.item.id) si.state = SelectableItemState.NotSelected
+      })
+    }
     this.toggle.emit(selectableItem.item)
   }
 
@@ -76,7 +102,7 @@ export class FilterableDropdownComponent {
       }, 0);
     } else {
       this.filterText = ''
-      this.close.next()
+      this.close.emit(this.itemsSelected)
     }
   }
 
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index bf8f7b732..e7db0b284 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -26,9 +26,18 @@
   <div class="col mb-2 mb-xl-0">
     <div class="d-flex">
       <label class="ml-auto mt-1 mr-2">Apply:</label>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Apply Tags" icon="tag-fill" [items]="tags" [itemsSelected]="selectedTags" (close)="applyTags($event)"></app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Set Correspondent" icon="person-fill" [items]="correspondents" [itemsSelected]="selectedCorrespondents" (close)="applyCorrespondent($event)"></app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Set Document Type" icon="file-earmark-fill" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" (close)="applyDocumentType($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" [selectableItems]="tagsSelectableItems" type="actions" (close)="applyTags($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" [selectableItems]="correspondentsSelectableItems" type="actions" singular="true" (close)="applyCorrespondent($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" [selectableItems]="documentTypesSelectableItems" type="actions" singular="true" (close)="applyDocumentType($event)"></app-filterable-dropdown>
     </div>
   </div>
+  <div class="w-100 d-xl-none"></div>
+  <div class="col-auto mb-2 mb-xl-0">
+    <button type="button" class="btn btn-sm btn-outline-danger " (click)="applyDelete()">
+      <svg class="buttonicon" fill="currentColor">
+        <use xlink:href="assets/bootstrap-icons.svg#trash" />
+      </svg>
+      <span class="d-none d-lg-inline"> Delete</span>
+    </button>
+  </div>
 </div>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index e5f722dc7..ae3d75aff 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -7,6 +7,7 @@ import { TagService } from 'src/app/services/rest/tag.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { DocumentService } from 'src/app/services/rest/document.service';
+import { SelectableItem, SelectableItemState } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
 
 @Component({
   selector: 'app-bulk-editor',
@@ -16,7 +17,7 @@ import { DocumentService } from 'src/app/services/rest/document.service';
 export class BulkEditorComponent {
 
   @Input()
-  documentsSelected: Set<number>
+  selectedDocuments: Set<number>
 
   @Input()
   allDocuments: PaperlessDocument[]
@@ -33,20 +34,11 @@ export class BulkEditorComponent {
   @Output()
   setCorrespondent = new EventEmitter()
 
-  @Output()
-  removeCorrespondent = new EventEmitter()
-
   @Output()
   setDocumentType = new EventEmitter()
 
   @Output()
-  removeDocumentType = new EventEmitter()
-
-  @Output()
-  addTag = new EventEmitter()
-
-  @Output()
-  removeTag = new EventEmitter()
+  setTags = new EventEmitter()
 
   @Output()
   delete = new EventEmitter()
@@ -55,34 +47,47 @@ export class BulkEditorComponent {
   correspondents: PaperlessCorrespondent[]
   documentTypes: PaperlessDocumentType[]
 
-  get selectedTags(): PaperlessTag[] {
-    let selectedTags = []
-    this.allDocuments.forEach(d => {
-      if (this.documentsSelected.has(d.id)) {
-        if (d.tags && !d.tags.every(t => selectedTags.find(st => st.id == t) !== undefined)) d.tags$.subscribe(t => selectedTags = selectedTags.concat(t))
-      }
+  get tagsSelectableItems(): SelectableItem[] {
+    let tagsSelectableItems = []
+    let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
+    this.tags.forEach(t => {
+      let selectedDocumentsWithTag: PaperlessDocument[] = selectedDocuments.filter(d => d.tags.includes(t.id))
+      let state = SelectableItemState.NotSelected
+      if (selectedDocumentsWithTag.length == selectedDocuments.length) state = SelectableItemState.Selected
+      else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected
+      tagsSelectableItems.push( { item: t, state: state } )
     })
-    return selectedTags
+    return tagsSelectableItems
   }
 
-  get selectedCorrespondents(): PaperlessCorrespondent[]  {
-    let selectedCorrespondents = []
-    this.allDocuments.forEach(d => {
-      if (this.documentsSelected.has(d.id)) {
-        if (d.correspondent && selectedCorrespondents.find(sc => sc.id == d.correspondent) == undefined) d.correspondent$.subscribe(c => selectedCorrespondents.push(c))
-      }
+  get correspondentsSelectableItems(): SelectableItem[] {
+    let correspondentsSelectableItems = []
+    let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
+
+    this.correspondents.forEach(c => {
+      let selectedDocumentsWithCorrespondent: PaperlessDocument[] = selectedDocuments.filter(d => d.correspondent == c.id)
+      let state = SelectableItemState.NotSelected
+      if (selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = SelectableItemState.Selected
+      else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected
+      correspondentsSelectableItems.push( { item: c, state: state } )
     })
-    return selectedCorrespondents
+
+    return correspondentsSelectableItems
   }
 
-  get selectedDocumentTypes(): PaperlessDocumentType[] {
-    let selectedDocumentTypes = []
-    this.allDocuments.forEach(d => {
-      if (this.documentsSelected.has(d.id)) {
-        if (d.document_type && selectedDocumentTypes.find(sdt => sdt.id == d.document_type) == undefined) d.document_type$.subscribe(dt => selectedDocumentTypes.push(dt))
-      }
+  get documentTypesSelectableItems(): SelectableItem[] {
+    let documentTypesSelectableItems = []
+    let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
+
+    this.documentTypes.forEach(dt => {
+      let selectedDocumentsWithDocumentType: PaperlessDocument[] = selectedDocuments.filter(d => d.document_type == dt.id)
+      let state = SelectableItemState.NotSelected
+      if (selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = SelectableItemState.Selected
+      else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected
+      documentTypesSelectableItems.push( { item: dt, state: state } )
     })
-    return selectedDocumentTypes
+
+    return documentTypesSelectableItems
   }
 
   constructor(
@@ -98,18 +103,19 @@ export class BulkEditorComponent {
     this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
   }
 
-  applyTags(tags) {
-    console.log(tags);
-
+  applyTags(tags: PaperlessTag[]) {
+    this.setTags.emit(tags)
   }
 
-  applyCorrespondent(correspondent) {
-    console.log(correspondent);
-
+  applyCorrespondent(selectedCorrespondent: ObjectWithId[]) {
+    this.setCorrespondent.emit(selectedCorrespondent)
   }
 
-  applyDocumentType(documentType) {
-    console.log(documentType);
+  applyDocumentType(selectedDocumentType: ObjectWithId[]) {
+    this.setDocumentType.emit(selectedDocumentType)
+  }
 
+  applyDelete() {
+    this.delete.next()
   }
 }
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index beb779636..b32ff52f7 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -82,16 +82,13 @@
 
   <app-bulk-editor *ngIf="isBulkEditing"
     [allDocuments]="list.documents"
-    [(documentsSelected)]="list.selected"
+    [(selectedDocuments)]="list.selected"
     (selectPage)="list.selectPage()"
     (selectAll)="list.selectAll()"
     (selectNone)="list.selectNone()"
-    (setCorrespondent)="bulkSetCorrespondent()"
-    (removeCorrespondent)="bulkRemoveCorrespondent()"
-    (setDocumentType)="bulkSetDocumentType()"
-    (removeDocumentType)="bulkRemoveDocumentType()"
-    (addTag)="bulkAddTag()"
-    (removeTag)="bulkRemoveTag()"
+    (setTags)="bulkSetTags($event)"
+    (setCorrespondent)="bulkSetCorrespondent($event)"
+    (setDocumentType)="bulkSetDocumentType($event)"
     (delete)="bulkDelete()">
 </app-bulk-editor>
 </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index fd0b7ab31..a3f7f1e12 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -139,7 +139,9 @@ export class DocumentListComponent implements OnInit {
     )
   }
 
-  bulkSetCorrespondent() {
+  bulkSetCorrespondent(correspondent) {
+    console.log(correspondent);
+
     let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Select correspondent"
     modal.componentInstance.message = `Select the correspondent you wish to assign to ${this.list.selected.size} selected document(s):`
@@ -166,7 +168,9 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
-  bulkSetDocumentType() {
+  bulkSetDocumentType(documentType) {
+    console.log();
+
     let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Select document type"
     modal.componentInstance.message = `Select the document type you wish to assign to ${this.list.selected.size} selected document(s):`
@@ -193,6 +197,11 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
+  bulkSetTags(tags) {
+    console.log('bulkSetTags', tags);
+
+  }
+
   bulkAddTag() {
     let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Select tag"

From da3695e3a4f7c93b10d88aaa713e9f48e2e6ae8c Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 02:26:41 -0800
Subject: [PATCH 0301/1300] Working to backend except tags

---
 .../bulk-editor/bulk-editor.component.ts      |  4 +-
 .../document-list/document-list.component.ts  | 67 +++++++------------
 2 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index ae3d75aff..8e6197e56 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -107,11 +107,11 @@ export class BulkEditorComponent {
     this.setTags.emit(tags)
   }
 
-  applyCorrespondent(selectedCorrespondent: ObjectWithId[]) {
+  applyCorrespondent(selectedCorrespondent: PaperlessCorrespondent[]) {
     this.setCorrespondent.emit(selectedCorrespondent)
   }
 
-  applyDocumentType(selectedDocumentType: ObjectWithId[]) {
+  applyDocumentType(selectedDocumentType: PaperlessDocumentType[]) {
     this.setDocumentType.emit(selectedDocumentType)
   }
 
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index a3f7f1e12..15e7987fe 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -15,6 +15,9 @@ import { FilterEditorComponent } from './filter-editor/filter-editor.component';
 import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component';
 import { SelectDialogComponent } from '../common/select-dialog/select-dialog.component';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
+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';
 
 @Component({
   selector: 'app-document-list',
@@ -139,17 +142,18 @@ export class DocumentListComponent implements OnInit {
     )
   }
 
-  bulkSetCorrespondent(correspondent) {
-    console.log(correspondent);
+  bulkSetCorrespondent(correspondent: PaperlessCorrespondent[]) {
+    if (correspondent.length > 0) correspondent = correspondent.shift()
+    else correspondent = undefined
 
-    let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Select correspondent"
-    modal.componentInstance.message = `Select the correspondent you wish to assign to ${this.list.selected.size} selected document(s):`
-    this.correspondentService.listAll().subscribe(response => {
-      modal.componentInstance.objects = response.results
-    })
-    modal.componentInstance.selectClicked.subscribe(selectedId => {
-      this.executeBulkOperation('set_correspondent', {"correspondent": selectedId}).subscribe(
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Confirm correspondent assignment"
+    let messageFragment = correspondent ? `assign the correspondent ${correspondent.name} to` : `remove all correspondents from`
+    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.btnClass = "btn-warning"
+    modal.componentInstance.btnCaption = "Confirm"
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
         response => {
           modal.close()
         }
@@ -157,28 +161,18 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
-  bulkRemoveCorrespondent() {
+  bulkSetDocumentType(documentType: PaperlessDocumentType[]) {
+    if (documentType.length > 0) documentType = documentType.shift()
+    else documentType = undefined
+
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Remove correspondent"
-    modal.componentInstance.message = `This operation will remove the correspondent from all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.title = "Confirm Document Type assignment"
+    let messageFragment = documentType ? `assign the document type ${documentType.name} to` : `remove all document types from`
+    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.btnClass = "btn-warning"
+    modal.componentInstance.btnCaption = "Confirm"
     modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('set_correspondent', {"correspondent": null}).subscribe(r => {
-        modal.close()
-      })
-    })
-  }
-
-  bulkSetDocumentType(documentType) {
-    console.log();
-
-    let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Select document type"
-    modal.componentInstance.message = `Select the document type you wish to assign to ${this.list.selected.size} selected document(s):`
-    this.documentTypeService.listAll().subscribe(response => {
-      modal.componentInstance.objects = response.results
-    })
-    modal.componentInstance.selectClicked.subscribe(selectedId => {
-      this.executeBulkOperation('set_document_type', {"document_type": selectedId}).subscribe(
+      this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
         response => {
           modal.close()
         }
@@ -186,20 +180,9 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
-  bulkRemoveDocumentType() {
-    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Remove document type"
-    modal.componentInstance.message = `This operation will remove the document type from all ${this.list.selected.size} selected document(s).`
-    modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('set_document_type', {"document_type": null}).subscribe(r => {
-        modal.close()
-      })
-    })
-  }
-
   bulkSetTags(tags) {
     console.log('bulkSetTags', tags);
-
+    // TODO: 
   }
 
   bulkAddTag() {

From 37237dfcf68221a919aa808625aee368e2915b6b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 19 Dec 2020 12:46:11 +0100
Subject: [PATCH 0302/1300] default title

---
 src/documents/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html
index 06dbb678e..d086be0fe 100644
--- a/src/documents/templates/index.html
+++ b/src/documents/templates/index.html
@@ -5,7 +5,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>PaperlessUi</title>
+  <title>Paperless-ng</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta name="cookie_prefix" content="{{cookie_prefix}}">

From 12e45624db56798e252fed90ba207fec0cb31b3a Mon Sep 17 00:00:00 2001
From: Skylinar <53079123+Skylinar@users.noreply.github.com>
Date: Sat, 19 Dec 2020 13:32:31 +0100
Subject: [PATCH 0303/1300] Add 'Epson WF-7710DWF' to scanner.rst

---
 docs/scanners.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/scanners.rst b/docs/scanners.rst
index 9815637b1..502e78394 100644
--- a/docs/scanners.rst
+++ b/docs/scanners.rst
@@ -23,16 +23,19 @@ that works right for you based on recommentations from other Paperless users.
 +---------+----------------+-----+-----+-----+----------------+
 | Fujitsu | `ix500`_       | yes |     | yes | `eonist`_      |
 +---------+----------------+-----+-----+-----+----------------+
+| Epson   | `WF-7710DWF`_  | yes |     | yes | `Skylinar`_    |
++---------+----------------+-----+-----+-----+----------------+
 
 .. _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
 .. _MFC-9142CDN: https://www.brother.co.uk/printers/laser-printers/mfc9140cdn
 .. _ix500: http://www.fujitsu.com/us/products/computing/peripheral/scanners/scansnap/ix500/
+.. _WF-7710: https://www.epson.de/en/products/printers/inkjet-printers/for-home/workforce-wf-7710dwf
 
 .. _danielquinn: https://github.com/danielquinn
 .. _ayounggun: https://github.com/ayounggun
 .. _bmsleight: https://github.com/bmsleight
 .. _eonist: https://github.com/eonist
 .. _REOLDEV: https://github.com/REOLDEV
-
+.. _Skylinar: https://github.com/Skylinar

From df8235de1396b8041c3d8c0125a477100378d7de Mon Sep 17 00:00:00 2001
From: Skylinar <53079123+Skylinar@users.noreply.github.com>
Date: Sat, 19 Dec 2020 13:36:10 +0100
Subject: [PATCH 0304/1300] Update scanners.rst

typo
---
 docs/scanners.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/scanners.rst b/docs/scanners.rst
index 502e78394..70d71c962 100644
--- a/docs/scanners.rst
+++ b/docs/scanners.rst
@@ -31,7 +31,7 @@ that works right for you based on recommentations from other Paperless users.
 .. _MFC-J5910DW: https://www.brother.co.uk/printers/inkjet-printers/mfcj5910dw
 .. _MFC-9142CDN: https://www.brother.co.uk/printers/laser-printers/mfc9140cdn
 .. _ix500: http://www.fujitsu.com/us/products/computing/peripheral/scanners/scansnap/ix500/
-.. _WF-7710: https://www.epson.de/en/products/printers/inkjet-printers/for-home/workforce-wf-7710dwf
+.. _WF-7710DWF: https://www.epson.de/en/products/printers/inkjet-printers/for-home/workforce-wf-7710dwf
 
 .. _danielquinn: https://github.com/danielquinn
 .. _ayounggun: https://github.com/ayounggun

From 57a5a4147bd168a1ef2e5b7e614f43499b312fee Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 19 Dec 2020 14:48:42 +0100
Subject: [PATCH 0305/1300] test case

---
 src/documents/tests/test_file_handling.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index 2e60065f1..b24f52aa2 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -14,7 +14,7 @@ from django.utils import timezone
 from .utils import DirectoriesMixin
 from ..file_handling import generate_filename, create_source_path_directory, delete_empty_directories, \
     generate_unique_filename
-from ..models import Document, Correspondent, Tag
+from ..models import Document, Correspondent, Tag, DocumentType
 
 
 class TestFileHandling(DirectoriesMixin, TestCase):
@@ -190,6 +190,17 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         self.assertEqual(os.path.isdir(settings.ORIGINALS_DIR + "/none"), True)
         self.assertTrue(os.path.isfile(important_file))
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{document_type} - {title}")
+    def test_document_type(self):
+        dt = DocumentType.objects.create(name="my_doc_type")
+        d = Document.objects.create(title="the_doc", mime_type="application/pdf")
+
+        self.assertEqual(generate_filename(d), "none - the_doc.pdf")
+
+        d.document_type = dt
+
+        self.assertEqual(generate_filename(d), "my_doc_type - the_doc.pdf")
+
     @override_settings(PAPERLESS_FILENAME_FORMAT="{tags[type]}")
     def test_tags_with_underscore(self):
         document = Document()

From 1b1b57eb6a5c77ceb3128c44f75ea17ac1865586 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 19 Dec 2020 15:16:42 +0100
Subject: [PATCH 0306/1300] more tests

---
 src/paperless/checks.py                      | 16 +++---
 src/paperless/tests/test_checks.py           | 55 ++++++++++++++++++++
 src/paperless_tesseract/checks.py            |  2 +-
 src/paperless_tesseract/tests/test_checks.py | 26 +++++++++
 4 files changed, 90 insertions(+), 9 deletions(-)
 create mode 100644 src/paperless/tests/test_checks.py
 create mode 100644 src/paperless_tesseract/tests/test_checks.py

diff --git a/src/paperless/checks.py b/src/paperless/checks.py
index 819582ffc..3e26ae69f 100644
--- a/src/paperless/checks.py
+++ b/src/paperless/checks.py
@@ -13,18 +13,18 @@ writeable_hint = (
 )
 
 
-def path_check(env_var):
+def path_check(var, directory):
     messages = []
-    directory = os.getenv(env_var)
+    print(directory)
     if directory:
         if not os.path.exists(directory):
             messages.append(Error(
-                exists_message.format(env_var),
+                exists_message.format(var),
                 exists_hint.format(directory)
             ))
         elif not os.access(directory, os.W_OK | os.X_OK):
             messages.append(Error(
-                writeable_message.format(env_var),
+                writeable_message.format(var),
                 writeable_hint.format(directory)
             ))
     return messages
@@ -36,10 +36,10 @@ def paths_check(app_configs, **kwargs):
     Check the various paths for existence, readability and writeability
     """
 
-    check_messages = path_check("PAPERLESS_DATA_DIR") + \
-        path_check("PAPERLESS_MEDIA_ROOT") + \
-        path_check("PAPERLESS_CONSUMPTION_DIR") + \
-        path_check("PAPERLESS_STATICDIR")
+    check_messages = path_check("PAPERLESS_DATA_DIR", settings.DATA_DIR) + \
+        path_check("PAPERLESS_MEDIA_ROOT", settings.MEDIA_ROOT) + \
+        path_check("PAPERLESS_CONSUMPTION_DIR", settings.CONSUMPTION_DIR) + \
+        path_check("PAPERLESS_STATICDIR", settings.STATIC_ROOT)
 
     return check_messages
 
diff --git a/src/paperless/tests/test_checks.py b/src/paperless/tests/test_checks.py
new file mode 100644
index 000000000..61cc05bf0
--- /dev/null
+++ b/src/paperless/tests/test_checks.py
@@ -0,0 +1,55 @@
+import os
+import shutil
+
+from django.test import TestCase, override_settings
+
+from documents.tests.utils import DirectoriesMixin
+from paperless import binaries_check, paths_check
+from paperless.checks import debug_mode_check
+
+
+class TestChecks(DirectoriesMixin, TestCase):
+
+    def test_binaries(self):
+        self.assertEqual(binaries_check(None), [])
+
+    @override_settings(CONVERT_BINARY="uuuhh", OPTIPNG_BINARY="forgot")
+    def test_binaries_fail(self):
+        self.assertEqual(len(binaries_check(None)), 2)
+
+    def test_paths_check(self):
+        self.assertEqual(paths_check(None), [])
+
+    @override_settings(MEDIA_ROOT="uuh",
+                       STATIC_ROOT="somewhere",
+                       DATA_DIR="whatever",
+                       CONSUMPTION_DIR="idontcare")
+    def test_paths_check_dont_exist(self):
+        msgs = paths_check(None)
+        self.assertEqual(len(msgs), 4)
+
+        for msg in msgs:
+            self.assertTrue(msg.msg.endswith("is set but doesn't exist."))
+
+    def test_paths_check_no_access(self):
+        os.chmod(self.dirs.data_dir, 0o000)
+        os.chmod(self.dirs.media_dir, 0o000)
+        os.chmod(self.dirs.consumption_dir, 0o000)
+
+        self.addCleanup(os.chmod, self.dirs.data_dir, 0o777)
+        self.addCleanup(os.chmod, self.dirs.media_dir, 0o777)
+        self.addCleanup(os.chmod, self.dirs.consumption_dir, 0o777)
+
+        msgs = paths_check(None)
+        self.assertEqual(len(msgs), 3)
+
+        for msg in msgs:
+            self.assertTrue(msg.msg.endswith("is not writeable"))
+
+    @override_settings(DEBUG=False)
+    def test_debug_disabled(self):
+        self.assertEqual(debug_mode_check(None), [])
+
+    @override_settings(DEBUG=True)
+    def test_debug_enabled(self):
+        self.assertEqual(len(debug_mode_check(None)), 1)
diff --git a/src/paperless_tesseract/checks.py b/src/paperless_tesseract/checks.py
index 41ea3c9b5..d58b7ac6d 100644
--- a/src/paperless_tesseract/checks.py
+++ b/src/paperless_tesseract/checks.py
@@ -1,7 +1,7 @@
 import subprocess
 
 from django.conf import settings
-from django.core.checks import Error, register
+from django.core.checks import Error, Warning, register
 
 
 def get_tesseract_langs():
diff --git a/src/paperless_tesseract/tests/test_checks.py b/src/paperless_tesseract/tests/test_checks.py
new file mode 100644
index 000000000..c4f15764e
--- /dev/null
+++ b/src/paperless_tesseract/tests/test_checks.py
@@ -0,0 +1,26 @@
+from unittest import mock
+
+from django.core.checks import ERROR
+from django.test import TestCase, override_settings
+
+from paperless_tesseract import check_default_language_available
+
+
+class TestChecks(TestCase):
+
+    def test_default_language(self):
+        msgs = check_default_language_available(None)
+
+    @override_settings(OCR_LANGUAGE="")
+    def test_no_language(self):
+        msgs = check_default_language_available(None)
+        self.assertEqual(len(msgs), 1)
+        self.assertTrue(msgs[0].msg.startswith("No OCR language has been specified with PAPERLESS_OCR_LANGUAGE"))
+
+    @override_settings(OCR_LANGUAGE="ita")
+    @mock.patch("paperless_tesseract.checks.get_tesseract_langs")
+    def test_invalid_language(self, m):
+        m.return_value = ["deu", "eng"]
+        msgs = check_default_language_available(None)
+        self.assertEqual(len(msgs), 1)
+        self.assertEqual(msgs[0].level, ERROR)

From fad3df1e39037af3ea4d7dcaf8220dae9f97ef93 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 19 Dec 2020 16:46:04 +0100
Subject: [PATCH 0307/1300] removed x-frame-options, since that was only used
 for the <object> pdf display tag.

---
 src/paperless/settings.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 1a6b80a0c..c6f7c9357 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -160,13 +160,6 @@ if AUTO_LOGIN_USERNAME:
     MIDDLEWARE.insert(_index+1, 'paperless.auth.AutoLoginMiddleware')
 
 
-if DEBUG:
-    X_FRAME_OPTIONS = ''
-    # this should really be 'allow-from uri' but its not supported in any mayor
-    # browser.
-else:
-    X_FRAME_OPTIONS = 'SAMEORIGIN'
-
 # We allow CORS from localhost:8080
 CORS_ALLOWED_ORIGINS = tuple(os.getenv("PAPERLESS_CORS_ALLOWED_HOSTS", "http://localhost:8000").split(","))
 

From bb814da95b1e5efecdfc3cdafd0a5fb772ed2281 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 19 Dec 2020 16:46:09 +0100
Subject: [PATCH 0308/1300] more test.

---
 src/documents/tests/test_management.py        | 135 ++++++++++++++++++
 .../tests/test_management_archiver.py         |  40 ------
 .../tests/test_management_decrypt.py          |  57 --------
 3 files changed, 135 insertions(+), 97 deletions(-)
 create mode 100644 src/documents/tests/test_management.py
 delete mode 100644 src/documents/tests/test_management_archiver.py
 delete mode 100644 src/documents/tests/test_management_decrypt.py

diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py
new file mode 100644
index 000000000..58aaf9342
--- /dev/null
+++ b/src/documents/tests/test_management.py
@@ -0,0 +1,135 @@
+import hashlib
+import tempfile
+import filecmp
+import os
+import shutil
+from pathlib import Path
+from unittest import mock
+
+from django.test import TestCase, override_settings
+
+
+from django.core.management import call_command
+
+from documents.file_handling import generate_filename
+from documents.management.commands.document_archiver import handle_document
+from documents.models import Document
+from documents.tests.utils import DirectoriesMixin
+
+
+sample_file = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
+
+
+class TestArchiver(DirectoriesMixin, TestCase):
+
+    def make_models(self):
+        return Document.objects.create(checksum="A", title="A", content="first document", mime_type="application/pdf")
+
+    def test_archiver(self):
+
+        doc = self.make_models()
+        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, f"{doc.id:07}.pdf"))
+
+        call_command('document_archiver')
+
+    def test_handle_document(self):
+
+        doc = self.make_models()
+        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, f"{doc.id:07}.pdf"))
+
+        handle_document(doc.pk)
+
+        doc = Document.objects.get(id=doc.id)
+
+        self.assertIsNotNone(doc.checksum)
+        self.assertTrue(os.path.isfile(doc.archive_path))
+        self.assertTrue(os.path.isfile(doc.source_path))
+        self.assertTrue(filecmp.cmp(sample_file, doc.source_path))
+
+
+class TestDecryptDocuments(TestCase):
+
+    @override_settings(
+        ORIGINALS_DIR=os.path.join(os.path.dirname(__file__), "samples", "originals"),
+        THUMBNAIL_DIR=os.path.join(os.path.dirname(__file__), "samples", "thumb"),
+        PASSPHRASE="test",
+        PAPERLESS_FILENAME_FORMAT=None
+    )
+    @mock.patch("documents.management.commands.decrypt_documents.input")
+    def test_decrypt(self, m):
+
+        media_dir = tempfile.mkdtemp()
+        originals_dir = os.path.join(media_dir, "documents", "originals")
+        thumb_dir = os.path.join(media_dir, "documents", "thumbnails")
+        os.makedirs(originals_dir, exist_ok=True)
+        os.makedirs(thumb_dir, exist_ok=True)
+
+        override_settings(
+            ORIGINALS_DIR=originals_dir,
+            THUMBNAIL_DIR=thumb_dir,
+            PASSPHRASE="test"
+        ).enable()
+
+        doc = Document.objects.create(checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg",  mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
+
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf.gpg"), os.path.join(originals_dir, "0000002.pdf.gpg"))
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", f"0000002.png.gpg"), os.path.join(thumb_dir, f"{doc.id:07}.png.gpg"))
+
+        call_command('decrypt_documents')
+
+        doc.refresh_from_db()
+
+        self.assertEqual(doc.storage_type, Document.STORAGE_TYPE_UNENCRYPTED)
+        self.assertEqual(doc.filename, "0000002.pdf")
+        self.assertTrue(os.path.isfile(os.path.join(originals_dir, "0000002.pdf")))
+        self.assertTrue(os.path.isfile(doc.source_path))
+        self.assertTrue(os.path.isfile(os.path.join(thumb_dir, f"{doc.id:07}.png")))
+        self.assertTrue(os.path.isfile(doc.thumbnail_path))
+
+        with doc.source_file as f:
+            checksum = hashlib.md5(f.read()).hexdigest()
+            self.assertEqual(checksum, doc.checksum)
+
+
+class TestMakeIndex(TestCase):
+
+    @mock.patch("documents.management.commands.document_index.index_reindex")
+    def test_reindex(self, m):
+        call_command("document_index", "reindex")
+        m.assert_called_once()
+
+    @mock.patch("documents.management.commands.document_index.index_optimize")
+    def test_optimize(self, m):
+        call_command("document_index", "optimize")
+        m.assert_called_once()
+
+
+class TestRenamer(DirectoriesMixin, TestCase):
+
+    def test_rename(self):
+        doc = Document.objects.create(title="test", mime_type="application/pdf")
+        doc.filename = generate_filename(doc)
+        doc.save()
+
+        Path(doc.source_path).touch()
+
+        old_source_path = doc.source_path
+
+        with override_settings(PAPERLESS_FILENAME_FORMAT="{title}"):
+            call_command("document_renamer")
+
+        doc2 = Document.objects.get(id=doc.id)
+
+        self.assertEqual(doc2.filename, "test.pdf")
+        self.assertFalse(os.path.isfile(old_source_path))
+        self.assertFalse(os.path.isfile(doc.source_path))
+        self.assertTrue(os.path.isfile(doc2.source_path))
+
+
+class TestCreateClassifier(TestCase):
+
+    @mock.patch("documents.management.commands.document_create_classifier.train_classifier")
+    def test_create_classifier(self, m):
+        call_command("document_create_classifier")
+
+        m.assert_called_once()
diff --git a/src/documents/tests/test_management_archiver.py b/src/documents/tests/test_management_archiver.py
deleted file mode 100644
index 0828f05ff..000000000
--- a/src/documents/tests/test_management_archiver.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import filecmp
-import os
-import shutil
-
-from django.core.management import call_command
-from django.test import TestCase
-
-from documents.management.commands.document_archiver import handle_document
-from documents.models import Document
-from documents.tests.utils import DirectoriesMixin
-
-
-sample_file = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
-
-
-class TestArchiver(DirectoriesMixin, TestCase):
-
-    def make_models(self):
-        return Document.objects.create(checksum="A", title="A", content="first document", mime_type="application/pdf")
-
-    def test_archiver(self):
-
-        doc = self.make_models()
-        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, f"{doc.id:07}.pdf"))
-
-        call_command('document_archiver')
-
-    def test_handle_document(self):
-
-        doc = self.make_models()
-        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, f"{doc.id:07}.pdf"))
-
-        handle_document(doc.pk)
-
-        doc = Document.objects.get(id=doc.id)
-
-        self.assertIsNotNone(doc.checksum)
-        self.assertTrue(os.path.isfile(doc.archive_path))
-        self.assertTrue(os.path.isfile(doc.source_path))
-        self.assertTrue(filecmp.cmp(sample_file, doc.source_path))
diff --git a/src/documents/tests/test_management_decrypt.py b/src/documents/tests/test_management_decrypt.py
deleted file mode 100644
index 1d64b1105..000000000
--- a/src/documents/tests/test_management_decrypt.py
+++ /dev/null
@@ -1,57 +0,0 @@
-import hashlib
-import json
-import os
-import shutil
-import tempfile
-from unittest import mock
-
-from django.core.management import call_command
-from django.test import TestCase, override_settings
-
-from documents.management.commands import document_exporter
-from documents.models import Document, Tag, DocumentType, Correspondent
-
-
-class TestDecryptDocuments(TestCase):
-
-    @override_settings(
-        ORIGINALS_DIR=os.path.join(os.path.dirname(__file__), "samples", "originals"),
-        THUMBNAIL_DIR=os.path.join(os.path.dirname(__file__), "samples", "thumb"),
-        PASSPHRASE="test",
-        PAPERLESS_FILENAME_FORMAT=None
-    )
-    @mock.patch("documents.management.commands.decrypt_documents.input")
-    def test_decrypt(self, m):
-
-        media_dir = tempfile.mkdtemp()
-        originals_dir = os.path.join(media_dir, "documents", "originals")
-        thumb_dir = os.path.join(media_dir, "documents", "thumbnails")
-        os.makedirs(originals_dir, exist_ok=True)
-        os.makedirs(thumb_dir, exist_ok=True)
-
-        override_settings(
-            ORIGINALS_DIR=originals_dir,
-            THUMBNAIL_DIR=thumb_dir,
-            PASSPHRASE="test"
-        ).enable()
-
-        doc = Document.objects.create(checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg",  mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
-
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf.gpg"), os.path.join(originals_dir, "0000002.pdf.gpg"))
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", f"0000002.png.gpg"), os.path.join(thumb_dir, f"{doc.id:07}.png.gpg"))
-
-        call_command('decrypt_documents')
-
-        doc.refresh_from_db()
-
-        self.assertEqual(doc.storage_type, Document.STORAGE_TYPE_UNENCRYPTED)
-        self.assertEqual(doc.filename, "0000002.pdf")
-        self.assertTrue(os.path.isfile(os.path.join(originals_dir, "0000002.pdf")))
-        self.assertTrue(os.path.isfile(doc.source_path))
-        self.assertTrue(os.path.isfile(os.path.join(thumb_dir, f"{doc.id:07}.png")))
-        self.assertTrue(os.path.isfile(doc.thumbnail_path))
-
-        with doc.source_file as f:
-            checksum = hashlib.md5(f.read()).hexdigest()
-            self.assertEqual(checksum, doc.checksum)
-

From 400da7bbc5f6175b27ec2a629379b6e4c4d56384 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 07:49:32 -0800
Subject: [PATCH 0309/1300] Minor refactoring

---
 .../bulk-editor/bulk-editor.component.ts             |  4 ++--
 .../document-list/document-list.component.ts         | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 8e6197e56..b1858e0f7 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -108,11 +108,11 @@ export class BulkEditorComponent {
   }
 
   applyCorrespondent(selectedCorrespondent: PaperlessCorrespondent[]) {
-    this.setCorrespondent.emit(selectedCorrespondent)
+    this.setCorrespondent.emit(selectedCorrespondent.length > 0 ? selectedCorrespondent.shift() : null)
   }
 
   applyDocumentType(selectedDocumentType: PaperlessDocumentType[]) {
-    this.setDocumentType.emit(selectedDocumentType)
+    this.setDocumentType.emit(selectedDocumentType.length > 0 ? selectedDocumentType.shift() : null)
   }
 
   applyDelete() {
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 15e7987fe..a08cb1fad 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -142,10 +142,7 @@ export class DocumentListComponent implements OnInit {
     )
   }
 
-  bulkSetCorrespondent(correspondent: PaperlessCorrespondent[]) {
-    if (correspondent.length > 0) correspondent = correspondent.shift()
-    else correspondent = undefined
-
+  bulkSetCorrespondent(correspondent: PaperlessCorrespondent) {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Confirm correspondent assignment"
     let messageFragment = correspondent ? `assign the correspondent ${correspondent.name} to` : `remove all correspondents from`
@@ -161,10 +158,7 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
-  bulkSetDocumentType(documentType: PaperlessDocumentType[]) {
-    if (documentType.length > 0) documentType = documentType.shift()
-    else documentType = undefined
-
+  bulkSetDocumentType(documentType: PaperlessDocumentType) {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Confirm Document Type assignment"
     let messageFragment = documentType ? `assign the document type ${documentType.name} to` : `remove all document types from`
@@ -182,7 +176,7 @@ export class DocumentListComponent implements OnInit {
 
   bulkSetTags(tags) {
     console.log('bulkSetTags', tags);
-    // TODO: 
+    // TODO:
   }
 
   bulkAddTag() {

From e79c45c98d5164de4c99888c1a9cbd7553ab3bcc Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 19 Dec 2020 20:39:56 +0100
Subject: [PATCH 0310/1300] fix test cases

---
 src/paperless/checks.py            | 7 ++-----
 src/paperless/tests/test_checks.py | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/paperless/checks.py b/src/paperless/checks.py
index 3e26ae69f..1e74b30a9 100644
--- a/src/paperless/checks.py
+++ b/src/paperless/checks.py
@@ -36,12 +36,9 @@ def paths_check(app_configs, **kwargs):
     Check the various paths for existence, readability and writeability
     """
 
-    check_messages = path_check("PAPERLESS_DATA_DIR", settings.DATA_DIR) + \
+    return path_check("PAPERLESS_DATA_DIR", settings.DATA_DIR) + \
         path_check("PAPERLESS_MEDIA_ROOT", settings.MEDIA_ROOT) + \
-        path_check("PAPERLESS_CONSUMPTION_DIR", settings.CONSUMPTION_DIR) + \
-        path_check("PAPERLESS_STATICDIR", settings.STATIC_ROOT)
-
-    return check_messages
+        path_check("PAPERLESS_CONSUMPTION_DIR", settings.CONSUMPTION_DIR)
 
 
 @register()
diff --git a/src/paperless/tests/test_checks.py b/src/paperless/tests/test_checks.py
index 61cc05bf0..e1525cab8 100644
--- a/src/paperless/tests/test_checks.py
+++ b/src/paperless/tests/test_checks.py
@@ -21,12 +21,11 @@ class TestChecks(DirectoriesMixin, TestCase):
         self.assertEqual(paths_check(None), [])
 
     @override_settings(MEDIA_ROOT="uuh",
-                       STATIC_ROOT="somewhere",
                        DATA_DIR="whatever",
                        CONSUMPTION_DIR="idontcare")
     def test_paths_check_dont_exist(self):
         msgs = paths_check(None)
-        self.assertEqual(len(msgs), 4)
+        self.assertEqual(len(msgs), 3, str(msgs))
 
         for msg in msgs:
             self.assertTrue(msg.msg.endswith("is set but doesn't exist."))

From 3f94fc2618e5f543c3cbaeed46cd01749a6e8f66 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 19 Dec 2020 21:52:58 +0100
Subject: [PATCH 0311/1300] fix & test a migration

---
 src/documents/migrations/1003_mime_types.py |   1 +
 src/documents/tests/test_migrations.py      | 129 ++++++++++++++++++++
 2 files changed, 130 insertions(+)
 create mode 100644 src/documents/tests/test_migrations.py

diff --git a/src/documents/migrations/1003_mime_types.py b/src/documents/migrations/1003_mime_types.py
index 78ecced2b..c196f29f4 100644
--- a/src/documents/migrations/1003_mime_types.py
+++ b/src/documents/migrations/1003_mime_types.py
@@ -11,6 +11,7 @@ from paperless.db import GnuPG
 STORAGE_TYPE_UNENCRYPTED = "unencrypted"
 STORAGE_TYPE_GPG = "gpg"
 
+
 def source_path(self):
     if self.filename:
         fname = str(self.filename)
diff --git a/src/documents/tests/test_migrations.py b/src/documents/tests/test_migrations.py
new file mode 100644
index 000000000..33ba41444
--- /dev/null
+++ b/src/documents/tests/test_migrations.py
@@ -0,0 +1,129 @@
+import os
+import shutil
+from pathlib import Path
+
+from django.apps import apps
+from django.conf import settings
+from django.db import connection
+from django.db.migrations.executor import MigrationExecutor
+from django.test import TestCase, TransactionTestCase, override_settings
+
+from documents.models import Document
+from documents.parsers import get_default_file_extension
+from documents.tests.utils import DirectoriesMixin
+
+
+class TestMigrations(TransactionTestCase):
+
+    @property
+    def app(self):
+        return apps.get_containing_app_config(type(self).__module__).name
+
+    migrate_from = None
+    migrate_to = None
+
+    def setUp(self):
+        super(TestMigrations, self).setUp()
+
+        assert self.migrate_from and self.migrate_to, \
+            "TestCase '{}' must define migrate_from and migrate_to     properties".format(type(self).__name__)
+        self.migrate_from = [(self.app, self.migrate_from)]
+        self.migrate_to = [(self.app, self.migrate_to)]
+        executor = MigrationExecutor(connection)
+        old_apps = executor.loader.project_state(self.migrate_from).apps
+
+        # Reverse to the original migration
+        executor.migrate(self.migrate_from)
+
+        self.setUpBeforeMigration(old_apps)
+
+        # Run the migration to test
+        executor = MigrationExecutor(connection)
+        executor.loader.build_graph()  # reload.
+        executor.migrate(self.migrate_to)
+
+        self.apps = executor.loader.project_state(self.migrate_to).apps
+
+    def setUpBeforeMigration(self, apps):
+        pass
+
+
+STORAGE_TYPE_UNENCRYPTED = "unencrypted"
+STORAGE_TYPE_GPG = "gpg"
+
+
+def source_path_before(self):
+    if self.filename:
+        fname = str(self.filename)
+    else:
+        fname = "{:07}.{}".format(self.pk, self.file_type)
+        if self.storage_type == STORAGE_TYPE_GPG:
+            fname += ".gpg"
+
+    return os.path.join(
+        settings.ORIGINALS_DIR,
+        fname
+    )
+
+
+def file_type_after(self):
+    return get_default_file_extension(self.mime_type)
+
+
+def source_path_after(doc):
+    if doc.filename:
+        fname = str(doc.filename)
+    else:
+        fname = "{:07}{}".format(doc.pk, file_type_after(doc))
+        if doc.storage_type == STORAGE_TYPE_GPG:
+            fname += ".gpg"  # pragma: no cover
+
+    return os.path.join(
+        settings.ORIGINALS_DIR,
+        fname
+    )
+
+
+@override_settings(PASSPHRASE="test")
+class TestMigrateMimeType(DirectoriesMixin, TestMigrations):
+
+    migrate_from = '1002_auto_20201111_1105'
+    migrate_to = '1003_mime_types'
+
+    def setUpBeforeMigration(self, apps):
+        Document = apps.get_model("documents", "Document")
+        doc = Document.objects.create(title="test", file_type="pdf", filename="file1.pdf")
+        self.doc_id = doc.id
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), source_path_before(doc))
+
+        doc2 = Document.objects.create(checksum="B", file_type="pdf", storage_type=STORAGE_TYPE_GPG)
+        self.doc2_id = doc2.id
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf.gpg"), source_path_before(doc2))
+
+    def testMimeTypesMigrated(self):
+        Document = self.apps.get_model('documents', 'Document')
+
+        doc = Document.objects.get(id=self.doc_id)
+        self.assertEqual(doc.mime_type, "application/pdf")
+
+        doc2 = Document.objects.get(id=self.doc2_id)
+        self.assertEqual(doc2.mime_type, "application/pdf")
+
+
+@override_settings(PASSPHRASE="test")
+class TestMigrateMimeTypeBackwards(DirectoriesMixin, TestMigrations):
+
+    migrate_from = '1003_mime_types'
+    migrate_to = '1002_auto_20201111_1105'
+
+    def setUpBeforeMigration(self, apps):
+        Document = apps.get_model("documents", "Document")
+        doc = Document.objects.create(title="test", mime_type="application/pdf", filename="file1.pdf")
+        self.doc_id = doc.id
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), source_path_after(doc))
+
+    def testMimeTypesReverted(self):
+        Document = self.apps.get_model('documents', 'Document')
+
+        doc = Document.objects.get(id=self.doc_id)
+        self.assertEqual(doc.file_type, "pdf")

From d91fa99e779366c3c892be80cb0213070787525a Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 14:26:26 -0800
Subject: [PATCH 0312/1300] Handler for bulk set tags (awaiting API endpoint)

---
 .../document-list/document-list.component.ts   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index a08cb1fad..3bdbc3eb8 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -174,9 +174,21 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
-  bulkSetTags(tags) {
-    console.log('bulkSetTags', tags);
-    // TODO:
+  bulkSetTags(tags: PaperlessTag[]) {
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Confirm Tags assignment"
+    let messageFragment = tags ? `assign the tag(s) ${tags.map(t => t.name).join(', ')} to` : `remove all tags from`
+    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.btnClass = "btn-warning"
+    modal.componentInstance.btnCaption = "Confirm"
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      // TODO: API endpoint for set multiple tags
+      this.executeBulkOperation('set_tags', {"document_type": tags ? tags.map(t => t.id) : null}).subscribe(
+        response => {
+          modal.close()
+        }
+      )
+    })
   }
 
   bulkAddTag() {

From 32224f187dd8fa8ec4f6f6ad019c6014a33af0e8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 20 Dec 2020 00:06:33 +0100
Subject: [PATCH 0313/1300] test CONSUMER_DELETE_DUPLICATES

---
 src/documents/tests/test_consumer.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index b4b19be4c..75d6aa16b 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -642,3 +642,31 @@ class TestConsumer(DirectoriesMixin, TestCase):
         self.assertEqual(document.document_type, dtype)
         self.assertIn(t1, document.tags.all())
         self.assertNotIn(t2, document.tags.all())
+
+    @override_settings(CONSUMER_DELETE_DUPLICATES=True)
+    def test_delete_duplicate(self):
+        dst = self.get_test_file()
+        self.assertTrue(os.path.isfile(dst))
+        doc = self.consumer.try_consume_file(dst)
+
+        self.assertFalse(os.path.isfile(dst))
+        self.assertIsNotNone(doc)
+
+        dst = self.get_test_file()
+        self.assertTrue(os.path.isfile(dst))
+        self.assertRaises(ConsumerError, self.consumer.try_consume_file, dst)
+        self.assertFalse(os.path.isfile(dst))
+
+    @override_settings(CONSUMER_DELETE_DUPLICATES=False)
+    def test_no_delete_duplicate(self):
+        dst = self.get_test_file()
+        self.assertTrue(os.path.isfile(dst))
+        doc = self.consumer.try_consume_file(dst)
+
+        self.assertFalse(os.path.isfile(dst))
+        self.assertIsNotNone(doc)
+
+        dst = self.get_test_file()
+        self.assertTrue(os.path.isfile(dst))
+        self.assertRaises(ConsumerError, self.consumer.try_consume_file, dst)
+        self.assertTrue(os.path.isfile(dst))

From 7f9a0204b59239088d2e47aec8d797d12d1a581a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 20 Dec 2020 00:08:05 +0100
Subject: [PATCH 0314/1300] removed most of the logic that extracts data from
 filename patterns #156

---
 src/documents/consumer.py            |   7 -
 src/documents/models.py              |  66 ---------
 src/documents/tests/test_consumer.py | 212 +--------------------------
 3 files changed, 4 insertions(+), 281 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index e4da51f1d..ab4912a36 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -247,7 +247,6 @@ class Consumer(LoggingMixin):
 
         with open(self.path, "rb") as f:
             document = Document.objects.create(
-                correspondent=file_info.correspondent,
                 title=(self.override_title or file_info.title)[:127],
                 content=text,
                 mime_type=mime_type,
@@ -257,12 +256,6 @@ class Consumer(LoggingMixin):
                 storage_type=storage_type
             )
 
-        relevant_tags = set(file_info.tags)
-        if relevant_tags:
-            tag_names = ", ".join([t.name for t in relevant_tags])
-            self.log("debug", "Tagging with {}".format(tag_names))
-            document.tags.add(*relevant_tags)
-
         self.apply_overrides(document)
 
         document.save()
diff --git a/src/documents/models.py b/src/documents/models.py
index 3a6d155ed..168dd8c7b 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -357,54 +357,12 @@ class SavedViewFilterRule(models.Model):
 # TODO: why is this in the models file?
 class FileInfo:
 
-    # This epic regex *almost* worked for our needs, so I'm keeping it here for
-    # posterity, in the hopes that we might find a way to make it work one day.
-    ALMOST_REGEX = re.compile(
-        r"^((?P<date>\d\d\d\d\d\d\d\d\d\d\d\d\d\dZ){separator})?"
-        r"((?P<correspondent>{non_separated_word}+){separator})??"
-        r"(?P<title>{non_separated_word}+)"
-        r"({separator}(?P<tags>[a-z,0-9-]+))?"
-        r"\.(?P<extension>[a-zA-Z.-]+)$".format(
-            separator=r"\s+-\s+",
-            non_separated_word=r"([\w,. ]|([^\s]-))"
-        )
-    )
     REGEXES = OrderedDict([
-        ("created-correspondent-title-tags", re.compile(
-            r"^(?P<created>\d\d\d\d\d\d\d\d(\d\d\d\d\d\d)?Z) - "
-            r"(?P<correspondent>.*) - "
-            r"(?P<title>.*) - "
-            r"(?P<tags>[a-z0-9\-,]*)$",
-            flags=re.IGNORECASE
-        )),
-        ("created-title-tags", re.compile(
-            r"^(?P<created>\d\d\d\d\d\d\d\d(\d\d\d\d\d\d)?Z) - "
-            r"(?P<title>.*) - "
-            r"(?P<tags>[a-z0-9\-,]*)$",
-            flags=re.IGNORECASE
-        )),
-        ("created-correspondent-title", re.compile(
-            r"^(?P<created>\d\d\d\d\d\d\d\d(\d\d\d\d\d\d)?Z) - "
-            r"(?P<correspondent>.*) - "
-            r"(?P<title>.*)$",
-            flags=re.IGNORECASE
-        )),
         ("created-title", re.compile(
             r"^(?P<created>\d\d\d\d\d\d\d\d(\d\d\d\d\d\d)?Z) - "
             r"(?P<title>.*)$",
             flags=re.IGNORECASE
         )),
-        ("correspondent-title-tags", re.compile(
-            r"(?P<correspondent>.*) - "
-            r"(?P<title>.*) - "
-            r"(?P<tags>[a-z0-9\-,]*)$",
-            flags=re.IGNORECASE
-        )),
-        ("correspondent-title", re.compile(
-            r"(?P<correspondent>.*) - "
-            r"(?P<title>.*)?$",
-            flags=re.IGNORECASE
-        )),
         ("title", re.compile(
             r"(?P<title>.*)$",
             flags=re.IGNORECASE
@@ -427,23 +385,10 @@ class FileInfo:
         except ValueError:
             return None
 
-    @classmethod
-    def _get_correspondent(cls, name):
-        if not name:
-            return None
-        return Correspondent.objects.get_or_create(name=name)[0]
-
     @classmethod
     def _get_title(cls, title):
         return title
 
-    @classmethod
-    def _get_tags(cls, tags):
-        r = []
-        for t in tags.split(","):
-            r.append(Tag.objects.get_or_create(name=t)[0])
-        return tuple(r)
-
     @classmethod
     def _mangle_property(cls, properties, name):
         if name in properties:
@@ -453,15 +398,6 @@ class FileInfo:
 
     @classmethod
     def from_filename(cls, filename):
-        """
-        We use a crude naming convention to make handling the correspondent,
-        title, and tags easier:
-          "<date> - <correspondent> - <title> - <tags>"
-          "<correspondent> - <title> - <tags>"
-          "<correspondent> - <title>"
-          "<title>"
-        """
-
         # Mutate filename in-place before parsing its components
         # by applying at most one of the configured transformations.
         for (pattern, repl) in settings.FILENAME_PARSE_TRANSFORMS:
@@ -492,7 +428,5 @@ class FileInfo:
             if m:
                 properties = m.groupdict()
                 cls._mangle_property(properties, "created")
-                cls._mangle_property(properties, "correspondent")
                 cls._mangle_property(properties, "title")
-                cls._mangle_property(properties, "tags")
                 return cls(**properties)
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 75d6aa16b..f53981850 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -29,81 +29,6 @@ class TestAttributes(TestCase):
 
         self.assertEqual(tuple([t.name for t in file_info.tags]), tags, filename)
 
-    def test_guess_attributes_from_name0(self):
-        self._test_guess_attributes_from_name(
-            "Sender - Title.pdf", "Sender", "Title", ())
-
-    def test_guess_attributes_from_name1(self):
-        self._test_guess_attributes_from_name(
-            "Spaced Sender - Title.pdf", "Spaced Sender", "Title", ())
-
-    def test_guess_attributes_from_name2(self):
-        self._test_guess_attributes_from_name(
-            "Sender - Spaced Title.pdf", "Sender", "Spaced Title", ())
-
-    def test_guess_attributes_from_name3(self):
-        self._test_guess_attributes_from_name(
-            "Dashed-Sender - Title.pdf", "Dashed-Sender", "Title", ())
-
-    def test_guess_attributes_from_name4(self):
-        self._test_guess_attributes_from_name(
-            "Sender - Dashed-Title.pdf", "Sender", "Dashed-Title", ())
-
-    def test_guess_attributes_from_name5(self):
-        self._test_guess_attributes_from_name(
-            "Sender - Title - tag1,tag2,tag3.pdf",
-            "Sender",
-            "Title",
-            self.TAGS
-        )
-
-    def test_guess_attributes_from_name6(self):
-        self._test_guess_attributes_from_name(
-            "Spaced Sender - Title - tag1,tag2,tag3.pdf",
-            "Spaced Sender",
-            "Title",
-            self.TAGS
-        )
-
-    def test_guess_attributes_from_name7(self):
-        self._test_guess_attributes_from_name(
-            "Sender - Spaced Title - tag1,tag2,tag3.pdf",
-            "Sender",
-            "Spaced Title",
-            self.TAGS
-        )
-
-    def test_guess_attributes_from_name8(self):
-        self._test_guess_attributes_from_name(
-            "Dashed-Sender - Title - tag1,tag2,tag3.pdf",
-            "Dashed-Sender",
-            "Title",
-            self.TAGS
-        )
-
-    def test_guess_attributes_from_name9(self):
-        self._test_guess_attributes_from_name(
-            "Sender - Dashed-Title - tag1,tag2,tag3.pdf",
-            "Sender",
-            "Dashed-Title",
-            self.TAGS
-        )
-
-    def test_guess_attributes_from_name10(self):
-        self._test_guess_attributes_from_name(
-            "Σενδερ - Τιτλε - tag1,tag2,tag3.pdf",
-            "Σενδερ",
-            "Τιτλε",
-            self.TAGS
-        )
-
-    def test_guess_attributes_from_name_when_correspondent_empty(self):
-        self._test_guess_attributes_from_name(
-            ' - weird empty correspondent but should not break.pdf',
-            None,
-            'weird empty correspondent but should not break',
-            ()
-        )
 
     def test_guess_attributes_from_name_when_title_starts_with_dash(self):
         self._test_guess_attributes_from_name(
@@ -121,28 +46,6 @@ class TestAttributes(TestCase):
             ()
         )
 
-    def test_guess_attributes_from_name_when_title_is_empty(self):
-        self._test_guess_attributes_from_name(
-            'weird correspondent but should not break - .pdf',
-            'weird correspondent but should not break',
-            '',
-            ()
-        )
-
-    def test_case_insensitive_tag_creation(self):
-        """
-        Tags should be detected and created as lower case.
-        :return:
-        """
-
-        filename = "Title - Correspondent - tAg1,TAG2.pdf"
-        self.assertEqual(len(FileInfo.from_filename(filename).tags), 2)
-
-        path = "Title - Correspondent - tag1,tag2.pdf"
-        self.assertEqual(len(FileInfo.from_filename(filename).tags), 2)
-
-        self.assertEqual(Tag.objects.all().count(), 2)
-
 
 class TestFieldPermutations(TestCase):
 
@@ -199,69 +102,7 @@ class TestFieldPermutations(TestCase):
             filename = template.format(**spec)
             self._test_guessed_attributes(filename, **spec)
 
-    def test_title_and_correspondent(self):
-        template = '{correspondent} - {title}.pdf'
-        for correspondent in self.valid_correspondents:
-            for title in self.valid_titles:
-                spec = dict(correspondent=correspondent, title=title)
-                filename = template.format(**spec)
-                self._test_guessed_attributes(filename, **spec)
-
-    def test_title_and_correspondent_and_tags(self):
-        template = '{correspondent} - {title} - {tags}.pdf'
-        for correspondent in self.valid_correspondents:
-            for title in self.valid_titles:
-                for tags in self.valid_tags:
-                    spec = dict(correspondent=correspondent, title=title,
-                                tags=tags)
-                    filename = template.format(**spec)
-                    self._test_guessed_attributes(filename, **spec)
-
-    def test_created_and_correspondent_and_title_and_tags(self):
-
-        template = (
-            "{created} - "
-            "{correspondent} - "
-            "{title} - "
-            "{tags}.pdf"
-        )
-
-        for created in self.valid_dates:
-            for correspondent in self.valid_correspondents:
-                for title in self.valid_titles:
-                    for tags in self.valid_tags:
-                        spec = {
-                            "created": created,
-                            "correspondent": correspondent,
-                            "title": title,
-                            "tags": tags,
-                        }
-                        self._test_guessed_attributes(
-                            template.format(**spec), **spec)
-
-    def test_created_and_correspondent_and_title(self):
-
-        template = "{created} - {correspondent} - {title}.pdf"
-
-        for created in self.valid_dates:
-            for correspondent in self.valid_correspondents:
-                for title in self.valid_titles:
-
-                    # Skip cases where title looks like a tag as we can't
-                    # accommodate such cases.
-                    if title.lower() == title:
-                        continue
-
-                    spec = {
-                        "created": created,
-                        "correspondent": correspondent,
-                        "title": title
-                    }
-                    self._test_guessed_attributes(
-                        template.format(**spec), **spec)
-
     def test_created_and_title(self):
-
         template = "{created} - {title}.pdf"
 
         for created in self.valid_dates:
@@ -273,21 +114,6 @@ class TestFieldPermutations(TestCase):
                 self._test_guessed_attributes(
                     template.format(**spec), **spec)
 
-    def test_created_and_title_and_tags(self):
-
-        template = "{created} - {title} - {tags}.pdf"
-
-        for created in self.valid_dates:
-            for title in self.valid_titles:
-                for tags in self.valid_tags:
-                    spec = {
-                        "created": created,
-                        "title": title,
-                        "tags": tags
-                    }
-                    self._test_guessed_attributes(
-                        template.format(**spec), **spec)
-
     def test_invalid_date_format(self):
         info = FileInfo.from_filename("06112017Z - title.pdf")
         self.assertEqual(info.title, "title")
@@ -336,32 +162,6 @@ class TestFieldPermutations(TestCase):
             info = FileInfo.from_filename(filename)
             self.assertEqual(info.title, "anotherall")
 
-        # Complex transformation without date in replacement string
-        with self.settings(
-                FILENAME_PARSE_TRANSFORMS=[(exact_patt, repl1)]):
-            info = FileInfo.from_filename(filename)
-            self.assertEqual(info.title, "0001")
-            self.assertEqual(len(info.tags), 2)
-            self.assertEqual(info.tags[0].name, "tag1")
-            self.assertEqual(info.tags[1].name, "tag2")
-            self.assertIsNone(info.created)
-
-        # Complex transformation with date in replacement string
-        with self.settings(
-            FILENAME_PARSE_TRANSFORMS=[
-                (none_patt, "none.gif"),
-                (exact_patt, repl2),    # <-- matches
-                (exact_patt, repl1),
-                (all_patt, "all.gif")]):
-            info = FileInfo.from_filename(filename)
-            self.assertEqual(info.title, "0001")
-            self.assertEqual(len(info.tags), 2)
-            self.assertEqual(info.tags[0].name, "tag1")
-            self.assertEqual(info.tags[1].name, "tag2")
-            self.assertEqual(info.created.year, 2019)
-            self.assertEqual(info.created.month, 9)
-            self.assertEqual(info.created.day, 8)
-
 
 class DummyParser(DocumentParser):
 
@@ -476,15 +276,13 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
     def testOverrideFilename(self):
         filename = self.get_test_file()
-        override_filename = "My Bank - Statement for November.pdf"
+        override_filename = "Statement for November.pdf"
 
         document = self.consumer.try_consume_file(filename, override_filename=override_filename)
 
-        self.assertEqual(document.correspondent.name, "My Bank")
         self.assertEqual(document.title, "Statement for November")
 
     def testOverrideTitle(self):
-
         document = self.consumer.try_consume_file(self.get_test_file(), override_title="Override Title")
         self.assertEqual(document.title, "Override Title")
 
@@ -594,11 +392,10 @@ class TestConsumer(DirectoriesMixin, TestCase):
     def testFilenameHandling(self):
         filename = self.get_test_file()
 
-        document = self.consumer.try_consume_file(filename, override_filename="Bank - Test.pdf", override_title="new docs")
+        document = self.consumer.try_consume_file(filename, override_title="new docs")
 
         self.assertEqual(document.title, "new docs")
-        self.assertEqual(document.correspondent.name, "Bank")
-        self.assertEqual(document.filename, "Bank/new docs.pdf")
+        self.assertEqual(document.filename, "none/new docs.pdf")
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
     @mock.patch("documents.signals.handlers.generate_unique_filename")
@@ -617,10 +414,9 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         Tag.objects.create(name="test", is_inbox_tag=True)
 
-        document = self.consumer.try_consume_file(filename, override_filename="Bank - Test.pdf", override_title="new docs")
+        document = self.consumer.try_consume_file(filename, override_title="new docs")
 
         self.assertEqual(document.title, "new docs")
-        self.assertEqual(document.correspondent.name, "Bank")
         self.assertIsNotNone(os.path.isfile(document.title))
         self.assertTrue(os.path.isfile(document.source_path))
 

From 561db8607a91099a85d690f5572af9b5f48beef5 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 15:20:07 -0800
Subject: [PATCH 0315/1300] Unused bulk tag functions

---
 .../document-list/document-list.component.ts  | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 3bdbc3eb8..7e9ce8f66 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -191,38 +191,6 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
-  bulkAddTag() {
-    let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Select tag"
-    modal.componentInstance.message = `Select the tag you wish to assign to ${this.list.selected.size} selected document(s):`
-    this.tagService.listAll().subscribe(response => {
-      modal.componentInstance.objects = response.results
-    })
-    modal.componentInstance.selectClicked.subscribe(selectedId => {
-      this.executeBulkOperation('add_tag', {"tag": selectedId}).subscribe(
-        response => {
-          modal.close()
-        }
-      )
-    })
-  }
-
-  bulkRemoveTag() {
-    let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Select tag"
-    modal.componentInstance.message = `Select the tag you wish to remove from ${this.list.selected.size} selected document(s):`
-    this.tagService.listAll().subscribe(response => {
-      modal.componentInstance.objects = response.results
-    })
-    modal.componentInstance.selectClicked.subscribe(selectedId => {
-      this.executeBulkOperation('remove_tag', {"tag": selectedId}).subscribe(
-        response => {
-          modal.close()
-        }
-      )
-    })
-  }
-
   bulkDelete() {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.delayConfirm(5)

From 9a4190bedfd8fc7747c13aa988fecbd323ac2ab0 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 20:19:37 -0800
Subject: [PATCH 0316/1300] Rename dropdown type enum & add pass as variable to
 use like an Enum

---
 .../filterable-dropdown/filterable-dropdown.component.html  | 4 ++--
 .../filterable-dropdown/filterable-dropdown.component.ts    | 6 ++++--
 .../document-list/bulk-editor/bulk-editor.component.html    | 6 +++---
 .../document-list/bulk-editor/bulk-editor.component.ts      | 3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 870ea41e4..425a290a5 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -1,12 +1,12 @@
 <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown">
-  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="type !== 'actions' && itemsSelected?.length > 0 ? 'btn-primary' : 'btn-outline-primary'">
+  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="type !== types.Editing && itemsSelected?.length > 0 ? 'btn-primary' : 'btn-outline-primary'">
     <div class="d-none d-md-inline">{{title}}</div>
     <div class="d-inline-block d-md-none">
       <svg class="toolbaricon" fill="currentColor">
         <use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
       </svg>
     </div>
-    <ng-container *ngIf="type !== 'actions' && itemsSelected?.length > 0">
+    <ng-container *ngIf="type !== types.Editing && itemsSelected?.length > 0">
       <div class="badge bg-secondary text-light rounded-pill badge-corner">
         {{itemsSelected?.length}}
       </div>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 4f694ed49..7463e7b19 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -19,7 +19,7 @@ export enum SelectableItemState {
 
 export enum FilterableDropdownType {
   Filtering = 'filtering',
-  Actions = 'actions'
+  Editing = 'editing'
 }
 
 @Component({
@@ -47,7 +47,7 @@ export class FilterableDropdownComponent {
 
   @Input()
   set selectableItems (selectableItems: SelectableItem[]) {
-    if (this.type == FilterableDropdownType.Actions && this.dropdown?.isOpen()) return
+    if (this.type == FilterableDropdownType.Editing && this.dropdown?.isOpen()) return
     else this._selectableItems = selectableItems
   }
 
@@ -75,6 +75,8 @@ export class FilterableDropdownComponent {
   @Input()
   type: FilterableDropdownType = FilterableDropdownType.Filtering
 
+  types = FilterableDropdownType
+
   @Input()
   singular: boolean = false
 
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index e7db0b284..859876a67 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -26,9 +26,9 @@
   <div class="col mb-2 mb-xl-0">
     <div class="d-flex">
       <label class="ml-auto mt-1 mr-2">Apply:</label>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" [selectableItems]="tagsSelectableItems" type="actions" (close)="applyTags($event)"></app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" [selectableItems]="correspondentsSelectableItems" type="actions" singular="true" (close)="applyCorrespondent($event)"></app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" [selectableItems]="documentTypesSelectableItems" type="actions" singular="true" (close)="applyDocumentType($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" [selectableItems]="tagsSelectableItems" [type]="dropdownTypes.Editing" (close)="applyTags($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" [selectableItems]="correspondentsSelectableItems" [type]="dropdownTypes.Editing" singular="true" (close)="applyCorrespondent($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" [selectableItems]="documentTypesSelectableItems" [type]="dropdownTypes.Editing" singular="true" (close)="applyDocumentType($event)"></app-filterable-dropdown>
     </div>
   </div>
   <div class="w-100 d-xl-none"></div>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index b1858e0f7..d6f0fc1c7 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -7,7 +7,7 @@ import { TagService } from 'src/app/services/rest/tag.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { DocumentService } from 'src/app/services/rest/document.service';
-import { SelectableItem, SelectableItemState } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
+import { SelectableItem, SelectableItemState, FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
 
 @Component({
   selector: 'app-bulk-editor',
@@ -47,6 +47,7 @@ export class BulkEditorComponent {
   correspondents: PaperlessCorrespondent[]
   documentTypes: PaperlessDocumentType[]
 
+  dropdownTypes = FilterableDropdownType
   get tagsSelectableItems(): SelectableItem[] {
     let tagsSelectableItems = []
     let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))

From 1da652ba4d50b562d3e69fd4f48ddd467d204a3f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 21:42:19 -0800
Subject: [PATCH 0317/1300] Only apply edits when something has changed

---
 .../filterable-dropdown.component.ts          | 16 ++++---
 .../bulk-editor/bulk-editor.component.html    |  6 +--
 .../bulk-editor/bulk-editor.component.ts      | 47 +++++++++++++++----
 3 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 7463e7b19..2d224567f 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -37,7 +37,7 @@ export class FilterableDropdownComponent {
   @Input()
   set items(items: ObjectWithId[]) {
     if (items) {
-      this.selectableItems = items.map(i => {
+      this._selectableItems = items.map(i => {
         return {item: i, state: SelectableItemState.NotSelected}
       })
     }
@@ -84,15 +84,16 @@ export class FilterableDropdownComponent {
   toggle = new EventEmitter()
 
   @Output()
-  close = new EventEmitter()
+  open = new EventEmitter()
+
+  @Output()
+  editingComplete = new EventEmitter()
 
   constructor(private filterPipe: FilterPipe) { }
 
   toggleItem(selectableItem: SelectableItem): void {
     if (this.singular && selectableItem.state == SelectableItemState.Selected) {
-      this._selectableItems.forEach(si => {
-        if (si.state == SelectableItemState.Selected && si.item.id !== selectableItem.item.id) si.state = SelectableItemState.NotSelected
-      })
+      this._selectableItems.filter(si => si.item.id !== selectableItem.item.id).forEach(si => si.state = SelectableItemState.NotSelected)
     }
     this.toggle.emit(selectableItem.item)
   }
@@ -101,10 +102,11 @@ export class FilterableDropdownComponent {
     if (open) {
       setTimeout(() => {
         this.listFilterTextInput.nativeElement.focus();
-      }, 0);
+      }, 0)
+      this.open.next()
     } else {
       this.filterText = ''
-      this.close.emit(this.itemsSelected)
+      if (this.type == FilterableDropdownType.Editing) this.editingComplete.emit(this.itemsSelected)
     }
   }
 
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 859876a67..4f79a6c3e 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -26,9 +26,9 @@
   <div class="col mb-2 mb-xl-0">
     <div class="d-flex">
       <label class="ml-auto mt-1 mr-2">Apply:</label>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" [selectableItems]="tagsSelectableItems" [type]="dropdownTypes.Editing" (close)="applyTags($event)"></app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" [selectableItems]="correspondentsSelectableItems" [type]="dropdownTypes.Editing" singular="true" (close)="applyCorrespondent($event)"></app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" [selectableItems]="documentTypesSelectableItems" [type]="dropdownTypes.Editing" singular="true" (close)="applyDocumentType($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" [selectableItems]="tagsSelectableItems" [type]="dropdownTypes.Editing" (open)="tagsDropdownOpen()" (editingComplete)="applyTags($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" [selectableItems]="correspondentsSelectableItems" [type]="dropdownTypes.Editing" singular="true" (open)="correspondentsDropdownOpen()" (editingComplete)="applyCorrespondent($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" [selectableItems]="documentTypesSelectableItems" [type]="dropdownTypes.Editing" singular="true" (open)="documentTypesDropdownOpen()" (editingComplete)="applyDocumentType($event)"></app-filterable-dropdown>
     </div>
   </div>
   <div class="w-100 d-xl-none"></div>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index d6f0fc1c7..54ecb6d0a 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -1,4 +1,5 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ObjectWithId } from 'src/app/data/object-with-id';
 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';
@@ -47,7 +48,12 @@ export class BulkEditorComponent {
   correspondents: PaperlessCorrespondent[]
   documentTypes: PaperlessDocumentType[]
 
+  private _initialTagsSelectableItems: SelectableItem[]
+  private _initialCorrespondentsSelectableItems: SelectableItem[]
+  private _initialDocumentTypesSelectableItems: SelectableItem[]
+
   dropdownTypes = FilterableDropdownType
+
   get tagsSelectableItems(): SelectableItem[] {
     let tagsSelectableItems = []
     let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
@@ -72,7 +78,6 @@ export class BulkEditorComponent {
       else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected
       correspondentsSelectableItems.push( { item: c, state: state } )
     })
-
     return correspondentsSelectableItems
   }
 
@@ -87,7 +92,6 @@ export class BulkEditorComponent {
       else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected
       documentTypesSelectableItems.push( { item: dt, state: state } )
     })
-
     return documentTypesSelectableItems
   }
 
@@ -104,16 +108,43 @@ export class BulkEditorComponent {
     this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
   }
 
-  applyTags(tags: PaperlessTag[]) {
-    this.setTags.emit(tags)
+  tagsDropdownOpen() {
+    this._initialTagsSelectableItems = this.tagsSelectableItems
   }
 
-  applyCorrespondent(selectedCorrespondent: PaperlessCorrespondent[]) {
-    this.setCorrespondent.emit(selectedCorrespondent.length > 0 ? selectedCorrespondent.shift() : null)
+  correspondentsDropdownOpen() {
+    this._initialCorrespondentsSelectableItems = this.correspondentsSelectableItems
   }
 
-  applyDocumentType(selectedDocumentType: PaperlessDocumentType[]) {
-    this.setDocumentType.emit(selectedDocumentType.length > 0 ? selectedDocumentType.shift() : null)
+  documentTypesDropdownOpen() {
+    this._initialDocumentTypesSelectableItems = this.documentTypesSelectableItems
+  }
+
+  applyTags(selectedTags: PaperlessTag[]) {
+    let initiallySelectedSelectableTags = this._initialTagsSelectableItems.filter(tsi => tsi.state == SelectableItemState.Selected)
+    let unchanged = this.equateItemsToSelectableItems(selectedTags, initiallySelectedSelectableTags)
+    if (!unchanged) this.setTags.emit(selectedTags)
+    this._initialTagsSelectableItems = null
+  }
+
+  applyCorrespondent(selectedCorrespondents: PaperlessCorrespondent[]) {
+    let initiallySelectedSelectableCorrespondents = this._initialCorrespondentsSelectableItems.filter(csi => csi.state == SelectableItemState.Selected)
+    let unchanged = this.equateItemsToSelectableItems(selectedCorrespondents, initiallySelectedSelectableCorrespondents)
+    if (!unchanged) this.setCorrespondent.emit(selectedCorrespondents?.length > 0 ? selectedCorrespondents.shift() : null)
+    this._initialCorrespondentsSelectableItems = null
+  }
+
+  applyDocumentType(selectedDocumentTypes: PaperlessDocumentType[]) {
+    let initiallySelectedSelectableDocumentTypes = this._initialDocumentTypesSelectableItems.filter(dtsi => dtsi.state == SelectableItemState.Selected)
+    let unchanged = this.equateItemsToSelectableItems(selectedDocumentTypes, initiallySelectedSelectableDocumentTypes)
+    if (!unchanged) this.setDocumentType.emit(selectedDocumentTypes.length > 0 ? selectedDocumentTypes.shift() : null)
+    this._initialDocumentTypesSelectableItems = null
+  }
+
+  equateItemsToSelectableItems(items: ObjectWithId[], selectableItems: SelectableItem[]): boolean {
+    // either both empty or all items must in selectableItems and vice-versa
+    return (selectableItems.length == 0 && items.length == 0) ||
+           (items.every(i => selectableItems.find(si => si.item.id == i.id) !== undefined) && selectableItems.every(si => items.find(i => i.id == si.item.id) !== undefined))
   }
 
   applyDelete() {

From fd6bfd02ce92f8a060c4b2239dd943a4e0a60994 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 21:45:53 -0800
Subject: [PATCH 0318/1300] SelectableItem dropdowns refactoring

---
 .../bulk-editor/bulk-editor.component.ts      | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 54ecb6d0a..7ba134e15 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -48,9 +48,9 @@ export class BulkEditorComponent {
   correspondents: PaperlessCorrespondent[]
   documentTypes: PaperlessDocumentType[]
 
-  private _initialTagsSelectableItems: SelectableItem[]
-  private _initialCorrespondentsSelectableItems: SelectableItem[]
-  private _initialDocumentTypesSelectableItems: SelectableItem[]
+  private initiallySelectedTagsSelectableItems: SelectableItem[]
+  private initiallySelectedCorrespondentsSelectableItems: SelectableItem[]
+  private initiallySelectedDocumentTypesSelectableItems: SelectableItem[]
 
   dropdownTypes = FilterableDropdownType
 
@@ -109,36 +109,33 @@ export class BulkEditorComponent {
   }
 
   tagsDropdownOpen() {
-    this._initialTagsSelectableItems = this.tagsSelectableItems
+    this.initiallySelectedTagsSelectableItems = this.tagsSelectableItems.filter(tsi => tsi.state == SelectableItemState.Selected)
   }
 
   correspondentsDropdownOpen() {
-    this._initialCorrespondentsSelectableItems = this.correspondentsSelectableItems
+    this.initiallySelectedCorrespondentsSelectableItems = this.correspondentsSelectableItems.filter(csi => csi.state == SelectableItemState.Selected)
   }
 
   documentTypesDropdownOpen() {
-    this._initialDocumentTypesSelectableItems = this.documentTypesSelectableItems
+    this.initiallySelectedDocumentTypesSelectableItems = this.documentTypesSelectableItems.filter(dtsi => dtsi.state == SelectableItemState.Selected)
   }
 
   applyTags(selectedTags: PaperlessTag[]) {
-    let initiallySelectedSelectableTags = this._initialTagsSelectableItems.filter(tsi => tsi.state == SelectableItemState.Selected)
-    let unchanged = this.equateItemsToSelectableItems(selectedTags, initiallySelectedSelectableTags)
+    let unchanged = this.equateItemsToSelectableItems(selectedTags, this.initiallySelectedTagsSelectableItems)
     if (!unchanged) this.setTags.emit(selectedTags)
-    this._initialTagsSelectableItems = null
+    this.initiallySelectedTagsSelectableItems = null
   }
 
   applyCorrespondent(selectedCorrespondents: PaperlessCorrespondent[]) {
-    let initiallySelectedSelectableCorrespondents = this._initialCorrespondentsSelectableItems.filter(csi => csi.state == SelectableItemState.Selected)
-    let unchanged = this.equateItemsToSelectableItems(selectedCorrespondents, initiallySelectedSelectableCorrespondents)
+    let unchanged = this.equateItemsToSelectableItems(selectedCorrespondents, this.initiallySelectedCorrespondentsSelectableItems)
     if (!unchanged) this.setCorrespondent.emit(selectedCorrespondents?.length > 0 ? selectedCorrespondents.shift() : null)
-    this._initialCorrespondentsSelectableItems = null
+    this.initiallySelectedCorrespondentsSelectableItems = null
   }
 
   applyDocumentType(selectedDocumentTypes: PaperlessDocumentType[]) {
-    let initiallySelectedSelectableDocumentTypes = this._initialDocumentTypesSelectableItems.filter(dtsi => dtsi.state == SelectableItemState.Selected)
-    let unchanged = this.equateItemsToSelectableItems(selectedDocumentTypes, initiallySelectedSelectableDocumentTypes)
+    let unchanged = this.equateItemsToSelectableItems(selectedDocumentTypes, this.initiallySelectedDocumentTypesSelectableItems)
     if (!unchanged) this.setDocumentType.emit(selectedDocumentTypes.length > 0 ? selectedDocumentTypes.shift() : null)
-    this._initialDocumentTypesSelectableItems = null
+    this.initiallySelectedDocumentTypesSelectableItems = null
   }
 
   equateItemsToSelectableItems(items: ObjectWithId[], selectableItems: SelectableItem[]): boolean {

From 638109338689931207e2aa9d623b30f5a0773779 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 21:52:45 -0800
Subject: [PATCH 0319/1300] Refactor SlectableItem to ToggleableItem

---
 .../filterable-dropdown-button.component.ts   | 14 ++--
 .../filterable-dropdown.component.html        |  6 +-
 .../filterable-dropdown.component.ts          | 36 ++++-----
 .../bulk-editor/bulk-editor.component.html    |  6 +-
 .../bulk-editor/bulk-editor.component.ts      | 76 +++++++++----------
 src-ui/src/app/pipes/filter.pipe.ts           | 14 ++--
 6 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
index a928d715e..b0ced21cc 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output, OnInit } 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';
-import { SelectableItem, SelectableItemState } from '../filterable-dropdown.component';
+import { ToggleableItem, ToggleableItemState } from '../filterable-dropdown.component';
 
 @Component({
   selector: 'app-filterable-dropdown-button',
@@ -12,10 +12,10 @@ import { SelectableItem, SelectableItemState } from '../filterable-dropdown.comp
 export class FilterableDropdownButtonComponent implements OnInit {
 
   @Input()
-  selectableItem: SelectableItem
+  toggleableItem: ToggleableItem
 
   get item(): PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent {
-    return this.selectableItem?.item
+    return this.toggleableItem?.item
   }
 
   @Output()
@@ -28,14 +28,14 @@ export class FilterableDropdownButtonComponent implements OnInit {
   }
 
   toggleItem(): void {
-    this.selectableItem.state = (this.selectableItem.state == SelectableItemState.NotSelected || this.selectableItem.state == SelectableItemState.PartiallySelected) ? SelectableItemState.Selected : SelectableItemState.NotSelected
-    this.toggle.emit(this.selectableItem)
+    this.toggleableItem.state = (this.toggleableItem.state == ToggleableItemState.NotSelected || this.toggleableItem.state == ToggleableItemState.PartiallySelected) ? ToggleableItemState.Selected : ToggleableItemState.NotSelected
+    this.toggle.emit(this.toggleableItem)
   }
 
   getSelectedIconName() {
     let iconName = ''
-    if (this.selectableItem?.state == SelectableItemState.Selected) iconName = 'check'
-    else if (this.selectableItem?.state == SelectableItemState.PartiallySelected) iconName = 'dash'
+    if (this.toggleableItem?.state == ToggleableItemState.Selected) iconName = 'check'
+    else if (this.toggleableItem?.state == ToggleableItemState.PartiallySelected) iconName = 'dash'
     return iconName
   }
 }
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 425a290a5..052bca03d 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -19,9 +19,9 @@
           <input class="form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
         </div>
       </div>
-      <div *ngIf="selectableItems" class="items">
-        <ng-container *ngFor="let selectableItem of selectableItems | filter: filterText">
-          <app-filterable-dropdown-button [selectableItem]="selectableItem" (toggle)="toggleItem($event)"></app-filterable-dropdown-button>
+      <div *ngIf="toggleableItems" class="items">
+        <ng-container *ngFor="let toggleableItem of toggleableItems | filter: filterText">
+          <app-filterable-dropdown-button [toggleableItem]="toggleableItem" (toggle)="toggleItem($event)"></app-filterable-dropdown-button>
         </ng-container>
       </div>
     </div>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 2d224567f..76b588be5 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -6,12 +6,12 @@ import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 import { FilterPipe } from  'src/app/pipes/filter.pipe';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
 
-export interface SelectableItem {
+export interface ToggleableItem {
   item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent,
-  state: SelectableItemState
+  state: ToggleableItemState
 }
 
-export enum SelectableItemState {
+export enum ToggleableItemState {
   NotSelected = 0,
   Selected = 1,
   PartiallySelected = 2
@@ -37,33 +37,33 @@ export class FilterableDropdownComponent {
   @Input()
   set items(items: ObjectWithId[]) {
     if (items) {
-      this._selectableItems = items.map(i => {
-        return {item: i, state: SelectableItemState.NotSelected}
+      this._toggleableItems = items.map(i => {
+        return {item: i, state: ToggleableItemState.NotSelected}
       })
     }
   }
 
-  _selectableItems: SelectableItem[] = []
+  _toggleableItems: ToggleableItem[] = []
 
   @Input()
-  set selectableItems (selectableItems: SelectableItem[]) {
+  set toggleableItems (toggleableItems: ToggleableItem[]) {
     if (this.type == FilterableDropdownType.Editing && this.dropdown?.isOpen()) return
-    else this._selectableItems = selectableItems
+    else this._toggleableItems = toggleableItems
   }
 
-  get selectableItems(): SelectableItem[] {
-    return this._selectableItems
+  get toggleableItems(): ToggleableItem[] {
+    return this._toggleableItems
   }
 
   @Input()
   set itemsSelected(itemsSelected: ObjectWithId[]) {
-    this.selectableItems.forEach(i => {
-      i.state = (itemsSelected.find(is => is.id == i.item.id)) ? SelectableItemState.Selected : SelectableItemState.NotSelected
+    this.toggleableItems.forEach(i => {
+      i.state = (itemsSelected.find(is => is.id == i.item.id)) ? ToggleableItemState.Selected : ToggleableItemState.NotSelected
     })
   }
 
   get itemsSelected() :ObjectWithId[] {
-    return this.selectableItems.filter(si => si.state == SelectableItemState.Selected).map(si => si.item)
+    return this.toggleableItems.filter(si => si.state == ToggleableItemState.Selected).map(si => si.item)
   }
 
   @Input()
@@ -91,11 +91,11 @@ export class FilterableDropdownComponent {
 
   constructor(private filterPipe: FilterPipe) { }
 
-  toggleItem(selectableItem: SelectableItem): void {
-    if (this.singular && selectableItem.state == SelectableItemState.Selected) {
-      this._selectableItems.filter(si => si.item.id !== selectableItem.item.id).forEach(si => si.state = SelectableItemState.NotSelected)
+  toggleItem(toggleableItem: ToggleableItem): void {
+    if (this.singular && toggleableItem.state == ToggleableItemState.Selected) {
+      this._toggleableItems.filter(si => si.item.id !== toggleableItem.item.id).forEach(si => si.state = ToggleableItemState.NotSelected)
     }
-    this.toggle.emit(selectableItem.item)
+    this.toggle.emit(toggleableItem.item)
   }
 
   dropdownOpenChange(open: boolean): void {
@@ -111,7 +111,7 @@ export class FilterableDropdownComponent {
   }
 
   listFilterEnter(): void {
-    let filtered = this.filterPipe.transform(this.selectableItems, this.filterText)
+    let filtered = this.filterPipe.transform(this.toggleableItems, this.filterText)
     if (filtered.length == 1) this.toggleItem(filtered.shift())
     this.dropdown.close()
   }
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 4f79a6c3e..58ca5e5a7 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -26,9 +26,9 @@
   <div class="col mb-2 mb-xl-0">
     <div class="d-flex">
       <label class="ml-auto mt-1 mr-2">Apply:</label>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" [selectableItems]="tagsSelectableItems" [type]="dropdownTypes.Editing" (open)="tagsDropdownOpen()" (editingComplete)="applyTags($event)"></app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" [selectableItems]="correspondentsSelectableItems" [type]="dropdownTypes.Editing" singular="true" (open)="correspondentsDropdownOpen()" (editingComplete)="applyCorrespondent($event)"></app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" [selectableItems]="documentTypesSelectableItems" [type]="dropdownTypes.Editing" singular="true" (open)="documentTypesDropdownOpen()" (editingComplete)="applyDocumentType($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" [toggleableItems]="tagsToggleableItems" [type]="dropdownTypes.Editing" (open)="tagsDropdownOpen()" (editingComplete)="applyTags($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" [toggleableItems]="correspondentsToggleableItems" [type]="dropdownTypes.Editing" singular="true" (open)="correspondentsDropdownOpen()" (editingComplete)="applyCorrespondent($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" [toggleableItems]="documentTypesToggleableItems" [type]="dropdownTypes.Editing" singular="true" (open)="documentTypesDropdownOpen()" (editingComplete)="applyDocumentType($event)"></app-filterable-dropdown>
     </div>
   </div>
   <div class="w-100 d-xl-none"></div>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 7ba134e15..2e6edbb71 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -8,7 +8,7 @@ import { TagService } from 'src/app/services/rest/tag.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { DocumentService } from 'src/app/services/rest/document.service';
-import { SelectableItem, SelectableItemState, FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
+import { ToggleableItem, ToggleableItemState, FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
 
 @Component({
   selector: 'app-bulk-editor',
@@ -48,51 +48,51 @@ export class BulkEditorComponent {
   correspondents: PaperlessCorrespondent[]
   documentTypes: PaperlessDocumentType[]
 
-  private initiallySelectedTagsSelectableItems: SelectableItem[]
-  private initiallySelectedCorrespondentsSelectableItems: SelectableItem[]
-  private initiallySelectedDocumentTypesSelectableItems: SelectableItem[]
+  private initiallySelectedTagsToggleableItems: ToggleableItem[]
+  private initiallySelectedCorrespondentsToggleableItems: ToggleableItem[]
+  private initiallySelectedDocumentTypesToggleableItems: ToggleableItem[]
 
   dropdownTypes = FilterableDropdownType
 
-  get tagsSelectableItems(): SelectableItem[] {
-    let tagsSelectableItems = []
+  get tagsToggleableItems(): ToggleableItem[] {
+    let tagsToggleableItems = []
     let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
     this.tags.forEach(t => {
       let selectedDocumentsWithTag: PaperlessDocument[] = selectedDocuments.filter(d => d.tags.includes(t.id))
-      let state = SelectableItemState.NotSelected
-      if (selectedDocumentsWithTag.length == selectedDocuments.length) state = SelectableItemState.Selected
-      else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected
-      tagsSelectableItems.push( { item: t, state: state } )
+      let state = ToggleableItemState.NotSelected
+      if (selectedDocumentsWithTag.length == selectedDocuments.length) state = ToggleableItemState.Selected
+      else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
+      tagsToggleableItems.push( { item: t, state: state } )
     })
-    return tagsSelectableItems
+    return tagsToggleableItems
   }
 
-  get correspondentsSelectableItems(): SelectableItem[] {
-    let correspondentsSelectableItems = []
+  get correspondentsToggleableItems(): ToggleableItem[] {
+    let correspondentsToggleableItems = []
     let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
 
     this.correspondents.forEach(c => {
       let selectedDocumentsWithCorrespondent: PaperlessDocument[] = selectedDocuments.filter(d => d.correspondent == c.id)
-      let state = SelectableItemState.NotSelected
-      if (selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = SelectableItemState.Selected
-      else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected
-      correspondentsSelectableItems.push( { item: c, state: state } )
+      let state = ToggleableItemState.NotSelected
+      if (selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = ToggleableItemState.Selected
+      else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
+      correspondentsToggleableItems.push( { item: c, state: state } )
     })
-    return correspondentsSelectableItems
+    return correspondentsToggleableItems
   }
 
-  get documentTypesSelectableItems(): SelectableItem[] {
-    let documentTypesSelectableItems = []
+  get documentTypesToggleableItems(): ToggleableItem[] {
+    let documentTypesToggleableItems = []
     let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
 
     this.documentTypes.forEach(dt => {
       let selectedDocumentsWithDocumentType: PaperlessDocument[] = selectedDocuments.filter(d => d.document_type == dt.id)
-      let state = SelectableItemState.NotSelected
-      if (selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = SelectableItemState.Selected
-      else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected
-      documentTypesSelectableItems.push( { item: dt, state: state } )
+      let state = ToggleableItemState.NotSelected
+      if (selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = ToggleableItemState.Selected
+      else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
+      documentTypesToggleableItems.push( { item: dt, state: state } )
     })
-    return documentTypesSelectableItems
+    return documentTypesToggleableItems
   }
 
   constructor(
@@ -109,39 +109,39 @@ export class BulkEditorComponent {
   }
 
   tagsDropdownOpen() {
-    this.initiallySelectedTagsSelectableItems = this.tagsSelectableItems.filter(tsi => tsi.state == SelectableItemState.Selected)
+    this.initiallySelectedTagsToggleableItems = this.tagsToggleableItems.filter(tsi => tsi.state == ToggleableItemState.Selected)
   }
 
   correspondentsDropdownOpen() {
-    this.initiallySelectedCorrespondentsSelectableItems = this.correspondentsSelectableItems.filter(csi => csi.state == SelectableItemState.Selected)
+    this.initiallySelectedCorrespondentsToggleableItems = this.correspondentsToggleableItems.filter(csi => csi.state == ToggleableItemState.Selected)
   }
 
   documentTypesDropdownOpen() {
-    this.initiallySelectedDocumentTypesSelectableItems = this.documentTypesSelectableItems.filter(dtsi => dtsi.state == SelectableItemState.Selected)
+    this.initiallySelectedDocumentTypesToggleableItems = this.documentTypesToggleableItems.filter(dtsi => dtsi.state == ToggleableItemState.Selected)
   }
 
   applyTags(selectedTags: PaperlessTag[]) {
-    let unchanged = this.equateItemsToSelectableItems(selectedTags, this.initiallySelectedTagsSelectableItems)
+    let unchanged = this.equateItemsToToggleableItems(selectedTags, this.initiallySelectedTagsToggleableItems)
     if (!unchanged) this.setTags.emit(selectedTags)
-    this.initiallySelectedTagsSelectableItems = null
+    this.initiallySelectedTagsToggleableItems = null
   }
 
   applyCorrespondent(selectedCorrespondents: PaperlessCorrespondent[]) {
-    let unchanged = this.equateItemsToSelectableItems(selectedCorrespondents, this.initiallySelectedCorrespondentsSelectableItems)
+    let unchanged = this.equateItemsToToggleableItems(selectedCorrespondents, this.initiallySelectedCorrespondentsToggleableItems)
     if (!unchanged) this.setCorrespondent.emit(selectedCorrespondents?.length > 0 ? selectedCorrespondents.shift() : null)
-    this.initiallySelectedCorrespondentsSelectableItems = null
+    this.initiallySelectedCorrespondentsToggleableItems = null
   }
 
   applyDocumentType(selectedDocumentTypes: PaperlessDocumentType[]) {
-    let unchanged = this.equateItemsToSelectableItems(selectedDocumentTypes, this.initiallySelectedDocumentTypesSelectableItems)
+    let unchanged = this.equateItemsToToggleableItems(selectedDocumentTypes, this.initiallySelectedDocumentTypesToggleableItems)
     if (!unchanged) this.setDocumentType.emit(selectedDocumentTypes.length > 0 ? selectedDocumentTypes.shift() : null)
-    this.initiallySelectedDocumentTypesSelectableItems = null
+    this.initiallySelectedDocumentTypesToggleableItems = null
   }
 
-  equateItemsToSelectableItems(items: ObjectWithId[], selectableItems: SelectableItem[]): boolean {
-    // either both empty or all items must in selectableItems and vice-versa
-    return (selectableItems.length == 0 && items.length == 0) ||
-           (items.every(i => selectableItems.find(si => si.item.id == i.id) !== undefined) && selectableItems.every(si => items.find(i => i.id == si.item.id) !== undefined))
+  equateItemsToToggleableItems(items: ObjectWithId[], toggleableItems: ToggleableItem[]): boolean {
+    // either both empty or all items must in toggleableItems and vice-versa
+    return (toggleableItems.length == 0 && items.length == 0) ||
+           (items.every(i => toggleableItems.find(si => si.item.id == i.id) !== undefined) && toggleableItems.every(si => items.find(i => i.id == si.item.id) !== undefined))
   }
 
   applyDelete() {
diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts
index 51d1924b8..1ea10c56e 100644
--- a/src-ui/src/app/pipes/filter.pipe.ts
+++ b/src-ui/src/app/pipes/filter.pipe.ts
@@ -1,17 +1,17 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import { SelectableItem } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
+import { ToggleableItem } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
 
 @Pipe({
   name: 'filter'
 })
 export class FilterPipe implements PipeTransform {
-  transform(selectableItems: SelectableItem[], searchText: string): any[] {
-    if (!selectableItems) return [];
-    if (!searchText) return selectableItems;
+  transform(toggleableItems: ToggleableItem[], searchText: string): any[] {
+    if (!toggleableItems) return [];
+    if (!searchText) return toggleableItems;
 
-    return selectableItems.filter(selectableItem => {
-      return Object.keys(selectableItem.item).some(key => {
-        return String(selectableItem.item[key]).toLowerCase().includes(searchText.toLowerCase());
+    return toggleableItems.filter(toggleableItem => {
+      return Object.keys(toggleableItem.item).some(key => {
+        return String(toggleableItem.item[key]).toLowerCase().includes(searchText.toLowerCase());
       });
     });
    }

From de6ba3489a929408c1fae41fd2a6a44547299979 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 21:56:31 -0800
Subject: [PATCH 0320/1300] Cleanup dropdown button component

---
 .../filterable-dropdown-button.component.html        |  6 +++---
 .../filterable-dropdown-button.component.ts          | 12 +++---------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html
index 5b58025d1..75dadba53 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html
@@ -5,8 +5,8 @@
     </svg>
   </div>
   <div class="mr-1">
-    <app-tag *ngIf="isTag; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
-    <ng-template #displayName><small>{{item.name}}</small></ng-template>
+    <app-tag *ngIf="isTag; else displayName" [tag]="toggleableItem?.item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
+    <ng-template #displayName><small>{{toggleableItem?.item.name}}</small></ng-template>
   </div>
-  <div class="badge badge-light rounded-pill ml-auto mr-1">{{item.document_count}}</div>
+  <div class="badge badge-light rounded-pill ml-auto mr-1">{{toggleableItem?.item.document_count}}</div>
 </button>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
index b0ced21cc..3486bdb46 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
@@ -9,22 +9,16 @@ import { ToggleableItem, ToggleableItemState } from '../filterable-dropdown.comp
   templateUrl: './filterable-dropdown-button.component.html',
   styleUrls: ['./filterable-dropdown-button.component.scss']
 })
-export class FilterableDropdownButtonComponent implements OnInit {
+export class FilterableDropdownButtonComponent {
 
   @Input()
   toggleableItem: ToggleableItem
 
-  get item(): PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent {
-    return this.toggleableItem?.item
-  }
-
   @Output()
   toggle = new EventEmitter()
 
-  isTag: boolean
-
-  ngOnInit() {
-    this.isTag = 'is_inbox_tag' in this.item // ~ this.item instanceof PaperlessTag
+  get isTag(): boolean {
+    return 'is_inbox_tag' in this.toggleableItem?.item // ~ this.item instanceof PaperlessTag
   }
 
   toggleItem(): void {

From ee4e026ba2c882c5b4d5f3b3985c25d0f7fd7277 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 22:06:17 -0800
Subject: [PATCH 0321/1300] rework toolbar

---
 .../bulk-editor/bulk-editor.component.html    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 58ca5e5a7..746dd9569 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -1,5 +1,13 @@
 <div class="row">
-  <div class="col mb-2 mb-xl-0" role="group" aria-label="Select">
+  <div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
+    <button class="btn btn-sm btn-outline-danger" (click)="selectNone.next()">
+      <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
+        <use xlink:href="assets/bootstrap-icons.svg#slash-circle" />
+      </svg>
+      Cancel
+    </button>
+  </div>
+  <div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
     <label class="mr-lg-2">Select:</label>
     <div class="btn-group">
       <button class="btn btn-sm btn-outline-primary" (click)="selectPage.next()">
@@ -14,26 +22,20 @@
         </svg>
         All
       </button>
-      <button class="btn btn-sm btn-outline-primary" (click)="selectNone.next()">
-        <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
-          <use xlink:href="assets/bootstrap-icons.svg#slash-circle" />
-        </svg>
-        None
-      </button>
     </div>
   </div>
   <div class="w-100 d-xl-none"></div>
-  <div class="col mb-2 mb-xl-0">
+  <div class="col-auto mb-2 mb-xl-0">
     <div class="d-flex">
-      <label class="ml-auto mt-1 mr-2">Apply:</label>
+      <label class="ml-auto mt-1 mr-2">Edit:</label>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" [toggleableItems]="tagsToggleableItems" [type]="dropdownTypes.Editing" (open)="tagsDropdownOpen()" (editingComplete)="applyTags($event)"></app-filterable-dropdown>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" [toggleableItems]="correspondentsToggleableItems" [type]="dropdownTypes.Editing" singular="true" (open)="correspondentsDropdownOpen()" (editingComplete)="applyCorrespondent($event)"></app-filterable-dropdown>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" [toggleableItems]="documentTypesToggleableItems" [type]="dropdownTypes.Editing" singular="true" (open)="documentTypesDropdownOpen()" (editingComplete)="applyDocumentType($event)"></app-filterable-dropdown>
     </div>
   </div>
   <div class="w-100 d-xl-none"></div>
-  <div class="col-auto mb-2 mb-xl-0">
-    <button type="button" class="btn btn-sm btn-outline-danger " (click)="applyDelete()">
+  <div class="col mb-2 mb-xl-0 d-flex">
+    <button type="button" class="btn btn-sm btn-outline-danger ml-auto" (click)="applyDelete()">
       <svg class="buttonicon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#trash" />
       </svg>

From 39b35c090b4e88e714059c0918e4741a6c55a3a2 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 22:14:52 -0800
Subject: [PATCH 0322/1300] Hide filter / bulk editor for better switching

---
 .../document-list/bulk-editor/bulk-editor.component.ts      | 6 +++---
 .../components/document-list/document-list.component.html   | 4 ++--
 .../app/components/document-list/document-list.component.ts | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 2e6edbb71..5b9a4ff38 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -57,7 +57,7 @@ export class BulkEditorComponent {
   get tagsToggleableItems(): ToggleableItem[] {
     let tagsToggleableItems = []
     let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
-    this.tags.forEach(t => {
+    this.tags?.forEach(t => {
       let selectedDocumentsWithTag: PaperlessDocument[] = selectedDocuments.filter(d => d.tags.includes(t.id))
       let state = ToggleableItemState.NotSelected
       if (selectedDocumentsWithTag.length == selectedDocuments.length) state = ToggleableItemState.Selected
@@ -71,7 +71,7 @@ export class BulkEditorComponent {
     let correspondentsToggleableItems = []
     let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
 
-    this.correspondents.forEach(c => {
+    this.correspondents?.forEach(c => {
       let selectedDocumentsWithCorrespondent: PaperlessDocument[] = selectedDocuments.filter(d => d.correspondent == c.id)
       let state = ToggleableItemState.NotSelected
       if (selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = ToggleableItemState.Selected
@@ -85,7 +85,7 @@ export class BulkEditorComponent {
     let documentTypesToggleableItems = []
     let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
 
-    this.documentTypes.forEach(dt => {
+    this.documentTypes?.forEach(dt => {
       let selectedDocumentsWithDocumentType: PaperlessDocument[] = selectedDocuments.filter(d => d.document_type == dt.id)
       let state = ToggleableItemState.NotSelected
       if (selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = ToggleableItemState.Selected
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index b32ff52f7..7032325e4 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -78,9 +78,9 @@
 </app-page-header>
 
 <div class="w-100 mb-2 mb-sm-4">
-  <app-filter-editor *ngIf="!isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
+  <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
 
-  <app-bulk-editor *ngIf="isBulkEditing"
+  <app-bulk-editor [hidden]="!isBulkEditing"
     [allDocuments]="list.documents"
     [(selectedDocuments)]="list.selected"
     (selectPage)="list.selectPage()"
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 7e9ce8f66..4ed6946e3 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -119,14 +119,17 @@ export class DocumentListComponent implements OnInit {
   }
 
   clickTag(tagID: number) {
+    this.list.selectNone()
     this.filterEditor.toggleTag(tagID)
   }
 
   clickCorrespondent(correspondentID: number) {
+    this.list.selectNone()
     this.filterEditor.toggleCorrespondent(correspondentID)
   }
 
   clickDocumentType(documentTypeID: number) {
+    this.list.selectNone()
     this.filterEditor.toggleDocumentType(documentTypeID)
   }
 

From 7dfcc7f47bc5204c20dd51120ee06a2ce564733a Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 22:31:14 -0800
Subject: [PATCH 0323/1300] Refactor dropdown button component

---
 src-ui/src/app/app.module.ts                  |  4 +--
 ...lterable-dropdown-button.component.spec.ts | 25 -------------------
 .../filterable-dropdown.component.html        |  2 +-
 .../filterable-dropdown.component.ts          | 12 +--------
 ...toggleable-dropdown-button.component.html} |  0
 ...toggleable-dropdown-button.component.scss} |  0
 ...ggleable-dropdown-button.component.spec.ts | 25 +++++++++++++++++++
 .../toggleable-dropdown-button.component.ts}  | 20 +++++++++++----
 .../bulk-editor/bulk-editor.component.ts      |  3 ++-
 src-ui/src/app/pipes/filter.pipe.ts           |  2 +-
 10 files changed, 47 insertions(+), 46 deletions(-)
 delete mode 100644 src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.spec.ts
 rename src-ui/src/app/components/common/filterable-dropdown/{filterable-dropdown-button/filterable-dropdown-button.component.html => toggleable-dropdown-button/toggleable-dropdown-button.component.html} (100%)
 rename src-ui/src/app/components/common/filterable-dropdown/{filterable-dropdown-button/filterable-dropdown-button.component.scss => toggleable-dropdown-button/toggleable-dropdown-button.component.scss} (100%)
 create mode 100644 src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.spec.ts
 rename src-ui/src/app/components/common/filterable-dropdown/{filterable-dropdown-button/filterable-dropdown-button.component.ts => toggleable-dropdown-button/toggleable-dropdown-button.component.ts} (70%)

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 97c547038..c78dc3cfe 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -28,7 +28,7 @@ import { AppFrameComponent } from './components/app-frame/app-frame.component';
 import { ToastsComponent } from './components/common/toasts/toasts.component';
 import { FilterEditorComponent } from './components/document-list/filter-editor/filter-editor.component';
 import { FilterableDropdownComponent } from './components/common/filterable-dropdown/filterable-dropdown.component';
-import { FilterableDropdownButtonComponent } from './components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component';
+import { ToggleableDropdownButtonComponent } from './components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
 import { DateDropdownComponent } from './components/common/date-dropdown/date-dropdown.component';
 import { DocumentCardLargeComponent } from './components/document-list/document-card-large/document-card-large.component';
 import { DocumentCardSmallComponent } from './components/document-list/document-card-small/document-card-small.component';
@@ -82,7 +82,7 @@ import { NgSelectModule } from '@ng-select/ng-select';
     ToastsComponent,
     FilterEditorComponent,
     FilterableDropdownComponent,
-    FilterableDropdownButtonComponent,
+    ToggleableDropdownButtonComponent,
     DateDropdownComponent,
     DocumentCardLargeComponent,
     DocumentCardSmallComponent,
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.spec.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.spec.ts
deleted file mode 100644
index c7f0b3293..000000000
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FilterableDropodownButtonComponent } from './filterable-dropdown-button.component';
-
-describe('FilterableDropodownButtonComponent', () => {
-  let component: FilterableDropodownButtonComponent;
-  let fixture: ComponentFixture<FilterableDropodownButtonComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ FilterableDropodownButtonComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FilterableDropodownButtonComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 052bca03d..9bc525684 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -21,7 +21,7 @@
       </div>
       <div *ngIf="toggleableItems" class="items">
         <ng-container *ngFor="let toggleableItem of toggleableItems | filter: filterText">
-          <app-filterable-dropdown-button [toggleableItem]="toggleableItem" (toggle)="toggleItem($event)"></app-filterable-dropdown-button>
+          <app-toggleable-dropdown-button [toggleableItem]="toggleableItem" (toggle)="toggleItem($event)"></app-toggleable-dropdown-button>
         </ng-container>
       </div>
     </div>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 76b588be5..dc1139783 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -5,17 +5,7 @@ import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 import { FilterPipe } from  'src/app/pipes/filter.pipe';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
-
-export interface ToggleableItem {
-  item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent,
-  state: ToggleableItemState
-}
-
-export enum ToggleableItemState {
-  NotSelected = 0,
-  Selected = 1,
-  PartiallySelected = 2
-}
+import { ToggleableItem, ToggleableItemState } from './toggleable-dropdown-button/toggleable-dropdown-button.component';
 
 export enum FilterableDropdownType {
   Filtering = 'filtering',
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
similarity index 100%
rename from src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html
rename to src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.scss b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.scss
similarity index 100%
rename from src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.scss
rename to src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.scss
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.spec.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.spec.ts
new file mode 100644
index 000000000..ec2868d7c
--- /dev/null
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ToggleableDropdownButtonComponent } from './toggleable-dropdown-button.component';
+
+describe('ToggleableDropdownButtonComponent', () => {
+  let component: ToggleableDropdownButtonComponent;
+  let fixture: ComponentFixture<ToggleableDropdownButtonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ToggleableDropdownButtonComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ToggleableDropdownButtonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
similarity index 70%
rename from src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
rename to src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
index 3486bdb46..7c9c02a49 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
@@ -2,14 +2,24 @@ import { Component, EventEmitter, Input, Output, OnInit } 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';
-import { ToggleableItem, ToggleableItemState } from '../filterable-dropdown.component';
+
+export interface ToggleableItem {
+  item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent,
+  state: ToggleableItemState
+}
+
+export enum ToggleableItemState {
+  NotSelected = 0,
+  Selected = 1,
+  PartiallySelected = 2
+}
 
 @Component({
-  selector: 'app-filterable-dropdown-button',
-  templateUrl: './filterable-dropdown-button.component.html',
-  styleUrls: ['./filterable-dropdown-button.component.scss']
+  selector: 'app-toggleable-dropdown-button',
+  templateUrl: './toggleable-dropdown-button.component.html',
+  styleUrls: ['./toggleable-dropdown-button.component.scss']
 })
-export class FilterableDropdownButtonComponent {
+export class ToggleableDropdownButtonComponent {
 
   @Input()
   toggleableItem: ToggleableItem
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 5b9a4ff38..21355fe4c 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -8,7 +8,8 @@ import { TagService } from 'src/app/services/rest/tag.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { DocumentService } from 'src/app/services/rest/document.service';
-import { ToggleableItem, ToggleableItemState, FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
+import { FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
+import { ToggleableItem, ToggleableItemState } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
 
 @Component({
   selector: 'app-bulk-editor',
diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts
index 1ea10c56e..a982e9019 100644
--- a/src-ui/src/app/pipes/filter.pipe.ts
+++ b/src-ui/src/app/pipes/filter.pipe.ts
@@ -1,5 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import { ToggleableItem } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
+import { ToggleableItem } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
 
 @Pipe({
   name: 'filter'

From 46f778111c5e555a81f189a84a740f0c190af904 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 22:54:37 -0800
Subject: [PATCH 0324/1300] Live filter badges when editing & hide badges when
 active filter items in dropdown

---
 .../filterable-dropdown.component.html              |  2 +-
 .../filterable-dropdown.component.ts                | 13 ++++++++-----
 .../toggleable-dropdown-button.component.html       |  2 +-
 .../toggleable-dropdown-button.component.ts         |  6 +++++-
 .../bulk-editor/bulk-editor.component.ts            |  6 +++---
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 9bc525684..5a05e66b4 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -21,7 +21,7 @@
       </div>
       <div *ngIf="toggleableItems" class="items">
         <ng-container *ngFor="let toggleableItem of toggleableItems | filter: filterText">
-          <app-toggleable-dropdown-button [toggleableItem]="toggleableItem" (toggle)="toggleItem($event)"></app-toggleable-dropdown-button>
+          <app-toggleable-dropdown-button [toggleableItem]="toggleableItem" [showCounts]="showCounts" (toggle)="toggleItem($event)"></app-toggleable-dropdown-button>
         </ng-container>
       </div>
     </div>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index dc1139783..a5dadc603 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -1,5 +1,4 @@
 import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core';
-import { ObjectWithId } from 'src/app/data/object-with-id';
 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';
@@ -25,10 +24,10 @@ export class FilterableDropdownComponent {
   filterText: string
 
   @Input()
-  set items(items: ObjectWithId[]) {
+  set items(items: (PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[]) {
     if (items) {
       this._toggleableItems = items.map(i => {
-        return {item: i, state: ToggleableItemState.NotSelected}
+        return {item: i, state: ToggleableItemState.NotSelected, count: i.document_count}
       })
     }
   }
@@ -46,13 +45,13 @@ export class FilterableDropdownComponent {
   }
 
   @Input()
-  set itemsSelected(itemsSelected: ObjectWithId[]) {
+  set itemsSelected(itemsSelected: (PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[]) {
     this.toggleableItems.forEach(i => {
       i.state = (itemsSelected.find(is => is.id == i.item.id)) ? ToggleableItemState.Selected : ToggleableItemState.NotSelected
     })
   }
 
-  get itemsSelected() :ObjectWithId[] {
+  get itemsSelected() :(PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[] {
     return this.toggleableItems.filter(si => si.state == ToggleableItemState.Selected).map(si => si.item)
   }
 
@@ -79,6 +78,10 @@ export class FilterableDropdownComponent {
   @Output()
   editingComplete = new EventEmitter()
 
+  get showCounts(): boolean {
+    return this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected == 0)
+  }
+
   constructor(private filterPipe: FilterPipe) { }
 
   toggleItem(toggleableItem: ToggleableItem): void {
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
index 75dadba53..32f9c58ad 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
@@ -8,5 +8,5 @@
     <app-tag *ngIf="isTag; else displayName" [tag]="toggleableItem?.item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
     <ng-template #displayName><small>{{toggleableItem?.item.name}}</small></ng-template>
   </div>
-  <div class="badge badge-light rounded-pill ml-auto mr-1">{{toggleableItem?.item.document_count}}</div>
+  <div *ngIf="showCounts" class="badge badge-light rounded-pill ml-auto mr-1">{{toggleableItem?.count}}</div>
 </button>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
index 7c9c02a49..4d58023ad 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
@@ -5,7 +5,8 @@ import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 
 export interface ToggleableItem {
   item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent,
-  state: ToggleableItemState
+  state: ToggleableItemState,
+  count: number
 }
 
 export enum ToggleableItemState {
@@ -24,6 +25,9 @@ export class ToggleableDropdownButtonComponent {
   @Input()
   toggleableItem: ToggleableItem
 
+  @Input()
+  showCounts: boolean = true
+
   @Output()
   toggle = new EventEmitter()
 
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 21355fe4c..af6934e32 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -63,7 +63,7 @@ export class BulkEditorComponent {
       let state = ToggleableItemState.NotSelected
       if (selectedDocumentsWithTag.length == selectedDocuments.length) state = ToggleableItemState.Selected
       else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
-      tagsToggleableItems.push( { item: t, state: state } )
+      tagsToggleableItems.push( { item: t, state: state, count: selectedDocumentsWithTag.length } )
     })
     return tagsToggleableItems
   }
@@ -77,7 +77,7 @@ export class BulkEditorComponent {
       let state = ToggleableItemState.NotSelected
       if (selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = ToggleableItemState.Selected
       else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
-      correspondentsToggleableItems.push( { item: c, state: state } )
+      correspondentsToggleableItems.push( { item: c, state: state, count: selectedDocumentsWithCorrespondent.length } )
     })
     return correspondentsToggleableItems
   }
@@ -91,7 +91,7 @@ export class BulkEditorComponent {
       let state = ToggleableItemState.NotSelected
       if (selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = ToggleableItemState.Selected
       else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
-      documentTypesToggleableItems.push( { item: dt, state: state } )
+      documentTypesToggleableItems.push( { item: dt, state: state, count: selectedDocumentsWithDocumentType.length } )
     })
     return documentTypesToggleableItems
   }

From 86da578774b62d638dd55e32e8b88dc954d83346 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 23:42:08 -0800
Subject: [PATCH 0325/1300] Hide toggled state & counts when selection spans
 documents not in view

---
 .../filterable-dropdown.component.ts          |  9 ++++-
 .../bulk-editor/bulk-editor.component.html    |  6 ++--
 .../bulk-editor/bulk-editor.component.ts      | 36 +++++++++++--------
 .../document-list.component.html              |  2 +-
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index a5dadc603..9a2c3cfc0 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -78,8 +78,15 @@ export class FilterableDropdownComponent {
   @Output()
   editingComplete = new EventEmitter()
 
+  _showCounts: boolean = true
+
+  @Input
+  set showCounts(show: boolean) {
+    this._showCounts = show
+  }
+
   get showCounts(): boolean {
-    return this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected == 0)
+    return this._showCounts && (this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected == 0))
   }
 
   constructor(private filterPipe: FilterPipe) { }
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 746dd9569..77d171656 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -28,9 +28,9 @@
   <div class="col-auto mb-2 mb-xl-0">
     <div class="d-flex">
       <label class="ml-auto mt-1 mr-2">Edit:</label>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" [toggleableItems]="tagsToggleableItems" [type]="dropdownTypes.Editing" (open)="tagsDropdownOpen()" (editingComplete)="applyTags($event)"></app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" [toggleableItems]="correspondentsToggleableItems" [type]="dropdownTypes.Editing" singular="true" (open)="correspondentsDropdownOpen()" (editingComplete)="applyCorrespondent($event)"></app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" [toggleableItems]="documentTypesToggleableItems" [type]="dropdownTypes.Editing" singular="true" (open)="documentTypesDropdownOpen()" (editingComplete)="applyDocumentType($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" [toggleableItems]="tagsToggleableItems" [type]="dropdownTypes.Editing" [showCounts]="!this.selectionSpansPages" (open)="tagsDropdownOpen()" (editingComplete)="applyTags($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" [toggleableItems]="correspondentsToggleableItems" [type]="dropdownTypes.Editing" [showCounts]="!this.selectionSpansPages" singular="true" (open)="correspondentsDropdownOpen()" (editingComplete)="applyCorrespondent($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" [toggleableItems]="documentTypesToggleableItems" [type]="dropdownTypes.Editing" [showCounts]="!this.selectionSpansPages" singular="true" (open)="documentTypesDropdownOpen()" (editingComplete)="applyDocumentType($event)"></app-filterable-dropdown>
     </div>
   </div>
   <div class="w-100 d-xl-none"></div>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index af6934e32..c8c05a327 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -22,7 +22,7 @@ export class BulkEditorComponent {
   selectedDocuments: Set<number>
 
   @Input()
-  allDocuments: PaperlessDocument[]
+  viewDocuments: PaperlessDocument[]
 
   @Output()
   selectPage = new EventEmitter()
@@ -45,53 +45,61 @@ export class BulkEditorComponent {
   @Output()
   delete = new EventEmitter()
 
-  tags: PaperlessTag[]
-  correspondents: PaperlessCorrespondent[]
-  documentTypes: PaperlessDocumentType[]
+  private tags: PaperlessTag[]
+  private correspondents: PaperlessCorrespondent[]
+  private documentTypes: PaperlessDocumentType[]
 
   private initiallySelectedTagsToggleableItems: ToggleableItem[]
   private initiallySelectedCorrespondentsToggleableItems: ToggleableItem[]
   private initiallySelectedDocumentTypesToggleableItems: ToggleableItem[]
 
-  dropdownTypes = FilterableDropdownType
+  private dropdownTypes = FilterableDropdownType
+
+  get selectionSpansPages(): boolean {
+    return this.selectedDocuments.length > this.viewDocuments.length || !Array.from(this.selectedDocuments).every(sd => this.viewDocuments.find(d => d.id == sd))
+  }
 
   get tagsToggleableItems(): ToggleableItem[] {
     let tagsToggleableItems = []
-    let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
+    let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id))
+    if (this.selectionSpansPages) selectedDocuments = []
+
     this.tags?.forEach(t => {
       let selectedDocumentsWithTag: PaperlessDocument[] = selectedDocuments.filter(d => d.tags.includes(t.id))
       let state = ToggleableItemState.NotSelected
-      if (selectedDocumentsWithTag.length == selectedDocuments.length) state = ToggleableItemState.Selected
+      if (selectedDocuments.length > 0 && selectedDocumentsWithTag.length == selectedDocuments.length) state = ToggleableItemState.Selected
       else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
-      tagsToggleableItems.push( { item: t, state: state, count: selectedDocumentsWithTag.length } )
+      tagsToggleableItems.push({item: t, state: state, count: selectedDocumentsWithTag.length})
     })
     return tagsToggleableItems
   }
 
   get correspondentsToggleableItems(): ToggleableItem[] {
     let correspondentsToggleableItems = []
-    let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
+    let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id))
+    if (this.selectionSpansPages) selectedDocuments = []
 
     this.correspondents?.forEach(c => {
       let selectedDocumentsWithCorrespondent: PaperlessDocument[] = selectedDocuments.filter(d => d.correspondent == c.id)
       let state = ToggleableItemState.NotSelected
-      if (selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = ToggleableItemState.Selected
+      if (selectedDocuments.length > 0 && selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = ToggleableItemState.Selected
       else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
-      correspondentsToggleableItems.push( { item: c, state: state, count: selectedDocumentsWithCorrespondent.length } )
+      correspondentsToggleableItems.push({item: c, state: state, count: selectedDocumentsWithCorrespondent.length})
     })
     return correspondentsToggleableItems
   }
 
   get documentTypesToggleableItems(): ToggleableItem[] {
     let documentTypesToggleableItems = []
-    let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id))
+    let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id))
+    if (this.selectionSpansPages) selectedDocuments = []
 
     this.documentTypes?.forEach(dt => {
       let selectedDocumentsWithDocumentType: PaperlessDocument[] = selectedDocuments.filter(d => d.document_type == dt.id)
       let state = ToggleableItemState.NotSelected
-      if (selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = ToggleableItemState.Selected
+      if (selectedDocuments.length > 0 && selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = ToggleableItemState.Selected
       else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
-      documentTypesToggleableItems.push( { item: dt, state: state, count: selectedDocumentsWithDocumentType.length } )
+      documentTypesToggleableItems.push({item: dt, state: state, count: selectedDocumentsWithDocumentType.length})
     })
     return documentTypesToggleableItems
   }
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 7032325e4..dc1902a24 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -81,7 +81,7 @@
   <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
 
   <app-bulk-editor [hidden]="!isBulkEditing"
-    [allDocuments]="list.documents"
+    [viewDocuments]="list.documents"
     [(selectedDocuments)]="list.selected"
     (selectPage)="list.selectPage()"
     (selectAll)="list.selectAll()"

From 2e44c18cdb17fb75d3588249a8c573bd406b914b Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 23:44:33 -0800
Subject: [PATCH 0326/1300] Show 's' when needed instead of (s) on document
 list

---
 .../app/components/document-list/document-list.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index dc1902a24..699f13840 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -94,7 +94,7 @@
 </div>
 
 <div class="d-flex justify-content-between align-items-center">
-  <p><span *ngIf="list.selected.size > 0">Selected {{list.selected.size}} of </span>{{list.collectionSize || 0}} document(s) <span *ngIf="isFiltered">(filtered)</span></p>
+  <p><span *ngIf="list.selected.size > 0">Selected {{list.selected.size}} of </span>{{list.collectionSize || 0}} document{{list.collectionSize > 1 ? 's' : ''}} <span *ngIf="isFiltered">(filtered)</span></p>
   <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
   [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
 </div>

From 7669679fb17555e3dd5785a52ef10bcd28e75e4d Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 19 Dec 2020 23:49:20 -0800
Subject: [PATCH 0327/1300] Mobile fixes

---
 .../document-list/bulk-editor/bulk-editor.component.html   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 77d171656..d15b45d0f 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -7,8 +7,9 @@
       Cancel
     </button>
   </div>
+  <div class="w-100 d-xl-none"></div>
   <div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
-    <label class="mr-lg-2">Select:</label>
+    <label class="mr-2">Select:</label>
     <div class="btn-group">
       <button class="btn btn-sm btn-outline-primary" (click)="selectPage.next()">
         <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
@@ -35,11 +36,11 @@
   </div>
   <div class="w-100 d-xl-none"></div>
   <div class="col mb-2 mb-xl-0 d-flex">
-    <button type="button" class="btn btn-sm btn-outline-danger ml-auto" (click)="applyDelete()">
+    <button type="button" class="btn btn-sm btn-outline-danger ml-0 ml-lg-auto" (click)="applyDelete()">
       <svg class="buttonicon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#trash" />
       </svg>
-      <span class="d-none d-lg-inline"> Delete</span>
+      Delete
     </button>
   </div>
 </div>

From 3561935e1b8d5906f2a477bbf08d2a47f1dffc48 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 20 Dec 2020 00:12:40 -0800
Subject: [PATCH 0328/1300] Fix some TS syntax errors

---
 .../filterable-dropdown.component.ts          | 20 +++++++++++--------
 .../bulk-editor/bulk-editor.component.ts      | 10 +++++-----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 9a2c3cfc0..10713cc00 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -52,7 +52,7 @@ export class FilterableDropdownComponent {
   }
 
   get itemsSelected() :(PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[] {
-    return this.toggleableItems.filter(si => si.state == ToggleableItemState.Selected).map(si => si.item)
+    return this.toggleableItems.filter(ti => ti.state == ToggleableItemState.Selected).map(ti => ti.item)
   }
 
   @Input()
@@ -67,7 +67,7 @@ export class FilterableDropdownComponent {
   types = FilterableDropdownType
 
   @Input()
-  singular: boolean = false
+  tingular: boolean = false
 
   @Output()
   toggle = new EventEmitter()
@@ -80,20 +80,20 @@ export class FilterableDropdownComponent {
 
   _showCounts: boolean = true
 
-  @Input
+  @Input()
   set showCounts(show: boolean) {
     this._showCounts = show
   }
 
   get showCounts(): boolean {
-    return this._showCounts && (this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected == 0))
+    return this._showCounts && (this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected.length == 0))
   }
 
   constructor(private filterPipe: FilterPipe) { }
 
   toggleItem(toggleableItem: ToggleableItem): void {
-    if (this.singular && toggleableItem.state == ToggleableItemState.Selected) {
-      this._toggleableItems.filter(si => si.item.id !== toggleableItem.item.id).forEach(si => si.state = ToggleableItemState.NotSelected)
+    if (this.tingular && toggleableItem.state == ToggleableItemState.Selected) {
+      this._toggleableItems.filter(ti => ti.item.id !== toggleableItem.item.id).forEach(ti => ti.state = ToggleableItemState.NotSelected)
     }
     this.toggle.emit(toggleableItem.item)
   }
@@ -112,7 +112,11 @@ export class FilterableDropdownComponent {
 
   listFilterEnter(): void {
     let filtered = this.filterPipe.transform(this.toggleableItems, this.filterText)
-    if (filtered.length == 1) this.toggleItem(filtered.shift())
-    this.dropdown.close()
+    if (filtered.length == 1) {
+      let toggleableItem = this.toggleableItems.find(ti => ti.item.id == filtered[0].item.id)
+      if (toggleableItem) toggleableItem.state = ToggleableItemState.Selected
+      this.toggleItem(filtered[0])
+      this.dropdown.close()
+    }
   }
 }
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index c8c05a327..66ad265de 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -45,18 +45,18 @@ export class BulkEditorComponent {
   @Output()
   delete = new EventEmitter()
 
-  private tags: PaperlessTag[]
-  private correspondents: PaperlessCorrespondent[]
-  private documentTypes: PaperlessDocumentType[]
+  tags: PaperlessTag[]
+  correspondents: PaperlessCorrespondent[]
+  documentTypes: PaperlessDocumentType[]
 
   private initiallySelectedTagsToggleableItems: ToggleableItem[]
   private initiallySelectedCorrespondentsToggleableItems: ToggleableItem[]
   private initiallySelectedDocumentTypesToggleableItems: ToggleableItem[]
 
-  private dropdownTypes = FilterableDropdownType
+  dropdownTypes = FilterableDropdownType
 
   get selectionSpansPages(): boolean {
-    return this.selectedDocuments.length > this.viewDocuments.length || !Array.from(this.selectedDocuments).every(sd => this.viewDocuments.find(d => d.id == sd))
+    return this.selectedDocuments.size > this.viewDocuments.length || !Array.from(this.selectedDocuments).every(sd => this.viewDocuments.find(d => d.id == sd))
   }
 
   get tagsToggleableItems(): ToggleableItem[] {

From 37c2051e01d9e171e253c9086e9171b4392f1a0d Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 20 Dec 2020 00:37:37 -0800
Subject: [PATCH 0329/1300] Typos & code fixes

---
 .../filterable-dropdown.component.ts               |  4 ++--
 .../bulk-editor/bulk-editor.component.ts           | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 10713cc00..bec6e1bef 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -67,7 +67,7 @@ export class FilterableDropdownComponent {
   types = FilterableDropdownType
 
   @Input()
-  tingular: boolean = false
+  singular: boolean = false
 
   @Output()
   toggle = new EventEmitter()
@@ -92,7 +92,7 @@ export class FilterableDropdownComponent {
   constructor(private filterPipe: FilterPipe) { }
 
   toggleItem(toggleableItem: ToggleableItem): void {
-    if (this.tingular && toggleableItem.state == ToggleableItemState.Selected) {
+    if (this.singular && toggleableItem.state == ToggleableItemState.Selected) {
       this._toggleableItems.filter(ti => ti.item.id !== toggleableItem.item.id).forEach(ti => ti.state = ToggleableItemState.NotSelected)
     }
     this.toggle.emit(toggleableItem.item)
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 66ad265de..053af8157 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -118,39 +118,39 @@ export class BulkEditorComponent {
   }
 
   tagsDropdownOpen() {
-    this.initiallySelectedTagsToggleableItems = this.tagsToggleableItems.filter(tsi => tsi.state == ToggleableItemState.Selected)
+    this.initiallySelectedTagsToggleableItems = this.tagsToggleableItems.filter(tti => tti.state == ToggleableItemState.Selected)
   }
 
   correspondentsDropdownOpen() {
-    this.initiallySelectedCorrespondentsToggleableItems = this.correspondentsToggleableItems.filter(csi => csi.state == ToggleableItemState.Selected)
+    this.initiallySelectedCorrespondentsToggleableItems = this.correspondentsToggleableItems.filter(cti => cti.state == ToggleableItemState.Selected)
   }
 
   documentTypesDropdownOpen() {
-    this.initiallySelectedDocumentTypesToggleableItems = this.documentTypesToggleableItems.filter(dtsi => dtsi.state == ToggleableItemState.Selected)
+    this.initiallySelectedDocumentTypesToggleableItems = this.documentTypesToggleableItems.filter(dtti => dtti.state == ToggleableItemState.Selected)
   }
 
   applyTags(selectedTags: PaperlessTag[]) {
     let unchanged = this.equateItemsToToggleableItems(selectedTags, this.initiallySelectedTagsToggleableItems)
     if (!unchanged) this.setTags.emit(selectedTags)
-    this.initiallySelectedTagsToggleableItems = null
+    this.initiallySelectedTagsToggleableItems = []
   }
 
   applyCorrespondent(selectedCorrespondents: PaperlessCorrespondent[]) {
     let unchanged = this.equateItemsToToggleableItems(selectedCorrespondents, this.initiallySelectedCorrespondentsToggleableItems)
     if (!unchanged) this.setCorrespondent.emit(selectedCorrespondents?.length > 0 ? selectedCorrespondents.shift() : null)
-    this.initiallySelectedCorrespondentsToggleableItems = null
+    this.initiallySelectedCorrespondentsToggleableItems = []
   }
 
   applyDocumentType(selectedDocumentTypes: PaperlessDocumentType[]) {
     let unchanged = this.equateItemsToToggleableItems(selectedDocumentTypes, this.initiallySelectedDocumentTypesToggleableItems)
     if (!unchanged) this.setDocumentType.emit(selectedDocumentTypes.length > 0 ? selectedDocumentTypes.shift() : null)
-    this.initiallySelectedDocumentTypesToggleableItems = null
+    this.initiallySelectedDocumentTypesToggleableItems = []
   }
 
   equateItemsToToggleableItems(items: ObjectWithId[], toggleableItems: ToggleableItem[]): boolean {
     // either both empty or all items must in toggleableItems and vice-versa
     return (toggleableItems.length == 0 && items.length == 0) ||
-           (items.every(i => toggleableItems.find(si => si.item.id == i.id) !== undefined) && toggleableItems.every(si => items.find(i => i.id == si.item.id) !== undefined))
+           (items.every(i => toggleableItems.find(ti => ti.item.id == i.id) !== undefined) && toggleableItems.every(ti => items.find(i => i.id == ti.item.id) !== undefined))
   }
 
   applyDelete() {

From fa7b90a5846fdc94ecdbc51380a50f7589c8c28a Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 20 Dec 2020 01:04:54 -0800
Subject: [PATCH 0330/1300] Add apply button to dropdowns

---
 .../filterable-dropdown/filterable-dropdown.component.html  | 6 ++++++
 .../filterable-dropdown/filterable-dropdown.component.ts    | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 5a05e66b4..58c831456 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -24,6 +24,12 @@
           <app-toggleable-dropdown-button [toggleableItem]="toggleableItem" [showCounts]="showCounts" (toggle)="toggleItem($event)"></app-toggleable-dropdown-button>
         </ng-container>
       </div>
+      <button *ngIf="type == types.Editing" class="list-group-item list-group-item-action bg-light" (click)="dropdown.close()" [disabled]="!hasBeenToggled || (toggleableItems | filter: filterText).length == 0">
+        <small class="ml-1" [ngClass]="{'font-weight-bold': hasBeenToggled && (toggleableItems | filter: filterText).length > 0}">Apply</small>
+        <svg width="1.5em" height="1em" viewBox="0 0 16 16" fill="currentColor">
+          <use xlink:href="assets/bootstrap-icons.svg#arrow-right" />
+        </svg>
+      </button>
     </div>
   </div>
 </div>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index bec6e1bef..05c77cd10 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -89,12 +89,15 @@ export class FilterableDropdownComponent {
     return this._showCounts && (this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected.length == 0))
   }
 
+  hasBeenToggled:boolean = false
+
   constructor(private filterPipe: FilterPipe) { }
 
   toggleItem(toggleableItem: ToggleableItem): void {
     if (this.singular && toggleableItem.state == ToggleableItemState.Selected) {
       this._toggleableItems.filter(ti => ti.item.id !== toggleableItem.item.id).forEach(ti => ti.state = ToggleableItemState.NotSelected)
     }
+    this.hasBeenToggled = true
     this.toggle.emit(toggleableItem.item)
   }
 
@@ -103,6 +106,7 @@ export class FilterableDropdownComponent {
       setTimeout(() => {
         this.listFilterTextInput.nativeElement.focus();
       }, 0)
+      this.hasBeenToggled = false
       this.open.next()
     } else {
       this.filterText = ''

From ee31fdc650c6f9df91ec2331b24c289cb03b466b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 20 Dec 2020 13:59:25 +0100
Subject: [PATCH 0331/1300] removed unused code

---
 src/paperless_tesseract/languages.py | 194 ---------------------------
 src/paperless_text/parsers.py        |  12 --
 2 files changed, 206 deletions(-)
 delete mode 100644 src/paperless_tesseract/languages.py

diff --git a/src/paperless_tesseract/languages.py b/src/paperless_tesseract/languages.py
deleted file mode 100644
index 5ea560654..000000000
--- a/src/paperless_tesseract/languages.py
+++ /dev/null
@@ -1,194 +0,0 @@
-# Thanks to the Library of Congress and some creative use of sed and awk:
-# http://www.loc.gov/standards/iso639-2/php/English_list.php
-
-ISO639 = {
-
-    "aa": "aar",
-    "ab": "abk",
-    "ae": "ave",
-    "af": "afr",
-    "ak": "aka",
-    "am": "amh",
-    "an": "arg",
-    "ar": "ara",
-    "as": "asm",
-    "av": "ava",
-    "ay": "aym",
-    "az": "aze",
-    "ba": "bak",
-    "be": "bel",
-    "bg": "bul",
-    "bh": "bih",
-    "bi": "bis",
-    "bm": "bam",
-    "bn": "ben",
-    "bo": "bod",
-    "br": "bre",
-    "bs": "bos",
-    "ca": "cat",
-    "ce": "che",
-    "ch": "cha",
-    "co": "cos",
-    "cr": "cre",
-    "cs": "ces",
-    "cu": "chu",
-    "cv": "chv",
-    "cy": "cym",
-    "da": "dan",
-    "de": "deu",
-    "dv": "div",
-    "dz": "dzo",
-    "ee": "ewe",
-    "el": "ell",
-    "en": "eng",
-    "eo": "epo",
-    "es": "spa",
-    "et": "est",
-    "eu": "eus",
-    "fa": "fas",
-    "ff": "ful",
-    "fi": "fin",
-    "fj": "fij",
-    "fo": "fao",
-    "fr": "fra",
-    "fy": "fry",
-    "ga": "gle",
-    "gd": "gla",
-    "gl": "glg",
-    "gn": "grn",
-    "gu": "guj",
-    "gv": "glv",
-    "ha": "hau",
-    "he": "heb",
-    "hi": "hin",
-    "ho": "hmo",
-    "hr": "hrv",
-    "ht": "hat",
-    "hu": "hun",
-    "hy": "hye",
-    "hz": "her",
-    "ia": "ina",
-    "id": "ind",
-    "ie": "ile",
-    "ig": "ibo",
-    "ii": "iii",
-    "ik": "ipk",
-    "io": "ido",
-    "is": "isl",
-    "it": "ita",
-    "iu": "iku",
-    "ja": "jpn",
-    "jv": "jav",
-    "ka": "kat",
-    "kg": "kon",
-    "ki": "kik",
-    "kj": "kua",
-    "kk": "kaz",
-    "kl": "kal",
-    "km": "khm",
-    "kn": "kan",
-    "ko": "kor",
-    "kr": "kau",
-    "ks": "kas",
-    "ku": "kur",
-    "kv": "kom",
-    "kw": "cor",
-    "ky": "kir",
-    "la": "lat",
-    "lb": "ltz",
-    "lg": "lug",
-    "li": "lim",
-    "ln": "lin",
-    "lo": "lao",
-    "lt": "lit",
-    "lu": "lub",
-    "lv": "lav",
-    "mg": "mlg",
-    "mh": "mah",
-    "mi": "mri",
-    "mk": "mkd",
-    "ml": "mal",
-    "mn": "mon",
-    "mr": "mar",
-    "ms": "msa",
-    "mt": "mlt",
-    "my": "mya",
-    "na": "nau",
-    "nb": "nob",
-    "nd": "nde",
-    "ne": "nep",
-    "ng": "ndo",
-    "nl": "nld",
-    "no": "nor",
-    "nr": "nbl",
-    "nv": "nav",
-    "ny": "nya",
-    "oc": "oci",
-    "oj": "oji",
-    "om": "orm",
-    "or": "ori",
-    "os": "oss",
-    "pa": "pan",
-    "pi": "pli",
-    "pl": "pol",
-    "ps": "pus",
-    "pt": "por",
-    "qu": "que",
-    "rm": "roh",
-    "rn": "run",
-    "ro": "ron",
-    "ru": "rus",
-    "rw": "kin",
-    "sa": "san",
-    "sc": "srd",
-    "sd": "snd",
-    "se": "sme",
-    "sg": "sag",
-    "si": "sin",
-    "sk": "slk",
-    "sl": "slv",
-    "sm": "smo",
-    "sn": "sna",
-    "so": "som",
-    "sq": "sqi",
-    "sr": "srp",
-    "ss": "ssw",
-    "st": "sot",
-    "su": "sun",
-    "sv": "swe",
-    "sw": "swa",
-    "ta": "tam",
-    "te": "tel",
-    "tg": "tgk",
-    "th": "tha",
-    "ti": "tir",
-    "tk": "tuk",
-    "tl": "tgl",
-    "tn": "tsn",
-    "to": "ton",
-    "tr": "tur",
-    "ts": "tso",
-    "tt": "tat",
-    "tw": "twi",
-    "ty": "tah",
-    "ug": "uig",
-    "uk": "ukr",
-    "ur": "urd",
-    "uz": "uzb",
-    "ve": "ven",
-    "vi": "vie",
-    "vo": "vol",
-    "wa": "wln",
-    "wo": "wol",
-    "xh": "xho",
-    "yi": "yid",
-    "yo": "yor",
-    "za": "zha",
-
-    # Tessdata contains two values for Chinese, "chi_sim" and "chi_tra".  I
-    # have no idea which one is better, so I just picked the bigger file.
-    "zh": "chi_tra",
-
-    "zu": "zul"
-
-}
diff --git a/src/paperless_text/parsers.py b/src/paperless_text/parsers.py
index 7e488ca37..030c2c2c2 100644
--- a/src/paperless_text/parsers.py
+++ b/src/paperless_text/parsers.py
@@ -35,15 +35,3 @@ class TextDocumentParser(DocumentParser):
     def parse(self, document_path, mime_type):
         with open(document_path, 'r') as f:
             self.text = f.read()
-
-
-def run_command(*args):
-    environment = os.environ.copy()
-    if settings.CONVERT_MEMORY_LIMIT:
-        environment["MAGICK_MEMORY_LIMIT"] = settings.CONVERT_MEMORY_LIMIT
-    if settings.CONVERT_TMPDIR:
-        environment["MAGICK_TMPDIR"] = settings.CONVERT_TMPDIR
-
-    if not subprocess.Popen(' '.join(args), env=environment,
-                            shell=True).wait() == 0:
-        raise ParseError("Convert failed at {}".format(args))

From 01c2fe508e084e9b310ba7693a094f249fa78dbe Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 20 Dec 2020 14:39:17 +0100
Subject: [PATCH 0332/1300] more tests

---
 src/documents/tests/test_admin.py | 57 +++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 src/documents/tests/test_admin.py

diff --git a/src/documents/tests/test_admin.py b/src/documents/tests/test_admin.py
new file mode 100644
index 000000000..b280c43ea
--- /dev/null
+++ b/src/documents/tests/test_admin.py
@@ -0,0 +1,57 @@
+from unittest import mock
+
+from django.contrib.admin.sites import AdminSite
+from django.test import TestCase
+from django.utils import timezone
+
+from documents.admin import DocumentAdmin
+from documents.models import Document, Tag
+
+
+class TestDocumentAdmin(TestCase):
+
+    def setUp(self) -> None:
+        self.doc_admin = DocumentAdmin(model=Document, admin_site=AdminSite())
+
+    @mock.patch("documents.admin.index.add_or_update_document")
+    def test_save_model(self, m):
+        doc = Document.objects.create(title="test")
+        doc.title = "new title"
+        self.doc_admin.save_model(None, doc, None, None)
+        self.assertEqual(Document.objects.get(id=doc.id).title, "new title")
+        m.assert_called_once()
+
+    def test_tags(self):
+        doc = Document.objects.create(title="test")
+        doc.tags.create(name="t1")
+        doc.tags.create(name="t2")
+
+        self.assertEqual(self.doc_admin.tags_(doc), "<span >t1, </span><span >t2, </span>")
+
+    def test_tags_empty(self):
+        doc = Document.objects.create(title="test")
+
+        self.assertEqual(self.doc_admin.tags_(doc), "")
+
+    @mock.patch("documents.admin.index.remove_document")
+    def test_delete_model(self, m):
+        doc = Document.objects.create(title="test")
+        self.doc_admin.delete_model(None, doc)
+        self.assertRaises(Document.DoesNotExist, Document.objects.get, id=doc.id)
+        m.assert_called_once()
+
+    @mock.patch("documents.admin.index.remove_document")
+    def test_delete_queryset(self, m):
+        for i in range(42):
+            Document.objects.create(title="Many documents with the same title", checksum=f"{i:02}")
+
+        self.assertEqual(Document.objects.count(), 42)
+
+        self.doc_admin.delete_queryset(None, Document.objects.all())
+
+        self.assertEqual(m.call_count, 42)
+        self.assertEqual(Document.objects.count(), 0)
+
+    def test_created(self):
+        doc = Document.objects.create(title="test", created=timezone.datetime(2020, 4, 12))
+        self.assertEqual(self.doc_admin.created_(doc), "2020-04-12")

From b10e7abbe8f42af1ea241dc8adcdd2cfb58b342a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 20 Dec 2020 15:25:47 +0100
Subject: [PATCH 0333/1300] don't know how that got in here

---
 src/paperless/checks.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/paperless/checks.py b/src/paperless/checks.py
index 1e74b30a9..1329ad679 100644
--- a/src/paperless/checks.py
+++ b/src/paperless/checks.py
@@ -15,7 +15,6 @@ writeable_hint = (
 
 def path_check(var, directory):
     messages = []
-    print(directory)
     if directory:
         if not os.path.exists(directory):
             messages.append(Error(

From 5b344963b921afdaf06c4c58df9d59b23f4e53d2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 20 Dec 2020 15:58:29 +0100
Subject: [PATCH 0334/1300] reorganized docker build.

---
 docker/local/Dockerfile => Dockerfile         |  17 ++-
 ...ostgres.yml => docker-compose.postgres.yml |   0
 ...se.sqlite.yml => docker-compose.sqlite.yml |   0
 docker/docker-compose.env                     |  34 -----
 scripts/make-release.sh                       | 125 ------------------
 scripts/push-release.sh                       |  23 ----
 6 files changed, 14 insertions(+), 185 deletions(-)
 rename docker/local/Dockerfile => Dockerfile (78%)
 rename docker/local/docker-compose.postgres.yml => docker-compose.postgres.yml (100%)
 rename docker/local/docker-compose.sqlite.yml => docker-compose.sqlite.yml (100%)
 delete mode 100644 docker/docker-compose.env
 delete mode 100755 scripts/make-release.sh
 delete mode 100755 scripts/push-release.sh

diff --git a/docker/local/Dockerfile b/Dockerfile
similarity index 78%
rename from docker/local/Dockerfile
rename to Dockerfile
index 461b9e4fc..732b4183c 100644
--- a/docker/local/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,18 @@
+FROM node:15 AS frontend
+
+WORKDIR /usr/src/paperless/src-ui/
+
+COPY src-ui/package* ./
+RUN npm install
+
+COPY src-ui .
+RUN node_modules/.bin/ng build --prod --output-hashing none --sourceMap=false
+
 FROM python:3.7-slim
 
 WORKDIR /usr/src/paperless/
 
-COPY requirements.txt ./
+COPY Pipfile* ./
 
 #Dependencies
 RUN apt-get update \
@@ -33,8 +43,8 @@ RUN apt-get update \
 		tzdata \
 		unpaper \
 		zlib1g \
-	&& pip3 install --upgrade supervisor setuptools \
-	&& pip install --no-cache-dir -r requirements.txt \
+	&& pip3 install --upgrade supervisor setuptools pipenv \
+  && pipenv install --system --deploy --ignore-pipfile --clear \
 	&& apt-get -y purge build-essential libqpdf-dev \
 	&& apt-get -y autoremove --purge \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -49,6 +59,7 @@ COPY docker/docker-entrypoint.sh /sbin/docker-entrypoint.sh
 
 # copy app
 COPY src/ ./src/
+COPY --from=frontend /usr/src/paperless/src-ui/dist/paperless-ui/ /usr/src/paperless/src/documents/static/frontend/
 
 # add users, setup scripts
 RUN addgroup --gid 1000 paperless \
diff --git a/docker/local/docker-compose.postgres.yml b/docker-compose.postgres.yml
similarity index 100%
rename from docker/local/docker-compose.postgres.yml
rename to docker-compose.postgres.yml
diff --git a/docker/local/docker-compose.sqlite.yml b/docker-compose.sqlite.yml
similarity index 100%
rename from docker/local/docker-compose.sqlite.yml
rename to docker-compose.sqlite.yml
diff --git a/docker/docker-compose.env b/docker/docker-compose.env
deleted file mode 100644
index 4271bce6e..000000000
--- a/docker/docker-compose.env
+++ /dev/null
@@ -1,34 +0,0 @@
-# The UID and GID of the user used to run paperless in the container. Set this
-# to your UID and GID on the host so that you have write access to the
-# consumption directory.
-#USERMAP_UID=1000
-#USERMAP_GID=1000
-
-# Additional languages to install for text recognition, separated by a
-# whitespace. Note that this is
-# different from PAPERLESS_OCR_LANGUAGE (default=eng), which defines the
-# default language used when guessing the language from the OCR output.
-# The container installs English, German, Italian, Spanish and French by
-# default.
-# See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster
-# for available languages.
-#PAPERLESS_OCR_LANGUAGES=tur ces
-
-###############################################################################
-# Paperless-specific settings                                                 #
-###############################################################################
-
-# All settings defined in the paperless.conf.example can be used here. The
-# Docker setup does not use the configuration file.
-# A few commonly adjusted settings are provided below.
-
-# Adjust this key if you plan to make paperless available publicly. It should
-# be a very long sequence of random characters. You don't need to remember it.
-#PAPERLESS_SECRET_KEY=change-me
-
-# Use this variable to set a timezone for the Paperless Docker containers. If not specified, defaults to UTC.
-#PAPERLESS_TIME_ZONE=America/Los_Angeles
-
-# The default language to use for OCR. Set this to the language most of your
-# documents are written in.
-#PAPERLESS_OCR_LANGUAGE=eng
diff --git a/scripts/make-release.sh b/scripts/make-release.sh
deleted file mode 100755
index f5c9028fa..000000000
--- a/scripts/make-release.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-
-# Release checklist
-# - wait for travis build.
-# adjust src/paperless/version.py
-# changelog in the documentation
-# adjust versions in docker/hub/*
-# adjust version in src-ui/src/environments/prod
-# If docker-compose was modified: all compose files are the same.
-
-# Steps:
-# run release script "dev", push
-# if it works: new tag, merge into master
-# on master: make release "lastest", push
-# on master: make release "version-tag", push
-# publish release files
-
-set -e
-
-
-VERSION=$1
-
-if [ -z "$VERSION" ]
-then
-	echo "Need a version string."
-	exit 1
-fi
-
-# source root directory of paperless
-PAPERLESS_ROOT=$(git rev-parse --show-toplevel)
-
-# output directory
-PAPERLESS_DIST="$PAPERLESS_ROOT/dist"
-PAPERLESS_DIST_APP="$PAPERLESS_DIST/paperless-ng"
-PAPERLESS_DIST_DOCKERFILES="$PAPERLESS_DIST/paperless-ng-dockerfiles"
-
-if [ -d "$PAPERLESS_DIST" ]
-then
-	echo "Removing $PAPERLESS_DIST"
-	rm "$PAPERLESS_DIST" -r
-fi
-
-mkdir "$PAPERLESS_DIST"
-mkdir "$PAPERLESS_DIST_APP"
-mkdir "$PAPERLESS_DIST_APP/docker"
-mkdir "$PAPERLESS_DIST_APP/scripts"
-mkdir "$PAPERLESS_DIST_DOCKERFILES"
-
-# setup dependencies.
-
-cd "$PAPERLESS_ROOT"
-
-pipenv clean
-pipenv install --dev
-pipenv lock --keep-outdated -r > "$PAPERLESS_DIST_APP/requirements.txt"
-
-# test if the application works.
-
-cd "$PAPERLESS_ROOT/src"
-pipenv run pytest --cov
-pipenv run pycodestyle
-
-# make the documentation.
-
-cd "$PAPERLESS_ROOT/docs"
-make clean html
-
-# copy stuff into place
-
-# the application itself
-
-cp "$PAPERLESS_ROOT/.env" \
-  "$PAPERLESS_ROOT/.dockerignore" \
-	"$PAPERLESS_ROOT/CONTRIBUTING.md" \
-	"$PAPERLESS_ROOT/LICENSE" \
-	"$PAPERLESS_ROOT/Pipfile" \
-	"$PAPERLESS_ROOT/Pipfile.lock" \
-	"$PAPERLESS_ROOT/README.md" "$PAPERLESS_DIST_APP"
-
-cp "$PAPERLESS_ROOT/paperless.conf.example" "$PAPERLESS_DIST_APP/paperless.conf"
-
-# copy python source, templates and static files.
-cd "$PAPERLESS_ROOT"
-find src -wholename '*/templates/*' -o -wholename '*/static/*' -o -name '*.py' | cpio -pdm "$PAPERLESS_DIST_APP"
-
-# build the front end.
-
-cd "$PAPERLESS_ROOT/src-ui"
-ng build --prod --output-hashing none --sourceMap=false --output-path "$PAPERLESS_DIST_APP/src/documents/static/frontend"
-
-# documentation
-cp "$PAPERLESS_ROOT/docs/_build/html/" "$PAPERLESS_DIST_APP/docs" -r
-
-# docker files for building the image yourself
-cp "$PAPERLESS_ROOT/docker/local/"* "$PAPERLESS_DIST_APP"
-cp "$PAPERLESS_ROOT/docker/docker-compose.env" "$PAPERLESS_DIST_APP"
-
-# docker files for pulling from docker hub
-cp "$PAPERLESS_ROOT/docker/hub/"* "$PAPERLESS_DIST_DOCKERFILES"
-cp "$PAPERLESS_ROOT/.env" "$PAPERLESS_DIST_DOCKERFILES"
-cp "$PAPERLESS_ROOT/docker/docker-compose.env" "$PAPERLESS_DIST_DOCKERFILES"
-
-# auxiliary files required for the docker image
-cp "$PAPERLESS_ROOT/docker/docker-entrypoint.sh" "$PAPERLESS_DIST_APP/docker/"
-cp "$PAPERLESS_ROOT/docker/gunicorn.conf.py" "$PAPERLESS_DIST_APP/docker/"
-cp "$PAPERLESS_ROOT/docker/imagemagick-policy.xml" "$PAPERLESS_DIST_APP/docker/"
-cp "$PAPERLESS_ROOT/docker/supervisord.conf" "$PAPERLESS_DIST_APP/docker/"
-
-# auxiliary files for bare metal installs
-cp "$PAPERLESS_ROOT/scripts/paperless-webserver.service" "$PAPERLESS_DIST_APP/scripts/"
-cp "$PAPERLESS_ROOT/scripts/paperless-consumer.service" "$PAPERLESS_DIST_APP/scripts/"
-cp "$PAPERLESS_ROOT/scripts/paperless-scheduler.service" "$PAPERLESS_DIST_APP/scripts/"
-
-# try to make the docker build.
-
-cd "$PAPERLESS_DIST_APP"
-
-docker build . -t "jonaswinkler/paperless-ng:$VERSION"
-
-# works. package the app!
-
-cd "$PAPERLESS_DIST"
-
-tar -cJf "paperless-ng-$VERSION.tar.xz" paperless-ng/
-tar -cJf "paperless-ng-$VERSION-dockerfiles.tar.xz" paperless-ng-dockerfiles/
diff --git a/scripts/push-release.sh b/scripts/push-release.sh
deleted file mode 100755
index cfa63f5cf..000000000
--- a/scripts/push-release.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-
-VERSION=$1
-
-if [ -z "$VERSION" ]
-then
-	echo "Need a version string."
-	exit 1
-fi
-
-# source root directory of paperless
-PAPERLESS_ROOT=$(git rev-parse --show-toplevel)
-
-# output directory
-PAPERLESS_DIST="$PAPERLESS_ROOT/dist"
-PAPERLESS_DIST_APP="$PAPERLESS_DIST/paperless-ng"
-
-cd "$PAPERLESS_DIST_APP"
-
-docker push "jonaswinkler/paperless-ng:$VERSION"

From 240d5b9da214f5d56fc1b4e3229ceb3578e76ab1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 20 Dec 2020 15:59:37 +0100
Subject: [PATCH 0335/1300] reorganized docker build.

---
 docker-compose.env.example | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 docker-compose.env.example

diff --git a/docker-compose.env.example b/docker-compose.env.example
new file mode 100644
index 000000000..4271bce6e
--- /dev/null
+++ b/docker-compose.env.example
@@ -0,0 +1,34 @@
+# The UID and GID of the user used to run paperless in the container. Set this
+# to your UID and GID on the host so that you have write access to the
+# consumption directory.
+#USERMAP_UID=1000
+#USERMAP_GID=1000
+
+# Additional languages to install for text recognition, separated by a
+# whitespace. Note that this is
+# different from PAPERLESS_OCR_LANGUAGE (default=eng), which defines the
+# default language used when guessing the language from the OCR output.
+# The container installs English, German, Italian, Spanish and French by
+# default.
+# See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster
+# for available languages.
+#PAPERLESS_OCR_LANGUAGES=tur ces
+
+###############################################################################
+# Paperless-specific settings                                                 #
+###############################################################################
+
+# All settings defined in the paperless.conf.example can be used here. The
+# Docker setup does not use the configuration file.
+# A few commonly adjusted settings are provided below.
+
+# Adjust this key if you plan to make paperless available publicly. It should
+# be a very long sequence of random characters. You don't need to remember it.
+#PAPERLESS_SECRET_KEY=change-me
+
+# Use this variable to set a timezone for the Paperless Docker containers. If not specified, defaults to UTC.
+#PAPERLESS_TIME_ZONE=America/Los_Angeles
+
+# The default language to use for OCR. Set this to the language most of your
+# documents are written in.
+#PAPERLESS_OCR_LANGUAGE=eng

From c6b9e2b5447a4c4021ec48ac8ea6ac590eb20b7e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 20 Dec 2020 16:00:11 +0100
Subject: [PATCH 0336/1300] revert last commit

---
 docker-compose.env.example | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 docker-compose.env.example

diff --git a/docker-compose.env.example b/docker-compose.env.example
deleted file mode 100644
index 4271bce6e..000000000
--- a/docker-compose.env.example
+++ /dev/null
@@ -1,34 +0,0 @@
-# The UID and GID of the user used to run paperless in the container. Set this
-# to your UID and GID on the host so that you have write access to the
-# consumption directory.
-#USERMAP_UID=1000
-#USERMAP_GID=1000
-
-# Additional languages to install for text recognition, separated by a
-# whitespace. Note that this is
-# different from PAPERLESS_OCR_LANGUAGE (default=eng), which defines the
-# default language used when guessing the language from the OCR output.
-# The container installs English, German, Italian, Spanish and French by
-# default.
-# See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster
-# for available languages.
-#PAPERLESS_OCR_LANGUAGES=tur ces
-
-###############################################################################
-# Paperless-specific settings                                                 #
-###############################################################################
-
-# All settings defined in the paperless.conf.example can be used here. The
-# Docker setup does not use the configuration file.
-# A few commonly adjusted settings are provided below.
-
-# Adjust this key if you plan to make paperless available publicly. It should
-# be a very long sequence of random characters. You don't need to remember it.
-#PAPERLESS_SECRET_KEY=change-me
-
-# Use this variable to set a timezone for the Paperless Docker containers. If not specified, defaults to UTC.
-#PAPERLESS_TIME_ZONE=America/Los_Angeles
-
-# The default language to use for OCR. Set this to the language most of your
-# documents are written in.
-#PAPERLESS_OCR_LANGUAGE=eng

From dd6aa2f77539fc66835484f7a95e80cb08a7e026 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 20 Dec 2020 16:01:16 +0100
Subject: [PATCH 0337/1300] added missing file

---
 docker-compose.example.env | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 docker-compose.example.env

diff --git a/docker-compose.example.env b/docker-compose.example.env
new file mode 100644
index 000000000..4271bce6e
--- /dev/null
+++ b/docker-compose.example.env
@@ -0,0 +1,34 @@
+# The UID and GID of the user used to run paperless in the container. Set this
+# to your UID and GID on the host so that you have write access to the
+# consumption directory.
+#USERMAP_UID=1000
+#USERMAP_GID=1000
+
+# Additional languages to install for text recognition, separated by a
+# whitespace. Note that this is
+# different from PAPERLESS_OCR_LANGUAGE (default=eng), which defines the
+# default language used when guessing the language from the OCR output.
+# The container installs English, German, Italian, Spanish and French by
+# default.
+# See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster
+# for available languages.
+#PAPERLESS_OCR_LANGUAGES=tur ces
+
+###############################################################################
+# Paperless-specific settings                                                 #
+###############################################################################
+
+# All settings defined in the paperless.conf.example can be used here. The
+# Docker setup does not use the configuration file.
+# A few commonly adjusted settings are provided below.
+
+# Adjust this key if you plan to make paperless available publicly. It should
+# be a very long sequence of random characters. You don't need to remember it.
+#PAPERLESS_SECRET_KEY=change-me
+
+# Use this variable to set a timezone for the Paperless Docker containers. If not specified, defaults to UTC.
+#PAPERLESS_TIME_ZONE=America/Los_Angeles
+
+# The default language to use for OCR. Set this to the language most of your
+# documents are written in.
+#PAPERLESS_OCR_LANGUAGE=eng

From d9e3895f3470c2da1c56e2711e3767a8e2451d6d Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 20 Dec 2020 08:07:19 -0800
Subject: [PATCH 0338/1300] Fix 2px difference between two editors =)

---
 .../document-list/bulk-editor/bulk-editor.component.html    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index d15b45d0f..35b6d5197 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -9,7 +9,7 @@
   </div>
   <div class="w-100 d-xl-none"></div>
   <div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
-    <label class="mr-2">Select:</label>
+    <label class="mr-2 mb-0">Select:</label>
     <div class="btn-group">
       <button class="btn btn-sm btn-outline-primary" (click)="selectPage.next()">
         <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
@@ -28,7 +28,7 @@
   <div class="w-100 d-xl-none"></div>
   <div class="col-auto mb-2 mb-xl-0">
     <div class="d-flex">
-      <label class="ml-auto mt-1 mr-2">Edit:</label>
+      <label class="ml-auto mt-1 mb-0 mr-2">Edit:</label>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" [toggleableItems]="tagsToggleableItems" [type]="dropdownTypes.Editing" [showCounts]="!this.selectionSpansPages" (open)="tagsDropdownOpen()" (editingComplete)="applyTags($event)"></app-filterable-dropdown>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" [toggleableItems]="correspondentsToggleableItems" [type]="dropdownTypes.Editing" [showCounts]="!this.selectionSpansPages" singular="true" (open)="correspondentsDropdownOpen()" (editingComplete)="applyCorrespondent($event)"></app-filterable-dropdown>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" [toggleableItems]="documentTypesToggleableItems" [type]="dropdownTypes.Editing" [showCounts]="!this.selectionSpansPages" singular="true" (open)="documentTypesDropdownOpen()" (editingComplete)="applyDocumentType($event)"></app-filterable-dropdown>
@@ -37,7 +37,7 @@
   <div class="w-100 d-xl-none"></div>
   <div class="col mb-2 mb-xl-0 d-flex">
     <button type="button" class="btn btn-sm btn-outline-danger ml-0 ml-lg-auto" (click)="applyDelete()">
-      <svg class="buttonicon" fill="currentColor">
+      <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#trash" />
       </svg>
       Delete

From 665863e3953a3696f9d87d4585847e5841588f84 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 20 Dec 2020 17:18:23 +0100
Subject: [PATCH 0339/1300] Display name of current user on the dashboard

---
 .../dashboard/dashboard.component.html        |  2 +-
 .../dashboard/dashboard.component.ts          | 24 ++++++++++++++++++-
 src/documents/templates/index.html            |  2 ++
 src/documents/views.py                        |  2 ++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 627e7ff22..541255a68 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -1,4 +1,4 @@
-<app-page-header title="Dashboard" subTitle="Welcome to paperless-ng!">
+<app-page-header title="Dashboard" [subTitle]="subtitle">
   <img src="assets/logo.svg" height="80" class="m-2 d-none d-md-block">
 </app-page-header>
 
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts
index a14ec5e90..db9b5d425 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.ts
+++ b/src-ui/src/app/components/dashboard/dashboard.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { Meta } from '@angular/platform-browser';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 
@@ -11,8 +12,29 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 export class DashboardComponent implements OnInit {
 
   constructor(
-    private savedViewService: SavedViewService) { }
+    private savedViewService: SavedViewService,
+    private meta: Meta
+  ) { }
 
+  get displayName() {
+    let tagFullName = this.meta.getTag('name=full_name')
+    let tagUsername = this.meta.getTag('name=username')
+    if (tagFullName && tagFullName.content) {
+      return tagFullName.content
+    } else if (tagUsername && tagUsername.content) {
+      return tagUsername.content
+    } else {
+      return null
+    }
+  }
+
+  get subtitle() {
+    if (this.displayName) {
+      return `Hello ${this.displayName}, welcome to Paperless-ng!`
+    } else {
+      return `Welcome to Paperless-ng!`
+    }
+  }
 
   savedViews: PaperlessSavedView[] = []
 
diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html
index d086be0fe..47a352cd5 100644
--- a/src/documents/templates/index.html
+++ b/src/documents/templates/index.html
@@ -8,6 +8,8 @@
   <title>Paperless-ng</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+	<meta name="username" content="{{username}}">
+	<meta name="full_name" content="{{full_name}}">
 	<meta name="cookie_prefix" content="{{cookie_prefix}}">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 <link rel="stylesheet" href="{% static 'frontend/styles.css' %}"></head>
diff --git a/src/documents/views.py b/src/documents/views.py
index 54d0de3f6..43e06065f 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -57,6 +57,8 @@ class IndexView(TemplateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['cookie_prefix'] = settings.COOKIE_PREFIX
+        context['username'] = self.request.user.username
+        context['full_name'] = self.request.user.get_full_name()
         return context
 
 

From 23381f7d170d8dcf1aabcbb26f5dbe04816ca0a8 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 21 Dec 2020 13:13:52 +0100
Subject: [PATCH 0340/1300] Added multi arch docker builds to travis ci

---
 .travis.yml | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index b745d6bd7..307a6073a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,102 @@ jobs:
         - ng build --prod
       after_success: true
 
+    - stage: build_docker
+      name: amd64 docker build
+      services:
+        - docker
+      before_install:
+        - true
+      install:
+        - true
+      after_success:
+        - true
+      script:
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        - docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 .
+        - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64
+      on:
+        condition: '"${BUILD_DOCKER}" = 1'
+    - stage: build_docker
+      name: arm64v8 docker build
+      services:
+        - docker
+      before_install:
+        - true
+      install:
+        - true
+      after_success:
+        - true
+      script:
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
+        - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
+        - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
+      arch: arm64
+      on:
+        condition: '"${BUILD_DOCKER}" = 1'
+    
+    - stage: build_docker
+      name: arm32v7 docker build
+      services:
+        - docker
+      before_install:
+        - true
+      install:
+        - true
+      after_success:
+        - true
+      script:
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        # register binfmt stuff for qemu-static binaries so we can use userland-emulation
+        - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+        # replace the multi-arch reference with a specific, arm32v7 version. else docker will use the platform specific one,
+        # which is amd64.
+        - sed -i 's/FROM node:15/FROM node@sha256:e9bf2028bd59399afd3f6665f427a07b7ddfee07cffdf2061c39d991a3b3e332/g' Dockerfile
+        - sed -i 's/FROM python:3.7-slim/FROM python@sha256:843dd86fa35b923095b5db60c6e2e296013d647c8327aeba0e7638e7f0a43373/g' Dockerfile
+        # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
+        - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 .
+        - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
+      on:
+        condition: '"${BUILD_DOCKER}" = 1'
+    
+    - stage: publish_manifest
+      env:
+        - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
+      services:
+        - docker
+      before_install:
+        - true
+      install:
+        - true
+      after_success:
+        - true
+      script:
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        - docker manifest create ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v6
+        - docker manifest annotate ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 --os linux --arch arm --variant v7
+        - docker manifest annotate ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 --os linux --arch arm64 --variant v8
+        - docker manifest push --purge ${DOCKER_REPO}:${TRAVIS_COMMIT}
+        - |
+          if [ "${TRAVIS_BRANCH}" = "master" ]; then
+            echo "Master branch detected"
+            DOCKER_TAG="latest"
+          else
+            DOCKER_TAG=${TRAVIS_TAG}
+          fi
+        - |
+          if [ "${DOCKER_TAG}" != "" ]; then
+            echo "Create Tag ${DOCKER_TAG}"
+            docker manifest create ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v6
+            docker manifest annotate ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 --os linux --arch arm --variant v7
+            docker manifest annotate ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 --os linux --arch arm64 --variant v8
+            docker manifest push --purge ${DOCKER_REPO}:${DOCKER_TAG}
+          else
+            echo "Not a tag and not on master, so not pushing tag/master specific manifest"
+          fi
+      on:
+        condition: '"${BUILD_DOCKER}" = 1'
+
 
 before_install:
   - sudo apt-get update -qq

From ba18258750e06d4a9f6529baf3722ec467474a88 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 21 Dec 2020 16:19:24 +0100
Subject: [PATCH 0341/1300] Add libxslt-dev to dependencies.

At least one arm based image does not pull in dependencies the same way
the amd64 one does, resulting in a missing libxslt shared lib.
---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 732b4183c..016bf7da9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,7 @@ RUN apt-get update \
 		libpq-dev \
 		libqpdf-dev \
 		libxml2 \
+		libxslt-dev \
 		optipng \
 		pngquant \
 		qpdf \

From 7817315f8b4b6fb9c95c08f4f788a8c068c4b401 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 21 Dec 2020 17:08:01 +0100
Subject: [PATCH 0342/1300] Adding some echos to bette runderstand where the
 build hangs

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 307a6073a..203861391 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,9 +60,12 @@ jobs:
       after_success:
         - true
       script:
+        - echo "Starting arm64v8 build, login to docker"
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
+        - echo "Build ..."
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
+        - echo "Push"
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
       arch: arm64
       on:

From 0e93f7eba577815ea251262dba6be5ac43558b4b Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 21 Dec 2020 08:14:06 -0800
Subject: [PATCH 0343/1300] Fix list small card layout

Some changes from #141 were lost
---
 src-ui/angular.json                           | 259 +++++++++---------
 .../document-list.component.html              |   2 +-
 src-ui/src/environments/environment.ts        |   2 +-
 3 files changed, 133 insertions(+), 130 deletions(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index 2ff1bb3b0..179053958 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -1,130 +1,133 @@
 {
-	"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-	"version": 1,
-	"newProjectRoot": "projects",
-	"projects": {
-		"paperless-ui": {
-			"projectType": "application",
-			"schematics": {
-				"@schematics/angular:component": {
-					"style": "scss"
-				}
-			},
-			"root": "",
-			"sourceRoot": "src",
-			"prefix": "app",
-			"architect": {
-				"build": {
-					"builder": "@angular-devkit/build-angular:browser",
-					"options": {
-						"outputPath": "dist/paperless-ui",
-						"outputHashing": "none",
-						"index": "src/index.html",
-						"main": "src/main.ts",
-						"polyfills": "src/polyfills.ts",
-						"tsConfig": "tsconfig.app.json",
-						"aot": true,
-						"assets": [
-							"src/favicon.ico",
-							"src/assets"
-						],
-						"styles": [
-							"src/styles.scss"
-						],
-						"scripts": []
-					},
-					"configurations": {
-						"production": {
-							"fileReplacements": [
-								{
-									"replace": "src/environments/environment.ts",
-									"with": "src/environments/environment.prod.ts"
-								}
-							],
-							"optimization": true,
-							"outputHashing": "none",
-							"sourceMap": false,
-							"extractCss": true,
-							"namedChunks": false,
-							"extractLicenses": true,
-							"vendorChunk": false,
-							"buildOptimizer": true,
-							"budgets": [
-								{
-									"type": "initial",
-									"maximumWarning": "2mb",
-									"maximumError": "5mb"
-								},
-								{
-									"type": "anyComponentStyle",
-									"maximumWarning": "6kb",
-									"maximumError": "10kb"
-								}
-							]
-						}
-					}
-				},
-				"serve": {
-					"builder": "@angular-devkit/build-angular:dev-server",
-					"options": {
-						"browserTarget": "paperless-ui:build"
-					},
-					"configurations": {
-						"production": {
-							"browserTarget": "paperless-ui:build:production"
-						}
-					}
-				},
-				"extract-i18n": {
-					"builder": "@angular-devkit/build-angular:extract-i18n",
-					"options": {
-						"browserTarget": "paperless-ui:build"
-					}
-				},
-				"test": {
-					"builder": "@angular-devkit/build-angular:karma",
-					"options": {
-						"main": "src/test.ts",
-						"polyfills": "src/polyfills.ts",
-						"tsConfig": "tsconfig.spec.json",
-						"karmaConfig": "karma.conf.js",
-						"assets": [
-							"src/favicon.ico",
-							"src/assets"
-						],
-						"styles": [
-							"src/styles.scss"
-						],
-						"scripts": []
-					}
-				},
-				"lint": {
-					"builder": "@angular-devkit/build-angular:tslint",
-					"options": {
-						"tsConfig": [
-							"tsconfig.app.json",
-							"tsconfig.spec.json",
-							"e2e/tsconfig.json"
-						],
-						"exclude": [
-							"**/node_modules/**"
-						]
-					}
-				},
-				"e2e": {
-					"builder": "@angular-devkit/build-angular:protractor",
-					"options": {
-						"protractorConfig": "e2e/protractor.conf.js",
-						"devServerTarget": "paperless-ui:serve"
-					},
-					"configurations": {
-						"production": {
-							"devServerTarget": "paperless-ui:serve:production"
-						}
-					}
-				}
-			}
-		}
-	},
-	"defaultProject": "paperless-ui"
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "paperless-ui": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/paperless-ui",
+            "outputHashing": "none",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
+            "aot": true,
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "none",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "paperless-ui:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "paperless-ui:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "paperless-ui:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": []
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        },
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "paperless-ui:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "paperless-ui:serve:production"
+            }
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "paperless-ui",
+  "cli": {
+    "analytics": "3204bb5c-281f-49a7-aa58-6656b6967b23"
+  }
 }
\ No newline at end of file
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 5ce4efd2a..31a2efd0d 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -150,6 +150,6 @@
 </table>
 
 
-<div class=" m-n2 row" *ngIf="displayMode == 'smallCards'">
+<div class="m-n2 row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'">
   <app-document-card-small [document]="d" [selected]="list.isSelected(d)" (selectedChange)="list.setSelected(d, $event)" *ngFor="let d of list.documents" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
 </div>
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts
index 29a8f3af6..19f8b27f9 100644
--- a/src-ui/src/environments/environment.ts
+++ b/src-ui/src/environments/environment.ts
@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  apiBaseUrl: "http://localhost:8000/api/",
+  apiBaseUrl: "http://10.0.1.28:8000/api/",
   appTitle: "Paperless-ng",
   version: "DEVELOPMENT"
 };

From e75534c0f222ad256c4525c43691cbb49bb0efc5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 21 Dec 2020 17:35:05 +0100
Subject: [PATCH 0344/1300] fixes #165

---
 .../management/commands/document_importer.py  | 31 +++++++++++++------
 .../tests/test_management_exporter.py         | 30 +++++++++++++++---
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py
index 70d05d98b..8e9a79219 100644
--- a/src/documents/management/commands/document_importer.py
+++ b/src/documents/management/commands/document_importer.py
@@ -1,18 +1,29 @@
 import json
 import os
 import shutil
+from contextlib import contextmanager
 
 from django.conf import settings
 from django.core.management import call_command
 from django.core.management.base import BaseCommand, CommandError
+from django.db.models.signals import post_save, m2m_changed
 from filelock import FileLock
 
 from documents.models import Document
 from documents.settings import EXPORTER_FILE_NAME, EXPORTER_THUMBNAIL_NAME, \
     EXPORTER_ARCHIVE_NAME
-from ...file_handling import create_source_path_directory, \
-    generate_unique_filename
+from ...file_handling import create_source_path_directory
 from ...mixins import Renderable
+from ...signals.handlers import update_filename_and_move_files
+
+
+@contextmanager
+def disable_signal(sig, receiver, sender):
+    try:
+        sig.disconnect(receiver=receiver, sender=sender)
+        yield
+    finally:
+        sig.connect(receiver=receiver, sender=sender)
 
 
 class Command(Renderable, BaseCommand):
@@ -47,11 +58,16 @@ class Command(Renderable, BaseCommand):
             self.manifest = json.load(f)
 
         self._check_manifest()
+        with disable_signal(post_save,
+                            receiver=update_filename_and_move_files,
+                            sender=Document):
+            with disable_signal(m2m_changed,
+                                receiver=update_filename_and_move_files,
+                                sender=Document.tags.through):
+                # Fill up the database with whatever is in the manifest
+                call_command("loaddata", manifest_path)
 
-        # Fill up the database with whatever is in the manifest
-        call_command("loaddata", manifest_path)
-
-        self._import_files_from_manifest()
+                self._import_files_from_manifest()
 
     @staticmethod
     def _check_manifest_exists(path):
@@ -117,9 +133,6 @@ class Command(Renderable, BaseCommand):
             document.storage_type = Document.STORAGE_TYPE_UNENCRYPTED
 
             with FileLock(settings.MEDIA_LOCK):
-                document.filename = generate_unique_filename(
-                    document, settings.ORIGINALS_DIR)
-
                 if os.path.isfile(document.source_path):
                     raise FileExistsError(document.source_path)
 
diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index 22d6fc7f6..d6ab7eadd 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -24,11 +24,17 @@ class TestExportImport(DirectoriesMixin, TestCase):
 
         file = os.path.join(self.dirs.originals_dir, "0000001.pdf")
 
-        Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow", filename="0000001.pdf", mime_type="application/pdf")
-        Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
-        Tag.objects.create(name="t")
-        DocumentType.objects.create(name="dt")
-        Correspondent.objects.create(name="c")
+        d1 = Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow", filename="0000001.pdf", mime_type="application/pdf")
+        d2 = Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
+        t1 = Tag.objects.create(name="t")
+        dt1 = DocumentType.objects.create(name="dt")
+        c1 = Correspondent.objects.create(name="c")
+
+        d1.tags.add(t1)
+        d1.correspondents = c1
+        d1.document_type = dt1
+        d1.save()
+        d2.save()
 
         target = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, target)
@@ -59,11 +65,25 @@ class TestExportImport(DirectoriesMixin, TestCase):
                     self.assertEqual(checksum, element['fields']['archive_checksum'])
 
         with paperless_environment() as dirs:
+            self.assertEqual(Document.objects.count(), 2)
+            Document.objects.all().delete()
+            Correspondent.objects.all().delete()
+            DocumentType.objects.all().delete()
+            Tag.objects.all().delete()
+            self.assertEqual(Document.objects.count(), 0)
+
             call_command('document_importer', target)
+            self.assertEqual(Document.objects.count(), 2)
             messages = check_sanity()
             # everything is alright after the test
             self.assertEqual(len(messages), 0, str([str(m) for m in messages]))
 
+    @override_settings(
+        PAPERLESS_FILENAME_FORMAT="{title}"
+    )
+    def test_exporter_with_filename_format(self):
+        self.test_exporter()
+
     def test_export_missing_files(self):
 
         target = tempfile.mkdtemp()

From b653e44f65bfbe9a80e5e1a4e21cb364bfc6abb7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 21 Dec 2020 18:15:28 +0100
Subject: [PATCH 0345/1300] changed field order, updated ng-select for tag
 color selection

---
 .../common/input/select/select.component.html    |  2 +-
 .../correspondent-edit-dialog.component.html     |  5 ++---
 .../document-type-edit-dialog.component.html     |  4 ++--
 .../tag-edit-dialog.component.html               | 16 +++++++++++++---
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/components/common/input/select/select.component.html b/src-ui/src/app/components/common/input/select/select.component.html
index 655adbe74..d33dae425 100644
--- a/src-ui/src/app/components/common/input/select/select.component.html
+++ b/src-ui/src/app/components/common/input/select/select.component.html
@@ -1,7 +1,7 @@
 <div class="form-group paperless-input-select">
   <label [for]="inputId">{{title}}</label>
   <div [class.input-group]="showPlusButton()">
-    <ng-select name="correspondent" [(ngModel)]="value"
+    <ng-select name="inputId" [(ngModel)]="value"
       [disabled]="disabled"
       [style.color]="textColor"
       [style.background]="backgroundColor"
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
index 307c78c3c..e09ea38bf 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
@@ -8,10 +8,9 @@
   <div class="modal-body">
     
     <app-input-text title="Name" formControlName="name"></app-input-text>
-    <app-input-text title="Match" formControlName="match"></app-input-text>
     <app-input-select title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-    <app-input-check title="Case insensitive" formControlName="is_insensitive"></app-input-check>
-
+    <app-input-text title="Match" formControlName="match" hint="Auto matching does not require you to fill in this field."></app-input-text>
+    <app-input-check title="Case insensitive" formControlName="is_insensitive" hint="Auto matching ignores this option."></app-input-check>
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-outline-dark" (click)="cancel()">Cancel</button>
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
index 013c5a947..3338c40c3 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
@@ -8,9 +8,9 @@
     <div class="modal-body">
       
       <app-input-text title="Name" formControlName="name"></app-input-text>
-      <app-input-text title="Match" formControlName="match"></app-input-text>
       <app-input-select title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-      <app-input-check title="Case insensitive" formControlName="is_insensitive"></app-input-check>
+      <app-input-text title="Match" formControlName="match" hint="Auto matching does not require you to fill in this field."></app-input-text>
+      <app-input-check title="Case insensitive" formControlName="is_insensitive" hint="Auto matching ignores this option."></app-input-check>
 
     </div>
     <div class="modal-footer">
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
index 8048b0c80..2d9f93252 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
@@ -7,11 +7,21 @@
     </div>
     <div class="modal-body">
       <app-input-text title="Name" formControlName="name"></app-input-text>
-      <app-input-select title="Colour" [items]="getColours()" formControlName="colour" [textColor]="getColor(objectForm.value.colour).textColor" [backgroundColor]="getColor(objectForm.value.colour).value"></app-input-select>
+
+
+      <div class="form-group paperless-input-select">
+        <label for="colour">Colour</label>
+        <ng-select name="colour" formControlName="colour" [items]="getColours()" bindValue="id" bindLabel="name">
+          <ng-template ng-option-tmp ng-label-tmp let-item="item">
+            <span class="badge" [style.background]="item.value" [style.color]="item.textColor">{{item.name}}</span>
+          </ng-template>
+        </ng-select>
+      </div>
+     
       <app-input-check title="Inbox tag" formControlName="is_inbox_tag" hint="Inbox tags are automatically assigned to all consumed documents."></app-input-check>
-      <app-input-text title="Match" formControlName="match"></app-input-text>
       <app-input-select title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-      <app-input-check title="Case insensitive" formControlName="is_insensitive"></app-input-check>
+      <app-input-text title="Match" formControlName="match" hint="Auto matching does not require you to fill in this field."></app-input-text>
+      <app-input-check title="Case insensitive" formControlName="is_insensitive" hint="Auto matching ignores this option."></app-input-check>
     </div>
     <div class="modal-footer">
       <button type="button" class="btn btn-outline-dark" (click)="cancel()">Cancel</button>

From 5892941d8a7c9b3dd227666334ebbb5825d45a70 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 21 Dec 2020 18:17:21 +0100
Subject: [PATCH 0346/1300] updated tag coloring for easier readability

---
 src-ui/src/app/data/paperless-tag.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/data/paperless-tag.ts b/src-ui/src/app/data/paperless-tag.ts
index 551c6e03a..979a200a8 100644
--- a/src-ui/src/app/data/paperless-tag.ts
+++ b/src-ui/src/app/data/paperless-tag.ts
@@ -6,14 +6,14 @@ export const TAG_COLOURS = [
     {id: 1, value: "#a6cee3", name: "Light Blue", textColor: "#000000"},
     {id: 2, value: "#1f78b4", name: "Blue", textColor: "#ffffff"},
     {id: 3, value: "#b2df8a", name: "Light Green", textColor: "#000000"},
-    {id: 4, value: "#33a02c", name: "Green", textColor: "#000000"},
+    {id: 4, value: "#33a02c", name: "Green", textColor: "#ffffff"},
     {id: 5, value: "#fb9a99", name: "Light Red", textColor: "#000000"},
     {id: 6, value: "#e31a1c", name: "Red ", textColor: "#ffffff"},
     {id: 7, value: "#fdbf6f", name: "Light Orange", textColor: "#000000"},
     {id: 8, value: "#ff7f00", name: "Orange", textColor: "#000000"},
     {id: 9, value: "#cab2d6", name: "Light Violet", textColor: "#000000"},
     {id: 10, value: "#6a3d9a", name: "Violet", textColor: "#ffffff"},
-    {id: 11, value: "#b15928", name: "Brown", textColor: "#000000"},
+    {id: 11, value: "#b15928", name: "Brown", textColor: "#ffffff"},
     {id: 12, value: "#000000", name: "Black", textColor: "#ffffff"},
     {id: 13, value: "#cccccc", name: "Light Grey", textColor: "#000000"}
 ]

From c527b274b65fb4f32617cabb0848c18649a9451d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 21 Dec 2020 18:23:06 +0100
Subject: [PATCH 0347/1300] disallow clearing tag color

---
 .../tag-list/tag-edit-dialog/tag-edit-dialog.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
index 2d9f93252..138d3e7cd 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
@@ -11,7 +11,7 @@
 
       <div class="form-group paperless-input-select">
         <label for="colour">Colour</label>
-        <ng-select name="colour" formControlName="colour" [items]="getColours()" bindValue="id" bindLabel="name">
+        <ng-select name="colour" formControlName="colour" [items]="getColours()" bindValue="id" bindLabel="name" [clearable]="false">
           <ng-template ng-option-tmp ng-label-tmp let-item="item">
             <span class="badge" [style.background]="item.value" [style.color]="item.textColor">{{item.name}}</span>
           </ng-template>

From dcbc0ea2e5d360001e02b2a1f1f0fccb703f237e Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 21 Dec 2020 09:52:55 -0800
Subject: [PATCH 0348/1300] Revert "Fix list small card layout"

This reverts commit 0e93f7eba577815ea251262dba6be5ac43558b4b.
---
 src-ui/angular.json                           | 259 +++++++++---------
 .../document-list.component.html              |   2 +-
 src-ui/src/environments/environment.ts        |   2 +-
 3 files changed, 130 insertions(+), 133 deletions(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index 179053958..2ff1bb3b0 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -1,133 +1,130 @@
 {
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "version": 1,
-  "newProjectRoot": "projects",
-  "projects": {
-    "paperless-ui": {
-      "projectType": "application",
-      "schematics": {
-        "@schematics/angular:component": {
-          "style": "scss"
-        }
-      },
-      "root": "",
-      "sourceRoot": "src",
-      "prefix": "app",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
-          "options": {
-            "outputPath": "dist/paperless-ui",
-            "outputHashing": "none",
-            "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.app.json",
-            "aot": true,
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
-            "scripts": []
-          },
-          "configurations": {
-            "production": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "none",
-              "sourceMap": false,
-              "extractCss": true,
-              "namedChunks": false,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "6kb",
-                  "maximumError": "10kb"
-                }
-              ]
-            }
-          }
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "paperless-ui:build"
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "paperless-ui:build:production"
-            }
-          }
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "paperless-ui:build"
-          }
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
-            "scripts": []
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        },
-        "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
-          "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "paperless-ui:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "paperless-ui:serve:production"
-            }
-          }
-        }
-      }
-    }
-  },
-  "defaultProject": "paperless-ui",
-  "cli": {
-    "analytics": "3204bb5c-281f-49a7-aa58-6656b6967b23"
-  }
+	"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+	"version": 1,
+	"newProjectRoot": "projects",
+	"projects": {
+		"paperless-ui": {
+			"projectType": "application",
+			"schematics": {
+				"@schematics/angular:component": {
+					"style": "scss"
+				}
+			},
+			"root": "",
+			"sourceRoot": "src",
+			"prefix": "app",
+			"architect": {
+				"build": {
+					"builder": "@angular-devkit/build-angular:browser",
+					"options": {
+						"outputPath": "dist/paperless-ui",
+						"outputHashing": "none",
+						"index": "src/index.html",
+						"main": "src/main.ts",
+						"polyfills": "src/polyfills.ts",
+						"tsConfig": "tsconfig.app.json",
+						"aot": true,
+						"assets": [
+							"src/favicon.ico",
+							"src/assets"
+						],
+						"styles": [
+							"src/styles.scss"
+						],
+						"scripts": []
+					},
+					"configurations": {
+						"production": {
+							"fileReplacements": [
+								{
+									"replace": "src/environments/environment.ts",
+									"with": "src/environments/environment.prod.ts"
+								}
+							],
+							"optimization": true,
+							"outputHashing": "none",
+							"sourceMap": false,
+							"extractCss": true,
+							"namedChunks": false,
+							"extractLicenses": true,
+							"vendorChunk": false,
+							"buildOptimizer": true,
+							"budgets": [
+								{
+									"type": "initial",
+									"maximumWarning": "2mb",
+									"maximumError": "5mb"
+								},
+								{
+									"type": "anyComponentStyle",
+									"maximumWarning": "6kb",
+									"maximumError": "10kb"
+								}
+							]
+						}
+					}
+				},
+				"serve": {
+					"builder": "@angular-devkit/build-angular:dev-server",
+					"options": {
+						"browserTarget": "paperless-ui:build"
+					},
+					"configurations": {
+						"production": {
+							"browserTarget": "paperless-ui:build:production"
+						}
+					}
+				},
+				"extract-i18n": {
+					"builder": "@angular-devkit/build-angular:extract-i18n",
+					"options": {
+						"browserTarget": "paperless-ui:build"
+					}
+				},
+				"test": {
+					"builder": "@angular-devkit/build-angular:karma",
+					"options": {
+						"main": "src/test.ts",
+						"polyfills": "src/polyfills.ts",
+						"tsConfig": "tsconfig.spec.json",
+						"karmaConfig": "karma.conf.js",
+						"assets": [
+							"src/favicon.ico",
+							"src/assets"
+						],
+						"styles": [
+							"src/styles.scss"
+						],
+						"scripts": []
+					}
+				},
+				"lint": {
+					"builder": "@angular-devkit/build-angular:tslint",
+					"options": {
+						"tsConfig": [
+							"tsconfig.app.json",
+							"tsconfig.spec.json",
+							"e2e/tsconfig.json"
+						],
+						"exclude": [
+							"**/node_modules/**"
+						]
+					}
+				},
+				"e2e": {
+					"builder": "@angular-devkit/build-angular:protractor",
+					"options": {
+						"protractorConfig": "e2e/protractor.conf.js",
+						"devServerTarget": "paperless-ui:serve"
+					},
+					"configurations": {
+						"production": {
+							"devServerTarget": "paperless-ui:serve:production"
+						}
+					}
+				}
+			}
+		}
+	},
+	"defaultProject": "paperless-ui"
 }
\ No newline at end of file
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 31a2efd0d..5ce4efd2a 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -150,6 +150,6 @@
 </table>
 
 
-<div class="m-n2 row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'">
+<div class=" m-n2 row" *ngIf="displayMode == 'smallCards'">
   <app-document-card-small [document]="d" [selected]="list.isSelected(d)" (selectedChange)="list.setSelected(d, $event)" *ngFor="let d of list.documents" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
 </div>
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts
index 19f8b27f9..29a8f3af6 100644
--- a/src-ui/src/environments/environment.ts
+++ b/src-ui/src/environments/environment.ts
@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  apiBaseUrl: "http://10.0.1.28:8000/api/",
+  apiBaseUrl: "http://localhost:8000/api/",
   appTitle: "Paperless-ng",
   version: "DEVELOPMENT"
 };

From 29e9d7d79364e4ebb11daa63b59ce616a1d00796 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 21 Dec 2020 09:53:43 -0800
Subject: [PATCH 0349/1300] Some changes from #141 were lost

---
 .../app/components/document-list/document-list.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 5ce4efd2a..1898a4849 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -150,6 +150,6 @@
 </table>
 
 
-<div class=" m-n2 row" *ngIf="displayMode == 'smallCards'">
+<div class="m-n2 row m-n2 row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'">
   <app-document-card-small [document]="d" [selected]="list.isSelected(d)" (selectedChange)="list.setSelected(d, $event)" *ngFor="let d of list.documents" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
 </div>

From 48d83e166b2924856e441349b126402053d0dcff Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 21 Dec 2020 11:12:48 -0800
Subject: [PATCH 0350/1300] use ngIf for editor components to maybe help
 performance

---
 .../document-list/document-list.component.html       |  4 ++--
 .../document-list/document-list.component.ts         | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 1898a4849..970d41ec4 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -78,9 +78,9 @@
 </app-page-header>
 
 <div class="w-100 mb-2 mb-sm-4">
-  <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
+  <app-filter-editor *ngIf="!isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
 
-  <app-bulk-editor [hidden]="!isBulkEditing"
+  <app-bulk-editor *ngIf="isBulkEditing"
     [viewDocuments]="list.documents"
     [(selectedDocuments)]="list.selected"
     (selectPage)="list.selectPage()"
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 4ed6946e3..cfce55a0d 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -120,17 +120,23 @@ export class DocumentListComponent implements OnInit {
 
   clickTag(tagID: number) {
     this.list.selectNone()
-    this.filterEditor.toggleTag(tagID)
+    setTimeout(() => {
+      this.filterEditor.toggleTag(tagID)
+    })
   }
 
   clickCorrespondent(correspondentID: number) {
     this.list.selectNone()
-    this.filterEditor.toggleCorrespondent(correspondentID)
+    setTimeout(() => {
+      this.filterEditor.toggleCorrespondent(correspondentID)
+    })
   }
 
   clickDocumentType(documentTypeID: number) {
     this.list.selectNone()
-    this.filterEditor.toggleDocumentType(documentTypeID)
+    setTimeout(() => {
+      this.filterEditor.toggleDocumentType(documentTypeID)
+    })
   }
 
   private executeBulkOperation(method: string, args): Observable<any> {

From ae3e2a70632642ce63abdd534aead833a45d7868 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 21 Dec 2020 21:28:21 +0100
Subject: [PATCH 0351/1300] updated documentation

---
 docs/advanced_usage.rst | 79 -----------------------------------------
 docs/configuration.rst  |  5 ---
 2 files changed, 84 deletions(-)

diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst
index 48a86384c..8f6b91b4c 100644
--- a/docs/advanced_usage.rst
+++ b/docs/advanced_usage.rst
@@ -5,85 +5,6 @@ Advanced topics
 Paperless offers a couple features that automate certain tasks and make your life
 easier.
 
-Guesswork
-#########
-
-
-Any document you put into the consumption directory will be consumed, but if
-you name the file right, it'll automatically set some values in the database
-for you.  This is is the logic the consumer follows:
-
-1. Try to find the correspondent, title, and tags in the file name following
-   the pattern: ``Date - Correspondent - Title - tag,tag,tag.pdf``.  Note that
-   the format of the date is **rigidly defined** as ``YYYYMMDDHHMMSSZ`` or
-   ``YYYYMMDDZ``.  The ``Z`` refers "Zulu time" AKA "UTC".
-   The tags are optional, so the format ``Date - Correspondent - Title.pdf``
-   works as well.
-2. If that doesn't work, we skip the date and try this pattern:
-   ``Correspondent - Title - tag,tag,tag.pdf``.
-3. If that doesn't work, we try to find the correspondent and title in the file
-   name following the pattern: ``Correspondent - Title.pdf``.
-4. If that doesn't work, just assume that the name of the file is the title.
-
-So given the above, the following examples would work as you'd expect:
-
-* ``20150314000700Z - Some Company Name - Invoice 2016-01-01 - money,invoices.pdf``
-* ``20150314Z - Some Company Name - Invoice 2016-01-01 - money,invoices.pdf``
-* ``Some Company Name - Invoice 2016-01-01 - money,invoices.pdf``
-* ``Another Company - Letter of Reference.jpg``
-* ``Dad's Recipe for Pancakes.png``
-
-These however wouldn't work:
-
-* ``2015-03-14 00:07:00 UTC - Some Company Name, Invoice 2016-01-01, money, invoices.pdf``
-* ``2015-03-14 - Some Company Name, Invoice 2016-01-01, money, invoices.pdf``
-* ``Some Company Name, Invoice 2016-01-01, money, invoices.pdf``
-* ``Another Company- Letter of Reference.jpg``
-
-Do I have to be so strict about naming?
-=======================================
-
-Rather than using the strict document naming rules, one can also set the option
-``PAPERLESS_FILENAME_DATE_ORDER`` in ``paperless.conf`` to any date order
-that is accepted by dateparser_. Doing so will cause ``paperless`` to default
-to any date format that is found in the title, instead of a date pulled from
-the document's text, without requiring the strict formatting of the document
-filename as described above.
-
-.. _dateparser: https://github.com/scrapinghub/dateparser/blob/v0.7.0/docs/usage.rst#settings
-
-.. _advanced-transforming_filenames:
-
-Transforming filenames for parsing
-==================================
-
-Some devices can't produce filenames that can be parsed by the default
-parser. By configuring the option ``PAPERLESS_FILENAME_PARSE_TRANSFORMS`` in
-``paperless.conf`` one can add transformations that are applied to the filename
-before it's parsed.
-
-The option contains a list of dictionaries of regular expressions (key:
-``pattern``) and replacements (key: ``repl``) in JSON format, which are
-applied in order by passing them to ``re.subn``. Transformation stops
-after the first match, so at most one transformation is applied. The general
-syntax is
-
-.. code:: python
-
-   [{"pattern":"pattern1", "repl":"repl1"}, {"pattern":"pattern2", "repl":"repl2"}, ..., {"pattern":"patternN", "repl":"replN"}]
-
-The example below is for a Brother ADS-2400N, a scanner that allows
-different names to different hardware buttons (useful for handling
-multiple entities in one instance), but insists on adding ``_<count>``
-to the filename.
-
-.. code:: python
-
-   # Brother profile configuration, support "Name_Date_Count" (the default
-   # setting) and "Name_Count" (use "Name" as tag and "Count" as title).
-   PAPERLESS_FILENAME_PARSE_TRANSFORMS=[{"pattern":"^([a-z]+)_(\\d{8})_(\\d{6})_([0-9]+)\\.", "repl":"\\2\\3Z - \\4 - \\1."}, {"pattern":"^([a-z]+)_([0-9]+)\\.", "repl":" - \\2 - \\1."}]
-
-
 .. _advanced-matching:
 
 Matching tags, correspondents and document types
diff --git a/docs/configuration.rst b/docs/configuration.rst
index d3f47215b..efc1a9db1 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -400,11 +400,6 @@ PAPERLESS_FILENAME_DATE_ORDER=<format>
 
     Defaults to none, which disables this feature.
 
-PAPERLESS_FILENAME_PARSE_TRANSFORMS
-    Transforms filenames before they are processed by paperless. See
-    :ref:`advanced-transforming_filenames` for details.
-
-    Defaults to none, which disables this feature.
 
 Binaries
 ########

From 48b59c8e24081d06d9c38457517cf55cdcc5f79b Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 21 Dec 2020 21:53:39 +0100
Subject: [PATCH 0352/1300] Use qemu also for arm64v8 build - something might
 be causing trouble on the native hosts

---
 .travis.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 203861391..d2534c152 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,14 +60,17 @@ jobs:
       after_success:
         - true
       script:
-        - echo "Starting arm64v8 build, login to docker"
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        # register binfmt stuff for qemu-static binaries so we can use userland-emulation
+        - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+        # replace the multi-arch reference with a specific, arm32v7 version. else docker will use the platform specific one,
+        # which is amd64.
+        - sed -i 's/FROM node:15/FROM node@sha256:5a14c8bf5020253f322b8f1f6bec4c34cafb0097acf1c1155506ee17b3c71119/g' Dockerfile
+        - sed -i 's/FROM python:3.7-slim/FROM python@sha256:d75eb820f62221ce8e40c5d8dbe988aa417e88553ef095a4a7591d7318da8486/g' Dockerfile
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
-        - echo "Build ..."
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
-        - echo "Push"
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
-      arch: arm64
+      arch: amd64
       on:
         condition: '"${BUILD_DOCKER}" = 1'
     

From ade951a600ee4e00fb1aaeeb8a13fec569640d2e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 21 Dec 2020 23:02:26 +0100
Subject: [PATCH 0353/1300] Adds jbig2 to the build, fixes #93

---
 Dockerfile | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 732b4183c..6c04a1d07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,14 @@
+FROM ubuntu:20.04 AS jbig2
+
+WORKDIR /usr/src/jbig2enc
+
+RUN apt-get update && apt-get install -y --no-install-recommends build-essential automake libtool libleptonica-dev zlib1g-dev git ca-certificates
+
+RUN git clone https://github.com/agl/jbig2enc .
+RUN ./autogen.sh
+RUN ./configure && make
+
+
 FROM node:15 AS frontend
 
 WORKDIR /usr/src/paperless/src-ui/
@@ -57,6 +68,12 @@ COPY docker/gunicorn.conf.py ./
 COPY docker/supervisord.conf /etc/supervisord.conf
 COPY docker/docker-entrypoint.sh /sbin/docker-entrypoint.sh
 
+# copy jbic
+COPY --from=jbig2 /usr/src/jbig2enc/src/.libs/libjbig2enc* /usr/local/lib/
+COPY --from=jbig2 /usr/src/jbig2enc/src/jbig2 /usr/local/bin/
+COPY --from=jbig2 /usr/src/jbig2enc/src/*.h /usr/local/include/
+
+
 # copy app
 COPY src/ ./src/
 COPY --from=frontend /usr/src/paperless/src-ui/dist/paperless-ui/ /usr/src/paperless/src/documents/static/frontend/

From e466158ce218b7ba66abe99f10bebffb77cf4024 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 01:17:07 +0100
Subject: [PATCH 0354/1300] bugfix

---
 .../widgets/saved-view-widget/saved-view-widget.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
index 5bfecc640..f200d8db9 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
@@ -23,7 +23,7 @@ export class SavedViewWidgetComponent implements OnInit {
   documents: PaperlessDocument[] = []
 
   ngOnInit(): void {
-    this.documentService.list(1,10,this.savedView.sort_field, this.savedView.sort_reverse, this.savedView.filter_rules).subscribe(result => {
+    this.documentService.listFiltered(1,10,this.savedView.sort_field, this.savedView.sort_reverse, this.savedView.filter_rules).subscribe(result => {
       this.documents = result.results
     })
   }

From 5863060585e2ccb9c8c850333318d8881244a1a5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 02:43:18 +0100
Subject: [PATCH 0355/1300] added selection to the large cards

---
 .../document-card-large.component.html        | 14 ++++++++---
 .../document-card-large.component.scss        | 25 +++++++++++++++++--
 .../document-card-large.component.ts          | 19 ++++++++++++++
 .../document-list.component.html              |  2 +-
 4 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index 5bf0c9af2..8f52f707f 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -1,7 +1,15 @@
-<div class="card mb-3 bg-light shadow-sm">
+<div class="card mb-3 bg-light shadow-sm" [class.card-selected]="selected" [class.document-card]="selectable">
   <div class="row no-gutters">
-    <div class="col-md-2 d-none d-lg-block">
-      <img [src]="getThumbUrl()" class="card-img doc-img border-right">
+    <div class="col-md-2 d-none d-lg-block doc-img-background" [class.doc-img-background-selected]="selected">
+      <img [src]="getThumbUrl()" class="card-img doc-img border-right" (click)="selected = selectable ? !selected : false">
+
+      <div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
+        <div class="custom-control custom-checkbox">
+          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="selected = $event.target.checked">
+          <label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
+        </div>
+      </div>
+
     </div>
     <div class="col">
       <div class="card-body">
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
index a20a56672..eb744d2af 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
@@ -1,5 +1,6 @@
+@import "/src/theme";
+
 .result-content {
-  color: darkgray;
   overflow-wrap: anywhere;
 }
 
@@ -8,11 +9,31 @@
   object-position: top;
   height: 100%;
   position: absolute;
-
+  mix-blend-mode: multiply;
 }
 
 .search-score-bar {
   width: 100px;
   height: 5px;
   margin-top: 2px;
+}
+
+.document-card-check {
+  display: none
+}
+
+.document-card:hover .document-card-check {
+  display: block;
+}
+
+.card-selected {
+  border-color: $primary;
+}
+
+.doc-img-background {
+  background-color: white;
+}
+
+.doc-img-background-selected {
+  background-color: $primaryFaded;
 }
\ No newline at end of file
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
index bcc1b1f3c..336af41da 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
@@ -12,6 +12,25 @@ export class DocumentCardLargeComponent implements OnInit {
 
   constructor(private documentService: DocumentService, private sanitizer: DomSanitizer) { }
 
+  _selected = false
+
+  get selected() {
+    return this._selected
+  }
+
+  @Input()
+  set selected(value: boolean) {
+    this._selected = value
+    this.selectedChange.emit(value)
+  }
+
+  @Output()
+  selectedChange = new EventEmitter<boolean>()
+
+  get selectable() {
+    return this.selectedChange.observers.length > 0
+  }
+
   @Input()
   moreLikeThis: boolean = false
 
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index f1101610b..4b05d5e61 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -97,7 +97,7 @@
 </div>
 
 <div *ngIf="displayMode == 'largeCards'">
-  <app-document-card-large *ngFor="let d of list.documents" [document]="d" [details]="d.content" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)">
+  <app-document-card-large [selected]="list.isSelected(d)" (selectedChange)="list.setSelected(d, $event)"   *ngFor="let d of list.documents" [document]="d" [details]="d.content" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)">
   </app-document-card-large>
 </div>
 

From f42e5bf1e5324dec65a21ed0cf7fd9acd76aaff9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 02:59:09 +0100
Subject: [PATCH 0356/1300] added tracking to the document list

---
 .../components/document-list/document-list.component.html   | 6 +++---
 .../app/components/document-list/document-list.component.ts | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 9657f35e3..7c7541b4d 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -73,7 +73,7 @@
 </div>
 
 <div *ngIf="displayMode == 'largeCards'">
-  <app-document-card-large *ngFor="let d of list.documents" [document]="d" [details]="d.content" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)">
+  <app-document-card-large *ngFor="let d of list.documents; trackBy: trackByDocumentId" [document]="d" [details]="d.content" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)">
   </app-document-card-large>
 </div>
 
@@ -87,7 +87,7 @@
     <th class="d-none d-xl-table-cell">Added</th>
   </thead>
   <tbody>
-    <tr *ngFor="let d of list.documents">
+    <tr *ngFor="let d of list.documents; trackBy: trackByDocumentId">
       <td class="d-none d-lg-table-cell">
         {{d.archive_serial_number}}
       </td>
@@ -117,5 +117,5 @@
 
 
 <div class="m-n2 row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'">
-  <app-document-card-small [document]="d" *ngFor="let d of list.documents" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
+  <app-document-card-small [document]="d" *ngFor="let d of list.documents; trackBy: trackByDocumentId" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
 </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 25d92e9db..2d5257804 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { FILTER_CORRESPONDENT } 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 { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
@@ -113,4 +114,7 @@ export class DocumentListComponent implements OnInit {
     this.filterEditor.toggleDocumentType(documentTypeID)
   }
 
+  trackByDocumentId(index, item: PaperlessDocument) {
+    return item.id
+  }
 }

From 360fc081bb8ba36f6d81cc6e9f2ec110644d6ca3 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 22 Dec 2020 02:08:36 -0800
Subject: [PATCH 0357/1300] Completely rewrite change detection, add back
 remove operations

---
 .../filterable-dropdown.component.html        |  6 ++
 .../filterable-dropdown.component.ts          |  8 +-
 .../bulk-editor/bulk-editor.component.html    | 30 +++++++-
 .../bulk-editor/bulk-editor.component.ts      | 74 +++++++++++++------
 .../document-list.component.html              |  3 +
 .../document-list/document-list.component.ts  | 52 ++++++++++++-
 6 files changed, 143 insertions(+), 30 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 58c831456..f9bf78b6c 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -19,6 +19,12 @@
           <input class="form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
         </div>
       </div>
+      <button *ngIf="showRemoveAll" role="menuitem" class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-left-0 border-right-0 border-bottom" (click)="removeAll.next()">
+        <svg class="toolbaricon text-danger" fill="currentColor">
+          <use xlink:href="assets/bootstrap-icons.svg#x" />
+        </svg>
+        <small class="my-1">Remove All</small>
+      </button>
       <div *ngIf="toggleableItems" class="items">
         <ng-container *ngFor="let toggleableItem of toggleableItems | filter: filterText">
           <app-toggleable-dropdown-button [toggleableItem]="toggleableItem" [showCounts]="showCounts" (toggle)="toggleItem($event)"></app-toggleable-dropdown-button>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 05c77cd10..3f0b3c3ad 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -69,12 +69,18 @@ export class FilterableDropdownComponent {
   @Input()
   singular: boolean = false
 
+  @Input()
+  showRemoveAll: boolean = false
+
   @Output()
   toggle = new EventEmitter()
 
   @Output()
   open = new EventEmitter()
 
+  @Output()
+  removeAll = new EventEmitter()
+
   @Output()
   editingComplete = new EventEmitter()
 
@@ -110,7 +116,7 @@ export class FilterableDropdownComponent {
       this.open.next()
     } else {
       this.filterText = ''
-      if (this.type == FilterableDropdownType.Editing) this.editingComplete.emit(this.itemsSelected)
+      if (this.type == FilterableDropdownType.Editing) this.editingComplete.emit(this.toggleableItems)
     }
   }
 
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 35b6d5197..589739d78 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -29,9 +29,33 @@
   <div class="col-auto mb-2 mb-xl-0">
     <div class="d-flex">
       <label class="ml-auto mt-1 mb-0 mr-2">Edit:</label>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" [toggleableItems]="tagsToggleableItems" [type]="dropdownTypes.Editing" [showCounts]="!this.selectionSpansPages" (open)="tagsDropdownOpen()" (editingComplete)="applyTags($event)"></app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" [toggleableItems]="correspondentsToggleableItems" [type]="dropdownTypes.Editing" [showCounts]="!this.selectionSpansPages" singular="true" (open)="correspondentsDropdownOpen()" (editingComplete)="applyCorrespondent($event)"></app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" [toggleableItems]="documentTypesToggleableItems" [type]="dropdownTypes.Editing" [showCounts]="!this.selectionSpansPages" singular="true" (open)="documentTypesDropdownOpen()" (editingComplete)="applyDocumentType($event)"></app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill"
+        [toggleableItems]="tagsToggleableItems"
+        [type]="dropdownTypes.Editing"
+        [showCounts]="!this.selectionSpansPages"
+        [showRemoveAll]="this.selectionSpansPages"
+        (open)="tagsDropdownOpen()"
+        (removeAll)="applyTags([], true)"
+        (editingComplete)="applyTags($event)">
+      </app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" singular="true"
+        [toggleableItems]="correspondentsToggleableItems"
+        [type]="dropdownTypes.Editing"
+        [showCounts]="!this.selectionSpansPages"
+        [showRemoveAll]="this.selectionSpansPages"
+        (open)="correspondentsDropdownOpen()"
+        (removeAll)="applyCorrespondent([], true)"
+        (editingComplete)="applyCorrespondent($event)">
+      </app-filterable-dropdown>
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" singular="true"
+        [toggleableItems]="documentTypesToggleableItems"
+        [type]="dropdownTypes.Editing"
+        [showCounts]="!this.selectionSpansPages"
+        [showRemoveAll]="this.selectionSpansPages"
+        (open)="documentTypesDropdownOpen()"
+        (removeAll)="applyDocumentType([], true)"
+        (editingComplete)="applyDocumentType($event)">
+      </app-filterable-dropdown>
     </div>
   </div>
   <div class="w-100 d-xl-none"></div>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 053af8157..31f7b5566 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -11,6 +11,11 @@ import { DocumentService } from 'src/app/services/rest/document.service';
 import { FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
 import { ToggleableItem, ToggleableItemState } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
 
+interface ChangedItems {
+  itemsToAdd: any[],
+  itemsToRemove: any[]
+}
+
 @Component({
   selector: 'app-bulk-editor',
   templateUrl: './bulk-editor.component.html',
@@ -33,6 +38,9 @@ export class BulkEditorComponent {
   @Output()
   selectNone = new EventEmitter()
 
+  @Output()
+  setTags = new EventEmitter()
+
   @Output()
   setCorrespondent = new EventEmitter()
 
@@ -40,18 +48,24 @@ export class BulkEditorComponent {
   setDocumentType = new EventEmitter()
 
   @Output()
-  setTags = new EventEmitter()
+  delete = new EventEmitter()
 
   @Output()
-  delete = new EventEmitter()
+  removeTags = new EventEmitter()
+
+  @Output()
+  removeCorrespondents = new EventEmitter()
+
+  @Output()
+  removeDocumentTypes = new EventEmitter()
 
   tags: PaperlessTag[]
   correspondents: PaperlessCorrespondent[]
   documentTypes: PaperlessDocumentType[]
 
-  private initiallySelectedTagsToggleableItems: ToggleableItem[]
-  private initiallySelectedCorrespondentsToggleableItems: ToggleableItem[]
-  private initiallySelectedDocumentTypesToggleableItems: ToggleableItem[]
+  private initialTagsToggleableItems: ToggleableItem[]
+  private initialCorrespondentsToggleableItems: ToggleableItem[]
+  private initialDocumentTypesToggleableItems: ToggleableItem[]
 
   dropdownTypes = FilterableDropdownType
 
@@ -59,6 +73,7 @@ export class BulkEditorComponent {
     return this.selectedDocuments.size > this.viewDocuments.length || !Array.from(this.selectedDocuments).every(sd => this.viewDocuments.find(d => d.id == sd))
   }
 
+  private _tagsToggleableItems: ToggleableItem[]
   get tagsToggleableItems(): ToggleableItem[] {
     let tagsToggleableItems = []
     let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id))
@@ -71,9 +86,11 @@ export class BulkEditorComponent {
       else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
       tagsToggleableItems.push({item: t, state: state, count: selectedDocumentsWithTag.length})
     })
+    this._tagsToggleableItems = tagsToggleableItems
     return tagsToggleableItems
   }
 
+  private _correspondentsToggleableItems: ToggleableItem[]
   get correspondentsToggleableItems(): ToggleableItem[] {
     let correspondentsToggleableItems = []
     let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id))
@@ -86,9 +103,11 @@ export class BulkEditorComponent {
       else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
       correspondentsToggleableItems.push({item: c, state: state, count: selectedDocumentsWithCorrespondent.length})
     })
+    this._correspondentsToggleableItems = correspondentsToggleableItems
     return correspondentsToggleableItems
   }
 
+  private _documentTypesToggleableItems: ToggleableItem[]
   get documentTypesToggleableItems(): ToggleableItem[] {
     let documentTypesToggleableItems = []
     let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id))
@@ -101,6 +120,7 @@ export class BulkEditorComponent {
       else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
       documentTypesToggleableItems.push({item: dt, state: state, count: selectedDocumentsWithDocumentType.length})
     })
+    this._documentTypesToggleableItems = documentTypesToggleableItems
     return documentTypesToggleableItems
   }
 
@@ -118,39 +138,45 @@ export class BulkEditorComponent {
   }
 
   tagsDropdownOpen() {
-    this.initiallySelectedTagsToggleableItems = this.tagsToggleableItems.filter(tti => tti.state == ToggleableItemState.Selected)
+    this.initialTagsToggleableItems = this._tagsToggleableItems
   }
 
   correspondentsDropdownOpen() {
-    this.initiallySelectedCorrespondentsToggleableItems = this.correspondentsToggleableItems.filter(cti => cti.state == ToggleableItemState.Selected)
+    this.initialCorrespondentsToggleableItems = this._correspondentsToggleableItems
   }
 
   documentTypesDropdownOpen() {
-    this.initiallySelectedDocumentTypesToggleableItems = this.documentTypesToggleableItems.filter(dtti => dtti.state == ToggleableItemState.Selected)
+    this.initialDocumentTypesToggleableItems = this._documentTypesToggleableItems
   }
 
-  applyTags(selectedTags: PaperlessTag[]) {
-    let unchanged = this.equateItemsToToggleableItems(selectedTags, this.initiallySelectedTagsToggleableItems)
-    if (!unchanged) this.setTags.emit(selectedTags)
-    this.initiallySelectedTagsToggleableItems = []
+  applyTags(newTagsToggleableItems: ToggleableItem[], forceApply:boolean = false) {
+    let changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems)
+    if (changedTags.itemsToAdd.length > 0) this.setTags.emit(changedTags.itemsToAdd)
+    if (changedTags.itemsToRemove.length > 0) this.removeTags.emit(changedTags.itemsToRemove)
   }
 
-  applyCorrespondent(selectedCorrespondents: PaperlessCorrespondent[]) {
-    let unchanged = this.equateItemsToToggleableItems(selectedCorrespondents, this.initiallySelectedCorrespondentsToggleableItems)
-    if (!unchanged) this.setCorrespondent.emit(selectedCorrespondents?.length > 0 ? selectedCorrespondents.shift() : null)
-    this.initiallySelectedCorrespondentsToggleableItems = []
+  applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[], forceApply:boolean = false) {
+    let changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems)
+    if (changedCorrespondents.itemsToAdd.length > 0) this.setCorrespondent.emit(changedCorrespondents.itemsToAdd)
+    else if (changedCorrespondents.itemsToRemove.length > 0) this.removeCorrespondents.emit(changedCorrespondents.itemsToRemove)
   }
 
-  applyDocumentType(selectedDocumentTypes: PaperlessDocumentType[]) {
-    let unchanged = this.equateItemsToToggleableItems(selectedDocumentTypes, this.initiallySelectedDocumentTypesToggleableItems)
-    if (!unchanged) this.setDocumentType.emit(selectedDocumentTypes.length > 0 ? selectedDocumentTypes.shift() : null)
-    this.initiallySelectedDocumentTypesToggleableItems = []
+  applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[], forceApply:boolean = false) {
+    let changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems)
+    if (changedDocumentTypes.itemsToAdd.length > 0) this.setDocumentType.emit(changedDocumentTypes.itemsToAdd)
+    else if (changedDocumentTypes.itemsToRemove.length > 0) this.removeDocumentTypes.emit(changedDocumentTypes.itemsToRemove)
   }
 
-  equateItemsToToggleableItems(items: ObjectWithId[], toggleableItems: ToggleableItem[]): boolean {
-    // either both empty or all items must in toggleableItems and vice-versa
-    return (toggleableItems.length == 0 && items.length == 0) ||
-           (items.every(i => toggleableItems.find(ti => ti.item.id == i.id) !== undefined) && toggleableItems.every(ti => items.find(i => i.id == ti.item.id) !== undefined))
+  checkForChangedItems(toggleableItemsA: ToggleableItem[], toggleableItemsB: ToggleableItem[]): ChangedItems {
+    let itemsToAdd: any[] = []
+    let itemsToRemove: any[] = []
+    toggleableItemsA.forEach(oldItem => {
+      let newItem = toggleableItemsB.find(nTTI => nTTI.item.id == oldItem.item.id)
+
+      if (newItem.state == ToggleableItemState.Selected && (oldItem.state == ToggleableItemState.PartiallySelected || oldItem.state == ToggleableItemState.NotSelected)) itemsToAdd.push(newItem.item)
+      else if (newItem.state == ToggleableItemState.NotSelected && (oldItem.state == ToggleableItemState.Selected || oldItem.state == ToggleableItemState.PartiallySelected)) itemsToRemove.push(newItem.item)
+    })
+    return { itemsToAdd: itemsToAdd, itemsToRemove: itemsToRemove }
   }
 
   applyDelete() {
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 36c6daa5b..d685e6770 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -87,8 +87,11 @@
     (selectAll)="list.selectAll()"
     (selectNone)="list.selectNone()"
     (setTags)="bulkSetTags($event)"
+    (removeTags)="bulkRemoveTags($event)"
     (setCorrespondent)="bulkSetCorrespondent($event)"
+    (removeCorrespondents)="bulkRemoveCorrespondents($event)"
     (setDocumentType)="bulkSetDocumentType($event)"
+    (removeDocumentTypes)="bulkRemoveDocumentTypes($event)"
     (delete)="bulkDelete()">
 </app-bulk-editor>
 </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 2575e4b49..60d763f13 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -158,7 +158,7 @@ export class DocumentListComponent implements OnInit {
 
   bulkSetCorrespondent(correspondent: PaperlessCorrespondent) {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm correspondent assignment"
+    modal.componentInstance.title = "Confirm Correspondent assignment"
     let messageFragment = correspondent ? `assign the correspondent ${correspondent.name} to` : `remove all correspondents from`
     modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
     modal.componentInstance.btnClass = "btn-warning"
@@ -172,6 +172,22 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
+  bulkRemoveCorrespondents(correspondents: PaperlessCorrespondent[]) {
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Confirm Correspondent Removal"
+    modal.componentInstance.message = `This operation will remove the correspondent(s) ${correspondents.map(t => t.name).join(', ')} from all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.btnClass = "btn-warning"
+    modal.componentInstance.btnCaption = "Confirm"
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      // TODO: API endpoint for remove multiple correspondents
+      this.executeBulkOperation('remove_correspondents', {"correspondents": correspondents.map(t => t.id)}).subscribe(
+        response => {
+          modal.close()
+        }
+      )
+    })
+  }
+
   bulkSetDocumentType(documentType: PaperlessDocumentType) {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Confirm Document Type assignment"
@@ -188,6 +204,22 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
+  bulkRemoveDocumentTypes(documentTypes: PaperlessDocumentType[]) {
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Confirm Document Type Removal"
+    modal.componentInstance.message = `This operation will remove the document type(s) ${documentTypes.map(t => t.name).join(', ')} all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.btnClass = "btn-warning"
+    modal.componentInstance.btnCaption = "Confirm"
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      // TODO: API endpoint for remove multiple document types
+      this.executeBulkOperation('remove_document_types', {"document_types": documentTypes.map(t => t.id)}).subscribe(
+        response => {
+          modal.close()
+        }
+      )
+    })
+  }
+
   bulkSetTags(tags: PaperlessTag[]) {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Confirm Tags assignment"
@@ -197,7 +229,23 @@ export class DocumentListComponent implements OnInit {
     modal.componentInstance.btnCaption = "Confirm"
     modal.componentInstance.confirmClicked.subscribe(() => {
       // TODO: API endpoint for set multiple tags
-      this.executeBulkOperation('set_tags', {"document_type": tags ? tags.map(t => t.id) : null}).subscribe(
+      this.executeBulkOperation('set_tags', {"tags": tags ? tags.map(t => t.id) : null}).subscribe(
+        response => {
+          modal.close()
+        }
+      )
+    })
+  }
+
+  bulkRemoveTags(tags: PaperlessTag[]) {
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Confirm Tags Removal"
+    modal.componentInstance.message = `This operation will remove the tags ${tags.map(t => t.name).join(', ')} from all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.btnClass = "btn-warning"
+    modal.componentInstance.btnCaption = "Confirm"
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      // TODO: API endpoint for remove multiple tags
+      this.executeBulkOperation('remove_tags', {"tags": tags.map(t => t.id)}).subscribe(
         response => {
           modal.close()
         }

From 2f26d0748045571575c7716dfaed48f31f675f2f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 22 Dec 2020 02:14:37 -0800
Subject: [PATCH 0358/1300] Only pass one item to bulk methods for
 correspondents/doctypes

---
 .../document-list/bulk-editor/bulk-editor.component.ts        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 31f7b5566..56ccfae53 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -157,13 +157,13 @@ export class BulkEditorComponent {
 
   applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[], forceApply:boolean = false) {
     let changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems)
-    if (changedCorrespondents.itemsToAdd.length > 0) this.setCorrespondent.emit(changedCorrespondents.itemsToAdd)
+    if (changedCorrespondents.itemsToAdd.length > 0) this.setCorrespondent.emit(changedCorrespondents.itemsToAdd[0])
     else if (changedCorrespondents.itemsToRemove.length > 0) this.removeCorrespondents.emit(changedCorrespondents.itemsToRemove)
   }
 
   applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[], forceApply:boolean = false) {
     let changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems)
-    if (changedDocumentTypes.itemsToAdd.length > 0) this.setDocumentType.emit(changedDocumentTypes.itemsToAdd)
+    if (changedDocumentTypes.itemsToAdd.length > 0) this.setDocumentType.emit(changedDocumentTypes.itemsToAdd[0])
     else if (changedDocumentTypes.itemsToRemove.length > 0) this.removeDocumentTypes.emit(changedDocumentTypes.itemsToRemove)
   }
 

From 1fb331643614b5811ad3c3435777e06f5172dbb4 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 22 Dec 2020 02:18:05 -0800
Subject: [PATCH 0359/1300] Fix remove all operations

---
 .../bulk-editor/bulk-editor.component.html     |  6 +++---
 .../bulk-editor/bulk-editor.component.ts       | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 589739d78..b547b8505 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -35,7 +35,7 @@
         [showCounts]="!this.selectionSpansPages"
         [showRemoveAll]="this.selectionSpansPages"
         (open)="tagsDropdownOpen()"
-        (removeAll)="applyTags([], true)"
+        (removeAll)="removeAllTags()"
         (editingComplete)="applyTags($event)">
       </app-filterable-dropdown>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" singular="true"
@@ -44,7 +44,7 @@
         [showCounts]="!this.selectionSpansPages"
         [showRemoveAll]="this.selectionSpansPages"
         (open)="correspondentsDropdownOpen()"
-        (removeAll)="applyCorrespondent([], true)"
+        (removeAll)="removeAllCorrespondents()"
         (editingComplete)="applyCorrespondent($event)">
       </app-filterable-dropdown>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" singular="true"
@@ -53,7 +53,7 @@
         [showCounts]="!this.selectionSpansPages"
         [showRemoveAll]="this.selectionSpansPages"
         (open)="documentTypesDropdownOpen()"
-        (removeAll)="applyDocumentType([], true)"
+        (removeAll)="removeAllDocumentTypes()"
         (editingComplete)="applyDocumentType($event)">
       </app-filterable-dropdown>
     </div>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 56ccfae53..c88a44e25 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -149,24 +149,36 @@ export class BulkEditorComponent {
     this.initialDocumentTypesToggleableItems = this._documentTypesToggleableItems
   }
 
-  applyTags(newTagsToggleableItems: ToggleableItem[], forceApply:boolean = false) {
+  applyTags(newTagsToggleableItems: ToggleableItem[]) {
     let changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems)
     if (changedTags.itemsToAdd.length > 0) this.setTags.emit(changedTags.itemsToAdd)
     if (changedTags.itemsToRemove.length > 0) this.removeTags.emit(changedTags.itemsToRemove)
   }
 
-  applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[], forceApply:boolean = false) {
+  removeAllTags() {
+    this.setTags.emit(null)
+  }
+
+  applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[]) {
     let changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems)
     if (changedCorrespondents.itemsToAdd.length > 0) this.setCorrespondent.emit(changedCorrespondents.itemsToAdd[0])
     else if (changedCorrespondents.itemsToRemove.length > 0) this.removeCorrespondents.emit(changedCorrespondents.itemsToRemove)
   }
 
-  applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[], forceApply:boolean = false) {
+  removeAllCorrespondents() {
+    this.setDocumentType.emit(null)
+  }
+
+  applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[]) {
     let changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems)
     if (changedDocumentTypes.itemsToAdd.length > 0) this.setDocumentType.emit(changedDocumentTypes.itemsToAdd[0])
     else if (changedDocumentTypes.itemsToRemove.length > 0) this.removeDocumentTypes.emit(changedDocumentTypes.itemsToRemove)
   }
 
+  removeAllDocumentTypes() {
+    this.setDocumentType.emit(null)
+  }
+
   checkForChangedItems(toggleableItemsA: ToggleableItem[], toggleableItemsB: ToggleableItem[]): ChangedItems {
     let itemsToAdd: any[] = []
     let itemsToRemove: any[] = []

From 41e842a9e66739dd80898063e46cbdefa9d02666 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 22 Dec 2020 02:58:20 -0800
Subject: [PATCH 0360/1300] Unify bulk operations logic, working tags
 assignment and removal

---
 .../bulk-editor/bulk-editor.component.ts      |  28 ++--
 .../document-list.component.html              |   7 +-
 .../document-list/document-list.component.ts  | 126 +++++++++---------
 3 files changed, 75 insertions(+), 86 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index c88a44e25..bbf5494f0 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -11,7 +11,7 @@ import { DocumentService } from 'src/app/services/rest/document.service';
 import { FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
 import { ToggleableItem, ToggleableItemState } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
 
-interface ChangedItems {
+export interface ChangedItems {
   itemsToAdd: any[],
   itemsToRemove: any[]
 }
@@ -42,23 +42,14 @@ export class BulkEditorComponent {
   setTags = new EventEmitter()
 
   @Output()
-  setCorrespondent = new EventEmitter()
+  setCorrespondents = new EventEmitter()
 
   @Output()
-  setDocumentType = new EventEmitter()
+  setDocumentTypes = new EventEmitter()
 
   @Output()
   delete = new EventEmitter()
 
-  @Output()
-  removeTags = new EventEmitter()
-
-  @Output()
-  removeCorrespondents = new EventEmitter()
-
-  @Output()
-  removeDocumentTypes = new EventEmitter()
-
   tags: PaperlessTag[]
   correspondents: PaperlessCorrespondent[]
   documentTypes: PaperlessDocumentType[]
@@ -151,8 +142,7 @@ export class BulkEditorComponent {
 
   applyTags(newTagsToggleableItems: ToggleableItem[]) {
     let changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems)
-    if (changedTags.itemsToAdd.length > 0) this.setTags.emit(changedTags.itemsToAdd)
-    if (changedTags.itemsToRemove.length > 0) this.removeTags.emit(changedTags.itemsToRemove)
+    if (changedTags.itemsToAdd.length > 0 || changedTags.itemsToRemove.length > 0) this.setTags.emit(changedTags)
   }
 
   removeAllTags() {
@@ -161,22 +151,20 @@ export class BulkEditorComponent {
 
   applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[]) {
     let changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems)
-    if (changedCorrespondents.itemsToAdd.length > 0) this.setCorrespondent.emit(changedCorrespondents.itemsToAdd[0])
-    else if (changedCorrespondents.itemsToRemove.length > 0) this.removeCorrespondents.emit(changedCorrespondents.itemsToRemove)
+    if (changedCorrespondents.itemsToAdd.length > 0 || changedCorrespondents.itemsToRemove.length > 0) this.setCorrespondents.emit(changedCorrespondents)
   }
 
   removeAllCorrespondents() {
-    this.setDocumentType.emit(null)
+    this.setDocumentTypes.emit(null)
   }
 
   applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[]) {
     let changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems)
-    if (changedDocumentTypes.itemsToAdd.length > 0) this.setDocumentType.emit(changedDocumentTypes.itemsToAdd[0])
-    else if (changedDocumentTypes.itemsToRemove.length > 0) this.removeDocumentTypes.emit(changedDocumentTypes.itemsToRemove)
+    if (changedDocumentTypes.itemsToAdd.length > 0 || changedDocumentTypes.itemsToRemove.length > 0) this.setDocumentTypes.emit(changedDocumentTypes)
   }
 
   removeAllDocumentTypes() {
-    this.setDocumentType.emit(null)
+    this.setDocumentTypes.emit(null)
   }
 
   checkForChangedItems(toggleableItemsA: ToggleableItem[], toggleableItemsB: ToggleableItem[]): ChangedItems {
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index d685e6770..816b9b3b6 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -87,11 +87,8 @@
     (selectAll)="list.selectAll()"
     (selectNone)="list.selectNone()"
     (setTags)="bulkSetTags($event)"
-    (removeTags)="bulkRemoveTags($event)"
-    (setCorrespondent)="bulkSetCorrespondent($event)"
-    (removeCorrespondents)="bulkRemoveCorrespondents($event)"
-    (setDocumentType)="bulkSetDocumentType($event)"
-    (removeDocumentTypes)="bulkRemoveDocumentTypes($event)"
+    (setCorrespondents)="bulkSetCorrespondents($event)"
+    (setDocumentTypes)="bulkSetDocumentTypes($event)"
     (delete)="bulkDelete()">
 </app-bulk-editor>
 </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 60d763f13..db955020e 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -19,6 +19,7 @@ import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-vi
 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';
+import { ChangedItems } from './bulk-editor/bulk-editor.component';
 
 @Component({
   selector: 'app-document-list',
@@ -156,47 +157,71 @@ export class DocumentListComponent implements OnInit {
     )
   }
 
-  bulkSetCorrespondent(correspondent: PaperlessCorrespondent) {
+  bulkSetTags(changedTags: ChangedItems) {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Correspondent assignment"
-    let messageFragment = correspondent ? `assign the correspondent ${correspondent.name} to` : `remove all correspondents from`
+    modal.componentInstance.title = "Confirm Tags Assignment"
+    let action = 'set_tags'
+    let tags
+    let messageFragment = ''
+    let both = changedTags && changedTags.itemsToAdd.length > 0 && changedTags.itemsToRemove.length > 0
+    if (!changedTags) {
+      messageFragment = `remove all tags from`
+    } else {
+      if (changedTags.itemsToAdd.length > 0) {
+        tags = changedTags.itemsToAdd
+        messageFragment = `assign the tag(s) ${changedTags.itemsToAdd.map(t => t.name).join(', ')} to`
+      }
+      if (changedTags.itemsToRemove.length > 0) {
+        if (!both) {
+          // TODO: API endpoint for remove multiple tags
+          action = 'remove_tags'
+          tags = changedTags.itemsToRemove
+        } else {
+          messageFragment += ' and '
+        }
+        messageFragment += `remove the correspondent(s) ${changedTags.itemsToRemove.map(t => t.name).join(', ')} from`
+      }
+    }
     modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
     modal.componentInstance.btnClass = "btn-warning"
     modal.componentInstance.btnCaption = "Confirm"
     modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
+      this.executeBulkOperation(action, {"tags": tags ? tags.map(t => t.id) : null}).subscribe(
         response => {
-          modal.close()
+          if (!both) modal.close()
+          else {
+            this.executeBulkOperation('remove_tags', {"tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe(
+              response => {
+                modal.close()
+              })
+          }
         }
       )
     })
   }
 
-  bulkRemoveCorrespondents(correspondents: PaperlessCorrespondent[]) {
+  bulkSetCorrespondents(changedCorrespondents: ChangedItems) {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Correspondent Removal"
-    modal.componentInstance.message = `This operation will remove the correspondent(s) ${correspondents.map(t => t.name).join(', ')} from all ${this.list.selected.size} selected document(s).`
-    modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = "Confirm"
-    modal.componentInstance.confirmClicked.subscribe(() => {
+    modal.componentInstance.title = "Confirm Correspondent Assignment"
+    let action = 'set_correspondent'
+    let correspondents
+    let messageFragment
+    if (!changedCorrespondents) {
+      messageFragment = `remove all correspondents from`
+    } else if (changedCorrespondents.itemsToAdd.length > 0) {
+      correspondents = changedCorrespondents.itemsToAdd[0]
+      messageFragment = `assign the correspondent ${correspondents.name} to`
+    } else {
       // TODO: API endpoint for remove multiple correspondents
-      this.executeBulkOperation('remove_correspondents', {"correspondents": correspondents.map(t => t.id)}).subscribe(
-        response => {
-          modal.close()
-        }
-      )
-    })
-  }
-
-  bulkSetDocumentType(documentType: PaperlessDocumentType) {
-    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Document Type assignment"
-    let messageFragment = documentType ? `assign the document type ${documentType.name} to` : `remove all document types from`
+      action = 'remove_correspondents'
+      correspondents = changedCorrespondents.itemsToRemove
+      messageFragment = `remove the correspondent(s) ${correspondents.map(c => c.name).join(', ')} from`
+    }
     modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
     modal.componentInstance.btnClass = "btn-warning"
     modal.componentInstance.btnCaption = "Confirm"
     modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
+      this.executeBulkOperation(action, {"correspondents": correspondents ? correspondents.map(c => c.id) : null}).subscribe(
         response => {
           modal.close()
         }
@@ -204,48 +229,27 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
-  bulkRemoveDocumentTypes(documentTypes: PaperlessDocumentType[]) {
+  bulkSetDocumentTypes(changedDocumentTypes: ChangedItems) {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Document Type Removal"
-    modal.componentInstance.message = `This operation will remove the document type(s) ${documentTypes.map(t => t.name).join(', ')} all ${this.list.selected.size} selected document(s).`
-    modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = "Confirm"
-    modal.componentInstance.confirmClicked.subscribe(() => {
-      // TODO: API endpoint for remove multiple document types
-      this.executeBulkOperation('remove_document_types', {"document_types": documentTypes.map(t => t.id)}).subscribe(
-        response => {
-          modal.close()
-        }
-      )
-    })
-  }
-
-  bulkSetTags(tags: PaperlessTag[]) {
-    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Tags assignment"
-    let messageFragment = tags ? `assign the tag(s) ${tags.map(t => t.name).join(', ')} to` : `remove all tags from`
+    let action = 'set_document_type'
+    let documentTypes
+    let messageFragment
+    if (!changedDocumentTypes) {
+      messageFragment = `remove all document types from`
+    } else if (changedDocumentTypes.itemsToAdd.length > 0) {
+      documentTypes = changedDocumentTypes.itemsToAdd[0]
+      messageFragment = `assign the document type ${documentTypes.name} to`
+    } else {
+      // TODO: API endpoint for remove multiple doc types
+      action = 'remove_document_types'
+      documentTypes = changedDocumentTypes.itemsToRemove
+      messageFragment = `remove the document type(s) ${documentTypes.map(dt => dt.name).join(', ')} from`
+    }
     modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
     modal.componentInstance.btnClass = "btn-warning"
     modal.componentInstance.btnCaption = "Confirm"
     modal.componentInstance.confirmClicked.subscribe(() => {
-      // TODO: API endpoint for set multiple tags
-      this.executeBulkOperation('set_tags', {"tags": tags ? tags.map(t => t.id) : null}).subscribe(
-        response => {
-          modal.close()
-        }
-      )
-    })
-  }
-
-  bulkRemoveTags(tags: PaperlessTag[]) {
-    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Tags Removal"
-    modal.componentInstance.message = `This operation will remove the tags ${tags.map(t => t.name).join(', ')} from all ${this.list.selected.size} selected document(s).`
-    modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = "Confirm"
-    modal.componentInstance.confirmClicked.subscribe(() => {
-      // TODO: API endpoint for remove multiple tags
-      this.executeBulkOperation('remove_tags', {"tags": tags.map(t => t.id)}).subscribe(
+      this.executeBulkOperation(action, {"document_types": documentTypes ? documentTypes.map(dt => dt.id) : null}).subscribe(
         response => {
           modal.close()
         }

From 0a4a06b99157f8dddf22d85e88fd9e3ac103e0db Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 22 Dec 2020 03:13:57 -0800
Subject: [PATCH 0361/1300] Singular items dont need removal logic since
 dropdowns dont support this (yet?)

---
 .../document-list/document-list.component.ts  | 43 ++++++-------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index db955020e..9e2652ceb 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -179,7 +179,7 @@ export class DocumentListComponent implements OnInit {
         } else {
           messageFragment += ' and '
         }
-        messageFragment += `remove the correspondent(s) ${changedTags.itemsToRemove.map(t => t.name).join(', ')} from`
+        messageFragment += `remove the tag(s) ${changedTags.itemsToRemove.map(t => t.name).join(', ')} from`
       }
     }
     modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
@@ -203,25 +203,17 @@ export class DocumentListComponent implements OnInit {
   bulkSetCorrespondents(changedCorrespondents: ChangedItems) {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Confirm Correspondent Assignment"
-    let action = 'set_correspondent'
-    let correspondents
-    let messageFragment
-    if (!changedCorrespondents) {
-      messageFragment = `remove all correspondents from`
-    } else if (changedCorrespondents.itemsToAdd.length > 0) {
-      correspondents = changedCorrespondents.itemsToAdd[0]
-      messageFragment = `assign the correspondent ${correspondents.name} to`
-    } else {
-      // TODO: API endpoint for remove multiple correspondents
-      action = 'remove_correspondents'
-      correspondents = changedCorrespondents.itemsToRemove
-      messageFragment = `remove the correspondent(s) ${correspondents.map(c => c.name).join(', ')} from`
+    let correspondent
+    let messageFragment = 'remove all correspondents from'
+    if (changedCorrespondents && changedCorrespondents.itemsToAdd.length > 0) {
+      correspondent = changedCorrespondents.itemsToAdd[0]
+      messageFragment = `assign the correspondent ${correspondent.name} to`
     }
     modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
     modal.componentInstance.btnClass = "btn-warning"
     modal.componentInstance.btnCaption = "Confirm"
     modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation(action, {"correspondents": correspondents ? correspondents.map(c => c.id) : null}).subscribe(
+      this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
         response => {
           modal.close()
         }
@@ -231,25 +223,18 @@ export class DocumentListComponent implements OnInit {
 
   bulkSetDocumentTypes(changedDocumentTypes: ChangedItems) {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    let action = 'set_document_type'
-    let documentTypes
-    let messageFragment
-    if (!changedDocumentTypes) {
-      messageFragment = `remove all document types from`
-    } else if (changedDocumentTypes.itemsToAdd.length > 0) {
-      documentTypes = changedDocumentTypes.itemsToAdd[0]
-      messageFragment = `assign the document type ${documentTypes.name} to`
-    } else {
-      // TODO: API endpoint for remove multiple doc types
-      action = 'remove_document_types'
-      documentTypes = changedDocumentTypes.itemsToRemove
-      messageFragment = `remove the document type(s) ${documentTypes.map(dt => dt.name).join(', ')} from`
+    modal.componentInstance.title = "Confirm Document Type Assignment"
+    let documentType
+    let messageFragment = 'remove all document types from'
+    if (changedDocumentTypes && changedDocumentTypes.itemsToAdd.length > 0) {
+      documentType = changedDocumentTypes.itemsToAdd[0]
+      messageFragment = `assign the document type ${documentType.name} to`
     }
     modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
     modal.componentInstance.btnClass = "btn-warning"
     modal.componentInstance.btnCaption = "Confirm"
     modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation(action, {"document_types": documentTypes ? documentTypes.map(dt => dt.id) : null}).subscribe(
+      this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
         response => {
           modal.close()
         }

From 406f8daa1273e93db1ea4ea4110d30e1428a9b95 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 22 Dec 2020 03:32:51 -0800
Subject: [PATCH 0362/1300] TODO comment

---
 .../src/app/components/document-list/document-list.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 9e2652ceb..91fd0cd40 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -173,7 +173,6 @@ export class DocumentListComponent implements OnInit {
       }
       if (changedTags.itemsToRemove.length > 0) {
         if (!both) {
-          // TODO: API endpoint for remove multiple tags
           action = 'remove_tags'
           tags = changedTags.itemsToRemove
         } else {
@@ -186,6 +185,7 @@ export class DocumentListComponent implements OnInit {
     modal.componentInstance.btnClass = "btn-warning"
     modal.componentInstance.btnCaption = "Confirm"
     modal.componentInstance.confirmClicked.subscribe(() => {
+      // TODO: API endpoints for add/remove multiple tags
       this.executeBulkOperation(action, {"tags": tags ? tags.map(t => t.id) : null}).subscribe(
         response => {
           if (!both) modal.close()

From 147a8774c6b7a029a73faa03475965c3302646b5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 12:40:06 +0100
Subject: [PATCH 0363/1300] more tests

---
 src/documents/tests/test_api.py | 52 +++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 5d2e6a3c5..28aa05513 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -64,6 +64,58 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
 
         self.assertEqual(len(Document.objects.all()), 0)
 
+    def test_document_fields(self):
+        c = Correspondent.objects.create(name="c", pk=41)
+        dt = DocumentType.objects.create(name="dt", pk=63)
+        tag = Tag.objects.create(name="t", pk=85)
+        doc = Document.objects.create(title="WOW", content="the content", correspondent=c, document_type=dt, checksum="123", mime_type="application/pdf")
+
+        response = self.client.get("/api/documents/", format='json')
+        self.assertEqual(response.status_code, 200)
+        results_full = response.data['results']
+        self.assertTrue("content" in results_full[0])
+        self.assertTrue("id" in results_full[0])
+
+        response = self.client.get("/api/documents/?fields=id", format='json')
+        self.assertEqual(response.status_code, 200)
+        results = response.data['results']
+        self.assertFalse("content" in results[0])
+        self.assertTrue("id" in results[0])
+        self.assertEqual(len(results[0]), 1)
+
+        response = self.client.get("/api/documents/?fields=content", format='json')
+        self.assertEqual(response.status_code, 200)
+        results = response.data['results']
+        self.assertTrue("content" in results[0])
+        self.assertFalse("id" in results[0])
+        self.assertEqual(len(results[0]), 1)
+
+        response = self.client.get("/api/documents/?fields=id,content", format='json')
+        self.assertEqual(response.status_code, 200)
+        results = response.data['results']
+        self.assertTrue("content" in results[0])
+        self.assertTrue("id" in results[0])
+        self.assertEqual(len(results[0]), 2)
+
+        response = self.client.get("/api/documents/?fields=id,conteasdnt", format='json')
+        self.assertEqual(response.status_code, 200)
+        results = response.data['results']
+        self.assertFalse("content" in results[0])
+        self.assertTrue("id" in results[0])
+        self.assertEqual(len(results[0]), 1)
+
+        response = self.client.get("/api/documents/?fields=", format='json')
+        self.assertEqual(response.status_code, 200)
+        results = response.data['results']
+        self.assertEqual(results_full, results)
+
+        response = self.client.get("/api/documents/?fields=dgfhs", format='json')
+        self.assertEqual(response.status_code, 200)
+        results = response.data['results']
+        self.assertEqual(len(results[0]), 0)
+
+
+
     def test_document_actions(self):
 
         _, filename = tempfile.mkstemp(dir=self.dirs.originals_dir)

From 7d1f931234147bb4588778fda9d3b1fccf4a7ecd Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 12:49:36 +0100
Subject: [PATCH 0364/1300] Use arm64-gravis instead of regular arm64. See if
 that is fast enough.

---
 .travis.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d2534c152..b91e43a28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,17 +60,12 @@ jobs:
       after_success:
         - true
       script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-        # register binfmt stuff for qemu-static binaries so we can use userland-emulation
-        - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-        # replace the multi-arch reference with a specific, arm32v7 version. else docker will use the platform specific one,
-        # which is amd64.
-        - sed -i 's/FROM node:15/FROM node@sha256:5a14c8bf5020253f322b8f1f6bec4c34cafb0097acf1c1155506ee17b3c71119/g' Dockerfile
-        - sed -i 's/FROM python:3.7-slim/FROM python@sha256:d75eb820f62221ce8e40c5d8dbe988aa417e88553ef095a4a7591d7318da8486/g' Dockerfile
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin"
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
-      arch: amd64
+      arch: arm64-graviton2
+      virt: vm      
       on:
         condition: '"${BUILD_DOCKER}" = 1'
     

From bf3b110804597af01ade2047527582d9f24ae9b2 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 12:58:35 +0100
Subject: [PATCH 0365/1300] Remove accidentially added quote

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b91e43a28..5f838755d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ jobs:
       after_success:
         - true
       script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin"
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8

From 1c3b85249c7880d8728de9ceb85b77d1f92e400d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 13:03:50 +0100
Subject: [PATCH 0366/1300] more tests

---
 src/documents/tests/test_api.py | 130 +++++++++++++++++++++++++++++++-
 1 file changed, 126 insertions(+), 4 deletions(-)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 28aa05513..bce2a433d 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -735,7 +735,6 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         args, kwargs = self.async_task.call_args
         self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc3.id])
 
-
     def test_remove_tag(self):
         self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2)
         bulk_edit.remove_tag([self.doc1.id, self.doc3.id, self.doc4.id], self.t1.id)
@@ -750,15 +749,103 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         self.assertEqual(Document.objects.count(), 3)
         self.assertCountEqual([doc.id for doc in Document.objects.all()], [self.doc3.id, self.doc4.id, self.doc5.id])
 
-    def test_api(self):
-        self.assertEqual(Document.objects.count(), 5)
+    @mock.patch("documents.serialisers.bulk_edit.set_correspondent")
+    def test_api_set_correspondent(self, m):
+        m.return_value = "OK"
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc1.id],
+            "method": "set_correspondent",
+            "parameters": {"correspondent": self.c1.id}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+        m.assert_called_once()
+        args, kwargs = m.call_args
+        self.assertEqual(args[0], [self.doc1.id])
+        self.assertEqual(kwargs['correspondent'], self.c1.id)
+
+    @mock.patch("documents.serialisers.bulk_edit.set_correspondent")
+    def test_api_unset_correspondent(self, m):
+        m.return_value = "OK"
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc1.id],
+            "method": "set_correspondent",
+            "parameters": {"correspondent": None}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+        m.assert_called_once()
+        args, kwargs = m.call_args
+        self.assertEqual(args[0], [self.doc1.id])
+        self.assertIsNone(kwargs['correspondent'])
+
+    @mock.patch("documents.serialisers.bulk_edit.set_document_type")
+    def test_api_set_type(self, m):
+        m.return_value = "OK"
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc1.id],
+            "method": "set_document_type",
+            "parameters": {"document_type": self.dt1.id}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+        m.assert_called_once()
+        args, kwargs = m.call_args
+        self.assertEqual(args[0], [self.doc1.id])
+        self.assertEqual(kwargs['document_type'], self.dt1.id)
+
+    @mock.patch("documents.serialisers.bulk_edit.set_document_type")
+    def test_api_unset_type(self, m):
+        m.return_value = "OK"
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc1.id],
+            "method": "set_document_type",
+            "parameters": {"document_type": None}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+        m.assert_called_once()
+        args, kwargs = m.call_args
+        self.assertEqual(args[0], [self.doc1.id])
+        self.assertIsNone(kwargs['document_type'])
+
+    @mock.patch("documents.serialisers.bulk_edit.add_tag")
+    def test_api_add_tag(self, m):
+        m.return_value = "OK"
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc1.id],
+            "method": "add_tag",
+            "parameters": {"tag": self.t1.id}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+        m.assert_called_once()
+        args, kwargs = m.call_args
+        self.assertEqual(args[0], [self.doc1.id])
+        self.assertEqual(kwargs['tag'], self.t1.id)
+
+    @mock.patch("documents.serialisers.bulk_edit.remove_tag")
+    def test_api_remove_tag(self, m):
+        m.return_value = "OK"
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc1.id],
+            "method": "remove_tag",
+            "parameters": {"tag": self.t1.id}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+        m.assert_called_once()
+        args, kwargs = m.call_args
+        self.assertEqual(args[0], [self.doc1.id])
+        self.assertEqual(kwargs['tag'], self.t1.id)
+
+    @mock.patch("documents.serialisers.bulk_edit.delete")
+    def test_api_delete(self, m):
+        m.return_value = "OK"
         response = self.client.post("/api/documents/bulk_edit/", json.dumps({
             "documents": [self.doc1.id],
             "method": "delete",
             "parameters": {}
         }), content_type='application/json')
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(Document.objects.count(), 4)
+        m.assert_called_once()
+        args, kwargs = m.call_args
+        self.assertEqual(args[0], [self.doc1.id])
+        self.assertEqual(len(kwargs), 0)
 
     def test_api_invalid_doc(self):
         self.assertEqual(Document.objects.count(), 5)
@@ -779,3 +866,38 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         }), content_type='application/json')
         self.assertEqual(response.status_code, 400)
         self.assertEqual(Document.objects.count(), 5)
+
+    def test_api_invalid_correspondent(self):
+        self.assertEqual(self.doc2.correspondent, self.c1)
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc2.id],
+            "method": "set_correspondent",
+            "parameters": {'correspondent': 345657}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+
+        doc2 = Document.objects.get(id=self.doc2.id)
+        self.assertEqual(doc2.correspondent, self.c1)
+
+    def test_api_invalid_document_type(self):
+        self.assertEqual(self.doc2.document_type, self.dt1)
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc2.id],
+            "method": "set_document_type",
+            "parameters": {'document_type': 345657}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+
+        doc2 = Document.objects.get(id=self.doc2.id)
+        self.assertEqual(doc2.document_type, self.dt1)
+
+    def test_api_invalid_tag(self):
+        self.assertEqual(list(self.doc2.tags.all()), [self.t1])
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc2.id],
+            "method": "add_tag",
+            "parameters": {'document_type': 345657}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+
+        self.assertEqual(list(self.doc2.tags.all()), [self.t1])

From b7d310ef90d0373dfa93efdddd86e1c6ca524627 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 13:04:08 +0100
Subject: [PATCH 0367/1300] more tests

---
 src/documents/checks.py            |  2 +-
 src/documents/tests/test_checks.py | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/documents/checks.py b/src/documents/checks.py
index b6da5bfc9..ba55b1397 100644
--- a/src/documents/checks.py
+++ b/src/documents/checks.py
@@ -51,6 +51,6 @@ def parser_check(app_configs, **kwargs):
 
     if len(parsers) == 0:
         return [Error("No parsers found. This is a bug. The consumer won't be "
-                      "able to onsume any documents without parsers.")]
+                      "able to consume any documents without parsers.")]
     else:
         return []
diff --git a/src/documents/tests/test_checks.py b/src/documents/tests/test_checks.py
index 1027c11a0..ee4fbe8d1 100644
--- a/src/documents/tests/test_checks.py
+++ b/src/documents/tests/test_checks.py
@@ -1,9 +1,12 @@
 import unittest
+from unittest import mock
 
+from django.core.checks import Error
 from django.test import TestCase
 
 from .factories import DocumentFactory
-from ..checks import changed_password_check
+from .. import document_consumer_declaration
+from ..checks import changed_password_check, parser_check
 from ..models import Document
 
 
@@ -15,3 +18,13 @@ class ChecksTestCase(TestCase):
     def test_changed_password_check_no_encryption(self):
         DocumentFactory.create(storage_type=Document.STORAGE_TYPE_UNENCRYPTED)
         self.assertEqual(changed_password_check(None), [])
+
+    def test_parser_check(self):
+
+        self.assertEqual(parser_check(None), [])
+
+        with mock.patch('documents.checks.document_consumer_declaration.send') as m:
+            m.return_value = []
+
+            self.assertEqual(parser_check(None), [Error("No parsers found. This is a bug. The consumer won't be "
+                                                        "able to consume any documents without parsers.")])

From 6968e228e17391bc78cf1e1142f8537199036012 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 13:04:22 +0100
Subject: [PATCH 0368/1300] increase indexing speed

---
 src/documents/management/commands/document_index.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/documents/management/commands/document_index.py b/src/documents/management/commands/document_index.py
index 7dfdbaa42..08e20e1d2 100644
--- a/src/documents/management/commands/document_index.py
+++ b/src/documents/management/commands/document_index.py
@@ -1,4 +1,5 @@
 from django.core.management import BaseCommand
+from django.db import transaction
 
 from documents.mixins import Renderable
 from documents.tasks import index_reindex, index_optimize
@@ -18,8 +19,8 @@ class Command(Renderable, BaseCommand):
     def handle(self, *args, **options):
 
         self.verbosity = options["verbosity"]
-
-        if options['command'] == 'reindex':
-            index_reindex()
-        elif options['command'] == 'optimize':
-            index_optimize()
+        with transaction.atomic():
+            if options['command'] == 'reindex':
+                index_reindex()
+            elif options['command'] == 'optimize':
+                index_optimize()

From 162626209c82ce8f8f286790302a279afdac6f86 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:27:19 +0100
Subject: [PATCH 0369/1300] Tell me, what kind of arm64 is it that produces
 amd64 docker images?

It's weird
---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5f838755d..f99a52eba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,12 +60,13 @@ jobs:
       after_success:
         - true
       script:
+        - uname -a
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
       arch: arm64-graviton2
-      virt: vm      
+      virt: lxc
       on:
         condition: '"${BUILD_DOCKER}" = 1'
     
@@ -85,8 +86,8 @@ jobs:
         - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
         # replace the multi-arch reference with a specific, arm32v7 version. else docker will use the platform specific one,
         # which is amd64.
-        - sed -i 's/FROM node:15/FROM node@sha256:e9bf2028bd59399afd3f6665f427a07b7ddfee07cffdf2061c39d991a3b3e332/g' Dockerfile
-        - sed -i 's/FROM python:3.7-slim/FROM python@sha256:843dd86fa35b923095b5db60c6e2e296013d647c8327aeba0e7638e7f0a43373/g' Dockerfile
+        - sed -i "s/FROM node:15/FROM node@$(docker manifest inspect node:15 | jq -r '.manifests [] | select (.platform.variant == "v7") | .digest')/g" Dockerfile
+        - sed -i "s/FROM python:3.7-slim/FROM python@$(docker manifest inspect python:3.7-slim | jq -r '.manifests [] | select (.platform.variant == "v7") | .digest')/g" Dockerfile
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7

From 2f599ca1d3a79fe5539f3135d8b39e953b2b35c5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 13:32:30 +0100
Subject: [PATCH 0370/1300] fixes an issue with open documents not refreshing
 after bulk operations

---
 .../document-list/document-list.component.ts      | 15 ++++++++-------
 src-ui/src/app/services/open-documents.service.ts | 12 +++++++++++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 5eb97b08d..f72a92aa9 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -2,8 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { FILTER_CORRESPONDENT } from 'src/app/data/filter-rule-type';
+import { tap } from 'rxjs/operators';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
@@ -17,6 +16,7 @@ import { FilterEditorComponent } from '../filter-editor/filter-editor.component'
 import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component';
 import { SelectDialogComponent } from '../common/select-dialog/select-dialog.component';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
+import { OpenDocumentsService } from 'src/app/services/open-documents.service';
 
 @Component({
   selector: 'app-document-list',
@@ -35,7 +35,8 @@ export class DocumentListComponent implements OnInit {
     private correspondentService: CorrespondentService,
     private documentTypeService: DocumentTypeService,
     private tagService: TagService,
-    private documentService: DocumentService) { }
+    private documentService: DocumentService,
+    private openDocumentService: OpenDocumentsService) { }
 
   @ViewChild("filterEditor")
   private filterEditor: FilterEditorComponent
@@ -131,12 +132,12 @@ export class DocumentListComponent implements OnInit {
 
   private executeBulkOperation(method: string, args): Observable<any> {
     return this.documentService.bulkEdit(Array.from(this.list.selected), method, args).pipe(
-      map(r => {
-
+      tap(() => {
         this.list.reload()
+        this.list.selected.forEach(id => {
+          this.openDocumentService.refreshDocument(id)
+        })
         this.list.selectNone()
-
-        return r
       })
     )
   }
diff --git a/src-ui/src/app/services/open-documents.service.ts b/src-ui/src/app/services/open-documents.service.ts
index e37f5db8c..c91031f83 100644
--- a/src-ui/src/app/services/open-documents.service.ts
+++ b/src-ui/src/app/services/open-documents.service.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { PaperlessDocument } from '../data/paperless-document';
 import { OPEN_DOCUMENT_SERVICE } from '../data/storage-keys';
+import { DocumentService } from './rest/document.service';
 
 @Injectable({
   providedIn: 'root'
@@ -9,7 +10,7 @@ export class OpenDocumentsService {
 
   private MAX_OPEN_DOCUMENTS = 5
 
-  constructor() { 
+  constructor(private documentService: DocumentService) { 
     if (sessionStorage.getItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS)) {
       try {
         this.openDocuments = JSON.parse(sessionStorage.getItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS))
@@ -22,6 +23,15 @@ export class OpenDocumentsService {
 
   private openDocuments: PaperlessDocument[] = []
 
+  refreshDocument(id: number) {
+    let index = this.openDocuments.findIndex(doc => doc.id == id)
+    if (index > -1) {
+      this.documentService.get(id).subscribe(doc => {
+        this.openDocuments[index] = doc
+      })
+    }
+  }
+
   getOpenDocuments(): PaperlessDocument[] {
     return this.openDocuments
   }

From 0aad31b4bc6bd9866fdfcb9550b89ffca41c24f3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 13:39:46 +0100
Subject: [PATCH 0371/1300] fixes clearing fields that should not be clearable

---
 .../app/components/common/input/select/select.component.html  | 1 +
 .../components/document-detail/document-detail.component.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/common/input/select/select.component.html b/src-ui/src/app/components/common/input/select/select.component.html
index d33dae425..780dc5686 100644
--- a/src-ui/src/app/components/common/input/select/select.component.html
+++ b/src-ui/src/app/components/common/input/select/select.component.html
@@ -5,6 +5,7 @@
       [disabled]="disabled"
       [style.color]="textColor"
       [style.background]="backgroundColor"
+      [clearable]="allowNull"
       (change)="onChange(value)"
       (blur)="onTouched()">
       <ng-option *ngFor="let i of items" [value]="i.id">{{i.name}}</ng-option>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 228264378..ae3fb0c0a 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -67,9 +67,9 @@
                                 formControlName='archive_serial_number'>
                         </div>
                         <app-input-date-time titleDate="Date created" formControlName="created"></app-input-date-time>
-                        <app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent"
+                        <app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent" [allowNull]="true"
                             (createNew)="createCorrespondent()"></app-input-select>
-                        <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type"
+                        <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type" [allowNull]="true"
                             (createNew)="createDocumentType()"></app-input-select>
                         <app-input-tags formControlName="tags" title="Tags"></app-input-tags>
 

From e8ea373eb2c4e3a686e07d2fc8919b0b15bb3281 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:42:21 +0100
Subject: [PATCH 0372/1300] Enable manifests support

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f99a52eba..6d26d6ccb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,6 +91,8 @@ jobs:
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
+      env:
+        - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
       on:
         condition: '"${BUILD_DOCKER}" = 1'
     

From 46ecdefde84eb581b038da1cdc2728cc3f11ea8d Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:43:51 +0100
Subject: [PATCH 0373/1300] Remove steps not necessary to build docker images

---
 .travis.yml | 54 ++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6d26d6ccb..c04f765d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,33 +5,33 @@ os: linux
 
 jobs:
   include:
-    - name: "Paperless on Python 3.6"
-      python: "3.6"
-
-    - name: "Paperless on Python 3.7"
-      python: "3.7"
-
-    - name: "Paperless on Python 3.8"
-      python: "3.8"
-
-    - name: "Documentation"
-      script:
-        - cd docs/
-        - make html
-      after_success: true
-
-    - name: "Front end"
-      language: node_js
-      node_js:
-        - 15
-      before_install: true
-      install:
-        - cd src-ui/
-        - npm install -g @angular/cli
-        - npm install
-      script:
-        - ng build --prod
-      after_success: true
+#    - name: "Paperless on Python 3.6"
+#      python: "3.6"
+#
+#    - name: "Paperless on Python 3.7"
+#      python: "3.7"
+#
+#    - name: "Paperless on Python 3.8"
+#      python: "3.8"
+#
+#    - name: "Documentation"
+#      script:
+#        - cd docs/
+#        - make html
+#      after_success: true
+#
+#    - name: "Front end"
+#      language: node_js
+#      node_js:
+#        - 15
+#      before_install: true
+#      install:
+#        - cd src-ui/
+#        - npm install -g @angular/cli
+#        - npm install
+#      script:
+#        - ng build --prod
+#      after_success: true
 
     - stage: build_docker
       name: amd64 docker build

From 0dbd598116d720d9d371015adccd06b42919ebdb Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 13:54:41 +0100
Subject: [PATCH 0374/1300] changelog

---
 docs/changelog.rst | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a993eb530..795582260 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,38 @@ Changelog
 *********
 
 
+paperless-ng 0.9.9
+##################
+
+Christmas release!
+
+Bulk editing
+
+* Paperless now supports bulk editing.
+* The following operations are available: Add and remove correspondents, tags, document types from selected documents, as well as mass-deleting documents.
+* We've got a more fancy UI in the works that makes these features more accessible, but that's not quite ready yet.
+
+Searching
+
+* Paperless now supports searching for similar documents ("More like this") both from the document detail page as well as from individual search results.
+* A search score indicates how well a document matches the search query, or how similar a document is to a given reference document.
+
+Changes
+
+* Clarification in the UI that the fields "Match" and "Is insensitive" are not relevant for the Auto matching algorithm.
+* New select interface for tags, types and correspondents allows filtering. This also improves tag selection. Thanks again to `Michael Shamoon`_!
+* Page navigation controls for the document viewer, thanks to `Michael Shamoon`_.
+
+Fixes
+
+* An error that caused the document importer to crash was fixed.
+* An issue with changes not being possible when ``PAPERLESS_COOKIE_PREFIX`` is used was fixed.
+* The date selection filters now allow manual entry of dates.
+
+Feature Removal
+
+* Most of the guesswork features have been removed. Paperless no longer tries to extract correspondents and tags from file names.
+
 paperless-ng 0.9.8
 ##################
 

From 3e389a3140c5acea15035d778afb7340fc61a8d8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 14:09:38 +0100
Subject: [PATCH 0375/1300] versions

---
 docker/hub/docker-compose.postgres.yml      | 2 +-
 docker/hub/docker-compose.sqlite.yml        | 2 +-
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index d33e4c38d..e7a32bec0 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.8
+    image: jonaswinkler/paperless-ng:0.9.9
     restart: always
     depends_on:
       - db
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index c130dfef6..98b7d70a2 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.8
+    image: jonaswinkler/paperless-ng:0.9.9
     restart: always
     depends_on:
       - broker
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index f12c6a7cb..ab6b07c73 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,5 +2,5 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "0.9.8"
+  version: "0.9.9"
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 10283c145..b1dfc590c 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (0, 9, 8)
+__version__ = (0, 9, 9)

From 978bb3c33980dc2d9bea056a47db26cdbde02d0b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 14:13:58 +0100
Subject: [PATCH 0376/1300] more change log

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 795582260..db3378011 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -27,6 +27,8 @@ Changes
 * Clarification in the UI that the fields "Match" and "Is insensitive" are not relevant for the Auto matching algorithm.
 * New select interface for tags, types and correspondents allows filtering. This also improves tag selection. Thanks again to `Michael Shamoon`_!
 * Page navigation controls for the document viewer, thanks to `Michael Shamoon`_.
+* Layout changes to the small cards document list.
+* The dashboard now displays the username (or full name if specified in the admin) on the dashboard.
 
 Fixes
 

From c751fe752079bf1367944e81c26a4d718a4531be Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 14:15:06 +0100
Subject: [PATCH 0377/1300] Switching back to virt: vm as there seems to be a
 prob with the lxc ones

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c04f765d0..9803a4d3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,7 +66,7 @@ jobs:
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
       arch: arm64-graviton2
-      virt: lxc
+      virt: vm
       on:
         condition: '"${BUILD_DOCKER}" = 1'
     

From 1f62b6d0d4c44516818a3e8e5d6e3efaa50f97f2 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 14:18:11 +0100
Subject: [PATCH 0378/1300] arm64-graviton2 build requires group:edge

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 9803a4d3b..8422229c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,6 +67,7 @@ jobs:
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
       arch: arm64-graviton2
       virt: vm
+      group: edge
       on:
         condition: '"${BUILD_DOCKER}" = 1'
     

From b08a5e62d89560fef4dc5a8ae27749190c68bad5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 14:43:16 +0100
Subject: [PATCH 0379/1300] documentation

---
 docs/setup.rst           |  2 ++
 docs/troubleshooting.rst | 28 +++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index e5e6526ea..908704fc2 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -120,6 +120,8 @@ The `bare metal route`_ is more complicated to setup but makes it easier
 should you want to contribute some code back. You need to configure and
 run the above mentioned components yourself.
 
+.. _setup-docker_route:
+
 Docker Route
 ============
 
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index dc5bf7f5d..4c06ec4cd 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -39,7 +39,7 @@ Operation not permitted
 
 You might see errors such as:
 
-.. code::
+.. code:: shell-session
 
     chown: changing ownership of '../export': Operation not permitted
 
@@ -49,3 +49,29 @@ to these folders. This happens when pointing these directories to NFS shares,
 for example.
 
 Ensure that `chown` is possible on these directories.
+
+Classifier error: No training data available
+############################################
+
+This indicates that the Auto matching algorithm found no documents to learn from.
+This may have two reasons:
+
+*   You don't use the Auto matching algorithm: The error can be safely ignored in this case.
+*   You are using the Auto matching algorithm: The classifier explicitly excludes documents
+    with Inbox tags. Verify that there are documents in your archive without inbox tags.
+    The algorithm will only learn from documents not in your inbox.
+
+Permission denied errors in the consumption directory
+#####################################################
+
+You might encounter errors such as:
+
+.. code:: shell-session
+
+    The following error occured while consuming document.pdf: [Errno 13] Permission denied: '/usr/src/paperless/src/../consume/document.pdf'
+
+This happens when paperless does not have permission to delete files inside the consumption directory.
+Ensure that ``USERMAP_UID`` and ``USERMAP_GID`` are set to the user id and group id you use on the host operating system, if these are
+different from ``1000``. See :ref:`setup-docker_route`.
+
+Also ensure that you are able to read and write to the consumption directory on the host.

From 403de420311e0a3f9324d507c181f9b65bfa3d49 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 15:18:42 +0100
Subject: [PATCH 0380/1300] discard selection when switching views

---
 src-ui/src/app/services/document-list-view.service.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 00f84048b..b148d4087 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -40,10 +40,14 @@ export class DocumentListViewService {
   }
 
   set savedView(value: PaperlessSavedView) {
-    if (value) {
+    if (value && !this._savedViewConfig || value && value.id != this._savedViewConfig.id) {
+      //saved view inactive and should be active now, or saved view active, but a different view is requested
       //this is here so that we don't modify value, which might be the actual instance of the saved view.
+      this.selectNone()
       this._savedViewConfig = Object.assign({}, value)
-    } else {
+    } else if (this._savedViewConfig && !value) {
+      //saved view active, but document list requested
+      this.selectNone()
       this._savedViewConfig = null
     }
   }

From 8dc15352effac4cb9739135fb70d1166be418523 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 15:22:24 +0100
Subject: [PATCH 0381/1300] changelog layout

---
 docs/changelog.rst | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index db3378011..e63c19d7d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,34 +11,34 @@ paperless-ng 0.9.9
 
 Christmas release!
 
-Bulk editing
+* Bulk editing
 
-* Paperless now supports bulk editing.
-* The following operations are available: Add and remove correspondents, tags, document types from selected documents, as well as mass-deleting documents.
-* We've got a more fancy UI in the works that makes these features more accessible, but that's not quite ready yet.
+  * Paperless now supports bulk editing.
+  * The following operations are available: Add and remove correspondents, tags, document types from selected documents, as well as mass-deleting documents.
+  * We've got a more fancy UI in the works that makes these features more accessible, but that's not quite ready yet.
 
-Searching
+* Searching
 
-* Paperless now supports searching for similar documents ("More like this") both from the document detail page as well as from individual search results.
-* A search score indicates how well a document matches the search query, or how similar a document is to a given reference document.
+  * Paperless now supports searching for similar documents ("More like this") both from the document detail page as well as from individual search results.
+  * A search score indicates how well a document matches the search query, or how similar a document is to a given reference document.
 
-Changes
+* Other additions and changes
 
-* Clarification in the UI that the fields "Match" and "Is insensitive" are not relevant for the Auto matching algorithm.
-* New select interface for tags, types and correspondents allows filtering. This also improves tag selection. Thanks again to `Michael Shamoon`_!
-* Page navigation controls for the document viewer, thanks to `Michael Shamoon`_.
-* Layout changes to the small cards document list.
-* The dashboard now displays the username (or full name if specified in the admin) on the dashboard.
+  * Clarification in the UI that the fields "Match" and "Is insensitive" are not relevant for the Auto matching algorithm.
+  * New select interface for tags, types and correspondents allows filtering. This also improves tag selection. Thanks again to `Michael Shamoon`_!
+  * Page navigation controls for the document viewer, thanks to `Michael Shamoon`_.
+  * Layout changes to the small cards document list.
+  * The dashboard now displays the username (or full name if specified in the admin) on the dashboard.
 
-Fixes
+* Fixes
 
-* An error that caused the document importer to crash was fixed.
-* An issue with changes not being possible when ``PAPERLESS_COOKIE_PREFIX`` is used was fixed.
-* The date selection filters now allow manual entry of dates.
+  * An error that caused the document importer to crash was fixed.
+  * An issue with changes not being possible when ``PAPERLESS_COOKIE_PREFIX`` is used was fixed.
+  * The date selection filters now allow manual entry of dates.
 
-Feature Removal
+* Feature Removal
 
-* Most of the guesswork features have been removed. Paperless no longer tries to extract correspondents and tags from file names.
+  * Most of the guesswork features have been removed. Paperless no longer tries to extract correspondents and tags from file names.
 
 paperless-ng 0.9.8
 ##################

From ebcb2cf694a0b92e24b23ea3b5ebe1afc185322a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 15:50:27 +0100
Subject: [PATCH 0382/1300] progress bar for the document importer

---
 .../management/commands/document_importer.py       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py
index 8e9a79219..344be32be 100644
--- a/src/documents/management/commands/document_importer.py
+++ b/src/documents/management/commands/document_importer.py
@@ -1,8 +1,10 @@
 import json
+import logging
 import os
 import shutil
 from contextlib import contextmanager
 
+import tqdm
 from django.conf import settings
 from django.core.management import call_command
 from django.core.management.base import BaseCommand, CommandError
@@ -43,6 +45,8 @@ class Command(Renderable, BaseCommand):
 
     def handle(self, *args, **options):
 
+        logging.getLogger().handlers[0].level = logging.ERROR
+
         self.source = options["source"]
 
         if not os.path.exists(self.source):
@@ -111,10 +115,13 @@ class Command(Renderable, BaseCommand):
         os.makedirs(settings.THUMBNAIL_DIR, exist_ok=True)
         os.makedirs(settings.ARCHIVE_DIR, exist_ok=True)
 
-        for record in self.manifest:
+        print("Copy files into paperless...")
 
-            if not record["model"] == "documents.document":
-                continue
+        manifest_documents = list(filter(
+            lambda r: r["model"] == "documents.document",
+            self.manifest))
+
+        for record in tqdm.tqdm(manifest_documents):
 
             document = Document.objects.get(pk=record["pk"])
 
@@ -138,7 +145,6 @@ class Command(Renderable, BaseCommand):
 
                 create_source_path_directory(document.source_path)
 
-                print(f"Moving {document_path} to {document.source_path}")
                 shutil.copy(document_path, document.source_path)
                 shutil.copy(thumbnail_path, document.thumbnail_path)
                 if archive_path:

From 0fa3c3188d9c324de15ee71243f8b34e456daf50 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 15:53:04 +0100
Subject: [PATCH 0383/1300] update index after import

---
 src/documents/management/commands/document_importer.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py
index 344be32be..6df14a82c 100644
--- a/src/documents/management/commands/document_importer.py
+++ b/src/documents/management/commands/document_importer.py
@@ -73,6 +73,9 @@ class Command(Renderable, BaseCommand):
 
                 self._import_files_from_manifest()
 
+        print("Updating search index...")
+        call_command('document_index', 'reindex')
+
     @staticmethod
     def _check_manifest_exists(path):
         if not os.path.exists(path):

From c4286d0a481e17b6d3bed4056c4462fba1005560 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Tue, 22 Dec 2020 16:33:41 +0100
Subject: [PATCH 0384/1300] Update README.md

---
 README.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 32ff2ab4a..526644685 100644
--- a/README.md
+++ b/README.md
@@ -39,14 +39,13 @@ Here's what you get:
 	* Auto completion suggests relevant words from your documents.
 	* Results are sorted by relevance to your search query.
 	* Highlighting shows you which parts of the document matched the query.
+	* Searching for similar documents ("More like this")
 * Email processing: Paperless adds documents from your email accounts.
 	* Configure multiple accounts and filters for each account.
 	* When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them or delete them.
 * Machine learning powered document matching.
 	* Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless.
 * A task processor that processes documents in parallel and also tells you when something goes wrong. On modern multi core systems, consumption is blazing fast.
-* Code cleanup in many, MANY areas. Some of the code from OG paperless was just overly complicated.
-* More tests, more stability.
 
 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).
 
@@ -54,10 +53,7 @@ For a complete list of changes from paperless, check out the [changelog](https:/
 
 # Roadmap for 1.0
 
-- **Bulk editing**. Add/remove metadata from multiple documents at once.
-
 - Make the front end nice (except mobile).
-- Test coverage at 90%.
 - Fix whatever bugs I and you find.
 
 ## Roadmap for versions beyond 1.0
@@ -66,7 +62,6 @@ These are things that I want to add to paperless eventually. They are sorted by
 
 - **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like:
   - Group and limit search results by correspondent, show “more from this” links in the results.
-  - Ability to search for “Similar documents” in the search results
 - **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system.
 - **An interactive consumer** that shows its progress for documents it processes on the web page.
 	- With live updates ans websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particular happy about.

From 544e8db722f7485361e758099c9408b82598eabd Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 17:08:30 +0100
Subject: [PATCH 0385/1300] error in test case

---
 src/documents/tests/test_api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index bce2a433d..494183d2d 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -896,7 +896,7 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         response = self.client.post("/api/documents/bulk_edit/", json.dumps({
             "documents": [self.doc2.id],
             "method": "add_tag",
-            "parameters": {'document_type': 345657}
+            "parameters": {'tag': 345657}
         }), content_type='application/json')
         self.assertEqual(response.status_code, 400)
 

From 7d676a75a84dbf1e82a044c0a1dd5569daa31537 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Tue, 22 Dec 2020 17:26:07 +0100
Subject: [PATCH 0386/1300] Update README.md

---
 README.md | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 526644685..978684d76 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 # Paperless-ng
 
-[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and others that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents.
+[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and contributors that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents.
 
 Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, have a look at the changelog in the documentation.
 
@@ -64,10 +64,10 @@ These are things that I want to add to paperless eventually. They are sorted by
   - Group and limit search results by correspondent, show “more from this” links in the results.
 - **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system.
 - **An interactive consumer** that shows its progress for documents it processes on the web page.
-	- With live updates ans websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particular happy about.
+	- With live updates and websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particularly happy about.
 	- Notifications when a document was added with buttons to open the new document right away.
 - **Arbitrary tag colors**. Allow the selection of any color with a color picker.
-- **More file types**. Possibly allow more file types to be processed by paperless, such as office .odt, .doc, .docx documents.
+- **More file types**. Possibly allow more file types to be processed by paperless, such as office .odt, .doc and .docx documents.
 
 Apart from that, paperless is pretty much feature complete.
 
@@ -75,6 +75,15 @@ Apart from that, paperless is pretty much feature complete.
 
 - **GnuPG encrypion.** [Here's a note about encryption in paperless](https://paperless-ng.readthedocs.io/en/latest/administration.html#managing-encryption). The gist of it is that I don't see which attacks this implementation protects against. It gives a false sense of security to users who don't care about how it works.
 
+## Wont-do list.
+
+These features will probably never make it into paperless, since paperless is meant to be an easy to use set-and-forget solution.
+
+- **Document versions.** I might consider adding the ability to update a document with a newer version, but that's about it. The kind of documents that get added to paperless usually don't change at all.
+- **Workflows.** I don't see a use case for these, yet.
+- **Folders.** Tags are superior in just about every way.
+- **Apps / extension support.** Again, paperless is meant to be simple.
+
 # Getting started
 
 The recommended way to deploy paperless is docker-compose. Don't clone the repository, grab the latest release to get started instead. The dockerfiles archive contains just the docker files which will pull the image from docker hub. The source archive contains everything you need to build the docker image yourself (i.e. if you want to run on Raspberry Pi).

From 50c5a23de8ae1cd86f15260b459972b27d1a1d32 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Tue, 22 Dec 2020 18:46:47 +0100
Subject: [PATCH 0387/1300] add basic ansible role for debian deployment

Currently only Debian 10 buster is supported.
Other Debian versions, Ubuntu and derivates should be easy to integrate.
Database deployment is considered out-of-scope and deferred to the user.
Provides basic upgrade support between releases.
---
 ansible/defaults/main.yml |  39 +++++
 ansible/tasks/main.yml    | 350 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 389 insertions(+)
 create mode 100644 ansible/defaults/main.yml
 create mode 100644 ansible/tasks/main.yml

diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml
new file mode 100644
index 000000000..0fa03b47a
--- /dev/null
+++ b/ansible/defaults/main.yml
@@ -0,0 +1,39 @@
+---
+paperlessng_version: 0.9.8
+paperlessng_directory: /opt/paperless-ng
+paperlessng_consumption_dir: "{{ paperlessng_directory }}/consumption"
+paperlessng_data_dir: "{{ paperlessng_directory }}/data"
+paperlessng_media_root: "{{ paperlessng_directory }}/media"
+paperlessng_static_dir: "{{ paperlessng_directory }}/static"
+paperlessng_filename_format:
+paperlessng_virtualenv: "{{ paperlessng_directory }}/.venv"
+
+paperlessng_ocr_languages:
+  - eng
+paperlessng_time_zone: Europe/Berlin
+paperlessng_ocrmypdf_args: --optimize 1
+# TODO Does optimze==1 really work with jbig2enc?
+# https://ocrmypdf.readthedocs.io/en/latest/jbig2.html#lossy-mode-jbig2
+# Documentation states -O1 only applies lossless transformations
+# https://ocrmypdf.readthedocs.io/en/latest/optimizer.html#lossless-optimizations
+paperlessng_use_jbig2enc: true
+
+paperlessng_superuser_name: paperlessng
+paperlessng_superuser_email: paperlessng@example.com
+paperlessng_superuser_password: paperlessng
+
+paperlessng_system_user: paperlessng
+paperlessng_system_group: paperlessng
+
+paperlessng_listen_address: 127.0.0.1
+paperlessng_listen_port: 8000
+
+paperlessng_redis_host: localhost
+paperlessng_redis_port: 6379
+
+paperlessng_db_type: sqlite # or postgresql
+paperlessng_db_host: localhost
+paperlessng_db_port: 5432
+paperlessng_db_name: paperlessng
+paperlessng_db_user: paperlessng
+paperlessng_db_pass: paperlessng
\ No newline at end of file
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
new file mode 100644
index 000000000..b427482b2
--- /dev/null
+++ b/ansible/tasks/main.yml
@@ -0,0 +1,350 @@
+---
+- name: verify operating system
+  fail:
+    msg: Sorry, only Debian 10 supported at the moment.
+  when: not(ansible_distribution == 'Debian' and ansible_distribution_version == '10')
+
+- name: install base dependencies
+  apt:
+    update_cache: yes
+    pkg:
+      # paperless-ng
+      - python3-dev
+      - python3-pip
+      - imagemagick
+      - unpaper
+      - ghostscript
+      - optipng
+      - tesseract-ocr
+      - gnupg
+      - libpoppler-cpp-dev
+      - libmagic-dev
+      - libpq-dev
+      # OCRmyPDF
+      - icc-profiles-free
+      - qpdf
+      - liblept5
+      - libxml2
+      - pngquant
+      - zlib1g
+      # dev
+      - build-essential
+      - python3-setuptools
+      - python3-wheel
+      - python3-virtualenv
+
+- name: install ocr languages
+  apt:
+    pkg: "{{ paperlessng_ocr_languages | map('regex_replace', '^(.*)$', 'tesseract-ocr-\\1') | list }}"
+
+- name: set up notesalexp repository key (for jbig2enc)
+  apt_key:
+    url: https://notesalexp.org/debian/alexp_key.asc
+    state: present
+  when: paperlessng_use_jbig2enc
+
+- name: set up notesalexp repository (for jbig2enc)
+  apt_repository:
+    repo: deb https://notesalexp.org/debian/buster/ buster main
+    state: present
+  when: paperlessng_use_jbig2enc
+
+- name: set up notesalexp repository pinning
+  copy:
+    content: |
+      Package: *
+      Pin: release o=notesalexp.org
+      Pin-Priority: 1
+
+      Package: jbig2enc
+      Pin: release o=notesalexp.org
+      Pin-Priority: 500
+    dest: /etc/apt/preferences.d/notesalexp
+  when: paperlessng_use_jbig2enc
+
+- name: install jbig2enc
+  apt:
+    pkg: jbig2enc
+    update_cache: yes
+  when: paperlessng_use_jbig2enc
+
+- name: install redis
+  apt:
+    pkg: redis-server
+  when: paperlessng_redis_host == 'localhost' or paperlessng_redis_host == '127.0.0.1'
+
+- name: enable redis
+  systemd:
+    name: redis-server
+    enabled: yes
+    masked: no
+    state: started
+  when: paperlessng_redis_host == 'localhost' or paperlessng_redis_host == '127.0.0.1'
+
+- name: check for paperless-ng installation
+  command:
+    cmd: 'grep -Po "(?<=Paperless-ng )\d+\.\d+\.\d+" {{ paperlessng_directory }}/docs/changelog.html'
+  changed_when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+  failed_when: false
+  ignore_errors: yes
+  register: paperlessng_current_version
+
+- name: backup current paperless-ng installation
+  copy:
+    src: "{{ paperlessng_directory }}"
+    dest: "{{ paperlessng_directory }}-{{ ansible_date_time.iso8601 }}/"
+    remote_src: yes
+  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+
+- name: download paperless-ng
+  get_url:
+    url: "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-{{ paperlessng_version }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
+    dest: /opt/paperless-ng-{{ paperlessng_version }}.tar.xz
+  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+
+- name: create paperless-ng directories
+  file:
+    path: "{{ item }}"
+    state: directory
+    owner: "{{ paperlessng_system_user }}"
+    group: "{{ paperlessng_system_group }}"
+    mode: 0750
+    recurse: yes
+  with_items:
+    - "{{ paperlessng_directory }}"
+    - "{{ paperlessng_consumption_dir }}"
+    - "{{ paperlessng_data_dir }}"
+    - "{{ paperlessng_media_root }}"
+    - "{{ paperlessng_static_dir }}"
+
+- name: create temporary directory
+  tempfile:
+    state: directory
+  register: tempdir
+  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+
+- name: extract paperless-ng
+  unarchive:
+    src: /opt/paperless-ng-{{ paperlessng_version }}.tar.xz
+    dest: "{{ tempdir.path }}"
+    remote_src: yes
+  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+
+- name: move paperless-ng
+  command:
+    cmd: "cp -R {{ tempdir.path }}/paperless-ng/. {{ paperlessng_directory }}"
+  args:
+    warn: false
+  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+
+- name: remove temporary directory
+  file:
+    path: "{{ tempdir.path }}"
+    state: absent
+  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+
+- name: configure paperless-ng
+  lineinfile:
+    path: "{{ paperlessng_directory }}/paperless.conf"
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+  with_items:
+    - regexp: "^#?PAPERLESS_REDIS="
+      line: "PAPERLESS_REDIS=redis://{{ paperlessng_redis_host }}:{{ paperlessng_redis_port }}"
+    - regexp: "^#?PAPERLESS_CONSUMPTION_DIR="
+      line: "PAPERLESS_CONSUMPTION_DIR={{ paperlessng_consumption_dir }}"
+    - regexp: "^#?PAPERLESS_DATA_DIR="
+      line: "PAPERLESS_DATA_DIR={{ paperlessng_data_dir }}"
+    - regexp: "^#?PAPERLESS_MEDIA_ROOT="
+      line: "PAPERLESS_MEDIA_ROOT={{ paperlessng_media_root }}"
+    - regexp: "^#?PAPERLESS_STATICDIR="
+      line: "PAPERLESS_STATICDIR={{ paperlessng_static_dir }}"
+    - regexp: "^#?PAPERLESS_FILENAME_FORMAT="
+      line: "PAPERLESS_FILENAME_FORMAT={{ paperlessng_filename_format }}"
+    - regexp: "^#?PAPERLESS_OCR_LANGUAGE="
+      line: "PAPERLESS_OCR_LANGUAGE={{ paperlessng_ocr_languages | join('+') }}"
+    - regexp: "^#PAPERLESS_OCR_USER_ARG="
+      # TODO JSON dict required in conf?
+      # https://paperless-ng.readthedocs.io/en/latest/configuration.html#ocr-settings
+      line: "PAPERLESS_OCR_USER_ARG=\"{{ paperlessng_ocrmypdf_args }}{{ ' --jbig2-lossy' if  paperlessng_use_jbig2enc else '' }}\""
+    - regexp: "^#?PAPERLESS_TIME_ZONE="
+      line: "PAPERLESS_TIME_ZONE={{ paperlessng_time_zone }}"
+  no_log: true
+
+- name: configure paperless-ng database [sqlite]
+  lineinfile:
+    path: "{{ paperlessng_directory }}/paperless.conf"
+    regexp: "^#?PAPERLESS_DBHOST="
+    state: absent
+  when: paperlessng_db_type == 'sqlite'
+
+- name: configure paperless-ng database [postgresql]
+  lineinfile:
+    path: "{{ paperlessng_directory }}/paperless.conf"
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+  with_items:
+    - regexp: "^#?PAPERLESS_DBHOST="
+      line: "PAPERLESS_DBHOST={{ paperlessng_db_host }}"
+    - regexp: "^#?PAPERLESS_DBPORT="
+      line: "PAPERLESS_DBPORT={{ paperlessng_db_port }}"
+    - regexp: "^#?PAPERLESS_DBNAME="
+      line: "PAPERLESS_DBNAME={{ paperlessng_db_name }}"
+    - regexp: "^#?PAPERLESS_DBUSER="
+      line: "PAPERLESS_DBUSER={{ paperlessng_db_user }}"
+    - regexp: "^#?PAPERLESS_DBPASS="
+      line: "PAPERLESS_DBPASS={{ paperlessng_db_pass }}"
+  when: paperlessng_db_type == 'postgresql'
+  no_log: true
+
+- name: create paperlessng venv
+  command:
+    cmd: "python3 -m virtualenv {{ paperlessng_virtualenv }} -p /usr/bin/python3"
+    creates: "{{ paperlessng_virtualenv }}"
+
+- name: install paperlessng requirements
+  pip:
+    requirements: "{{ paperlessng_directory }}/requirements.txt"
+    virtualenv: "{{ paperlessng_virtualenv }}"
+    extra_args: --upgrade
+
+- name: collect static files
+  command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py collectstatic --clear --no-input"
+
+- name: create database schema
+  command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py migrate"
+  register: database_schema
+  changed_when: '"No migrations to apply." not in database_schema.stdout'
+
+- name: create first paperless user
+  # "manage.py createsuperuser" only works on interactive TTYs
+  command: |
+    {{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py shell -c "
+    from django.contrib.auth.models import User
+    from django.contrib.auth.hashers import get_hasher
+
+    if User.objects.filter(username='{{ paperlessng_superuser_name }}').exists():
+        user = User.objects.get(username='{{ paperlessng_superuser_name }}')
+        old = user.__dict__.copy()
+
+        user.is_superuser = True
+        user.email = '{{ paperlessng_superuser_email }}'
+        user.set_password('{{ paperlessng_superuser_password }}')
+        user.save()
+        new = user.__dict__
+
+        algorithm, iterations, old_salt, old_hash = old['password'].split('$')
+        new_password_old_salt = get_hasher(algorithm).encode(password='{{ paperlessng_superuser_password }}', salt=old_salt, iterations=int(iterations))
+        _, _, _, new_hash = new_password_old_salt.split('$')
+        if not (old_hash == new_hash and old['is_superuser'] == new['is_superuser'] and old['email'] == new['email']):
+            print('changed')
+    else:
+        User.objects.create_superuser('{{ paperlessng_superuser_name }}', '{{ paperlessng_superuser_email }}', '{{ paperlessng_superuser_password }}')
+        print('changed')
+    "
+  register: superuser
+  changed_when: superuser.stdout == 'changed'
+  no_log: true
+
+- name: configure ghostscript for PDF
+  lineinfile:
+    path: "/etc/ImageMagick-6/policy.xml"
+    regexp: '<policy domain="coder" rights="none" pattern="PDF" />'
+    line: '<policy domain="coder" rights="read|write" pattern="PDF" />'
+
+- name: create paperless group
+  group:
+    name: "{{ paperlessng_system_group }}"
+
+- name: create paperless user
+  user:
+    name: "{{ paperlessng_system_user }}"
+    groups:
+      - "{{ paperlessng_system_group }}"
+    shell: /usr/sbin/nologin
+    # GNUPG_HOME required due to paperless db.py
+    create_home: yes
+
+- name: configure systemd services
+  ini_file:
+    path: "{{ paperlessng_directory }}/scripts/{{ item[0] }}"
+    section: "{{ item[1].section }}"
+    option: "{{ item[1].option  }}"
+    value: "{{ item[1].value }}"
+  with_nested:
+    - [
+        paperless-consumer.service,
+        paperless-scheduler.service,
+        paperless-webserver.service,
+      ]
+    - [
+        {
+          section: "Service",
+          option: "User",
+          value: "{{ paperlessng_system_user }}",
+        },
+        {
+          section: "Service",
+          option: "Group",
+          value: "{{ paperlessng_system_group }}",
+        },
+        {
+          section: "Service",
+          option: "WorkingDirectory",
+          value: "{{ paperlessng_directory }}/src",
+        },
+      ]
+
+- name: configure paperless-consumer service
+  ini_file:
+    path: "{{ paperlessng_directory }}/scripts/paperless-consumer.service"
+    section: "Service"
+    option: "ExecStart"
+    value: "{{ paperlessng_virtualenv }}/bin/python3 manage.py document_consumer"
+
+- name: configure paperless-scheduler service
+  ini_file:
+    path: "{{ paperlessng_directory }}/scripts/paperless-scheduler.service"
+    section: "Service"
+    option: "ExecStart"
+    value: "{{ paperlessng_virtualenv }}/bin/python3 manage.py qcluster"
+
+- name: configure paperless-webserver service
+  ini_file:
+    path: "{{ paperlessng_directory }}/scripts/paperless-webserver.service"
+    section: "Service"
+    option: "ExecStart"
+    value: "{{ paperlessng_virtualenv }}/bin/gunicorn paperless.wsgi -w 2 -b {{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}"
+
+- name: copy systemd services
+  copy:
+    src: "{{ paperlessng_directory }}/scripts/{{ item }}"
+    dest: "/etc/systemd/system/{{ item }}"
+    remote_src: yes
+  with_items:
+    - paperless-consumer.service
+    - paperless-scheduler.service
+    - paperless-webserver.service
+  register: paperless_services
+
+- name: reload systemd daemon
+  systemd:
+    name: "{{ item }}"
+    state: restarted
+    daemon_reload: yes
+  with_items:
+    - paperless-consumer
+    - paperless-scheduler
+    - paperless-webserver
+  when: paperless_services.changed
+
+- name: enable paperlessng services
+  systemd:
+    name: "{{ item }}"
+    enabled: yes
+    masked: no
+    state: started
+  with_items:
+    - paperless-consumer
+    - paperless-scheduler
+    - paperless-webserver

From e48294a74b18283ce4c60288eed907a1c0c8dbb1 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Tue, 22 Dec 2020 19:30:53 +0100
Subject: [PATCH 0388/1300] Update to 0.9.9

---
 ansible/defaults/main.yml |  5 +++--
 ansible/tasks/main.yml    | 14 ++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml
index 0fa03b47a..fbeef9871 100644
--- a/ansible/defaults/main.yml
+++ b/ansible/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-paperlessng_version: 0.9.8
+paperlessng_version: 0.9.9
 paperlessng_directory: /opt/paperless-ng
 paperlessng_consumption_dir: "{{ paperlessng_directory }}/consumption"
 paperlessng_data_dir: "{{ paperlessng_directory }}/data"
@@ -32,8 +32,9 @@ paperlessng_redis_host: localhost
 paperlessng_redis_port: 6379
 
 paperlessng_db_type: sqlite # or postgresql
+# Below entries only apply for paperlessng_db_type=='postgresql'
 paperlessng_db_host: localhost
 paperlessng_db_port: 5432
 paperlessng_db_name: paperlessng
 paperlessng_db_user: paperlessng
-paperlessng_db_pass: paperlessng
\ No newline at end of file
+paperlessng_db_pass: paperlessng
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index b427482b2..96b1e469b 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -169,7 +169,7 @@
       line: "PAPERLESS_OCR_USER_ARG=\"{{ paperlessng_ocrmypdf_args }}{{ ' --jbig2-lossy' if  paperlessng_use_jbig2enc else '' }}\""
     - regexp: "^#?PAPERLESS_TIME_ZONE="
       line: "PAPERLESS_TIME_ZONE={{ paperlessng_time_zone }}"
-  no_log: true
+  #no_log: true
 
 - name: configure paperless-ng database [sqlite]
   lineinfile:
@@ -209,17 +209,21 @@
     extra_args: --upgrade
 
 - name: collect static files
-  command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py collectstatic --clear --no-input"
+  command: "{{ paperlessng_virtualenv }}/bin/python3 manage.py collectstatic --clear --no-input"
+  args:
+    chdir: "{{ paperlessng_directory }}/src"
 
 - name: create database schema
-  command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py migrate"
+  command: "{{ paperlessng_virtualenv }}/bin/python3 manage.py migrate"
+  args:
+    chdir: "{{ paperlessng_directory }}/src"
   register: database_schema
   changed_when: '"No migrations to apply." not in database_schema.stdout'
 
 - name: create first paperless user
   # "manage.py createsuperuser" only works on interactive TTYs
   command: |
-    {{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py shell -c "
+    {{ paperlessng_virtualenv }}/bin/python3 manage.py shell -c "
     from django.contrib.auth.models import User
     from django.contrib.auth.hashers import get_hasher
 
@@ -242,6 +246,8 @@
         User.objects.create_superuser('{{ paperlessng_superuser_name }}', '{{ paperlessng_superuser_email }}', '{{ paperlessng_superuser_password }}')
         print('changed')
     "
+  args:
+    chdir: "{{ paperlessng_directory }}/src"
   register: superuser
   changed_when: superuser.stdout == 'changed'
   no_log: true

From e9b5f8d9f8384b08bc855eca2bcf7b705fd6b879 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 20:28:41 +0100
Subject: [PATCH 0389/1300] api validation, more tests

---
 src/documents/serialisers.py    | 47 +++++++++++++++++++++++++++++++++
 src/documents/tests/test_api.py | 14 +++++++++-
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index f9fde9ac8..d9f1833bf 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -246,8 +246,55 @@ class BulkEditSerializer(serializers.Serializer):
         else:
             raise serializers.ValidationError("Unsupported method.")
 
+    def _validate_parameters_tags(self, parameters):
+        if 'tag' in parameters:
+            tag_id = parameters['tag']
+            try:
+                Tag.objects.get(id=tag_id)
+            except Tag.DoesNotExist:
+                raise serializers.ValidationError("Tag does not exist")
+        else:
+            raise serializers.ValidationError("tag not specified")
+
+    def _validate_parameters_document_type(self, parameters):
+        if 'document_type' in parameters:
+            document_type_id = parameters['document_type']
+            if document_type_id is None:
+                # None is ok
+                return
+            try:
+                DocumentType.objects.get(id=document_type_id)
+            except DocumentType.DoesNotExist:
+                raise serializers.ValidationError(
+                    "Document type does not exist")
+        else:
+            raise serializers.ValidationError("document_type not specified")
+
+    def _validate_parameters_correspondent(self, parameters):
+        if 'correspondent' in parameters:
+            correspondent_id = parameters['correspondent']
+            if correspondent_id is None:
+                return
+            try:
+                Correspondent.objects.get(id=correspondent_id)
+            except Correspondent.DoesNotExist:
+                raise serializers.ValidationError(
+                    "Correspondent does not exist")
+        else:
+            raise serializers.ValidationError("correspondent not specified")
+
     def validate(self, attrs):
 
+        method = attrs['method']
+        parameters = attrs['parameters']
+
+        if method == bulk_edit.set_correspondent:
+            self._validate_parameters_correspondent(parameters)
+        elif method == bulk_edit.set_document_type:
+            self._validate_parameters_document_type(parameters)
+        elif method == bulk_edit.add_tag or method == bulk_edit.remove_tag:
+            self._validate_parameters_tags(parameters)
+
         return attrs
 
 
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 494183d2d..dc4d49d4e 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -669,6 +669,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(v1.filter_rules.count(), 0)
 
 
+
 class TestBulkEdit(DirectoriesMixin, APITestCase):
 
     def setUp(self):
@@ -891,7 +892,7 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         doc2 = Document.objects.get(id=self.doc2.id)
         self.assertEqual(doc2.document_type, self.dt1)
 
-    def test_api_invalid_tag(self):
+    def test_api_add_invalid_tag(self):
         self.assertEqual(list(self.doc2.tags.all()), [self.t1])
         response = self.client.post("/api/documents/bulk_edit/", json.dumps({
             "documents": [self.doc2.id],
@@ -901,3 +902,14 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 400)
 
         self.assertEqual(list(self.doc2.tags.all()), [self.t1])
+
+    def test_api_delete_invalid_tag(self):
+        self.assertEqual(list(self.doc2.tags.all()), [self.t1])
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc2.id],
+            "method": "remove_tag",
+            "parameters": {'tag': 345657}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+
+        self.assertEqual(list(self.doc2.tags.all()), [self.t1])

From b7c118afa3eac43ea22e50f2fddecc96d89674ef Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 22 Dec 2020 21:08:54 +0100
Subject: [PATCH 0390/1300] more tests

---
 src/documents/tests/test_api.py | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index dc4d49d4e..0262b6d6a 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -669,7 +669,6 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(v1.filter_rules.count(), 0)
 
 
-
 class TestBulkEdit(DirectoriesMixin, APITestCase):
 
     def setUp(self):
@@ -913,3 +912,28 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 400)
 
         self.assertEqual(list(self.doc2.tags.all()), [self.t1])
+
+
+class TestApiAuth(APITestCase):
+
+    def test_auth_required(self):
+
+        d = Document.objects.create(title="Test")
+
+        self.assertEqual(self.client.get("/api/documents/").status_code, 401)
+
+        self.assertEqual(self.client.get(f"/api/documents/{d.id}/").status_code, 401)
+        self.assertEqual(self.client.get(f"/api/documents/{d.id}/download/").status_code, 401)
+        self.assertEqual(self.client.get(f"/api/documents/{d.id}/preview/").status_code, 401)
+        self.assertEqual(self.client.get(f"/api/documents/{d.id}/thumb/").status_code, 401)
+
+        self.assertEqual(self.client.get("/api/tags/").status_code, 401)
+        self.assertEqual(self.client.get("/api/correspondents/").status_code, 401)
+        self.assertEqual(self.client.get("/api/document_types/").status_code, 401)
+
+        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/documents/bulk_edit/").status_code, 401)

From 9c2c74ad2b67bdfcf8c2b74a76fd82ff2ff9e5f9 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Wed, 23 Dec 2020 01:51:38 +0100
Subject: [PATCH 0391/1300] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 978684d76..214f90b6f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/jonaswinkler/paperless-ng.svg?branch=master)](https://travis-ci.org/jonaswinkler/paperless-ng)
 [![Documentation Status](https://readthedocs.org/projects/paperless-ng/badge/?version=latest)](https://paperless-ng.readthedocs.io/en/latest/?badge=latest)
 [![Docker Hub Pulls](https://img.shields.io/docker/pulls/jonaswinkler/paperless-ng.svg)](https://hub.docker.com/r/jonaswinkler/paperless-ng)
-[![Coverage Status](https://coveralls.io/repos/github/jonaswinkler/paperless-ng/badge.svg?branch=master)](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/jonaswinkler/paperless-ng/badge.svg?branch=master)](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master)  *<sup><-- green badge, yay :)</sup>*
 
 # Paperless-ng
 

From 6589369e1b62505d79801ca8d496e6e6c6950151 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Wed, 23 Dec 2020 02:29:58 +0100
Subject: [PATCH 0392/1300] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 214f90b6f..1806fd4bb 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,7 @@ These are things that I want to add to paperless eventually. They are sorted by
 - **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like:
   - Group and limit search results by correspondent, show “more from this” links in the results.
 - **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system.
+- **Localization.** I won't translate paperless into any other languages except English and German, however, I'll add the necessary means so that anyone can translate paperless into their favorite language.
 - **An interactive consumer** that shows its progress for documents it processes on the web page.
 	- With live updates and websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particularly happy about.
 	- Notifications when a document was added with buttons to open the new document right away.

From ccfa14b9b7c48ed60fc49ce64d673dde02edb308 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 23 Dec 2020 09:14:40 +0100
Subject: [PATCH 0393/1300] Remove arm32v6 from docker manifest , it is not
 getting created

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8422229c7..281635ace 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,7 +110,7 @@ jobs:
         - true
       script:
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-        - docker manifest create ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v6
+        - docker manifest create ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
         - docker manifest annotate ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 --os linux --arch arm --variant v7
         - docker manifest annotate ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 --os linux --arch arm64 --variant v8
         - docker manifest push --purge ${DOCKER_REPO}:${TRAVIS_COMMIT}
@@ -124,7 +124,7 @@ jobs:
         - |
           if [ "${DOCKER_TAG}" != "" ]; then
             echo "Create Tag ${DOCKER_TAG}"
-            docker manifest create ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v6
+            docker manifest create ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
             docker manifest annotate ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 --os linux --arch arm --variant v7
             docker manifest annotate ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 --os linux --arch arm64 --variant v8
             docker manifest push --purge ${DOCKER_REPO}:${DOCKER_TAG}

From 8135de49f00e01170c1450f380fb1789626d68af Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 23 Dec 2020 12:13:12 +0100
Subject: [PATCH 0394/1300] Re-enable test steps

---
 .travis.yml | 55 ++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 281635ace..e5f3cd91e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,33 +5,33 @@ os: linux
 
 jobs:
   include:
-#    - name: "Paperless on Python 3.6"
-#      python: "3.6"
-#
-#    - name: "Paperless on Python 3.7"
-#      python: "3.7"
-#
-#    - name: "Paperless on Python 3.8"
-#      python: "3.8"
-#
-#    - name: "Documentation"
-#      script:
-#        - cd docs/
-#        - make html
-#      after_success: true
-#
-#    - name: "Front end"
-#      language: node_js
-#      node_js:
-#        - 15
-#      before_install: true
-#      install:
-#        - cd src-ui/
-#        - npm install -g @angular/cli
-#        - npm install
-#      script:
-#        - ng build --prod
-#      after_success: true
+    - name: "Paperless on Python 3.6"
+      python: "3.6"
+
+    - name: "Paperless on Python 3.7"
+      python: "3.7"
+
+    - name: "Paperless on Python 3.8"
+      python: "3.8"
+
+    - name: "Documentation"
+      script:
+        - cd docs/
+        - make html
+      after_success: true
+
+    - name: "Front end"
+      language: node_js
+      node_js:
+        - 15
+      before_install: true
+      install:
+        - cd src-ui/
+        - npm install -g @angular/cli
+        - npm install
+      script:
+        - ng build --prod
+      after_success: true
 
     - stage: build_docker
       name: amd64 docker build
@@ -60,7 +60,6 @@ jobs:
       after_success:
         - true
       script:
-        - uname -a
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .

From 92fa97873543cbd499ceaca8787765f231027071 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Wed, 23 Dec 2020 13:30:09 +0100
Subject: [PATCH 0395/1300] Allow running role on all Debian releases

Dynamically template current release string where required.
---
 ansible/tasks/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index 96b1e469b..5b0bb5802 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
 - name: verify operating system
   fail:
-    msg: Sorry, only Debian 10 supported at the moment.
-  when: not(ansible_distribution == 'Debian' and ansible_distribution_version == '10')
+    msg: Sorry, only Debian supported at the moment.
+  when: ansible_distribution != 'Debian'
 
 - name: install base dependencies
   apt:
@@ -45,7 +45,7 @@
 
 - name: set up notesalexp repository (for jbig2enc)
   apt_repository:
-    repo: deb https://notesalexp.org/debian/buster/ buster main
+    repo: "deb https://notesalexp.org/debian/{{ ansible_distribution_release }}/ {{ ansible_distribution_release }} main"
     state: present
   when: paperlessng_use_jbig2enc
 
@@ -169,7 +169,7 @@
       line: "PAPERLESS_OCR_USER_ARG=\"{{ paperlessng_ocrmypdf_args }}{{ ' --jbig2-lossy' if  paperlessng_use_jbig2enc else '' }}\""
     - regexp: "^#?PAPERLESS_TIME_ZONE="
       line: "PAPERLESS_TIME_ZONE={{ paperlessng_time_zone }}"
-  #no_log: true
+  no_log: true
 
 - name: configure paperless-ng database [sqlite]
   lineinfile:

From 089a8c0498c1e3264209284a7f5804c093b7d3d2 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Wed, 23 Dec 2020 13:39:16 +0100
Subject: [PATCH 0396/1300] Fix fresh installation

We can't backup a nonexistent folder.
---
 ansible/tasks/main.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index 5b0bb5802..ba83b4975 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -81,6 +81,19 @@
     state: started
   when: paperlessng_redis_host == 'localhost' or paperlessng_redis_host == '127.0.0.1'
 
+- name: create paperless group
+  group:
+    name: "{{ paperlessng_system_group }}"
+
+- name: create paperless user
+  user:
+    name: "{{ paperlessng_system_user }}"
+    groups:
+      - "{{ paperlessng_system_group }}"
+    shell: /usr/sbin/nologin
+    # GNUPG_HOME required due to paperless db.py
+    create_home: yes
+
 - name: check for paperless-ng installation
   command:
     cmd: 'grep -Po "(?<=Paperless-ng )\d+\.\d+\.\d+" {{ paperlessng_directory }}/docs/changelog.html'
@@ -94,7 +107,7 @@
     src: "{{ paperlessng_directory }}"
     dest: "{{ paperlessng_directory }}-{{ ansible_date_time.iso8601 }}/"
     remote_src: yes
-  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+  when: '"No such file or directory" not in paperlessng_current_version.stderr and paperlessng_current_version.stdout != paperlessng_version | string'
 
 - name: download paperless-ng
   get_url:
@@ -258,19 +271,6 @@
     regexp: '<policy domain="coder" rights="none" pattern="PDF" />'
     line: '<policy domain="coder" rights="read|write" pattern="PDF" />'
 
-- name: create paperless group
-  group:
-    name: "{{ paperlessng_system_group }}"
-
-- name: create paperless user
-  user:
-    name: "{{ paperlessng_system_user }}"
-    groups:
-      - "{{ paperlessng_system_group }}"
-    shell: /usr/sbin/nologin
-    # GNUPG_HOME required due to paperless db.py
-    create_home: yes
-
 - name: configure systemd services
   ini_file:
     path: "{{ paperlessng_directory }}/scripts/{{ item[0] }}"

From 227934a7f0941e76c8c6b51f552aea25ab2e3222 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Wed, 23 Dec 2020 14:05:35 +0100
Subject: [PATCH 0397/1300] Do not clear static files on every run

Django collectstatic knows when files change.
---
 ansible/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index ba83b4975..9c8fd67f5 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -222,7 +222,7 @@
     extra_args: --upgrade
 
 - name: collect static files
-  command: "{{ paperlessng_virtualenv }}/bin/python3 manage.py collectstatic --clear --no-input"
+  command: "{{ paperlessng_virtualenv }}/bin/python3 manage.py collectstatic --no-input"
   args:
     chdir: "{{ paperlessng_directory }}/src"
 

From 95c4e77ae4954b7dea91c304f9226e488204dce8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 23 Dec 2020 15:09:39 +0100
Subject: [PATCH 0398/1300] added many localization markers to the front end
 #123

---
 .../app-frame/app-frame.component.html        | 56 +++++++----------
 .../dashboard/dashboard.component.html        |  2 +-
 .../dashboard/dashboard.component.ts          |  6 +-
 .../saved-view-widget.component.html          |  6 +-
 .../statistics-widget.component.html          |  6 +-
 .../upload-file-widget.component.html         |  8 +--
 .../upload-file-widget.component.ts           |  6 +-
 .../welcome-widget.component.html             | 14 ++---
 .../document-detail.component.html            | 63 +++++++++----------
 .../document-detail.component.ts              |  8 +--
 .../document-card-large.component.html        | 20 +++---
 .../document-card-small.component.html        | 10 +--
 .../document-list.component.html              | 20 +++---
 .../document-list/document-list.component.ts  |  6 +-
 .../save-view-config-dialog.component.html    | 12 ++--
 .../correspondent-edit-dialog.component.html  | 12 ++--
 .../correspondent-list.component.html         | 25 +++-----
 .../document-type-edit-dialog.component.html  | 12 ++--
 .../document-type-list.component.html         | 21 +++----
 .../generic-list/generic-list.component.ts    | 10 +--
 .../manage/logs/logs.component.html           |  7 ++-
 .../manage/settings/settings.component.html   | 22 +++----
 .../manage/settings/settings.component.ts     |  6 +-
 .../not-found/not-found.component.html        |  2 +-
 .../components/search/search.component.html   |  2 +-
 src-ui/src/app/data/matching-model.ts         | 12 ++--
 .../src/app/services/rest/document.service.ts | 14 ++---
 27 files changed, 178 insertions(+), 210 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 2458005f4..5fe42fc40 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -1,7 +1,7 @@
 <nav class="navbar navbar-dark sticky-top bg-primary flex-md-nowrap p-0 shadow">
   <span class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" href="#">
     <img src="assets/logo-dark-notext.svg" height="18px" class="mr-2">
-    Paperless-ng
+    <ng-container i18n="app title">Paperless-ng</ng-container>
   </span>
   <button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-toggle="collapse"
     data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"
@@ -9,8 +9,8 @@
     <span class="navbar-toggler-icon"></span>
   </button>
   <form (ngSubmit)="search()" class="w-100 m-1">
-    <input class="form-control form-control-dark" type="text" placeholder="Search" aria-label="Search"
-      [formControl]="searchField" [ngbTypeahead]="searchAutoComplete" (selectItem)="itemSelected($event)">
+    <input class="form-control form-control-dark" type="text" placeholder="Search for documents" aria-label="Search"
+      [formControl]="searchField" [ngbTypeahead]="searchAutoComplete" (selectItem)="itemSelected($event)" i18n-placeholder>
   </form>
 </nav>
 
@@ -28,136 +28,122 @@
             <a class="nav-link" routerLink="dashboard" routerLinkActive="active" (click)="closeMenu()">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#house"/>
-              </svg>
-              Dashboard
+              </svg>&nbsp;<ng-container i18n>Dashboard</ng-container>
             </a>
           </li>
           <li class="nav-item">
             <a class="nav-link" routerLink="documents" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}" (click)="closeMenu()">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#files"/>
-              </svg>
-              Documents
+              </svg>&nbsp;<ng-container i18n>Documents</ng-container>
             </a>
           </li>
         </ul>
 
         <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted" *ngIf='savedViewService.sidebarViews.length > 0'>
-          <span>Saved views</span>
+          <ng-container i18n>Saved views</ng-container>
         </h6>
         <ul class="nav flex-column mb-2">
           <li class="nav-item w-100" *ngFor="let view of savedViewService.sidebarViews">
             <a class="nav-link text-truncate" routerLink="view/{{view.id}}" routerLinkActive="active" (click)="closeMenu()">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#funnel"/>
-              </svg>
-              {{view.name}}
+              </svg>&nbsp;{{view.name}}
             </a>
           </li>
         </ul>
 
         <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted" *ngIf='openDocuments.length > 0'>
-          <span>Open documents</span>
+          <ng-container i18n>Open documents</ng-container>
         </h6>
         <ul class="nav flex-column mb-2">
           <li class="nav-item w-100" *ngFor='let d of openDocuments'>
             <a class="nav-link text-truncate" routerLink="documents/{{d.id}}" routerLinkActive="active" (click)="closeMenu()">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#file-text"/>
-              </svg>
-              {{d.title | documentTitle}}
+              </svg>&nbsp;{{d.title | documentTitle}}
             </a>
           </li>
           <li class="nav-item w-100" *ngIf="openDocuments.length > 1">
             <a class="nav-link text-truncate" [routerLink]="" (click)="closeAll()">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#x"/>
-              </svg>
-              Close all
+              </svg>&nbsp;<ng-container i18n>Close all</ng-container>
             </a>
           </li>
         </ul>
 
         <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
-          <span>Manage</span>
+          <ng-container i18n>Manage</ng-container>
         </h6>
         <ul class="nav flex-column mb-2">
           <li class="nav-item">
             <a class="nav-link" routerLink="correspondents" routerLinkActive="active" (click)="closeMenu()">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#person"/>
-              </svg>
-              Correspondents
+              </svg>&nbsp;<ng-container i18n>Correspondents</ng-container>
             </a>
           </li>
           <li class="nav-item">
             <a class="nav-link" routerLink="tags" routerLinkActive="active" (click)="closeMenu()">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#tags"/>
-              </svg>
-              Tags
+              </svg>&nbsp;<ng-container i18n>Tags</ng-container>
             </a>
           </li>
           <li class="nav-item">
             <a class="nav-link" routerLink="documenttypes" routerLinkActive="active" (click)="closeMenu()">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#hash"/>
-              </svg>
-              Document types
+              </svg>&nbsp;<ng-container i18n>Document types</ng-container>
             </a>
           </li>
           <li class="nav-item">
             <a class="nav-link" routerLink="logs" routerLinkActive="active" (click)="closeMenu()">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#text-left"/>
-              </svg>
-              Logs
+              </svg>&nbsp;<ng-container i18n>Logs</ng-container>
             </a>
           </li>
           <li class="nav-item">
             <a class="nav-link" routerLink="settings" routerLinkActive="active" (click)="closeMenu()">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#gear"/>
-              </svg>
-              Settings
+              </svg>&nbsp;<ng-container i18n>Settings</ng-container>
             </a>
           </li>
           <li class="nav-item">
             <a class="nav-link" href="admin/">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#toggles"/>
-              </svg>
-              Admin
+              </svg>&nbsp;<ng-container i18n>Admin</ng-container>
             </a>
           </li>
         </ul>
 
         <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
-          <span>Misc</span>
+          <ng-container i18n>Misc</ng-container>
         </h6>
         <ul class="nav flex-column mb-2">
           <li class="nav-item">
             <a class="nav-link" target="_blank" rel="noopener noreferrer" href="https://paperless-ng.readthedocs.io/en/latest/">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#question-circle"/>
-              </svg>
-              Documentation
+              </svg>&nbsp;<ng-container i18n>Documentation</ng-container>
             </a>
           </li>
           <li class="nav-item">
             <a class="nav-link" target="_blank" rel="noopener noreferrer" href="https://github.com/jonaswinkler/paperless-ng">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#link"/>
-              </svg>
-              GitHub
+              </svg>&nbsp;<ng-container i18n>GitHub</ng-container>
             </a>
           </li>
           <li class="nav-item">
             <a class="nav-link" href="accounts/logout/">
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#door-open"/>
-              </svg>
-              Logout
+              </svg>&nbsp;<ng-container i18n>Logout</ng-container>
             </a>
           </li>
         </ul>
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 541255a68..5b76dd242 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -1,4 +1,4 @@
-<app-page-header title="Dashboard" [subTitle]="subtitle">
+<app-page-header title="Dashboard" [subTitle]="subtitle" i18n-title>
   <img src="assets/logo.svg" height="80" class="m-2 d-none d-md-block">
 </app-page-header>
 
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts
index db9b5d425..0dca25d8a 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.ts
+++ b/src-ui/src/app/components/dashboard/dashboard.component.ts
@@ -24,15 +24,15 @@ export class DashboardComponent implements OnInit {
     } else if (tagUsername && tagUsername.content) {
       return tagUsername.content
     } else {
-      return null
+      return "null"
     }
   }
 
   get subtitle() {
     if (this.displayName) {
-      return `Hello ${this.displayName}, welcome to Paperless-ng!`
+      return $localize`Hello ${this.displayName}, welcome to Paperless-ng!`
     } else {
-      return `Welcome to Paperless-ng!`
+      return $localize`Welcome to Paperless-ng!`
     }
   }
 
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
index f50708af3..1bf06b60f 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
@@ -1,13 +1,13 @@
 <app-widget-frame [title]="savedView.name">
 
-  <a header-buttons [routerLink]="" (click)="showAll()">Show all</a>
+  <a header-buttons [routerLink]="" (click)="showAll()" i18n>Show all</a>
 
 
   <table content class="table table-sm table-hover table-borderless">
     <thead>
       <tr>
-        <th>Created</th>
-        <th scope="col">Title</th>
+        <th i18n>Created</th>
+        <th scope="col" i18n>Title</th>
       </tr>
     </thead>
     <tbody>
diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html
index 50d844b36..0ad0005ea 100644
--- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html
@@ -1,6 +1,6 @@
-<app-widget-frame title="Statistics">
+<app-widget-frame title="Statistics" i18n-title>
   <ng-container content>
-    <p class="card-text">Documents in inbox: {{statistics.documents_inbox}}</p>
-    <p class="card-text">Total documents: {{statistics.documents_total}}</p>
+    <p class="card-text" i18n>Documents in inbox: {{statistics.documents_inbox}}</p>
+    <p class="card-text" i18n>Total documents: {{statistics.documents_total}}</p>
   </ng-container>
 </app-widget-frame>
\ No newline at end of file
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index 013486a47..91fff4e83 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -1,16 +1,16 @@
-<app-widget-frame title="Upload new documents">
+<app-widget-frame title="Upload new documents" i18n-title>
 
   <div content>
     <form>
-      <ngx-file-drop dropZoneLabel="Drop documents here or" (onFileDrop)="dropped($event)"
+      <ngx-file-drop dropZoneLabel="Drop documents here or" browseBtnLabel="Browse files" (onFileDrop)="dropped($event)"
         (onFileOver)="fileOver($event)" (onFileLeave)="fileLeave($event)" dropZoneClassName="bg-light card"
         multiple="true" contentClassName="justify-content-center d-flex align-items-center p-5" [showBrowseBtn]=true
-        browseBtnClassName="btn btn-sm btn-outline-primary ml-2">
+        browseBtnClassName="btn btn-sm btn-outline-primary ml-2" i18n-dropZoneLabel i18n-browseBtnLabel>
 
       </ngx-file-drop>
     </form>
     <div *ngIf="uploadVisible" class="mt-3">
-      <p>Uploading {{uploadStatus.length}} file(s)</p>
+      <p i18n>Uploading {{uploadStatus.length}} file(s)</p>
       <ngb-progressbar [value]="loadedSum" [max]="totalSum" [striped]="true" [animated]="uploadStatus.length > 0">
       </ngb-progressbar>
     </div>
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index 2ea4825f1..b80f9544e 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -60,7 +60,7 @@ export class UploadFileWidgetComponent implements OnInit {
             } else if (event.type == HttpEventType.Response) {
               this.uploadStatus.splice(this.uploadStatus.indexOf(uploadStatusObject), 1)
               this.completedFiles += 1
-              this.toastService.showToast(Toast.make("Information", "The document has been uploaded and will be processed by the consumer shortly."))
+              this.toastService.showToast(Toast.make("Information", $localize`The document has been uploaded and will be processed by the consumer shortly.`))
             }
             
           }, error => {
@@ -68,11 +68,11 @@ export class UploadFileWidgetComponent implements OnInit {
             this.completedFiles += 1
             switch (error.status) {
               case 400: {
-                this.toastService.showToast(Toast.makeError(`There was an error while uploading the document: ${error.error.document}`))
+                this.toastService.showToast(Toast.makeError($localize`There was an error while uploading the document: ${error.error.document}`))
                 break;
               }
               default: {
-                this.toastService.showToast(Toast.makeError("An error has occurred while uploading the document. Sorry!"))
+                this.toastService.showToast(Toast.makeError($localize`An error has occurred while uploading the document. Sorry!`))
                 break;
               }
             }
diff --git a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html
index 0caf55f11..6c9c34d5b 100644
--- a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html
@@ -1,16 +1,16 @@
-<app-widget-frame title="First steps">
+<app-widget-frame title="First steps" i18n-title>
 
   <ng-container content>
     <img src="assets/save-filter.png" class="float-right">
-    <p>Paperless is running! :)</p>
-    <p>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list.
+    <p i18n>Paperless is running! :)</p>
+    <p i18n>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list.
       After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and have them displayed on the dashboard instead of this message.</p>
-    <p>Paperless offers some more features that try to make your life easier, such as:</p>
+    <p i18n>Paperless offers some more features that try to make your life easier, such as:</p>
     <ul>
-      <li>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</li>
-      <li>You can configure paperless to read your mails and add documents from attached files.</li>
+      <li i18n>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</li>
+      <li i18n>You can configure paperless to read your mails and add documents from attached files.</li>
     </ul>
-    <p>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</p>
+    <p i18n>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</p>
   </ng-container>
 
 </app-widget-frame>
\ No newline at end of file
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index ae3fb0c0a..f569c1033 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -1,19 +1,18 @@
 <app-page-header [(title)]="title">
     <div class="input-group input-group-sm mr-5" *ngIf="getContentType() == 'application/pdf'">
       <div class="input-group-prepend">
-        <div class="input-group-text">Page </div>
+        <div class="input-group-text" i18n>Page</div>
       </div>
       <input class="form-control flex-grow-0 w-auto" type="number" min="1" [max]="previewNumPages" [(ngModel)]="previewCurrentPage" />
       <div class="input-group-append">
-        <div class="input-group-text">of {{previewNumPages}}</div>
+        <div class="input-group-text" i18n>of {{previewNumPages}}</div>
       </div>
     </div>
 
     <button type="button" class="btn btn-sm btn-outline-danger mr-2" (click)="delete()">
         <svg class="buttonicon" fill="currentColor">
             <use xlink:href="assets/bootstrap-icons.svg#trash" />
-        </svg>
-        <span class="d-none d-lg-inline"> Delete</span>
+        </svg>&nbsp;<span class="d-none d-lg-inline" i18n>Delete</span>
     </button>
 
     <div class="btn-group mr-2">
@@ -21,14 +20,13 @@
         <a [href]="downloadUrl" class="btn btn-sm btn-outline-primary">
             <svg class="buttonicon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#download" />
-            </svg>
-            <span class="d-none d-lg-inline"> Download</span>
+            </svg>&nbsp;<span class="d-none d-lg-inline" i18n>Download</span>
         </a>
 
         <div class="btn-group" ngbDropdown role="group" *ngIf="metadata?.has_archive_version">
             <button class="btn btn-sm btn-outline-primary dropdown-toggle-split" ngbDropdownToggle></button>
             <div class="dropdown-menu shadow" ngbDropdownMenu>
-                <a ngbDropdownItem [href]="downloadOriginalUrl">Download original</a>
+                <a ngbDropdownItem [href]="downloadOriginalUrl" i18n>Download original</a>
             </div>
         </div>
 
@@ -37,15 +35,13 @@
     <button type="button" class="btn btn-sm btn-outline-primary mr-2" (click)="moreLike()">
         <svg class="buttonicon" fill="currentColor">
             <use xlink:href="assets/bootstrap-icons.svg#three-dots" />
-        </svg>
-        <span class="d-none d-lg-inline"> More like this</span>
+        </svg>&nbsp;<span class="d-none d-lg-inline" i18n>More like this</span>
     </button>
 
     <button type="button" class="btn btn-sm btn-outline-primary" (click)="close()">
         <svg class="buttonicon" fill="currentColor">
             <use xlink:href="assets/bootstrap-icons.svg#x" />
-        </svg>
-        <span class="d-none d-lg-inline"> Close</span>
+        </svg>&nbsp;<span class="d-none d-lg-inline" i18n>Close</span>
     </button>
 </app-page-header>
 
@@ -57,27 +53,27 @@
 
             <ul ngbNav #nav="ngbNav" class="nav-tabs">
                 <li [ngbNavItem]="1">
-                    <a ngbNavLink>Details</a>
+                    <a ngbNavLink i18n>Details</a>
                     <ng-template ngbNavContent>
 
-                        <app-input-text title="Title" formControlName="title"></app-input-text>
+                        <app-input-text i18n-title title="Title" formControlName="title"></app-input-text>
                         <div class="form-group">
-                            <label for="archive_serial_number">Archive Serial Number</label>
+                            <label for="archive_serial_number" i18n>Archive Serial Number</label>
                             <input type="number" class="form-control" id="archive_serial_number"
                                 formControlName='archive_serial_number'>
                         </div>
-                        <app-input-date-time titleDate="Date created" formControlName="created"></app-input-date-time>
-                        <app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent" [allowNull]="true"
+                        <app-input-date-time i18n-titleDate titleDate="Date created" formControlName="created"></app-input-date-time>
+                        <app-input-select [items]="correspondents" i18n-title title="Correspondent" formControlName="correspondent" [allowNull]="true"
                             (createNew)="createCorrespondent()"></app-input-select>
-                        <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type" [allowNull]="true"
+                        <app-input-select [items]="documentTypes" i18n-title title="Document type" formControlName="document_type" [allowNull]="true"
                             (createNew)="createDocumentType()"></app-input-select>
-                        <app-input-tags formControlName="tags" title="Tags"></app-input-tags>
+                        <app-input-tags formControlName="tags" i18n-title title="Tags"></app-input-tags>
 
                     </ng-template>
                 </li>
 
                 <li [ngbNavItem]="2">
-                    <a ngbNavLink>Content</a>
+                    <a ngbNavLink i18n>Content</a>
                     <ng-template ngbNavContent>
                         <div class="form-group">
                             <textarea class="form-control" id="content" rows="20" formControlName='content'></textarea>
@@ -86,48 +82,48 @@
                 </li>
 
                 <li [ngbNavItem]="3">
-                    <a ngbNavLink>Metadata</a>
+                    <a ngbNavLink i18n>Metadata</a>
                     <ng-template ngbNavContent>
 
                         <table class="table table-borderless">
                             <tbody>
                                 <tr>
-                                    <td>Date modified</td>
+                                    <td i18n>Date modified</td>
                                     <td>{{document.modified | date:'medium'}}</td>
                                 </tr>
                                 <tr>
-                                    <td>Date added</td>
+                                    <td i18n>Date added</td>
                                     <td>{{document.added | date:'medium'}}</td>
                                 </tr>
                                 <tr>
-                                    <td>Media filename</td>
+                                    <td i18n>Media filename</td>
                                     <td>{{metadata?.media_filename}}</td>
                                 </tr>
                                 <tr>
-                                    <td>Original MD5 Checksum</td>
+                                    <td i18n>Original MD5 checksum</td>
                                     <td>{{metadata?.original_checksum}}</td>
                                 </tr>
                                 <tr>
-                                    <td>Original file size</td>
+                                    <td i18n>Original file size</td>
                                     <td>{{metadata?.original_size | fileSize}}</td>
                                 </tr>
                                 <tr>
-                                    <td>Original mime type</td>
+                                    <td i18n>Original mime type</td>
                                     <td>{{metadata?.original_mime_type}}</td>
                                 </tr>
                                 <tr *ngIf="metadata?.has_archive_version">
-                                    <td>Archive MD5 Checksum</td>
+                                    <td i18n>Archive MD5 checksum</td>
                                     <td>{{metadata?.archive_checksum}}</td>
                                 </tr>
                                 <tr *ngIf="metadata?.has_archive_version">
-                                    <td>Archive file size</td>
+                                    <td i18n>Archive file size</td>
                                     <td>{{metadata?.archive_size | fileSize}}</td>
                                 </tr>
                             </tbody>
                         </table>
 
-                        <app-metadata-collapse title="Original document metadata" [metadata]="metadata.original_metadata" *ngIf="metadata?.original_metadata?.length > 0"></app-metadata-collapse>
-                        <app-metadata-collapse title="Archived document metadata" [metadata]="metadata.archive_metadata" *ngIf="metadata?.archive_metadata?.length > 0"></app-metadata-collapse>
+                        <app-metadata-collapse i18n-title title="Original document metadata" [metadata]="metadata.original_metadata" *ngIf="metadata?.original_metadata?.length > 0"></app-metadata-collapse>
+                        <app-metadata-collapse i18n-title title="Archived document metadata" [metadata]="metadata.archive_metadata" *ngIf="metadata?.archive_metadata?.length > 0"></app-metadata-collapse>
 
                     </ng-template>
                 </li>
@@ -135,10 +131,9 @@
 
             <div [ngbNavOutlet]="nav" class="mt-2"></div>
 
-            <button type="button" class="btn btn-outline-secondary" (click)="discard()">Discard</button>&nbsp;
-            <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()">Save & edit
-                next</button>&nbsp;
-            <button type="submit" class="btn btn-primary">Save</button>&nbsp;
+            <button type="button" class="btn btn-outline-secondary" (click)="discard()" i18n>Discard</button>&nbsp;
+            <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()" i18n>Save & edit next</button>&nbsp;
+            <button type="submit" class="btn btn-primary" i18n>Save</button>&nbsp;
         </form>
     </div>
 
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index d705c3176..2efd32f27 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -158,11 +158,11 @@ export class DocumentDetailComponent implements OnInit {
 
   delete() {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm delete"
-    modal.componentInstance.messageBold = `Do you really want to delete document '${this.document.title}'?`
-    modal.componentInstance.message = `The files for this document will be deleted permanently. This operation cannot be undone.`
+    modal.componentInstance.title = $localize`Confirm delete`
+    modal.componentInstance.messageBold = $localize`Do you really want to delete document '${this.document.title}'?`
+    modal.componentInstance.message = $localize`The files for this document will be deleted permanently. This operation cannot be undone.`
     modal.componentInstance.btnClass = "btn-danger"
-    modal.componentInstance.btnCaption = "Delete document"
+    modal.componentInstance.btnCaption = $localize`Delete document`
     modal.componentInstance.confirmClicked.subscribe(() => {
       this.documentsService.delete(this.document).subscribe(() => {
         modal.close()
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index 8f52f707f..ac015cc52 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -17,11 +17,11 @@
         <div class="d-flex justify-content-between align-items-center">
           <h5 class="card-title">
             <ng-container *ngIf="document.correspondent">
-              <a *ngIf="clickCorrespondent.observers.length ; else nolink" [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>
+              <a *ngIf="clickCorrespondent.observers.length ; else nolink" [routerLink]="" title="Filter by correspondent" i18n-title (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>
               <ng-template #nolink>{{(document.correspondent$ | async)?.name}}</ng-template>:
             </ng-container>
             {{document.title | documentTitle}}
-            <app-tag [tag]="t" linkTitle="Filter by tag" *ngFor="let t of document.tags$ | async" class="ml-1" (click)="clickTag.emit(t.id)" [clickable]="clickTag.observers.length"></app-tag>
+            <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)" [clickable]="clickTag.observers.length"></app-tag>
           </h5>
           <h5 class="card-title" *ngIf="document.archive_serial_number">#{{document.archive_serial_number}}</h5>
         </div>
@@ -36,37 +36,33 @@
             <a routerLink="/search" [queryParams]="{'more_like': document.id}" class="btn btn-sm btn-outline-secondary" *ngIf="moreLikeThis">
               <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>
-              More like this
+              </svg>&nbsp;<ng-container i18n>More like this</ng-container>
             </a>
             <a routerLink="/documents/{{document.id}}" class="btn btn-sm btn-outline-secondary">
               <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>
-              Edit
+              </svg>&nbsp;<ng-container i18n>Edit</ng-container>
             </a>
             <a type="button" class="btn btn-sm btn-outline-secondary" [href]="getPreviewUrl()">
               <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-search" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd" d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"/>
                 <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
-              </svg>
-              View
+              </svg>&nbsp;<ng-container i18n>View</ng-container>
             </a>
             <a type="button" 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>
-              Download
+              </svg>&nbsp;<ng-container i18n>Download</ng-container>
             </a>
             
           </div>
 
-          <small class="text-muted ml-auto">Score:</small>
+          <small class="text-muted ml-auto" i18n>Score:</small>
 
           <ngb-progressbar *ngIf="searchScore" [type]="searchScoreClass" [value]="searchScore" class="search-score-bar mx-2" [max]="1"></ngb-progressbar>
           
-          <small class="text-muted">Created: {{document.created | date}}</small>
+          <small class="text-muted" i18n>Created: {{document.created | date}}</small>
         </div>
         
       </div>
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 658aa1ea0..4fd155559 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -12,7 +12,7 @@
 
       <div style="top: 0; right: 0; font-size: large" class="text-right position-absolute mr-1">
         <div *ngFor="let t of getTagsLimited$() | async">
-          <app-tag [tag]="t" (click)="clickTag.emit(t.id)" [clickable]="true" linkTitle="Filter by tag"></app-tag>
+          <app-tag [tag]="t" (click)="clickTag.emit(t.id)" [clickable]="true" linkTitle="Filter by tag" i18n-linkTitle></app-tag>
         </div>
         <div *ngIf="moreTags">
           <span class="badge badge-secondary">+ {{moreTags}}</span>
@@ -23,7 +23,7 @@
     <div class="card-body p-2">
       <p class="card-text">
         <ng-container *ngIf="document.correspondent">
-          <a [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>:
+          <a [routerLink]="" title="Filter by correspondent" i18n-title (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>:
         </ng-container>
         {{document.title | documentTitle}}
       </p>
@@ -32,18 +32,18 @@
 
       <div class="d-flex justify-content-between align-items-center mx-n2">
         <div class="btn-group">
-          <a routerLink="/documents/{{document.id}}" class="btn btn-sm btn-outline-secondary" title="Edit">
+          <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">
+          <a [href]="getPreviewUrl()" class="btn btn-sm btn-outline-secondary" title="View in browser" i18n-title>
             <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-search" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
               <path fill-rule="evenodd" d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"/>
               <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
             </svg>
           </a>
-          <a [href]="getDownloadUrl()" class="btn btn-sm btn-outline-secondary" title="Download">
+          <a [href]="getDownloadUrl()" class="btn btn-sm btn-outline-secondary" title="Download" 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"/>
               <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"/>
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 25bcb7468..888639b5e 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -47,7 +47,7 @@
 
   <div class="btn-group btn-group-toggle ml-2" ngbRadioGroup [(ngModel)]="list.sortReverse">
     <div ngbDropdown class="btn-group">
-      <button class="btn btn-outline-primary btn-sm" id="dropdownBasic1" ngbDropdownToggle>Sort by</button>
+      <button class="btn btn-outline-primary btn-sm" id="dropdownBasic1" ngbDropdownToggle i18n>Sort by</button>
       <div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="shadow">
         <button *ngFor="let f of getSortFields()" ngbDropdownItem (click)="list.sortField = f.field"
           [class.active]="list.sortField == f.field">{{f.name}}</button>
@@ -70,15 +70,15 @@
   <div class="btn-group ml-2">
 
     <div class="btn-group" ngbDropdown role="group">
-      <button class="btn btn-sm btn-outline-primary dropdown-toggle" ngbDropdownToggle>Views</button>
+      <button class="btn btn-sm btn-outline-primary dropdown-toggle" ngbDropdownToggle i18n>Views</button>
       <div class="dropdown-menu shadow" ngbDropdownMenu>
         <ng-container *ngIf="!list.savedViewId">
           <button ngbDropdownItem *ngFor="let view of savedViewService.allViews" (click)="loadViewConfig(view)">{{view.name}}</button>
           <div class="dropdown-divider" *ngIf="savedViewService.allViews.length > 0"></div>
         </ng-container>
 
-        <button ngbDropdownItem (click)="saveViewConfig()" *ngIf="list.savedViewId">Save "{{list.savedViewTitle}}"</button>
-        <button ngbDropdownItem (click)="saveViewConfigAs()">Save as...</button>
+        <button ngbDropdownItem (click)="saveViewConfig()" *ngIf="list.savedViewId" i18n>Save "{{list.savedViewTitle}}"</button>
+        <button ngbDropdownItem (click)="saveViewConfigAs()" i18n>Save as...</button>
       </div>
     </div>
 
@@ -104,12 +104,12 @@
 <table class="table table-sm border shadow-sm" *ngIf="displayMode == 'details'">
   <thead>
     <th></th>
-    <th class="d-none d-lg-table-cell">ASN</th>
-    <th class="d-none d-md-table-cell">Correspondent</th>
-    <th>Title</th>
-    <th class="d-none d-xl-table-cell">Document type</th>
-    <th>Created</th>
-    <th class="d-none d-xl-table-cell">Added</th>
+    <th class="d-none d-lg-table-cell" i18n>ASN</th>
+    <th class="d-none d-md-table-cell" i18n>Correspondent</th>
+    <th i18n>Title</th>
+    <th class="d-none d-xl-table-cell" i18n>Document type</th>
+    <th i18n>Created</th>
+    <th class="d-none d-xl-table-cell" i18n>Added</th>
   </thead>
   <tbody>
     <tr *ngFor="let d of list.documents; trackBy: trackByDocumentId" [ngClass]="list.isSelected(d) ? 'table-row-selected' : ''">
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index f72a92aa9..cb0d09fe0 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -48,7 +48,7 @@ export class DocumentListComponent implements OnInit {
   }
 
   getTitle() {
-    return this.list.savedViewTitle || "Documents"
+    return this.list.savedViewTitle || $localize`Documents`
   }
 
   getSortFields() {
@@ -90,7 +90,7 @@ export class DocumentListComponent implements OnInit {
 
   saveViewConfig() {
     this.savedViewService.update(this.list.savedView).subscribe(result => {
-      this.toastService.showToast(Toast.make("Information", `View "${this.list.savedView.name}" saved successfully.`))
+      this.toastService.showToast(Toast.make("Information", $localize`View "${this.list.savedView.name}" saved successfully.`))
     })
 
   }
@@ -109,7 +109,7 @@ export class DocumentListComponent implements OnInit {
       }
       this.savedViewService.create(savedView).subscribe(() => {
         modal.close()
-        this.toastService.showToast(Toast.make("Information", `View "${savedView.name}" created successfully.`))
+        this.toastService.showToast(Toast.make("Information", $localize`View "${savedView.name}" created successfully.`))
       })
     })
   }
diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
index 8819aa313..9a2a37e36 100644
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
@@ -1,17 +1,17 @@
 <form [formGroup]="saveViewConfigForm" class="needs-validation" novalidate (ngSubmit)="save()">
   <div class="modal-header">
-    <h4 class="modal-title" id="modal-basic-title">Save current view</h4>
+    <h4 class="modal-title" id="modal-basic-title" i18n>Save current view</h4>
     <button type="button" class="close" aria-label="Close" (click)="cancel()">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
   <div class="modal-body">
-    <app-input-text title="Name" formControlName="name"></app-input-text>
-    <app-input-check title="Show in side bar" formControlName="showInSideBar"></app-input-check>
-    <app-input-check title="Show on dashboard" formControlName="showOnDashboard"></app-input-check>
+    <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
+    <app-input-check i18n-title title="Show in side bar" formControlName="showInSideBar"></app-input-check>
+    <app-input-check i18n-title title="Show on dashboard" formControlName="showOnDashboard"></app-input-check>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-outline-dark" (click)="cancel()">Cancel</button>
-    <button type="submit" class="btn btn-primary">Save</button>
+    <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
+    <button type="submit" class="btn btn-primary" i18n>Save</button>
   </div>
 </form>
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
index e09ea38bf..bc3d1c88f 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
@@ -7,13 +7,13 @@
   </div>
   <div class="modal-body">
     
-    <app-input-text title="Name" formControlName="name"></app-input-text>
-    <app-input-select title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-    <app-input-text title="Match" formControlName="match" hint="Auto matching does not require you to fill in this field."></app-input-text>
-    <app-input-check title="Case insensitive" formControlName="is_insensitive" hint="Auto matching ignores this option."></app-input-check>
+    <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
+    <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
+    <app-input-text i18n-title title="Match" formControlName="match" hint="Auto matching does not require you to fill in this field."></app-input-text>
+    <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" hint="Auto matching ignores this option."></app-input-check>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-outline-dark" (click)="cancel()">Cancel</button>
-    <button type="submit" class="btn btn-primary">Save</button>
+    <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
+    <button type="submit" class="btn btn-primary" i18n>Save</button>
   </div>
 </form>
\ No newline at end of file
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
index 2efd1c58d..4abc72037 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
@@ -1,7 +1,5 @@
-<app-page-header title="Correspondents">
-  <button type="button" class="btn btn-sm btn-outline-primary" (click)="openCreateDialog()">
-    Create
-  </button>
+<app-page-header title="Correspondents" i18n-title>
+  <button type="button" class="btn btn-sm btn-outline-primary" (click)="openCreateDialog()" i18n>Create</button>
 </app-page-header>
 
 <div class="row m-0 justify-content-end">
@@ -11,11 +9,11 @@
 <table class="table table-striped border shadow">
     <thead>
     <tr>
-      <th scope="col" sortable="name" (sort)="onSort($event)">Name</th>
-      <th scope="col" sortable="matching_algorithm" (sort)="onSort($event)">Matching</th>
-      <th scope="col" sortable="document_count" (sort)="onSort($event)">Document count</th>
-      <th scope="col" sortable="last_correspondence" (sort)="onSort($event)">Last correspondence</th>
-      <th scope="col">Actions</th>
+      <th scope="col" sortable="name" (sort)="onSort($event)" i18n>Name</th>
+      <th scope="col" sortable="matching_algorithm" (sort)="onSort($event)" i18n>Matching</th>
+      <th scope="col" sortable="document_count" (sort)="onSort($event)" i18n>Document count</th>
+      <th scope="col" sortable="last_correspondence" (sort)="onSort($event)" i18n>Last correspondence</th>
+      <th scope="col" i18n>Actions</th>
     </tr>
     </thead>
     <tbody>
@@ -29,21 +27,18 @@
             <button class="btn btn-sm btn-outline-secondary" (click)="filterDocuments(correspondent)">
               <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-funnel" viewBox="0 0 16 16">
                 <path fill-rule="evenodd" d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2zm1 .5v1.308l4.372 4.858A.5.5 0 0 1 7 8.5v5.306l2-.666V8.5a.5.5 0 0 1 .128-.334L13.5 3.308V2h-11z"/>
-              </svg>
-              Documents
+              </svg>&nbsp;<ng-container i18n>Documents</ng-container>
             </button>
             <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(correspondent)">
               <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>
-              Edit
+              </svg>&nbsp;<ng-container i18n>Edit</ng-container>
             </button>
             <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(correspondent)">
               <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
                 <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
                 <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4L4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
-              </svg>
-              Delete
+              </svg>&nbsp;<ng-container i18n>Delete</ng-container>
             </button>
           </div>
         </td>
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
index 3338c40c3..16c006051 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
@@ -7,14 +7,14 @@
     </div>
     <div class="modal-body">
       
-      <app-input-text title="Name" formControlName="name"></app-input-text>
-      <app-input-select title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-      <app-input-text title="Match" formControlName="match" hint="Auto matching does not require you to fill in this field."></app-input-text>
-      <app-input-check title="Case insensitive" formControlName="is_insensitive" hint="Auto matching ignores this option."></app-input-check>
+      <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
+      <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
+      <app-input-text i18n-title title="Match" formControlName="match" hint="Auto matching does not require you to fill in this field."></app-input-text>
+      <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" hint="Auto matching ignores this option."></app-input-check>
 
     </div>
     <div class="modal-footer">
-      <button type="button" class="btn btn-outline-dark" (click)="cancel()">Cancel</button>
-      <button type="submit" class="btn btn-primary">Save</button>
+      <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
+      <button type="submit" class="btn btn-primary" i18n>Save</button>
     </div>
   </form>
\ No newline at end of file
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
index d2ffab400..6de7e0595 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
@@ -1,7 +1,5 @@
 <app-page-header title="Document types">
-  <button type="button" class="btn btn-sm btn-outline-primary" (click)="openCreateDialog()">
-    Create
-  </button>
+  <button type="button" class="btn btn-sm btn-outline-primary" (click)="openCreateDialog()" i18n>Create</button>
 </app-page-header>
 
 <div class="row m-0 justify-content-end">
@@ -12,10 +10,10 @@
 <table class="table table-striped border shadow">
   <thead>
     <tr>
-      <th scope="col" sortable="name" (sort)="onSort($event)">Name</th>
-      <th scope="col" sortable="matching_algorithm" (sort)="onSort($event)">Matching</th>
-      <th scope="col" sortable="document_count" (sort)="onSort($event)">Document count</th>
-      <th scope="col">Actions</th>
+      <th scope="col" sortable="name" (sort)="onSort($event)" i18n>Name</th>
+      <th scope="col" sortable="matching_algorithm" (sort)="onSort($event)" i18n>Matching</th>
+      <th scope="col" sortable="document_count" (sort)="onSort($event)" i18n>Document count</th>
+      <th scope="col" i18n>Actions</th>
     </tr>
   </thead>
   <tbody>
@@ -28,21 +26,18 @@
           <button class="btn btn-sm btn-outline-secondary" (click)="filterDocuments(document_type)">
             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-funnel" viewBox="0 0 16 16">
               <path fill-rule="evenodd" d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2zm1 .5v1.308l4.372 4.858A.5.5 0 0 1 7 8.5v5.306l2-.666V8.5a.5.5 0 0 1 .128-.334L13.5 3.308V2h-11z"/>
-            </svg>
-            Documents
+            </svg>&nbsp;<ng-container i18n>Documents</ng-container>
           </button>
           <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(document_type)">
             <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>
-            Edit
+            </svg>&nbsp;<ng-container i18n>Edit</ng-container>
           </button>
           <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(document_type)">
             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
               <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
               <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4L4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
-            </svg>
-            Delete
+            </svg>&nbsp;<ng-container i18n>Delete</ng-container>
           </button>
         </div>
       </td>
diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
index 783c22b36..e1ef39428 100644
--- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
+++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
@@ -28,7 +28,7 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
 
   getMatching(o: MatchingModel) {
     if (o.matching_algorithm == MATCH_AUTO) {
-      return "Automatic"
+      return $localize`Automatic`
     } else if (o.match && o.match.length > 0) {
       return `${o.match} (${MATCHING_ALGORITHMS.find(a => a.id == o.matching_algorithm).name})`
     } else {
@@ -90,11 +90,11 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
 
   openDeleteDialog(object: T) {
     var activeModal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    activeModal.componentInstance.title = "Confirm delete"
-    activeModal.componentInstance.messageBold = `Do you really want to delete ${this.getObjectName(object)}?`
-    activeModal.componentInstance.message = "Associated documents will not be deleted."
+    activeModal.componentInstance.title = $localize`Confirm delete`
+    activeModal.componentInstance.messageBold = $localize`Do you really want to delete ${this.getObjectName(object)}?`
+    activeModal.componentInstance.message = $localize`Associated documents will not be deleted.`
     activeModal.componentInstance.btnClass = "btn-danger"
-    activeModal.componentInstance.btnCaption = "Delete"
+    activeModal.componentInstance.btnCaption = $localize`Delete`
     activeModal.componentInstance.confirmClicked.subscribe(() => {
       this.service.delete(object).subscribe(_ => {
         activeModal.close()
diff --git a/src-ui/src/app/components/manage/logs/logs.component.html b/src-ui/src/app/components/manage/logs/logs.component.html
index 6af482c66..8c2cbae34 100644
--- a/src-ui/src/app/components/manage/logs/logs.component.html
+++ b/src-ui/src/app/components/manage/logs/logs.component.html
@@ -1,11 +1,12 @@
-<app-page-header title="Logs">
+<app-page-header title="Logs" i18n-title>
 
   <div ngbDropdown class="btn-group">
     <button class="btn btn-outline-primary btn-sm" id="dropdownBasic1" ngbDropdownToggle>
       <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#funnel" />
-      </svg>
-      Filter
+      </svg>&nbsp;<ng-container i18n>Filter</ng-container>
+      
+      
     </button>
     <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
       <button *ngFor="let f of getLevels()" ngbDropdownItem (click)="setLevel(f.id)"
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index f71f12238..6c16cfaa8 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -7,14 +7,14 @@
 
   <ul ngbNav #nav="ngbNav" class="nav-tabs">
     <li [ngbNavItem]="1">
-      <a ngbNavLink>General settings</a>
+      <a ngbNavLink i18n>General settings</a>
       <ng-template ngbNavContent>
 
-        <h4>Document list</h4>
+        <h4 i18n>Document list</h4>
         
         <div class="form-row form-group">
           <div class="col-md-3 col-form-label">
-            <span>Items per page</span>
+            <span i18n>Items per page</span>
           </div>
           <div class="col">
         
@@ -31,36 +31,36 @@
       </ng-template>
     </li>
     <li [ngbNavItem]="2">
-      <a ngbNavLink>Saved views</a>
+      <a ngbNavLink i18n>Saved views</a>
       <ng-template ngbNavContent>
 
         <div formGroupName="savedViews">
           
             <div *ngFor="let view of savedViews" [formGroupName]="view.id" class="form-row">
               <div class="form-group col-4 mr-3">
-                <label for="name_{{view.id}}">Name</label>
+                <label for="name_{{view.id}}" i18n>Name</label>
                 <input type="text" class="form-control" formControlName="name" id="name_{{view.id}}">
               </div>
 
               <div class="form-group col-auto mr-3">
-                <label for="show_on_dashboard_{{view.id}}">Appears on</label>
+                <label for="show_on_dashboard_{{view.id}}" i18n>Appears on</label>
                 <div class="custom-control custom-switch">
                   <input type="checkbox" class="custom-control-input" id="show_on_dashboard_{{view.id}}" formControlName="show_on_dashboard">
-                  <label class="custom-control-label" for="show_on_dashboard_{{view.id}}">Show on dashboard</label>
+                  <label class="custom-control-label" for="show_on_dashboard_{{view.id}}" i18n>Show on dashboard</label>
                 </div>
                 <div class="custom-control custom-switch">
                   <input type="checkbox" class="custom-control-input" id="show_in_sidebar_{{view.id}}" formControlName="show_in_sidebar">
-                  <label class="custom-control-label" for="show_in_sidebar_{{view.id}}">Show in sidebar</label>
+                  <label class="custom-control-label" for="show_in_sidebar_{{view.id}}" i18n>Show in sidebar</label>
                 </div>
               </div>
 
               <div class="form-group col-auto">
-                <label for="name_{{view.id}}">Actions</label>
-                <button type="button" class="btn btn-sm btn-outline-danger form-control" (click)="deleteSavedView(view)">Delete</button>
+                <label for="name_{{view.id}}" i18n>Actions</label>
+                <button type="button" class="btn btn-sm btn-outline-danger form-control" (click)="deleteSavedView(view)" i18n>Delete</button>
               </div>
             </div>
 
-            <div *ngIf="savedViews.length == 0">No saved views defined.</div>
+            <div *ngIf="savedViews.length == 0" i18n>No saved views defined.</div>
           
         </div>
 
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index f839010b1..bec85e039 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -46,14 +46,14 @@ export class SettingsComponent implements OnInit {
     this.savedViewService.delete(savedView).subscribe(() => {
       this.savedViewGroup.removeControl(savedView.id.toString())
       this.savedViews.splice(this.savedViews.indexOf(savedView), 1)
-      this.toastService.showToast(Toast.make("Information", `Saved view "${savedView.name} deleted.`))
+      this.toastService.showToast(Toast.make("Information", $localize`Saved view "${savedView.name} deleted.`))
     })
   }
 
   private saveLocalSettings() {
     localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
     this.documentListViewService.updatePageSize()
-    this.toastService.showToast(Toast.make("Information", "Settings saved successfully."))
+    this.toastService.showToast(Toast.make("Information", $localize`Settings saved successfully.`))
   }
 
   saveSettings() {
@@ -65,7 +65,7 @@ export class SettingsComponent implements OnInit {
       this.savedViewService.patchMany(x).subscribe(s => {
         this.saveLocalSettings()
       }, error => {
-        this.toastService.showToast(Toast.makeError(`Error while storing settings on server: ${JSON.stringify(error.error)}`))
+        this.toastService.showToast(Toast.makeError($localize`Error while storing settings on server: ${JSON.stringify(error.error)}`))
       })
     } else {
       this.saveLocalSettings()
diff --git a/src-ui/src/app/components/not-found/not-found.component.html b/src-ui/src/app/components/not-found/not-found.component.html
index 6b21cf3ba..4d7e0f7e0 100644
--- a/src-ui/src/app/components/not-found/not-found.component.html
+++ b/src-ui/src/app/components/not-found/not-found.component.html
@@ -4,5 +4,5 @@
         <path fill-rule="evenodd" d="M4.285 12.433a.5.5 0 0 0 .683-.183A3.498 3.498 0 0 1 8 10.5c1.295 0 2.426.703 3.032 1.75a.5.5 0 0 0 .866-.5A4.498 4.498 0 0 0 8 9.5a4.5 4.5 0 0 0-3.898 2.25.5.5 0 0 0 .183.683z"/>
         <path d="M7 6.5C7 7.328 6.552 8 6 8s-1-.672-1-1.5S5.448 5 6 5s1 .672 1 1.5zm4 0c0 .828-.448 1.5-1 1.5s-1-.672-1-1.5S9.448 5 10 5s1 .672 1 1.5z"/>
       </svg>
-    <h1>404 Not Found</h1>
+    <h1 i18n>404 Not Found</h1>
 </div>
\ No newline at end of file
diff --git a/src-ui/src/app/components/search/search.component.html b/src-ui/src/app/components/search/search.component.html
index de6f0133f..ba2253401 100644
--- a/src-ui/src/app/components/search/search.component.html
+++ b/src-ui/src/app/components/search/search.component.html
@@ -1,7 +1,7 @@
 <app-page-header title="Search results">
 </app-page-header>
 
-<div *ngIf="errorMessage" class="alert alert-danger">Invalid search query: {{errorMessage}}</div>
+<div *ngIf="errorMessage" class="alert alert-danger" i18n>Invalid search query: {{errorMessage}}</div>
 
 <p *ngIf="more_like">
     Showing documents similar to
diff --git a/src-ui/src/app/data/matching-model.ts b/src-ui/src/app/data/matching-model.ts
index 698c32da5..dd9ae95ff 100644
--- a/src-ui/src/app/data/matching-model.ts
+++ b/src-ui/src/app/data/matching-model.ts
@@ -9,12 +9,12 @@ export const MATCH_FUZZY = 5
 export const MATCH_AUTO = 6
 
 export const MATCHING_ALGORITHMS = [
-    {id: MATCH_ANY, name: "Any"},
-    {id: MATCH_ALL, name: "All"},
-    {id: MATCH_LITERAL, name: "Literal"},
-    {id: MATCH_REGEX, name: "Regular Expression"},
-    {id: MATCH_FUZZY, name: "Fuzzy Match"},
-    {id: MATCH_AUTO, name: "Auto"},
+    {id: MATCH_ANY, name: $localize`Any`},
+    {id: MATCH_ALL, name: $localize`All`},
+    {id: MATCH_LITERAL, name: $localize`Literal`},
+    {id: MATCH_REGEX, name: $localize`Regular expression`},
+    {id: MATCH_FUZZY, name: $localize`Fuzzy match`},
+    {id: MATCH_AUTO, name: $localize`Auto`},
 ]
 
 export interface MatchingModel extends ObjectWithId {
diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index c132fa856..ec5c7689b 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -13,13 +13,13 @@ import { TagService } from './tag.service';
 import { FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 
 export const DOCUMENT_SORT_FIELDS = [
-  { field: "correspondent__name", name: "Correspondent" },
-  { field: "document_type__name", name: "Document type" },
-  { field: 'title', name: 'Title' },
-  { field: 'archive_serial_number', name: 'ASN' },
-  { field: 'created', name: 'Created' },
-  { field: 'added', name: 'Added' },
-  { field: 'modified', name: 'Modified' }
+  { field: "correspondent__name", name: $localize`Correspondent` },
+  { field: "document_type__name", name: $localize`Document type` },
+  { field: 'title', name: $localize`Title` },
+  { field: 'archive_serial_number', name: $localize`ASN` },
+  { field: 'created', name: $localize`Created` },
+  { field: 'added', name: $localize`Added` },
+  { field: 'modified', name: $localize`Modified` }
 ]
 
 @Injectable({

From 929b25a96983af002c4f7cddaa1937d2b4485943 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 23 Dec 2020 15:13:55 +0100
Subject: [PATCH 0399/1300] add api support for adding and removing many tags
 simultaneously

---
 src/documents/bulk_edit.py      | 23 +++++++++++++++++++++++
 src/documents/serialisers.py    | 28 ++++++++++++++++++++++++++--
 src/documents/tests/test_api.py |  9 +++++++++
 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index aa5b8ea3f..132547704 100644
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -1,3 +1,5 @@
+import itertools
+
 from django.db.models import Q
 from django_q.tasks import async_task
 
@@ -66,6 +68,27 @@ def remove_tag(doc_ids, tag):
     return "OK"
 
 
+def modify_tags(doc_ids, add_tags, remove_tags):
+    qs = Document.objects.filter(id__in=doc_ids)
+    affected_docs = [doc.id for doc in qs]
+
+    DocumentTagRelationship = Document.tags.through
+
+    DocumentTagRelationship.objects.filter(
+        document_id__in=affected_docs,
+        tag_id__in=remove_tags,
+    ).delete()
+
+    DocumentTagRelationship.objects.bulk_create([
+        DocumentTagRelationship(
+            document_id=doc, tag_id=tag) for (doc,tag) in itertools.product(affected_docs, add_tags)
+    ], ignore_conflicts=True)
+
+    async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
+
+    return "OK"
+
+
 def delete(doc_ids):
     Document.objects.filter(id__in=doc_ids).delete()
 
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index d9f1833bf..f34176d8a 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -217,6 +217,7 @@ class BulkEditSerializer(serializers.Serializer):
             "set_document_type",
             "add_tag",
             "remove_tag",
+            "modify_tags",
             "delete"
         ],
         label="Method",
@@ -225,11 +226,19 @@ class BulkEditSerializer(serializers.Serializer):
 
     parameters = serializers.DictField(allow_empty=True)
 
-    def validate_documents(self, documents):
+    def _validate_document_id_list(self, documents, name="documents"):
+        if not type(documents) == list:
+            raise serializers.ValidationError(f"{name} must be a list")
+        if not all([type(i) == int for i in documents]):
+            raise serializers.ValidationError(f"{name} must be a list of integers")
         count = Document.objects.filter(id__in=documents).count()
         if not count == len(documents):
             raise serializers.ValidationError(
-                "Some documents don't exist or were specified twice.")
+                f"Some documents in {name} don't exist or were specified twice.")
+
+
+    def validate_documents(self, documents):
+        self._validate_document_id_list(documents)
         return documents
 
     def validate_method(self, method):
@@ -241,6 +250,8 @@ class BulkEditSerializer(serializers.Serializer):
             return bulk_edit.add_tag
         elif method == "remove_tag":
             return bulk_edit.remove_tag
+        elif method == "modify_tags":
+            return bulk_edit.modify_tags
         elif method == "delete":
             return bulk_edit.delete
         else:
@@ -283,6 +294,17 @@ class BulkEditSerializer(serializers.Serializer):
         else:
             raise serializers.ValidationError("correspondent not specified")
 
+    def _validate_parameters_modify_tags(self, parameters):
+        if "add_tags" in parameters:
+            self._validate_document_id_list(parameters['add_tags'], "add_tags")
+        else:
+            raise serializers.ValidationError("add_tags not specified")
+
+        if "remove_tags" in parameters:
+            self._validate_document_id_list(parameters['remove_tags'], "remove_tags")
+        else:
+            raise serializers.ValidationError("remove_tags not specified")
+
     def validate(self, attrs):
 
         method = attrs['method']
@@ -294,6 +316,8 @@ class BulkEditSerializer(serializers.Serializer):
             self._validate_parameters_document_type(parameters)
         elif method == bulk_edit.add_tag or method == bulk_edit.remove_tag:
             self._validate_parameters_tags(parameters)
+        elif method == bulk_edit.modify_tags:
+            self._validate_parameters_modify_tags(parameters)
 
         return attrs
 
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 0262b6d6a..030de652d 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -743,6 +743,15 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         args, kwargs = self.async_task.call_args
         self.assertCountEqual(kwargs['document_ids'], [self.doc4.id])
 
+    def test_modify_tags(self):
+        tag_unrelated = Tag.objects.create(name="unrelated")
+        self.doc2.tags.add(tag_unrelated)
+        self.doc3.tags.add(tag_unrelated)
+        bulk_edit.modify_tags([self.doc2.id, self.doc3.id], add_tags=[self.t2.id], remove_tags=[self.t1.id])
+
+        self.assertCountEqual(list(self.doc2.tags.all()), [self.t2, tag_unrelated])
+        self.assertCountEqual(list(self.doc3.tags.all()), [self.t2, tag_unrelated])
+
     def test_delete(self):
         self.assertEqual(Document.objects.count(), 5)
         bulk_edit.delete([self.doc1.id, self.doc2.id])

From 46b077671437e7b565817d5f591879cdeed3c2b7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 23 Dec 2020 15:14:24 +0100
Subject: [PATCH 0400/1300] fix typo #176

---
 src/documents/consumer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index ab4912a36..37630bc21 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -103,7 +103,7 @@ class Consumer(LoggingMixin):
 
         parser_class = get_parser_class_for_mime_type(mime_type)
         if not parser_class:
-            raise ConsumerError(f"No parsers abvailable for {self.filename}")
+            raise ConsumerError(f"No parsers available for {self.filename}")
         else:
             self.log("debug",
                      f"Parser: {parser_class.__name__} "

From cffe9fa354c5e5c0c1d2628f01f508fa5d50ccda Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 23 Dec 2020 15:22:28 +0100
Subject: [PATCH 0401/1300] debug log mime type #176

---
 src/documents/consumer.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 37630bc21..ab07b3149 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -95,19 +95,20 @@ class Consumer(LoggingMixin):
         self.pre_check_directories()
         self.pre_check_duplicate()
 
-        self.log("info", "Consuming {}".format(self.filename))
+        self.log("info", f"Consuming {self.filename}")
 
         # Determine the parser class.
 
         mime_type = magic.from_file(self.path, mime=True)
 
+        self.log("debug", f"Detected mime type: {mime_type}")
+
         parser_class = get_parser_class_for_mime_type(mime_type)
         if not parser_class:
             raise ConsumerError(f"No parsers available for {self.filename}")
         else:
             self.log("debug",
-                     f"Parser: {parser_class.__name__} "
-                     f"based on mime type {mime_type}")
+                     f"Parser: {parser_class.__name__}")
 
         # Notify all listeners that we're going to do some work.
 

From c54d26ed195c12a666480111855b7ac34252161a Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Wed, 23 Dec 2020 16:09:13 +0100
Subject: [PATCH 0402/1300] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1806fd4bb..7a5f6028d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/jonaswinkler/paperless-ng.svg?branch=master)](https://travis-ci.org/jonaswinkler/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)
 [![Coverage Status](https://coveralls.io/repos/github/jonaswinkler/paperless-ng/badge.svg?branch=master)](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master)  *<sup><-- green badge, yay :)</sup>*
 

From 02e81f7ab5942afac95d1346ab743f17be4a04f2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 23 Dec 2020 17:03:00 +0100
Subject: [PATCH 0403/1300] update Dockerfile

---
 Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f0112e529..686496475 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,7 +41,7 @@ RUN apt-get update \
 		libpq-dev \
 		libqpdf-dev \
 		libxml2 \
-		libxslt-dev \
+		libxslt1-dev \
 		optipng \
 		pngquant \
 		qpdf \
@@ -55,9 +55,11 @@ RUN apt-get update \
 		tzdata \
 		unpaper \
 		zlib1g \
-	&& pip3 install --upgrade supervisor setuptools pipenv \
-  && pipenv install --system --deploy --ignore-pipfile --clear \
-	&& apt-get -y purge build-essential libqpdf-dev \
+	&& pip3 install --upgrade supervisor pipenv \
+  && pipenv install --system --deploy --ignore-pipfile \
+  && pipenv --clear \
+  && pip3 uninstall -y pipenv \
+	&& apt-get -y purge build-essential libqpdf-dev libxslt1-dev \
 	&& apt-get -y autoremove --purge \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& mkdir /var/log/supervisord /var/run/supervisord

From 64d0c7fae6e52869ac52d4c0673085e20089d5bb Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 23 Dec 2020 18:07:37 +0100
Subject: [PATCH 0404/1300] silence compiler warnings

---
 src-ui/angular.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index 2ff1bb3b0..79233eeda 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -31,7 +31,10 @@
 						"styles": [
 							"src/styles.scss"
 						],
-						"scripts": []
+						"scripts": [],
+						"allowedCommonJsDependencies": [
+							"ng2-pdf-viewer"
+						]
 					},
 					"configurations": {
 						"production": {
@@ -127,4 +130,4 @@
 		}
 	},
 	"defaultProject": "paperless-ui"
-}
\ No newline at end of file
+}

From eec9716ffaf19289aeedd45306301df332f15bba Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 23 Dec 2020 22:34:30 +0100
Subject: [PATCH 0405/1300] more translation markers

---
 .../document-list.component.html              |  3 ++-
 .../components/search/search.component.html   | 12 ++++-----
 src-ui/src/app/data/paperless-tag.ts          | 26 +++++++++----------
 src-ui/src/app/pipes/document-title.pipe.ts   |  2 +-
 src-ui/src/app/pipes/yes-no.pipe.ts           |  2 +-
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 888639b5e..1f58846b8 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -91,7 +91,8 @@
 </div>
 
 <div class="d-flex justify-content-between align-items-center">
-  <p><span *ngIf="list.selected.size > 0">Selected {{list.selected.size}} of </span>{{list.collectionSize || 0}} document(s) <span *ngIf="isFiltered">(filtered)</span></p>
+  <p i18n *ngIf="list.selected.size > 0">Selected {{list.selected.size}} of {{list.collectionSize || 0}} {list.collectionSize, plural, =1 {document} other {documents}}</p>
+  <p i18n *ngIf="list.selected.size == 0">{{list.collectionSize || 0}} {list.collectionSize, plural, =1 {document} other {documents}}</p>
   <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
   [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
 </div>
diff --git a/src-ui/src/app/components/search/search.component.html b/src-ui/src/app/components/search/search.component.html
index ba2253401..7047a3144 100644
--- a/src-ui/src/app/components/search/search.component.html
+++ b/src-ui/src/app/components/search/search.component.html
@@ -3,21 +3,19 @@
 
 <div *ngIf="errorMessage" class="alert alert-danger" i18n>Invalid search query: {{errorMessage}}</div>
 
-<p *ngIf="more_like">
-    Showing documents similar to
-    <a routerLink="/documents/{{more_like}}">{{more_like_doc?.original_file_name}}</a>
+<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">
-    Search string: <i>{{query}}</i>
+    <ng-container i18n>Search query: <i>{{query}}</i></ng-container>
     <ng-container *ngIf="correctedQuery">
-        - Did you mean "<a [routerLink]="" (click)="searchCorrectedQuery()">{{correctedQuery}}</a>"?
+        - <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>{{resultCount}} result(s)</p>
+    <p i18n>{resultCount, plural, =0 {No results} =1 {One result} other {{{resultCount}} results}}</p>
     <app-document-card-large *ngFor="let result of results"
         [document]="result.document"
         [details]="result.highlights"
diff --git a/src-ui/src/app/data/paperless-tag.ts b/src-ui/src/app/data/paperless-tag.ts
index 979a200a8..b13653e91 100644
--- a/src-ui/src/app/data/paperless-tag.ts
+++ b/src-ui/src/app/data/paperless-tag.ts
@@ -3,19 +3,19 @@ import { ObjectWithId } from './object-with-id';
 
 
 export const TAG_COLOURS = [
-    {id: 1, value: "#a6cee3", name: "Light Blue", textColor: "#000000"},
-    {id: 2, value: "#1f78b4", name: "Blue", textColor: "#ffffff"},
-    {id: 3, value: "#b2df8a", name: "Light Green", textColor: "#000000"},
-    {id: 4, value: "#33a02c", name: "Green", textColor: "#ffffff"},
-    {id: 5, value: "#fb9a99", name: "Light Red", textColor: "#000000"},
-    {id: 6, value: "#e31a1c", name: "Red ", textColor: "#ffffff"},
-    {id: 7, value: "#fdbf6f", name: "Light Orange", textColor: "#000000"},
-    {id: 8, value: "#ff7f00", name: "Orange", textColor: "#000000"},
-    {id: 9, value: "#cab2d6", name: "Light Violet", textColor: "#000000"},
-    {id: 10, value: "#6a3d9a", name: "Violet", textColor: "#ffffff"},
-    {id: 11, value: "#b15928", name: "Brown", textColor: "#ffffff"},
-    {id: 12, value: "#000000", name: "Black", textColor: "#ffffff"},
-    {id: 13, value: "#cccccc", name: "Light Grey", textColor: "#000000"}
+    {id: 1, value: "#a6cee3", name: $localize`Light blue`, textColor: "#000000"},
+    {id: 2, value: "#1f78b4", name: $localize`Blue`, textColor: "#ffffff"},
+    {id: 3, value: "#b2df8a", name: $localize`Light green`, textColor: "#000000"},
+    {id: 4, value: "#33a02c", name: $localize`Green`, textColor: "#ffffff"},
+    {id: 5, value: "#fb9a99", name: $localize`Light red`, textColor: "#000000"},
+    {id: 6, value: "#e31a1c", name: $localize`Red `, textColor: "#ffffff"},
+    {id: 7, value: "#fdbf6f", name: $localize`Light orange`, textColor: "#000000"},
+    {id: 8, value: "#ff7f00", name: $localize`Orange`, textColor: "#000000"},
+    {id: 9, value: "#cab2d6", name: $localize`Light violet`, textColor: "#000000"},
+    {id: 10, value: "#6a3d9a", name: $localize`Violet`, textColor: "#ffffff"},
+    {id: 11, value: "#b15928", name: $localize`Brown`, textColor: "#ffffff"},
+    {id: 12, value: "#000000", name: $localize`Black`, textColor: "#ffffff"},
+    {id: 13, value: "#cccccc", name: $localize`Light grey`, textColor: "#000000"}
 ]
 
 export interface PaperlessTag extends MatchingModel {
diff --git a/src-ui/src/app/pipes/document-title.pipe.ts b/src-ui/src/app/pipes/document-title.pipe.ts
index 621562d39..60a552ca8 100644
--- a/src-ui/src/app/pipes/document-title.pipe.ts
+++ b/src-ui/src/app/pipes/document-title.pipe.ts
@@ -9,7 +9,7 @@ export class DocumentTitlePipe implements PipeTransform {
     if (value) {
       return value
     } else {
-      return "(no title)"
+      return $localize`(no title)`
     }
   }
 
diff --git a/src-ui/src/app/pipes/yes-no.pipe.ts b/src-ui/src/app/pipes/yes-no.pipe.ts
index 9a4ed56ef..f12c844a5 100644
--- a/src-ui/src/app/pipes/yes-no.pipe.ts
+++ b/src-ui/src/app/pipes/yes-no.pipe.ts
@@ -6,7 +6,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 export class YesNoPipe implements PipeTransform {
 
   transform(value: boolean): unknown {
-    return value ? "Yes" : "No"
+    return value ? $localize`Yes` : $localize`No`
   }
 
 }

From 198354d07dd86fa05855584f1eeedd3977c12fa0 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 23 Dec 2020 22:45:54 +0100
Subject: [PATCH 0406/1300] a couple small changes

---
 .../components/document-detail/document-detail.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index f569c1033..daf01249f 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -58,7 +58,7 @@
 
                         <app-input-text i18n-title title="Title" formControlName="title"></app-input-text>
                         <div class="form-group">
-                            <label for="archive_serial_number" i18n>Archive Serial Number</label>
+                            <label for="archive_serial_number" i18n>Archive serial number</label>
                             <input type="number" class="form-control" id="archive_serial_number"
                                 formControlName='archive_serial_number'>
                         </div>
@@ -139,7 +139,7 @@
 
     <div class="col-md-6 col-xl-8 mb-3">
       <div class="pdf-viewer-container" *ngIf="getContentType() == 'application/pdf'">
-        <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="previewCurrentPage" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer>
+        <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="previewCurrentPage" [render-text-mode]="2" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer>
       </div>
     </div>
 </div>

From 37caf6a64a6eaa96dba6cd5ed5d0e6cd7f70dc2f Mon Sep 17 00:00:00 2001
From: Andrew Rowson <github@growse.com>
Date: Thu, 24 Dec 2020 11:53:20 +0000
Subject: [PATCH 0407/1300] Gunicorn should bind to both ipv4 and ipv6

As per https://docs.gunicorn.org/en/stable/settings.html#bind
---
 docker/supervisord.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/supervisord.conf b/docker/supervisord.conf
index ebe0f005d..ff3ed4311 100644
--- a/docker/supervisord.conf
+++ b/docker/supervisord.conf
@@ -8,7 +8,7 @@ loglevel=info                ; log level; default info; others: debug,warn,trace
 user=root
 
 [program:gunicorn]
-command=gunicorn -c /usr/src/paperless/gunicorn.conf.py -b 0.0.0.0:8000 paperless.wsgi
+command=gunicorn -c /usr/src/paperless/gunicorn.conf.py -b '[::]:8000' paperless.wsgi
 user=paperless
 
 stdout_logfile=/dev/stdout

From 6e79b771ece557cfe5792d4152019069934542dc Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 25 Dec 2020 00:58:17 -0800
Subject: [PATCH 0408/1300] Refactor bulk editor to be self-contained

See https://github.com/jonaswinkler/paperless-ng/pull/162#issuecomment-750425915
---
 .../bulk-editor/bulk-editor.component.html    |   6 +-
 .../bulk-editor/bulk-editor.component.ts      | 182 ++++++++++++++----
 .../document-list.component.html              |  13 +-
 .../document-list/document-list.component.ts  | 126 +-----------
 4 files changed, 148 insertions(+), 179 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index b547b8505..11d3603b2 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -1,6 +1,6 @@
 <div class="row">
   <div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
-    <button class="btn btn-sm btn-outline-danger" (click)="selectNone.next()">
+    <button class="btn btn-sm btn-outline-danger" (click)="documentList.selectNone()">
       <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#slash-circle" />
       </svg>
@@ -11,13 +11,13 @@
   <div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
     <label class="mr-2 mb-0">Select:</label>
     <div class="btn-group">
-      <button class="btn btn-sm btn-outline-primary" (click)="selectPage.next()">
+      <button class="btn btn-sm btn-outline-primary" (click)="documentList.selectPage()">
         <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#file-earmark-check" />
         </svg>
         Page
       </button>
-      <button class="btn btn-sm btn-outline-primary" (click)="selectAll.next()">
+      <button class="btn btn-sm btn-outline-primary" (click)="documentList.selectAll()">
         <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#check-all" />
         </svg>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index bbf5494f0..19b913af0 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -1,4 +1,6 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Observable } from 'rxjs';
+import { tap } from 'rxjs/operators';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { PaperlessTag } from 'src/app/data/paperless-tag';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
@@ -7,8 +9,12 @@ import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { TagService } from 'src/app/services/rest/tag.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
+import { DocumentListViewService } from 'src/app/services/document-list-view.service';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { DocumentService } from 'src/app/services/rest/document.service';
+import { OpenDocumentsService } from 'src/app/services/open-documents.service';
 import { FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
+import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component';
 import { ToggleableItem, ToggleableItemState } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
 
 export interface ChangedItems {
@@ -23,33 +29,6 @@ export interface ChangedItems {
 })
 export class BulkEditorComponent {
 
-  @Input()
-  selectedDocuments: Set<number>
-
-  @Input()
-  viewDocuments: PaperlessDocument[]
-
-  @Output()
-  selectPage = new EventEmitter()
-
-  @Output()
-  selectAll = new EventEmitter()
-
-  @Output()
-  selectNone = new EventEmitter()
-
-  @Output()
-  setTags = new EventEmitter()
-
-  @Output()
-  setCorrespondents = new EventEmitter()
-
-  @Output()
-  setDocumentTypes = new EventEmitter()
-
-  @Output()
-  delete = new EventEmitter()
-
   tags: PaperlessTag[]
   correspondents: PaperlessCorrespondent[]
   documentTypes: PaperlessDocumentType[]
@@ -61,13 +40,13 @@ export class BulkEditorComponent {
   dropdownTypes = FilterableDropdownType
 
   get selectionSpansPages(): boolean {
-    return this.selectedDocuments.size > this.viewDocuments.length || !Array.from(this.selectedDocuments).every(sd => this.viewDocuments.find(d => d.id == sd))
+    return this.documentList.selected.size > this.documentList.documents.length || !Array.from(this.documentList.selected).every(sd => this.documentList.documents.find(d => d.id == sd))
   }
 
   private _tagsToggleableItems: ToggleableItem[]
   get tagsToggleableItems(): ToggleableItem[] {
     let tagsToggleableItems = []
-    let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id))
+    let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id))
     if (this.selectionSpansPages) selectedDocuments = []
 
     this.tags?.forEach(t => {
@@ -84,7 +63,7 @@ export class BulkEditorComponent {
   private _correspondentsToggleableItems: ToggleableItem[]
   get correspondentsToggleableItems(): ToggleableItem[] {
     let correspondentsToggleableItems = []
-    let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id))
+    let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id))
     if (this.selectionSpansPages) selectedDocuments = []
 
     this.correspondents?.forEach(c => {
@@ -101,7 +80,7 @@ export class BulkEditorComponent {
   private _documentTypesToggleableItems: ToggleableItem[]
   get documentTypesToggleableItems(): ToggleableItem[] {
     let documentTypesToggleableItems = []
-    let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id))
+    let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id))
     if (this.selectionSpansPages) selectedDocuments = []
 
     this.documentTypes?.forEach(dt => {
@@ -115,11 +94,18 @@ export class BulkEditorComponent {
     return documentTypesToggleableItems
   }
 
+  get documentList(): DocumentListViewService {
+    return this.documentListViewService
+  }
+
   constructor(
     private documentTypeService: DocumentTypeService,
     private tagService: TagService,
     private correspondentService: CorrespondentService,
-    private documentService: DocumentService
+    private documentListViewService: DocumentListViewService,
+    private documentService: DocumentService,
+    private modalService: NgbModal,
+    private openDocumentService: OpenDocumentsService
   ) { }
 
   ngOnInit() {
@@ -142,32 +128,36 @@ export class BulkEditorComponent {
 
   applyTags(newTagsToggleableItems: ToggleableItem[]) {
     let changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems)
-    if (changedTags.itemsToAdd.length > 0 || changedTags.itemsToRemove.length > 0) this.setTags.emit(changedTags)
+    if (changedTags.itemsToAdd.length > 0 || changedTags.itemsToRemove.length > 0) this.bulkSetTags(changedTags)
   }
 
   removeAllTags() {
-    this.setTags.emit(null)
+    this.bulkSetTags(null)
   }
 
   applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[]) {
     let changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems)
-    if (changedCorrespondents.itemsToAdd.length > 0 || changedCorrespondents.itemsToRemove.length > 0) this.setCorrespondents.emit(changedCorrespondents)
+    if (changedCorrespondents.itemsToAdd.length > 0 || changedCorrespondents.itemsToRemove.length > 0) this.bulkSetCorrespondents(changedCorrespondents)
   }
 
   removeAllCorrespondents() {
-    this.setDocumentTypes.emit(null)
+    this.bulkSetCorrespondents(null)
   }
 
   applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[]) {
     let changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems)
-    if (changedDocumentTypes.itemsToAdd.length > 0 || changedDocumentTypes.itemsToRemove.length > 0) this.setDocumentTypes.emit(changedDocumentTypes)
+    if (changedDocumentTypes.itemsToAdd.length > 0 || changedDocumentTypes.itemsToRemove.length > 0) this.bulkSetDocumentTypes(changedDocumentTypes)
   }
 
   removeAllDocumentTypes() {
-    this.setDocumentTypes.emit(null)
+    this.bulkSetDocumentTypes(null)
   }
 
-  checkForChangedItems(toggleableItemsA: ToggleableItem[], toggleableItemsB: ToggleableItem[]): ChangedItems {
+  applyDelete() {
+    this.bulkDelete()
+  }
+
+  private checkForChangedItems(toggleableItemsA: ToggleableItem[], toggleableItemsB: ToggleableItem[]): ChangedItems {
     let itemsToAdd: any[] = []
     let itemsToRemove: any[] = []
     toggleableItemsA.forEach(oldItem => {
@@ -179,7 +169,117 @@ export class BulkEditorComponent {
     return { itemsToAdd: itemsToAdd, itemsToRemove: itemsToRemove }
   }
 
-  applyDelete() {
-    this.delete.next()
+  private executeBulkOperation(method: string, args): Observable<any> {
+    return this.documentService.bulkEdit(Array.from(this.documentList.selected), method, args).pipe(
+      tap(() => {
+        this.documentList.reload()
+        this.documentList.selected.forEach(id => {
+          this.openDocumentService.refreshDocument(id)
+        })
+        this.documentList.selectNone()
+      })
+    )
+  }
+
+  private bulkSetTags(changedTags: ChangedItems) {
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Confirm Tags Assignment"
+    let action = 'set_tags'
+    let tags
+    let messageFragment = ''
+    let both = changedTags && changedTags.itemsToAdd.length > 0 && changedTags.itemsToRemove.length > 0
+    if (!changedTags) {
+      messageFragment = `remove all tags from`
+    } else {
+      if (changedTags.itemsToAdd.length > 0) {
+        tags = changedTags.itemsToAdd
+        messageFragment = `assign the tag(s) ${changedTags.itemsToAdd.map(t => t.name).join(', ')} to`
+      }
+      if (changedTags.itemsToRemove.length > 0) {
+        if (!both) {
+          action = 'remove_tags'
+          tags = changedTags.itemsToRemove
+        } else {
+          messageFragment += ' and '
+        }
+        messageFragment += `remove the tag(s) ${changedTags.itemsToRemove.map(t => t.name).join(', ')} from`
+      }
+    }
+    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.documentList.selected.size} selected document(s).`
+    modal.componentInstance.btnClass = "btn-warning"
+    modal.componentInstance.btnCaption = "Confirm"
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      // TODO: API endpoints for add/remove multiple tags
+      this.executeBulkOperation(action, {"tags": tags ? tags.map(t => t.id) : null}).subscribe(
+        response => {
+          if (!both) modal.close()
+          else {
+            this.executeBulkOperation('remove_tags', {"tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe(
+              response => {
+                modal.close()
+              })
+          }
+        }
+      )
+    })
+  }
+
+  private bulkSetCorrespondents(changedCorrespondents: ChangedItems) {
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Confirm Correspondent Assignment"
+    let correspondent
+    let messageFragment = 'remove all correspondents from'
+    if (changedCorrespondents && changedCorrespondents.itemsToAdd.length > 0) {
+      correspondent = changedCorrespondents.itemsToAdd[0]
+      messageFragment = `assign the correspondent ${correspondent.name} to`
+    }
+    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.documentList.selected.size} selected document(s).`
+    modal.componentInstance.btnClass = "btn-warning"
+    modal.componentInstance.btnCaption = "Confirm"
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
+        response => {
+          modal.close()
+        }
+      )
+    })
+  }
+
+  private bulkSetDocumentTypes(changedDocumentTypes: ChangedItems) {
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Confirm Document Type Assignment"
+    let documentType
+    let messageFragment = 'remove all document types from'
+    if (changedDocumentTypes && changedDocumentTypes.itemsToAdd.length > 0) {
+      documentType = changedDocumentTypes.itemsToAdd[0]
+      messageFragment = `assign the document type ${documentType.name} to`
+    }
+    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.documentList.selected.size} selected document(s).`
+    modal.componentInstance.btnClass = "btn-warning"
+    modal.componentInstance.btnCaption = "Confirm"
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
+        response => {
+          modal.close()
+        }
+      )
+    })
+  }
+
+  private bulkDelete() {
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.delayConfirm(5)
+    modal.componentInstance.title = "Delete confirm"
+    modal.componentInstance.messageBold = `This operation will permanently delete all ${this.documentList.selected.size} selected document(s).`
+    modal.componentInstance.message = `This operation cannot be undone.`
+    modal.componentInstance.btnClass = "btn-danger"
+    modal.componentInstance.btnCaption = "Delete document(s)"
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      this.executeBulkOperation("delete", {}).subscribe(
+        response => {
+          modal.close()
+        }
+      )
+    })
   }
 }
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 816b9b3b6..6ff1e2ef5 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -79,18 +79,7 @@
 
 <div class="w-100 mb-2 mb-sm-4">
   <app-filter-editor *ngIf="!isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
-
-  <app-bulk-editor *ngIf="isBulkEditing"
-    [viewDocuments]="list.documents"
-    [(selectedDocuments)]="list.selected"
-    (selectPage)="list.selectPage()"
-    (selectAll)="list.selectAll()"
-    (selectNone)="list.selectNone()"
-    (setTags)="bulkSetTags($event)"
-    (setCorrespondents)="bulkSetCorrespondents($event)"
-    (setDocumentTypes)="bulkSetDocumentTypes($event)"
-    (delete)="bulkDelete()">
-</app-bulk-editor>
+  <app-bulk-editor *ngIf="isBulkEditing"></app-bulk-editor>
 </div>
 
 <div class="d-flex justify-content-between align-items-center">
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 236bdeeaa..699e91cb4 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,23 +1,19 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { Observable } from 'rxjs';
-import { tap } from 'rxjs/operators';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
-import { DocumentService, DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
+import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
 import { TagService } from 'src/app/services/rest/tag.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { Toast, ToastService } from 'src/app/services/toast.service';
 import { FilterEditorComponent } from './filter-editor/filter-editor.component';
-import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component';
 import { SelectDialogComponent } from '../common/select-dialog/select-dialog.component';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
 import { ChangedItems } from './bulk-editor/bulk-editor.component';
-import { OpenDocumentsService } from 'src/app/services/open-documents.service';
 
 @Component({
   selector: 'app-document-list',
@@ -32,12 +28,10 @@ export class DocumentListComponent implements OnInit {
     public route: ActivatedRoute,
     private router: Router,
     private toastService: ToastService,
-    public modalService: NgbModal,
+    private modalService: NgbModal,
     private correspondentService: CorrespondentService,
     private documentTypeService: DocumentTypeService,
-    private tagService: TagService,
-    private documentService: DocumentService,
-    private openDocumentService: OpenDocumentsService) { }
+    private tagService: TagService) { }
 
   @ViewChild("filterEditor")
   private filterEditor: FilterEditorComponent
@@ -143,118 +137,4 @@ export class DocumentListComponent implements OnInit {
   trackByDocumentId(index, item: PaperlessDocument) {
     return item.id
   }
-
-  private executeBulkOperation(method: string, args): Observable<any> {
-    return this.documentService.bulkEdit(Array.from(this.list.selected), method, args).pipe(
-      tap(() => {
-        this.list.reload()
-        this.list.selected.forEach(id => {
-          this.openDocumentService.refreshDocument(id)
-        })
-        this.list.selectNone()
-      })
-    )
-  }
-
-  bulkSetTags(changedTags: ChangedItems) {
-    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Tags Assignment"
-    let action = 'set_tags'
-    let tags
-    let messageFragment = ''
-    let both = changedTags && changedTags.itemsToAdd.length > 0 && changedTags.itemsToRemove.length > 0
-    if (!changedTags) {
-      messageFragment = `remove all tags from`
-    } else {
-      if (changedTags.itemsToAdd.length > 0) {
-        tags = changedTags.itemsToAdd
-        messageFragment = `assign the tag(s) ${changedTags.itemsToAdd.map(t => t.name).join(', ')} to`
-      }
-      if (changedTags.itemsToRemove.length > 0) {
-        if (!both) {
-          action = 'remove_tags'
-          tags = changedTags.itemsToRemove
-        } else {
-          messageFragment += ' and '
-        }
-        messageFragment += `remove the tag(s) ${changedTags.itemsToRemove.map(t => t.name).join(', ')} from`
-      }
-    }
-    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
-    modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = "Confirm"
-    modal.componentInstance.confirmClicked.subscribe(() => {
-      // TODO: API endpoints for add/remove multiple tags
-      this.executeBulkOperation(action, {"tags": tags ? tags.map(t => t.id) : null}).subscribe(
-        response => {
-          if (!both) modal.close()
-          else {
-            this.executeBulkOperation('remove_tags', {"tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe(
-              response => {
-                modal.close()
-              })
-          }
-        }
-      )
-    })
-  }
-
-  bulkSetCorrespondents(changedCorrespondents: ChangedItems) {
-    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Correspondent Assignment"
-    let correspondent
-    let messageFragment = 'remove all correspondents from'
-    if (changedCorrespondents && changedCorrespondents.itemsToAdd.length > 0) {
-      correspondent = changedCorrespondents.itemsToAdd[0]
-      messageFragment = `assign the correspondent ${correspondent.name} to`
-    }
-    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
-    modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = "Confirm"
-    modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
-        response => {
-          modal.close()
-        }
-      )
-    })
-  }
-
-  bulkSetDocumentTypes(changedDocumentTypes: ChangedItems) {
-    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Document Type Assignment"
-    let documentType
-    let messageFragment = 'remove all document types from'
-    if (changedDocumentTypes && changedDocumentTypes.itemsToAdd.length > 0) {
-      documentType = changedDocumentTypes.itemsToAdd[0]
-      messageFragment = `assign the document type ${documentType.name} to`
-    }
-    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
-    modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = "Confirm"
-    modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
-        response => {
-          modal.close()
-        }
-      )
-    })
-  }
-
-  bulkDelete() {
-    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.delayConfirm(5)
-    modal.componentInstance.title = "Delete confirm"
-    modal.componentInstance.messageBold = `This operation will permanently delete all ${this.list.selected.size} selected document(s).`
-    modal.componentInstance.message = `This operation cannot be undone.`
-    modal.componentInstance.btnClass = "btn-danger"
-    modal.componentInstance.btnCaption = "Delete document(s)"
-    modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation("delete", {}).subscribe(
-        response => {
-          modal.close()
-        }
-      )
-    })
-  }
 }

From 2ac6a02e31a1f4b49583fbbbe637b057db7ccf8b Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 25 Dec 2020 01:14:56 -0800
Subject: [PATCH 0409/1300] More simplification

---
 .../bulk-editor/bulk-editor.component.html    | 24 ++++----
 .../bulk-editor/bulk-editor.component.ts      | 57 +++++++------------
 2 files changed, 34 insertions(+), 47 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 11d3603b2..f27d6d201 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -32,29 +32,29 @@
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill"
         [toggleableItems]="tagsToggleableItems"
         [type]="dropdownTypes.Editing"
-        [showCounts]="!this.selectionSpansPages"
-        [showRemoveAll]="this.selectionSpansPages"
+        [showCounts]="!selectionSpansPages"
+        [showRemoveAll]="selectionSpansPages"
         (open)="tagsDropdownOpen()"
-        (removeAll)="removeAllTags()"
-        (editingComplete)="applyTags($event)">
+        (removeAll)="setTags(null)"
+        (editingComplete)="setTags($event)">
       </app-filterable-dropdown>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" singular="true"
         [toggleableItems]="correspondentsToggleableItems"
         [type]="dropdownTypes.Editing"
-        [showCounts]="!this.selectionSpansPages"
-        [showRemoveAll]="this.selectionSpansPages"
+        [showCounts]="!selectionSpansPages"
+        [showRemoveAll]="selectionSpansPages"
         (open)="correspondentsDropdownOpen()"
-        (removeAll)="removeAllCorrespondents()"
-        (editingComplete)="applyCorrespondent($event)">
+        (removeAll)="setCorrespondents(null)"
+        (editingComplete)="setCorrespondents($event)">
       </app-filterable-dropdown>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" singular="true"
         [toggleableItems]="documentTypesToggleableItems"
         [type]="dropdownTypes.Editing"
-        [showCounts]="!this.selectionSpansPages"
-        [showRemoveAll]="this.selectionSpansPages"
+        [showCounts]="!selectionSpansPages"
+        [showRemoveAll]="selectionSpansPages"
         (open)="documentTypesDropdownOpen()"
-        (removeAll)="removeAllDocumentTypes()"
-        (editingComplete)="applyDocumentType($event)">
+        (removeAll)="setDocumentTypes(null)"
+        (editingComplete)="setDocumentTypes($event)">
       </app-filterable-dropdown>
     </div>
   </div>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 19b913af0..a5732b922 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -126,37 +126,6 @@ export class BulkEditorComponent {
     this.initialDocumentTypesToggleableItems = this._documentTypesToggleableItems
   }
 
-  applyTags(newTagsToggleableItems: ToggleableItem[]) {
-    let changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems)
-    if (changedTags.itemsToAdd.length > 0 || changedTags.itemsToRemove.length > 0) this.bulkSetTags(changedTags)
-  }
-
-  removeAllTags() {
-    this.bulkSetTags(null)
-  }
-
-  applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[]) {
-    let changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems)
-    if (changedCorrespondents.itemsToAdd.length > 0 || changedCorrespondents.itemsToRemove.length > 0) this.bulkSetCorrespondents(changedCorrespondents)
-  }
-
-  removeAllCorrespondents() {
-    this.bulkSetCorrespondents(null)
-  }
-
-  applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[]) {
-    let changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems)
-    if (changedDocumentTypes.itemsToAdd.length > 0 || changedDocumentTypes.itemsToRemove.length > 0) this.bulkSetDocumentTypes(changedDocumentTypes)
-  }
-
-  removeAllDocumentTypes() {
-    this.bulkSetDocumentTypes(null)
-  }
-
-  applyDelete() {
-    this.bulkDelete()
-  }
-
   private checkForChangedItems(toggleableItemsA: ToggleableItem[], toggleableItemsB: ToggleableItem[]): ChangedItems {
     let itemsToAdd: any[] = []
     let itemsToRemove: any[] = []
@@ -181,7 +150,13 @@ export class BulkEditorComponent {
     )
   }
 
-  private bulkSetTags(changedTags: ChangedItems) {
+  setTags(newTagsToggleableItems: ToggleableItem[]) {
+    let changedTags: ChangedItems
+    if (newTagsToggleableItems) {
+      changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems)
+      if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 0) return
+    }
+
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Confirm Tags Assignment"
     let action = 'set_tags'
@@ -224,7 +199,13 @@ export class BulkEditorComponent {
     })
   }
 
-  private bulkSetCorrespondents(changedCorrespondents: ChangedItems) {
+  setCorrespondents(newCorrespondentsToggleableItems: ToggleableItem[]) {
+    let changedCorrespondents: ChangedItems
+    if (newCorrespondentsToggleableItems) {
+      changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems)
+      if (changedCorrespondents.itemsToAdd.length == 0 && changedCorrespondents.itemsToRemove.length == 0) return
+    }
+
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Confirm Correspondent Assignment"
     let correspondent
@@ -245,7 +226,13 @@ export class BulkEditorComponent {
     })
   }
 
-  private bulkSetDocumentTypes(changedDocumentTypes: ChangedItems) {
+  setDocumentTypes(newDocumentTypesToggleableItems: ToggleableItem[]) {
+    let changedDocumentTypes: ChangedItems
+    if (newDocumentTypesToggleableItems) {
+      changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems)
+      if (changedDocumentTypes.itemsToAdd.length == 0 && changedDocumentTypes.itemsToRemove.length == 0) return
+    }
+
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Confirm Document Type Assignment"
     let documentType
@@ -266,7 +253,7 @@ export class BulkEditorComponent {
     })
   }
 
-  private bulkDelete() {
+  applyDelete() {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.delayConfirm(5)
     modal.componentInstance.title = "Delete confirm"

From f7f78d80b757918c33bb1144de1e62899168eb00 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 25 Dec 2020 19:01:46 +0100
Subject: [PATCH 0410/1300] added isnull filters for document types and
 correspondents

---
 src/documents/filters.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/documents/filters.py b/src/documents/filters.py
index b3c92eba3..4614d292b 100755
--- a/src/documents/filters.py
+++ b/src/documents/filters.py
@@ -98,12 +98,14 @@ class DocumentFilterSet(FilterSet):
             "added": DATE_KWARGS,
             "modified": DATE_KWARGS,
 
+            "correspondent": ["isnull"],
             "correspondent__id": ID_KWARGS,
             "correspondent__name": CHAR_KWARGS,
 
             "tags__id": ID_KWARGS,
             "tags__name": CHAR_KWARGS,
 
+            "document_type": ["isnull"],
             "document_type__id": ID_KWARGS,
             "document_type__name": CHAR_KWARGS,
 

From b9cf517cd139f4cf8f3194cb60e9384718c57c5e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 25 Dec 2020 19:06:12 +0100
Subject: [PATCH 0411/1300] front end client support for filtering for no
 correspondent/document type

---
 src-ui/src/app/data/filter-rule-type.ts          | 5 +++--
 src-ui/src/app/services/rest/document.service.ts | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts
index ea8e60eee..173425c92 100644
--- a/src-ui/src/app/data/filter-rule-type.ts
+++ b/src-ui/src/app/data/filter-rule-type.ts
@@ -25,8 +25,8 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
 
   {id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false},
 
-  {id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", datatype: "correspondent", multi: false},
-  {id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", datatype: "document_type", multi: false},
+  {id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", isnull_filtervar: "correspondent__isnull", datatype: "correspondent", multi: false},
+  {id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", isnull_filtervar: "document_type__isnull", datatype: "document_type", multi: false},
 
   {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},
   {id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true},
@@ -51,6 +51,7 @@ export interface FilterRuleType {
   id: number
   name: string
   filtervar: string
+  isnull_filtervar?: string
   datatype: string //number, string, boolean, date
   multi: boolean
   default?: any
diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index ec5c7689b..ff17e972e 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -38,6 +38,8 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
         let ruleType = FILTER_RULE_TYPES.find(t => t.id == rule.rule_type)
         if (ruleType.multi) {
           params[ruleType.filtervar] = params[ruleType.filtervar] ? params[ruleType.filtervar] + "," + rule.value : rule.value
+        } else if (ruleType.isnull_filtervar && rule.value == null) {
+          params[ruleType.isnull_filtervar] = true
         } else {
           params[ruleType.filtervar] = rule.value
         }

From 03838421bc61d489cf895153d84302346c013fb3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 25 Dec 2020 19:23:53 +0100
Subject: [PATCH 0412/1300] not sure when that got in here

---
 src-ui/src/app/components/dashboard/dashboard.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts
index 0dca25d8a..a5f857b99 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.ts
+++ b/src-ui/src/app/components/dashboard/dashboard.component.ts
@@ -24,7 +24,7 @@ export class DashboardComponent implements OnInit {
     } else if (tagUsername && tagUsername.content) {
       return tagUsername.content
     } else {
-      return "null"
+      return null
     }
   }
 

From 20e724da464277266e7e7fea80badefc4bb1b15e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 25 Dec 2020 19:24:39 +0100
Subject: [PATCH 0413/1300] fixes #182

---
 src-ui/src/app/components/app-frame/app-frame.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 5fe42fc40..d191ec0de 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -1,8 +1,8 @@
 <nav class="navbar navbar-dark sticky-top bg-primary flex-md-nowrap p-0 shadow">
-  <span class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" href="#">
+  <a class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" routerLink="/dashboard">
     <img src="assets/logo-dark-notext.svg" height="18px" class="mr-2">
     <ng-container i18n="app title">Paperless-ng</ng-container>
-  </span>
+  </a>
   <button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-toggle="collapse"
     data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"
     (click)="isMenuCollapsed = !isMenuCollapsed">

From 99b5e257311d5bbc51453367dcae45cd2206861f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 25 Dec 2020 19:26:27 +0100
Subject: [PATCH 0414/1300] clarify error messages #176

---
 src/documents/consumer.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index ab07b3149..4bcb6d1d9 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -105,7 +105,8 @@ class Consumer(LoggingMixin):
 
         parser_class = get_parser_class_for_mime_type(mime_type)
         if not parser_class:
-            raise ConsumerError(f"No parsers available for {self.filename}")
+            raise ConsumerError(
+                f"Unsupported mime type {mime_type} of file {self.filename}")
         else:
             self.log("debug",
                      f"Parser: {parser_class.__name__}")

From 25fb9fb185e2b1d5bf39b741fc9b209059e80925 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 26 Dec 2020 01:08:54 +0100
Subject: [PATCH 0415/1300] better selection

---
 .../document-card-large.component.html               |  4 ++--
 .../document-card-large.component.ts                 | 12 ++++--------
 .../document-card-small.component.html               |  4 ++--
 .../document-card-small.component.ts                 | 12 ++++--------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index ac015cc52..c1757eb35 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -1,11 +1,11 @@
 <div class="card mb-3 bg-light shadow-sm" [class.card-selected]="selected" [class.document-card]="selectable">
   <div class="row no-gutters">
     <div class="col-md-2 d-none d-lg-block doc-img-background" [class.doc-img-background-selected]="selected">
-      <img [src]="getThumbUrl()" class="card-img doc-img border-right" (click)="selected = selectable ? !selected : false">
+      <img [src]="getThumbUrl()" class="card-img doc-img border-right" (click)="setSelected(selectable ? !selected : false)">
 
       <div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
         <div class="custom-control custom-checkbox">
-          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="selected = $event.target.checked">
+          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="setSelected($event.target.checked)">
           <label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
         </div>
       </div>
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
index 336af41da..e3bd4b7f7 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
@@ -12,15 +12,11 @@ export class DocumentCardLargeComponent implements OnInit {
 
   constructor(private documentService: DocumentService, private sanitizer: DomSanitizer) { }
 
-  _selected = false
-
-  get selected() {
-    return this._selected
-  }
-
   @Input()
-  set selected(value: boolean) {
-    this._selected = value
+  selected = false
+
+  setSelected(value: boolean) {
+    this.selected = value
     this.selectedChange.emit(value)
   }
 
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 4fd155559..a423252ee 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,11 +1,11 @@
 <div class="col p-2 h-100 document-card">
   <div class="card h-100 shadow-sm" [class.card-selected]="selected">
     <div class="border-bottom" [class.doc-img-background-selected]="selected">
-      <img class="card-img doc-img" [src]="getThumbUrl()" (click)="selected = !selected">
+      <img class="card-img doc-img" [src]="getThumbUrl()" (click)="setSelected(!selected)">
 
       <div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
         <div class="custom-control custom-checkbox">
-          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="selected = $event.target.checked">
+          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="setSelected($event.target.checked)">
           <label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
         </div>
       </div>
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
index 6b7f86614..ed69c5c50 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
@@ -12,15 +12,11 @@ export class DocumentCardSmallComponent implements OnInit {
 
   constructor(private documentService: DocumentService) { }
 
-  _selected = false
-
-  get selected() {
-    return this._selected
-  }
-
   @Input()
-  set selected(value: boolean) {
-    this._selected = value
+  selected = false
+
+  setSelected(value: boolean) {
+    this.selected = value
     this.selectedChange.emit(value)
   }
 

From 3f8c74c4af1c3e15670425ddfd06ff36c6b51e13 Mon Sep 17 00:00:00 2001
From: Andrew Rowson <github@growse.com>
Date: Sat, 26 Dec 2020 11:53:29 +0000
Subject: [PATCH 0416/1300] Updated bind param gunicorn config file to listen
 on ipv6

---
 docker/gunicorn.conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/gunicorn.conf.py b/docker/gunicorn.conf.py
index a2f456079..88d881664 100644
--- a/docker/gunicorn.conf.py
+++ b/docker/gunicorn.conf.py
@@ -1,4 +1,4 @@
-bind = '127.0.0.1:8000'
+bind = '[::]:8000'
 backlog = 2048
 workers = 3
 worker_class = 'sync'

From 5e5059b2e77f684aae3bd4c84c4699824f766161 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 26 Dec 2020 21:16:12 -0800
Subject: [PATCH 0417/1300] Prevent iOS input zoom

---
 src-ui/src/styles.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss
index 6e09db630..7e9a9377a 100644
--- a/src-ui/src/styles.scss
+++ b/src-ui/src/styles.scss
@@ -100,3 +100,13 @@ body {
     padding-top: 1px;
   }
 }
+
+@supports (-webkit-touch-callout: none) {
+  input[type="number"],
+  input[type="search"],
+  input[type="text"],
+  select:focus,
+  textarea {
+    font-size: 16px;
+  }
+}

From 320298e3ffb5a750024377867188475a921de831 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 27 Dec 2020 12:43:05 +0100
Subject: [PATCH 0418/1300] add api method to get selection data

---
 src/documents/serialisers.py |  8 +++++
 src/documents/views.py       | 60 ++++++++++++++++++++++++++++++++++--
 src/paperless/urls.py        |  7 +++--
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index f34176d8a..155030a68 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -393,3 +393,11 @@ class PostDocumentSerializer(serializers.Serializer):
             return [tag.id for tag in tags]
         else:
             return None
+
+
+class SelectionDataSerializer(serializers.Serializer):
+
+    documents = serializers.ListField(
+        required=True,
+        child=serializers.IntegerField()
+    )
diff --git a/src/documents/views.py b/src/documents/views.py
index 8f6ec7f13..d4d7b7123 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -4,7 +4,7 @@ from datetime import datetime
 from time import mktime
 
 from django.conf import settings
-from django.db.models import Count, Max
+from django.db.models import Count, Max, Case, When, IntegerField
 from django.http import HttpResponse, HttpResponseBadRequest, Http404
 from django.views.decorators.cache import cache_control
 from django.views.generic import TemplateView
@@ -48,7 +48,7 @@ from .serialisers import (
     DocumentTypeSerializer,
     PostDocumentSerializer,
     SavedViewSerializer,
-    BulkEditSerializer
+    BulkEditSerializer, SelectionDataSerializer
 )
 
 
@@ -372,6 +372,62 @@ class PostDocumentView(APIView):
         return Response("OK")
 
 
+class SelectionDataView(APIView):
+
+    permission_classes = (IsAuthenticated,)
+    serializer_class = SelectionDataSerializer
+    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)
+
+        ids = serializer.validated_data.get('documents')
+
+        correspondents = Correspondent.objects.annotate(dcount=Count(Case(
+            When(documents__id__in=ids, then=1),
+            output_field=IntegerField()
+        )))
+
+        tags = Tag.objects.annotate(dcount=Count(Case(
+            When(documents__id__in=ids, then=1),
+            output_field=IntegerField()
+        )))
+
+        types = DocumentType.objects.annotate(dcount=Count(Case(
+            When(documents__id__in=ids, then=1),
+            output_field=IntegerField()
+        )))
+
+        r = Response({
+            "selected_correspondents": [{
+                "id": t.id,
+                "dcount": t.dcount
+            } for t in correspondents],
+            "selected_tags": [{
+                "id": t.id,
+                "dcount": t.dcount
+            } for t in tags],
+            "selected_types": [{
+                "id": t.id,
+                "dcount": t.dcount
+            } for t in types]
+        })
+
+        return r
+
+
 class SearchView(APIView):
 
     permission_classes = (IsAuthenticated,)
diff --git a/src/paperless/urls.py b/src/paperless/urls.py
index 831eb02b4..39e99a7a4 100755
--- a/src/paperless/urls.py
+++ b/src/paperless/urls.py
@@ -19,7 +19,8 @@ from documents.views import (
     StatisticsView,
     PostDocumentView,
     SavedViewViewSet,
-    BulkEditView
+    BulkEditView,
+    SelectionDataView
 )
 from paperless.views import FaviconView
 
@@ -53,10 +54,12 @@ urlpatterns = [
         re_path(r"^documents/post_document/", PostDocumentView.as_view(),
                 name="post_document"),
 
-
         re_path(r"^documents/bulk_edit/", BulkEditView.as_view(),
                 name="bulk_edit"),
 
+        re_path(r"^documents/selection_data/", SelectionDataView.as_view(),
+                name="selection_data"),
+
         path('token/', views.obtain_auth_token)
 
     ] + api_router.urls)),

From 802bd7fb0dc872ab22da6fd2fe405c445772c9d1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 27 Dec 2020 12:54:47 +0100
Subject: [PATCH 0419/1300] client support for selection data

---
 .../src/app/services/rest/document.service.ts | 18 +++++++++++++++-
 src/documents/views.py                        | 21 ++++++++++---------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index ff17e972e..9caaecdb2 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { PaperlessDocumentMetadata } from 'src/app/data/paperless-document-metadata';
 import { AbstractPaperlessService } from './abstract-paperless-service';
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { Results } from 'src/app/data/results';
 import { FilterRule } from 'src/app/data/filter-rule';
@@ -22,6 +22,17 @@ export const DOCUMENT_SORT_FIELDS = [
   { field: 'modified', name: $localize`Modified` }
 ]
 
+export interface SelectionDataItem {
+  id: number
+  document_count: number
+}
+
+export interface SelectionData {
+  correspondents: SelectionDataItem[]
+  tags: SelectionDataItem[]
+  document_types: SelectionDataItem[]
+}
+
 @Injectable({
   providedIn: 'root'
 })
@@ -114,4 +125,9 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     })
   }
 
+  selectionData(ids: number[]): Observable<SelectionData> {
+    console.log(ids)
+    return this.http.post<SelectionData>(this.getResourceUrl(null, 'selection_data'), {"documents": ids})
+  }
+
 }
diff --git a/src/documents/views.py b/src/documents/views.py
index d4d7b7123..a50896057 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -395,17 +395,18 @@ class SelectionDataView(APIView):
 
         ids = serializer.validated_data.get('documents')
 
-        correspondents = Correspondent.objects.annotate(dcount=Count(Case(
+        correspondents = Correspondent.objects.annotate(
+            document_count=Count(Case(
+                When(documents__id__in=ids, then=1),
+                output_field=IntegerField()
+            )))
+
+        tags = Tag.objects.annotate(document_count=Count(Case(
             When(documents__id__in=ids, then=1),
             output_field=IntegerField()
         )))
 
-        tags = Tag.objects.annotate(dcount=Count(Case(
-            When(documents__id__in=ids, then=1),
-            output_field=IntegerField()
-        )))
-
-        types = DocumentType.objects.annotate(dcount=Count(Case(
+        types = DocumentType.objects.annotate(document_count=Count(Case(
             When(documents__id__in=ids, then=1),
             output_field=IntegerField()
         )))
@@ -413,15 +414,15 @@ class SelectionDataView(APIView):
         r = Response({
             "selected_correspondents": [{
                 "id": t.id,
-                "dcount": t.dcount
+                "document_count": t.document_count
             } for t in correspondents],
             "selected_tags": [{
                 "id": t.id,
-                "dcount": t.dcount
+                "document_count": t.document_count
             } for t in tags],
             "selected_types": [{
                 "id": t.id,
-                "dcount": t.dcount
+                "document_count": t.document_count
             } for t in types]
         })
 

From 4b9a8f340902427229119e5ae5da2e6151872bdf Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 27 Dec 2020 13:07:58 +0100
Subject: [PATCH 0420/1300] move document count into matching model

---
 src-ui/src/app/data/matching-model.ts          | 2 ++
 src-ui/src/app/data/paperless-correspondent.ts | 2 --
 src-ui/src/app/data/paperless-document-type.ts | 2 --
 src-ui/src/app/data/paperless-tag.ts           | 3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/data/matching-model.ts b/src-ui/src/app/data/matching-model.ts
index dd9ae95ff..dfb007ecb 100644
--- a/src-ui/src/app/data/matching-model.ts
+++ b/src-ui/src/app/data/matching-model.ts
@@ -29,4 +29,6 @@ export interface MatchingModel extends ObjectWithId {
 
     is_insensitive?: boolean
 
+    document_count?: number
+
 }
diff --git a/src-ui/src/app/data/paperless-correspondent.ts b/src-ui/src/app/data/paperless-correspondent.ts
index 217e62529..f2ff18525 100644
--- a/src-ui/src/app/data/paperless-correspondent.ts
+++ b/src-ui/src/app/data/paperless-correspondent.ts
@@ -1,8 +1,6 @@
 import { MatchingModel } from './matching-model';
 
 export interface PaperlessCorrespondent extends MatchingModel {
-
-  document_count?: number
   
   last_correspondence?: Date
 
diff --git a/src-ui/src/app/data/paperless-document-type.ts b/src-ui/src/app/data/paperless-document-type.ts
index d099bec47..b1d002461 100644
--- a/src-ui/src/app/data/paperless-document-type.ts
+++ b/src-ui/src/app/data/paperless-document-type.ts
@@ -2,6 +2,4 @@ import { MatchingModel } from './matching-model';
 
 export interface PaperlessDocumentType extends MatchingModel {
 
-  document_count?: number
-
 }
diff --git a/src-ui/src/app/data/paperless-tag.ts b/src-ui/src/app/data/paperless-tag.ts
index b13653e91..45ef8a613 100644
--- a/src-ui/src/app/data/paperless-tag.ts
+++ b/src-ui/src/app/data/paperless-tag.ts
@@ -23,6 +23,5 @@ export interface PaperlessTag extends MatchingModel {
     colour?: number
 
     is_inbox_tag?: boolean
-  
-    document_count?: number
+
 }

From a2ad62b3104cbca843ab07cd151334af2d1a1887 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 27 Dec 2020 13:10:43 +0100
Subject: [PATCH 0421/1300] typing

---
 .../filterable-dropdown.component.ts                   | 10 ++++------
 .../toggleable-dropdown-button.component.ts            |  6 ++----
 .../filter-editor/filter-editor.component.ts           |  5 ++---
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 3f0b3c3ad..e66966486 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -1,10 +1,8 @@
 import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } 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';
 import { FilterPipe } from  'src/app/pipes/filter.pipe';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
 import { ToggleableItem, ToggleableItemState } from './toggleable-dropdown-button/toggleable-dropdown-button.component';
+import { MatchingModel } from 'src/app/data/matching-model';
 
 export enum FilterableDropdownType {
   Filtering = 'filtering',
@@ -24,7 +22,7 @@ export class FilterableDropdownComponent {
   filterText: string
 
   @Input()
-  set items(items: (PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[]) {
+  set items(items: MatchingModel[]) {
     if (items) {
       this._toggleableItems = items.map(i => {
         return {item: i, state: ToggleableItemState.NotSelected, count: i.document_count}
@@ -45,13 +43,13 @@ export class FilterableDropdownComponent {
   }
 
   @Input()
-  set itemsSelected(itemsSelected: (PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[]) {
+  set itemsSelected(itemsSelected: MatchingModel[]) {
     this.toggleableItems.forEach(i => {
       i.state = (itemsSelected.find(is => is.id == i.item.id)) ? ToggleableItemState.Selected : ToggleableItemState.NotSelected
     })
   }
 
-  get itemsSelected() :(PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[] {
+  get itemsSelected(): MatchingModel[] {
     return this.toggleableItems.filter(ti => ti.state == ToggleableItemState.Selected).map(ti => ti.item)
   }
 
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
index 4d58023ad..adfea556a 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
@@ -1,10 +1,8 @@
 import { Component, EventEmitter, Input, Output, OnInit } 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';
+import { MatchingModel } from 'src/app/data/matching-model';
 
 export interface ToggleableItem {
-  item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent,
+  item: MatchingModel,
   state: ToggleableItemState,
   count: number
 }
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index 2d88579f9..dfc0e4e2c 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -4,7 +4,7 @@ import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 import { Subject, Subscription } from 'rxjs';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
-import { NgbDateParserFormatter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap';
 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';
@@ -42,8 +42,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   constructor(
     private documentTypeService: DocumentTypeService,
     private tagService: TagService,
-    private correspondentService: CorrespondentService,
-    private dateParser: NgbDateParserFormatter
+    private correspondentService: CorrespondentService
   ) { }
 
   tags: PaperlessTag[] = []

From bf79b252ad011df752bc32d07910c7723d0dcd60 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 27 Dec 2020 13:12:01 +0100
Subject: [PATCH 0422/1300] remove "Remove All"

---
 .../filterable-dropdown/filterable-dropdown.component.html  | 6 ------
 .../filterable-dropdown/filterable-dropdown.component.ts    | 6 ------
 .../document-list/bulk-editor/bulk-editor.component.html    | 6 ------
 3 files changed, 18 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index f9bf78b6c..58c831456 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -19,12 +19,6 @@
           <input class="form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
         </div>
       </div>
-      <button *ngIf="showRemoveAll" role="menuitem" class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-left-0 border-right-0 border-bottom" (click)="removeAll.next()">
-        <svg class="toolbaricon text-danger" fill="currentColor">
-          <use xlink:href="assets/bootstrap-icons.svg#x" />
-        </svg>
-        <small class="my-1">Remove All</small>
-      </button>
       <div *ngIf="toggleableItems" class="items">
         <ng-container *ngFor="let toggleableItem of toggleableItems | filter: filterText">
           <app-toggleable-dropdown-button [toggleableItem]="toggleableItem" [showCounts]="showCounts" (toggle)="toggleItem($event)"></app-toggleable-dropdown-button>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index e66966486..bffbb86e1 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -67,18 +67,12 @@ export class FilterableDropdownComponent {
   @Input()
   singular: boolean = false
 
-  @Input()
-  showRemoveAll: boolean = false
-
   @Output()
   toggle = new EventEmitter()
 
   @Output()
   open = new EventEmitter()
 
-  @Output()
-  removeAll = new EventEmitter()
-
   @Output()
   editingComplete = new EventEmitter()
 
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index f27d6d201..aa85fdb12 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -33,27 +33,21 @@
         [toggleableItems]="tagsToggleableItems"
         [type]="dropdownTypes.Editing"
         [showCounts]="!selectionSpansPages"
-        [showRemoveAll]="selectionSpansPages"
         (open)="tagsDropdownOpen()"
-        (removeAll)="setTags(null)"
         (editingComplete)="setTags($event)">
       </app-filterable-dropdown>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" singular="true"
         [toggleableItems]="correspondentsToggleableItems"
         [type]="dropdownTypes.Editing"
         [showCounts]="!selectionSpansPages"
-        [showRemoveAll]="selectionSpansPages"
         (open)="correspondentsDropdownOpen()"
-        (removeAll)="setCorrespondents(null)"
         (editingComplete)="setCorrespondents($event)">
       </app-filterable-dropdown>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" singular="true"
         [toggleableItems]="documentTypesToggleableItems"
         [type]="dropdownTypes.Editing"
         [showCounts]="!selectionSpansPages"
-        [showRemoveAll]="selectionSpansPages"
         (open)="documentTypesDropdownOpen()"
-        (removeAll)="setDocumentTypes(null)"
         (editingComplete)="setDocumentTypes($event)">
       </app-filterable-dropdown>
     </div>

From 3dd4583ea84cf07a379fcf3c99e5b8438cab8a53 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 27 Dec 2020 13:23:11 +0100
Subject: [PATCH 0423/1300] always show count badges

---
 .../filterable-dropdown.component.html                |  2 +-
 .../filterable-dropdown.component.ts                  | 11 -----------
 .../toggleable-dropdown-button.component.html         |  2 +-
 .../toggleable-dropdown-button.component.ts           |  3 ---
 .../bulk-editor/bulk-editor.component.html            |  3 ---
 5 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 58c831456..5f9440336 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -21,7 +21,7 @@
       </div>
       <div *ngIf="toggleableItems" class="items">
         <ng-container *ngFor="let toggleableItem of toggleableItems | filter: filterText">
-          <app-toggleable-dropdown-button [toggleableItem]="toggleableItem" [showCounts]="showCounts" (toggle)="toggleItem($event)"></app-toggleable-dropdown-button>
+          <app-toggleable-dropdown-button [toggleableItem]="toggleableItem" (toggle)="toggleItem($event)"></app-toggleable-dropdown-button>
         </ng-container>
       </div>
       <button *ngIf="type == types.Editing" class="list-group-item list-group-item-action bg-light" (click)="dropdown.close()" [disabled]="!hasBeenToggled || (toggleableItems | filter: filterText).length == 0">
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index bffbb86e1..45a037f65 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -76,17 +76,6 @@ export class FilterableDropdownComponent {
   @Output()
   editingComplete = new EventEmitter()
 
-  _showCounts: boolean = true
-
-  @Input()
-  set showCounts(show: boolean) {
-    this._showCounts = show
-  }
-
-  get showCounts(): boolean {
-    return this._showCounts && (this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected.length == 0))
-  }
-
   hasBeenToggled:boolean = false
 
   constructor(private filterPipe: FilterPipe) { }
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
index 32f9c58ad..daa72b41d 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
@@ -8,5 +8,5 @@
     <app-tag *ngIf="isTag; else displayName" [tag]="toggleableItem?.item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
     <ng-template #displayName><small>{{toggleableItem?.item.name}}</small></ng-template>
   </div>
-  <div *ngIf="showCounts" class="badge badge-light rounded-pill ml-auto mr-1">{{toggleableItem?.count}}</div>
+  <div class="badge badge-light rounded-pill ml-auto mr-1">{{toggleableItem?.count}}</div>
 </button>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
index adfea556a..400029615 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
@@ -23,9 +23,6 @@ export class ToggleableDropdownButtonComponent {
   @Input()
   toggleableItem: ToggleableItem
 
-  @Input()
-  showCounts: boolean = true
-
   @Output()
   toggle = new EventEmitter()
 
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index aa85fdb12..fd619717f 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -32,21 +32,18 @@
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill"
         [toggleableItems]="tagsToggleableItems"
         [type]="dropdownTypes.Editing"
-        [showCounts]="!selectionSpansPages"
         (open)="tagsDropdownOpen()"
         (editingComplete)="setTags($event)">
       </app-filterable-dropdown>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" singular="true"
         [toggleableItems]="correspondentsToggleableItems"
         [type]="dropdownTypes.Editing"
-        [showCounts]="!selectionSpansPages"
         (open)="correspondentsDropdownOpen()"
         (editingComplete)="setCorrespondents($event)">
       </app-filterable-dropdown>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" singular="true"
         [toggleableItems]="documentTypesToggleableItems"
         [type]="dropdownTypes.Editing"
-        [showCounts]="!selectionSpansPages"
         (open)="documentTypesDropdownOpen()"
         (editingComplete)="setDocumentTypes($event)">
       </app-filterable-dropdown>

From a283b815ef3f07be46af85ff18aa5f9f00df60dd Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 27 Dec 2020 13:34:36 +0100
Subject: [PATCH 0424/1300] refactor

---
 .../toggleable-dropdown-button.component.ts           | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
index 400029615..cffbc916f 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
@@ -36,9 +36,12 @@ export class ToggleableDropdownButtonComponent {
   }
 
   getSelectedIconName() {
-    let iconName = ''
-    if (this.toggleableItem?.state == ToggleableItemState.Selected) iconName = 'check'
-    else if (this.toggleableItem?.state == ToggleableItemState.PartiallySelected) iconName = 'dash'
-    return iconName
+    if (this.toggleableItem?.state == ToggleableItemState.Selected) {
+      return "check"
+    } else if (this.toggleableItem?.state == ToggleableItemState.PartiallySelected) {
+      return "dash"
+    } else {
+      return ""
+    }
   }
 }

From c2a47ca4b10c283868dfd8e9ced9af971a0e1abf Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 27 Dec 2020 13:34:54 +0100
Subject: [PATCH 0425/1300] remove "selectionSpansPages"

---
 .../document-list/bulk-editor/bulk-editor.component.ts   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index a5732b922..4365e00b0 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -39,16 +39,11 @@ export class BulkEditorComponent {
 
   dropdownTypes = FilterableDropdownType
 
-  get selectionSpansPages(): boolean {
-    return this.documentList.selected.size > this.documentList.documents.length || !Array.from(this.documentList.selected).every(sd => this.documentList.documents.find(d => d.id == sd))
-  }
-
   private _tagsToggleableItems: ToggleableItem[]
   get tagsToggleableItems(): ToggleableItem[] {
     let tagsToggleableItems = []
     let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id))
-    if (this.selectionSpansPages) selectedDocuments = []
-
+ 
     this.tags?.forEach(t => {
       let selectedDocumentsWithTag: PaperlessDocument[] = selectedDocuments.filter(d => d.tags.includes(t.id))
       let state = ToggleableItemState.NotSelected
@@ -64,7 +59,6 @@ export class BulkEditorComponent {
   get correspondentsToggleableItems(): ToggleableItem[] {
     let correspondentsToggleableItems = []
     let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id))
-    if (this.selectionSpansPages) selectedDocuments = []
 
     this.correspondents?.forEach(c => {
       let selectedDocumentsWithCorrespondent: PaperlessDocument[] = selectedDocuments.filter(d => d.correspondent == c.id)
@@ -81,7 +75,6 @@ export class BulkEditorComponent {
   get documentTypesToggleableItems(): ToggleableItem[] {
     let documentTypesToggleableItems = []
     let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id))
-    if (this.selectionSpansPages) selectedDocuments = []
 
     this.documentTypes?.forEach(dt => {
       let selectedDocumentsWithDocumentType: PaperlessDocument[] = selectedDocuments.filter(d => d.document_type == dt.id)

From fb830699752a13c044dcd00468a203c4ddcc6671 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 27 Dec 2020 14:50:57 +0100
Subject: [PATCH 0426/1300] fix test case.

---
 src/documents/tests/test_consumer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index f53981850..795ca7f95 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -350,7 +350,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
         try:
             self.consumer.try_consume_file(self.get_test_file())
         except ConsumerError as e:
-            self.assertTrue("No parsers abvailable for" in str(e))
+            self.assertEqual("Unsupported mime type application/pdf of file sample.pdf", str(e))
             return
 
         self.fail("Should throw exception")

From 6a70369a77246d298eb741a832736ad0148ec8ad Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 27 Dec 2020 17:05:35 +0100
Subject: [PATCH 0427/1300] update index after bulk edit operations #195

---
 src/documents/bulk_edit.py      | 27 +++++++++++++++++++++++++
 src/documents/index.py          | 13 +++++-------
 src/documents/tasks.py          |  9 +++++++++
 src/documents/tests/test_api.py | 36 ++++++++++++++++-----------------
 4 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index aa5b8ea3f..fd787f56a 100644
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -1,6 +1,8 @@
 from django.db.models import Q
 from django_q.tasks import async_task
+from whoosh.writing import AsyncWriter
 
+from documents import index
 from documents.models import Document, Correspondent, DocumentType
 
 
@@ -13,6 +15,11 @@ def set_correspondent(doc_ids, correspondent):
     affected_docs = [doc.id for doc in qs]
     qs.update(correspondent=correspondent)
 
+    async_task(
+        "documents.tasks.bulk_index_documents",
+        document_ids=affected_docs
+    )
+
     async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
 
     return "OK"
@@ -27,6 +34,11 @@ def set_document_type(doc_ids, document_type):
     affected_docs = [doc.id for doc in qs]
     qs.update(document_type=document_type)
 
+    async_task(
+        "documents.tasks.bulk_index_documents",
+        document_ids=affected_docs
+    )
+
     async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
 
     return "OK"
@@ -44,6 +56,11 @@ def add_tag(doc_ids, tag):
             document_id=doc, tag_id=tag) for doc in affected_docs
     ])
 
+    async_task(
+        "documents.tasks.bulk_index_documents",
+        document_ids=affected_docs
+    )
+
     async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
 
     return "OK"
@@ -61,6 +78,11 @@ def remove_tag(doc_ids, tag):
         Q(tag_id=tag)
     ).delete()
 
+    async_task(
+        "documents.tasks.bulk_index_documents",
+        document_ids=affected_docs
+    )
+
     async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
 
     return "OK"
@@ -69,4 +91,9 @@ def remove_tag(doc_ids, tag):
 def delete(doc_ids):
     Document.objects.filter(id__in=doc_ids).delete()
 
+    ix = index.open_index()
+    with AsyncWriter(ix) as writer:
+        for id in doc_ids:
+            index.remove_document_by_id(writer, id)
+
     return "OK"
diff --git a/src/documents/index.py b/src/documents/index.py
index 308ee932e..51197e252 100644
--- a/src/documents/index.py
+++ b/src/documents/index.py
@@ -87,11 +87,6 @@ def open_index(recreate=False):
 
 
 def update_document(writer, doc):
-    # TODO: this line caused many issues all around, since:
-    #  We need to make sure that this method does not get called with
-    #  deserialized documents (i.e, document objects that don't come from
-    #  Django's ORM interfaces directly.
-    logger.debug("Indexing {}...".format(doc))
     tags = ",".join([t.name for t in doc.tags.all()])
     writer.update_document(
         id=doc.pk,
@@ -107,9 +102,11 @@ def update_document(writer, doc):
 
 
 def remove_document(writer, doc):
-    # TODO: see above.
-    logger.debug("Removing {} from index...".format(doc))
-    writer.delete_by_term('id', doc.pk)
+    remove_document_by_id(writer, doc.pk)
+
+
+def remove_document_by_id(writer, doc_id):
+    writer.delete_by_term('id', doc_id)
 
 
 def add_or_update_document(document):
diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index fafe6e10f..c1f3ffbaa 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -94,3 +94,12 @@ def bulk_rename_files(document_ids):
     qs = Document.objects.filter(id__in=document_ids)
     for doc in qs:
         post_save.send(Document, instance=doc, created=False)
+
+
+def bulk_index_documents(document_ids):
+    documents = Document.objects.filter(id__in=document_ids)
+
+    ix = index.open_index()
+    with AsyncWriter(ix) as writer:
+        for doc in documents:
+            index.update_document(writer, doc)
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 0262b6d6a..35b998a9d 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -699,49 +699,49 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1)
         bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], self.c2.id)
         self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 3)
-        self.async_task.assert_called_once()
-        args, kwargs = self.async_task.call_args
-        self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id])
+        self.assertEqual(self.async_task.call_count, 2)
+        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id])
+        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id])
 
     def test_unset_correspondent(self):
         self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1)
         bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], None)
         self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 0)
-        self.async_task.assert_called_once()
-        args, kwargs = self.async_task.call_args
-        self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id])
+        self.assertEqual(self.async_task.call_count, 2)
+        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id])
+        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id])
 
     def test_set_document_type(self):
         self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1)
         bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], self.dt2.id)
         self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 3)
-        self.async_task.assert_called_once()
-        args, kwargs = self.async_task.call_args
-        self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id])
+        self.assertEqual(self.async_task.call_count, 2)
+        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id])
+        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id])
 
     def test_unset_document_type(self):
         self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1)
         bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], None)
         self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 0)
-        self.async_task.assert_called_once()
-        args, kwargs = self.async_task.call_args
-        self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id])
+        self.assertEqual(self.async_task.call_count, 2)
+        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id])
+        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id])
 
     def test_add_tag(self):
         self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2)
         bulk_edit.add_tag([self.doc1.id, self.doc2.id, self.doc3.id, self.doc4.id], self.t1.id)
         self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 4)
-        self.async_task.assert_called_once()
-        args, kwargs = self.async_task.call_args
-        self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc3.id])
+        self.assertEqual(self.async_task.call_count, 2)
+        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc3.id])
+        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc3.id])
 
     def test_remove_tag(self):
         self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2)
         bulk_edit.remove_tag([self.doc1.id, self.doc3.id, self.doc4.id], self.t1.id)
         self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 1)
-        self.async_task.assert_called_once()
-        args, kwargs = self.async_task.call_args
-        self.assertCountEqual(kwargs['document_ids'], [self.doc4.id])
+        self.assertEqual(self.async_task.call_count, 2)
+        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc4.id])
+        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc4.id])
 
     def test_delete(self):
         self.assertEqual(Document.objects.count(), 5)

From 131ebf0480d88b6f6363785b42e0ae3259495992 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Sun, 27 Dec 2020 17:07:33 +0100
Subject: [PATCH 0428/1300] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7a5f6028d..7f3808905 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![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)
-[![Coverage Status](https://coveralls.io/repos/github/jonaswinkler/paperless-ng/badge.svg?branch=master)](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master)  *<sup><-- green badge, yay :)</sup>*
+[![Coverage Status](https://coveralls.io/repos/github/jonaswinkler/paperless-ng/badge.svg?branch=master)](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master)
 
 # Paperless-ng
 

From 0560ac2a957957030b695b7645d2d35f7809b683 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sun, 27 Dec 2020 20:01:21 +0100
Subject: [PATCH 0429/1300] Use conditions to prevent builds on branches / tags
 other than master, dev and ng-*

---
 .travis.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e5f3cd91e..cf18825e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ jobs:
         - docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64
       on:
-        condition: '"${BUILD_DOCKER}" = 1'
+        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
     - stage: build_docker
       name: arm64v8 docker build
       services:
@@ -68,8 +68,7 @@ jobs:
       virt: vm
       group: edge
       on:
-        condition: '"${BUILD_DOCKER}" = 1'
-    
+        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
     - stage: build_docker
       name: arm32v7 docker build
       services:
@@ -94,8 +93,7 @@ jobs:
       env:
         - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
       on:
-        condition: '"${BUILD_DOCKER}" = 1'
-    
+        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
     - stage: publish_manifest
       env:
         - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
@@ -131,7 +129,7 @@ jobs:
             echo "Not a tag and not on master, so not pushing tag/master specific manifest"
           fi
       on:
-        condition: '"${BUILD_DOCKER}" = 1'
+        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
 
 
 before_install:

From b8e7506de42723538faac6aab528a0b17ad8290f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 27 Dec 2020 23:55:19 +0100
Subject: [PATCH 0430/1300] partial selection model implementation

---
 .../date-dropdown/date-dropdown.component.ts  |  12 +-
 .../filterable-dropdown.component.html        |  12 +-
 .../filterable-dropdown.component.ts          | 145 ++++++++----
 .../toggleable-dropdown-button.component.ts   |   3 +-
 .../bulk-editor/bulk-editor.component.html    |   4 +-
 .../filter-editor.component.html              |  10 +-
 .../filter-editor/filter-editor.component.ts  | 222 +++++++-----------
 7 files changed, 199 insertions(+), 209 deletions(-)

diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
index e787ce11e..1bf5d0216 100644
--- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
+++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
@@ -30,9 +30,15 @@ export class DateDropdownComponent implements OnInit, OnDestroy {
   @Input()
   dateBefore: string
 
+  @Output()
+  dateBeforeChange = new EventEmitter<string>()
+
   @Input()
   dateAfter: string
 
+  @Output()
+  dateAfterChange = new EventEmitter<string>()
+
   @Input()
   title: string
 
@@ -83,6 +89,8 @@ export class DateDropdownComponent implements OnInit, OnDestroy {
   }
 
   onChange() {
+    this.dateAfterChange.emit(this.dateAfter)
+    this.dateBeforeChange.emit(this.dateBefore)
     this.datesSet.emit({after: this.dateAfter, before: this.dateBefore})
   }
 
@@ -91,12 +99,12 @@ export class DateDropdownComponent implements OnInit, OnDestroy {
   }
 
   clearBefore() {
-    this.dateBefore = null;
+    this.dateBefore = null
     this.onChange()
   }
 
   clearAfter() {
-    this.dateAfter = null;
+    this.dateAfter = null
     this.onChange()
   }
 
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 5f9440336..1261ff921 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -1,14 +1,14 @@
 <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown">
-  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="type !== types.Editing && itemsSelected?.length > 0 ? 'btn-primary' : 'btn-outline-primary'">
+  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="type !== types.Editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'">
     <div class="d-none d-md-inline">{{title}}</div>
     <div class="d-inline-block d-md-none">
       <svg class="toolbaricon" fill="currentColor">
         <use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
       </svg>
     </div>
-    <ng-container *ngIf="type !== types.Editing && itemsSelected?.length > 0">
+    <ng-container *ngIf="type !== types.Editing && selectionModel.selectionSize() > 0">
       <div class="badge bg-secondary text-light rounded-pill badge-corner">
-        {{itemsSelected?.length}}
+        {{selectionModel.selectionSize()}}
       </div>
     </ng-container>
   </button>
@@ -19,9 +19,9 @@
           <input class="form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
         </div>
       </div>
-      <div *ngIf="toggleableItems" class="items">
-        <ng-container *ngFor="let toggleableItem of toggleableItems | filter: filterText">
-          <app-toggleable-dropdown-button [toggleableItem]="toggleableItem" (toggle)="toggleItem($event)"></app-toggleable-dropdown-button>
+      <div *ngIf="selectionModel.items" class="items">
+        <ng-container *ngFor="let toggleableItem of selectionModel.items | filter: filterText">
+          <app-toggleable-dropdown-button [toggleableItem]="toggleableItem" (toggle)="selectionModel.toggle(toggleableItem.item)"></app-toggleable-dropdown-button>
         </ng-container>
       </div>
       <button *ngIf="type == types.Editing" class="list-group-item list-group-item-action bg-light" (click)="dropdown.close()" [disabled]="!hasBeenToggled || (toggleableItems | filter: filterText).length == 0">
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 45a037f65..31c9d064e 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -3,12 +3,55 @@ import { FilterPipe } from  'src/app/pipes/filter.pipe';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
 import { ToggleableItem, ToggleableItemState } from './toggleable-dropdown-button/toggleable-dropdown-button.component';
 import { MatchingModel } from 'src/app/data/matching-model';
+import { Subject } from 'rxjs';
 
 export enum FilterableDropdownType {
   Filtering = 'filtering',
   Editing = 'editing'
 }
 
+export class FilterableDropdownSelectionModel {
+
+  changed = new Subject<FilterableDropdownSelectionModel>()
+
+  multiple = false
+
+  items: ToggleableItem[] = []
+
+  getSelected() {
+    return this.items.filter(i => i.state == ToggleableItemState.Selected).map(i => i.item)
+  }
+
+
+
+  toggle(item: MatchingModel, fireEvent = true) {
+    console.log("TOGGLE TAG")
+    let toggleableItem = this.items.find(i => i.item == item)
+    console.log(toggleableItem)
+
+    if (toggleableItem) {
+      if (toggleableItem.state == ToggleableItemState.Selected) {
+        toggleableItem.state = ToggleableItemState.NotSelected
+      } else {
+        this.items.forEach(i => {
+          if (i.item == item) {
+            i.state = ToggleableItemState.Selected
+          } else if (!this.multiple) {
+            i.state = ToggleableItemState.NotSelected
+          }
+        })
+      }
+      if (fireEvent) {
+        this.changed.next(this)
+      }
+    }
+  }
+
+  selectionSize() {
+    return this.getSelected().length
+  }
+}
+
 @Component({
   selector: 'app-filterable-dropdown',
   templateUrl: './filterable-dropdown.component.html',
@@ -24,33 +67,45 @@ export class FilterableDropdownComponent {
   @Input()
   set items(items: MatchingModel[]) {
     if (items) {
-      this._toggleableItems = items.map(i => {
+      this._selectionModel.items = items.map(i => {
         return {item: i, state: ToggleableItemState.NotSelected, count: i.document_count}
       })
     }
   }
 
-  _toggleableItems: ToggleableItem[] = []
-
-  @Input()
-  set toggleableItems (toggleableItems: ToggleableItem[]) {
-    if (this.type == FilterableDropdownType.Editing && this.dropdown?.isOpen()) return
-    else this._toggleableItems = toggleableItems
+  get items(): MatchingModel[] {
+    return this._selectionModel.items.map(i => i.item)
   }
 
-  get toggleableItems(): ToggleableItem[] {
-    return this._toggleableItems
-  }
+  _selectionModel = new FilterableDropdownSelectionModel()
 
   @Input()
-  set itemsSelected(itemsSelected: MatchingModel[]) {
-    this.toggleableItems.forEach(i => {
-      i.state = (itemsSelected.find(is => is.id == i.item.id)) ? ToggleableItemState.Selected : ToggleableItemState.NotSelected
+  set selectionModel(model: FilterableDropdownSelectionModel) {
+    if (this.selectionModel) {
+      this.selectionModel.changed.complete()
+      model.items = this.selectionModel.items
+      model.multiple = this.selectionModel.multiple
+    }
+    model.changed.subscribe(updatedModel => {
+      this.selectionModelChange.next(updatedModel)
     })
+    this._selectionModel = model
   }
 
-  get itemsSelected(): MatchingModel[] {
-    return this.toggleableItems.filter(ti => ti.state == ToggleableItemState.Selected).map(ti => ti.item)
+  get selectionModel(): FilterableDropdownSelectionModel {
+    return this._selectionModel
+  }
+
+  @Output()
+  selectionModelChange = new EventEmitter<FilterableDropdownSelectionModel>()
+
+  @Input()
+  set multiple(value: boolean) {
+    this.selectionModel.multiple = value
+  }
+
+  get multiple() {
+    return this.selectionModel.multiple
   }
 
   @Input()
@@ -64,50 +119,40 @@ export class FilterableDropdownComponent {
 
   types = FilterableDropdownType
 
-  @Input()
-  singular: boolean = false
-
-  @Output()
-  toggle = new EventEmitter()
-
-  @Output()
-  open = new EventEmitter()
-
-  @Output()
-  editingComplete = new EventEmitter()
-
   hasBeenToggled:boolean = false
 
-  constructor(private filterPipe: FilterPipe) { }
+  constructor(private filterPipe: FilterPipe) {
+    this.selectionModel = new FilterableDropdownSelectionModel()
+  }
 
   toggleItem(toggleableItem: ToggleableItem): void {
-    if (this.singular && toggleableItem.state == ToggleableItemState.Selected) {
-      this._toggleableItems.filter(ti => ti.item.id !== toggleableItem.item.id).forEach(ti => ti.state = ToggleableItemState.NotSelected)
-    }
-    this.hasBeenToggled = true
-    this.toggle.emit(toggleableItem.item)
+    // if (this.singular && toggleableItem.state == ToggleableItemState.Selected) {
+    //   this.selectionModel.items.filter(ti => ti.item.id !== toggleableItem.item.id).forEach(ti => ti.state = ToggleableItemState.NotSelected)
+    // }
+    // this.hasBeenToggled = true
+    // this.toggle.emit(toggleableItem.item)
   }
 
   dropdownOpenChange(open: boolean): void {
-    if (open) {
-      setTimeout(() => {
-        this.listFilterTextInput.nativeElement.focus();
-      }, 0)
-      this.hasBeenToggled = false
-      this.open.next()
-    } else {
-      this.filterText = ''
-      if (this.type == FilterableDropdownType.Editing) this.editingComplete.emit(this.toggleableItems)
-    }
+    // if (open) {
+    //   setTimeout(() => {
+    //     this.listFilterTextInput.nativeElement.focus();
+    //   }, 0)
+    //   this.hasBeenToggled = false
+    //   this.open.next()
+    // } else {
+    //   this.filterText = ''
+    //   if (this.type == FilterableDropdownType.Editing) this.editingComplete.emit(this.toggleableItems)
+    // }
   }
 
   listFilterEnter(): void {
-    let filtered = this.filterPipe.transform(this.toggleableItems, this.filterText)
-    if (filtered.length == 1) {
-      let toggleableItem = this.toggleableItems.find(ti => ti.item.id == filtered[0].item.id)
-      if (toggleableItem) toggleableItem.state = ToggleableItemState.Selected
-      this.toggleItem(filtered[0])
-      this.dropdown.close()
-    }
+    // let filtered = this.filterPipe.transform(this.toggleableItems, this.filterText)
+    // if (filtered.length == 1) {
+    //   let toggleableItem = this.toggleableItems.find(ti => ti.item.id == filtered[0].item.id)
+    //   if (toggleableItem) toggleableItem.state = ToggleableItemState.Selected
+    //   this.toggleItem(filtered[0])
+    //   this.dropdown.close()
+    // }
   }
 }
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
index cffbc916f..b881edd5d 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
@@ -31,8 +31,7 @@ export class ToggleableDropdownButtonComponent {
   }
 
   toggleItem(): void {
-    this.toggleableItem.state = (this.toggleableItem.state == ToggleableItemState.NotSelected || this.toggleableItem.state == ToggleableItemState.PartiallySelected) ? ToggleableItemState.Selected : ToggleableItemState.NotSelected
-    this.toggle.emit(this.toggleableItem)
+    this.toggle.emit()
   }
 
   getSelectedIconName() {
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index fd619717f..800ef3742 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -1,4 +1,4 @@
-<div class="row">
+<!-- <div class="row">
   <div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
     <button class="btn btn-sm btn-outline-danger" (click)="documentList.selectNone()">
       <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
@@ -58,4 +58,4 @@
       Delete
     </button>
   </div>
-</div>
+</div> -->
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index 2d480bfed..f029275eb 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -8,11 +8,11 @@
   <div class="w-100 d-xl-none"></div>
    <div class="col col-xl-auto mb-2 mb-xl-0">
      <div class="d-flex">
-       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="tags" [itemsSelected]="selectedTags" title="Tags" icon="tag-fill" (toggle)="toggleTag($event.id)"></app-filterable-dropdown>
-       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" icon="person-fill" (toggle)="toggleCorrespondent($event.id)"></app-filterable-dropdown>
-       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document types" icon="file-earmark-fill" (toggle)="toggleDocumentType($event.id)"></app-filterable-dropdown>
-       <app-date-dropdown class="mr-2 mr-md-3" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (datesSet)="onDatesCreatedSet($event)"></app-date-dropdown>
-       <app-date-dropdown [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added"  (datesSet)="onDatesAddedSet($event)"></app-date-dropdown>
+       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="tags" [(selectionModel)]="tagSelectionModel" (selectionModelChange)="updateRules()" [multiple]="true" title="Tags" icon="tag-fill"></app-filterable-dropdown>
+       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="correspondents" [(selectionModel)]="correspondentSelectionModel" (selectionModelChange)="updateRules()" title="Correspondents" icon="person-fill"></app-filterable-dropdown>
+       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [(selectionModel)]="documentTypeSelectionModel" (selectionModelChange)="updateRules()" title="Document types" icon="file-earmark-fill"></app-filterable-dropdown>
+       <app-date-dropdown class="mr-2 mr-md-3" [(dateBefore)]="dateCreatedBefore" [(dateAfter)]="dateCreatedAfter" title="Created" (datesSet)="updateRules()"></app-date-dropdown>
+       <app-date-dropdown [(dateBefore)]="dateAddedBefore" [(dateAfter)]="dateAddedAfter" title="Added"  (datesSet)="updateRules()"></app-date-dropdown>
      </div>
    </div>
    <div class="w-100 d-xl-none"></div>
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index dfc0e4e2c..3b072c434 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -3,14 +3,13 @@ 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';
 import { Subject, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
-import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap';
+import { debounceTime, distinctUntilChanged, filter, flatMap, mergeMap } from 'rxjs/operators';
 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_TAG, FILTER_RULE_TYPES, FILTER_TITLE } from 'src/app/data/filter-rule-type';
-import { DateSelection } from 'src/app/components/common/date-dropdown/date-dropdown.component';
+import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component';
 
 @Component({
   selector: 'app-filter-editor',
@@ -46,37 +45,91 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   ) { }
 
   tags: PaperlessTag[] = []
-  correspondents: PaperlessCorrespondent[]
+  correspondents: PaperlessCorrespondent[] = []
   documentTypes: PaperlessDocumentType[] = []
 
+  _titleFilter = ""
+
+  tagSelectionModel = new FilterableDropdownSelectionModel()
+  correspondentSelectionModel = new FilterableDropdownSelectionModel()
+  documentTypeSelectionModel = new FilterableDropdownSelectionModel()
+
+  dateCreatedBefore: string
+  dateCreatedAfter: string
+  dateAddedBefore: string
+  dateAddedAfter: string
+
   @Input()
-  filterRules: FilterRule[]
+  set filterRules (value: FilterRule[]) {
+    console.log("SET FILTER RULES")
+    value.forEach(rule => {
+      switch (rule.rule_type) {
+        case FILTER_TITLE:
+          this._titleFilter = rule.value
+          break
+        case FILTER_CREATED_AFTER:
+          this.dateCreatedAfter = rule.value
+          break
+        case FILTER_CREATED_BEFORE:
+          this.dateCreatedBefore = rule.value
+          break
+        case FILTER_ADDED_AFTER:
+          this.dateAddedAfter = rule.value
+          break
+        case FILTER_ADDED_BEFORE:
+          this.dateAddedBefore = rule.value
+          break
+      }
+    })
+
+    this.tagService.getCachedMany(value.filter(v => v.rule_type == FILTER_HAS_TAG).map(rule => +rule.value)).subscribe(tags => {
+      console.log(tags)
+      tags.forEach(tag => this.tagSelectionModel.toggle(tag, false))
+    })
+  }
 
   @Output()
   filterRulesChange = new EventEmitter<FilterRule[]>()
 
+  updateRules() {
+    console.log("UPDATE RULES!!!")
+    let filterRules: FilterRule[] = []
+    if (this._titleFilter) {
+      filterRules.push({rule_type: FILTER_TITLE, value: this._titleFilter})
+    }
+    this.tagSelectionModel.getSelected().forEach(tag => {
+      filterRules.push({rule_type: FILTER_HAS_TAG, value: tag.id.toString()})
+    })
+    this.correspondentSelectionModel.getSelected().forEach(correspondent => {
+      filterRules.push({rule_type: FILTER_CORRESPONDENT, value: correspondent.id.toString()})
+    })
+    this.documentTypeSelectionModel.getSelected().forEach(documentType => {
+      filterRules.push({rule_type: FILTER_DOCUMENT_TYPE, value: documentType.id.toString()})
+    })
+    if (this.dateCreatedBefore) {
+      filterRules.push({rule_type: FILTER_CREATED_BEFORE, value: this.dateCreatedBefore})
+    }
+    if (this.dateCreatedAfter) {
+      filterRules.push({rule_type: FILTER_CREATED_AFTER, value: this.dateCreatedAfter})
+    }
+    if (this.dateAddedBefore) {
+      filterRules.push({rule_type: FILTER_ADDED_BEFORE, value: this.dateAddedBefore})
+    }
+    if (this.dateAddedAfter) {
+      filterRules.push({rule_type: FILTER_ADDED_AFTER, value: this.dateAddedAfter})
+    }
+    console.log(filterRules)
+    this.filterRulesChange.next(filterRules)
+  }
+
   hasFilters() {
-    return this.filterRules.length > 0
-  }
-
-  get selectedTags(): PaperlessTag[] {
-    let tagRules: FilterRule[] = this.filterRules.filter(fr => fr.rule_type == FILTER_HAS_TAG)
-    return this.tags?.filter(t => tagRules.find(tr => +tr.value == t.id))
-  }
-
-  get selectedCorrespondents(): PaperlessCorrespondent[] {
-    let correspondentRules: FilterRule[] = this.filterRules.filter(fr => fr.rule_type == FILTER_CORRESPONDENT)
-    return this.correspondents?.filter(c => correspondentRules.find(cr => +cr.value == c.id))
-  }
-
-  get selectedDocumentTypes(): PaperlessDocumentType[] {
-    let documentTypeRules: FilterRule[] = this.filterRules.filter(fr => fr.rule_type == FILTER_DOCUMENT_TYPE)
-    return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => +dtr.value == dt.id))
+    return this._titleFilter || 
+      this.dateCreatedAfter || this.dateAddedBefore || this.dateCreatedAfter || this.dateCreatedBefore ||
+      this.tagSelectionModel.selectionSize() || this.correspondentSelectionModel.selectionSize() || this.documentTypeSelectionModel.selectionSize()
   }
 
   get titleFilter() {
-    let existingRule = this.filterRules.find(rule => rule.rule_type == FILTER_TITLE)
-    return existingRule ? existingRule.value : ''
+    return this._titleFilter
   }
 
   set titleFilter(value) {
@@ -97,142 +150,27 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
       debounceTime(400),
       distinctUntilChanged()
     ).subscribe(title => {
-      this.setTitleRule(title)
+      this._titleFilter = title
+      this.updateRules()
     })
   }
 
   ngOnDestroy() {
     this.titleFilterDebounce.complete()
-    // TODO: not sure if both is necessary
-    this.subscription.unsubscribe()
-  }
-
-  applyFilters() {
-    this.filterRulesChange.next(this.filterRules)
   }
 
   clearSelected() {
-    this.filterRules = []
-    this.applyFilters()
-  }
-
-  private toggleFilterRule(filterRuleTypeID: number, value: number) {
-
-    let filterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
-
-    let existingRule = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID && rule.value == value?.toString())
-    let existingRuleOfSameType = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID)
-
-    if (existingRule) {
-      // if this exact rule already exists, remove it in all cases.
-      this.filterRules.splice(this.filterRules.indexOf(existingRule), 1)
-    } else if (filterRuleType.multi || !existingRuleOfSameType) {
-      // if we allow multiple rules per type, or no rule of this type already exists, push a new rule.
-      this.filterRules.push({rule_type: filterRuleTypeID, value: value?.toString()})
-    } else {
-      // otherwise (i.e., no multi support AND there's already a rule of this type), update the rule.
-      existingRuleOfSameType.value = value?.toString()
-    }
-    this.applyFilters()
-  }
-
-  private setTitleRule(title: string) {
-    let existingRule = this.filterRules.find(rule => rule.rule_type == FILTER_TITLE)
-
-    if (!existingRule && title) {
-      this.filterRules.push({rule_type: FILTER_TITLE, value: title})
-    } else if (existingRule && !title) {
-      this.filterRules.splice(this.filterRules.findIndex(rule => rule.rule_type == FILTER_TITLE), 1)
-    } else if (existingRule && title) {
-      existingRule.value = title
-    }
-    this.applyFilters()
+    this._titleFilter = ""
+    this.updateRules()
   }
 
   toggleTag(tagId: number) {
-    this.toggleFilterRule(FILTER_HAS_TAG, tagId)
   }
 
   toggleCorrespondent(correspondentId: number) {
-    this.toggleFilterRule(FILTER_CORRESPONDENT, correspondentId)
   }
 
   toggleDocumentType(documentTypeId: number) {
-    this.toggleFilterRule(FILTER_DOCUMENT_TYPE, documentTypeId)
-  }
-
-
-
-  // Date handling
-
-
-  onDatesCreatedSet(dates: DateSelection) {
-    this.setDateCreatedBefore(dates.before)
-    this.setDateCreatedAfter(dates.after)
-    this.applyFilters()
-  }
-
-  onDatesAddedSet(dates: DateSelection) {
-    this.setDateAddedBefore(dates.before)
-    this.setDateAddedAfter(dates.after)
-    this.applyFilters()
-  }
-
-  get dateCreatedBefore(): string {
-    let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_BEFORE)
-    return createdBeforeRule ? createdBeforeRule.value : null
-  }
-
-  get dateCreatedAfter(): string {
-    let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_AFTER)
-    return createdAfterRule ? createdAfterRule.value : null
-  }
-
-  get dateAddedBefore(): string {
-    let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_BEFORE)
-    return addedBeforeRule ? addedBeforeRule.value : null
-  }
-
-  get dateAddedAfter(): string {
-    let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_AFTER)
-    return addedAfterRule ? addedAfterRule.value : null
-  }
-
-  setDateCreatedBefore(date?: string) {
-    if (date) this.setDateFilter(date, FILTER_CREATED_BEFORE)
-    else this.clearDateFilter(FILTER_CREATED_BEFORE)
-  }
-
-  setDateCreatedAfter(date?: string) {
-    if (date) this.setDateFilter(date, FILTER_CREATED_AFTER)
-    else this.clearDateFilter(FILTER_CREATED_AFTER)
-  }
-
-  setDateAddedBefore(date?: string) {
-    if (date) this.setDateFilter(date, FILTER_ADDED_BEFORE)
-    else this.clearDateFilter(FILTER_ADDED_BEFORE)
-  }
-
-  setDateAddedAfter(date?: string) {
-    if (date) this.setDateFilter(date, FILTER_ADDED_AFTER)
-    else this.clearDateFilter(FILTER_ADDED_AFTER)
-  }
-
-  setDateFilter(date: string, dateRuleTypeID: number) {
-    let existingRule = this.filterRules.find(rule => rule.rule_type == dateRuleTypeID)
-
-    if (existingRule) {
-      existingRule.value = date
-    } else {
-      this.filterRules.push({rule_type: dateRuleTypeID, value: date})
-    }
-  }
-
-  clearDateFilter(dateRuleTypeID: number) {
-    let ruleIndex = this.filterRules.findIndex(rule => rule.rule_type == dateRuleTypeID)
-    if (ruleIndex != -1) {
-      this.filterRules.splice(ruleIndex, 1)
-    }
   }
 
 }

From 4fb5dce5e76abe4c1ec026e2ffa781af5d3fae35 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 00:52:28 +0100
Subject: [PATCH 0431/1300] selection model

---
 .../filterable-dropdown.component.html        |  4 +-
 .../filterable-dropdown.component.ts          | 76 +++++++++++--------
 .../toggleable-dropdown-button.component.html |  6 +-
 .../toggleable-dropdown-button.component.ts   | 14 +++-
 .../filter-editor/filter-editor.component.ts  | 40 ++++++----
 5 files changed, 87 insertions(+), 53 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 1261ff921..7c9a133ce 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -20,8 +20,8 @@
         </div>
       </div>
       <div *ngIf="selectionModel.items" class="items">
-        <ng-container *ngFor="let toggleableItem of selectionModel.items | filter: filterText">
-          <app-toggleable-dropdown-button [toggleableItem]="toggleableItem" (toggle)="selectionModel.toggle(toggleableItem.item)"></app-toggleable-dropdown-button>
+        <ng-container *ngFor="let item of selectionModel.items | filter: filterText">
+          <app-toggleable-dropdown-button [item]="item" [state]="selectionModel.get(item.id)" (toggle)="selectionModel.toggle(item.id)"></app-toggleable-dropdown-button>
         </ng-container>
       </div>
       <button *ngIf="type == types.Editing" class="list-group-item list-group-item-action bg-light" (click)="dropdown.close()" [disabled]="!hasBeenToggled || (toggleableItems | filter: filterText).length == 0">
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 31c9d064e..acb07e0d4 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -4,6 +4,7 @@ import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
 import { ToggleableItem, ToggleableItemState } from './toggleable-dropdown-button/toggleable-dropdown-button.component';
 import { MatchingModel } from 'src/app/data/matching-model';
 import { Subject } from 'rxjs';
+import { ThrowStmt } from '@angular/compiler';
 
 export enum FilterableDropdownType {
   Filtering = 'filtering',
@@ -16,39 +17,56 @@ export class FilterableDropdownSelectionModel {
 
   multiple = false
 
-  items: ToggleableItem[] = []
+  items: MatchingModel[] = []
 
-  getSelected() {
-    return this.items.filter(i => i.state == ToggleableItemState.Selected).map(i => i.item)
+  selection = new Map<number, ToggleableItemState>()
+
+  getSelectedItems() {
+    return this.items.filter(i => this.selection.get(i.id) == ToggleableItemState.Selected)
   }
 
-
-
-  toggle(item: MatchingModel, fireEvent = true) {
-    console.log("TOGGLE TAG")
-    let toggleableItem = this.items.find(i => i.item == item)
-    console.log(toggleableItem)
-
-    if (toggleableItem) {
-      if (toggleableItem.state == ToggleableItemState.Selected) {
-        toggleableItem.state = ToggleableItemState.NotSelected
-      } else {
-        this.items.forEach(i => {
-          if (i.item == item) {
-            i.state = ToggleableItemState.Selected
-          } else if (!this.multiple) {
-            i.state = ToggleableItemState.NotSelected
-          }
-        })
-      }
-      if (fireEvent) {
-        this.changed.next(this)
-      }
+  set(id: number, state: ToggleableItemState, fireEvent = true) {
+    this.selection.set(id, state)
+    if (fireEvent) {
+      this.changed.next(this)
     }
   }
 
+  toggle(id: number, fireEvent = true) {
+    let state = this.selection.get(id)
+    if (state == null || state != ToggleableItemState.Selected) {
+      this.selection.set(id, ToggleableItemState.Selected)
+    } else if (state == ToggleableItemState.Selected) {
+      this.selection.set(id, ToggleableItemState.NotSelected)
+    }
+
+    if (!this.multiple) {
+      for (let key of this.selection.keys()) {
+        if (key != id) {
+          this.selection.set(key, ToggleableItemState.NotSelected)
+        }
+      }
+    }
+
+    if (fireEvent) {
+      this.changed.next(this)
+    }
+    
+  }
+
+  get(id: number) {
+    return this.selection.get(id) || ToggleableItemState.NotSelected
+  }
+
   selectionSize() {
-    return this.getSelected().length
+    return this.getSelectedItems().length
+  }
+
+  clear(fireEvent = true) {
+    this.selection.clear()
+    if (fireEvent) {
+      this.changed.next(this)
+    }
   }
 }
 
@@ -67,14 +85,12 @@ export class FilterableDropdownComponent {
   @Input()
   set items(items: MatchingModel[]) {
     if (items) {
-      this._selectionModel.items = items.map(i => {
-        return {item: i, state: ToggleableItemState.NotSelected, count: i.document_count}
-      })
+      this._selectionModel.items = items
     }
   }
 
   get items(): MatchingModel[] {
-    return this._selectionModel.items.map(i => i.item)
+    return this._selectionModel.items
   }
 
   _selectionModel = new FilterableDropdownSelectionModel()
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
index daa72b41d..5b58025d1 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
@@ -5,8 +5,8 @@
     </svg>
   </div>
   <div class="mr-1">
-    <app-tag *ngIf="isTag; else displayName" [tag]="toggleableItem?.item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
-    <ng-template #displayName><small>{{toggleableItem?.item.name}}</small></ng-template>
+    <app-tag *ngIf="isTag; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
+    <ng-template #displayName><small>{{item.name}}</small></ng-template>
   </div>
-  <div class="badge badge-light rounded-pill ml-auto mr-1">{{toggleableItem?.count}}</div>
+  <div class="badge badge-light rounded-pill ml-auto mr-1">{{item.document_count}}</div>
 </button>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
index b881edd5d..1d42b0946 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
@@ -21,13 +21,19 @@ export enum ToggleableItemState {
 export class ToggleableDropdownButtonComponent {
 
   @Input()
-  toggleableItem: ToggleableItem
+  item: MatchingModel
+
+  @Input()
+  state: ToggleableItemState
+
+  @Input()
+  count: number
 
   @Output()
   toggle = new EventEmitter()
 
   get isTag(): boolean {
-    return 'is_inbox_tag' in this.toggleableItem?.item // ~ this.item instanceof PaperlessTag
+    return 'is_inbox_tag' in this.item
   }
 
   toggleItem(): void {
@@ -35,9 +41,9 @@ export class ToggleableDropdownButtonComponent {
   }
 
   getSelectedIconName() {
-    if (this.toggleableItem?.state == ToggleableItemState.Selected) {
+    if (this.state == ToggleableItemState.Selected) {
       return "check"
-    } else if (this.toggleableItem?.state == ToggleableItemState.PartiallySelected) {
+    } else if (this.state == ToggleableItemState.PartiallySelected) {
       return "dash"
     } else {
       return ""
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index 3b072c434..f881dc1d9 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -3,13 +3,14 @@ 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';
 import { Subject, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged, filter, flatMap, mergeMap } from 'rxjs/operators';
+import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 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_TAG, FILTER_RULE_TYPES, FILTER_TITLE } from 'src/app/data/filter-rule-type';
+import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE } 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';
 
 @Component({
   selector: 'app-filter-editor',
@@ -61,7 +62,6 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
   @Input()
   set filterRules (value: FilterRule[]) {
-    console.log("SET FILTER RULES")
     value.forEach(rule => {
       switch (rule.rule_type) {
         case FILTER_TITLE:
@@ -79,31 +79,34 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
         case FILTER_ADDED_BEFORE:
           this.dateAddedBefore = rule.value
           break
+        case FILTER_HAS_TAG:
+          this.tagSelectionModel.set(+rule.value, ToggleableItemState.Selected, false)
+          break
+        case FILTER_CORRESPONDENT:
+          this.correspondentSelectionModel.set(+rule.value, ToggleableItemState.Selected, false)
+          break
+        case FILTER_DOCUMENT_TYPE:
+          this.documentTypeSelectionModel.set(+rule.value, ToggleableItemState.Selected, false)
+          break
       }
     })
-
-    this.tagService.getCachedMany(value.filter(v => v.rule_type == FILTER_HAS_TAG).map(rule => +rule.value)).subscribe(tags => {
-      console.log(tags)
-      tags.forEach(tag => this.tagSelectionModel.toggle(tag, false))
-    })
   }
 
   @Output()
   filterRulesChange = new EventEmitter<FilterRule[]>()
 
   updateRules() {
-    console.log("UPDATE RULES!!!")
     let filterRules: FilterRule[] = []
     if (this._titleFilter) {
       filterRules.push({rule_type: FILTER_TITLE, value: this._titleFilter})
     }
-    this.tagSelectionModel.getSelected().forEach(tag => {
+    this.tagSelectionModel.getSelectedItems().forEach(tag => {
       filterRules.push({rule_type: FILTER_HAS_TAG, value: tag.id.toString()})
     })
-    this.correspondentSelectionModel.getSelected().forEach(correspondent => {
+    this.correspondentSelectionModel.getSelectedItems().forEach(correspondent => {
       filterRules.push({rule_type: FILTER_CORRESPONDENT, value: correspondent.id.toString()})
     })
-    this.documentTypeSelectionModel.getSelected().forEach(documentType => {
+    this.documentTypeSelectionModel.getSelectedItems().forEach(documentType => {
       filterRules.push({rule_type: FILTER_DOCUMENT_TYPE, value: documentType.id.toString()})
     })
     if (this.dateCreatedBefore) {
@@ -118,13 +121,12 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     if (this.dateAddedAfter) {
       filterRules.push({rule_type: FILTER_ADDED_AFTER, value: this.dateAddedAfter})
     }
-    console.log(filterRules)
     this.filterRulesChange.next(filterRules)
   }
 
   hasFilters() {
     return this._titleFilter || 
-      this.dateCreatedAfter || this.dateAddedBefore || this.dateCreatedAfter || this.dateCreatedBefore ||
+      this.dateAddedAfter || this.dateAddedBefore || this.dateCreatedAfter || this.dateCreatedBefore ||
       this.tagSelectionModel.selectionSize() || this.correspondentSelectionModel.selectionSize() || this.documentTypeSelectionModel.selectionSize()
   }
 
@@ -161,16 +163,26 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
   clearSelected() {
     this._titleFilter = ""
+    this.tagSelectionModel.clear(false)
+    this.documentTypeSelectionModel.clear(false)
+    this.correspondentSelectionModel.clear(false)
+    this.dateAddedBefore = null
+    this.dateAddedAfter = null
+    this.dateCreatedBefore = null
+    this.dateCreatedAfter = null
     this.updateRules()
   }
 
   toggleTag(tagId: number) {
+    this.tagSelectionModel.toggle(tagId)
   }
 
   toggleCorrespondent(correspondentId: number) {
+    this.correspondentSelectionModel.toggle(correspondentId)
   }
 
   toggleDocumentType(documentTypeId: number) {
+    this.documentTypeSelectionModel.toggle(documentTypeId)
   }
 
 }

From 75c8cd9967970a562d6e8fd41bedf39df1c5de94 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 27 Dec 2020 23:05:19 -0800
Subject: [PATCH 0432/1300] Dark mode settings logic

---
 src-ui/src/app/app.component.ts               |  6 ++--
 .../manage/settings/settings.component.html   | 27 ++++++++++++-----
 .../manage/settings/settings.component.ts     | 27 ++++++++++++++---
 src-ui/src/app/data/storage-keys.ts           |  8 +++--
 .../src/app/services/app-view.service.spec.ts | 16 ++++++++++
 src-ui/src/app/services/app-view.service.ts   | 29 +++++++++++++++++++
 6 files changed, 98 insertions(+), 15 deletions(-)
 create mode 100644 src-ui/src/app/services/app-view.service.spec.ts
 create mode 100644 src-ui/src/app/services/app-view.service.ts

diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts
index 84c173a18..9cd9fb3ec 100644
--- a/src-ui/src/app/app.component.ts
+++ b/src-ui/src/app/app.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { AppViewService } from './services/app-view.service';
 
 @Component({
   selector: 'app-root',
@@ -6,8 +7,9 @@ import { Component } from '@angular/core';
   styleUrls: ['./app.component.scss']
 })
 export class AppComponent {
-  
-  constructor () {
+
+  constructor (appViewService: AppViewService) {
+    appViewService.updateDarkModeSettings()
   }
 
 
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 6c16cfaa8..9b999c0dc 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -10,21 +10,34 @@
       <a ngbNavLink i18n>General settings</a>
       <ng-template ngbNavContent>
 
-        <h4 i18n>Document list</h4>
-        
+        <h4 i18n>Appearance</h4>
+
         <div class="form-row form-group">
           <div class="col-md-3 col-form-label">
             <span i18n>Items per page</span>
           </div>
           <div class="col">
-        
+
             <select class="form-control" formControlName="documentListItemPerPage">
               <option [ngValue]="10">10</option>
               <option [ngValue]="25">25</option>
               <option [ngValue]="50">50</option>
               <option [ngValue]="100">100</option>
             </select>
-        
+
+          </div>
+        </div>
+
+        <div class="form-row form-group">
+          <div class="col-md-3 col-form-label">
+            <span i18n>Dark mode</span>
+          </div>
+          <div class="col">
+            <app-input-check i18n-title title="Use system settings" formControlName="darkModeUseSystem" (change)="toggleDarkModeSetting()"></app-input-check>
+            <div class="custom-control custom-switch" *ngIf="!settingsForm.value.darkModeUseSystem">
+              <input type="checkbox" class="custom-control-input" id="darkModeEnabled" formControlName="darkModeEnabled" [checked]="settingsForm.value.darkModeEnabled">
+              <label class="custom-control-label" for="darkModeEnabled">Enabled</label>
+            </div>
           </div>
         </div>
 
@@ -35,7 +48,7 @@
       <ng-template ngbNavContent>
 
         <div formGroupName="savedViews">
-          
+
             <div *ngFor="let view of savedViews" [formGroupName]="view.id" class="form-row">
               <div class="form-group col-4 mr-3">
                 <label for="name_{{view.id}}" i18n>Name</label>
@@ -61,7 +74,7 @@
             </div>
 
             <div *ngIf="savedViews.length == 0" i18n>No saved views defined.</div>
-          
+
         </div>
 
       </ng-template>
@@ -71,4 +84,4 @@
   <div [ngbNavOutlet]="nav" class="border-left border-right border-bottom p-3 mb-3 shadow"></div>
 
   <button type="submit" class="btn btn-primary">Save</button>
-</form>
\ No newline at end of file
+</form>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index bec85e039..acb456f1c 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -1,10 +1,11 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Renderer2  } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { Toast, ToastService } from 'src/app/services/toast.service';
+import { AppViewService } from 'src/app/services/app-view.service';
 
 @Component({
   selector: 'app-settings',
@@ -17,17 +18,24 @@ export class SettingsComponent implements OnInit {
 
   settingsForm = new FormGroup({
     'documentListItemPerPage': new FormControl(+localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT),
+    'darkModeUseSystem': new FormControl(
+      localStorage.getItem(GENERAL_SETTINGS.DARK_MODE_USE_SYSTEM) == undefined ? GENERAL_SETTINGS.DARK_MODE_USE_SYSTEM_DEFAULT : JSON.parse(localStorage.getItem(GENERAL_SETTINGS.DARK_MODE_USE_SYSTEM))
+    ),
+    'darkModeEnabled': new FormControl(
+      localStorage.getItem(GENERAL_SETTINGS.DARK_MODE_ENABLED) == undefined ? GENERAL_SETTINGS.DARK_MODE_ENABLED_DEFAULT : JSON.parse(localStorage.getItem(GENERAL_SETTINGS.DARK_MODE_ENABLED))
+    ),
     'savedViews': this.savedViewGroup
   })
 
+  savedViews: PaperlessSavedView[]
+
   constructor(
     public savedViewService: SavedViewService,
     private documentListViewService: DocumentListViewService,
-    private toastService: ToastService
+    private toastService: ToastService,
+    private appViewService: AppViewService
   ) { }
 
-  savedViews: PaperlessSavedView[]
-
   ngOnInit() {
     this.savedViewService.listAll().subscribe(r => {
       this.savedViews = r.results
@@ -50,9 +58,20 @@ export class SettingsComponent implements OnInit {
     })
   }
 
+  toggleDarkModeSetting() {
+    if (this.settingsForm.value.darkModeUseSystem) {
+      (this.settingsForm.controls.darkModeEnabled as FormControl).disable()
+    } else {
+      (this.settingsForm.controls.darkModeEnabled as FormControl).enable()
+    }
+  }
+
   private saveLocalSettings() {
     localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
+    localStorage.setItem(GENERAL_SETTINGS.DARK_MODE_USE_SYSTEM, this.settingsForm.value.darkModeUseSystem)
+    localStorage.setItem(GENERAL_SETTINGS.DARK_MODE_ENABLED, (this.settingsForm.value.darkModeEnabled == true).toString())
     this.documentListViewService.updatePageSize()
+    this.appViewService.updateDarkModeSettings()
     this.toastService.showToast(Toast.make("Information", $localize`Settings saved successfully.`))
   }
 
diff --git a/src-ui/src/app/data/storage-keys.ts b/src-ui/src/app/data/storage-keys.ts
index 13b41d4a7..057d68d70 100644
--- a/src-ui/src/app/data/storage-keys.ts
+++ b/src-ui/src/app/data/storage-keys.ts
@@ -8,5 +8,9 @@ export const DOCUMENT_LIST_SERVICE = {
 
 export const GENERAL_SETTINGS = {
   DOCUMENT_LIST_SIZE: 'general-settings:documentListSize',
-  DOCUMENT_LIST_SIZE_DEFAULT: 50
-}
\ No newline at end of file
+  DOCUMENT_LIST_SIZE_DEFAULT: 50,
+  DARK_MODE_USE_SYSTEM: 'general-settings:darkModeUseSystem',
+  DARK_MODE_USE_SYSTEM_DEFAULT: true,
+  DARK_MODE_ENABLED: 'general-settings:darkModeEnabled',
+  DARK_MODE_ENABLED_DEFAULT: false
+}
diff --git a/src-ui/src/app/services/app-view.service.spec.ts b/src-ui/src/app/services/app-view.service.spec.ts
new file mode 100644
index 000000000..fc44ed3a4
--- /dev/null
+++ b/src-ui/src/app/services/app-view.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { AppViewService } from './app-view.service';
+
+describe('AppViewService', () => {
+  let service: AppViewService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(AppViewService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/services/app-view.service.ts b/src-ui/src/app/services/app-view.service.ts
new file mode 100644
index 000000000..c6faa5603
--- /dev/null
+++ b/src-ui/src/app/services/app-view.service.ts
@@ -0,0 +1,29 @@
+import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AppViewService {
+  private renderer: Renderer2;
+
+  constructor(rendererFactory: RendererFactory2, @Inject(DOCUMENT) private document) {
+    this.renderer = rendererFactory.createRenderer(null, null);
+  }
+
+  updateDarkModeSettings() {
+    let darkModeUseSystem = JSON.parse(localStorage.getItem(GENERAL_SETTINGS.DARK_MODE_USE_SYSTEM)) && GENERAL_SETTINGS.DARK_MODE_USE_SYSTEM_DEFAULT
+    let darkModeEnabled = JSON.parse(localStorage.getItem(GENERAL_SETTINGS.DARK_MODE_ENABLED)) || GENERAL_SETTINGS.DARK_MODE_ENABLED_DEFAULT
+
+    if (darkModeUseSystem) {
+      this.renderer.addClass(this.document.body, 'dark-mode-preferred')
+      this.renderer.removeClass(this.document.body, 'dark-mode')
+    } else {
+      this.renderer.removeClass(this.document.body, 'dark-mode-preferred')
+      darkModeEnabled ? this.renderer.addClass(this.document.body, 'dark-mode') : this.renderer.removeClass(this.document.body, 'dark-mode')
+    }
+
+  }
+
+}

From 28b7c3c20867e97eae9a3d9ff4fc04a66d1cef7a Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 27 Dec 2020 23:05:34 -0800
Subject: [PATCH 0433/1300] Logo svg inline

---
 .../app-frame/app-frame.component.html        |  4 +-
 src-ui/src/assets/logo-dark-notext.svg        | 86 ++++---------------
 src-ui/src/assets/logo-white-notext.svg       | 69 +++++++++++++++
 3 files changed, 90 insertions(+), 69 deletions(-)
 create mode 100644 src-ui/src/assets/logo-white-notext.svg

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index d191ec0de..6fd2a579e 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -1,6 +1,8 @@
 <nav class="navbar navbar-dark sticky-top bg-primary flex-md-nowrap p-0 shadow">
   <a class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" routerLink="/dashboard">
-    <img src="assets/logo-dark-notext.svg" height="18px" class="mr-2">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 198.43 238.91" width="16px" 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>
   </a>
   <button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-toggle="collapse"
diff --git a/src-ui/src/assets/logo-dark-notext.svg b/src-ui/src/assets/logo-dark-notext.svg
index 38ca9e700..74eb142c8 100644
--- a/src-ui/src/assets/logo-dark-notext.svg
+++ b/src-ui/src/assets/logo-dark-notext.svg
@@ -1,69 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="69.999977mm"
-   height="84.283669mm"
-   viewBox="0 0 69.999977 84.283669"
-   version="1.1"
-   id="svg4812"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
-   sodipodi:docname="logo-dark-notext.svg">
-  <defs
-     id="defs4806" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="328.04904"
-     inkscape:cy="330.33332"
-     inkscape:document-units="mm"
-     inkscape:current-layer="SvgjsG1020"
-     inkscape:document-rotation="0"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="1280"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4809">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-9.9999792,-10.000082)">
-    <g
-       id="SvgjsG1020"
-       featureKey="symbol1"
-       fill="#ffffff"
-       transform="matrix(0.10341565,0,0,0.10341565,1.2287665,8.3453496)">
-      <path
-         id="path57"
-         style="fill:#ffffff;stroke-width:1.10017"
-         d="M 752.4375,82.365234 C 638.02019,348.60552 87.938206,381.6089 263.96484,810.67383 c 2.20034,5.50083 -40.70621,63.80947 -69.31054,112.21679 -6.601,-24.20366 -14.30329,-50.6063 -13.20313,-52.80664 C 324.47281,700.65835 79.135592,604.94324 65.933594,466.32227 4.3242706,576.33891 -17.678136,768.86756 168.25,879.98438 c 1.10017,-10e-6 9.90207,41.80777 14.30273,62.71093 -4.40066,8.80133 -8.80162,17.60213 -11.00195,24.20313 -4.40066,11.00166 28.60352,9.90123 28.60352,12.10156 3.3005,-1.10017 81.41295,-138.62054 83.61328,-139.7207 C 726.0345,738.06398 804.14532,339.80419 752.4375,82.365234 Z M 526.9043,362.90625 C 320.073,547.73422 284.86775,685.25508 291.46875,752.36523 222.15826,588.44043 425.68898,408.01308 526.9043,362.90625 Z M 127.54297,626.94727 c 39.60599,36.30549 105.6163,147.4222 49.50781,212.33203 13.202,-29.7045 17.60234,-96.81455 -49.50781,-212.33203 z"
-         transform="matrix(0.90895334,0,0,0.90895334,65.06894,-58.865357)" />
-      <defs
-         id="defs14302" />
-    </g>
-  </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg4812" inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" sodipodi:docname="logo-dark-notext.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 198.4 238.9"
+	 style="enable-background:new 0 0 198.4 238.9;" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" id="base" inkscape:current-layer="SvgjsG1020" inkscape:cx="328.04904" inkscape:cy="330.33332" inkscape:document-rotation="0" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1016" inkscape:window-maximized="1" inkscape:window-width="1920" inkscape:window-x="1280" inkscape:window-y="27" inkscape:zoom="0.98994949" pagecolor="#ffffff" showgrid="false">
+	</sodipodi:namedview>
+<g id="layer1" transform="translate(-9.9999792,-10.000082)" inkscape:groupmode="layer" inkscape:label="Layer 1">
+	<g id="SvgjsG1020" transform="matrix(0.10341565,0,0,0.10341565,1.2287665,8.3453496)">
+		<path id="path57" d="M1967.5,16C1672.7,702,255.4,787,709,1892.5c5.7,14.2-104.9,164.4-178.6,289.1c-17-62.4-36.9-130.4-34-136.1
+			c368.5-436.5-263.6-683.1-297.6-1040.3C40,1288.7-16.7,1784.8,462.3,2071.1c2.8,0,25.5,107.7,36.9,161.6
+			c-11.3,22.7-22.7,45.4-28.3,62.4c-11.3,28.3,73.7,25.5,73.7,31.2c8.5-2.8,209.8-357.2,215.4-360
+			C1899.5,1705.4,2100.8,679.3,1967.5,16z M1386.4,738.8C853.5,1215,762.8,1569.4,779.8,1742.3
+			C601.2,1319.9,1125.7,855,1386.4,738.8z M357.5,1419.1c102,93.5,272.1,379.8,127.6,547.1C519,1889.7,530.4,1716.8,357.5,1419.1z"
+			/>
+	</g>
+</g>
 </svg>
diff --git a/src-ui/src/assets/logo-white-notext.svg b/src-ui/src/assets/logo-white-notext.svg
new file mode 100644
index 000000000..38ca9e700
--- /dev/null
+++ b/src-ui/src/assets/logo-white-notext.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="69.999977mm"
+   height="84.283669mm"
+   viewBox="0 0 69.999977 84.283669"
+   version="1.1"
+   id="svg4812"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="logo-dark-notext.svg">
+  <defs
+     id="defs4806" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="328.04904"
+     inkscape:cy="330.33332"
+     inkscape:document-units="mm"
+     inkscape:current-layer="SvgjsG1020"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="1280"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4809">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-9.9999792,-10.000082)">
+    <g
+       id="SvgjsG1020"
+       featureKey="symbol1"
+       fill="#ffffff"
+       transform="matrix(0.10341565,0,0,0.10341565,1.2287665,8.3453496)">
+      <path
+         id="path57"
+         style="fill:#ffffff;stroke-width:1.10017"
+         d="M 752.4375,82.365234 C 638.02019,348.60552 87.938206,381.6089 263.96484,810.67383 c 2.20034,5.50083 -40.70621,63.80947 -69.31054,112.21679 -6.601,-24.20366 -14.30329,-50.6063 -13.20313,-52.80664 C 324.47281,700.65835 79.135592,604.94324 65.933594,466.32227 4.3242706,576.33891 -17.678136,768.86756 168.25,879.98438 c 1.10017,-10e-6 9.90207,41.80777 14.30273,62.71093 -4.40066,8.80133 -8.80162,17.60213 -11.00195,24.20313 -4.40066,11.00166 28.60352,9.90123 28.60352,12.10156 3.3005,-1.10017 81.41295,-138.62054 83.61328,-139.7207 C 726.0345,738.06398 804.14532,339.80419 752.4375,82.365234 Z M 526.9043,362.90625 C 320.073,547.73422 284.86775,685.25508 291.46875,752.36523 222.15826,588.44043 425.68898,408.01308 526.9043,362.90625 Z M 127.54297,626.94727 c 39.60599,36.30549 105.6163,147.4222 49.50781,212.33203 13.202,-29.7045 17.60234,-96.81455 -49.50781,-212.33203 z"
+         transform="matrix(0.90895334,0,0,0.90895334,65.06894,-58.865357)" />
+      <defs
+         id="defs14302" />
+    </g>
+  </g>
+</svg>

From c6acf2f7f6338820a9df04b946dc504655ebc9eb Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 27 Dec 2020 23:05:42 -0800
Subject: [PATCH 0434/1300] Prevent FOIT

---
 src-ui/src/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src-ui/src/index.html b/src-ui/src/index.html
index f82399ce6..f6a313a48 100644
--- a/src-ui/src/index.html
+++ b/src-ui/src/index.html
@@ -5,6 +5,7 @@
   <title>Paperless-ng</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="color-scheme" content="dark light">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
 <body>

From 86079a936ef2f32b7013f6953afea958a3028fdd Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 27 Dec 2020 23:05:52 -0800
Subject: [PATCH 0435/1300] Initial theme SCSS

---
 src-ui/src/styles.scss     |   1 +
 src-ui/src/theme_dark.scss | 232 +++++++++++++++++++++++++++++++++++++
 2 files changed, 233 insertions(+)
 create mode 100644 src-ui/src/theme_dark.scss

diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss
index 7e9a9377a..8cf4a93f6 100644
--- a/src-ui/src/styles.scss
+++ b/src-ui/src/styles.scss
@@ -1,4 +1,5 @@
 @import "theme";
+@import "theme_dark";
 @import "node_modules/bootstrap/scss/bootstrap";
 @import "~@ng-select/ng-select/themes/default.theme.css";
 
diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
new file mode 100644
index 000000000..ea7987828
--- /dev/null
+++ b/src-ui/src/theme_dark.scss
@@ -0,0 +1,232 @@
+$bg-dark-mode: #161618;
+$bg-light-dark-mode: #1c1c1f;
+$text-color-dark-mode: #abb2bf;
+$text-color-dark-mode-accent: lighten($text-color-dark-mode, 10%);
+$border-color-dark-mode: #47494f;
+
+* {
+  transition: background-color 0.3s ease, border-color 0.3s ease;
+}
+@mixin dark-mode {
+  background-color: $bg-dark-mode !important;
+  color: $text-color-dark-mode;
+
+  .navbar-brand {
+    color: $text-color-dark-mode;
+  }
+
+  .bg-light {
+    background-color: $bg-light-dark-mode !important;
+
+    a,
+    div {
+      color: $text-color-dark-mode !important;
+    }
+  }
+
+  .border,
+  .border-bottom,
+  .border-left,
+  .border-right {
+    border-color: $border-color-dark-mode !important;
+  }
+
+  .nav-link.active {
+    background-color: $bg-dark-mode;
+    color: $text-color-dark-mode;
+    border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode;
+  }
+
+  .nav-link:hover {
+    border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode;
+  }
+
+  .nav-tabs {
+    border-color: $border-color-dark-mode;
+  }
+
+  .dropdown-menu {
+    background-color: $bg-dark-mode;
+
+    .dropdown-divider {
+      border-color: $border-color-dark-mode;
+    }
+
+    .dropdown-item {
+      color: $text-color-dark-mode;
+
+      &:hover {
+        background-color: $bg-light-dark-mode;
+        color: $text-color-dark-mode;
+      }
+    }
+
+    .dropdown-item.disabled {
+      color: darken($text-color-dark-mode, 20%);
+    }
+  }
+
+  .card {
+    background-color: $bg-light-dark-mode;
+
+    .card-text {
+      color: $text-color-dark-mode;
+    }
+  }
+
+  app-tag .badge {
+    opacity: 0.8;
+    color: $bg-dark-mode !important;
+  }
+
+  .badge-light {
+    background-color: darken($bg-dark-mode, 20%);
+    color: $text-color-dark-mode-accent;
+  }
+
+  .doc-img {
+    background-color: lighten($bg-light-dark-mode, 30%);
+    mix-blend-mode: soft-light;
+  }
+
+  .doc-img-background {
+    background-color: lighten($bg-light-dark-mode, 30%);
+  }
+
+  .doc-img-background-selected {
+    background-color: lighten($bg-light-dark-mode, 35%);
+  }
+
+  .toast {
+    background-color: opacify($bg-light-dark-mode, .85);
+  }
+
+  .toast-header {
+    background-color: opacify($bg-dark-mode, .85);
+  }
+
+  a:hover {
+    color: lighten($primary, 10%);
+  }
+
+  table {
+    background-color: $bg-dark-mode;
+    color: $text-color-dark-mode;
+    border-color: $border-color-dark-mode;
+  }
+
+  .table td,
+  .table th {
+    border-color: $border-color-dark-mode;
+  }
+
+  .table-row-selected {
+    background-color: $bg-light-dark-mode;
+  }
+
+  .close {
+    text-shadow: 0 1px 0 #666;
+  }
+
+  .btn-outline-primary:hover {
+    background-color: darken($primary, 10%);
+    color: $text-color-dark-mode-accent;
+  }
+
+  .btn-outline-secondary {
+    border-color: $border-color-dark-mode;
+    color: $border-color-dark-mode;
+
+    &:hover {
+      background-color: $bg-dark-mode;
+    }
+  }
+
+  .btn-link:hover,
+  .btn-outline-primary:not(:disabled):not(.disabled).active,
+  .btn-outline-primary:not(:disabled):not(.disabled):active,
+  .show > .btn-outline-primary.dropdown-toggle {
+    color: $text-color-dark-mode-accent;
+  }
+
+  .form-control,
+  input,
+  select,
+  textarea {
+    background-color: $bg-dark-mode;
+    color: $text-color-dark-mode;
+    border-color: $border-color-dark-mode;
+
+    &::placeholder {
+      color: $text-color-dark-mode;
+    }
+
+    &:focus {
+      background-color: $bg-light-dark-mode !important;
+      color: darken($text-color-dark-mode, 10%) !important;
+    }
+  }
+
+  .ng-select-container,
+  .ng-select.ng-select-opened > .ng-select-container,
+  .ng-dropdown-panel,
+  .ng-dropdown-panel .ng-dropdown-panel-items .ng-option {
+    background-color: $bg-dark-mode;
+    color: $text-color-dark-mode;
+    border-color: $border-color-dark-mode;
+
+    input:focus {
+      background-color: $bg-dark-mode !important;
+    }
+  }
+
+  .ng-dropdown-panel .ng-dropdown-panel-items .ng-option:hover {
+    background-color: $bg-light-dark-mode;
+  }
+
+  .custom-control-label:before {
+    background-color: $bg-dark-mode;
+    color: $text-color-dark-mode;
+  }
+
+  .custom-control-input:checked ~ .custom-control-label::before {
+    color: $text-color-dark-mode-accent;
+  }
+
+  .input-group-text {
+    color: $text-color-dark-mode;
+    background-color: $bg-light-dark-mode;
+    border-color: $border-color-dark-mode;
+  }
+
+  .list-group-item {
+    color: $text-color-dark-mode;
+    background-color: $bg-light-dark-mode;
+    border-color: $border-color-dark-mode;
+  }
+
+  .page-item.disabled .page-link {
+    background-color: $bg-dark-mode;
+    border-color: $border-color-dark-mode;
+  }
+
+  .list-group-item,
+  .page-link {
+    background-color: $bg-light-dark-mode;
+    border-color: $border-color-dark-mode;
+  }
+
+  .page-item.active .page-link {
+    border-color: $border-color-dark-mode;
+    color: $text-color-dark-mode-accent;
+  }
+}
+
+body.dark-mode {
+  @include dark-mode;
+}
+@media (prefers-color-scheme: dark) {
+  body.dark-mode-preferred {
+    @include dark-mode;
+  }
+}

From ef9631ae241889cfca5ce7f18b71d2575ae5a673 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Mon, 28 Dec 2020 09:47:17 +0100
Subject: [PATCH 0436/1300] Drop all permissions to paperlessng user

Also make role idempotent
---
 ansible/tasks/main.yml | 105 ++++++++++++++++++++++++++---------------
 1 file changed, 68 insertions(+), 37 deletions(-)

diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index 9c8fd67f5..77635b3d1 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -81,11 +81,11 @@
     state: started
   when: paperlessng_redis_host == 'localhost' or paperlessng_redis_host == '127.0.0.1'
 
-- name: create paperless group
+- name: create paperless system group
   group:
     name: "{{ paperlessng_system_group }}"
 
-- name: create paperless user
+- name: create paperless system user
   user:
     name: "{{ paperlessng_system_user }}"
     groups:
@@ -105,31 +105,10 @@
 - name: backup current paperless-ng installation
   copy:
     src: "{{ paperlessng_directory }}"
-    dest: "{{ paperlessng_directory }}-{{ ansible_date_time.iso8601 }}/"
     remote_src: yes
+    dest: "{{ paperlessng_directory }}-{{ ansible_date_time.iso8601 }}/"
   when: '"No such file or directory" not in paperlessng_current_version.stderr and paperlessng_current_version.stdout != paperlessng_version | string'
 
-- name: download paperless-ng
-  get_url:
-    url: "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-{{ paperlessng_version }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
-    dest: /opt/paperless-ng-{{ paperlessng_version }}.tar.xz
-  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
-
-- name: create paperless-ng directories
-  file:
-    path: "{{ item }}"
-    state: directory
-    owner: "{{ paperlessng_system_user }}"
-    group: "{{ paperlessng_system_group }}"
-    mode: 0750
-    recurse: yes
-  with_items:
-    - "{{ paperlessng_directory }}"
-    - "{{ paperlessng_consumption_dir }}"
-    - "{{ paperlessng_data_dir }}"
-    - "{{ paperlessng_media_root }}"
-    - "{{ paperlessng_static_dir }}"
-
 - name: create temporary directory
   tempfile:
     state: directory
@@ -138,16 +117,28 @@
 
 - name: extract paperless-ng
   unarchive:
-    src: /opt/paperless-ng-{{ paperlessng_version }}.tar.xz
-    dest: "{{ tempdir.path }}"
+    src: "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-{{ paperlessng_version }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
     remote_src: yes
+    dest: "{{ tempdir.path }}"
+  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+
+- name: change permissions of paperless-ng
+  command:
+    cmd: "{{ item }}"
+  with_items:
+  - "find {{ tempdir.path }} -type d -exec chmod 0750 {} ;"
+  - "find {{ tempdir.path }} -type f -exec chmod 0640 {} ;"
   when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
 
 - name: move paperless-ng
-  command:
-    cmd: "cp -R {{ tempdir.path }}/paperless-ng/. {{ paperlessng_directory }}"
-  args:
-    warn: false
+  copy:
+    src: "{{ tempdir.path }}/paperless-ng/"
+    remote_src: yes
+    dest: "{{ paperlessng_directory }}"
+    owner: "{{ paperlessng_system_user }}"
+    group: "{{ paperlessng_system_group }}"
+    mode: preserve
+    directory_mode: preserve
   when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
 
 - name: remove temporary directory
@@ -156,6 +147,20 @@
     state: absent
   when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
 
+- name: create paperless-ng directories and set permissions
+  file:
+    path: "{{ item }}"
+    state: directory
+    owner: "{{ paperlessng_system_user }}"
+    group: "{{ paperlessng_system_group }}"
+    mode: "750"
+  with_items:
+    - "{{ paperlessng_directory }}"  # ansible `copy:` does not set correct permissions on `dest:` for recursive copies
+    - "{{ paperlessng_consumption_dir }}"
+    - "{{ paperlessng_data_dir }}"
+    - "{{ paperlessng_media_root }}"
+    - "{{ paperlessng_static_dir }}"
+
 - name: configure paperless-ng
   lineinfile:
     path: "{{ paperlessng_directory }}/paperless.conf"
@@ -176,10 +181,10 @@
       line: "PAPERLESS_FILENAME_FORMAT={{ paperlessng_filename_format }}"
     - regexp: "^#?PAPERLESS_OCR_LANGUAGE="
       line: "PAPERLESS_OCR_LANGUAGE={{ paperlessng_ocr_languages | join('+') }}"
-    - regexp: "^#PAPERLESS_OCR_USER_ARG="
-      # TODO JSON dict required in conf?
-      # https://paperless-ng.readthedocs.io/en/latest/configuration.html#ocr-settings
-      line: "PAPERLESS_OCR_USER_ARG=\"{{ paperlessng_ocrmypdf_args }}{{ ' --jbig2-lossy' if  paperlessng_use_jbig2enc else '' }}\""
+    # - regexp: "^#PAPERLESS_OCR_USER_ARG="
+    #   # TODO JSON dict required in conf
+    #   # https://paperless-ng.readthedocs.io/en/latest/configuration.html#ocr-settings
+    #   line: "PAPERLESS_OCR_USER_ARG=\"{{ paperlessng_ocrmypdf_args }}{{ ' --jbig2-lossy' if  paperlessng_use_jbig2enc else '' }}\""
     - regexp: "^#?PAPERLESS_TIME_ZONE="
       line: "PAPERLESS_TIME_ZONE={{ paperlessng_time_zone }}"
   no_log: true
@@ -211,29 +216,45 @@
   no_log: true
 
 - name: create paperlessng venv
+  become: yes
+  become_user: "{{ paperlessng_system_user }}"
   command:
     cmd: "python3 -m virtualenv {{ paperlessng_virtualenv }} -p /usr/bin/python3"
     creates: "{{ paperlessng_virtualenv }}"
+  register: venv
 
 - name: install paperlessng requirements
+  become: yes
+  become_user: "{{ paperlessng_system_user }}"
   pip:
     requirements: "{{ paperlessng_directory }}/requirements.txt"
-    virtualenv: "{{ paperlessng_virtualenv }}"
+    executable: "{{ paperlessng_virtualenv }}/bin/pip3"
     extra_args: --upgrade
+  when: paperlessng_current_version.stdout != paperlessng_version | string
 
 - name: collect static files
+  become: yes
+  become_user: "{{ paperlessng_system_user }}"
   command: "{{ paperlessng_virtualenv }}/bin/python3 manage.py collectstatic --no-input"
   args:
     chdir: "{{ paperlessng_directory }}/src"
+  when: paperlessng_current_version.stdout != paperlessng_version | string
+  register: static_files
+  changed_when: "'188 unmodified' not in static_files.stdout"
 
 - name: create database schema
+  become: yes
+  become_user: "{{ paperlessng_system_user }}"
   command: "{{ paperlessng_virtualenv }}/bin/python3 manage.py migrate"
   args:
     chdir: "{{ paperlessng_directory }}/src"
+  when: paperlessng_current_version.stdout != paperlessng_version | string
   register: database_schema
   changed_when: '"No migrations to apply." not in database_schema.stdout'
 
-- name: create first paperless user
+- name: configure paperless superuser
+  become: yes
+  become_user: "{{ paperlessng_system_user }}"
   # "manage.py createsuperuser" only works on interactive TTYs
   command: |
     {{ paperlessng_virtualenv }}/bin/python3 manage.py shell -c "
@@ -265,6 +286,16 @@
   changed_when: superuser.stdout == 'changed'
   no_log: true
 
+- name: set ownership and permissions on paperlessng venv
+  file:
+    path: "{{ paperlessng_virtualenv }}"
+    state: directory
+    recurse: yes
+    owner: "{{ paperlessng_system_user }}"
+    group: "{{ paperlessng_system_group }}"
+    mode: g-w,o-rwx
+  when: venv.changed or paperlessng_current_version.stdout != paperlessng_version | string
+
 - name: configure ghostscript for PDF
   lineinfile:
     path: "/etc/ImageMagick-6/policy.xml"
@@ -325,8 +356,8 @@
 - name: copy systemd services
   copy:
     src: "{{ paperlessng_directory }}/scripts/{{ item }}"
-    dest: "/etc/systemd/system/{{ item }}"
     remote_src: yes
+    dest: "/etc/systemd/system/{{ item }}"
   with_items:
     - paperless-consumer.service
     - paperless-scheduler.service

From 1276419ec6e6691280d98bfb30081f926166e6e5 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Mon, 28 Dec 2020 11:28:19 +0100
Subject: [PATCH 0437/1300] Add molecule test for role

Only test default installation with jbig2enc and sqlite
---
 .travis.yml                           | 10 ++++++++++
 ansible/molecule/default/converge.yml |  7 +++++++
 ansible/molecule/default/molecule.yml | 21 +++++++++++++++++++++
 ansible/molecule/default/verify.yml   | 14 ++++++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 ansible/molecule/default/converge.yml
 create mode 100644 ansible/molecule/default/molecule.yml
 create mode 100644 ansible/molecule/default/verify.yml

diff --git a/.travis.yml b/.travis.yml
index b745d6bd7..e36b1ca99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,16 @@ jobs:
         - ng build --prod
       after_success: true
 
+    - name: "Ansible role"
+      sudo: required
+      services:
+        - docker
+      install:
+        - python3 -m pip install molecule[ansible,docker]
+      script:
+        - cd ansible/
+        - molecule test
+      after_success: true
 
 before_install:
   - sudo apt-get update -qq
diff --git a/ansible/molecule/default/converge.yml b/ansible/molecule/default/converge.yml
new file mode 100644
index 000000000..82067f417
--- /dev/null
+++ b/ansible/molecule/default/converge.yml
@@ -0,0 +1,7 @@
+---
+- name: Converge
+  hosts: all
+  tasks:
+    - name: "Include ansible"
+      include_role:
+        name: "ansible"
diff --git a/ansible/molecule/default/molecule.yml b/ansible/molecule/default/molecule.yml
new file mode 100644
index 000000000..1bf938d98
--- /dev/null
+++ b/ansible/molecule/default/molecule.yml
@@ -0,0 +1,21 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+platforms:
+  - name: debian_buster
+    image: jrei/systemd-debian:10
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    tmpfs:
+      - /tmp
+      - /run
+      - /run/lock
+    override_command: False
+  # debian 9 stretch only has Python 3.5 which is EOL and breaks multiple dependencies
+provisioner:
+  name: ansible
+verifier:
+  name: ansible
diff --git a/ansible/molecule/default/verify.yml b/ansible/molecule/default/verify.yml
new file mode 100644
index 000000000..4c3b86044
--- /dev/null
+++ b/ansible/molecule/default/verify.yml
@@ -0,0 +1,14 @@
+---
+# This is an example playbook to execute Ansible tests.
+
+- name: Verify
+  hosts: all
+  gather_facts: false
+  tasks:
+  - name: check if webserver is up
+    uri:
+      url: http://localhost:8000
+      status_code: [200, 302]
+      return_content: yes
+    register: landingpage
+    failed_when: "'Sign in</button>' not in landingpage.content"

From 08beaf81d56a8130a49657db70e2bdb6b5bdd2dc Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Mon, 28 Dec 2020 12:03:30 +0100
Subject: [PATCH 0438/1300] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 7f3808905..eea41ce05 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,6 @@ Paperless has been around a while now, and people are starting to build stuff on
 These projects also exist, but their status and compatibility with paperless-ng is unknown.
 
 * [Paperless Desktop](https://github.com/thomasbrueggemann/paperless-desktop): A desktop UI for your Paperless installation.  Runs on Mac, Linux, and Windows.
-* [ansible-role-paperless](https://github.com/ovv/ansible-role-paperless): An easy way to get Paperless running via Ansible.
 * [paperless-cli](https://github.com/stgarf/paperless-cli): A golang command line binary to interact with a Paperless instance.
 
 # Important Note

From 61834581d5b840eedf35177cee29efc33100330b Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 28 Dec 2020 12:22:35 +0100
Subject: [PATCH 0439/1300] Move build condition into separate stages list

---
 .travis.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cf18825e8..26153588e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,12 @@ language: python
 dist: focal
 os: linux
 
+stages:
+ - name: build_docker
+   if: branch =~ /^(master|dev|ng-.*)$/
+ - name: publish_manifest
+   if: branch =~ /^(master|dev|ng-.*)$/
+
 jobs:
   include:
     - name: "Paperless on Python 3.6"
@@ -47,8 +53,6 @@ jobs:
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         - docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64
-      on:
-        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
     - stage: build_docker
       name: arm64v8 docker build
       services:
@@ -67,8 +71,6 @@ jobs:
       arch: arm64-graviton2
       virt: vm
       group: edge
-      on:
-        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
     - stage: build_docker
       name: arm32v7 docker build
       services:
@@ -92,8 +94,6 @@ jobs:
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
       env:
         - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
-      on:
-        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
     - stage: publish_manifest
       env:
         - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
@@ -128,8 +128,6 @@ jobs:
           else
             echo "Not a tag and not on master, so not pushing tag/master specific manifest"
           fi
-      on:
-        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
 
 
 before_install:

From ba9b5c50d2a6cfac6c8615f5a9a603f4e0d33b5d Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 28 Dec 2020 12:24:39 +0100
Subject: [PATCH 0440/1300] Add stage definitions of test jobs and add test to
 list of stages

Defining the stages instead of having travis guess them and implicitly build an order
ensures that the test stage is executed before the docker images are built.
---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 26153588e..f4873cf3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ dist: focal
 os: linux
 
 stages:
+ - name: test
  - name: build_docker
    if: branch =~ /^(master|dev|ng-.*)$/
  - name: publish_manifest
@@ -12,21 +13,26 @@ stages:
 jobs:
   include:
     - name: "Paperless on Python 3.6"
+      stage: test
       python: "3.6"
 
     - name: "Paperless on Python 3.7"
+      stage: test
       python: "3.7"
 
     - name: "Paperless on Python 3.8"
+      stage: test
       python: "3.8"
 
     - name: "Documentation"
+      stage: test
       script:
         - cd docs/
         - make html
       after_success: true
 
     - name: "Front end"
+      stage: test
       language: node_js
       node_js:
         - 15

From e2bea3aee38366011c49ca1e8ea04ab6a51b2ca1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 12:29:34 +0100
Subject: [PATCH 0441/1300] add missing index task

---
 src/documents/bulk_edit.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index beb9c50f7..c2dc438bc 100644
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -106,6 +106,10 @@ def modify_tags(doc_ids, add_tags, remove_tags):
             document_id=doc, tag_id=tag) for (doc,tag) in itertools.product(affected_docs, add_tags)
     ], ignore_conflicts=True)
 
+    async_task(
+        "documents.tasks.bulk_index_documents",
+        document_ids=affected_docs
+    )
     async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
 
     return "OK"

From e228e18f04c11e92c0ef9beba1321aacbf31568f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 12:29:53 +0100
Subject: [PATCH 0442/1300] it must have been late when I tried to do this

---
 src/documents/serialisers.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 155030a68..1f33b957c 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -236,6 +236,15 @@ class BulkEditSerializer(serializers.Serializer):
             raise serializers.ValidationError(
                 f"Some documents in {name} don't exist or were specified twice.")
 
+    def _validate_tag_id_list(self, tags, name="tags"):
+        if not type(tags) == list:
+            raise serializers.ValidationError(f"{name} must be a list")
+        if not all([type(i) == int for i in tags]):
+            raise serializers.ValidationError(f"{name} must be a list of integers")
+        count = Tag.objects.filter(id__in=tags).count()
+        if not count == len(tags):
+            raise serializers.ValidationError(
+                f"Some tags in {name} don't exist or were specified twice.")
 
     def validate_documents(self, documents):
         self._validate_document_id_list(documents)
@@ -296,12 +305,12 @@ class BulkEditSerializer(serializers.Serializer):
 
     def _validate_parameters_modify_tags(self, parameters):
         if "add_tags" in parameters:
-            self._validate_document_id_list(parameters['add_tags'], "add_tags")
+            self._validate_tag_id_list(parameters['add_tags'], "add_tags")
         else:
             raise serializers.ValidationError("add_tags not specified")
 
         if "remove_tags" in parameters:
-            self._validate_document_id_list(parameters['remove_tags'], "remove_tags")
+            self._validate_tag_id_list(parameters['remove_tags'], "remove_tags")
         else:
             raise serializers.ValidationError("remove_tags not specified")
 

From 9e311241b313844a50989c3b1aee9d01087374ba Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 12:31:14 +0100
Subject: [PATCH 0443/1300] rename some stuff

---
 src-ui/src/app/services/rest/document.service.ts | 9 ++++-----
 src/documents/views.py                           | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index 9caaecdb2..c42510270 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -28,9 +28,9 @@ export interface SelectionDataItem {
 }
 
 export interface SelectionData {
-  correspondents: SelectionDataItem[]
-  tags: SelectionDataItem[]
-  document_types: SelectionDataItem[]
+  selected_correspondents: SelectionDataItem[]
+  selected_tags: SelectionDataItem[]
+  selected_document_types: SelectionDataItem[]
 }
 
 @Injectable({
@@ -125,8 +125,7 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     })
   }
 
-  selectionData(ids: number[]): Observable<SelectionData> {
-    console.log(ids)
+  getSelectionData(ids: number[]): Observable<SelectionData> {
     return this.http.post<SelectionData>(this.getResourceUrl(null, 'selection_data'), {"documents": ids})
   }
 
diff --git a/src/documents/views.py b/src/documents/views.py
index a50896057..ddf02f534 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -420,7 +420,7 @@ class SelectionDataView(APIView):
                 "id": t.id,
                 "document_count": t.document_count
             } for t in tags],
-            "selected_types": [{
+            "selected_document_types": [{
                 "id": t.id,
                 "document_count": t.document_count
             } for t in types]

From bd02c789663221eb34ff3dacbe5d40b0405d5848 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 12:31:30 +0100
Subject: [PATCH 0444/1300] fix the filter pipe

---
 src-ui/src/app/pipes/filter.pipe.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts
index a982e9019..8465f1533 100644
--- a/src-ui/src/app/pipes/filter.pipe.ts
+++ b/src-ui/src/app/pipes/filter.pipe.ts
@@ -1,17 +1,18 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { ToggleableItem } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
+import { MatchingModel } from '../data/matching-model';
 
 @Pipe({
   name: 'filter'
 })
 export class FilterPipe implements PipeTransform {
-  transform(toggleableItems: ToggleableItem[], searchText: string): any[] {
-    if (!toggleableItems) return [];
-    if (!searchText) return toggleableItems;
+  transform(items: MatchingModel[], searchText: string): any[] {
+    if (!items) return [];
+    if (!searchText) return items;
 
-    return toggleableItems.filter(toggleableItem => {
-      return Object.keys(toggleableItem.item).some(key => {
-        return String(toggleableItem.item[key]).toLowerCase().includes(searchText.toLowerCase());
+    return items.filter(item => {
+      return Object.keys(item).some(key => {
+        return String(item[key]).toLowerCase().includes(searchText.toLowerCase());
       });
     });
    }

From 544ca8d0082325d23276c7164e3af07d0f67ccd7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 12:31:50 +0100
Subject: [PATCH 0445/1300] add ability to manually clear the cache on matching
 models

---
 .../app/services/rest/abstract-paperless-service.ts  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/services/rest/abstract-paperless-service.ts b/src-ui/src/app/services/rest/abstract-paperless-service.ts
index f57956754..8ad1a2141 100644
--- a/src-ui/src/app/services/rest/abstract-paperless-service.ts
+++ b/src-ui/src/app/services/rest/abstract-paperless-service.ts
@@ -74,27 +74,31 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
     )
   }
 
+  clearCache() {
+    this._listAll = null
+  }
+
   get(id: number): Observable<T> {
     return this.http.get<T>(this.getResourceUrl(id))
   }
 
   create(o: T): Observable<T> {
-    this._listAll = null
+    this.clearCache()
     return this.http.post<T>(this.getResourceUrl(), o)
   }
 
   delete(o: T): Observable<any> {
-    this._listAll = null
+    this.clearCache()
     return this.http.delete(this.getResourceUrl(o.id))
   }
 
   update(o: T): Observable<T> {
-    this._listAll = null
+    this.clearCache()
     return this.http.put<T>(this.getResourceUrl(o.id), o)
   }
 
   patch(o: T): Observable<T> {
-    this._listAll = null
+    this.clearCache()
     return this.http.patch<T>(this.getResourceUrl(o.id), o)
   }
 

From 527c533958e14d5ab83b99c8d08b6a553cde1ec0 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 12:32:21 +0100
Subject: [PATCH 0446/1300] improve performance of the toggle dropdown button

---
 .../toggleable-dropdown-button.component.html     | 14 +++++++++++---
 .../toggleable-dropdown-button.component.ts       | 15 +++++++--------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
index 5b58025d1..404ea9d4d 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html
@@ -1,8 +1,16 @@
 <button class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-left-0 border-right-0 border-bottom" role="menuitem" (click)="toggleItem()">
   <div class="selected-icon mr-1">
-    <svg *ngIf="getSelectedIconName() !== ''" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
-      <use attr.xlink:href="assets/bootstrap-icons.svg#{{getSelectedIconName()}}" />
-    </svg>
+    <ng-container *ngIf="isChecked()">
+      <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" class="bi bi-check" viewBox="0 0 16 16">
+        <path d="M10.97 4.97a.75.75 0 0 1 1.07 1.05l-3.99 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.267.267 0 0 1 .02-.022z"/>
+      </svg>
+    </ng-container>
+    <ng-container *ngIf="isPartiallyChecked()">
+      <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" class="bi bi-dash" viewBox="0 0 16 16">
+        <path d="M4 8a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7A.5.5 0 0 1 4 8z"/>
+      </svg>
+    </ng-container>
+    
   </div>
   <div class="mr-1">
     <app-tag *ngIf="isTag; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
index 1d42b0946..f082dfe67 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
@@ -40,13 +40,12 @@ export class ToggleableDropdownButtonComponent {
     this.toggle.emit()
   }
 
-  getSelectedIconName() {
-    if (this.state == ToggleableItemState.Selected) {
-      return "check"
-    } else if (this.state == ToggleableItemState.PartiallySelected) {
-      return "dash"
-    } else {
-      return ""
-    }
+  isChecked() {
+    return this.state == ToggleableItemState.Selected
   }
+
+  isPartiallyChecked() {
+    return this.state == ToggleableItemState.PartiallySelected
+  }
+
 }

From 67953c98a94dd0ee661d250867f7021967779ded Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 12:32:36 +0100
Subject: [PATCH 0447/1300] remove some non-required stuff

---
 .../document-list/document-list.component.ts           | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 60a483816..d83f02678 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -4,16 +4,11 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
-import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
-import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
-import { TagService } from 'src/app/services/rest/tag.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { Toast, ToastService } from 'src/app/services/toast.service';
 import { FilterEditorComponent } from './filter-editor/filter-editor.component';
-import { SelectDialogComponent } from '../common/select-dialog/select-dialog.component';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
-import { ChangedItems } from './bulk-editor/bulk-editor.component';
 
 @Component({
   selector: 'app-document-list',
@@ -28,10 +23,7 @@ export class DocumentListComponent implements OnInit {
     public route: ActivatedRoute,
     private router: Router,
     private toastService: ToastService,
-    private modalService: NgbModal,
-    private correspondentService: CorrespondentService,
-    private documentTypeService: DocumentTypeService,
-    private tagService: TagService) { }
+    private modalService: NgbModal) { }
 
   @ViewChild("filterEditor")
   private filterEditor: FilterEditorComponent

From 8af0259671e60862233f45cda651ea7a0bca19f1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 12:36:26 +0100
Subject: [PATCH 0448/1300] rework the bulk editor

---
 .../filterable-dropdown.component.html        |   8 +-
 .../filterable-dropdown.component.ts          | 109 ++++++---
 .../bulk-editor/bulk-editor.component.html    |  42 ++--
 .../bulk-editor/bulk-editor.component.ts      | 223 ++++++------------
 4 files changed, 168 insertions(+), 214 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 7c9a133ce..d7b2af6d3 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -1,12 +1,12 @@
 <div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown">
-  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="type !== types.Editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'">
+  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'">
     <div class="d-none d-md-inline">{{title}}</div>
     <div class="d-inline-block d-md-none">
       <svg class="toolbaricon" fill="currentColor">
         <use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
       </svg>
     </div>
-    <ng-container *ngIf="type !== types.Editing && selectionModel.selectionSize() > 0">
+    <ng-container *ngIf="!editing && selectionModel.selectionSize() > 0">
       <div class="badge bg-secondary text-light rounded-pill badge-corner">
         {{selectionModel.selectionSize()}}
       </div>
@@ -24,8 +24,8 @@
           <app-toggleable-dropdown-button [item]="item" [state]="selectionModel.get(item.id)" (toggle)="selectionModel.toggle(item.id)"></app-toggleable-dropdown-button>
         </ng-container>
       </div>
-      <button *ngIf="type == types.Editing" class="list-group-item list-group-item-action bg-light" (click)="dropdown.close()" [disabled]="!hasBeenToggled || (toggleableItems | filter: filterText).length == 0">
-        <small class="ml-1" [ngClass]="{'font-weight-bold': hasBeenToggled && (toggleableItems | filter: filterText).length > 0}">Apply</small>
+      <button *ngIf="editing" class="list-group-item list-group-item-action bg-light" (click)="applyClicked()" [disabled]="!selectionModel.isDirty()">
+        <small class="ml-1" [ngClass]="{'font-weight-bold': selectionModel.isDirty()}">Apply</small>
         <svg width="1.5em" height="1em" viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#arrow-right" />
         </svg>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index acb07e0d4..8fb2d25d9 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -1,14 +1,13 @@
 import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core';
 import { FilterPipe } from  'src/app/pipes/filter.pipe';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
-import { ToggleableItem, ToggleableItemState } from './toggleable-dropdown-button/toggleable-dropdown-button.component';
+import { ToggleableItemState } from './toggleable-dropdown-button/toggleable-dropdown-button.component';
 import { MatchingModel } from 'src/app/data/matching-model';
 import { Subject } from 'rxjs';
-import { ThrowStmt } from '@angular/compiler';
 
-export enum FilterableDropdownType {
-  Filtering = 'filtering',
-  Editing = 'editing'
+export interface ChangedItems {
+  itemsToAdd: MatchingModel[],
+  itemsToRemove: MatchingModel[]
 }
 
 export class FilterableDropdownSelectionModel {
@@ -19,31 +18,37 @@ export class FilterableDropdownSelectionModel {
 
   items: MatchingModel[] = []
 
-  selection = new Map<number, ToggleableItemState>()
+  private selectionStates = new Map<number, ToggleableItemState>()
+
+  private temporarySelectionStates = new Map<number, ToggleableItemState>()
 
   getSelectedItems() {
-    return this.items.filter(i => this.selection.get(i.id) == ToggleableItemState.Selected)
+    return this.items.filter(i => this.temporarySelectionStates.get(i.id) == ToggleableItemState.Selected)
   }
 
   set(id: number, state: ToggleableItemState, fireEvent = true) {
-    this.selection.set(id, state)
+    if (state == ToggleableItemState.NotSelected) {
+      this.temporarySelectionStates.delete(id)
+    } else {
+      this.temporarySelectionStates.set(id, state)
+    }
     if (fireEvent) {
       this.changed.next(this)
     }
   }
 
   toggle(id: number, fireEvent = true) {
-    let state = this.selection.get(id)
+    let state = this.temporarySelectionStates.get(id)
     if (state == null || state != ToggleableItemState.Selected) {
-      this.selection.set(id, ToggleableItemState.Selected)
+      this.temporarySelectionStates.set(id, ToggleableItemState.Selected)
     } else if (state == ToggleableItemState.Selected) {
-      this.selection.set(id, ToggleableItemState.NotSelected)
+      this.temporarySelectionStates.delete(id)
     }
 
     if (!this.multiple) {
-      for (let key of this.selection.keys()) {
+      for (let key of this.temporarySelectionStates.keys()) {
         if (key != id) {
-          this.selection.set(key, ToggleableItemState.NotSelected)
+          this.temporarySelectionStates.delete(key)
         }
       }
     }
@@ -55,7 +60,7 @@ export class FilterableDropdownSelectionModel {
   }
 
   get(id: number) {
-    return this.selection.get(id) || ToggleableItemState.NotSelected
+    return this.temporarySelectionStates.get(id) || ToggleableItemState.NotSelected
   }
 
   selectionSize() {
@@ -63,11 +68,47 @@ export class FilterableDropdownSelectionModel {
   }
 
   clear(fireEvent = true) {
-    this.selection.clear()
+    this.temporarySelectionStates.clear()
     if (fireEvent) {
       this.changed.next(this)
     }
   }
+
+  isDirty() {
+    if (!Array.from(this.temporarySelectionStates.keys()).every(id => this.temporarySelectionStates.get(id) == this.selectionStates.get(id))) {
+      return true
+    } else if (!Array.from(this.selectionStates.keys()).every(id => this.selectionStates.get(id) == this.temporarySelectionStates.get(id))) {
+      return true
+    } else {
+      return false
+    }
+  }
+
+  init(map) {
+    this.temporarySelectionStates = map
+    this.apply()
+  }
+
+  apply() {
+    this.selectionStates.clear()
+    this.temporarySelectionStates.forEach((value, key) => {
+      this.selectionStates.set(key, value)
+    })
+  }
+
+  reset() {
+    this.temporarySelectionStates.clear()
+    this.selectionStates.forEach((value, key) => {
+      this.temporarySelectionStates.set(key, value)
+    })
+  }
+
+  diff(): ChangedItems {
+    return {
+      itemsToAdd: this.items.filter(item => this.temporarySelectionStates.get(item.id) == ToggleableItemState.Selected && this.selectionStates.get(item.id) != ToggleableItemState.Selected),
+      itemsToRemove: this.items.filter(item => !this.temporarySelectionStates.has(item.id) && this.selectionStates.has(item.id)),
+    }
+  }
 }
 
 @Component({
@@ -131,35 +172,35 @@ export class FilterableDropdownComponent {
   icon: string
 
   @Input()
-  type: FilterableDropdownType = FilterableDropdownType.Filtering
+  editing = false
 
-  types = FilterableDropdownType
+  @Output()
+  apply = new EventEmitter<ChangedItems>()
 
-  hasBeenToggled:boolean = false
+  @Output()
+  open = new EventEmitter()
 
   constructor(private filterPipe: FilterPipe) {
     this.selectionModel = new FilterableDropdownSelectionModel()
   }
 
-  toggleItem(toggleableItem: ToggleableItem): void {
-    // if (this.singular && toggleableItem.state == ToggleableItemState.Selected) {
-    //   this.selectionModel.items.filter(ti => ti.item.id !== toggleableItem.item.id).forEach(ti => ti.state = ToggleableItemState.NotSelected)
-    // }
-    // this.hasBeenToggled = true
-    // this.toggle.emit(toggleableItem.item)
+  applyClicked() {
+    if (this.selectionModel.isDirty()) {
+      this.dropdown.close()
+      this.apply.emit(this.selectionModel.diff())
+    }
   }
 
   dropdownOpenChange(open: boolean): void {
-    // if (open) {
-    //   setTimeout(() => {
-    //     this.listFilterTextInput.nativeElement.focus();
-    //   }, 0)
-    //   this.hasBeenToggled = false
-    //   this.open.next()
-    // } else {
-    //   this.filterText = ''
-    //   if (this.type == FilterableDropdownType.Editing) this.editingComplete.emit(this.toggleableItems)
-    // }
+    if (open) {
+      setTimeout(() => {
+        this.listFilterTextInput.nativeElement.focus();
+      }, 0)
+      this.selectionModel.reset()
+      this.open.next()
+    } else {
+      this.filterText = ''
+    }
   }
 
   listFilterEnter(): void {
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 800ef3742..c78f3ea3e 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -1,6 +1,6 @@
-<!-- <div class="row">
+<div class="row">
   <div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
-    <button class="btn btn-sm btn-outline-danger" (click)="documentList.selectNone()">
+    <button class="btn btn-sm btn-outline-danger" (click)="list.selectNone()">
       <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#slash-circle" />
       </svg>
@@ -11,13 +11,13 @@
   <div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
     <label class="mr-2 mb-0">Select:</label>
     <div class="btn-group">
-      <button class="btn btn-sm btn-outline-primary" (click)="documentList.selectPage()">
+      <button class="btn btn-sm btn-outline-primary" (click)="list.selectPage()">
         <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#file-earmark-check" />
         </svg>
         Page
       </button>
-      <button class="btn btn-sm btn-outline-primary" (click)="documentList.selectAll()">
+      <button class="btn btn-sm btn-outline-primary" (click)="list.selectAll()">
         <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#check-all" />
         </svg>
@@ -30,22 +30,26 @@
     <div class="d-flex">
       <label class="ml-auto mt-1 mb-0 mr-2">Edit:</label>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill"
-        [toggleableItems]="tagsToggleableItems"
-        [type]="dropdownTypes.Editing"
-        (open)="tagsDropdownOpen()"
-        (editingComplete)="setTags($event)">
+        [items]="tags"
+        [editing]="true"
+        [multiple]="true"
+        (open)="openTagsDropdown()"
+        [(selectionModel)]="tagSelectionModel"
+        (apply)="setTags($event)">
       </app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" singular="true"
-        [toggleableItems]="correspondentsToggleableItems"
-        [type]="dropdownTypes.Editing"
-        (open)="correspondentsDropdownOpen()"
-        (editingComplete)="setCorrespondents($event)">
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill"
+        [items]="correspondents"
+        [editing]="true"
+        (open)="openCorrespondentDropdown()"
+        [(selectionModel)]="correspondentSelectionModel"
+        (apply)="setCorrespondents($event)">
       </app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill" singular="true"
-        [toggleableItems]="documentTypesToggleableItems"
-        [type]="dropdownTypes.Editing"
-        (open)="documentTypesDropdownOpen()"
-        (editingComplete)="setDocumentTypes($event)">
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill"
+        [items]="documentTypes"
+        [editing]="true"
+        (open)="openDocumentTypeDropdown()"
+        [(selectionModel)]="documentTypeSelectionModel"
+        (apply)="setDocumentTypes($event)">
       </app-filterable-dropdown>
     </div>
   </div>
@@ -58,4 +62,4 @@
       Delete
     </button>
   </div>
-</div> -->
+</div>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 4365e00b0..36577bc6f 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -1,26 +1,19 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
-import { ObjectWithId } from 'src/app/data/object-with-id';
 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';
-import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { TagService } from 'src/app/services/rest/tag.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { DocumentService } from 'src/app/services/rest/document.service';
+import { DocumentService, SelectionDataItem } from 'src/app/services/rest/document.service';
 import { OpenDocumentsService } from 'src/app/services/open-documents.service';
-import { FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component';
 import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component';
-import { ToggleableItem, ToggleableItemState } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
-
-export interface ChangedItems {
-  itemsToAdd: any[],
-  itemsToRemove: any[]
-}
+import { ChangedItems, FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component';
+import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
 
 @Component({
   selector: 'app-bulk-editor',
@@ -33,69 +26,15 @@ export class BulkEditorComponent {
   correspondents: PaperlessCorrespondent[]
   documentTypes: PaperlessDocumentType[]
 
-  private initialTagsToggleableItems: ToggleableItem[]
-  private initialCorrespondentsToggleableItems: ToggleableItem[]
-  private initialDocumentTypesToggleableItems: ToggleableItem[]
-
-  dropdownTypes = FilterableDropdownType
-
-  private _tagsToggleableItems: ToggleableItem[]
-  get tagsToggleableItems(): ToggleableItem[] {
-    let tagsToggleableItems = []
-    let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id))
- 
-    this.tags?.forEach(t => {
-      let selectedDocumentsWithTag: PaperlessDocument[] = selectedDocuments.filter(d => d.tags.includes(t.id))
-      let state = ToggleableItemState.NotSelected
-      if (selectedDocuments.length > 0 && selectedDocumentsWithTag.length == selectedDocuments.length) state = ToggleableItemState.Selected
-      else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
-      tagsToggleableItems.push({item: t, state: state, count: selectedDocumentsWithTag.length})
-    })
-    this._tagsToggleableItems = tagsToggleableItems
-    return tagsToggleableItems
-  }
-
-  private _correspondentsToggleableItems: ToggleableItem[]
-  get correspondentsToggleableItems(): ToggleableItem[] {
-    let correspondentsToggleableItems = []
-    let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id))
-
-    this.correspondents?.forEach(c => {
-      let selectedDocumentsWithCorrespondent: PaperlessDocument[] = selectedDocuments.filter(d => d.correspondent == c.id)
-      let state = ToggleableItemState.NotSelected
-      if (selectedDocuments.length > 0 && selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = ToggleableItemState.Selected
-      else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
-      correspondentsToggleableItems.push({item: c, state: state, count: selectedDocumentsWithCorrespondent.length})
-    })
-    this._correspondentsToggleableItems = correspondentsToggleableItems
-    return correspondentsToggleableItems
-  }
-
-  private _documentTypesToggleableItems: ToggleableItem[]
-  get documentTypesToggleableItems(): ToggleableItem[] {
-    let documentTypesToggleableItems = []
-    let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id))
-
-    this.documentTypes?.forEach(dt => {
-      let selectedDocumentsWithDocumentType: PaperlessDocument[] = selectedDocuments.filter(d => d.document_type == dt.id)
-      let state = ToggleableItemState.NotSelected
-      if (selectedDocuments.length > 0 && selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = ToggleableItemState.Selected
-      else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected
-      documentTypesToggleableItems.push({item: dt, state: state, count: selectedDocumentsWithDocumentType.length})
-    })
-    this._documentTypesToggleableItems = documentTypesToggleableItems
-    return documentTypesToggleableItems
-  }
-
-  get documentList(): DocumentListViewService {
-    return this.documentListViewService
-  }
+  tagSelectionModel = new FilterableDropdownSelectionModel()
+  correspondentSelectionModel = new FilterableDropdownSelectionModel()
+  documentTypeSelectionModel = new FilterableDropdownSelectionModel()
 
   constructor(
     private documentTypeService: DocumentTypeService,
     private tagService: TagService,
     private correspondentService: CorrespondentService,
-    private documentListViewService: DocumentListViewService,
+    public list: DocumentListViewService,
     private documentService: DocumentService,
     private modalService: NgbModal,
     private openDocumentService: OpenDocumentsService
@@ -107,97 +46,69 @@ export class BulkEditorComponent {
     this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
   }
 
-  tagsDropdownOpen() {
-    this.initialTagsToggleableItems = this._tagsToggleableItems
-  }
-
-  correspondentsDropdownOpen() {
-    this.initialCorrespondentsToggleableItems = this._correspondentsToggleableItems
-  }
-
-  documentTypesDropdownOpen() {
-    this.initialDocumentTypesToggleableItems = this._documentTypesToggleableItems
-  }
-
-  private checkForChangedItems(toggleableItemsA: ToggleableItem[], toggleableItemsB: ToggleableItem[]): ChangedItems {
-    let itemsToAdd: any[] = []
-    let itemsToRemove: any[] = []
-    toggleableItemsA.forEach(oldItem => {
-      let newItem = toggleableItemsB.find(nTTI => nTTI.item.id == oldItem.item.id)
-
-      if (newItem.state == ToggleableItemState.Selected && (oldItem.state == ToggleableItemState.PartiallySelected || oldItem.state == ToggleableItemState.NotSelected)) itemsToAdd.push(newItem.item)
-      else if (newItem.state == ToggleableItemState.NotSelected && (oldItem.state == ToggleableItemState.Selected || oldItem.state == ToggleableItemState.PartiallySelected)) itemsToRemove.push(newItem.item)
-    })
-    return { itemsToAdd: itemsToAdd, itemsToRemove: itemsToRemove }
-  }
-
   private executeBulkOperation(method: string, args): Observable<any> {
-    return this.documentService.bulkEdit(Array.from(this.documentList.selected), method, args).pipe(
+    return this.documentService.bulkEdit(Array.from(this.list.selected), method, args).pipe(
       tap(() => {
-        this.documentList.reload()
-        this.documentList.selected.forEach(id => {
+        this.list.reload()
+        this.list.selected.forEach(id => {
           this.openDocumentService.refreshDocument(id)
         })
-        this.documentList.selectNone()
+        this.list.selectNone()
       })
     )
   }
 
-  setTags(newTagsToggleableItems: ToggleableItem[]) {
-    let changedTags: ChangedItems
-    if (newTagsToggleableItems) {
-      changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems)
-      if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 0) return
-    }
+  private applySelectionData(items: SelectionDataItem[], selectionModel: FilterableDropdownSelectionModel) {
+    let selectionData = new Map<number, ToggleableItemState>()
+    items.forEach(i => {
+      if (i.document_count == this.list.selected.size) {
+        selectionData.set(i.id, ToggleableItemState.Selected)
+      } else if (i.document_count > 0) {
+        selectionData.set(i.id, ToggleableItemState.PartiallySelected)
+      }
+    })
+    selectionModel.init(selectionData)
+  }
 
-    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Tags Assignment"
-    let action = 'set_tags'
-    let tags
-    let messageFragment = ''
-    let both = changedTags && changedTags.itemsToAdd.length > 0 && changedTags.itemsToRemove.length > 0
-    if (!changedTags) {
-      messageFragment = `remove all tags from`
-    } else {
-      if (changedTags.itemsToAdd.length > 0) {
-        tags = changedTags.itemsToAdd
-        messageFragment = `assign the tag(s) ${changedTags.itemsToAdd.map(t => t.name).join(', ')} to`
-      }
-      if (changedTags.itemsToRemove.length > 0) {
-        if (!both) {
-          action = 'remove_tags'
-          tags = changedTags.itemsToRemove
-        } else {
-          messageFragment += ' and '
-        }
-        messageFragment += `remove the tag(s) ${changedTags.itemsToRemove.map(t => t.name).join(', ')} from`
-      }
-    }
-    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.documentList.selected.size} selected document(s).`
-    modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = "Confirm"
-    modal.componentInstance.confirmClicked.subscribe(() => {
-      // TODO: API endpoints for add/remove multiple tags
-      this.executeBulkOperation(action, {"tags": tags ? tags.map(t => t.id) : null}).subscribe(
-        response => {
-          if (!both) modal.close()
-          else {
-            this.executeBulkOperation('remove_tags', {"tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe(
-              response => {
-                modal.close()
-              })
-          }
-        }
-      )
+  openTagsDropdown() {
+    this.documentService.getSelectionData(Array.from(this.list.selected)).subscribe(s => {
+      this.applySelectionData(s.selected_tags, this.tagSelectionModel)
     })
   }
 
-  setCorrespondents(newCorrespondentsToggleableItems: ToggleableItem[]) {
-    let changedCorrespondents: ChangedItems
-    if (newCorrespondentsToggleableItems) {
-      changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems)
-      if (changedCorrespondents.itemsToAdd.length == 0 && changedCorrespondents.itemsToRemove.length == 0) return
-    }
+  openDocumentTypeDropdown() {
+    this.documentService.getSelectionData(Array.from(this.list.selected)).subscribe(s => {
+      this.applySelectionData(s.selected_document_types, this.documentTypeSelectionModel)
+    })
+  }
+
+  openCorrespondentDropdown() {
+    this.documentService.getSelectionData(Array.from(this.list.selected)).subscribe(s => {
+      this.applySelectionData(s.selected_correspondents, this.correspondentSelectionModel)
+    })
+  }
+
+  setTags(changedTags: ChangedItems) {
+    if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 0) return
+
+    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.title = "Confirm Tags Assignment"
+   
+    modal.componentInstance.message = `This operation will modify some tags on all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.btnClass = "btn-warning"
+    modal.componentInstance.btnCaption = "Confirm"
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      this.executeBulkOperation('modify_tags', {"add_tags": changedTags.itemsToAdd.map(t => t.id), "remove_tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe(
+        response => {
+          this.tagService.clearCache()
+          modal.close()
+        })
+      }
+    )
+  }
+
+  setCorrespondents(changedCorrespondents: ChangedItems) {
+    if (changedCorrespondents.itemsToAdd.length == 0 && changedCorrespondents.itemsToRemove.length == 0) return
 
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Confirm Correspondent Assignment"
@@ -207,24 +118,21 @@ export class BulkEditorComponent {
       correspondent = changedCorrespondents.itemsToAdd[0]
       messageFragment = `assign the correspondent ${correspondent.name} to`
     }
-    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.documentList.selected.size} selected document(s).`
+    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
     modal.componentInstance.btnClass = "btn-warning"
     modal.componentInstance.btnCaption = "Confirm"
     modal.componentInstance.confirmClicked.subscribe(() => {
       this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
         response => {
+          this.correspondentService.clearCache()
           modal.close()
         }
       )
     })
   }
 
-  setDocumentTypes(newDocumentTypesToggleableItems: ToggleableItem[]) {
-    let changedDocumentTypes: ChangedItems
-    if (newDocumentTypesToggleableItems) {
-      changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems)
-      if (changedDocumentTypes.itemsToAdd.length == 0 && changedDocumentTypes.itemsToRemove.length == 0) return
-    }
+  setDocumentTypes(changedDocumentTypes: ChangedItems) {
+    if (changedDocumentTypes.itemsToAdd.length == 0 && changedDocumentTypes.itemsToRemove.length == 0) return
 
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = "Confirm Document Type Assignment"
@@ -234,12 +142,13 @@ export class BulkEditorComponent {
       documentType = changedDocumentTypes.itemsToAdd[0]
       messageFragment = `assign the document type ${documentType.name} to`
     }
-    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.documentList.selected.size} selected document(s).`
+    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
     modal.componentInstance.btnClass = "btn-warning"
     modal.componentInstance.btnCaption = "Confirm"
     modal.componentInstance.confirmClicked.subscribe(() => {
       this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
         response => {
+          this.documentService.clearCache()
           modal.close()
         }
       )
@@ -250,7 +159,7 @@ export class BulkEditorComponent {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.delayConfirm(5)
     modal.componentInstance.title = "Delete confirm"
-    modal.componentInstance.messageBold = `This operation will permanently delete all ${this.documentList.selected.size} selected document(s).`
+    modal.componentInstance.messageBold = `This operation will permanently delete all ${this.list.selected.size} selected document(s).`
     modal.componentInstance.message = `This operation cannot be undone.`
     modal.componentInstance.btnClass = "btn-danger"
     modal.componentInstance.btnCaption = "Delete document(s)"

From 7beb8a09299696e1e83cf6241f249f3b67943833 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 12:48:41 +0100
Subject: [PATCH 0449/1300] fix enter select

---
 .../filterable-dropdown.component.ts          | 20 +++++++++++--------
 src-ui/src/app/pipes/filter.pipe.ts           |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 8fb2d25d9..e06f0d638 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -196,7 +196,9 @@ export class FilterableDropdownComponent {
       setTimeout(() => {
         this.listFilterTextInput.nativeElement.focus();
       }, 0)
-      this.selectionModel.reset()
+      if (this.editing) {
+        this.selectionModel.reset()
+      }
       this.open.next()
     } else {
       this.filterText = ''
@@ -204,12 +206,14 @@ export class FilterableDropdownComponent {
   }
 
   listFilterEnter(): void {
-    // let filtered = this.filterPipe.transform(this.toggleableItems, this.filterText)
-    // if (filtered.length == 1) {
-    //   let toggleableItem = this.toggleableItems.find(ti => ti.item.id == filtered[0].item.id)
-    //   if (toggleableItem) toggleableItem.state = ToggleableItemState.Selected
-    //   this.toggleItem(filtered[0])
-    //   this.dropdown.close()
-    // }
+    let filtered = this.filterPipe.transform(this.items, this.filterText)
+    if (filtered.length == 1) {
+      this.selectionModel.toggle(filtered[0].id)
+      if (this.editing) {
+        this.applyClicked()
+      } else {
+        this.dropdown.close()
+      }
+    }
   }
 }
diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts
index 8465f1533..d83ccc07a 100644
--- a/src-ui/src/app/pipes/filter.pipe.ts
+++ b/src-ui/src/app/pipes/filter.pipe.ts
@@ -6,7 +6,7 @@ import { MatchingModel } from '../data/matching-model';
   name: 'filter'
 })
 export class FilterPipe implements PipeTransform {
-  transform(items: MatchingModel[], searchText: string): any[] {
+  transform(items: MatchingModel[], searchText: string): MatchingModel[] {
     if (!items) return [];
     if (!searchText) return items;
 

From bdf2e298435b2e3139224f91a880842de3193eae Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Mon, 28 Dec 2020 12:21:10 +0100
Subject: [PATCH 0450/1300] Verify role for Ubuntu 20.04

---
 ansible/molecule/default/molecule.yml | 14 ++++++++++++++
 ansible/tasks/main.yml                |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ansible/molecule/default/molecule.yml b/ansible/molecule/default/molecule.yml
index 1bf938d98..27f37ba63 100644
--- a/ansible/molecule/default/molecule.yml
+++ b/ansible/molecule/default/molecule.yml
@@ -4,6 +4,20 @@ dependency:
 driver:
   name: docker
 platforms:
+  - name: ubuntu_focal
+    image: jrei/systemd-ubuntu:20.04
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    tmpfs:
+      - /tmp
+      - /run
+      - /run/lock
+    override_command: False
+  # ubuntu 18.04 bionic works except that
+  #   the default redis configuration expects IPv6 which is not enabled in docker by default
+  #   the default Python environment is configured for ASCII instead of UTF-8
+  # ubuntu 16.04 xenial only has Python 3.5 which is EOL and breaks multiple dependencies
   - name: debian_buster
     image: jrei/systemd-debian:10
     privileged: true
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index 77635b3d1..c94534895 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
 - name: verify operating system
   fail:
-    msg: Sorry, only Debian supported at the moment.
-  when: ansible_distribution != 'Debian'
+    msg: Sorry, only Debian and Ubuntu supported at the moment.
+  when: not(ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu')
 
 - name: install base dependencies
   apt:

From 3d173a13ab8706a57ae0985461857c556a6992f4 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 13:31:22 +0100
Subject: [PATCH 0451/1300] move the two post bulk edit tasks into one

---
 src/documents/bulk_edit.py      | 29 ++++-------------------
 src/documents/tasks.py          |  9 ++------
 src/documents/tests/test_api.py | 41 ++++++++++++++++++---------------
 3 files changed, 30 insertions(+), 49 deletions(-)

diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index c2dc438bc..18168a164 100644
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -18,11 +18,7 @@ def set_correspondent(doc_ids, correspondent):
     qs.update(correspondent=correspondent)
 
     async_task(
-        "documents.tasks.bulk_index_documents",
-        document_ids=affected_docs
-    )
-
-    async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
+        "documents.tasks.bulk_update_documents", document_ids=affected_docs)
 
     return "OK"
 
@@ -37,11 +33,7 @@ def set_document_type(doc_ids, document_type):
     qs.update(document_type=document_type)
 
     async_task(
-        "documents.tasks.bulk_index_documents",
-        document_ids=affected_docs
-    )
-
-    async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
+        "documents.tasks.bulk_update_documents", document_ids=affected_docs)
 
     return "OK"
 
@@ -59,11 +51,7 @@ def add_tag(doc_ids, tag):
     ])
 
     async_task(
-        "documents.tasks.bulk_index_documents",
-        document_ids=affected_docs
-    )
-
-    async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
+        "documents.tasks.bulk_update_documents", document_ids=affected_docs)
 
     return "OK"
 
@@ -81,11 +69,7 @@ def remove_tag(doc_ids, tag):
     ).delete()
 
     async_task(
-        "documents.tasks.bulk_index_documents",
-        document_ids=affected_docs
-    )
-
-    async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
+        "documents.tasks.bulk_update_documents", document_ids=affected_docs)
 
     return "OK"
 
@@ -107,10 +91,7 @@ def modify_tags(doc_ids, add_tags, remove_tags):
     ], ignore_conflicts=True)
 
     async_task(
-        "documents.tasks.bulk_index_documents",
-        document_ids=affected_docs
-    )
-    async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
+        "documents.tasks.bulk_update_documents", document_ids=affected_docs)
 
     return "OK"
 
diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index c1f3ffbaa..f9937c177 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -90,16 +90,11 @@ def sanity_check():
         return "No issues detected."
 
 
-def bulk_rename_files(document_ids):
-    qs = Document.objects.filter(id__in=document_ids)
-    for doc in qs:
-        post_save.send(Document, instance=doc, created=False)
-
-
-def bulk_index_documents(document_ids):
+def bulk_update_documents(document_ids):
     documents = Document.objects.filter(id__in=document_ids)
 
     ix = index.open_index()
     with AsyncWriter(ix) as writer:
         for doc in documents:
             index.update_document(writer, doc)
+            post_save.send(Document, instance=doc, created=False)
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index a9c855ff7..adc947a1a 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -699,49 +699,49 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1)
         bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], self.c2.id)
         self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 3)
-        self.assertEqual(self.async_task.call_count, 2)
-        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id])
-        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id])
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id])
 
     def test_unset_correspondent(self):
         self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1)
         bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], None)
         self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 0)
-        self.assertEqual(self.async_task.call_count, 2)
-        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id])
-        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id])
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id])
 
     def test_set_document_type(self):
         self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1)
         bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], self.dt2.id)
         self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 3)
-        self.assertEqual(self.async_task.call_count, 2)
-        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id])
-        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id])
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id])
 
     def test_unset_document_type(self):
         self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1)
         bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], None)
         self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 0)
-        self.assertEqual(self.async_task.call_count, 2)
-        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id])
-        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id])
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id])
 
     def test_add_tag(self):
         self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2)
         bulk_edit.add_tag([self.doc1.id, self.doc2.id, self.doc3.id, self.doc4.id], self.t1.id)
         self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 4)
-        self.assertEqual(self.async_task.call_count, 2)
-        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc3.id])
-        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc3.id])
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc3.id])
 
     def test_remove_tag(self):
         self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2)
         bulk_edit.remove_tag([self.doc1.id, self.doc3.id, self.doc4.id], self.t1.id)
         self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 1)
-        self.assertEqual(self.async_task.call_count, 2)
-        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc4.id])
-        self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc4.id])
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        self.assertCountEqual(kwargs['document_ids'], [self.doc4.id])
 
     def test_modify_tags(self):
         tag_unrelated = Tag.objects.create(name="unrelated")
@@ -752,6 +752,11 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         self.assertCountEqual(list(self.doc2.tags.all()), [self.t2, tag_unrelated])
         self.assertCountEqual(list(self.doc3.tags.all()), [self.t2, tag_unrelated])
 
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+        # TODO: doc3 should not be affected, but the query for that is rather complicated
+        self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id])
+
     def test_delete(self):
         self.assertEqual(Document.objects.count(), 5)
         bulk_edit.delete([self.doc1.id, self.doc2.id])

From aa6e96e54d6a29ef5a8ea5478457cc63515ec456 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 13:33:58 +0100
Subject: [PATCH 0452/1300] fix pycodestyle

---
 src/documents/bulk_edit.py   |  6 +++---
 src/documents/serialisers.py | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index 18168a164..c0c80a795 100644
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -85,9 +85,9 @@ def modify_tags(doc_ids, add_tags, remove_tags):
         tag_id__in=remove_tags,
     ).delete()
 
-    DocumentTagRelationship.objects.bulk_create([
-        DocumentTagRelationship(
-            document_id=doc, tag_id=tag) for (doc,tag) in itertools.product(affected_docs, add_tags)
+    DocumentTagRelationship.objects.bulk_create([DocumentTagRelationship(
+        document_id=doc, tag_id=tag) for (doc, tag) in itertools.product(
+        affected_docs, add_tags)
     ], ignore_conflicts=True)
 
     async_task(
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 1f33b957c..66f5f883f 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -230,17 +230,20 @@ class BulkEditSerializer(serializers.Serializer):
         if not type(documents) == list:
             raise serializers.ValidationError(f"{name} must be a list")
         if not all([type(i) == int for i in documents]):
-            raise serializers.ValidationError(f"{name} must be a list of integers")
+            raise serializers.ValidationError(
+                f"{name} must be a list of integers")
         count = Document.objects.filter(id__in=documents).count()
         if not count == len(documents):
             raise serializers.ValidationError(
-                f"Some documents in {name} don't exist or were specified twice.")
+                f"Some documents in {name} don't exist or were "
+                f"specified twice.")
 
     def _validate_tag_id_list(self, tags, name="tags"):
         if not type(tags) == list:
             raise serializers.ValidationError(f"{name} must be a list")
         if not all([type(i) == int for i in tags]):
-            raise serializers.ValidationError(f"{name} must be a list of integers")
+            raise serializers.ValidationError(
+                f"{name} must be a list of integers")
         count = Tag.objects.filter(id__in=tags).count()
         if not count == len(tags):
             raise serializers.ValidationError(
@@ -310,7 +313,8 @@ class BulkEditSerializer(serializers.Serializer):
             raise serializers.ValidationError("add_tags not specified")
 
         if "remove_tags" in parameters:
-            self._validate_tag_id_list(parameters['remove_tags'], "remove_tags")
+            self._validate_tag_id_list(parameters['remove_tags'],
+                                       "remove_tags")
         else:
             raise serializers.ValidationError("remove_tags not specified")
 

From d6e733c56f8724b95189011fd383829d830eb2df Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 15:39:53 +0100
Subject: [PATCH 0453/1300] add more localization tags #123

---
 .../confirm-dialog/confirm-dialog.component.ts |  4 ++--
 .../date-dropdown/date-dropdown.component.html |  8 ++++----
 .../filterable-dropdown.component.html         |  2 +-
 .../select-dialog/select-dialog.component.html |  4 ++--
 .../select-dialog/select-dialog.component.ts   |  4 ++--
 .../metadata-collapse.component.ts             |  2 +-
 .../bulk-editor/bulk-editor.component.html     | 16 ++++++----------
 .../document-list/document-list.component.html | 10 +++++-----
 .../filter-editor/filter-editor.component.html | 18 +++++++++---------
 .../filter-editor/filter-editor.component.ts   |  6 +++---
 10 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts
index 4791d0e77..c397811a4 100644
--- a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts
+++ b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts
@@ -14,7 +14,7 @@ export class ConfirmDialogComponent implements OnInit {
   public confirmClicked = new EventEmitter()
 
   @Input()
-  title = "Confirmation"
+  title = $localize`Confirmation`
 
   @Input()
   messageBold
@@ -26,7 +26,7 @@ export class ConfirmDialogComponent implements OnInit {
   btnClass = "btn-primary"
 
   @Input()
-  btnCaption = "Confirm"
+  btnCaption = $localize`Confirm`
 
   confirmButtonEnabled = true
   seconds = 0
diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
index ba9f1fafb..e4f17c4e6 100644
--- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
+++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
@@ -10,12 +10,12 @@
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
 
           <div class="mb-2 d-flex flex-row w-100 justify-content-between small">
-            <div>After</div>
+            <div i18n>After</div>
             <a *ngIf="dateAfter" class="btn btn-link p-0 m-0" (click)="clearAfter()">
               <svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
               </svg>
-              <small>Clear</small>
+              <small i18n>Clear</small>
             </a>
           </div>
 
@@ -26,12 +26,12 @@
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
 
           <div class="mb-2 d-flex flex-row w-100 justify-content-between small">
-            <div>Before</div>
+            <div i18n>Before</div>
             <a *ngIf="dateBefore" class="btn btn-link p-0 m-0" (click)="clearBefore()">
               <svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
               </svg>
-              <small>Clear</small>
+              <small i18n>Clear</small>
             </a>
           </div>
 
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index d7b2af6d3..48e0dfd97 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -25,7 +25,7 @@
         </ng-container>
       </div>
       <button *ngIf="editing" class="list-group-item list-group-item-action bg-light" (click)="applyClicked()" [disabled]="!selectionModel.isDirty()">
-        <small class="ml-1" [ngClass]="{'font-weight-bold': selectionModel.isDirty()}">Apply</small>
+        <small class="ml-1" [ngClass]="{'font-weight-bold': selectionModel.isDirty()}" i18n>Apply</small>
         <svg width="1.5em" height="1em" viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#arrow-right" />
         </svg>
diff --git a/src-ui/src/app/components/common/select-dialog/select-dialog.component.html b/src-ui/src/app/components/common/select-dialog/select-dialog.component.html
index 8bde38d61..2184013a3 100644
--- a/src-ui/src/app/components/common/select-dialog/select-dialog.component.html
+++ b/src-ui/src/app/components/common/select-dialog/select-dialog.component.html
@@ -10,6 +10,6 @@
 
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn btn-outline-dark" (click)="cancelClicked()">Cancel</button>
-  <button type="button" class="btn btn-primary" (click)="selectClicked.emit(selected)">Select</button>
+  <button type="button" class="btn btn-outline-dark" (click)="cancelClicked()" i18n>Cancel</button>
+  <button type="button" class="btn btn-primary" (click)="selectClicked.emit(selected)" i18n>Select</button>
 </div>
\ No newline at end of file
diff --git a/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts b/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts
index 76b23491c..99bf9b91a 100644
--- a/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts
+++ b/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts
@@ -15,10 +15,10 @@ export class SelectDialogComponent implements OnInit {
   public selectClicked = new EventEmitter()
 
   @Input()
-  title = "Select"
+  title = $localize`Select`
 
   @Input()
-  message = "Please select an object"
+  message = $localize`Please select an object`
 
   @Input()
   objects: ObjectWithId[] = []
diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts
index 160274e41..34bbbd655 100644
--- a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts
+++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts
@@ -15,7 +15,7 @@ export class MetadataCollapseComponent implements OnInit {
   metadata
 
   @Input()
-  title = "Metadata"
+  title = $localize`Metadata`
 
   ngOnInit(): void {
   }
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index c78f3ea3e..e08d50c47 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -3,32 +3,29 @@
     <button class="btn btn-sm btn-outline-danger" (click)="list.selectNone()">
       <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#slash-circle" />
-      </svg>
-      Cancel
+      </svg>&nbsp;<ng-container i18n>Cancel</ng-container>
     </button>
   </div>
   <div class="w-100 d-xl-none"></div>
   <div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
-    <label class="mr-2 mb-0">Select:</label>
+    <label class="mr-2 mb-0" i18n>Select:</label>
     <div class="btn-group">
       <button class="btn btn-sm btn-outline-primary" (click)="list.selectPage()">
         <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#file-earmark-check" />
-        </svg>
-        Page
+        </svg>&nbsp;<ng-container i18n>Page</ng-container>
       </button>
       <button class="btn btn-sm btn-outline-primary" (click)="list.selectAll()">
         <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#check-all" />
-        </svg>
-        All
+        </svg>&nbsp;<ng-container i18n>All</ng-container>
       </button>
     </div>
   </div>
   <div class="w-100 d-xl-none"></div>
   <div class="col-auto mb-2 mb-xl-0">
     <div class="d-flex">
-      <label class="ml-auto mt-1 mb-0 mr-2">Edit:</label>
+      <label class="ml-auto mt-1 mb-0 mr-2" i18n>Edit:</label>
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill"
         [items]="tags"
         [editing]="true"
@@ -58,8 +55,7 @@
     <button type="button" class="btn btn-sm btn-outline-danger ml-0 ml-lg-auto" (click)="applyDelete()">
       <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#trash" />
-      </svg>
-      Delete
+      </svg>&nbsp;<ng-container i18n>Delete</ng-container>
     </button>
   </div>
 </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index b5539a1e5..40a08c105 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -4,13 +4,13 @@
     <button class="btn btn-sm btn-outline-primary" id="dropdownSelect" ngbDropdownToggle>
       <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#text-indent-left" />
-      </svg>
-      Select
+      </svg>&nbsp;<ng-container i18n>Select</ng-container>
+      
     </button>
     <div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow">
-      <button ngbDropdownItem (click)="list.selectPage()">Select page</button>
-      <button ngbDropdownItem (click)="list.selectAll()">Select all</button>
-      <button ngbDropdownItem (click)="list.selectNone()">Select none</button>
+      <button ngbDropdownItem (click)="list.selectNone()" i18n>Select none</button>
+      <button ngbDropdownItem (click)="list.selectPage()" i18n>Select page</button>
+      <button ngbDropdownItem (click)="list.selectAll()" i18n>Select all</button>
     </div>
   </div>
 
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index f029275eb..27a16edfd 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -1,18 +1,18 @@
 <div class="row">
    <div class="col mb-2 mb-xl-0">
      <div class="form-inline d-flex">
-         <label class="text-muted mr-2">Filter by:</label>
-         <input class="form-control form-control-sm flex-grow-1" type="text" [(ngModel)]="titleFilter" placeholder="Title">
+         <label class="text-muted mr-2" i18n>Filter by:</label>
+         <input class="form-control form-control-sm flex-grow-1" type="text" [(ngModel)]="titleFilter" placeholder="Title" i18n-placeholder>
      </div>
   </div>
   <div class="w-100 d-xl-none"></div>
    <div class="col col-xl-auto mb-2 mb-xl-0">
      <div class="d-flex">
-       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="tags" [(selectionModel)]="tagSelectionModel" (selectionModelChange)="updateRules()" [multiple]="true" title="Tags" icon="tag-fill"></app-filterable-dropdown>
-       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="correspondents" [(selectionModel)]="correspondentSelectionModel" (selectionModelChange)="updateRules()" title="Correspondents" icon="person-fill"></app-filterable-dropdown>
-       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [(selectionModel)]="documentTypeSelectionModel" (selectionModelChange)="updateRules()" title="Document types" icon="file-earmark-fill"></app-filterable-dropdown>
-       <app-date-dropdown class="mr-2 mr-md-3" [(dateBefore)]="dateCreatedBefore" [(dateAfter)]="dateCreatedAfter" title="Created" (datesSet)="updateRules()"></app-date-dropdown>
-       <app-date-dropdown [(dateBefore)]="dateAddedBefore" [(dateAfter)]="dateAddedAfter" title="Added"  (datesSet)="updateRules()"></app-date-dropdown>
+       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="tags" [(selectionModel)]="tagSelectionModel" (selectionModelChange)="updateRules()" [multiple]="true" title="Tags" icon="tag-fill" i18n-title></app-filterable-dropdown>
+       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="correspondents" [(selectionModel)]="correspondentSelectionModel" (selectionModelChange)="updateRules()" title="Correspondents" icon="person-fill" i18n-title></app-filterable-dropdown>
+       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [(selectionModel)]="documentTypeSelectionModel" (selectionModelChange)="updateRules()" title="Document types" icon="file-earmark-fill" i18n-title></app-filterable-dropdown>
+       <app-date-dropdown class="mr-2 mr-md-3" [(dateBefore)]="dateCreatedBefore" [(dateAfter)]="dateCreatedAfter" title="Created" (datesSet)="updateRules()" i18n-title></app-date-dropdown>
+       <app-date-dropdown [(dateBefore)]="dateAddedBefore" [(dateAfter)]="dateAddedAfter" title="Added"  (datesSet)="updateRules()" i18n-title></app-date-dropdown>
      </div>
    </div>
    <div class="w-100 d-xl-none"></div>
@@ -20,8 +20,8 @@
      <button class="btn btn-link btn-sm px-0 mx-0 ml-xl-n4" [disabled]="!hasFilters()" (click)="clearSelected()">
        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
          <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
-       </svg>
-       Clear all filters
+       </svg>&nbsp;<ng-container i18n>Clear all filters</ng-container>
+       
      </button>
    </div>
 </div>
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index f881dc1d9..14a88c10b 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -25,13 +25,13 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
       switch(this.filterRules[0].rule_type) {
 
         case FILTER_CORRESPONDENT:
-          return `Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}`
+          return $localize`Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}`
 
         case FILTER_DOCUMENT_TYPE:
-          return `Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}`
+          return $localize`Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}`
 
         case FILTER_HAS_TAG:
-          return `Tag: ${this.tags.find(t => t.id == +rule.value)?.name}`
+          return $localize`Tag: ${this.tags.find(t => t.id == +rule.value)?.name}`
 
       }
     }

From 27ae4f6b1e2e6dc7e0444c9881086ca7f2cca380 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 15:48:35 +0100
Subject: [PATCH 0454/1300] fixes #197

---
 docker/local/Dockerfile | 1 +
 docs/setup.rst          | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index 461b9e4fc..b66b814ff 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -9,6 +9,7 @@ RUN apt-get update \
   && apt-get -y --no-install-recommends install \
 		build-essential \
 		curl \
+		fonts-liberation \
 		ghostscript \
 		gnupg \
 		icc-profiles-free \
diff --git a/docs/setup.rst b/docs/setup.rst
index 4d29ce640..437409194 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -221,8 +221,9 @@ writing. Windows is not and will never be supported.
     *   ``python3-pip``, optionally ``pipenv`` for package installation
     *   ``python3-dev``
 
+    *   ``fonts-liberation`` for generating thumbnails for plain text files
     *   ``imagemagick`` >= 6 for PDF conversion
-    *   ``optipng`` for optimising thumbnails
+    *   ``optipng`` for optimizing thumbnails
     *   ``gnupg`` for handling encrypted documents
     *   ``libpoppler-cpp-dev`` for PDF to text conversion
     *   ``libmagic-dev`` for mime type detection
@@ -242,8 +243,7 @@ writing. Windows is not and will never be supported.
     *   ``tesseract-ocr`` language packs (``tesseract-ocr-eng``, ``tesseract-ocr-deu``, etc)
 
     You will also need ``build-essential``, ``python3-setuptools`` and ``python3-wheel``
-    for installing some of the python dependencies. You can remove that
-    again after installation.
+    for installing some of the python dependencies.
 
 2.  Install ``redis`` >= 5.0 and configure it to start automatically.
 

From 6d4aa76405c2292dd7c236b54ca54bc06f468b10 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 15:59:06 +0100
Subject: [PATCH 0455/1300] fixes #196

---
 src/documents/views.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/documents/views.py b/src/documents/views.py
index ddf02f534..32b88a18f 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -5,6 +5,7 @@ from time import mktime
 
 from django.conf import settings
 from django.db.models import Count, Max, Case, When, IntegerField
+from django.db.models.functions import Lower
 from django.http import HttpResponse, HttpResponseBadRequest, Http404
 from django.views.decorators.cache import cache_control
 from django.views.generic import TemplateView
@@ -68,7 +69,7 @@ class CorrespondentViewSet(ModelViewSet):
 
     queryset = Correspondent.objects.annotate(
         document_count=Count('documents'),
-        last_correspondence=Max('documents__created')).order_by('name')
+        last_correspondence=Max('documents__created')).order_by(Lower('name'))
 
     serializer_class = CorrespondentSerializer
     pagination_class = StandardPagination
@@ -87,7 +88,7 @@ class TagViewSet(ModelViewSet):
     model = Tag
 
     queryset = Tag.objects.annotate(
-        document_count=Count('documents')).order_by('name')
+        document_count=Count('documents')).order_by(Lower('name'))
 
     serializer_class = TagSerializer
     pagination_class = StandardPagination
@@ -101,7 +102,7 @@ class DocumentTypeViewSet(ModelViewSet):
     model = DocumentType
 
     queryset = DocumentType.objects.annotate(
-        document_count=Count('documents')).order_by('name')
+        document_count=Count('documents')).order_by(Lower('name'))
 
     serializer_class = DocumentTypeSerializer
     pagination_class = StandardPagination

From 1de7a490b4f1114fdc8fd7523da4ed4e0ce4c85f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 17:04:53 +0100
Subject: [PATCH 0456/1300] #186 allow filtering for documents with no
 correspondents / tags / types

---
 .../filterable-dropdown.component.html        |  2 +-
 .../filterable-dropdown.component.ts          | 23 ++++++++++++++++++-
 .../filter-editor.component.html              |  6 ++---
 .../filter-editor/filter-editor.component.ts  | 16 ++++++++-----
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 48e0dfd97..7215faa79 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -21,7 +21,7 @@
       </div>
       <div *ngIf="selectionModel.items" class="items">
         <ng-container *ngFor="let item of selectionModel.items | filter: filterText">
-          <app-toggleable-dropdown-button [item]="item" [state]="selectionModel.get(item.id)" (toggle)="selectionModel.toggle(item.id)"></app-toggleable-dropdown-button>
+          <app-toggleable-dropdown-button *ngIf="allowSelectNone || item.id" [item]="item" [state]="selectionModel.get(item.id)" (toggle)="selectionModel.toggle(item.id)"></app-toggleable-dropdown-button>
         </ng-container>
       </div>
       <button *ngIf="editing" class="list-group-item list-group-item-action bg-light" (click)="applyClicked()" [disabled]="!selectionModel.isDirty()">
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index e06f0d638..06b2333d5 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -53,6 +53,16 @@ export class FilterableDropdownSelectionModel {
       }
     }
 
+    if (!id) {
+      for (let key of this.temporarySelectionStates.keys()) {
+        if (key) {
+          this.temporarySelectionStates.delete(key)
+        }
+      }
+    } else {
+      this.temporarySelectionStates.delete(null)
+    }
+
     if (fireEvent) {
       this.changed.next(this)
     }
@@ -84,6 +94,10 @@ export class FilterableDropdownSelectionModel {
     }
   }
 
+  isNoneSelected() {
+    return this.selectionSize() == 1 && this.get(null) == ToggleableItemState.Selected
+  }
+
   init(map) {
     this.temporarySelectionStates = map
     this.apply()
@@ -126,7 +140,11 @@ export class FilterableDropdownComponent {
   @Input()
   set items(items: MatchingModel[]) {
     if (items) {
-      this._selectionModel.items = items
+      this._selectionModel.items = Array.from(items)
+      this._selectionModel.items.unshift({
+        name: "None",
+        id: null
+      })
     }
   }
 
@@ -171,6 +189,9 @@ export class FilterableDropdownComponent {
   @Input()
   icon: string
 
+  @Input()
+  allowSelectNone: boolean = false
+
   @Input()
   editing = false
 
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index 27a16edfd..f0c83ae73 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -8,9 +8,9 @@
   <div class="w-100 d-xl-none"></div>
    <div class="col col-xl-auto mb-2 mb-xl-0">
      <div class="d-flex">
-       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="tags" [(selectionModel)]="tagSelectionModel" (selectionModelChange)="updateRules()" [multiple]="true" title="Tags" icon="tag-fill" i18n-title></app-filterable-dropdown>
-       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="correspondents" [(selectionModel)]="correspondentSelectionModel" (selectionModelChange)="updateRules()" title="Correspondents" icon="person-fill" i18n-title></app-filterable-dropdown>
-       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [(selectionModel)]="documentTypeSelectionModel" (selectionModelChange)="updateRules()" title="Document types" icon="file-earmark-fill" i18n-title></app-filterable-dropdown>
+       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="tags" [(selectionModel)]="tagSelectionModel" (selectionModelChange)="updateRules()" [multiple]="true" [allowSelectNone]="true" title="Tags" icon="tag-fill" i18n-title></app-filterable-dropdown>
+       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="correspondents" [(selectionModel)]="correspondentSelectionModel" (selectionModelChange)="updateRules()" [allowSelectNone]="true" title="Correspondents" icon="person-fill" i18n-title></app-filterable-dropdown>
+       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [(selectionModel)]="documentTypeSelectionModel" (selectionModelChange)="updateRules()" [allowSelectNone]="true" title="Document types" icon="file-earmark-fill" i18n-title></app-filterable-dropdown>
        <app-date-dropdown class="mr-2 mr-md-3" [(dateBefore)]="dateCreatedBefore" [(dateAfter)]="dateCreatedAfter" title="Created" (datesSet)="updateRules()" i18n-title></app-date-dropdown>
        <app-date-dropdown [(dateBefore)]="dateAddedBefore" [(dateAfter)]="dateAddedAfter" title="Added"  (datesSet)="updateRules()" i18n-title></app-date-dropdown>
      </div>
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index 14a88c10b..d4cac1a9d 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -8,7 +8,7 @@ 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_TAG, FILTER_TITLE } from 'src/app/data/filter-rule-type';
+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 } 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';
 
@@ -100,14 +100,18 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     if (this._titleFilter) {
       filterRules.push({rule_type: FILTER_TITLE, value: this._titleFilter})
     }
-    this.tagSelectionModel.getSelectedItems().forEach(tag => {
-      filterRules.push({rule_type: FILTER_HAS_TAG, value: tag.id.toString()})
-    })
+    if (this.tagSelectionModel.isNoneSelected()) {
+      filterRules.push({rule_type: FILTER_HAS_ANY_TAG, value: "false"})
+    } else {
+      this.tagSelectionModel.getSelectedItems().filter(tag => tag.id).forEach(tag => {
+        filterRules.push({rule_type: FILTER_HAS_TAG, value: tag.id?.toString()})
+      })  
+    }
     this.correspondentSelectionModel.getSelectedItems().forEach(correspondent => {
-      filterRules.push({rule_type: FILTER_CORRESPONDENT, value: correspondent.id.toString()})
+      filterRules.push({rule_type: FILTER_CORRESPONDENT, value: correspondent.id?.toString()})
     })
     this.documentTypeSelectionModel.getSelectedItems().forEach(documentType => {
-      filterRules.push({rule_type: FILTER_DOCUMENT_TYPE, value: documentType.id.toString()})
+      filterRules.push({rule_type: FILTER_DOCUMENT_TYPE, value: documentType.id?.toString()})
     })
     if (this.dateCreatedBefore) {
       filterRules.push({rule_type: FILTER_CREATED_BEFORE, value: this.dateCreatedBefore})

From 39637fc4aa6af7d08e5692bfffd7092f3cb44781 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 17:09:19 +0100
Subject: [PATCH 0457/1300] fixes #175

---
 src/paperless_mail/mail.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
index 3c200362d..537807400 100644
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@ -3,9 +3,9 @@ import tempfile
 from datetime import timedelta, date
 
 import magic
+import pathvalidate
 from django.conf import settings
 from django.db import DatabaseError
-from django.utils.text import slugify
 from django_q.tasks import async_task
 from imap_tools import MailBox, MailBoxUnencrypted, AND, MailMessageFlags, \
     MailboxFolderSelectError
@@ -294,7 +294,7 @@ class MailAccountHandler(LoggingMixin):
                 async_task(
                     "documents.tasks.consume_file",
                     path=temp_filename,
-                    override_filename=att.filename,
+                    override_filename=pathvalidate.sanitize_filename(att.filename),  # NOQA: E501
                     override_title=title,
                     override_correspondent_id=correspondent.id if correspondent else None,  # NOQA: E501
                     override_document_type_id=doc_type.id if doc_type else None,  # NOQA: E501

From 70c02a1c8235880a66facbdaaee3dfed6d1e855a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 17:20:07 +0100
Subject: [PATCH 0458/1300] fixes #185

---
 docker/local/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index b66b814ff..a8e991d8c 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -63,6 +63,7 @@ RUN sudo -HEu paperless python3 manage.py collectstatic --clear --no-input
 
 VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/usr/src/paperless/consume", "/usr/src/paperless/export"]
 ENTRYPOINT ["/sbin/docker-entrypoint.sh"]
+EXPOSE 8000
 CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"]
 
 LABEL maintainer="Jonas Winkler <dev@jpwinkler.de>"

From 27666da4e957661c6dd648a0a4c30faa09291133 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 21:27:46 +0100
Subject: [PATCH 0459/1300] more translation tags #123

---
 .../bulk-editor/bulk-editor.component.ts      | 76 ++++++++++++-------
 1 file changed, 50 insertions(+), 26 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 36577bc6f..1e2e8496f 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -14,6 +14,7 @@ import { OpenDocumentsService } from 'src/app/services/open-documents.service';
 import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component';
 import { ChangedItems, FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component';
 import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
+import { MatchingModel } from 'src/app/data/matching-model';
 
 @Component({
   selector: 'app-bulk-editor',
@@ -88,15 +89,40 @@ export class BulkEditorComponent {
     })
   }
 
+  private _localizeList(items: MatchingModel[]) {
+    if (items.length == 0) {
+      return ""
+    } else if (items.length == 1) {
+      return items[0].name
+    } else if (items.length == 2) {
+      return $localize`${items[0].name} and ${items[1].name}`
+    } else {
+      let list = items.slice(0, items.length - 1).map(i => i.name).join($localize`, `)
+      return $localize`${list} and ${items[items.length - 1].name}`
+    }
+  }
+
   setTags(changedTags: ChangedItems) {
     if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 0) return
 
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Tags Assignment"
-   
-    modal.componentInstance.message = `This operation will modify some tags on all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.title = $localize`Confirm tags assignment`
+    if (changedTags.itemsToAdd.length == 1 && changedTags.itemsToRemove.length == 0) {
+      let tag = changedTags.itemsToAdd[0]
+      modal.componentInstance.message = $localize`This operation will add the tag ${tag.name} to all ${this.list.selected.size} selected document(s).`
+    } else if (changedTags.itemsToAdd.length > 1 && changedTags.itemsToRemove.length == 0) {
+      modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} to all ${this.list.selected.size} selected document(s).`
+    } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 1) {
+      let tag = changedTags.itemsToAdd[0]
+      modal.componentInstance.message = $localize`This operation will remove the tag ${tag.name} from all ${this.list.selected.size} selected document(s).`
+    } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length > 1) {
+      modal.componentInstance.message = $localize`This operation will remove the tags ${this._localizeList(changedTags.itemsToRemove)} from all ${this.list.selected.size} selected document(s).`
+    } else {
+      modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} and remove the tags ${this._localizeList(changedTags.itemsToRemove)} on all ${this.list.selected.size} selected document(s).`
+    }
+    
     modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = "Confirm"
+    modal.componentInstance.btnCaption = $localize`Confirm`
     modal.componentInstance.confirmClicked.subscribe(() => {
       this.executeBulkOperation('modify_tags', {"add_tags": changedTags.itemsToAdd.map(t => t.id), "remove_tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe(
         response => {
@@ -111,18 +137,17 @@ export class BulkEditorComponent {
     if (changedCorrespondents.itemsToAdd.length == 0 && changedCorrespondents.itemsToRemove.length == 0) return
 
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Correspondent Assignment"
-    let correspondent
-    let messageFragment = 'remove all correspondents from'
-    if (changedCorrespondents && changedCorrespondents.itemsToAdd.length > 0) {
-      correspondent = changedCorrespondents.itemsToAdd[0]
-      messageFragment = `assign the correspondent ${correspondent.name} to`
+    modal.componentInstance.title = $localize`Confirm correspondent assignment`
+    let correspondent = changedCorrespondents.itemsToAdd.length > 0 ? changedCorrespondents.itemsToAdd[0] : null
+    if (correspondent) {
+      modal.componentInstance.message = $localize`This operation will assign the correspondent ${correspondent.name} to all ${this.list.selected.size} selected document(s).`
+    } else {
+      modal.componentInstance.message = $localize`This operation will remove the correspondent from all ${this.list.selected.size} selected document(s).`
     }
-    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
     modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = "Confirm"
+    modal.componentInstance.btnCaption = $localize`Confirm`
     modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
+      this.executeBulkOperation('set_correspondent', {"correspondent": correspondent?.id}).subscribe(
         response => {
           this.correspondentService.clearCache()
           modal.close()
@@ -135,18 +160,17 @@ export class BulkEditorComponent {
     if (changedDocumentTypes.itemsToAdd.length == 0 && changedDocumentTypes.itemsToRemove.length == 0) return
 
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = "Confirm Document Type Assignment"
-    let documentType
-    let messageFragment = 'remove all document types from'
-    if (changedDocumentTypes && changedDocumentTypes.itemsToAdd.length > 0) {
-      documentType = changedDocumentTypes.itemsToAdd[0]
-      messageFragment = `assign the document type ${documentType.name} to`
+    modal.componentInstance.title = $localize`Confirm document type assignment`
+    let documentType = changedDocumentTypes.itemsToAdd.length > 0 ? changedDocumentTypes.itemsToAdd[0] : null
+    if (documentType) {
+      modal.componentInstance.message = $localize`This operation will assign the document type ${documentType.name} to all ${this.list.selected.size} selected document(s).`
+    } else {
+      modal.componentInstance.message = $localize`This operation will remove the document type from all ${this.list.selected.size} selected document(s).`
     }
-    modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
     modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = "Confirm"
+    modal.componentInstance.btnCaption = $localize`Confirm`
     modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
+      this.executeBulkOperation('set_document_type', {"document_type": documentType?.id}).subscribe(
         response => {
           this.documentService.clearCache()
           modal.close()
@@ -158,11 +182,11 @@ export class BulkEditorComponent {
   applyDelete() {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.delayConfirm(5)
-    modal.componentInstance.title = "Delete confirm"
-    modal.componentInstance.messageBold = `This operation will permanently delete all ${this.list.selected.size} selected document(s).`
-    modal.componentInstance.message = `This operation cannot be undone.`
+    modal.componentInstance.title = $localize`Delete confirm`
+    modal.componentInstance.messageBold = $localize`This operation will permanently delete all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.message = $localize`This operation cannot be undone.`
     modal.componentInstance.btnClass = "btn-danger"
-    modal.componentInstance.btnCaption = "Delete document(s)"
+    modal.componentInstance.btnCaption = $localize`Delete document(s)`
     modal.componentInstance.confirmClicked.subscribe(() => {
       this.executeBulkOperation("delete", {}).subscribe(
         response => {

From bd3a2306d6cef22766b92dc4d5eb83e939b978ed Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 21:52:09 +0100
Subject: [PATCH 0460/1300] better toasts

---
 .../edit-dialog/edit-dialog.component.ts      |  4 +--
 .../upload-file-widget.component.ts           |  8 ++---
 .../document-list/document-list.component.ts  |  4 +--
 .../manage/settings/settings.component.ts     |  8 ++---
 src-ui/src/app/services/toast.service.ts      | 31 +++++++------------
 5 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
index ba0d90847..e80193755 100644
--- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
@@ -5,7 +5,7 @@ import { Observable } from 'rxjs';
 import { MATCHING_ALGORITHMS } from 'src/app/data/matching-model';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
-import { Toast, ToastService } from 'src/app/services/toast.service';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Directive()
 export abstract class EditDialogComponent<T extends ObjectWithId> implements OnInit {
@@ -66,7 +66,7 @@ export abstract class EditDialogComponent<T extends ObjectWithId> implements OnI
       this.activeModal.close()
       this.success.emit(result)
     }, error => {
-      this.toastService.showToast(Toast.makeError(`Could not save ${this.entityName}: ${error.error.name}`))
+      this.toastService.showError($localize`Could not save ${this.entityName}: ${error.error.name}`)
     })
   }
 
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index b80f9544e..2b14a571a 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -2,7 +2,7 @@ import { HttpEventType } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop';
 import { DocumentService } from 'src/app/services/rest/document.service';
-import { Toast, ToastService } from 'src/app/services/toast.service';
+import { ToastService } from 'src/app/services/toast.service';
 
 
 interface UploadStatus {
@@ -60,7 +60,7 @@ export class UploadFileWidgetComponent implements OnInit {
             } else if (event.type == HttpEventType.Response) {
               this.uploadStatus.splice(this.uploadStatus.indexOf(uploadStatusObject), 1)
               this.completedFiles += 1
-              this.toastService.showToast(Toast.make("Information", $localize`The document has been uploaded and will be processed by the consumer shortly.`))
+              this.toastService.showInfo($localize`The document has been uploaded and will be processed by the consumer shortly.`)
             }
             
           }, error => {
@@ -68,11 +68,11 @@ export class UploadFileWidgetComponent implements OnInit {
             this.completedFiles += 1
             switch (error.status) {
               case 400: {
-                this.toastService.showToast(Toast.makeError($localize`There was an error while uploading the document: ${error.error.document}`))
+                this.toastService.showInfo($localize`There was an error while uploading the document: ${error.error.document}`)
                 break;
               }
               default: {
-                this.toastService.showToast(Toast.makeError($localize`An error has occurred while uploading the document. Sorry!`))
+                this.toastService.showInfo($localize`An error has occurred while uploading the document. Sorry!`)
                 break;
               }
             }
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index d83f02678..fbd8065ae 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -81,7 +81,7 @@ export class DocumentListComponent implements OnInit {
 
   saveViewConfig() {
     this.savedViewService.update(this.list.savedView).subscribe(result => {
-      this.toastService.showToast(Toast.make("Information", $localize`View "${this.list.savedView.name}" saved successfully.`))
+      this.toastService.showInfo($localize`View "${this.list.savedView.name}" saved successfully.`)
     })
 
   }
@@ -100,7 +100,7 @@ export class DocumentListComponent implements OnInit {
       }
       this.savedViewService.create(savedView).subscribe(() => {
         modal.close()
-        this.toastService.showToast(Toast.make("Information", $localize`View "${savedView.name}" created successfully.`))
+        this.toastService.showInfo($localize`View "${savedView.name}" created successfully.`)
       })
     })
   }
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index bec85e039..a90966bb9 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -4,7 +4,7 @@ import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
-import { Toast, ToastService } from 'src/app/services/toast.service';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-settings',
@@ -46,14 +46,14 @@ export class SettingsComponent implements OnInit {
     this.savedViewService.delete(savedView).subscribe(() => {
       this.savedViewGroup.removeControl(savedView.id.toString())
       this.savedViews.splice(this.savedViews.indexOf(savedView), 1)
-      this.toastService.showToast(Toast.make("Information", $localize`Saved view "${savedView.name} deleted.`))
+      this.toastService.showInfo($localize`Saved view "${savedView.name} deleted.`)
     })
   }
 
   private saveLocalSettings() {
     localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
     this.documentListViewService.updatePageSize()
-    this.toastService.showToast(Toast.make("Information", $localize`Settings saved successfully.`))
+    this.toastService.showInfo($localize`Settings saved successfully.`)
   }
 
   saveSettings() {
@@ -65,7 +65,7 @@ export class SettingsComponent implements OnInit {
       this.savedViewService.patchMany(x).subscribe(s => {
         this.saveLocalSettings()
       }, error => {
-        this.toastService.showToast(Toast.makeError($localize`Error while storing settings on server: ${JSON.stringify(error.error)}`))
+        this.toastService.showError($localize`Error while storing settings on server: ${JSON.stringify(error.error)}`)
       })
     } else {
       this.saveLocalSettings()
diff --git a/src-ui/src/app/services/toast.service.ts b/src-ui/src/app/services/toast.service.ts
index a3ce060a9..86d66eee6 100644
--- a/src-ui/src/app/services/toast.service.ts
+++ b/src-ui/src/app/services/toast.service.ts
@@ -1,30 +1,13 @@
 import { Injectable } from '@angular/core';
 import { Subject, zip } from 'rxjs';
 
-export class Toast {
-
-  static make(title: string, content: string, classname?: string, delay?: number): Toast {
-    let t = new Toast()
-    t.title = title
-    t.content = content
-    t.classname = classname
-    if (delay) {
-      t.delay = delay
-    }
-    return t
-  }
-
-  static makeError(content: string) {
-    return Toast.make("Error", content, null, 10000)
-  }
+export interface Toast {
 
   title: string
 
-  classname: string
-
   content: string
 
-  delay: number = 5000
+  delay: number
 
 }
 
@@ -39,11 +22,19 @@ export class ToastService {
 
   private toastsSubject: Subject<Toast[]> = new Subject()
 
-  showToast(toast: Toast) {
+  show(toast: Toast) {
     this.toasts.push(toast)
     this.toastsSubject.next(this.toasts)
   }
 
+  showError(content: string, delay: number = 10000) {
+    this.show({title: $localize`Error`, content: content, delay: delay})
+  }
+
+  showInfo(content: string, delay: number = 5000) {
+    this.show({title: $localize`Information`, content: content, delay: delay})
+  }
+
   closeToast(toast: Toast) {
     let index = this.toasts.findIndex(t => t == toast)
     if (index > -1) {

From ebcf4e2d812ad147262ac40f6ec9c230506fbfb3 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 28 Dec 2020 12:54:00 -0800
Subject: [PATCH 0461/1300] Set on init

---
 src-ui/src/app/services/app-view.service.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src-ui/src/app/services/app-view.service.ts b/src-ui/src/app/services/app-view.service.ts
index c6faa5603..33b47ce82 100644
--- a/src-ui/src/app/services/app-view.service.ts
+++ b/src-ui/src/app/services/app-view.service.ts
@@ -10,6 +10,8 @@ export class AppViewService {
 
   constructor(rendererFactory: RendererFactory2, @Inject(DOCUMENT) private document) {
     this.renderer = rendererFactory.createRenderer(null, null);
+
+    this.updateDarkModeSettings()
   }
 
   updateDarkModeSettings() {

From 1297c0911c788b420d471574aefc3b7210cae90f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 28 Dec 2020 12:56:00 -0800
Subject: [PATCH 0462/1300] Theme tweaks

See https://github.com/jonaswinkler/paperless-ng/issues/194
---
 .../document-card-small.component.html        |  2 +-
 src-ui/src/theme_dark.scss                    | 62 ++++++++++++++-----
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index e0d8d28e1..9d808e84b 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,6 +1,6 @@
 <div class="col p-2 h-100">
   <div class="card h-100 shadow-sm" [class.card-selected]="selected">
-    <div class="border-bottom" [class.doc-img-background-selected]="selected">
+    <div class="border-bottom doc-img-container" [class.doc-img-background-selected]="selected">
       <img class="card-img doc-img" [src]="getThumbUrl()" (click)="setSelected(!selected)">
 
       <div class="border-right border-bottom bg-light p-1 rounded document-card-check">
diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index ea7987828..83f8cbf60 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -1,3 +1,5 @@
+$primary-dark-mode: #346e2c;
+$danger-dark-mode: #9c142a;
 $bg-dark-mode: #161618;
 $bg-light-dark-mode: #1c1c1f;
 $text-color-dark-mode: #abb2bf;
@@ -7,6 +9,7 @@ $border-color-dark-mode: #47494f;
 * {
   transition: background-color 0.3s ease, border-color 0.3s ease;
 }
+
 @mixin dark-mode {
   background-color: $bg-dark-mode !important;
   color: $text-color-dark-mode;
@@ -74,9 +77,13 @@ $border-color-dark-mode: #47494f;
     }
   }
 
+  .modal-content, .modal-header, .modal-body, .modal-footer {
+    background-color: $bg-light-dark-mode;
+    border-color: $border-color-dark-mode;
+  }
+
   app-tag .badge {
-    opacity: 0.8;
-    color: $bg-dark-mode !important;
+    filter: brightness(.8);
   }
 
   .badge-light {
@@ -84,17 +91,19 @@ $border-color-dark-mode: #47494f;
     color: $text-color-dark-mode-accent;
   }
 
+  .doc-img-container {
+    border: none !important;
+  }
+
   .doc-img {
-    background-color: lighten($bg-light-dark-mode, 30%);
-    mix-blend-mode: soft-light;
+    mix-blend-mode: normal;
+    filter: invert(95%) hue-rotate(180deg);
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
   }
 
-  .doc-img-background {
-    background-color: lighten($bg-light-dark-mode, 30%);
-  }
-
-  .doc-img-background-selected {
-    background-color: lighten($bg-light-dark-mode, 35%);
+  .card-selected .doc-img {
+    mix-blend-mode: luminosity;
   }
 
   .toast {
@@ -128,20 +137,39 @@ $border-color-dark-mode: #47494f;
     text-shadow: 0 1px 0 #666;
   }
 
-  .btn-outline-primary:hover {
-    background-color: darken($primary, 10%);
-    color: $text-color-dark-mode-accent;
+  .btn-outline-primary{
+    border-color: $primary-dark-mode;
+    color: $primary-dark-mode;
+
+    &:hover {
+      background-color: darken($primary-dark-mode, 10%);
+      color: $text-color-dark-mode-accent;
+    }
   }
 
   .btn-outline-secondary {
-    border-color: $border-color-dark-mode;
-    color: $border-color-dark-mode;
+    border-color: $text-color-dark-mode;
+    color: $text-color-dark-mode;
 
     &:hover {
       background-color: $bg-dark-mode;
     }
   }
 
+  .btn-outline-danger {
+    border-color: $danger-dark-mode;
+    color: $danger-dark-mode;
+
+    &:hover {
+      background-color: darken($danger-dark-mode, 10%);
+      color: $text-color-dark-mode-accent;
+    }
+  }
+
+  .btn-link:not(:disabled):not(.disabled) {
+    color: $primary-dark-mode;
+  }
+
   .btn-link:hover,
   .btn-outline-primary:not(:disabled):not(.disabled).active,
   .btn-outline-primary:not(:disabled):not(.disabled):active,
@@ -149,6 +177,10 @@ $border-color-dark-mode: #47494f;
     color: $text-color-dark-mode-accent;
   }
 
+  button.bg-light:hover {
+    background-color: $bg-dark-mode !important;
+  }
+
   .form-control,
   input,
   select,

From 6834c70baee677aae1bdcbcfaa68ee81622c8d53 Mon Sep 17 00:00:00 2001
From: Jo Vandeginste <jo.vandeginste@gmail.com>
Date: Mon, 28 Dec 2020 22:19:30 +0100
Subject: [PATCH 0463/1300] Allow extending INSTALLED_APPS via environment

This allows a user to add "apps" (aka parsers) through the environment.

Especially useful when using Docker, and adding a test-parser.

Usage:

```yaml
services:
  webserver:
    environment:
      PAPERLESS_APPS: paperless_tika.apps.PaperlessTikaConfig
```

You can add more by separating them with a `,`:

```yaml
PAPERLESS_APPS: app1,app2
```
---
 src/paperless/settings.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index c6f7c9357..d7cae943b 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -69,6 +69,8 @@ SCRATCH_DIR = os.getenv("PAPERLESS_SCRATCH_DIR", "/tmp/paperless")
 # Application Definition                                                      #
 ###############################################################################
 
+env_apps = os.getenv("PAPERLESS_APPS") if os.getenv("PAPERLESS_APPS") else []
+
 INSTALLED_APPS = [
     "whitenoise.runserver_nostatic",
 
@@ -95,7 +97,7 @@ INSTALLED_APPS = [
 
     "django_q",
 
-]
+] + env_apps
 
 REST_FRAMEWORK = {
     'DEFAULT_AUTHENTICATION_CLASSES': [

From 755da317eaf8dab2e5894b0953ffd230268dc0c0 Mon Sep 17 00:00:00 2001
From: Jo Vandeginste <jo.vandeginste@gmail.com>
Date: Mon, 28 Dec 2020 22:37:53 +0100
Subject: [PATCH 0464/1300] Update settings.py

---
 src/paperless/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index d7cae943b..0aa162739 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -69,7 +69,7 @@ SCRATCH_DIR = os.getenv("PAPERLESS_SCRATCH_DIR", "/tmp/paperless")
 # Application Definition                                                      #
 ###############################################################################
 
-env_apps = os.getenv("PAPERLESS_APPS") if os.getenv("PAPERLESS_APPS") else []
+env_apps = os.getenv("PAPERLESS_APPS").split(",") if os.getenv("PAPERLESS_APPS") else []
 
 INSTALLED_APPS = [
     "whitenoise.runserver_nostatic",

From 9093ac5901c289830ef9d5f68d763a0691e93ba3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 22:54:49 +0100
Subject: [PATCH 0465/1300] more localization tags #123

---
 .../edit-dialog/edit-dialog.component.ts      | 21 ++++++++++++++-----
 .../correspondent-edit-dialog.component.ts    | 14 ++++++++++++-
 .../correspondent-list.component.ts           |  4 ++--
 .../document-type-edit-dialog.component.ts    | 14 ++++++++++++-
 .../document-type-list.component.ts           |  5 +++--
 .../generic-list/generic-list.component.ts    |  6 +++---
 .../tag-edit-dialog.component.ts              | 14 ++++++++++++-
 .../manage/tag-list/tag-list.component.ts     |  4 ++--
 8 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
index e80193755..ea96be90a 100644
--- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
@@ -13,8 +13,7 @@ export abstract class EditDialogComponent<T extends ObjectWithId> implements OnI
   constructor(
     private service: AbstractPaperlessService<T>,
     private activeModal: NgbActiveModal,
-    private toastService: ToastService,
-    private entityName: string) { }
+    private toastService: ToastService) { }
 
   @Input()
   dialogMode: string = 'create'
@@ -35,12 +34,24 @@ export abstract class EditDialogComponent<T extends ObjectWithId> implements OnI
     }
   }
 
+  getCreateTitle() {
+    return $localize`Create new item`
+  }
+
+  getEditTitle() {
+    return $localize`Edit item`
+  }
+
+  getSaveErrorMessage(error: string) {
+    return $localize`Could not save element: ${error}`
+  }
+
   getTitle() {
     switch (this.dialogMode) {
       case 'create':
-        return "Create new " + this.entityName
+        return this.getCreateTitle()
       case 'edit':
-        return "Edit " + this.entityName
+        return this.getEditTitle()
       default:
         break;
     }
@@ -66,7 +77,7 @@ export abstract class EditDialogComponent<T extends ObjectWithId> implements OnI
       this.activeModal.close()
       this.success.emit(result)
     }, error => {
-      this.toastService.showError($localize`Could not save ${this.entityName}: ${error.error.name}`)
+      this.toastService.showError(this.getSaveErrorMessage(error.error.name))
     })
   }
 
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts
index bc6b2a823..b6c3e08d4 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts
@@ -14,7 +14,19 @@ import { ToastService } from 'src/app/services/toast.service';
 export class CorrespondentEditDialogComponent extends EditDialogComponent<PaperlessCorrespondent> {
 
   constructor(service: CorrespondentService, activeModal: NgbActiveModal, toastService: ToastService) {
-    super(service, activeModal, toastService, 'correspondent')
+    super(service, activeModal, toastService)
+  }
+
+  getCreateTitle() {
+    return $localize`Create new correspondent`
+  }
+
+  getEditTitle() {
+    return $localize`Edit correspondent`
+  }
+
+  getSaveErrorMessage(error: string) {
+    return $localize`Could not save correspondent: ${error}`
   }
 
   getForm(): FormGroup {
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
index a128340b9..bc3bf7b02 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
@@ -22,8 +22,8 @@ export class CorrespondentListComponent extends GenericListComponent<PaperlessCo
     super(correspondentsService,modalService,CorrespondentEditDialogComponent)
   }
 
-  getObjectName(object: PaperlessCorrespondent) {
-    return `correspondent '${object.name}'`
+  getDeleteMessage(object: PaperlessCorrespondent) {
+    return $localize`Do you really want to delete the correspondent ${object.name}?`
   }
 
   filterDocuments(object: PaperlessCorrespondent) {
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts
index a8052f453..df81f88c9 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts
@@ -14,7 +14,19 @@ import { ToastService } from 'src/app/services/toast.service';
 export class DocumentTypeEditDialogComponent extends EditDialogComponent<PaperlessDocumentType> {
 
   constructor(service: DocumentTypeService, activeModal: NgbActiveModal, toastService: ToastService) { 
-    super(service, activeModal, toastService, 'document type')
+    super(service, activeModal, toastService)
+  }
+
+  getCreateTitle() {
+    return $localize`Create new document type`
+  }
+
+  getEditTitle() {
+    return $localize`Edit document type`
+  }
+
+  getSaveErrorMessage(error: string) {
+    return $localize`Could not save document type: ${error}`
   }
 
   getForm(): FormGroup {
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
index d18a19226..b376b2576 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
@@ -22,10 +22,11 @@ export class DocumentTypeListComponent extends GenericListComponent<PaperlessDoc
     super(service, modalService, DocumentTypeEditDialogComponent)
   }
 
-  getObjectName(object: PaperlessDocumentType) {
-    return `document type '${object.name}'`
+  getDeleteMessage(object: PaperlessDocumentType) {
+    return $localize`Do you really want to delete the document type ${object.name}?`
   }
 
+
   filterDocuments(object: PaperlessDocumentType) {
     this.list.documentListView.filter_rules = [
       {rule_type: FILTER_DOCUMENT_TYPE, value: object.id.toString()}
diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
index e1ef39428..1f9cc65f9 100644
--- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
+++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
@@ -84,14 +84,14 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
     })
   }
 
-  getObjectName(object: T) {
-    return object.toString()
+  getDeleteMessage(object: T) {
+    return $localize`Do you really want to delete this element?`
   }
 
   openDeleteDialog(object: T) {
     var activeModal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     activeModal.componentInstance.title = $localize`Confirm delete`
-    activeModal.componentInstance.messageBold = $localize`Do you really want to delete ${this.getObjectName(object)}?`
+    activeModal.componentInstance.messageBold = this.getDeleteMessage(object)
     activeModal.componentInstance.message = $localize`Associated documents will not be deleted.`
     activeModal.componentInstance.btnClass = "btn-danger"
     activeModal.componentInstance.btnCaption = $localize`Delete`
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts
index bb0162608..ceca19142 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts
@@ -14,7 +14,19 @@ import { ToastService } from 'src/app/services/toast.service';
 export class TagEditDialogComponent extends EditDialogComponent<PaperlessTag> {
 
   constructor(service: TagService, activeModal: NgbActiveModal, toastService: ToastService) { 
-    super(service, activeModal, toastService, 'tag')
+    super(service, activeModal, toastService)
+  }
+
+  getCreateTitle() {
+    return $localize`Create new tag`
+  }
+
+  getEditTitle() {
+    return $localize`Edit tag`
+  }
+
+  getSaveErrorMessage(error: string) {
+    return $localize`Could not save tag: ${error}`
   }
 
   getForm(): FormGroup {
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
index e3f151550..e43410f41 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
@@ -26,8 +26,8 @@ export class TagListComponent extends GenericListComponent<PaperlessTag> {
     return TAG_COLOURS.find(c => c.id == id)
   }
 
-  getObjectName(object: PaperlessTag) {
-    return `tag '${object.name}'`
+  getDeleteMessage(object: PaperlessTag) {
+    return $localize`Do you really want to delete the tag ${object.name}?`
   }
 
   filterDocuments(object: PaperlessTag) {

From b44ca770a5fde737bff999ad05aa57657dc506c2 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 28 Dec 2020 14:20:00 -0800
Subject: [PATCH 0466/1300] Fix some white partial pixels around borders

---
 .../document-card-large.component.html                 | 10 +++++-----
 .../document-card-large.component.scss                 |  6 +-----
 .../document-card-small.component.html                 |  4 ++--
 src-ui/src/theme_dark.scss                             |  6 ++++--
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index c1757eb35..729b02613 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -1,7 +1,7 @@
 <div class="card mb-3 bg-light shadow-sm" [class.card-selected]="selected" [class.document-card]="selectable">
   <div class="row no-gutters">
-    <div class="col-md-2 d-none d-lg-block doc-img-background" [class.doc-img-background-selected]="selected">
-      <img [src]="getThumbUrl()" class="card-img doc-img border-right" (click)="setSelected(selectable ? !selected : false)">
+    <div class="col-md-2 d-none d-lg-block doc-img-background rounded-left" [class.doc-img-background-selected]="selected">
+      <img [src]="getThumbUrl()" class="card-img doc-img border-right rounded-left" (click)="setSelected(selectable ? !selected : false)">
 
       <div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
         <div class="custom-control custom-checkbox">
@@ -55,16 +55,16 @@
                 <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;<ng-container i18n>Download</ng-container>
             </a>
-            
+
           </div>
 
           <small class="text-muted ml-auto" i18n>Score:</small>
 
           <ngb-progressbar *ngIf="searchScore" [type]="searchScoreClass" [value]="searchScore" class="search-score-bar mx-2" [max]="1"></ngb-progressbar>
-          
+
           <small class="text-muted" i18n>Created: {{document.created | date}}</small>
         </div>
-        
+
       </div>
     </div>
   </div>
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
index eb744d2af..0b1604d90 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
@@ -30,10 +30,6 @@
   border-color: $primary;
 }
 
-.doc-img-background {
-  background-color: white;
-}
-
 .doc-img-background-selected {
   background-color: $primaryFaded;
-}
\ No newline at end of file
+}
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 9d808e84b..83ba8c274 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,7 +1,7 @@
 <div class="col p-2 h-100">
-  <div class="card h-100 shadow-sm" [class.card-selected]="selected">
+  <div class="card h-100 shadow-sm document-card" [class.card-selected]="selected">
     <div class="border-bottom doc-img-container" [class.doc-img-background-selected]="selected">
-      <img class="card-img doc-img" [src]="getThumbUrl()" (click)="setSelected(!selected)">
+      <img class="card-img doc-img rounded-top" [src]="getThumbUrl()" (click)="setSelected(!selected)">
 
       <div class="border-right border-bottom bg-light p-1 rounded document-card-check">
         <div class="custom-control custom-checkbox">
diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index 83f8cbf60..0603ce4cb 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -93,13 +93,15 @@ $border-color-dark-mode: #47494f;
 
   .doc-img-container {
     border: none !important;
+    border-radius: .25rem;
+    overflow: hidden;
   }
 
   .doc-img {
     mix-blend-mode: normal;
     filter: invert(95%) hue-rotate(180deg);
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
+    border-color: $border-color-dark-mode;
+    border-radius: 0;
   }
 
   .card-selected .doc-img {

From bd01b821ec8fa64d7ebf1338a960553508e4feef Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 23:24:08 +0100
Subject: [PATCH 0467/1300] possible fix for #201

---
 docker/local/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index a8e991d8c..9fc71abc7 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -9,6 +9,7 @@ RUN apt-get update \
   && apt-get -y --no-install-recommends install \
 		build-essential \
 		curl \
+		file \
 		fonts-liberation \
 		ghostscript \
 		gnupg \

From 1dd2386fa507a491b18fbbfa1b7f94ae1a1258e3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 28 Dec 2020 23:53:18 +0100
Subject: [PATCH 0468/1300] messed up, restore functionality

---
 .../document-list/bulk-editor/bulk-editor.component.ts        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 1e2e8496f..f8520b84d 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -147,7 +147,7 @@ export class BulkEditorComponent {
     modal.componentInstance.btnClass = "btn-warning"
     modal.componentInstance.btnCaption = $localize`Confirm`
     modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('set_correspondent', {"correspondent": correspondent?.id}).subscribe(
+      this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
         response => {
           this.correspondentService.clearCache()
           modal.close()
@@ -170,7 +170,7 @@ export class BulkEditorComponent {
     modal.componentInstance.btnClass = "btn-warning"
     modal.componentInstance.btnCaption = $localize`Confirm`
     modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('set_document_type', {"document_type": documentType?.id}).subscribe(
+      this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
         response => {
           this.documentService.clearCache()
           modal.close()

From edb9264d78b055f6a0e8f2a3fa0c16c69fa1ef27 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 28 Dec 2020 16:46:08 -0800
Subject: [PATCH 0469/1300] Many small fixes to theme & inline logo

---
 .../dashboard/dashboard.component.html        |  5 +-
 src-ui/src/assets/logo-dark.svg               | 96 +------------------
 src-ui/src/theme_dark.scss                    | 95 ++++++++++++++----
 3 files changed, 87 insertions(+), 109 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 5b76dd242..50bd44a4e 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -1,5 +1,8 @@
 <app-page-header title="Dashboard" [subTitle]="subtitle" i18n-title>
-  <img src="assets/logo.svg" height="80" class="m-2 d-none d-md-block">
+  <svg class="logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.64" height="100%" width="auto">
+    <path class="leaf" d="M730.71,0C616.3,266.24,66.21,299.25,242.24,728.31c2.2,5.5-40.71,63.81-69.31,112.22-6.6-24.21-14.3-50.61-13.2-52.81C302.75,618.29,57.41,522.58,44.21,384-17.4,494-39.4,686.5,146.53,797.62c1.1,0,9.9,41.81,14.3,62.71-4.4,8.8-8.8,17.6-11,24.2-4.4,11,28.6,9.91,28.6,12.11,3.3-1.1,81.41-138.63,83.61-139.73C704.31,655.7,782.42,257.44,730.71,0ZM105.82,544.58C145.43,580.89,211.44,692,155.33,756.91,168.53,727.21,172.93,660.1,105.82,544.58ZM269.74,670C200.43,506.08,404,325.65,505.18,280.54,298.35,465.37,263.14,602.89,269.74,670Z" transform="translate(0)" style="fill:#17541f"/>
+    <path class="text" style="fill:#000" d="M1169.27,231.44q.7,17.06.71,38.73t-.71,38a112,112,0,0,1-6.76,38A100.16,100.16,0,0,1,1142.25,380a93.87,93.87,0,0,1-33.76,23.46q-20.25,8.54-46.56,8.53h-36.25V597.5q0,9.94,2.85,14.57c1.89,3.08,3.79,4.86,5.68,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.56-.71,7.1-5.33t3.56-14.57V166q0-10.66-3.56-15.28t-7.1-6q-2.85-1.42-8.53,0V127.66h104.48q26.31,0,46.56,8.53a93.75,93.75,0,0,1,33.76,23.46,101,101,0,0,1,20.26,33.4A111.05,111.05,0,0,1,1169.27,231.44ZM1118.8,215.8q0-18.48-6-32t-14.22-21.32a74.68,74.68,0,0,0-17.06-12.44q-8.88-4.62-15.28-4.62h-40.52V392.79h40.52q6.39,0,15.28-3.56t17.06-12.44a86,86,0,0,0,14.22-21.67q6-12.8,6-32Zm337.63,389.52a27.35,27.35,0,0,1-2.85,11.72,40.58,40.58,0,0,1-8.17,11.38,54.8,54.8,0,0,1-13.5,9.59,40.07,40.07,0,0,1-18.84,4.27,60,60,0,0,1-30.57-7.82q-13.5-7.82-18.48-20.61a56.12,56.12,0,0,1-6.39-16.35q-9.24,19.18-28.08,32a72.42,72.42,0,0,1-41.58,12.8q-28.44,0-49.76-20.61-12.07-10.67-19.9-27.73t-9.24-39.09q-.71-2.13-.71-8.53v-.71a124.43,124.43,0,0,1,4.26-25.23,113.22,113.22,0,0,1,11-26.3,149.46,149.46,0,0,1,17.77-24.88,128.6,128.6,0,0,1,22.39-20.26,17.39,17.39,0,0,0,4.62-3.2,28.53,28.53,0,0,1,5.33-3.91l2.13-1.06,2.14-1.07q12.8-7.81,22.39-14.22t17.41-12.08a97.25,97.25,0,0,0,8.53-6.4c2.84-2.37,5.93-4.73,9.24-7.1a79.43,79.43,0,0,0,12.09-10,36.51,36.51,0,0,0,8.53-13.5q4.26-7.11,4.26-17.06a67.74,67.74,0,0,0-2.13-17.77,49.09,49.09,0,0,0-14.57-27q-11.73-11.37-26-14.93a38.26,38.26,0,0,0-12.08-2.13q-19.9,0-34.12,7.11-9.24,4.26-13.51,9.59t-4.62,10a10.73,10.73,0,0,0,1.78,7.46,12.91,12.91,0,0,0,5.69,4.26,6,6,0,0,0,1.78.71,6.28,6.28,0,0,1,1.77.72,32.21,32.21,0,0,1,15.28,12.43,34,34,0,0,1,6,19.55,32.78,32.78,0,0,1-32.7,32.7,33.53,33.53,0,0,1-24.17-9.6,30.94,30.94,0,0,1-10-23.1,106.83,106.83,0,0,1,3.2-25.23,84.65,84.65,0,0,1,9.6-23.81q13.5-19.91,32.34-28.79a96.24,96.24,0,0,1,41.58-8.89,93.82,93.82,0,0,1,33.76,6.4,96.18,96.18,0,0,1,29.86,18.13,103.38,103.38,0,0,1,22,28.07q8.88,16.35,8.88,37.68v209q0,12.79.36,16.7t.36,5.34h0q0,9.24,5.68,14.92a18.45,18.45,0,0,0,13.51,5.69q9.24,0,14.92-5.33a20.62,20.62,0,0,0,6.4-13.86Zm-111.6-17.77a52.58,52.58,0,0,0,6.76-21.33q1.07-11.37,1.06-21.32V413.4a63.92,63.92,0,0,1-6,5.33,74,74,0,0,0-6.75,6q-20.62,14.93-35.19,27.37a164.06,164.06,0,0,0-24.52,25.59,113,113,0,0,0-15.64,28.07,121,121,0,0,0-7.11,34.12v10.67q.72,27,14.58,42.29t39.44,15.28a38.56,38.56,0,0,0,20.62-5.69q9.24-6.39,12.79-14.92Zm244.52-304.23q40.51.72,64.68,24.53t24.17,75.7V542.77q0,51.88-24.17,75.34T1589.35,643h-2.13a80.27,80.27,0,0,1-22-2.84h-.71a.63.63,0,0,1-.71-.71,91.74,91.74,0,0,1-28.43-15.64l-6.76-6.76-5.33-7.46v118q0,10,2.85,14.58c1.89,3.08,3.79,5.09,5.68,6a10.54,10.54,0,0,0,9.24,0V766h-86V748.19q5.68,2.13,8.53,0,3.56-1.43,6.75-6t3.2-14.58V326.68q0-9.94-3.2-14.57t-6.75-6q-2.85-1.43-8.53,0V289h68.23v27.72a68.68,68.68,0,0,1,12.09-14.21,75.62,75.62,0,0,1,28.43-15.64.63.63,0,0,1,.71-.71h.71a90.55,90.55,0,0,1,22-2.85Zm35.54,84.59v-.71q-.72-36.26-8.89-51.18t-26.65-16.35a63.12,63.12,0,0,0-24.17,3.2,48,48,0,0,0-19.9,13.15q-8.54,9.24-14.22,24.88t-7.82,37V548.45q2.13,22,7.82,37.32t14.22,24.17a53.23,53.23,0,0,0,19.9,13.15,58.92,58.92,0,0,0,24.17,3.55q18.48-1.42,26.65-16.35t8.89-51.18V367.91Zm179.83-84.59a105.36,105.36,0,0,1,33.41,5.69,86.38,86.38,0,0,1,30.56,17.77,88.06,88.06,0,0,1,21.68,30.57q8.18,18.48,8.18,44.06v90.28H1757.1V544.9q0,44.07,15.28,62.9t38,18.13a113.94,113.94,0,0,0,26.65-4.62,54.83,54.83,0,0,0,22.75-13.15q9.59-9.24,16-26.3t6.4-44.78h16.35V547a153.56,153.56,0,0,1-4.27,36.61A72,72,0,0,1,1852,634.1q-16.71,7.47-40.87,8.18a102.25,102.25,0,0,1-34.83-6.4,96,96,0,0,1-32-19.19,108.91,108.91,0,0,1-23.45-30.21q-9.24-17.41-9.25-39.45v-16.7s-.11-9.12-.35-27.37-.36-29.5-.36-33.76-.11-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56A90.72,90.72,0,0,1,1771,289.37a98.55,98.55,0,0,1,33.76-6.05Zm46.2,169.89V397.05q0-27-3.55-45.13t-9.6-29.15q-6-11-14.57-15.28a42.36,42.36,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.72,73.92v56.16Zm279.35-113.73a42.31,42.31,0,0,0,.71,5.68,17.92,17.92,0,0,1,0,7.11q-.72,14.93-10.31,24.52a33,33,0,0,1-46.91-.35,33.52,33.52,0,0,1-9.6-24.17q0-17.76,13.51-27a8.33,8.33,0,0,0,1.77-1.06l1.07-1.07a16.22,16.22,0,0,0,6.4-10.31q1.41-6.75-8.53-11.73a26.26,26.26,0,0,0-12.8-3.55q-21.32-1.43-37.67,12.8t-22,49.75V597.5q0,9.94,2.84,14.57t5.69,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.55-.71,7.11-5.33t3.55-14.57V326.68q0-9.94-3.55-14.57t-7.11-6q-2.85-1.43-8.53,0V288.3h68.24v29.14q5-7.81,9.95-14.57a48.44,48.44,0,0,1,11.72-11.37,59.79,59.79,0,0,1,15.64-7.46q8.89-2.85,22.39-2.85,20.61,0,38.39,14.93t26.3,43.36Zm95.95,258q0,9.94,3.2,14.57c2.13,3.08,4.15,4.86,6,5.33q3.55,2.13,9.24,0v18.48h-86V617.4q5.68,2.13,10,0,2.13-.71,5.69-5.33t3.55-14.57V166.75q0-10.65-3.55-15.28a28.82,28.82,0,0,0-5.69-6q-4.26-2.13-10,0V128.37h67.52V597.5Zm154.25-314.18a105.25,105.25,0,0,1,33.4,5.69,86.33,86.33,0,0,1,30.57,17.77,88.19,88.19,0,0,1,21.68,30.57q8.18,18.48,8.17,44.06v90.28H2332.84V544.9q0,44.07,15.29,62.9t38,18.13a113.93,113.93,0,0,0,26.66-4.62,54.79,54.79,0,0,0,22.74-13.15q9.6-9.24,16-26.3t6.39-44.78h16.35V547a153.56,153.56,0,0,1-4.26,36.61,72,72,0,0,1-42.29,50.46q-16.71,7.47-40.88,8.18a102.24,102.24,0,0,1-34.82-6.4,96,96,0,0,1-32-19.19,108.94,108.94,0,0,1-23.46-30.21q-9.24-17.41-9.24-39.45v-16.7s-.12-9.12-.35-27.37-.36-29.5-.36-33.76-.12-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56a90.78,90.78,0,0,1,29.85-17.77,98.6,98.6,0,0,1,33.77-6.05Zm46.2,169.89V397.05q0-27-3.56-45.13t-9.59-29.15q-6-11-14.57-15.28a42.39,42.39,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.73,73.92v56.16Zm213.24,178.41c-.48.47-.83.71-1.07.71s-.59.23-1.06.71l-.71.71c-1,.47-2,1-3.2,1.42s-2.25,1-3.2,1.42q-14.93,6.4-34.83,6.4a48.79,48.79,0,0,1-22-5.33q-10.65-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.5V550.59h17.06q-1.43,22.74,5,39.09,4.27,14.22,16.71,26.65t37.31,12.44q16.35,0,27-5.68,18.48-9.24,25.24-22A45.92,45.92,0,0,0,2657,574.4q-1.42-13.86-10.31-27.37A126,126,0,0,0,2625,522.15q-8.52-6.39-17.77-13.5t-18.48-14.93q-24.87-19.91-39.45-35.89T2526.89,428a98.76,98.76,0,0,1-10.66-26.3,119.09,119.09,0,0,1-2.84-26.65,106,106,0,0,1,1.06-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,63,63,0,0,1,14.21-20.26A73.7,73.7,0,0,1,2561,288.3q13.5-5.69,32.7-5.69a53.27,53.27,0,0,1,21.32,4.62q10.66,4.62,19.19,8.53t13.51,3.56q5-.36,5-11h13.51v88.14h-18.48q.7-21.33-5-38.38a67,67,0,0,0-17.41-27Q2612.89,299,2588.73,299q-19.18,0-31.27,8.53-6.4,5-11,14.57a55.84,55.84,0,0,0-5.33,21,66.08,66.08,0,0,0,3.55,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.5,26.5,0,0,0,5.33,3.56,23,23,0,0,1,3.56,2.84l2.84,2.84q7.82,6.41,16,12.8t16.71,12.79a449.06,449.06,0,0,1,33.05,30.92,276.13,276.13,0,0,1,22,25.94,104.57,104.57,0,0,1,13.15,22.75,69,69,0,0,1,5,20.61q7.11,32.7-2.49,55.09t-24.52,35.19h-.71a1.26,1.26,0,0,1-1.43,1.42,11,11,0,0,1-2.84,2.13l-4.26,2.84-4.27,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.12,3.12,0,0,1-1.42.36Zm211.11,0c-.48.47-.83.71-1.07.71s-.59.23-1.07.71l-.71.71c-.94.47-2,1-3.2,1.42s-2.25,1-3.19,1.42Q2826.84,643,2807,643a48.76,48.76,0,0,1-22-5.33q-10.66-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.51V550.59h17.06q-1.41,22.74,5,39.09,4.26,14.22,16.7,26.65t37.32,12.44q16.35,0,27-5.68,18.48-9.24,25.23-22a45.93,45.93,0,0,0,5.34-26.65q-1.42-13.86-10.31-27.37a126,126,0,0,0-21.68-24.88q-8.53-6.39-17.77-13.5t-18.48-14.93q-24.89-19.91-39.45-35.89T2738,428a98.76,98.76,0,0,1-10.66-26.3,119.08,119.08,0,0,1-2.85-26.65,105.9,105.9,0,0,1,1.07-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,62.83,62.83,0,0,1,14.21-20.26,73.58,73.58,0,0,1,22.75-14.57q13.5-5.69,32.69-5.69a53.28,53.28,0,0,1,21.33,4.62q10.67,4.62,19.19,8.53t13.5,3.56q5-.36,5-11h13.51v88.14h-18.49q.72-21.33-5-38.38a67,67,0,0,0-17.42-27Q2824,299,2799.84,299q-19.2,0-31.28,8.53-6.39,5-11,14.57a56,56,0,0,0-5.34,21,66.3,66.3,0,0,0,3.56,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.22,26.22,0,0,0,5.33,3.56,22.83,22.83,0,0,1,3.55,2.84l2.85,2.84q7.82,6.41,16,12.8t16.7,12.79a445,445,0,0,1,33.05,30.92,274.85,274.85,0,0,1,22,25.94,105,105,0,0,1,13.15,22.75,68.69,68.69,0,0,1,5,20.61q7.11,32.7-2.48,55.09t-24.53,35.19h-.71a1.26,1.26,0,0,1-1.42,1.42,11.2,11.2,0,0,1-2.84,2.13l-4.27,2.84-4.26,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.15,3.15,0,0,1-1.42.36Z" transform="translate(0)"/>
+  </svg>
 </app-page-header>
 
 <div class='row'>
diff --git a/src-ui/src/assets/logo-dark.svg b/src-ui/src/assets/logo-dark.svg
index bc8ba2b80..111d8d32f 100644
--- a/src-ui/src/assets/logo-dark.svg
+++ b/src-ui/src/assets/logo-dark.svg
@@ -1,93 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="2897.3997"
-   height="896.63574"
-   id="svg14314"
-   sodipodi:docname="logo-dark.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata14320">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs14318" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     id="namedview14316"
-     showgrid="false"
-     inkscape:zoom="0.46439736"
-     inkscape:cx="1179.9546"
-     inkscape:cy="327.93662"
-     inkscape:window-x="1280"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg14314"
-     inkscape:document-rotation="0" />
-  <g
-     transform="matrix(10.638298,0,0,10.638298,-106.38296,-106.38298)"
-     id="g14312"
-     inkscape:label="g14312">
-    <defs
-       id="SvgjsDefs1018" />
-    <g
-       id="SvgjsG1019"
-       featureKey="root"
-       fill="#ffffff" />
-    <g
-       id="SvgjsG1020"
-       featureKey="symbol1"
-       fill="#ffffff"
-       transform="matrix(0.10341565,0,0,0.10341565,1.2287665,8.3453496)">
-      <defs
-         id="defs14302" />
-      <g
-         id="g14306">
-        <path
-           style="fill:#17541f"
-           d="M 231,798 C 227,779 219,741 218,741 49,640 69,465 125,365 c 12,126 235,213 105,367 -1,2 6,26 12,48 26,-44 65,-97 63,-102 C 145,288 645,258 749,16 c 47,234 -24,596 -426,688 -2,1 -73,126 -76,127 0,-2 -30,-1 -26,-11 2,-6 6,-14 10,-22 z"
-           id="path14304" />
-      </g>
-      <path
-         style="fill:#ffffff"
-         d="M 544,271 C 452,312 267,476 330,625 324,564 356,439 544,271 Z"
-         id="path57" />
-      <path
-         style="fill:#ffffff"
-         d="m 226,704 c 51,-59 -9,-160 -45,-193 61,105 57,166 45,193 z"
-         id="path59" />
-    </g>
-    <g
-       id="SvgjsG1021"
-       featureKey="text1"
-       fill="#ffffff"
-       transform="matrix(3.3407567,0,0,3.3407567,98.195992,2.9576938)">
-      <path
-         d="m 6.5,8.62 q 0.02,0.48 0.02,1.09 0,0.61 -0.02,1.07 0,0.54 -0.19,1.07 Q 6.12,12.38 5.74,12.8 5.36,13.22 4.79,13.46 4.22,13.7 3.48,13.7 H 2.46 v 5.22 q 0,0.28 0.08,0.41 0.08,0.13 0.16,0.15 0.12,0.06 0.26,0 V 20 H 0.54 v -0.52 q 0.16,0.06 0.24,0 0.1,-0.02 0.2,-0.15 0.1,-0.13 0.1,-0.41 V 6.78 Q 1.08,6.48 0.98,6.35 0.88,6.22 0.78,6.18 0.7,6.14 0.54,6.18 V 5.7 H 3.48 Q 4.22,5.7 4.79,5.94 5.36,6.18 5.74,6.6 6.12,7.02 6.31,7.54 6.5,8.06 6.5,8.62 Z M 5.08,8.18 Q 5.08,7.66 4.91,7.28 4.74,6.9 4.51,6.68 4.28,6.46 4.03,6.33 3.78,6.2 3.6,6.2 H 2.46 v 6.96 H 3.6 q 0.18,0 0.43,-0.1 0.25,-0.1 0.48,-0.35 0.23,-0.25 0.4,-0.61 0.17,-0.36 0.17,-0.9 z m 9.5,10.96 q 0,0.16 -0.08,0.33 -0.08,0.17 -0.23,0.32 -0.15,0.15 -0.38,0.27 -0.23,0.12 -0.53,0.12 -0.48,0 -0.86,-0.22 -0.38,-0.22 -0.52,-0.58 -0.12,-0.2 -0.18,-0.46 -0.26,0.54 -0.79,0.9 -0.53,0.36 -1.17,0.36 -0.8,0 -1.4,-0.58 Q 8.1,19.3 7.88,18.82 7.66,18.34 7.62,17.72 7.6,17.66 7.6,17.48 v -0.02 q 0.02,-0.34 0.12,-0.71 0.1,-0.37 0.31,-0.74 0.21,-0.37 0.5,-0.7 Q 8.82,14.98 9.16,14.74 9.24,14.7 9.29,14.65 9.34,14.6 9.44,14.54 L 9.5,14.51 9.56,14.48 q 0.36,-0.22 0.63,-0.4 0.27,-0.18 0.49,-0.34 0.12,-0.08 0.24,-0.18 0.12,-0.1 0.26,-0.2 0.18,-0.12 0.34,-0.28 0.16,-0.16 0.24,-0.38 0.12,-0.2 0.12,-0.48 0,-0.28 -0.06,-0.5 -0.08,-0.44 -0.41,-0.76 -0.33,-0.32 -0.73,-0.42 -0.18,-0.06 -0.34,-0.06 -0.56,0 -0.96,0.2 Q 9.12,10.8 9,10.95 8.88,11.1 8.87,11.23 q -0.01,0.13 0.05,0.21 0.06,0.08 0.16,0.12 0.04,0.02 0.05,0.02 0.01,0 0.05,0.02 0.26,0.1 0.43,0.35 0.17,0.25 0.17,0.55 0,0.38 -0.27,0.65 -0.27,0.27 -0.65,0.27 -0.4,0 -0.68,-0.27 Q 7.9,12.88 7.9,12.5 q 0,-0.34 0.09,-0.71 0.09,-0.37 0.27,-0.67 0.38,-0.56 0.91,-0.81 0.53,-0.25 1.17,-0.25 0.48,0 0.95,0.18 0.47,0.18 0.84,0.51 0.37,0.33 0.62,0.79 Q 13,12 13,12.6 v 5.88 q 0,0.36 0.01,0.47 0.01,0.11 0.01,0.15 v 0 q 0,0.26 0.16,0.42 0.16,0.16 0.38,0.16 0.26,0 0.42,-0.15 0.16,-0.15 0.18,-0.39 z m -3.14,-0.5 q 0.16,-0.28 0.19,-0.6 0.03,-0.32 0.03,-0.6 v -3.7 q -0.08,0.08 -0.17,0.15 -0.09,0.07 -0.19,0.17 -0.58,0.42 -0.99,0.77 -0.41,0.35 -0.69,0.72 -0.28,0.37 -0.44,0.79 -0.16,0.42 -0.2,0.96 v 0.3 q 0.02,0.76 0.41,1.19 0.39,0.43 1.11,0.43 0.32,0 0.58,-0.16 0.26,-0.18 0.36,-0.42 z m 6.88,-8.56 q 1.14,0.02 1.82,0.69 0.68,0.67 0.68,2.13 v 4.48 q 0,1.46 -0.68,2.12 -0.68,0.66 -1.82,0.7 h -0.06 q -0.34,0 -0.62,-0.08 h -0.02 q -0.02,0 -0.02,-0.02 -0.46,-0.16 -0.8,-0.44 l -0.19,-0.19 q 0,0 -0.15,-0.21 v 3.32 q 0,0.28 0.08,0.41 0.08,0.13 0.16,0.17 0.12,0.06 0.26,0 v 0.5 h -2.42 v -0.5 q 0.16,0.06 0.24,0 0.1,-0.04 0.19,-0.17 0.09,-0.13 0.09,-0.41 V 11.3 q 0,-0.28 -0.09,-0.41 -0.09,-0.13 -0.19,-0.17 -0.08,-0.04 -0.24,0 v -0.48 h 1.92 v 0.78 q 0.14,-0.22 0.34,-0.4 0.34,-0.3 0.8,-0.44 0,-0.02 0.02,-0.02 h 0.02 q 0.32,-0.08 0.62,-0.08 z m 1,2.38 V 12.44 Q 19.3,11.42 19.07,11 q -0.23,-0.42 -0.75,-0.46 -0.36,-0.02 -0.68,0.09 -0.32,0.11 -0.56,0.37 -0.24,0.26 -0.4,0.7 -0.16,0.44 -0.22,1.04 v 4.8 q 0.06,0.62 0.22,1.05 0.16,0.43 0.4,0.68 0.24,0.25 0.56,0.37 0.32,0.12 0.68,0.1 0.52,-0.04 0.75,-0.46 0.23,-0.42 0.25,-1.44 v -0.02 z m 5.06,-2.38 q 0.46,0 0.94,0.16 0.48,0.16 0.86,0.5 0.38,0.34 0.61,0.86 0.23,0.52 0.23,1.24 v 2.02 0.06 0.46 h -3.98 v 2.06 q 0,1.24 0.43,1.77 0.43,0.53 1.07,0.51 0.38,-0.02 0.75,-0.13 0.37,-0.11 0.64,-0.37 0.27,-0.26 0.45,-0.74 0.18,-0.48 0.18,-1.26 h 0.46 v 0.28 q 0,0.54 -0.12,1.03 -0.12,0.49 -0.42,0.85 -0.3,0.36 -0.77,0.57 -0.47,0.21 -1.15,0.23 -0.48,0 -0.98,-0.18 -0.5,-0.18 -0.9,-0.54 -0.4,-0.36 -0.66,-0.85 -0.26,-0.49 -0.26,-1.11 v -0.47 q 0,0 -0.01,-0.77 -0.01,-0.77 -0.01,-0.95 0,-0.18 -0.01,-0.99 -0.01,-0.81 -0.01,-0.87 v -0.59 q 0,-0.72 0.25,-1.25 0.25,-0.53 0.62,-0.86 0.37,-0.33 0.84,-0.5 0.47,-0.17 0.95,-0.17 z m 1.3,4.78 v -1.58 q 0,-0.76 -0.1,-1.27 -0.1,-0.51 -0.27,-0.82 -0.17,-0.31 -0.41,-0.43 -0.24,-0.12 -0.54,-0.12 -0.64,0 -0.97,0.56 -0.33,0.56 -0.33,2.08 v 1.58 z m 7.86,-3.2 q 0,0.04 0.02,0.16 0.02,0.12 0,0.2 -0.02,0.42 -0.29,0.69 -0.27,0.27 -0.65,0.27 -0.4,0 -0.67,-0.28 -0.27,-0.28 -0.27,-0.68 0,-0.5 0.38,-0.76 0.04,-0.02 0.05,-0.03 l 0.03,-0.03 q 0.14,-0.1 0.18,-0.29 0.04,-0.19 -0.24,-0.33 -0.18,-0.1 -0.36,-0.1 -0.6,-0.04 -1.06,0.36 -0.46,0.4 -0.62,1.4 v 6.68 q 0,0.28 0.08,0.41 0.08,0.13 0.16,0.15 0.12,0.06 0.26,0 V 20 h -2.42 v -0.52 q 0.16,0.06 0.24,0 0.1,-0.02 0.2,-0.15 0.1,-0.13 0.1,-0.41 V 11.3 q 0,-0.28 -0.1,-0.41 -0.1,-0.13 -0.2,-0.17 -0.08,-0.04 -0.24,0 v -0.5 h 1.92 v 0.82 q 0.14,-0.22 0.28,-0.41 0.14,-0.19 0.33,-0.32 0.19,-0.13 0.44,-0.21 0.25,-0.08 0.63,-0.08 0.58,0 1.08,0.42 0.5,0.42 0.74,1.22 z m 2.7,7.26 q 0,0.28 0.09,0.41 0.09,0.13 0.17,0.15 0.1,0.06 0.26,0 V 20 h -2.42 v -0.52 q 0.16,0.06 0.28,0 0.06,-0.02 0.16,-0.15 0.1,-0.13 0.1,-0.41 V 6.8 q 0,-0.3 -0.1,-0.43 Q 34.68,6.24 34.62,6.2 34.5,6.14 34.34,6.2 V 5.72 h 1.9 V 6.8 Z m 4.34,-8.84 q 0.46,0 0.94,0.16 0.48,0.16 0.86,0.5 0.38,0.34 0.61,0.86 0.23,0.52 0.23,1.24 v 2.02 0.06 0.46 h -3.98 v 2.06 q 0,1.24 0.43,1.77 0.43,0.53 1.07,0.51 0.38,-0.02 0.75,-0.13 0.37,-0.11 0.64,-0.37 0.27,-0.26 0.45,-0.74 0.18,-0.48 0.18,-1.26 h 0.46 v 0.28 q 0,0.54 -0.12,1.03 -0.12,0.49 -0.42,0.85 -0.3,0.36 -0.77,0.57 -0.47,0.21 -1.15,0.23 -0.48,0 -0.98,-0.18 -0.5,-0.18 -0.9,-0.54 -0.4,-0.36 -0.66,-0.85 -0.26,-0.49 -0.26,-1.11 v -0.47 q 0,0 -0.01,-0.77 -0.01,-0.77 -0.01,-0.95 0,-0.18 -0.01,-0.99 -0.01,-0.81 -0.01,-0.87 v -0.59 q 0,-0.72 0.25,-1.25 0.25,-0.53 0.62,-0.86 0.37,-0.33 0.84,-0.5 0.47,-0.17 0.95,-0.17 z m 1.3,4.78 v -1.58 q 0,-0.76 -0.1,-1.27 -0.1,-0.51 -0.27,-0.82 -0.17,-0.31 -0.41,-0.43 -0.24,-0.12 -0.54,-0.12 -0.64,0 -0.97,0.56 -0.33,0.56 -0.33,2.08 v 1.58 z m 6,5.02 q -0.02,0.02 -0.03,0.02 -0.01,0 -0.03,0.02 l -0.02,0.02 q -0.04,0.02 -0.09,0.04 -0.05,0.02 -0.09,0.04 -0.42,0.18 -0.98,0.18 -0.32,0 -0.62,-0.15 Q 45.72,19.9 45.5,19.8 45.28,19.7 45.13,19.71 44.98,19.72 44.98,20 H 44.6 v -2.4 h 0.48 q -0.04,0.64 0.14,1.1 0.12,0.4 0.47,0.75 0.35,0.35 1.05,0.35 0.46,0 0.76,-0.16 0.52,-0.26 0.71,-0.62 0.19,-0.36 0.15,-0.75 -0.04,-0.39 -0.29,-0.77 -0.25,-0.38 -0.61,-0.7 -0.24,-0.18 -0.5,-0.38 -0.26,-0.2 -0.52,-0.42 -0.7,-0.56 -1.11,-1.01 -0.41,-0.45 -0.63,-0.84 -0.22,-0.39 -0.3,-0.74 -0.08,-0.35 -0.08,-0.75 0,-0.24 0.03,-0.44 0.03,-0.2 0.07,-0.36 0.06,-0.34 0.2,-0.66 0.14,-0.32 0.4,-0.57 0.26,-0.25 0.64,-0.41 0.38,-0.16 0.92,-0.16 0.3,0 0.6,0.13 0.3,0.13 0.54,0.24 0.24,0.11 0.38,0.1 0.14,-0.01 0.14,-0.31 h 0.38 V 12.7 H 48.1 q 0.02,-0.6 -0.14,-1.08 -0.14,-0.42 -0.49,-0.76 -0.35,-0.34 -1.03,-0.34 -0.54,0 -0.88,0.24 -0.18,0.14 -0.31,0.41 -0.13,0.27 -0.15,0.59 -0.02,0.32 0.1,0.69 0.12,0.37 0.48,0.69 0.04,0.06 0.11,0.12 0.07,0.06 0.15,0.1 0.06,0.04 0.1,0.08 l 0.08,0.08 q 0.22,0.18 0.45,0.36 0.23,0.18 0.47,0.36 0.56,0.48 0.93,0.87 0.37,0.39 0.62,0.73 0.25,0.34 0.37,0.64 0.12,0.3 0.14,0.58 0.2,0.92 -0.07,1.55 -0.27,0.63 -0.69,0.99 h -0.02 q 0,0.04 -0.04,0.04 -0.04,0.04 -0.08,0.06 l -0.12,0.08 q 0,0 -0.12,0.06 v 0.02 q -0.02,0 -0.04,0.01 -0.02,0.01 -0.04,0.01 z m 5.94,0 q -0.02,0.02 -0.03,0.02 -0.01,0 -0.03,0.02 l -0.02,0.02 q -0.04,0.02 -0.09,0.04 -0.05,0.02 -0.09,0.04 -0.42,0.18 -0.98,0.18 -0.32,0 -0.62,-0.15 -0.3,-0.15 -0.52,-0.25 -0.22,-0.1 -0.37,-0.09 -0.15,0.01 -0.15,0.29 h -0.38 v -2.4 h 0.48 q -0.04,0.64 0.14,1.1 0.12,0.4 0.47,0.75 0.35,0.35 1.05,0.35 0.46,0 0.76,-0.16 0.52,-0.26 0.71,-0.62 0.19,-0.36 0.15,-0.75 -0.04,-0.39 -0.29,-0.77 -0.25,-0.38 -0.61,-0.7 -0.24,-0.18 -0.5,-0.38 -0.26,-0.2 -0.52,-0.42 -0.7,-0.56 -1.11,-1.01 -0.41,-0.45 -0.63,-0.84 -0.22,-0.39 -0.3,-0.74 -0.08,-0.35 -0.08,-0.75 0,-0.24 0.03,-0.44 0.03,-0.2 0.07,-0.36 0.06,-0.34 0.2,-0.66 0.14,-0.32 0.4,-0.57 0.26,-0.25 0.64,-0.41 0.38,-0.16 0.92,-0.16 0.3,0 0.6,0.13 0.3,0.13 0.54,0.24 0.24,0.11 0.38,0.1 0.14,-0.01 0.14,-0.31 h 0.38 v 2.48 h -0.52 q 0.02,-0.6 -0.14,-1.08 -0.14,-0.42 -0.49,-0.76 -0.35,-0.34 -1.03,-0.34 -0.54,0 -0.88,0.24 -0.18,0.14 -0.31,0.41 -0.13,0.27 -0.15,0.59 -0.02,0.32 0.1,0.69 0.12,0.37 0.48,0.69 0.04,0.06 0.11,0.12 0.07,0.06 0.15,0.1 0.06,0.04 0.1,0.08 l 0.08,0.08 q 0.22,0.18 0.45,0.36 0.23,0.18 0.47,0.36 0.56,0.48 0.93,0.87 0.37,0.39 0.62,0.73 0.25,0.34 0.37,0.64 0.12,0.3 0.14,0.58 0.2,0.92 -0.07,1.55 -0.27,0.63 -0.69,0.99 h -0.02 q 0,0.04 -0.04,0.04 -0.04,0.04 -0.08,0.06 l -0.12,0.08 q 0,0 -0.12,0.06 v 0.02 q -0.02,0 -0.04,0.01 -0.02,0.01 -0.04,0.01 z"
-         id="path14309" />
-    </g>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.64">
+  <path d="M160.83,860.33c-4.4-20.9-13.2-62.71-14.3-62.71C-39.4,686.5-17.4,494,44.21,384c13.2,138.62,258.54,234.33,115.52,403.76-1.1,2.2,6.6,28.6,13.2,52.81,28.6-48.41,71.51-106.72,69.31-112.22C66.21,299.25,616.3,266.24,730.71,0,782.42,257.44,704.31,655.7,262,756.91c-2.2,1.1-80.31,138.63-83.61,139.73,0-2.2-33-1.1-28.6-12.11C152,877.93,156.43,869.13,160.83,860.33Z" transform="translate(0 0)" style="fill:#17541f"/><path d="M505.18,280.54C404,325.65,200.43,506.08,269.74,670,263.14,602.89,298.35,465.37,505.18,280.54Z" transform="translate(0 0)" style="fill:#fff"/>
+  <path d="M155.33,756.91c56.11-64.91-9.9-176-49.51-212.33C172.93,660.1,168.53,727.21,155.33,756.91Z" transform="translate(0 0)" style="fill:#fff"/>
+  <path d="M1169.27,231.44q.7,17.06.71,38.73t-.71,38a112,112,0,0,1-6.76,38A100.16,100.16,0,0,1,1142.25,380a93.87,93.87,0,0,1-33.76,23.46q-20.25,8.54-46.56,8.53h-36.25V597.5q0,9.94,2.85,14.57c1.89,3.08,3.79,4.86,5.68,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.56-.71,7.1-5.33t3.56-14.57V166q0-10.66-3.56-15.28t-7.1-6q-2.85-1.42-8.53,0V127.66h104.48q26.31,0,46.56,8.53a93.75,93.75,0,0,1,33.76,23.46,101,101,0,0,1,20.26,33.4A111.05,111.05,0,0,1,1169.27,231.44ZM1118.8,215.8q0-18.48-6-32t-14.22-21.32a74.68,74.68,0,0,0-17.06-12.44q-8.88-4.62-15.28-4.62h-40.52V392.79h40.52q6.39,0,15.28-3.56t17.06-12.44a86,86,0,0,0,14.22-21.67q6-12.8,6-32Zm337.63,389.52a27.35,27.35,0,0,1-2.85,11.72,40.58,40.58,0,0,1-8.17,11.38,54.8,54.8,0,0,1-13.5,9.59,40.07,40.07,0,0,1-18.84,4.27,60,60,0,0,1-30.57-7.82q-13.5-7.82-18.48-20.61a56.12,56.12,0,0,1-6.39-16.35q-9.24,19.18-28.08,32a72.42,72.42,0,0,1-41.58,12.8q-28.44,0-49.76-20.61-12.07-10.67-19.9-27.73t-9.24-39.09q-.71-2.13-.71-8.53v-.71a124.43,124.43,0,0,1,4.26-25.23,113.22,113.22,0,0,1,11-26.3,149.46,149.46,0,0,1,17.77-24.88,128.6,128.6,0,0,1,22.39-20.26,17.39,17.39,0,0,0,4.62-3.2,28.53,28.53,0,0,1,5.33-3.91l2.13-1.06,2.14-1.07q12.8-7.81,22.39-14.22t17.41-12.08a97.25,97.25,0,0,0,8.53-6.4c2.84-2.37,5.93-4.73,9.24-7.1a79.43,79.43,0,0,0,12.09-10,36.51,36.51,0,0,0,8.53-13.5q4.26-7.11,4.26-17.06a67.74,67.74,0,0,0-2.13-17.77,49.09,49.09,0,0,0-14.57-27q-11.73-11.37-26-14.93a38.26,38.26,0,0,0-12.08-2.13q-19.9,0-34.12,7.11-9.24,4.26-13.51,9.59t-4.62,10a10.73,10.73,0,0,0,1.78,7.46,12.91,12.91,0,0,0,5.69,4.26,6,6,0,0,0,1.78.71,6.28,6.28,0,0,1,1.77.72,32.21,32.21,0,0,1,15.28,12.43,34,34,0,0,1,6,19.55,32.78,32.78,0,0,1-32.7,32.7,33.53,33.53,0,0,1-24.17-9.6,30.94,30.94,0,0,1-10-23.1,106.83,106.83,0,0,1,3.2-25.23,84.65,84.65,0,0,1,9.6-23.81q13.5-19.91,32.34-28.79a96.24,96.24,0,0,1,41.58-8.89,93.82,93.82,0,0,1,33.76,6.4,96.18,96.18,0,0,1,29.86,18.13,103.38,103.38,0,0,1,22,28.07q8.88,16.35,8.88,37.68v209q0,12.79.36,16.7t.36,5.34h0q0,9.24,5.68,14.92a18.45,18.45,0,0,0,13.51,5.69q9.24,0,14.92-5.33a20.62,20.62,0,0,0,6.4-13.86Zm-111.6-17.77a52.58,52.58,0,0,0,6.76-21.33q1.07-11.37,1.06-21.32V413.4a63.92,63.92,0,0,1-6,5.33,74,74,0,0,0-6.75,6q-20.62,14.93-35.19,27.37a164.06,164.06,0,0,0-24.52,25.59,113,113,0,0,0-15.64,28.07,121,121,0,0,0-7.11,34.12v10.67q.72,27,14.58,42.29t39.44,15.28a38.56,38.56,0,0,0,20.62-5.69q9.24-6.39,12.79-14.92Zm244.52-304.23q40.51.72,64.68,24.53t24.17,75.7V542.77q0,51.88-24.17,75.34T1589.35,643h-2.13a80.27,80.27,0,0,1-22-2.84h-.71a.63.63,0,0,1-.71-.71,91.74,91.74,0,0,1-28.43-15.64l-6.76-6.76-5.33-7.46v118q0,10,2.85,14.58c1.89,3.08,3.79,5.09,5.68,6a10.54,10.54,0,0,0,9.24,0V766h-86V748.19q5.68,2.13,8.53,0,3.56-1.43,6.75-6t3.2-14.58V326.68q0-9.94-3.2-14.57t-6.75-6q-2.85-1.43-8.53,0V289h68.23v27.72a68.68,68.68,0,0,1,12.09-14.21,75.62,75.62,0,0,1,28.43-15.64.63.63,0,0,1,.71-.71h.71a90.55,90.55,0,0,1,22-2.85Zm35.54,84.59v-.71q-.72-36.26-8.89-51.18t-26.65-16.35a63.12,63.12,0,0,0-24.17,3.2,48,48,0,0,0-19.9,13.15q-8.54,9.24-14.22,24.88t-7.82,37V548.45q2.13,22,7.82,37.32t14.22,24.17a53.23,53.23,0,0,0,19.9,13.15,58.92,58.92,0,0,0,24.17,3.55q18.48-1.42,26.65-16.35t8.89-51.18V367.91Zm179.83-84.59a105.36,105.36,0,0,1,33.41,5.69,86.38,86.38,0,0,1,30.56,17.77,88.06,88.06,0,0,1,21.68,30.57q8.18,18.48,8.18,44.06v90.28H1757.1V544.9q0,44.07,15.28,62.9t38,18.13a113.94,113.94,0,0,0,26.65-4.62,54.83,54.83,0,0,0,22.75-13.15q9.59-9.24,16-26.3t6.4-44.78h16.35V547a153.56,153.56,0,0,1-4.27,36.61A72,72,0,0,1,1852,634.1q-16.71,7.47-40.87,8.18a102.25,102.25,0,0,1-34.83-6.4,96,96,0,0,1-32-19.19,108.91,108.91,0,0,1-23.45-30.21q-9.24-17.41-9.25-39.45v-16.7s-.11-9.12-.35-27.37-.36-29.5-.36-33.76-.11-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56A90.72,90.72,0,0,1,1771,289.37a98.55,98.55,0,0,1,33.76-6.05Zm46.2,169.89V397.05q0-27-3.55-45.13t-9.6-29.15q-6-11-14.57-15.28a42.36,42.36,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.72,73.92v56.16Zm279.35-113.73a42.31,42.31,0,0,0,.71,5.68,17.92,17.92,0,0,1,0,7.11q-.72,14.93-10.31,24.52a33,33,0,0,1-46.91-.35,33.52,33.52,0,0,1-9.6-24.17q0-17.76,13.51-27a8.33,8.33,0,0,0,1.77-1.06l1.07-1.07a16.22,16.22,0,0,0,6.4-10.31q1.41-6.75-8.53-11.73a26.26,26.26,0,0,0-12.8-3.55q-21.32-1.43-37.67,12.8t-22,49.75V597.5q0,9.94,2.84,14.57t5.69,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.55-.71,7.11-5.33t3.55-14.57V326.68q0-9.94-3.55-14.57t-7.11-6q-2.85-1.43-8.53,0V288.3h68.24v29.14q5-7.81,9.95-14.57a48.44,48.44,0,0,1,11.72-11.37,59.79,59.79,0,0,1,15.64-7.46q8.89-2.85,22.39-2.85,20.61,0,38.39,14.93t26.3,43.36Zm95.95,258q0,9.94,3.2,14.57c2.13,3.08,4.15,4.86,6,5.33q3.55,2.13,9.24,0v18.48h-86V617.4q5.68,2.13,10,0,2.13-.71,5.69-5.33t3.55-14.57V166.75q0-10.65-3.55-15.28a28.82,28.82,0,0,0-5.69-6q-4.26-2.13-10,0V128.37h67.52V597.5Zm154.25-314.18a105.25,105.25,0,0,1,33.4,5.69,86.33,86.33,0,0,1,30.57,17.77,88.19,88.19,0,0,1,21.68,30.57q8.18,18.48,8.17,44.06v90.28H2332.84V544.9q0,44.07,15.29,62.9t38,18.13a113.93,113.93,0,0,0,26.66-4.62,54.79,54.79,0,0,0,22.74-13.15q9.6-9.24,16-26.3t6.39-44.78h16.35V547a153.56,153.56,0,0,1-4.26,36.61,72,72,0,0,1-42.29,50.46q-16.71,7.47-40.88,8.18a102.24,102.24,0,0,1-34.82-6.4,96,96,0,0,1-32-19.19,108.94,108.94,0,0,1-23.46-30.21q-9.24-17.41-9.24-39.45v-16.7s-.12-9.12-.35-27.37-.36-29.5-.36-33.76-.12-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56a90.78,90.78,0,0,1,29.85-17.77,98.6,98.6,0,0,1,33.77-6.05Zm46.2,169.89V397.05q0-27-3.56-45.13t-9.59-29.15q-6-11-14.57-15.28a42.39,42.39,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.73,73.92v56.16Zm213.24,178.41c-.48.47-.83.71-1.07.71s-.59.23-1.06.71l-.71.71c-1,.47-2,1-3.2,1.42s-2.25,1-3.2,1.42q-14.93,6.4-34.83,6.4a48.79,48.79,0,0,1-22-5.33q-10.65-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.5V550.59h17.06q-1.43,22.74,5,39.09,4.27,14.22,16.71,26.65t37.31,12.44q16.35,0,27-5.68,18.48-9.24,25.24-22A45.92,45.92,0,0,0,2657,574.4q-1.42-13.86-10.31-27.37A126,126,0,0,0,2625,522.15q-8.52-6.39-17.77-13.5t-18.48-14.93q-24.87-19.91-39.45-35.89T2526.89,428a98.76,98.76,0,0,1-10.66-26.3,119.09,119.09,0,0,1-2.84-26.65,106,106,0,0,1,1.06-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,63,63,0,0,1,14.21-20.26A73.7,73.7,0,0,1,2561,288.3q13.5-5.69,32.7-5.69a53.27,53.27,0,0,1,21.32,4.62q10.66,4.62,19.19,8.53t13.51,3.56q5-.36,5-11h13.51v88.14h-18.48q.7-21.33-5-38.38a67,67,0,0,0-17.41-27Q2612.89,299,2588.73,299q-19.18,0-31.27,8.53-6.4,5-11,14.57a55.84,55.84,0,0,0-5.33,21,66.08,66.08,0,0,0,3.55,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.5,26.5,0,0,0,5.33,3.56,23,23,0,0,1,3.56,2.84l2.84,2.84q7.82,6.41,16,12.8t16.71,12.79a449.06,449.06,0,0,1,33.05,30.92,276.13,276.13,0,0,1,22,25.94,104.57,104.57,0,0,1,13.15,22.75,69,69,0,0,1,5,20.61q7.11,32.7-2.49,55.09t-24.52,35.19h-.71a1.26,1.26,0,0,1-1.43,1.42,11,11,0,0,1-2.84,2.13l-4.26,2.84-4.27,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.12,3.12,0,0,1-1.42.36Zm211.11,0c-.48.47-.83.71-1.07.71s-.59.23-1.07.71l-.71.71c-.94.47-2,1-3.2,1.42s-2.25,1-3.19,1.42Q2826.84,643,2807,643a48.76,48.76,0,0,1-22-5.33q-10.66-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.51V550.59h17.06q-1.41,22.74,5,39.09,4.26,14.22,16.7,26.65t37.32,12.44q16.35,0,27-5.68,18.48-9.24,25.23-22a45.93,45.93,0,0,0,5.34-26.65q-1.42-13.86-10.31-27.37a126,126,0,0,0-21.68-24.88q-8.53-6.39-17.77-13.5t-18.48-14.93q-24.89-19.91-39.45-35.89T2738,428a98.76,98.76,0,0,1-10.66-26.3,119.08,119.08,0,0,1-2.85-26.65,105.9,105.9,0,0,1,1.07-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,62.83,62.83,0,0,1,14.21-20.26,73.58,73.58,0,0,1,22.75-14.57q13.5-5.69,32.69-5.69a53.28,53.28,0,0,1,21.33,4.62q10.67,4.62,19.19,8.53t13.5,3.56q5-.36,5-11h13.51v88.14h-18.49q.72-21.33-5-38.38a67,67,0,0,0-17.42-27Q2824,299,2799.84,299q-19.2,0-31.28,8.53-6.39,5-11,14.57a56,56,0,0,0-5.34,21,66.3,66.3,0,0,0,3.56,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.22,26.22,0,0,0,5.33,3.56,22.83,22.83,0,0,1,3.55,2.84l2.85,2.84q7.82,6.41,16,12.8t16.7,12.79a445,445,0,0,1,33.05,30.92,274.85,274.85,0,0,1,22,25.94,105,105,0,0,1,13.15,22.75,68.69,68.69,0,0,1,5,20.61q7.11,32.7-2.48,55.09t-24.53,35.19h-.71a1.26,1.26,0,0,1-1.42,1.42,11.2,11.2,0,0,1-2.84,2.13l-4.27,2.84-4.26,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.15,3.15,0,0,1-1.42.36Z" transform="translate(0 0)"/>
 </svg>
diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index 0603ce4cb..7cb195911 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -18,34 +18,65 @@ $border-color-dark-mode: #47494f;
     color: $text-color-dark-mode;
   }
 
+  svg.logo {
+    .leaf {
+      color: $primary-dark-mode !important;
+    }
+    .text {
+      fill: $text-color-dark-mode !important;
+    }
+  }
+
   .bg-light {
     background-color: $bg-light-dark-mode !important;
 
     a,
     div {
-      color: $text-color-dark-mode !important;
+      color: $text-color-dark-mode;
     }
   }
 
-  .border,
-  .border-bottom,
-  .border-left,
-  .border-right {
+  .border {
     border-color: $border-color-dark-mode !important;
   }
 
-  .nav-link.active {
-    background-color: $bg-dark-mode;
-    color: $text-color-dark-mode;
-    border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode;
+  .border-right {
+    border-right: 1px solid $border-color-dark-mode !important;
   }
 
-  .nav-link:hover {
-    border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode;
+  .border-left {
+    border-left: 1px solid $border-color-dark-mode !important;
+  }
+
+  .border-bottom {
+    border-bottom: 1px solid $border-color-dark-mode !important;
+  }
+
+  .nav-link {
+    color: $text-color-dark-mode !important;
+
+    &.active {
+      background-color: $bg-dark-mode;
+      color: $text-color-dark-mode;
+      border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode;
+    }
+
+    &:hover {
+      color: $text-color-dark-mode-accent !important;
+      border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode;
+    }
   }
 
   .nav-tabs {
     border-color: $border-color-dark-mode;
+
+    .nav-link {
+      color: $primary-dark-mode !important;
+
+      &.active {
+        color: $text-color-dark-mode !important;
+      }
+    }
   }
 
   .dropdown-menu {
@@ -77,6 +108,10 @@ $border-color-dark-mode: #47494f;
     }
   }
 
+  .text-dark {
+    color: $text-color-dark-mode !important;
+  }
+
   .modal-content, .modal-header, .modal-body, .modal-footer {
     background-color: $bg-light-dark-mode;
     border-color: $border-color-dark-mode;
@@ -93,15 +128,20 @@ $border-color-dark-mode: #47494f;
 
   .doc-img-container {
     border: none !important;
-    border-radius: .25rem;
+    border-top-left-radius: .25rem;
+    border-top-right-radius: .25rem;
     overflow: hidden;
   }
 
   .doc-img {
     mix-blend-mode: normal;
     filter: invert(95%) hue-rotate(180deg);
-    border-color: $border-color-dark-mode;
     border-radius: 0;
+    border-color: $bg-dark-mode;
+
+    &.border-right {
+      border-right: none !important;
+    }
   }
 
   .card-selected .doc-img {
@@ -116,14 +156,23 @@ $border-color-dark-mode: #47494f;
     background-color: opacify($bg-dark-mode, .85);
   }
 
-  a:hover {
-    color: lighten($primary, 10%);
+  a {
+    color: $primary-dark-mode;
+
+    &:hover {
+      color: lighten($primary, 10%);
+    }
   }
 
   table {
-    background-color: $bg-dark-mode;
+    background-color: $bg-light-dark-mode;
     color: $text-color-dark-mode;
     border-color: $border-color-dark-mode;
+
+    tr:hover {
+      background-color: $bg-light-dark-mode;
+      color: $text-color-dark-mode-accent;
+    }
   }
 
   .table td,
@@ -136,6 +185,7 @@ $border-color-dark-mode: #47494f;
   }
 
   .close {
+    color: $text-color-dark-mode;
     text-shadow: 0 1px 0 #666;
   }
 
@@ -168,6 +218,15 @@ $border-color-dark-mode: #47494f;
     }
   }
 
+  .btn-outline-dark {
+    border-color: $border-color-dark-mode;
+    color: $text-color-dark-mode;
+
+    &:hover {
+      color: $text-color-dark-mode-accent;
+    }
+  }
+
   .btn-link:not(:disabled):not(.disabled) {
     color: $primary-dark-mode;
   }
@@ -254,6 +313,10 @@ $border-color-dark-mode: #47494f;
     border-color: $border-color-dark-mode;
     color: $text-color-dark-mode-accent;
   }
+
+  .progress {
+    background-color: $border-color-dark-mode;
+  }
 }
 
 body.dark-mode {

From 777d8b46097c4c606e7733702c4c1dd6b9b48fb3 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 28 Dec 2020 16:52:51 -0800
Subject: [PATCH 0470/1300] Fix bg color on large cards

---
 .../document-card-large/document-card-large.component.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index 729b02613..56047fc1e 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -1,4 +1,4 @@
-<div class="card mb-3 bg-light 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">
   <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">
       <img [src]="getThumbUrl()" class="card-img doc-img border-right rounded-left" (click)="setSelected(selectable ? !selected : false)">
@@ -12,7 +12,7 @@
 
     </div>
     <div class="col">
-      <div class="card-body">
+      <div class="card-body bg-light">
 
         <div class="d-flex justify-content-between align-items-center">
           <h5 class="card-title">

From d6285cc85147e7dfd9ee9bb9c9457971e9211392 Mon Sep 17 00:00:00 2001
From: Marco Aceti <mail@marcoaceti.it>
Date: Tue, 29 Dec 2020 01:57:46 +0100
Subject: [PATCH 0471/1300] Add libxslt-dev library to Dockerfile build

---
 docker/local/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index 9fc71abc7..4c35eec3a 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -22,6 +22,7 @@ RUN apt-get update \
 		libpq-dev \
 		libqpdf-dev \
 		libxml2 \
+		libxslt-dev \
 		optipng \
 		pngquant \
 		qpdf \

From 39d1c051cf7bddf515ea08d08c6de66ac77ecc46 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 02:25:39 +0100
Subject: [PATCH 0472/1300] use the actual name of the package #205

---
 docker/local/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index 4c35eec3a..1fd5e24fa 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update \
 		libpq-dev \
 		libqpdf-dev \
 		libxml2 \
-		libxslt-dev \
+		libxslt1-dev \
 		optipng \
 		pngquant \
 		qpdf \

From f770f0444a3f2415567a3ee6b468e965939b408d Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 28 Dec 2020 17:49:10 -0800
Subject: [PATCH 0473/1300] Fix hidden ng-select contents on focus

---
 src-ui/src/theme_dark.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index 7cb195911..1f8380bad 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -269,7 +269,7 @@ $border-color-dark-mode: #47494f;
     border-color: $border-color-dark-mode;
 
     input:focus {
-      background-color: $bg-dark-mode !important;
+      background-color: transparent !important;
     }
   }
 

From 4ecd5ada0661a1d256978c5d0d5b54b5db661f32 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 28 Dec 2020 19:07:12 -0800
Subject: [PATCH 0474/1300] Semantic correction

---
 src-ui/src/app/services/app-view.service.ts | 8 ++++----
 src-ui/src/index.html                       | 2 +-
 src-ui/src/theme_dark.scss                  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/app/services/app-view.service.ts b/src-ui/src/app/services/app-view.service.ts
index 33b47ce82..b44c8965f 100644
--- a/src-ui/src/app/services/app-view.service.ts
+++ b/src-ui/src/app/services/app-view.service.ts
@@ -19,11 +19,11 @@ export class AppViewService {
     let darkModeEnabled = JSON.parse(localStorage.getItem(GENERAL_SETTINGS.DARK_MODE_ENABLED)) || GENERAL_SETTINGS.DARK_MODE_ENABLED_DEFAULT
 
     if (darkModeUseSystem) {
-      this.renderer.addClass(this.document.body, 'dark-mode-preferred')
-      this.renderer.removeClass(this.document.body, 'dark-mode')
+      this.renderer.addClass(this.document.body, 'color-scheme-system')
+      this.renderer.removeClass(this.document.body, 'color-scheme-dark')
     } else {
-      this.renderer.removeClass(this.document.body, 'dark-mode-preferred')
-      darkModeEnabled ? this.renderer.addClass(this.document.body, 'dark-mode') : this.renderer.removeClass(this.document.body, 'dark-mode')
+      this.renderer.removeClass(this.document.body, 'color-scheme-system')
+      darkModeEnabled ? this.renderer.addClass(this.document.body, 'color-scheme-dark') : this.renderer.removeClass(this.document.body, 'dark-mode')
     }
 
   }
diff --git a/src-ui/src/index.html b/src-ui/src/index.html
index f6a313a48..b688b25b5 100644
--- a/src-ui/src/index.html
+++ b/src-ui/src/index.html
@@ -8,7 +8,7 @@
   <meta name="color-scheme" content="dark light">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
-<body>
+<body class="color-scheme-system">
   <app-root></app-root>
 </body>
 </html>
diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index 1f8380bad..a122f1d86 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -319,11 +319,11 @@ $border-color-dark-mode: #47494f;
   }
 }
 
-body.dark-mode {
+body.color-scheme-dark {
   @include dark-mode;
 }
-@media (prefers-color-scheme: dark) {
-  body.dark-mode-preferred {
+body.color-scheme-system {
+  @media (prefers-color-scheme: dark) {
     @include dark-mode;
   }
 }

From f964dd59353ae30f1c3e940a2938833211e8b6cb Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 12:26:41 +0100
Subject: [PATCH 0475/1300] added configuration option for the font #197 #207

---
 docs/configuration.rst        | 9 +++++++++
 paperless.conf.example        | 1 +
 src/paperless/settings.py     | 2 ++
 src/paperless_text/parsers.py | 6 +++---
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index efc1a9db1..5ccb80b3a 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -400,6 +400,15 @@ PAPERLESS_FILENAME_DATE_ORDER=<format>
 
     Defaults to none, which disables this feature.
 
+PAPERLESS_THUMBNAIL_FONT_NAME=<filename>
+    Paperless creates thumbnails for plain text files by rendering the content
+    of the file on an image and uses a predefined font for that. This
+    font can be changed here.
+
+    Note that this won't have any effect on already generated thumbnails.
+
+    Defaults to ``/usr/share/fonts/liberation/LiberationSerif-Regular.ttf``.
+
 
 Binaries
 ########
diff --git a/paperless.conf.example b/paperless.conf.example
index 910fc22a0..139453cf3 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -54,6 +54,7 @@
 #PAPERLESS_POST_CONSUME_SCRIPT=/path/to/an/arbitrary/script.sh
 #PAPERLESS_FILENAME_DATE_ORDER=YMD
 #PAPERLESS_FILENAME_PARSE_TRANSFORMS=[]
+#PAPERLESS_THUMBNAIL_FONT_NAME=
 
 # Binaries
 
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 0aa162739..5af1be85e 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -422,3 +422,5 @@ for t in json.loads(os.getenv("PAPERLESS_FILENAME_PARSE_TRANSFORMS", "[]")):
 # TODO: this should not have a prefix.
 # Specify the filename format for out files
 PAPERLESS_FILENAME_FORMAT = os.getenv("PAPERLESS_FILENAME_FORMAT")
+
+THUMBNAIL_FONT_NAME = os.getenv("PAPERLESS_THUMBNAIL_FONT_NAME", "/usr/share/fonts/liberation/LiberationSerif-Regular.ttf")
diff --git a/src/paperless_text/parsers.py b/src/paperless_text/parsers.py
index 030c2c2c2..a38bd7a91 100644
--- a/src/paperless_text/parsers.py
+++ b/src/paperless_text/parsers.py
@@ -1,10 +1,9 @@
 import os
-import subprocess
 
 from PIL import ImageDraw, ImageFont, Image
 from django.conf import settings
 
-from documents.parsers import DocumentParser, ParseError
+from documents.parsers import DocumentParser
 
 
 class TextDocumentParser(DocumentParser):
@@ -23,7 +22,8 @@ class TextDocumentParser(DocumentParser):
         img = Image.new("RGB", (500, 700), color="white")
         draw = ImageDraw.Draw(img)
         font = ImageFont.truetype(
-            "/usr/share/fonts/liberation/LiberationSerif-Regular.ttf", 20,
+            font=settings.THUMBNAIL_FONT_NAME,
+            size=20,
             layout_engine=ImageFont.LAYOUT_BASIC)
         draw.text((5, 5), read_text(), font=font, fill="black")
 

From b2327d6fde161b0a22f245c795273f1689572361 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 17:09:07 +0100
Subject: [PATCH 0476/1300] more settings

---
 .../filterable-dropdown.component.ts          |  10 +-
 .../bulk-editor/bulk-editor.component.html    |   3 +
 .../bulk-editor/bulk-editor.component.ts      | 134 +++++++++++-------
 .../manage/settings/settings.component.html   |   7 +
 .../manage/settings/settings.component.ts     |  13 +-
 src-ui/src/app/data/storage-keys.ts           |   5 -
 .../services/document-list-view.service.ts    |   9 +-
 .../src/app/services/settings.service.spec.ts |  16 +++
 src-ui/src/app/services/settings.service.ts   |  60 ++++++++
 9 files changed, 194 insertions(+), 63 deletions(-)
 create mode 100644 src-ui/src/app/services/settings.service.spec.ts
 create mode 100644 src-ui/src/app/services/settings.service.ts

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 06b2333d5..0e075ff19 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -195,6 +195,9 @@ export class FilterableDropdownComponent {
   @Input()
   editing = false
 
+  @Input()
+  applyOnClose = false
+
   @Output()
   apply = new EventEmitter<ChangedItems>()
 
@@ -208,7 +211,9 @@ export class FilterableDropdownComponent {
   applyClicked() {
     if (this.selectionModel.isDirty()) {
       this.dropdown.close()
-      this.apply.emit(this.selectionModel.diff())
+      if (!this.applyOnClose) {
+        this.apply.emit(this.selectionModel.diff())
+      }
     }
   }
 
@@ -223,6 +228,9 @@ export class FilterableDropdownComponent {
       this.open.next()
     } else {
       this.filterText = ''
+      if (this.applyOnClose && this.selectionModel.isDirty()) {
+        this.apply.emit(this.selectionModel.diff())
+      }
     }
   }
 
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index e08d50c47..62a2bb95d 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -30,6 +30,7 @@
         [items]="tags"
         [editing]="true"
         [multiple]="true"
+        [applyOnClose]="applyOnClose"
         (open)="openTagsDropdown()"
         [(selectionModel)]="tagSelectionModel"
         (apply)="setTags($event)">
@@ -37,6 +38,7 @@
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill"
         [items]="correspondents"
         [editing]="true"
+        [applyOnClose]="applyOnClose"
         (open)="openCorrespondentDropdown()"
         [(selectionModel)]="correspondentSelectionModel"
         (apply)="setCorrespondents($event)">
@@ -44,6 +46,7 @@
       <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill"
         [items]="documentTypes"
         [editing]="true"
+        [applyOnClose]="applyOnClose"
         (open)="openDocumentTypeDropdown()"
         [(selectionModel)]="documentTypeSelectionModel"
         (apply)="setDocumentTypes($event)">
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index f8520b84d..64b84b47a 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -15,6 +15,7 @@ import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog
 import { ChangedItems, FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component';
 import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
 import { MatchingModel } from 'src/app/data/matching-model';
+import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service';
 
 @Component({
   selector: 'app-bulk-editor',
@@ -38,9 +39,13 @@ export class BulkEditorComponent {
     public list: DocumentListViewService,
     private documentService: DocumentService,
     private modalService: NgbModal,
-    private openDocumentService: OpenDocumentsService
+    private openDocumentService: OpenDocumentsService,
+    private settings: SettingsService
   ) { }
 
+  applyOnClose: boolean = this.settings.get(SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE)
+  showConfirmationDialogs: boolean = this.settings.get(SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS)
+
   ngOnInit() {
     this.tagService.listAll().subscribe(result => this.tags = result.results)
     this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
@@ -54,7 +59,6 @@ export class BulkEditorComponent {
         this.list.selected.forEach(id => {
           this.openDocumentService.refreshDocument(id)
         })
-        this.list.selectNone()
       })
     )
   }
@@ -105,30 +109,40 @@ export class BulkEditorComponent {
   setTags(changedTags: ChangedItems) {
     if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 0) return
 
-    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = $localize`Confirm tags assignment`
-    if (changedTags.itemsToAdd.length == 1 && changedTags.itemsToRemove.length == 0) {
-      let tag = changedTags.itemsToAdd[0]
-      modal.componentInstance.message = $localize`This operation will add the tag ${tag.name} to all ${this.list.selected.size} selected document(s).`
-    } else if (changedTags.itemsToAdd.length > 1 && changedTags.itemsToRemove.length == 0) {
-      modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} to all ${this.list.selected.size} selected document(s).`
-    } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 1) {
-      let tag = changedTags.itemsToAdd[0]
-      modal.componentInstance.message = $localize`This operation will remove the tag ${tag.name} from all ${this.list.selected.size} selected document(s).`
-    } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length > 1) {
-      modal.componentInstance.message = $localize`This operation will remove the tags ${this._localizeList(changedTags.itemsToRemove)} from all ${this.list.selected.size} selected document(s).`
+    if (this.showConfirmationDialogs) {
+      let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+      modal.componentInstance.title = $localize`Confirm tags assignment`
+      if (changedTags.itemsToAdd.length == 1 && changedTags.itemsToRemove.length == 0) {
+        let tag = changedTags.itemsToAdd[0]
+        modal.componentInstance.message = $localize`This operation will add the tag ${tag.name} to all ${this.list.selected.size} selected document(s).`
+      } else if (changedTags.itemsToAdd.length > 1 && changedTags.itemsToRemove.length == 0) {
+        modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} to all ${this.list.selected.size} selected document(s).`
+      } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 1) {
+        let tag = changedTags.itemsToAdd[0]
+        modal.componentInstance.message = $localize`This operation will remove the tag ${tag.name} from all ${this.list.selected.size} selected document(s).`
+      } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length > 1) {
+        modal.componentInstance.message = $localize`This operation will remove the tags ${this._localizeList(changedTags.itemsToRemove)} from all ${this.list.selected.size} selected document(s).`
+      } else {
+        modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} and remove the tags ${this._localizeList(changedTags.itemsToRemove)} on all ${this.list.selected.size} selected document(s).`
+      }
+      
+      modal.componentInstance.btnClass = "btn-warning"
+      modal.componentInstance.btnCaption = $localize`Confirm`
+      modal.componentInstance.confirmClicked.subscribe(() => {
+        this.performSetTags(modal, changedTags)
+      })
     } else {
-      modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} and remove the tags ${this._localizeList(changedTags.itemsToRemove)} on all ${this.list.selected.size} selected document(s).`
+      this.performSetTags(null, changedTags)
     }
-    
-    modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = $localize`Confirm`
-    modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('modify_tags', {"add_tags": changedTags.itemsToAdd.map(t => t.id), "remove_tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe(
-        response => {
-          this.tagService.clearCache()
+  }
+
+  private performSetTags(modal, changedTags: ChangedItems) {
+    this.executeBulkOperation('modify_tags', {"add_tags": changedTags.itemsToAdd.map(t => t.id), "remove_tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe(
+      response => {
+        this.tagService.clearCache()
+        if (modal) {
           modal.close()
-        })
+        }
       }
     )
   }
@@ -136,47 +150,69 @@ export class BulkEditorComponent {
   setCorrespondents(changedCorrespondents: ChangedItems) {
     if (changedCorrespondents.itemsToAdd.length == 0 && changedCorrespondents.itemsToRemove.length == 0) return
 
-    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = $localize`Confirm correspondent assignment`
     let correspondent = changedCorrespondents.itemsToAdd.length > 0 ? changedCorrespondents.itemsToAdd[0] : null
-    if (correspondent) {
-      modal.componentInstance.message = $localize`This operation will assign the correspondent ${correspondent.name} to all ${this.list.selected.size} selected document(s).`
+
+    if (this.showConfirmationDialogs) {
+      let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+      modal.componentInstance.title = $localize`Confirm correspondent assignment`
+      if (correspondent) {
+        modal.componentInstance.message = $localize`This operation will assign the correspondent ${correspondent.name} to all ${this.list.selected.size} selected document(s).`
+      } else {
+        modal.componentInstance.message = $localize`This operation will remove the correspondent from all ${this.list.selected.size} selected document(s).`
+      }
+      modal.componentInstance.btnClass = "btn-warning"
+      modal.componentInstance.btnCaption = $localize`Confirm`
+      modal.componentInstance.confirmClicked.subscribe(() => {
+        this.performSetCorrespondents(modal, correspondent)
+      })
     } else {
-      modal.componentInstance.message = $localize`This operation will remove the correspondent from all ${this.list.selected.size} selected document(s).`
+      this.performSetCorrespondents(null, correspondent)
     }
-    modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = $localize`Confirm`
-    modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
-        response => {
-          this.correspondentService.clearCache()
+  }
+
+  private performSetCorrespondents(modal, correspondent: MatchingModel) {
+    this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
+      response => {
+        this.correspondentService.clearCache()
+        if (modal) {
           modal.close()
         }
-      )
-    })
+      }
+    )
   }
 
   setDocumentTypes(changedDocumentTypes: ChangedItems) {
     if (changedDocumentTypes.itemsToAdd.length == 0 && changedDocumentTypes.itemsToRemove.length == 0) return
 
-    let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.title = $localize`Confirm document type assignment`
     let documentType = changedDocumentTypes.itemsToAdd.length > 0 ? changedDocumentTypes.itemsToAdd[0] : null
-    if (documentType) {
-      modal.componentInstance.message = $localize`This operation will assign the document type ${documentType.name} to all ${this.list.selected.size} selected document(s).`
+
+    if (this.showConfirmationDialogs) {
+      let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
+      modal.componentInstance.title = $localize`Confirm document type assignment`
+      if (documentType) {
+        modal.componentInstance.message = $localize`This operation will assign the document type ${documentType.name} to all ${this.list.selected.size} selected document(s).`
+      } else {
+        modal.componentInstance.message = $localize`This operation will remove the document type from all ${this.list.selected.size} selected document(s).`
+      }
+      modal.componentInstance.btnClass = "btn-warning"
+      modal.componentInstance.btnCaption = $localize`Confirm`
+      modal.componentInstance.confirmClicked.subscribe(() => {
+        this.performSetDocumentTypes(modal, documentType)
+      })
     } else {
-      modal.componentInstance.message = $localize`This operation will remove the document type from all ${this.list.selected.size} selected document(s).`
+      this.performSetDocumentTypes(null, documentType)
     }
-    modal.componentInstance.btnClass = "btn-warning"
-    modal.componentInstance.btnCaption = $localize`Confirm`
-    modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
-        response => {
-          this.documentService.clearCache()
+  }
+
+  private performSetDocumentTypes(modal, documentType) {
+    this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
+      response => {
+        this.documentTypeService.clearCache()
+        if (modal) {
           modal.close()
         }
-      )
-    })
+      }
+    )
   }
 
   applyDelete() {
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 6c16cfaa8..1f5374dba 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -26,8 +26,15 @@
             </select>
         
           </div>
+
+  
         </div>
 
+        <h4 i18n>Bulk editing</h4>
+
+        <app-input-check i18n-title title="Show confirmation dialogs" formControlName="bulkEditConfirmationDialogs" i18n-hint hint="Deleting documents will always ask for confirmation."></app-input-check>
+        <app-input-check i18n-title title="Apply on close" formControlName="bulkEditApplyOnClose"></app-input-check>
+
       </ng-template>
     </li>
     <li [ngbNavItem]="2">
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index a90966bb9..c26c63384 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
-import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
+import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service';
 import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
@@ -16,14 +16,17 @@ export class SettingsComponent implements OnInit {
   savedViewGroup = new FormGroup({})
 
   settingsForm = new FormGroup({
-    'documentListItemPerPage': new FormControl(+localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT),
+    'bulkEditConfirmationDialogs': new FormControl(this.settings.get(SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS)),
+    'bulkEditApplyOnClose': new FormControl(this.settings.get(SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE)),
+    'documentListItemPerPage': new FormControl(this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)),
     'savedViews': this.savedViewGroup
   })
 
   constructor(
     public savedViewService: SavedViewService,
     private documentListViewService: DocumentListViewService,
-    private toastService: ToastService
+    private toastService: ToastService,
+    private settings: SettingsService
   ) { }
 
   savedViews: PaperlessSavedView[]
@@ -51,7 +54,9 @@ export class SettingsComponent implements OnInit {
   }
 
   private saveLocalSettings() {
-    localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
+    this.settings.set(SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, this.settingsForm.value.bulkEditApplyOnClose)
+    this.settings.set(SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS, this.settingsForm.value.bulkEditConfirmationDialogs)
+    this.settings.set(SETTINGS_KEYS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
     this.documentListViewService.updatePageSize()
     this.toastService.showInfo($localize`Settings saved successfully.`)
   }
diff --git a/src-ui/src/app/data/storage-keys.ts b/src-ui/src/app/data/storage-keys.ts
index 13b41d4a7..ec91c06ac 100644
--- a/src-ui/src/app/data/storage-keys.ts
+++ b/src-ui/src/app/data/storage-keys.ts
@@ -5,8 +5,3 @@ export const OPEN_DOCUMENT_SERVICE = {
 export const DOCUMENT_LIST_SERVICE = {
   CURRENT_VIEW_CONFIG: 'document-list-service:currentViewConfig'
 }
-
-export const GENERAL_SETTINGS = {
-  DOCUMENT_LIST_SIZE: 'general-settings:documentListSize',
-  DOCUMENT_LIST_SIZE_DEFAULT: 50
-}
\ No newline at end of file
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index b148d4087..ab78d78b1 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -3,8 +3,9 @@ import { Observable } from 'rxjs';
 import { cloneFilterRules, FilterRule } from '../data/filter-rule';
 import { PaperlessDocument } from '../data/paperless-document';
 import { PaperlessSavedView } from '../data/paperless-saved-view';
-import { DOCUMENT_LIST_SERVICE, GENERAL_SETTINGS } from '../data/storage-keys';
+import { DOCUMENT_LIST_SERVICE } from '../data/storage-keys';
 import { DocumentService } from './rest/document.service';
+import { SettingsService, SETTINGS_KEYS } from './settings.service';
 
 
 /**
@@ -23,7 +24,7 @@ export class DocumentListViewService {
   isReloading: boolean = false
   documents: PaperlessDocument[] = []
   currentPage = 1
-  currentPageSize: number = +localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT
+  currentPageSize: number = this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)
   collectionSize: number
 
   /**
@@ -190,7 +191,7 @@ export class DocumentListViewService {
   }
 
   updatePageSize() {
-    let newPageSize = +localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT
+    let newPageSize = this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)
     if (newPageSize != this.currentPageSize) {
       this.currentPageSize = newPageSize
     }
@@ -239,7 +240,7 @@ export class DocumentListViewService {
     }
   }
 
-  constructor(private documentService: DocumentService) {
+  constructor(private documentService: DocumentService, private settings: SettingsService) {
     let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
     if (documentListViewConfigJson) {
       try {
diff --git a/src-ui/src/app/services/settings.service.spec.ts b/src-ui/src/app/services/settings.service.spec.ts
new file mode 100644
index 000000000..359cb6b7a
--- /dev/null
+++ b/src-ui/src/app/services/settings.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { SettingsService } from './settings.service';
+
+describe('SettingsService', () => {
+  let service: SettingsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(SettingsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
new file mode 100644
index 000000000..00e6ff639
--- /dev/null
+++ b/src-ui/src/app/services/settings.service.ts
@@ -0,0 +1,60 @@
+import { Injectable } from '@angular/core';
+
+export interface PaperlessSettings {
+  key: string
+  type: string
+  default: any
+}
+
+export const SETTINGS_KEYS = {
+  BULK_EDIT_CONFIRMATION_DIALOGS: 'general-settings:bulk-edit:confirmation-dialogs',
+  BULK_EDIT_APPLY_ON_CLOSE: 'general-settings:bulk-edit:apply-on-close',
+  DOCUMENT_LIST_SIZE: 'general-settings:documentListSize',
+}
+
+const SETTINGS: PaperlessSettings[] = [
+  {key: SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS, type: "boolean", default: true},
+  {key: SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, type: "boolean", default: false},
+  {key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, type: "number", default: 50}
+]
+
+@Injectable({
+  providedIn: 'root'
+})
+export class SettingsService {
+
+  constructor() { }
+
+  get(key: string): any {
+    let setting = SETTINGS.find(s => s.key == key)
+
+    if (!setting) {
+      return null
+    }
+
+    let value = localStorage.getItem(key)
+
+    if (value != null) {
+      switch (setting.type) {
+        case "boolean":
+          return JSON.parse(value)
+        case "number":
+          return +value
+        case "string":
+          return value
+        default:
+          return value
+      }
+    } else {
+      return setting.default
+    }
+  }
+
+  set(key: string, value: any) {
+    localStorage.setItem(key, value.toString())
+  }
+
+  unset(key: string) {
+    localStorage.removeItem(key)
+  }
+}

From 7f4cfc0b76496ab60da4bf85ef2b1462e4197095 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 17:20:45 +0100
Subject: [PATCH 0477/1300] fix a couple issues with the bulk editor

---
 .../document-list/bulk-editor/bulk-editor.component.ts      | 6 ++----
 src-ui/src/app/services/document-list-view.service.ts       | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 64b84b47a..88efcee06 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -56,6 +56,7 @@ export class BulkEditorComponent {
     return this.documentService.bulkEdit(Array.from(this.list.selected), method, args).pipe(
       tap(() => {
         this.list.reload()
+        this.list.reduceSelectionToFilter()
         this.list.selected.forEach(id => {
           this.openDocumentService.refreshDocument(id)
         })
@@ -118,7 +119,7 @@ export class BulkEditorComponent {
       } else if (changedTags.itemsToAdd.length > 1 && changedTags.itemsToRemove.length == 0) {
         modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} to all ${this.list.selected.size} selected document(s).`
       } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 1) {
-        let tag = changedTags.itemsToAdd[0]
+        let tag = changedTags.itemsToRemove[0]
         modal.componentInstance.message = $localize`This operation will remove the tag ${tag.name} from all ${this.list.selected.size} selected document(s).`
       } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length > 1) {
         modal.componentInstance.message = $localize`This operation will remove the tags ${this._localizeList(changedTags.itemsToRemove)} from all ${this.list.selected.size} selected document(s).`
@@ -139,7 +140,6 @@ export class BulkEditorComponent {
   private performSetTags(modal, changedTags: ChangedItems) {
     this.executeBulkOperation('modify_tags', {"add_tags": changedTags.itemsToAdd.map(t => t.id), "remove_tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe(
       response => {
-        this.tagService.clearCache()
         if (modal) {
           modal.close()
         }
@@ -173,7 +173,6 @@ export class BulkEditorComponent {
   private performSetCorrespondents(modal, correspondent: MatchingModel) {
     this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
       response => {
-        this.correspondentService.clearCache()
         if (modal) {
           modal.close()
         }
@@ -207,7 +206,6 @@ export class BulkEditorComponent {
   private performSetDocumentTypes(modal, documentType) {
     this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
       response => {
-        this.documentTypeService.clearCache()
         if (modal) {
           modal.close()
         }
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index ab78d78b1..dfcf9c0c5 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -203,7 +203,7 @@ export class DocumentListViewService {
     this.selected.clear()
   }
 
-  private reduceSelectionToFilter() {
+  reduceSelectionToFilter() {
     if (this.selected.size > 0) {
       this.documentService.listAllFilteredIds(this.filterRules).subscribe(ids => {
         let subset = new Set<number>()

From 2b341afcaef82accf97871f82302866e6931c1bf Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 17:32:56 +0100
Subject: [PATCH 0478/1300] fix some bugs with the filter editor

---
 .../filter-editor/filter-editor.component.ts             | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index d4cac1a9d..de6d724bc 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -80,13 +80,16 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
           this.dateAddedBefore = rule.value
           break
         case FILTER_HAS_TAG:
-          this.tagSelectionModel.set(+rule.value, ToggleableItemState.Selected, false)
+          this.tagSelectionModel.set(rule.value ? +rule.value : null, ToggleableItemState.Selected, false)
+          break
+        case FILTER_HAS_ANY_TAG:
+          this.tagSelectionModel.set(null, ToggleableItemState.Selected, false)
           break
         case FILTER_CORRESPONDENT:
-          this.correspondentSelectionModel.set(+rule.value, ToggleableItemState.Selected, false)
+          this.correspondentSelectionModel.set(rule.value ? +rule.value : null, ToggleableItemState.Selected, false)
           break
         case FILTER_DOCUMENT_TYPE:
-          this.documentTypeSelectionModel.set(+rule.value, ToggleableItemState.Selected, false)
+          this.documentTypeSelectionModel.set(rule.value ? +rule.value : null, ToggleableItemState.Selected, false)
           break
       }
     })

From 5c3ae44021c284f93a74cc41857a2dd8fb5710c6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 18:23:08 +0100
Subject: [PATCH 0479/1300] fix up gunicorn conf

---
 docker/gunicorn.conf.py | 2 +-
 docker/supervisord.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/gunicorn.conf.py b/docker/gunicorn.conf.py
index 88d881664..5c9c0eb37 100644
--- a/docker/gunicorn.conf.py
+++ b/docker/gunicorn.conf.py
@@ -1,4 +1,4 @@
-bind = '[::]:8000'
+bind = ['[::]:8000', 'localhost:8000']
 backlog = 2048
 workers = 3
 worker_class = 'sync'
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
index ff3ed4311..9b97b6825 100644
--- a/docker/supervisord.conf
+++ b/docker/supervisord.conf
@@ -8,7 +8,7 @@ loglevel=info                ; log level; default info; others: debug,warn,trace
 user=root
 
 [program:gunicorn]
-command=gunicorn -c /usr/src/paperless/gunicorn.conf.py -b '[::]:8000' paperless.wsgi
+command=gunicorn -c /usr/src/paperless/gunicorn.conf.py paperless.wsgi
 user=paperless
 
 stdout_logfile=/dev/stdout

From 6581cff8dc241f0ba3bb01b1ed4dfa1e3a41eb2f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 20:55:27 +0100
Subject: [PATCH 0480/1300] more tests

---
 src/documents/tests/test_api.py | 48 +++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index adc947a1a..dbe8f881c 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -847,6 +847,21 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         self.assertEqual(args[0], [self.doc1.id])
         self.assertEqual(kwargs['tag'], self.t1.id)
 
+    @mock.patch("documents.serialisers.bulk_edit.modify_tags")
+    def test_api_modify_tags(self, m):
+        m.return_value = "OK"
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc1.id, self.doc3.id],
+            "method": "modify_tags",
+            "parameters": {"add_tags": [self.t1.id], "remove_tags": [self.t2.id]}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+        m.assert_called_once()
+        args, kwargs = m.call_args
+        self.assertListEqual(args[0], [self.doc1.id, self.doc3.id])
+        self.assertEqual(kwargs['add_tags'], [self.t1.id])
+        self.assertEqual(kwargs['remove_tags'], [self.t2.id])
+
     @mock.patch("documents.serialisers.bulk_edit.delete")
     def test_api_delete(self, m):
         m.return_value = "OK"
@@ -927,6 +942,38 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
 
         self.assertEqual(list(self.doc2.tags.all()), [self.t1])
 
+    def test_api_modify_invalid_tags(self):
+        self.assertEqual(list(self.doc2.tags.all()), [self.t1])
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc2.id],
+            "method": "modify_tags",
+            "parameters": {'add_tags': [self.t2.id, 1657], "remove_tags": [1123123]}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+
+    def test_api_selection_data_empty(self):
+        response = self.client.post("/api/documents/selection_data/", json.dumps({
+            "documents": []
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+        for field, Entity in [('selected_correspondents', Correspondent), ('selected_tags', Tag), ('selected_document_types', DocumentType)]:
+            self.assertEqual(len(response.data[field]), Entity.objects.count())
+            for correspondent in response.data[field]:
+                self.assertEqual(correspondent['document_count'], 0)
+            self.assertCountEqual(
+                map(lambda c: c['id'], response.data[field]),
+                map(lambda c: c['id'], Entity.objects.values('id')))
+
+    def test_api_selection_data(self):
+        response = self.client.post("/api/documents/selection_data/", json.dumps({
+            "documents": [self.doc1.id, self.doc2.id, self.doc4.id, self.doc5.id]
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+
+        self.assertCountEqual(response.data['selected_correspondents'], [{"id": self.c1.id, "document_count": 1}, {"id": self.c2.id, "document_count": 0}])
+        self.assertCountEqual(response.data['selected_tags'], [{"id": self.t1.id, "document_count": 2}, {"id": self.t2.id, "document_count": 1}])
+        self.assertCountEqual(response.data['selected_document_types'], [{"id": self.c1.id, "document_count": 1}, {"id": self.c2.id, "document_count": 0}])
+
 
 class TestApiAuth(APITestCase):
 
@@ -951,3 +998,4 @@ class TestApiAuth(APITestCase):
         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/documents/bulk_edit/").status_code, 401)
+        self.assertEqual(self.client.get("/api/documents/selection_data/").status_code, 401)

From bf3ffc29a9aee03a160612032fd78f31226732bb Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Tue, 29 Dec 2020 20:59:49 +0100
Subject: [PATCH 0481/1300] Make role compatible with ansible 2.7

Recursive remote copy is supported starting with 2.8 only
Indentation behaviour in literal yaml strings seems to have changed
Regex logic for ImageMagic was flawed (no idea why this worked before)
---
 ansible/tasks/main.yml | 69 +++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index c94534895..b1932a33c 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -28,6 +28,7 @@
       - pngquant
       - zlib1g
       # dev
+      - sudo
       - build-essential
       - python3-setuptools
       - python3-wheel
@@ -122,23 +123,19 @@
     dest: "{{ tempdir.path }}"
   when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
 
-- name: change permissions of paperless-ng
+- name: change owner and permissions of paperless-ng
   command:
     cmd: "{{ item }}"
+    warn: false
   with_items:
+  - "chown -R {{ paperlessng_system_user }}:{{ paperlessng_system_group }} {{ tempdir.path }}"
   - "find {{ tempdir.path }} -type d -exec chmod 0750 {} ;"
   - "find {{ tempdir.path }} -type f -exec chmod 0640 {} ;"
   when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
 
 - name: move paperless-ng
-  copy:
-    src: "{{ tempdir.path }}/paperless-ng/"
-    remote_src: yes
-    dest: "{{ paperlessng_directory }}"
-    owner: "{{ paperlessng_system_user }}"
-    group: "{{ paperlessng_system_group }}"
-    mode: preserve
-    directory_mode: preserve
+  command:
+    cmd: "cp -a {{ tempdir.path }}/paperless-ng/ {{ paperlessng_directory }}"
   when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
 
 - name: remove temporary directory
@@ -256,30 +253,31 @@
   become: yes
   become_user: "{{ paperlessng_system_user }}"
   # "manage.py createsuperuser" only works on interactive TTYs
+  vars:
+    creation_script: |
+      from django.contrib.auth.models import User
+      from django.contrib.auth.hashers import get_hasher
+
+      if User.objects.filter(username='{{ paperlessng_superuser_name }}').exists():
+          user = User.objects.get(username='{{ paperlessng_superuser_name }}')
+          old = user.__dict__.copy()
+
+          user.is_superuser = True
+          user.email = '{{ paperlessng_superuser_email }}'
+          user.set_password('{{ paperlessng_superuser_password }}')
+          user.save()
+          new = user.__dict__
+
+          algorithm, iterations, old_salt, old_hash = old['password'].split('$')
+          new_password_old_salt = get_hasher(algorithm).encode(password='{{ paperlessng_superuser_password }}', salt=old_salt, iterations=int(iterations))
+          _, _, _, new_hash = new_password_old_salt.split('$')
+          if not (old_hash == new_hash and old['is_superuser'] == new['is_superuser'] and old['email'] == new['email']):
+              print('changed')
+      else:
+          User.objects.create_superuser('{{ paperlessng_superuser_name }}', '{{ paperlessng_superuser_email }}', '{{ paperlessng_superuser_password }}')
+          print('changed')
   command: |
-    {{ paperlessng_virtualenv }}/bin/python3 manage.py shell -c "
-    from django.contrib.auth.models import User
-    from django.contrib.auth.hashers import get_hasher
-
-    if User.objects.filter(username='{{ paperlessng_superuser_name }}').exists():
-        user = User.objects.get(username='{{ paperlessng_superuser_name }}')
-        old = user.__dict__.copy()
-
-        user.is_superuser = True
-        user.email = '{{ paperlessng_superuser_email }}'
-        user.set_password('{{ paperlessng_superuser_password }}')
-        user.save()
-        new = user.__dict__
-
-        algorithm, iterations, old_salt, old_hash = old['password'].split('$')
-        new_password_old_salt = get_hasher(algorithm).encode(password='{{ paperlessng_superuser_password }}', salt=old_salt, iterations=int(iterations))
-        _, _, _, new_hash = new_password_old_salt.split('$')
-        if not (old_hash == new_hash and old['is_superuser'] == new['is_superuser'] and old['email'] == new['email']):
-            print('changed')
-    else:
-        User.objects.create_superuser('{{ paperlessng_superuser_name }}', '{{ paperlessng_superuser_email }}', '{{ paperlessng_superuser_password }}')
-        print('changed')
-    "
+    {{ paperlessng_virtualenv }}/bin/python3 manage.py shell -c "{{ creation_script }}"
   args:
     chdir: "{{ paperlessng_directory }}/src"
   register: superuser
@@ -298,9 +296,10 @@
 
 - name: configure ghostscript for PDF
   lineinfile:
-    path: "/etc/ImageMagick-6/policy.xml"
-    regexp: '<policy domain="coder" rights="none" pattern="PDF" />'
-    line: '<policy domain="coder" rights="read|write" pattern="PDF" />'
+    path: /etc/ImageMagick-6/policy.xml
+    regexp: '(\s+)<policy domain="coder" rights=".*" pattern="PDF" />'
+    line: '\1<policy domain="coder" rights="read|write" pattern="PDF" />'
+    backrefs: yes
 
 - name: configure systemd services
   ini_file:

From e24b40de2919febda07085a34e774ba59dcd3139 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 21:01:18 +0100
Subject: [PATCH 0482/1300] more tests

---
 src/documents/tests/test_tasks.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/documents/tests/test_tasks.py b/src/documents/tests/test_tasks.py
index 6d04e58e1..653590707 100644
--- a/src/documents/tests/test_tasks.py
+++ b/src/documents/tests/test_tasks.py
@@ -1,10 +1,12 @@
 from datetime import datetime
+from unittest import mock
 
 from django.test import TestCase
 from django.utils import timezone
 
 from documents import tasks
 from documents.models import Document
+from documents.sanity_checker import SanityError, SanityFailedError
 from documents.tests.utils import DirectoriesMixin
 
 
@@ -22,3 +24,19 @@ class TestTasks(DirectoriesMixin, TestCase):
 
     def test_train_classifier(self):
         tasks.train_classifier()
+
+    @mock.patch("documents.tasks.sanity_checker.check_sanity")
+    def test_sanity_check(self, m):
+        m.return_value = []
+        tasks.sanity_check()
+        m.assert_called_once()
+        m.reset_mock()
+        m.return_value = [SanityError("")]
+        self.assertRaises(SanityFailedError, tasks.sanity_check)
+        m.assert_called_once()
+
+    def test_culk_update_documents(self):
+        doc1 = Document.objects.create(title="test", content="my document", checksum="wow", added=timezone.now(),
+                                created=timezone.now(), modified=timezone.now())
+
+        tasks.bulk_update_documents([doc1.pk])

From d690b34ee078a4d968eb906d12a1f7f4b33a21ba Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 21:02:45 +0100
Subject: [PATCH 0483/1300] added invalid PDF document with BOM marker

---
 src/documents/tests/samples/test_with_bom.pdf | Bin 0 -> 16109 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/documents/tests/samples/test_with_bom.pdf

diff --git a/src/documents/tests/samples/test_with_bom.pdf b/src/documents/tests/samples/test_with_bom.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..c4a46701cfe54cc12affb0e66f362daca6de5af0
GIT binary patch
literal 16109
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

literal 0
HcmV?d00001


From b8e8bf3dd47d738f2e4c8ca67f14b6e8131071dc Mon Sep 17 00:00:00 2001
From: Jo Vandeginste <Jo.Vandeginste@kuleuven.be>
Date: Tue, 29 Dec 2020 01:23:40 +0100
Subject: [PATCH 0484/1300] Add the new paperless_tika parser

This parser will use an external Tika and Gotenberg server to parse
"Office" documents (.doc, .xls, .odt, etc.)

Signed-off-by: Jo Vandeginste <Jo.Vandeginste@kuleuven.be>
---
 Pipfile                              |   1 +
 docker/hub/docker-compose.tika.yml   |  43 ++++++++++
 docker/local/docker-compose.tika.yml |  43 ++++++++++
 docs/configuration.rst               |  29 +++++++
 src/paperless/settings.py            |   5 ++
 src/paperless_tika/apps.py           |  14 ++++
 src/paperless_tika/parsers.py        | 118 +++++++++++++++++++++++++++
 src/paperless_tika/signals.py        |  20 +++++
 src/paperless_tika/test.py           |   3 +
 9 files changed, 276 insertions(+)
 create mode 100644 docker/hub/docker-compose.tika.yml
 create mode 100644 docker/local/docker-compose.tika.yml
 create mode 100644 src/paperless_tika/apps.py
 create mode 100644 src/paperless_tika/parsers.py
 create mode 100644 src/paperless_tika/signals.py
 create mode 100644 src/paperless_tika/test.py

diff --git a/Pipfile b/Pipfile
index 48759307c..f6301b98f 100644
--- a/Pipfile
+++ b/Pipfile
@@ -42,6 +42,7 @@ whoosh="~=2.7.4"
 inotifyrecursive = "~=0.3.4"
 ocrmypdf = "*"
 tqdm = "*"
+tika = "*"
 
 [dev-packages]
 coveralls = "*"
diff --git a/docker/hub/docker-compose.tika.yml b/docker/hub/docker-compose.tika.yml
new file mode 100644
index 000000000..04dd3260e
--- /dev/null
+++ b/docker/hub/docker-compose.tika.yml
@@ -0,0 +1,43 @@
+version: "3.4"
+services:
+  broker:
+    image: redis:6.0
+    restart: always
+
+  webserver:
+    image: jonaswinkler/paperless-ng:0.9.9
+    restart: always
+    depends_on:
+      - broker
+    ports:
+      - 8000:8000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - data:/usr/src/paperless/data
+      - media:/usr/src/paperless/media
+      - ./export:/usr/src/paperless/export
+      - ./consume:/usr/src/paperless/consume
+    env_file: docker-compose.env
+    environment:
+      PAPERLESS_REDIS: redis://broker:6379
+      PAPERLESS_TIKA: 1
+      GOTENBERG_SERVER_ENDPOINT: http://gotenberg:3000
+      TIKA_SERVER_ENDPOINT: http://tika:9998
+
+  gotenberg:
+    image: thecodingmachine/gotenberg
+    restart: unless-stopped
+    environment:
+      DISABLE_GOOGLE_CHROME: 1
+
+  tika:
+    image: apache/tika
+    restart: unless-stopped
+
+volumes:
+  data:
+  media:
diff --git a/docker/local/docker-compose.tika.yml b/docker/local/docker-compose.tika.yml
new file mode 100644
index 000000000..ab901f306
--- /dev/null
+++ b/docker/local/docker-compose.tika.yml
@@ -0,0 +1,43 @@
+version: "3.4"
+services:
+  broker:
+    image: redis:6.0
+    restart: always
+
+  webserver:
+    build: .
+    restart: always
+    depends_on:
+      - broker
+    ports:
+      - 8000:8000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - data:/usr/src/paperless/data
+      - media:/usr/src/paperless/media
+      - ./export:/usr/src/paperless/export
+      - ./consume:/usr/src/paperless/consume
+    env_file: docker-compose.env
+    environment:
+      PAPERLESS_REDIS: redis://broker:6379
+      PAPERLESS_TIKA: 1
+      GOTENBERG_SERVER_ENDPOINT: http://gotenberg:3000
+      TIKA_SERVER_ENDPOINT: http://tika:9998
+
+  gotenberg:
+    image: thecodingmachine/gotenberg
+    restart: unless-stopped
+    environment:
+      DISABLE_GOOGLE_CHROME: 1
+
+  tika:
+    image: apache/tika
+    restart: unless-stopped
+
+volumes:
+  data:
+  media:
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 5ccb80b3a..f53acb633 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -277,6 +277,35 @@ PAPERLESS_OCR_USER_ARG=<json>
 
         {"deskew": true, "optimize": 3, "unpaper_args": "--pre-rotate 90"}    
     
+.. _configuration-tika:
+
+Tika settings
+#############
+
+Paperless can make use of `Tika <https://tika.apache.org/>`_ and 
+`Gotenberg <https://thecodingmachine.github.io/gotenberg/>`_ for parsing and
+converting "Office" documents (such as ".doc", ".xlsx" and ".odt"). If you
+wish to use this, you must provide a Tika server and a Gotenberg server,
+configure their endpoints, and enable the feature.
+
+If you run paperless on docker, you can add those services to the docker-compose
+file (see the examples provided).
+
+PAPERLESS_TIKA=<bool>
+    Enable (or disable) the Tika parser.
+
+    Defaults to false.
+
+TIKA_SERVER_ENDPOINT=<url>
+    Set the endpoint URL were Paperless can reach your Tika server.
+
+    Defaults to "http://localhost:9998".
+
+GOTENBERG_SERVER_ENDPOINT=<url>
+    Set the endpoint URL were Paperless can reach your Gotenberg server.
+
+    Defaults to "http://localhost:3000".
+
     
 Software tweaks
 ###############
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 5af1be85e..219166cf5 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -87,6 +87,7 @@ INSTALLED_APPS = [
     "documents.apps.DocumentsConfig",
     "paperless_tesseract.apps.PaperlessTesseractConfig",
     "paperless_text.apps.PaperlessTextConfig",
+    "paperless_tika.apps.PaperlessTikaConfig",
     "paperless_mail.apps.PaperlessMailConfig",
 
     "django.contrib.admin",
@@ -424,3 +425,7 @@ for t in json.loads(os.getenv("PAPERLESS_FILENAME_PARSE_TRANSFORMS", "[]")):
 PAPERLESS_FILENAME_FORMAT = os.getenv("PAPERLESS_FILENAME_FORMAT")
 
 THUMBNAIL_FONT_NAME = os.getenv("PAPERLESS_THUMBNAIL_FONT_NAME", "/usr/share/fonts/liberation/LiberationSerif-Regular.ttf")
+
+# Tika settings
+PAPERLESS_TIKA = __get_boolean("PAPERLESS_TIKA", "NO")
+GOTENBERG_SERVER_ENDPOINT = os.getenv("GOTENBERG_SERVER_ENDPOINT", "http://localhost:3000")
diff --git a/src/paperless_tika/apps.py b/src/paperless_tika/apps.py
new file mode 100644
index 000000000..c29586d6a
--- /dev/null
+++ b/src/paperless_tika/apps.py
@@ -0,0 +1,14 @@
+from django.apps import AppConfig
+from django.conf import settings
+from paperless_tika.signals import tika_consumer_declaration
+
+
+class PaperlessTikaConfig(AppConfig):
+    name = "paperless_tika"
+
+    def ready(self):
+        from documents.signals import document_consumer_declaration
+
+        if settings.PAPERLESS_TIKA:
+            document_consumer_declaration.connect(tika_consumer_declaration)
+        AppConfig.ready(self)
diff --git a/src/paperless_tika/parsers.py b/src/paperless_tika/parsers.py
new file mode 100644
index 000000000..5a77681f2
--- /dev/null
+++ b/src/paperless_tika/parsers.py
@@ -0,0 +1,118 @@
+import os
+import subprocess
+import tika
+import requests
+import dateutil.parser
+
+from PIL import ImageDraw, ImageFont, Image
+from django.conf import settings
+
+from documents.parsers import DocumentParser, ParseError, run_convert
+from paperless_tesseract.parsers import RasterisedDocumentParser
+from tika import parser
+
+
+class TikaDocumentParser(DocumentParser):
+    """
+    This parser sends documents to a local tika server
+    """
+
+    def get_thumbnail(self, document_path, mime_type):
+        self.log("info", f"[TIKA_THUMB] Generating thumbnail for{document_path}")
+        archive_path = self.archive_path
+
+        out_path = os.path.join(self.tempdir, "convert.png")
+
+        # Run convert to get a decent thumbnail
+        try:
+            run_convert(
+                density=300,
+                scale="500x5000>",
+                alpha="remove",
+                strip=True,
+                trim=False,
+                input_file="{}[0]".format(archive_path),
+                output_file=out_path,
+                logging_group=self.logging_group,
+            )
+        except ParseError:
+            # if convert fails, fall back to extracting
+            # the first PDF page as a PNG using Ghostscript
+            self.log(
+                "warning",
+                "Thumbnail generation with ImageMagick failed, falling back "
+                "to ghostscript. Check your /etc/ImageMagick-x/policy.xml!",
+            )
+            gs_out_path = os.path.join(self.tempdir, "gs_out.png")
+            cmd = [
+                settings.GS_BINARY,
+                "-q",
+                "-sDEVICE=pngalpha",
+                "-o",
+                gs_out_path,
+                archive_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,
+                input_file=gs_out_path,
+                output_file=out_path,
+                logging_group=self.logging_group,
+            )
+
+        return out_path
+
+    def parse(self, document_path, mime_type):
+        self.log("info", f"[TIKA_PARSE] Sending {document_path} to Tika server")
+
+        try:
+            parsed = parser.from_file(document_path)
+        except requests.exceptions.HTTPError as err:
+            raise ParseError(f"Could not parse {document_path} with tika server: {err}")
+
+        try:
+            content = parsed["content"].strip()
+        except:
+            content = ""
+
+        try:
+            creation_date = dateutil.parser.isoparse(
+                parsed["metadata"]["Creation-Date"]
+            )
+        except:
+            creation_date = None
+
+        archive_path = os.path.join(self.tempdir, "convert.pdf")
+        convert_to_pdf(self, document_path, archive_path)
+
+        self.archive_path = archive_path
+        self.date = creation_date
+        self.text = content
+
+
+def convert_to_pdf(self, document_path, pdf_path):
+    pdf_path = os.path.join(self.tempdir, "convert.pdf")
+    gotenberg_server = settings.GOTENBERG_SERVER_ENDPOINT
+    url = gotenberg_server + "/convert/office"
+
+    self.log("info", f"[TIKA] Converting {document_path} to PDF as {pdf_path}")
+    files = {"files": open(document_path, "rb")}
+    headers = {}
+
+    try:
+        response = requests.post(url, files=files, headers=headers)
+        response.raise_for_status()  # ensure we notice bad responses
+    except requests.exceptions.HTTPError as err:
+        raise ParseError(
+            f"Could not contact gotenberg server at {gotenberg_server}: {err}"
+        )
+
+    file = open(pdf_path, "wb")
+    file.write(response.content)
+    file.close()
diff --git a/src/paperless_tika/signals.py b/src/paperless_tika/signals.py
new file mode 100644
index 000000000..409daebe2
--- /dev/null
+++ b/src/paperless_tika/signals.py
@@ -0,0 +1,20 @@
+from .parsers import TikaDocumentParser
+
+
+def tika_consumer_declaration(sender, **kwargs):
+    return {
+        "parser": TikaDocumentParser,
+        "weight": 10,
+        "mime_types": {
+            "application/msword": ".doc",
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.document": ".docx",
+            "application/vnd.ms-excel": ".xls",
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": ".xlsx",
+            "application/vnd.ms-powerpoint": ".ppt",
+            "application/vnd.openxmlformats-officedocument.presentationml.presentation": ".pptx",
+            "application/vnd.openxmlformats-officedocument.presentationml.slideshow": ".ppsx",
+            "application/vnd.oasis.opendocument.presentation": ".odp",
+            "application/vnd.oasis.opendocument.spreadsheet": ".ods",
+            "application/vnd.oasis.opendocument.text": ".odt",
+        },
+    }
diff --git a/src/paperless_tika/test.py b/src/paperless_tika/test.py
new file mode 100644
index 000000000..0a2885226
--- /dev/null
+++ b/src/paperless_tika/test.py
@@ -0,0 +1,3 @@
+import magic
+m = magic.from_file("/nfsstorage/jo/syncthing/Documenten/20R-309.153.052.pdf")
+print(m)

From f075384b449aa390926dae1c8f0e4e4f7e411146 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Tue, 29 Dec 2020 21:55:59 +0100
Subject: [PATCH 0485/1300] Move paperless.conf to /etc, drop permissions

---
 ansible/tasks/main.yml | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index b1932a33c..2ee2e4db2 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -158,9 +158,14 @@
     - "{{ paperlessng_media_root }}"
     - "{{ paperlessng_static_dir }}"
 
+- name: rename initial config
+  command:
+    cmd: "mv {{ paperlessng_directory }}/paperless.conf {{ paperlessng_directory }}/paperless.conf.template"
+    removes: "{{ paperlessng_directory }}/paperless.conf"
+
 - name: configure paperless-ng
   lineinfile:
-    path: "{{ paperlessng_directory }}/paperless.conf"
+    path: "{{ paperlessng_directory }}/paperless.conf.template"
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
   with_items:
@@ -184,18 +189,18 @@
     #   line: "PAPERLESS_OCR_USER_ARG=\"{{ paperlessng_ocrmypdf_args }}{{ ' --jbig2-lossy' if  paperlessng_use_jbig2enc else '' }}\""
     - regexp: "^#?PAPERLESS_TIME_ZONE="
       line: "PAPERLESS_TIME_ZONE={{ paperlessng_time_zone }}"
-  no_log: true
+  no_log: yes
 
 - name: configure paperless-ng database [sqlite]
   lineinfile:
-    path: "{{ paperlessng_directory }}/paperless.conf"
+    path: "{{ paperlessng_directory }}/paperless.conf.template"
     regexp: "^#?PAPERLESS_DBHOST="
     state: absent
   when: paperlessng_db_type == 'sqlite'
 
 - name: configure paperless-ng database [postgresql]
   lineinfile:
-    path: "{{ paperlessng_directory }}/paperless.conf"
+    path: "{{ paperlessng_directory }}/paperless.conf.template"
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
   with_items:
@@ -210,7 +215,17 @@
     - regexp: "^#?PAPERLESS_DBPASS="
       line: "PAPERLESS_DBPASS={{ paperlessng_db_pass }}"
   when: paperlessng_db_type == 'postgresql'
-  no_log: true
+  no_log: yes
+
+- name: deploy paperless-ng configuration
+  copy:
+    src: "{{ paperlessng_directory }}/paperless.conf.template"
+    remote_src: yes
+    dest: /etc/paperless.conf
+    owner: root
+    group: root
+    mode: '0644'
+  register: configuration
 
 - name: create paperlessng venv
   become: yes
@@ -232,9 +247,7 @@
 - name: collect static files
   become: yes
   become_user: "{{ paperlessng_system_user }}"
-  command: "{{ paperlessng_virtualenv }}/bin/python3 manage.py collectstatic --no-input"
-  args:
-    chdir: "{{ paperlessng_directory }}/src"
+  command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py collectstatic --no-input"
   when: paperlessng_current_version.stdout != paperlessng_version | string
   register: static_files
   changed_when: "'188 unmodified' not in static_files.stdout"
@@ -242,9 +255,7 @@
 - name: create database schema
   become: yes
   become_user: "{{ paperlessng_system_user }}"
-  command: "{{ paperlessng_virtualenv }}/bin/python3 manage.py migrate"
-  args:
-    chdir: "{{ paperlessng_directory }}/src"
+  command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py migrate"
   when: paperlessng_current_version.stdout != paperlessng_version | string
   register: database_schema
   changed_when: '"No migrations to apply." not in database_schema.stdout'
@@ -276,13 +287,10 @@
       else:
           User.objects.create_superuser('{{ paperlessng_superuser_name }}', '{{ paperlessng_superuser_email }}', '{{ paperlessng_superuser_password }}')
           print('changed')
-  command: |
-    {{ paperlessng_virtualenv }}/bin/python3 manage.py shell -c "{{ creation_script }}"
-  args:
-    chdir: "{{ paperlessng_directory }}/src"
+  command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py shell -c \"{{ creation_script }}\""
   register: superuser
   changed_when: superuser.stdout == 'changed'
-  no_log: true
+  no_log: yes
 
 - name: set ownership and permissions on paperlessng venv
   file:
@@ -372,7 +380,7 @@
     - paperless-consumer
     - paperless-scheduler
     - paperless-webserver
-  when: paperless_services.changed
+  when: paperless_services.changed or configuration.changed
 
 - name: enable paperlessng services
   systemd:

From fb09f67899343f8c5dd5816e72b86db6f3bde298 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 22:01:18 +0100
Subject: [PATCH 0486/1300] bugfixes

---
 .../filter-editor/filter-editor.component.ts   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index de6d724bc..4b62d6a51 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -62,6 +62,10 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
   @Input()
   set filterRules (value: FilterRule[]) {
+    this.documentTypeSelectionModel.clear(false)
+    this.tagSelectionModel.clear(false)
+    this.correspondentSelectionModel.clear(false)
+
     value.forEach(rule => {
       switch (rule.rule_type) {
         case FILTER_TITLE:
@@ -95,10 +99,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     })
   }
 
-  @Output()
-  filterRulesChange = new EventEmitter<FilterRule[]>()
-
-  updateRules() {
+  get filterRules() {
     let filterRules: FilterRule[] = []
     if (this._titleFilter) {
       filterRules.push({rule_type: FILTER_TITLE, value: this._titleFilter})
@@ -128,7 +129,14 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     if (this.dateAddedAfter) {
       filterRules.push({rule_type: FILTER_ADDED_AFTER, value: this.dateAddedAfter})
     }
-    this.filterRulesChange.next(filterRules)
+    return filterRules
+  }
+
+  @Output()
+  filterRulesChange = new EventEmitter<FilterRule[]>()
+
+  updateRules() {
+    this.filterRulesChange.next(this.filterRules)
   }
 
   hasFilters() {

From 8139ecfd3987a91734fade2519cbf0366d9d0db8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 22:01:37 +0100
Subject: [PATCH 0487/1300] version bump

---
 docker/hub/docker-compose.postgres.yml      | 2 +-
 docker/hub/docker-compose.sqlite.yml        | 2 +-
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index e7a32bec0..c2b599e52 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.9
+    image: jonaswinkler/paperless-ng:0.9.10
     restart: always
     depends_on:
       - db
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index 98b7d70a2..429d42c06 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.9
+    image: jonaswinkler/paperless-ng:0.9.10
     restart: always
     depends_on:
       - broker
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index ab6b07c73..7b707f014 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,5 +2,5 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "0.9.9"
+  version: "0.9.10"
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index b1dfc590c..facb097fc 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (0, 9, 9)
+__version__ = (0, 9, 10)

From 761a6a4264f8823ff56c4abfa6c2fce5c5654625 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 22:01:56 +0100
Subject: [PATCH 0488/1300] plural form fix

---
 .../app/components/document-list/document-list.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 40a08c105..bc1047ba9 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -84,7 +84,7 @@
 
 <div class="d-flex justify-content-between align-items-center">
   <p i18n *ngIf="list.selected.size > 0">Selected {{list.selected.size}} of {{list.collectionSize || 0}} {list.collectionSize, plural, =1 {document} other {documents}}</p>
-  <p i18n *ngIf="list.selected.size == 0">{{list.collectionSize || 0}} {list.collectionSize, plural, =1 {document} other {documents}}</p>
+  <p *ngIf="list.selected.size == 0">{list.collectionSize, plural, =1 {1 document} other {{{list.collectionSize || 0}} documents}}</p>
   <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
   [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
 </div>

From ef63ec40d91fa7560abc0ed85e866e70bfc0749a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 22:02:03 +0100
Subject: [PATCH 0489/1300] changelog

---
 docs/changelog.rst | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e63c19d7d..4357a981b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,35 @@
 Changelog
 *********
 
+paperless-ng 0.9.10
+###################
+
+* Bulk editing
+
+  * Thanks to `Michael Shamoon`_, we've got a new interface for the bulk editor.
+  * There are some configuration options in the settings to alter the behavior.
+
+* Other changes and additions
+  
+  * The Paperless-ng logo now navigates to the dashboard.
+  * Filter for documents that don't have any correspondents, types or tags assigned.
+  * Tags, types and correspondents are now sorted case insensitive.
+  * Lots of preparation work for localization support.
+
+* Fixes
+
+  * Added missing dependencies for Raspberry Pi builds.
+  * Fixed an issue with plain text file consumption: Thumbnail generation failed due to missing fonts.
+  * An issue with the search index reporting missing documents after bulk deletes was fixed.
+
+.. note::
+
+  The bulk delete operations did not update the search index. Therefore, documents that you deleted remained in the index and
+  caused the search to return messages about missing documents when searching. Further bulk operations will properly update
+  the index.
+  
+  However, this change is not retroactive: If you used the delete method of the bulk editor, you need to reindex your search index
+  by :ref:`running the management command document_index with the argument reindex <administration-index>`.
 
 paperless-ng 0.9.9
 ##################

From bb569b4e7875298049efe3e4c9b4cf29018267f9 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Tue, 29 Dec 2020 22:43:52 +0100
Subject: [PATCH 0490/1300] Integrate OCRmyPDF args into ansible config

---
 ansible/defaults/main.yml | 11 ++++++-----
 ansible/tasks/main.yml    |  6 ++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml
index fbeef9871..2504f18dc 100644
--- a/ansible/defaults/main.yml
+++ b/ansible/defaults/main.yml
@@ -11,12 +11,13 @@ paperlessng_virtualenv: "{{ paperlessng_directory }}/.venv"
 paperlessng_ocr_languages:
   - eng
 paperlessng_time_zone: Europe/Berlin
-paperlessng_ocrmypdf_args: --optimize 1
-# TODO Does optimze==1 really work with jbig2enc?
-# https://ocrmypdf.readthedocs.io/en/latest/jbig2.html#lossy-mode-jbig2
-# Documentation states -O1 only applies lossless transformations
-# https://ocrmypdf.readthedocs.io/en/latest/optimizer.html#lossless-optimizations
+# see https://ocrmypdf.readthedocs.io/en/latest/api.html#ocrmypdf.ocr
+paperlessng_ocrmypdf_args:
+  - "deskew": true
+  - "clean": true
+  - "optimize": 1
 paperlessng_use_jbig2enc: true
+paperlessng_big2enc_lossy: false
 
 paperlessng_superuser_name: paperlessng
 paperlessng_superuser_email: paperlessng@example.com
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index 2ee2e4db2..4a243f322 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -183,10 +183,8 @@
       line: "PAPERLESS_FILENAME_FORMAT={{ paperlessng_filename_format }}"
     - regexp: "^#?PAPERLESS_OCR_LANGUAGE="
       line: "PAPERLESS_OCR_LANGUAGE={{ paperlessng_ocr_languages | join('+') }}"
-    # - regexp: "^#PAPERLESS_OCR_USER_ARG="
-    #   # TODO JSON dict required in conf
-    #   # https://paperless-ng.readthedocs.io/en/latest/configuration.html#ocr-settings
-    #   line: "PAPERLESS_OCR_USER_ARG=\"{{ paperlessng_ocrmypdf_args }}{{ ' --jbig2-lossy' if  paperlessng_use_jbig2enc else '' }}\""
+    - regexp: "^#PAPERLESS_OCR_USER_ARG="
+      line: "PAPERLESS_OCR_USER_ARG={{ paperlessng_ocrmypdf_args | combine({'jbig2_lossy': true} if paperlessng_big2enc_lossy else {}) }}"
     - regexp: "^#?PAPERLESS_TIME_ZONE="
       line: "PAPERLESS_TIME_ZONE={{ paperlessng_time_zone }}"
   no_log: yes

From 14f87f5aee52753ada73ffcee8ab1f110e25af4c Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Tue, 29 Dec 2020 23:30:59 +0100
Subject: [PATCH 0491/1300] Harden systemd service files, drop perms further

---
 ansible/tasks/main.yml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index 4a243f322..f0fd84d67 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -310,7 +310,7 @@
 - name: configure systemd services
   ini_file:
     path: "{{ paperlessng_directory }}/scripts/{{ item[0] }}"
-    section: "{{ item[1].section }}"
+    section: "Service"
     option: "{{ item[1].option  }}"
     value: "{{ item[1].value }}"
   with_nested:
@@ -320,21 +320,35 @@
         paperless-webserver.service,
       ]
     - [
+        # https://www.freedesktop.org/software/systemd/man/systemd.exec.html
         {
-          section: "Service",
           option: "User",
           value: "{{ paperlessng_system_user }}",
         },
         {
-          section: "Service",
           option: "Group",
           value: "{{ paperlessng_system_group }}",
         },
         {
-          section: "Service",
           option: "WorkingDirectory",
           value: "{{ paperlessng_directory }}/src",
         },
+        {
+          option: "ProtectSystem",
+          value: "full",
+        },
+        {
+          option: "NoNewPrivileges",
+          value: "true",
+        },
+        {
+          option: "PrivateUsers",
+          value: "true",
+        },
+        {
+          option: "PrivateDevices",
+          value: "true",
+        }
       ]
 
 - name: configure paperless-consumer service

From f9ab8d3b3504006f0ea899c5082749d95c23957a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 23:34:04 +0100
Subject: [PATCH 0492/1300] more localization tags #123

---
 .../save-view-config-dialog.component.html         |  2 +-
 .../correspondent-edit-dialog.component.html       |  4 ++--
 .../document-type-edit-dialog.component.html       |  4 ++--
 .../document-type-list.component.html              |  2 +-
 .../tag-edit-dialog/tag-edit-dialog.component.html | 14 +++++++-------
 .../manage/tag-list/tag-list.component.html        |  6 ++----
 .../app/components/search/search.component.html    |  2 +-
 7 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
index 9a2a37e36..9e28448a2 100644
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
@@ -7,7 +7,7 @@
   </div>
   <div class="modal-body">
     <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
-    <app-input-check i18n-title title="Show in side bar" formControlName="showInSideBar"></app-input-check>
+    <app-input-check i18n-title title="Show in sidebar" formControlName="showInSideBar"></app-input-check>
     <app-input-check i18n-title title="Show on dashboard" formControlName="showOnDashboard"></app-input-check>
   </div>
   <div class="modal-footer">
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
index bc3d1c88f..e35c57e26 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
@@ -9,8 +9,8 @@
     
     <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
     <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-    <app-input-text i18n-title title="Match" formControlName="match" hint="Auto matching does not require you to fill in this field."></app-input-text>
-    <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" hint="Auto matching ignores this option."></app-input-check>
+    <app-input-text i18n-title title="Match" formControlName="match" i18n-hint hint="Auto matching does not require you to fill in this field."></app-input-text>
+    <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" i18n-hint hint="Auto matching ignores this option."></app-input-check>
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
index 16c006051..458fbb4bc 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
@@ -9,8 +9,8 @@
       
       <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
       <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-      <app-input-text i18n-title title="Match" formControlName="match" hint="Auto matching does not require you to fill in this field."></app-input-text>
-      <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" hint="Auto matching ignores this option."></app-input-check>
+      <app-input-text i18n-title title="Match" formControlName="match" i18n-hint hint="Auto matching does not require you to fill in this field."></app-input-text>
+      <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" i18n-hint hint="Auto matching ignores this option."></app-input-check>
 
     </div>
     <div class="modal-footer">
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
index 6de7e0595..e18d3ec00 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
@@ -1,4 +1,4 @@
-<app-page-header title="Document types">
+<app-page-header title="Document types" i18n-title>
   <button type="button" class="btn btn-sm btn-outline-primary" (click)="openCreateDialog()" i18n>Create</button>
 </app-page-header>
 
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
index 138d3e7cd..bbb96fb6b 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
@@ -10,7 +10,7 @@
 
 
       <div class="form-group paperless-input-select">
-        <label for="colour">Colour</label>
+        <label for="colour" i18n>Color</label>
         <ng-select name="colour" formControlName="colour" [items]="getColours()" bindValue="id" bindLabel="name" [clearable]="false">
           <ng-template ng-option-tmp ng-label-tmp let-item="item">
             <span class="badge" [style.background]="item.value" [style.color]="item.textColor">{{item.name}}</span>
@@ -18,13 +18,13 @@
         </ng-select>
       </div>
      
-      <app-input-check title="Inbox tag" formControlName="is_inbox_tag" hint="Inbox tags are automatically assigned to all consumed documents."></app-input-check>
-      <app-input-select title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-      <app-input-text title="Match" formControlName="match" hint="Auto matching does not require you to fill in this field."></app-input-text>
-      <app-input-check title="Case insensitive" formControlName="is_insensitive" hint="Auto matching ignores this option."></app-input-check>
+      <app-input-check i18n-title title="Inbox tag" formControlName="is_inbox_tag" i18n-hint hint="Inbox tags are automatically assigned to all consumed documents."></app-input-check>
+      <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
+      <app-input-text i18n-title title="Match" formControlName="match" i18n-hint hint="Auto matching does not require you to fill in this field."></app-input-text>
+      <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" i18n-hint hint="Auto matching ignores this option."></app-input-check>
     </div>
     <div class="modal-footer">
-      <button type="button" class="btn btn-outline-dark" (click)="cancel()">Cancel</button>
-      <button type="submit" class="btn btn-primary">Save</button>
+      <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
+      <button type="submit" class="btn btn-primary" i18n>Save</button>
     </div>
   </form>
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.html b/src-ui/src/app/components/manage/tag-list/tag-list.component.html
index bbe2c6dd2..83bf211a6 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.html
@@ -1,7 +1,5 @@
-<app-page-header title="Tags">
-  <button type="button" class="btn btn-sm btn-outline-primary" (click)="openCreateDialog()">
-    Create
-  </button>
+<app-page-header title="Tags" i18n-title>
+  <button type="button" class="btn btn-sm btn-outline-primary" (click)="openCreateDialog()" i18n>Create</button>
 </app-page-header>
 
 <div class="row m-0 justify-content-end">
diff --git a/src-ui/src/app/components/search/search.component.html b/src-ui/src/app/components/search/search.component.html
index 7047a3144..547c8a475 100644
--- a/src-ui/src/app/components/search/search.component.html
+++ b/src-ui/src/app/components/search/search.component.html
@@ -1,4 +1,4 @@
-<app-page-header title="Search results">
+<app-page-header i18n-title title="Search results">
 </app-page-header>
 
 <div *ngIf="errorMessage" class="alert alert-danger" i18n>Invalid search query: {{errorMessage}}</div>

From 03c6a4e18eafe79fe579eff44700b4b28baee835 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 23:37:33 +0100
Subject: [PATCH 0493/1300] more localization #123

---
 .../common/date-dropdown/date-dropdown.component.ts       | 8 ++++----
 .../filterable-dropdown/filterable-dropdown.component.ts  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
index 1bf5d0216..27472bdc7 100644
--- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
+++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
@@ -21,10 +21,10 @@ const LAST_YEAR = 3
 export class DateDropdownComponent implements OnInit, OnDestroy {
 
   quickFilters = [
-    {id: LAST_7_DAYS, name: "Last 7 days"},
-    {id: LAST_MONTH, name: "Last month"},
-    {id: LAST_3_MONTHS, name: "Last 3 months"},
-    {id: LAST_YEAR, name: "Last year"}
+    {id: LAST_7_DAYS, name: $localize`Last 7 days`},
+    {id: LAST_MONTH, name: $localize`Last month`},
+    {id: LAST_3_MONTHS, name: $localize`Last 3 months`},
+    {id: LAST_YEAR, name: $localize`Last year`}
   ]
 
   @Input()
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 0e075ff19..915d10677 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -142,7 +142,7 @@ export class FilterableDropdownComponent {
     if (items) {
       this._selectionModel.items = Array.from(items)
       this._selectionModel.items.unshift({
-        name: "None",
+        name: $localize`Not assigned`,
         id: null
       })
     }

From 2de3894d67744bbdb5c5c67dced25b6244e2cf2d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 23:41:59 +0100
Subject: [PATCH 0494/1300] more localization tags

---
 .../document-detail.component.html            |  2 +-
 .../manage/tag-list/tag-list.component.html   | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index daf01249f..eae3367c1 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -132,7 +132,7 @@
             <div [ngbNavOutlet]="nav" class="mt-2"></div>
 
             <button type="button" class="btn btn-outline-secondary" (click)="discard()" i18n>Discard</button>&nbsp;
-            <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()" i18n>Save & edit next</button>&nbsp;
+            <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()" i18n>Save & next</button>&nbsp;
             <button type="submit" class="btn btn-primary" i18n>Save</button>&nbsp;
         </form>
     </div>
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.html b/src-ui/src/app/components/manage/tag-list/tag-list.component.html
index 83bf211a6..43126f7b2 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.html
@@ -10,11 +10,11 @@
 <table class="table table-striped border shadow-sm">
   <thead>
     <tr>
-      <th scope="col" sortable="name" (sort)="onSort($event)">Name</th>
-      <th scope="col">Colour</th>
-      <th scope="col" sortable="matching_algorithm" (sort)="onSort($event)">Matching</th>
-      <th scope="col" sortable="document_count" (sort)="onSort($event)">Document count</th>
-      <th scope="col">Actions</th>
+      <th scope="col" sortable="name" (sort)="onSort($event)" i18n>Name</th>
+      <th scope="col" i18n>Color</th>
+      <th scope="col" sortable="matching_algorithm" (sort)="onSort($event)" i18n>Matching</th>
+      <th scope="col" sortable="document_count" (sort)="onSort($event)" i18n>Document count</th>
+      <th scope="col" i18n>Actions</th>
     </tr>
   </thead>
   <tbody>
@@ -29,21 +29,18 @@
           <button class="btn btn-sm btn-outline-secondary" (click)="filterDocuments(tag)">
             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-funnel" viewBox="0 0 16 16">
               <path fill-rule="evenodd" d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2zm1 .5v1.308l4.372 4.858A.5.5 0 0 1 7 8.5v5.306l2-.666V8.5a.5.5 0 0 1 .128-.334L13.5 3.308V2h-11z"/>
-            </svg>
-            Documents
+            </svg>&nbsp;<ng-container i18n>Documents</ng-container>
           </button>
           <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(tag)">
             <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>
-            Edit
+            </svg>&nbsp;<ng-container i18n>Edit</ng-container>
           </button>
           <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(tag)">
             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
               <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
               <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4L4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
-            </svg>
-            Delete
+            </svg>&nbsp;<ng-container i18n>Delete</ng-container>
           </button>
         </div>
       </td>

From 9f18d0ad4581c8db476b9924bb60696424721e03 Mon Sep 17 00:00:00 2001
From: Fabian Koller <C0nsultant@users.noreply.github.com>
Date: Tue, 29 Dec 2020 23:52:27 +0100
Subject: [PATCH 0495/1300] Fix ENV var name for user args in example config

The actual string used when looking up the user arguments ends with an S: `PAPERLESS_OCR_USER_ARGS`
---
 paperless.conf.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paperless.conf.example b/paperless.conf.example
index 910fc22a0..cc4cc0eb7 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -39,7 +39,7 @@
 #PAPERLESS_OCR_OUTPUT_TYPE=pdfa
 #PAPERLESS_OCR_PAGES=1
 #PAPERLESS_OCR_IMAGE_DPI=300
-#PAPERLESS_OCR_USER_ARG={}
+#PAPERLESS_OCR_USER_ARGS={}
 #PAPERLESS_CONVERT_MEMORY_LIMIT=0
 #PAPERLESS_CONVERT_TMPDIR=/var/tmp/paperless
 

From e4e4efcba7e287d7133ea194d5785d88ff937963 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Tue, 29 Dec 2020 23:54:22 +0100
Subject: [PATCH 0496/1300] Fix creation of user arg

json.loads is picky in that is expects true json, not yaml from ansible
---
 ansible/tasks/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index f0fd84d67..604b29203 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -183,8 +183,8 @@
       line: "PAPERLESS_FILENAME_FORMAT={{ paperlessng_filename_format }}"
     - regexp: "^#?PAPERLESS_OCR_LANGUAGE="
       line: "PAPERLESS_OCR_LANGUAGE={{ paperlessng_ocr_languages | join('+') }}"
-    - regexp: "^#PAPERLESS_OCR_USER_ARG="
-      line: "PAPERLESS_OCR_USER_ARG={{ paperlessng_ocrmypdf_args | combine({'jbig2_lossy': true} if paperlessng_big2enc_lossy else {}) }}"
+    - regexp: "^#PAPERLESS_OCR_USER_ARGS="
+      line: "PAPERLESS_OCR_USER_ARGS={{ paperlessng_ocrmypdf_args | combine({'jbig2_lossy': true} if paperlessng_big2enc_lossy else {}) | to_json }}"
     - regexp: "^#?PAPERLESS_TIME_ZONE="
       line: "PAPERLESS_TIME_ZONE={{ paperlessng_time_zone }}"
   no_log: yes

From d909010f08d2558d2f8d3d46c8879d75d5d66504 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 00:24:42 +0100
Subject: [PATCH 0497/1300] angular message file

---
 src-ui/messages.xlf | 1562 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1562 insertions(+)
 create mode 100644 src-ui/messages.xlf

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
new file mode 100644
index 000000000..6270f5373
--- /dev/null
+++ b/src-ui/messages.xlf
@@ -0,0 +1,1562 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file source-language="en-US" datatype="plaintext" original="ng2.template">
+    <body>
+      <trans-unit id="4733307402565258070" datatype="html">
+        <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">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2155249406916744630" datatype="html">
+        <source>View &quot;<x id="PH" equiv-text="this.list.savedView.name"/>&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">84</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">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9ca82952a6bc860b5391d5975322d8af8ceddfa4" datatype="html">
+        <source>Select</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7e1f9a7054aff842832620c03dedae894787ba41" datatype="html">
+        <source>Select none</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9" datatype="html">
+        <source>Select page</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74" datatype="html">
+        <source>Select all</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ec97f67072a83aaa972536b18d83179f6e4bbec9" datatype="html">
+        <source>Sort by</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b7641aed03492978b4ec6843b1e53f30464294d9" datatype="html">
+        <source>Views</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b69d81ff62cdc22b6bf88fe0b72dc1f66ccfa44f" datatype="html">
+        <source>Save as...</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="72e7d343f9165602cce1ca7faffbc565fd31ef92" datatype="html">
+        <source>Save &quot;<x id="INTERPOLATION" equiv-text="{{list.savedViewTitle}}"/>&quot;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="546b2014cc578af06b6023a7f38fa77aa9d58f5d" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {document} other {documents}}</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3c298bb50741c8b2641889b0a0e0009769e66370" datatype="html">
+        <source>Selected <x id="INTERPOLATION" equiv-text="{{list.selected.size}}"/> of <x id="INTERPOLATION_1" equiv-text="{{list.collectionSize || 0}}"/> <x id="ICU" equiv-text="{list.collectionSize, plural, =1 {document} other {documents}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8b04a8e375ac6760a54aabaf5df0287d53ce4a4a" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {1 document} other {<x id="INTERPOLATION"/> documents}}</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ca0b795795658155d44ddca02e95f1feeeb4a88f" datatype="html">
+        <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">100</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">101</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">102</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">103</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">104</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">105</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">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5277522254327902345" datatype="html">
+        <source>Do you really want to delete document &apos;<x id="PH" equiv-text="this.document.title"/>&apos;?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">162</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">163</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">165</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7" datatype="html">
+        <source>Delete</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="dc75033a5238fdc4f462212c847a45ba8018a3fd" datatype="html">
+        <source>Download</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4ea3c236bca3528318e3b3a411a20909e5fa8be4" datatype="html">
+        <source>More like this</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f4e529ae5ffd73001d1ff4bbdeeb0a72e342e5c8" datatype="html">
+        <source>Close</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4f8b2bb476981727ab34ed40fde1218361f92c45" datatype="html">
+        <source>Details</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4ab4cb601522b9194922554d934c4c30bd93567d" datatype="html">
+        <source>Content</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f721a500a68c357e8f2a01e60510f6a01e4ba529" datatype="html">
+        <source>Metadata</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7" datatype="html">
+        <source>Discard</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="52c9a103b812f258bcddc3d90a6e3f46871d25fe" datatype="html">
+        <source>Save</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3" datatype="html">
+        <source>Page</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c972a8e7d09f86e0c408a80349990fb213b32c08" datatype="html">
+        <source>of <x id="INTERPOLATION" equiv-text="{{previewNumPages}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a071e35fecc10753065b1cb5b38608be66da2c8b" datatype="html">
+        <source>Download original</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9b3996b5ddcc628a999a7df72fbfc2a2eae8c8a5" datatype="html">
+        <source>Archive serial number</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="30eebc2dd656dbcb259d8d5286d244ee397d63bd" datatype="html">
+        <source>Date created</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cafc87479686947e2590b9f588a88040aeaf660b" datatype="html">
+        <source>Tags</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
+        <source>Date modified</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269" datatype="html">
+        <source>Date added</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3" datatype="html">
+        <source>Media filename</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">99</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8" datatype="html">
+        <source>Original MD5 checksum</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e92ca184ea785769fb26138fc25ee9fa06fff6e5" datatype="html">
+        <source>Original file size</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd" datatype="html">
+        <source>Original mime type</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="edbf54e4117606b5dd87aaea3c14b21ebf398020" datatype="html">
+        <source>Archive MD5 checksum</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e6bf12eadecbfd80016eca15fa78651c6ca90c64" datatype="html">
+        <source>Archive file size</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">119</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f" datatype="html">
+        <source>Original document metadata</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7174dcea4a3d0b743e7e4a78747e902230727f67" datatype="html">
+        <source>Archived document metadata</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">126</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3fb9f1a31c3798173b2fea72638732c783b152fe" datatype="html">
+        <source>Save &amp; next</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8765497970646365998" datatype="html">
+        <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ng!</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7016571167317583872" datatype="html">
+        <source>Welcome to Paperless-ng!</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f65253954b66e929a8b4d5ecaf61f9129f8cec64" datatype="html">
+        <source>Dashboard</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2133075428913430816" datatype="html">
+        <source>Do you really want to delete the tag <x id="PH" equiv-text="object.name"/>?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="70a67e04629f6d412db0a12d51820b480788d795" datatype="html">
+        <source>Create</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cff1428d10d59d14e45edec3c735a27b5482db59" datatype="html">
+        <source>Name</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8fa4d523f7b91df4390120b85ed0406138273e1a" datatype="html">
+        <source>Color</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d0c4488f742efeba0915e90e285a022da813deff" datatype="html">
+        <source>Matching</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9bcf8d20d23c111eca1431abd2d2ce0de324499c" datatype="html">
+        <source>Document count</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="030b4423b92167200e39519599f9b863b4f7c62c" datatype="html">
+        <source>Actions</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9d51b3c90afda70700229d1b8a55371c13cb3bce" datatype="html">
+        <source>Documents</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="28f86ffd419b869711aa13f5e5ff54be6d70731c" datatype="html">
+        <source>Edit</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3954409824493602446" datatype="html">
+        <source>Do you really want to delete the document type <x id="PH" equiv-text="object.name"/>?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8" datatype="html">
+        <source>Document types</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="eb3d5aefff38a814b76da74371cbf02c0789a1ef" datatype="html">
+        <source>Logs</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5ca707824ab93066c7d9b44e1b8bf216725c2c22" datatype="html">
+        <source>Filter</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1153806754022288374" datatype="html">
+        <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/> deleted.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5647210819299459618" datatype="html">
+        <source>Settings saved successfully.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8488620293789898901" datatype="html">
+        <source>Error while storing settings on server: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">73</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="11ebd254cc9294717105c5982eb0cd2af30a446d" datatype="html">
+        <source>General settings</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="99dee94e92dbd9e21a008d4569f9719ed206ae37" datatype="html">
+        <source>Saved views</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0d8ceb153aa715eb905da0710cc0b2ac73159abc" datatype="html">
+        <source>Document list</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2045151788cbdda7512752e408da59a6b54a8ef0" datatype="html">
+        <source>Items per page</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3863a86cd9e69a61d143d3daf51df44203df4a82" datatype="html">
+        <source>Bulk editing</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586" datatype="html">
+        <source>Show confirmation dialogs</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a" datatype="html">
+        <source>Deleting documents will always ask for confirmation.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8cfddc13e04f5545ac63f419ef363505d6f78c2e" datatype="html">
+        <source>Apply on close</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8cb90334f5dfd7fc67205085f59381e2a334ccfc" datatype="html">
+        <source>Appears on</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">53</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5" datatype="html">
+        <source>Show on dashboard</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="541bfc5b123b3f8867fd681eaceefb663a811973" datatype="html">
+        <source>Show in sidebar</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">60</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="abba764a7a595d04dc8c3b26e04b3780d4fdb540" datatype="html">
+        <source>No saved views defined.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ef60a738a565f498b858e903e42bc5ffc3cc1299" datatype="html">
+        <source>404 Not Found</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/not-found/not-found.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2337099367951805921" datatype="html">
+        <source>Do you really want to delete the correspondent <x id="PH" equiv-text="object.name"/>?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c3f3334de899327bf3ec8999236e10798ff76e72" datatype="html">
+        <source>Correspondents</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0488919cff4fcc2174d34e4a1167f1b3c586ca37" datatype="html">
+        <source>Last correspondence</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1234709746630139322" datatype="html">
+        <source>Confirmation</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9178182467454450952" datatype="html">
+        <source>Confirm</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6457471243969293847" datatype="html">
+        <source>Create new correspondent</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2059822531169388684" datatype="html">
+        <source>Edit correspondent</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3025930461519142465" datatype="html">
+        <source>Could not save correspondent: <x id="PH" equiv-text="error"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3d5caa52b0a51bfd2757215f7614183554d740f0" datatype="html">
+        <source>Matching algorithm</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="180092a6b8a6151a05f4a7552a2fb75fd159dfa8" datatype="html">
+        <source>Match</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a1923dd970db4f74b4417b80b4a14e250fd116ff" datatype="html">
+        <source>Auto matching does not require you to fill in this field.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="632e529f49cf3d367dfbd15bd055e9b53aef30fb" datatype="html">
+        <source>Case insensitive</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="85e19678590a8b3ac1dff9d69c7a7610d1742e5a" datatype="html">
+        <source>Auto matching ignores this option.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d7b35c384aecd25a516200d6921836374613dfe7" datatype="html">
+        <source>Cancel</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9153094873118985366" datatype="html">
+        <source>Create new tag</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5872175735754226507" datatype="html">
+        <source>Edit tag</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2861521377141790537" datatype="html">
+        <source>Could not save tag: <x id="PH" equiv-text="error"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42" datatype="html">
+        <source>Inbox tag</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5e2f1a4ea12a1b8606ee3f0548d0ba64bf266077" datatype="html">
+        <source>Inbox tags are automatically assigned to all consumed documents.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6672809941092516947" datatype="html">
+        <source>Create new document type</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="36335016091244220" datatype="html">
+        <source>Edit document type</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5647767513381010218" datatype="html">
+        <source>Could not save document type: <x id="PH" equiv-text="error"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</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">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+        <note priority="1" from="description">app title</note>
+      </trans-unit>
+      <trans-unit id="8d667444401ef6380fd262e4fe4795f261a427b1" datatype="html">
+        <source>Search for documents</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="68949525c4d9a901e0cd15a94e3fc8d2711e9918" datatype="html">
+        <source>Manage</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">77</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
+        <source>Settings</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="408cb6073e60c5d966296a3207fc596adca75e01" datatype="html">
+        <source>Admin</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">119</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="46aa32e581922d6d2c3d7bc4c87209ad5808b029" datatype="html">
+        <source>Misc</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7" datatype="html">
+        <source>Documentation</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">132</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="355a222236bc01b9a8cd3cb9ecf76891125aed69" datatype="html">
+        <source>GitHub</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">139</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bb694b49d408265c91c62799c2b3a7e3151c824d" datatype="html">
+        <source>Logout</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">146</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4f55b670f49d927c6026bb614c7c62b1f2a394c0" datatype="html">
+        <source>Open documents</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">57</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="dca5bf9344a759fa5a07f1b21f50286ec242ba44" datatype="html">
+        <source>Close all</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">71</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">28</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">31</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">34</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ddb40946e790522301687ecddb9ce1cb8ad40dd1" datatype="html">
+        <source>Filter by:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2f33515a935c36763660e8420940b8a7e11fb1f4" datatype="html">
+        <source>Clear all filters</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7593728289020204896" datatype="html">
+        <source>Not assigned</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
+          <context context-type="linenumber">145</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c2d0ac9f528bbd5f53fd34269fde8b59e029621b" datatype="html">
+        <source>Apply</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4873149362496451858" datatype="html">
+        <source>Last 7 days</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4463380307954693363" datatype="html">
+        <source>Last month</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8697368973702409683" datatype="html">
+        <source>Last 3 months</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3566342898065860218" datatype="html">
+        <source>Last year</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="be2add3a3d9e4e2556b8f9048a15a9c0f00bf1ad" datatype="html">
+        <source>After</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8785188e6c678b842fcb93b7392faf86db7ec676" datatype="html">
+        <source>Before</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="99ee4faa69cd2ea8e3678c1f557c0ff1f05aae46" datatype="html">
+        <source>Clear</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6829218544e108e152f5fa72cb79c4ccb82e0d06" datatype="html">
+        <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="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60" datatype="html">
+        <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">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e" datatype="html">
+        <source>Created: <x id="INTERPOLATION" equiv-text="{{document.created | date}}"/></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">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8" datatype="html">
+        <source>Filter by correspondent</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">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bdb9a910523610254872e147222689e9a4115b84" datatype="html">
+        <source>Filter by tag</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">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2840db547019ce8c76b2cdbe3a1653c5b68b06af" datatype="html">
+        <source>View in browser</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-group>
+      </trans-unit>
+      <trans-unit id="5033601776243148314" datatype="html">
+        <source><x id="PH" equiv-text="items[0].name"/> and <x id="PH_1" equiv-text="items[1].name"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="760986369763309193" datatype="html">
+        <source>, </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4137232459980262849" datatype="html">
+        <source>Confirm tags assignment</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5778291417880283825" datatype="html">
+        <source>This operation will add the tag <x id="PH" equiv-text="tag.name"/> to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4791265247184178563" datatype="html">
+        <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToAdd)"/> to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">120</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7202114001606049276" datatype="html">
+        <source>This operation will remove the tag <x id="PH" equiv-text="tag.name"/> from all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="247266594076352528" datatype="html">
+        <source>This operation will remove the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToRemove)"/> from all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4286636723521919383" datatype="html">
+        <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToAdd)"/> and remove the tags <x id="PH_1" equiv-text="this._localizeList(changedTags.itemsToRemove)"/> on all <x id="PH_2" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">127</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2996713129519325161" datatype="html">
+        <source>Confirm correspondent assignment</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">157</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9000739289559833849" datatype="html">
+        <source>This operation will assign the correspondent <x id="PH" equiv-text="correspondent.name"/> to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">159</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5197985579238314950" datatype="html">
+        <source>This operation will remove the correspondent from all <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5393409374423140648" datatype="html">
+        <source>Confirm document type assignment</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">190</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="471313288900612996" datatype="html">
+        <source>This operation will assign the document type <x id="PH" equiv-text="documentType.name"/> to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">192</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6005206188202839923" datatype="html">
+        <source>This operation will remove the document type from all <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">194</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="749430623564850405" datatype="html">
+        <source>Delete confirm</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">219</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3928393581343272038" datatype="html">
+        <source>This operation will permanently delete all <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">220</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5641451190833696892" datatype="html">
+        <source>This operation cannot be undone.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">221</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6734339521247847366" datatype="html">
+        <source>Delete document(s)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">223</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8b0609df23817024b3bed12beb9b64fc1009f588" datatype="html">
+        <source>Select:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="dfc3c34e182ea73c5d784ff7c8135f087992dac1" datatype="html">
+        <source>All</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="907df6a2b68daecc3c399cf40a764b358bd9fd84" datatype="html">
+        <source>Edit:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="27d158b47717ff9305d19866960418c603f19d55" datatype="html">
+        <source>Save current view</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4eb84de23219c85432e38fb4fbdeb6c0f103ff8b" datatype="html">
+        <source>Show all</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="61e0f26d843eec0b33ff475e111b0c2f7a80b835" datatype="html">
+        <source>Statistics</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="46c8fe557cf52c9389783627d4f85453f4ddb459" datatype="html">
+        <source>Documents in inbox: <x id="INTERPOLATION" equiv-text="{{statistics.documents_inbox}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438" datatype="html">
+        <source>Total documents: <x id="INTERPOLATION" equiv-text="{{statistics.documents_total}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8705589528094706681" datatype="html">
+        <source>The document has been uploaded and will be processed by the consumer shortly.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4956689020592747108" datatype="html">
+        <source>There was an error while uploading the document: <x id="PH" equiv-text="error.error.document"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7554858521017940575" datatype="html">
+        <source>An error has occurred while uploading the document. Sorry!</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e022072b3e4dd77e3f09960817ef3359a49963b3" datatype="html">
+        <source>Upload new documents</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="52d5d56b6667ba3f7c759cbc0d4c39d34a99701e" datatype="html">
+        <source>Drop documents here or</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="865c511f4a24558ed0e954f9bbbff557bbb8954d" datatype="html">
+        <source>Browse files</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1be5ea6494cb95abc74f42ee9cfddb7ba3a53709" datatype="html">
+        <source>Uploading <x id="INTERPOLATION" equiv-text="{{uploadStatus.length}}"/> file(s)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="45854ddec74086b271e62be6a363f4fa5036f7fc" datatype="html">
+        <source>First steps</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a0dc8218a6fcc5d11a4723ed127bd6be9d6d3ef3" datatype="html">
+        <source>Paperless is running! :)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="73d73c4f994d21fcb441cf316884db54693be3fa" datatype="html">
+        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they&apos;ll start showing up in the documents list. After you&apos;ve added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as &apos;Recently added&apos;, &apos;Tagged TODO&apos;) and have them displayed on the dashboard instead of this message.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">6,7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0b87e4267fd45103b1a9c474d243b3366dbf12ee" datatype="html">
+        <source>Paperless offers some more features that try to make your life easier, such as:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="edb41dc36af2e70789d8e3422325d930e783253e" datatype="html">
+        <source>Once you&apos;ve got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9dca488928c0b7af46c3866f86a6c2c8548399aa" datatype="html">
+        <source>You can configure paperless to read your mails and add documents from attached files.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d282f6277cbf6704f697170d2ad19ce500790e20" datatype="html">
+        <source>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="218403386307979629" datatype="html">
+        <source>Metadata</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3797570084942068182" datatype="html">
+        <source>Select</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7103181924469214926" datatype="html">
+        <source>Please select an object</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2807800733729323332" datatype="html">
+        <source>Yes</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3542042671420335679" datatype="html">
+        <source>No</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7536524521722799066" datatype="html">
+        <source>(no title)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/document-title.pipe.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1519954996184640001" datatype="html">
+        <source>Error</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5037437391296624618" datatype="html">
+        <source>Information</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2691296884221415710" datatype="html">
+        <source>Correspondent</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5066119607229701477" datatype="html">
+        <source>Document type</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="5701618810648052610" datatype="html">
+        <source>Title</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">18</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">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4207916966377787111" datatype="html">
+        <source>Created</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="231679111972850796" datatype="html">
+        <source>Added</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3553216189604488439" datatype="html">
+        <source>Modified</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2056433880533904076" datatype="html">
+        <source>Light blue</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4082253113407591781" datatype="html">
+        <source>Blue</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1143414876575720034" datatype="html">
+        <source>Light green</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="119581980963263815" datatype="html">
+        <source>Green</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3250646524116252719" datatype="html">
+        <source>Light red</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1628552745302385832" datatype="html">
+        <source>Red </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5479028842846122610" datatype="html">
+        <source>Light orange</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8598918991528773310" datatype="html">
+        <source>Orange</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1789283185177957430" datatype="html">
+        <source>Light violet</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2682868487071320453" datatype="html">
+        <source>Violet</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1449010446077321264" datatype="html">
+        <source>Brown</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="30300572504753589" datatype="html">
+        <source>Black</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="461048771215121187" datatype="html">
+        <source>Light grey</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4561076822163447092" datatype="html">
+        <source>Create new item</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5324147361912094446" datatype="html">
+        <source>Edit item</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1699589597032579396" datatype="html">
+        <source>Could not save element: <x id="PH" equiv-text="error"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="810888510148304696" datatype="html">
+        <source>Automatic</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5044611416737085530" datatype="html">
+        <source>Do you really want to delete this element?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8371896857609524947" datatype="html">
+        <source>Associated documents will not be deleted.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7022070615528435141" datatype="html">
+        <source>Delete</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">97</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3184700926171002527" datatype="html">
+        <source>Any</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1616102757855967475" datatype="html">
+        <source>All</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1968183742008490888" datatype="html">
+        <source>Literal</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1338733395833138319" datatype="html">
+        <source>Regular expression</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="701356546322112069" datatype="html">
+        <source>Fuzzy match</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="616064537937996961" datatype="html">
+        <source>Auto</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>

From 5395208b00d437ca875208cc14c191cca532ebce Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 00:26:06 +0100
Subject: [PATCH 0498/1300] add initial localization support for the front end
 #215

---
 src-ui/angular.json                | 7 +++++++
 src/documents/templates/index.html | 8 ++++----
 src/documents/views.py             | 5 +++++
 src/paperless/settings.py          | 8 ++++++++
 src/paperless/urls.py              | 3 ++-
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index 79233eeda..514b351fc 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -13,6 +13,12 @@
 			"root": "",
 			"sourceRoot": "src",
 			"prefix": "app",
+			"i18n": {
+				"sourceLocale": "en-US",
+				"locales": {
+					"de": "src/locale/messages.de-DE.xlf"
+				}
+			},
 			"architect": {
 				"build": {
 					"builder": "@angular-devkit/build-angular:browser",
@@ -23,6 +29,7 @@
 						"main": "src/main.ts",
 						"polyfills": "src/polyfills.ts",
 						"tsConfig": "tsconfig.app.json",
+						"localize": true,
 						"aot": true,
 						"assets": [
 							"src/favicon.ico",
diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html
index 47a352cd5..c95e4b15f 100644
--- a/src/documents/templates/index.html
+++ b/src/documents/templates/index.html
@@ -12,11 +12,11 @@
 	<meta name="full_name" content="{{full_name}}">
 	<meta name="cookie_prefix" content="{{cookie_prefix}}">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-<link rel="stylesheet" href="{% static 'frontend/styles.css' %}"></head>
+<link rel="stylesheet" href="{% static styles_css %}"></head>
 <body>
   <app-root>Loading...</app-root>
-	<script src="{% static 'frontend/runtime.js' %}" defer></script>
-	<script src="{% static 'frontend/polyfills.js' %}" defer></script>
-	<script src="{% static 'frontend/main.js' %}" defer></script>
+	<script src="{% static runtime_js %}" defer></script>
+	<script src="{% static polyfills_js %}" defer></script>
+	<script src="{% static main_js %}" defer></script>
 </body>
 </html>
diff --git a/src/documents/views.py b/src/documents/views.py
index 32b88a18f..7dc3ae3e6 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -7,6 +7,7 @@ from django.conf import settings
 from django.db.models import Count, Max, Case, When, IntegerField
 from django.db.models.functions import Lower
 from django.http import HttpResponse, HttpResponseBadRequest, Http404
+from django.utils.translation import get_language
 from django.views.decorators.cache import cache_control
 from django.views.generic import TemplateView
 from django_filters.rest_framework import DjangoFilterBackend
@@ -61,6 +62,10 @@ class IndexView(TemplateView):
         context['cookie_prefix'] = settings.COOKIE_PREFIX
         context['username'] = self.request.user.username
         context['full_name'] = self.request.user.get_full_name()
+        context['styles_css'] = f"frontend/{get_language()}/styles.css"
+        context['runtime_js'] = f"frontend/{get_language()}/runtime.js"
+        context['polyfills_js'] = f"frontend/{get_language()}/polyfills.js"
+        context['main_js'] = f"frontend/{get_language()}/main.js"
         return context
 
 
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 5af1be85e..b59968dea 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -6,6 +6,8 @@ import re
 
 from dotenv import load_dotenv
 
+from django.utils.translation import gettext_lazy as _
+
 # Tap paperless.conf if it's available
 if os.path.exists("../paperless.conf"):
     load_dotenv("../paperless.conf")
@@ -117,6 +119,7 @@ MIDDLEWARE = [
     'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -246,6 +249,11 @@ if os.getenv("PAPERLESS_DBHOST"):
 
 LANGUAGE_CODE = 'en-us'
 
+LANGUAGES = [
+    ("en-us", _("English")),
+    ("de", _("German"))
+]
+
 TIME_ZONE = os.getenv("PAPERLESS_TIME_ZONE", "UTC")
 
 USE_I18N = True
diff --git a/src/paperless/urls.py b/src/paperless/urls.py
index 39e99a7a4..e44762aee 100755
--- a/src/paperless/urls.py
+++ b/src/paperless/urls.py
@@ -88,7 +88,8 @@ urlpatterns = [
 
     # Frontend assets TODO: this is pretty bad, but it works.
     path('assets/<path:path>',
-         RedirectView.as_view(url='/static/frontend/assets/%(path)s')),
+         RedirectView.as_view(url='/static/frontend/en-us/assets/%(path)s')),
+    # TODO: with localization, this is even worse! :/
 
     # login, logout
     path('accounts/', include('django.contrib.auth.urls')),

From a91958bfe13cc065b1fe2e6c5494181de5f044e1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 01:39:06 +0100
Subject: [PATCH 0499/1300] add translation support to the backend #215

---
 src/locale/de/LC_MESSAGES/django.po | 27 +++++++++++++++++++++++++++
 src/paperless/settings.py           |  4 ++++
 2 files changed, 31 insertions(+)
 create mode 100644 src/locale/de/LC_MESSAGES/django.po

diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po
new file mode 100644
index 000000000..bbab220a7
--- /dev/null
+++ b/src/locale/de/LC_MESSAGES/django.po
@@ -0,0 +1,27 @@
+# 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.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-12-30 00:37+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: paperless/settings.py:253
+msgid "English"
+msgstr ""
+
+#: paperless/settings.py:254
+msgid "German"
+msgstr ""
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index b59968dea..783da188a 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -254,6 +254,10 @@ LANGUAGES = [
     ("de", _("German"))
 ]
 
+LOCALE_PATHS = [
+    os.path.join(BASE_DIR, "locale")
+]
+
 TIME_ZONE = os.getenv("PAPERLESS_TIME_ZONE", "UTC")
 
 USE_I18N = True

From db4b62163176f16220f2684c6e237ec3300c7939 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 00:24:42 +0100
Subject: [PATCH 0500/1300] angular message file

---
 src-ui/messages.xlf | 1562 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1562 insertions(+)
 create mode 100644 src-ui/messages.xlf

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
new file mode 100644
index 000000000..6270f5373
--- /dev/null
+++ b/src-ui/messages.xlf
@@ -0,0 +1,1562 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file source-language="en-US" datatype="plaintext" original="ng2.template">
+    <body>
+      <trans-unit id="4733307402565258070" datatype="html">
+        <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">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2155249406916744630" datatype="html">
+        <source>View &quot;<x id="PH" equiv-text="this.list.savedView.name"/>&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">84</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">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9ca82952a6bc860b5391d5975322d8af8ceddfa4" datatype="html">
+        <source>Select</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7e1f9a7054aff842832620c03dedae894787ba41" datatype="html">
+        <source>Select none</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9" datatype="html">
+        <source>Select page</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74" datatype="html">
+        <source>Select all</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ec97f67072a83aaa972536b18d83179f6e4bbec9" datatype="html">
+        <source>Sort by</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b7641aed03492978b4ec6843b1e53f30464294d9" datatype="html">
+        <source>Views</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b69d81ff62cdc22b6bf88fe0b72dc1f66ccfa44f" datatype="html">
+        <source>Save as...</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="72e7d343f9165602cce1ca7faffbc565fd31ef92" datatype="html">
+        <source>Save &quot;<x id="INTERPOLATION" equiv-text="{{list.savedViewTitle}}"/>&quot;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="546b2014cc578af06b6023a7f38fa77aa9d58f5d" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {document} other {documents}}</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3c298bb50741c8b2641889b0a0e0009769e66370" datatype="html">
+        <source>Selected <x id="INTERPOLATION" equiv-text="{{list.selected.size}}"/> of <x id="INTERPOLATION_1" equiv-text="{{list.collectionSize || 0}}"/> <x id="ICU" equiv-text="{list.collectionSize, plural, =1 {document} other {documents}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8b04a8e375ac6760a54aabaf5df0287d53ce4a4a" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {1 document} other {<x id="INTERPOLATION"/> documents}}</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ca0b795795658155d44ddca02e95f1feeeb4a88f" datatype="html">
+        <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">100</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">101</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">102</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">103</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">104</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">105</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">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5277522254327902345" datatype="html">
+        <source>Do you really want to delete document &apos;<x id="PH" equiv-text="this.document.title"/>&apos;?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">162</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">163</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">165</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7" datatype="html">
+        <source>Delete</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="dc75033a5238fdc4f462212c847a45ba8018a3fd" datatype="html">
+        <source>Download</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4ea3c236bca3528318e3b3a411a20909e5fa8be4" datatype="html">
+        <source>More like this</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f4e529ae5ffd73001d1ff4bbdeeb0a72e342e5c8" datatype="html">
+        <source>Close</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4f8b2bb476981727ab34ed40fde1218361f92c45" datatype="html">
+        <source>Details</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4ab4cb601522b9194922554d934c4c30bd93567d" datatype="html">
+        <source>Content</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f721a500a68c357e8f2a01e60510f6a01e4ba529" datatype="html">
+        <source>Metadata</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7" datatype="html">
+        <source>Discard</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="52c9a103b812f258bcddc3d90a6e3f46871d25fe" datatype="html">
+        <source>Save</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3" datatype="html">
+        <source>Page</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c972a8e7d09f86e0c408a80349990fb213b32c08" datatype="html">
+        <source>of <x id="INTERPOLATION" equiv-text="{{previewNumPages}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a071e35fecc10753065b1cb5b38608be66da2c8b" datatype="html">
+        <source>Download original</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9b3996b5ddcc628a999a7df72fbfc2a2eae8c8a5" datatype="html">
+        <source>Archive serial number</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="30eebc2dd656dbcb259d8d5286d244ee397d63bd" datatype="html">
+        <source>Date created</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cafc87479686947e2590b9f588a88040aeaf660b" datatype="html">
+        <source>Tags</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
+        <source>Date modified</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269" datatype="html">
+        <source>Date added</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3" datatype="html">
+        <source>Media filename</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">99</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8" datatype="html">
+        <source>Original MD5 checksum</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e92ca184ea785769fb26138fc25ee9fa06fff6e5" datatype="html">
+        <source>Original file size</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd" datatype="html">
+        <source>Original mime type</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="edbf54e4117606b5dd87aaea3c14b21ebf398020" datatype="html">
+        <source>Archive MD5 checksum</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e6bf12eadecbfd80016eca15fa78651c6ca90c64" datatype="html">
+        <source>Archive file size</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">119</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f" datatype="html">
+        <source>Original document metadata</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7174dcea4a3d0b743e7e4a78747e902230727f67" datatype="html">
+        <source>Archived document metadata</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">126</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3fb9f1a31c3798173b2fea72638732c783b152fe" datatype="html">
+        <source>Save &amp; next</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8765497970646365998" datatype="html">
+        <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ng!</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7016571167317583872" datatype="html">
+        <source>Welcome to Paperless-ng!</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f65253954b66e929a8b4d5ecaf61f9129f8cec64" datatype="html">
+        <source>Dashboard</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2133075428913430816" datatype="html">
+        <source>Do you really want to delete the tag <x id="PH" equiv-text="object.name"/>?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="70a67e04629f6d412db0a12d51820b480788d795" datatype="html">
+        <source>Create</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cff1428d10d59d14e45edec3c735a27b5482db59" datatype="html">
+        <source>Name</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8fa4d523f7b91df4390120b85ed0406138273e1a" datatype="html">
+        <source>Color</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d0c4488f742efeba0915e90e285a022da813deff" datatype="html">
+        <source>Matching</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9bcf8d20d23c111eca1431abd2d2ce0de324499c" datatype="html">
+        <source>Document count</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="030b4423b92167200e39519599f9b863b4f7c62c" datatype="html">
+        <source>Actions</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9d51b3c90afda70700229d1b8a55371c13cb3bce" datatype="html">
+        <source>Documents</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="28f86ffd419b869711aa13f5e5ff54be6d70731c" datatype="html">
+        <source>Edit</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3954409824493602446" datatype="html">
+        <source>Do you really want to delete the document type <x id="PH" equiv-text="object.name"/>?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8" datatype="html">
+        <source>Document types</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="eb3d5aefff38a814b76da74371cbf02c0789a1ef" datatype="html">
+        <source>Logs</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5ca707824ab93066c7d9b44e1b8bf216725c2c22" datatype="html">
+        <source>Filter</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1153806754022288374" datatype="html">
+        <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/> deleted.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5647210819299459618" datatype="html">
+        <source>Settings saved successfully.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8488620293789898901" datatype="html">
+        <source>Error while storing settings on server: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">73</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="11ebd254cc9294717105c5982eb0cd2af30a446d" datatype="html">
+        <source>General settings</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="99dee94e92dbd9e21a008d4569f9719ed206ae37" datatype="html">
+        <source>Saved views</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0d8ceb153aa715eb905da0710cc0b2ac73159abc" datatype="html">
+        <source>Document list</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2045151788cbdda7512752e408da59a6b54a8ef0" datatype="html">
+        <source>Items per page</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3863a86cd9e69a61d143d3daf51df44203df4a82" datatype="html">
+        <source>Bulk editing</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586" datatype="html">
+        <source>Show confirmation dialogs</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a" datatype="html">
+        <source>Deleting documents will always ask for confirmation.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8cfddc13e04f5545ac63f419ef363505d6f78c2e" datatype="html">
+        <source>Apply on close</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8cb90334f5dfd7fc67205085f59381e2a334ccfc" datatype="html">
+        <source>Appears on</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">53</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5" datatype="html">
+        <source>Show on dashboard</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="541bfc5b123b3f8867fd681eaceefb663a811973" datatype="html">
+        <source>Show in sidebar</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">60</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="abba764a7a595d04dc8c3b26e04b3780d4fdb540" datatype="html">
+        <source>No saved views defined.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ef60a738a565f498b858e903e42bc5ffc3cc1299" datatype="html">
+        <source>404 Not Found</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/not-found/not-found.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2337099367951805921" datatype="html">
+        <source>Do you really want to delete the correspondent <x id="PH" equiv-text="object.name"/>?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c3f3334de899327bf3ec8999236e10798ff76e72" datatype="html">
+        <source>Correspondents</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0488919cff4fcc2174d34e4a1167f1b3c586ca37" datatype="html">
+        <source>Last correspondence</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1234709746630139322" datatype="html">
+        <source>Confirmation</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9178182467454450952" datatype="html">
+        <source>Confirm</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6457471243969293847" datatype="html">
+        <source>Create new correspondent</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2059822531169388684" datatype="html">
+        <source>Edit correspondent</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3025930461519142465" datatype="html">
+        <source>Could not save correspondent: <x id="PH" equiv-text="error"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3d5caa52b0a51bfd2757215f7614183554d740f0" datatype="html">
+        <source>Matching algorithm</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="180092a6b8a6151a05f4a7552a2fb75fd159dfa8" datatype="html">
+        <source>Match</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a1923dd970db4f74b4417b80b4a14e250fd116ff" datatype="html">
+        <source>Auto matching does not require you to fill in this field.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="632e529f49cf3d367dfbd15bd055e9b53aef30fb" datatype="html">
+        <source>Case insensitive</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="85e19678590a8b3ac1dff9d69c7a7610d1742e5a" datatype="html">
+        <source>Auto matching ignores this option.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d7b35c384aecd25a516200d6921836374613dfe7" datatype="html">
+        <source>Cancel</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9153094873118985366" datatype="html">
+        <source>Create new tag</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5872175735754226507" datatype="html">
+        <source>Edit tag</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2861521377141790537" datatype="html">
+        <source>Could not save tag: <x id="PH" equiv-text="error"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42" datatype="html">
+        <source>Inbox tag</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5e2f1a4ea12a1b8606ee3f0548d0ba64bf266077" datatype="html">
+        <source>Inbox tags are automatically assigned to all consumed documents.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6672809941092516947" datatype="html">
+        <source>Create new document type</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="36335016091244220" datatype="html">
+        <source>Edit document type</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5647767513381010218" datatype="html">
+        <source>Could not save document type: <x id="PH" equiv-text="error"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</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">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+        <note priority="1" from="description">app title</note>
+      </trans-unit>
+      <trans-unit id="8d667444401ef6380fd262e4fe4795f261a427b1" datatype="html">
+        <source>Search for documents</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="68949525c4d9a901e0cd15a94e3fc8d2711e9918" datatype="html">
+        <source>Manage</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">77</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
+        <source>Settings</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="408cb6073e60c5d966296a3207fc596adca75e01" datatype="html">
+        <source>Admin</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">119</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="46aa32e581922d6d2c3d7bc4c87209ad5808b029" datatype="html">
+        <source>Misc</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7" datatype="html">
+        <source>Documentation</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">132</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="355a222236bc01b9a8cd3cb9ecf76891125aed69" datatype="html">
+        <source>GitHub</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">139</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bb694b49d408265c91c62799c2b3a7e3151c824d" datatype="html">
+        <source>Logout</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">146</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4f55b670f49d927c6026bb614c7c62b1f2a394c0" datatype="html">
+        <source>Open documents</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">57</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="dca5bf9344a759fa5a07f1b21f50286ec242ba44" datatype="html">
+        <source>Close all</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">71</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">28</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">31</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">34</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ddb40946e790522301687ecddb9ce1cb8ad40dd1" datatype="html">
+        <source>Filter by:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2f33515a935c36763660e8420940b8a7e11fb1f4" datatype="html">
+        <source>Clear all filters</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7593728289020204896" datatype="html">
+        <source>Not assigned</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
+          <context context-type="linenumber">145</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c2d0ac9f528bbd5f53fd34269fde8b59e029621b" datatype="html">
+        <source>Apply</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4873149362496451858" datatype="html">
+        <source>Last 7 days</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4463380307954693363" datatype="html">
+        <source>Last month</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8697368973702409683" datatype="html">
+        <source>Last 3 months</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3566342898065860218" datatype="html">
+        <source>Last year</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="be2add3a3d9e4e2556b8f9048a15a9c0f00bf1ad" datatype="html">
+        <source>After</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8785188e6c678b842fcb93b7392faf86db7ec676" datatype="html">
+        <source>Before</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="99ee4faa69cd2ea8e3678c1f557c0ff1f05aae46" datatype="html">
+        <source>Clear</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6829218544e108e152f5fa72cb79c4ccb82e0d06" datatype="html">
+        <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="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60" datatype="html">
+        <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">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e" datatype="html">
+        <source>Created: <x id="INTERPOLATION" equiv-text="{{document.created | date}}"/></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">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8" datatype="html">
+        <source>Filter by correspondent</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">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bdb9a910523610254872e147222689e9a4115b84" datatype="html">
+        <source>Filter by tag</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">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2840db547019ce8c76b2cdbe3a1653c5b68b06af" datatype="html">
+        <source>View in browser</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-group>
+      </trans-unit>
+      <trans-unit id="5033601776243148314" datatype="html">
+        <source><x id="PH" equiv-text="items[0].name"/> and <x id="PH_1" equiv-text="items[1].name"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="760986369763309193" datatype="html">
+        <source>, </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4137232459980262849" datatype="html">
+        <source>Confirm tags assignment</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5778291417880283825" datatype="html">
+        <source>This operation will add the tag <x id="PH" equiv-text="tag.name"/> to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4791265247184178563" datatype="html">
+        <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToAdd)"/> to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">120</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7202114001606049276" datatype="html">
+        <source>This operation will remove the tag <x id="PH" equiv-text="tag.name"/> from all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="247266594076352528" datatype="html">
+        <source>This operation will remove the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToRemove)"/> from all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4286636723521919383" datatype="html">
+        <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToAdd)"/> and remove the tags <x id="PH_1" equiv-text="this._localizeList(changedTags.itemsToRemove)"/> on all <x id="PH_2" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">127</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2996713129519325161" datatype="html">
+        <source>Confirm correspondent assignment</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">157</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9000739289559833849" datatype="html">
+        <source>This operation will assign the correspondent <x id="PH" equiv-text="correspondent.name"/> to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">159</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5197985579238314950" datatype="html">
+        <source>This operation will remove the correspondent from all <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5393409374423140648" datatype="html">
+        <source>Confirm document type assignment</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">190</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="471313288900612996" datatype="html">
+        <source>This operation will assign the document type <x id="PH" equiv-text="documentType.name"/> to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">192</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6005206188202839923" datatype="html">
+        <source>This operation will remove the document type from all <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">194</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="749430623564850405" datatype="html">
+        <source>Delete confirm</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">219</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3928393581343272038" datatype="html">
+        <source>This operation will permanently delete all <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">220</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5641451190833696892" datatype="html">
+        <source>This operation cannot be undone.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">221</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6734339521247847366" datatype="html">
+        <source>Delete document(s)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">223</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8b0609df23817024b3bed12beb9b64fc1009f588" datatype="html">
+        <source>Select:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="dfc3c34e182ea73c5d784ff7c8135f087992dac1" datatype="html">
+        <source>All</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="907df6a2b68daecc3c399cf40a764b358bd9fd84" datatype="html">
+        <source>Edit:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="27d158b47717ff9305d19866960418c603f19d55" datatype="html">
+        <source>Save current view</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4eb84de23219c85432e38fb4fbdeb6c0f103ff8b" datatype="html">
+        <source>Show all</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="61e0f26d843eec0b33ff475e111b0c2f7a80b835" datatype="html">
+        <source>Statistics</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="46c8fe557cf52c9389783627d4f85453f4ddb459" datatype="html">
+        <source>Documents in inbox: <x id="INTERPOLATION" equiv-text="{{statistics.documents_inbox}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438" datatype="html">
+        <source>Total documents: <x id="INTERPOLATION" equiv-text="{{statistics.documents_total}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8705589528094706681" datatype="html">
+        <source>The document has been uploaded and will be processed by the consumer shortly.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4956689020592747108" datatype="html">
+        <source>There was an error while uploading the document: <x id="PH" equiv-text="error.error.document"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7554858521017940575" datatype="html">
+        <source>An error has occurred while uploading the document. Sorry!</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e022072b3e4dd77e3f09960817ef3359a49963b3" datatype="html">
+        <source>Upload new documents</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="52d5d56b6667ba3f7c759cbc0d4c39d34a99701e" datatype="html">
+        <source>Drop documents here or</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="865c511f4a24558ed0e954f9bbbff557bbb8954d" datatype="html">
+        <source>Browse files</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1be5ea6494cb95abc74f42ee9cfddb7ba3a53709" datatype="html">
+        <source>Uploading <x id="INTERPOLATION" equiv-text="{{uploadStatus.length}}"/> file(s)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="45854ddec74086b271e62be6a363f4fa5036f7fc" datatype="html">
+        <source>First steps</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a0dc8218a6fcc5d11a4723ed127bd6be9d6d3ef3" datatype="html">
+        <source>Paperless is running! :)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="73d73c4f994d21fcb441cf316884db54693be3fa" datatype="html">
+        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they&apos;ll start showing up in the documents list. After you&apos;ve added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as &apos;Recently added&apos;, &apos;Tagged TODO&apos;) and have them displayed on the dashboard instead of this message.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">6,7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0b87e4267fd45103b1a9c474d243b3366dbf12ee" datatype="html">
+        <source>Paperless offers some more features that try to make your life easier, such as:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="edb41dc36af2e70789d8e3422325d930e783253e" datatype="html">
+        <source>Once you&apos;ve got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9dca488928c0b7af46c3866f86a6c2c8548399aa" datatype="html">
+        <source>You can configure paperless to read your mails and add documents from attached files.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d282f6277cbf6704f697170d2ad19ce500790e20" datatype="html">
+        <source>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="218403386307979629" datatype="html">
+        <source>Metadata</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3797570084942068182" datatype="html">
+        <source>Select</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7103181924469214926" datatype="html">
+        <source>Please select an object</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2807800733729323332" datatype="html">
+        <source>Yes</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3542042671420335679" datatype="html">
+        <source>No</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7536524521722799066" datatype="html">
+        <source>(no title)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/document-title.pipe.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1519954996184640001" datatype="html">
+        <source>Error</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5037437391296624618" datatype="html">
+        <source>Information</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2691296884221415710" datatype="html">
+        <source>Correspondent</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5066119607229701477" datatype="html">
+        <source>Document type</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="5701618810648052610" datatype="html">
+        <source>Title</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">18</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">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4207916966377787111" datatype="html">
+        <source>Created</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="231679111972850796" datatype="html">
+        <source>Added</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3553216189604488439" datatype="html">
+        <source>Modified</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2056433880533904076" datatype="html">
+        <source>Light blue</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4082253113407591781" datatype="html">
+        <source>Blue</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1143414876575720034" datatype="html">
+        <source>Light green</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="119581980963263815" datatype="html">
+        <source>Green</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3250646524116252719" datatype="html">
+        <source>Light red</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1628552745302385832" datatype="html">
+        <source>Red </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5479028842846122610" datatype="html">
+        <source>Light orange</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8598918991528773310" datatype="html">
+        <source>Orange</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1789283185177957430" datatype="html">
+        <source>Light violet</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2682868487071320453" datatype="html">
+        <source>Violet</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1449010446077321264" datatype="html">
+        <source>Brown</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="30300572504753589" datatype="html">
+        <source>Black</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="461048771215121187" datatype="html">
+        <source>Light grey</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4561076822163447092" datatype="html">
+        <source>Create new item</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5324147361912094446" datatype="html">
+        <source>Edit item</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1699589597032579396" datatype="html">
+        <source>Could not save element: <x id="PH" equiv-text="error"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="810888510148304696" datatype="html">
+        <source>Automatic</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5044611416737085530" datatype="html">
+        <source>Do you really want to delete this element?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8371896857609524947" datatype="html">
+        <source>Associated documents will not be deleted.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7022070615528435141" datatype="html">
+        <source>Delete</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">97</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3184700926171002527" datatype="html">
+        <source>Any</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1616102757855967475" datatype="html">
+        <source>All</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1968183742008490888" datatype="html">
+        <source>Literal</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1338733395833138319" datatype="html">
+        <source>Regular expression</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="701356546322112069" datatype="html">
+        <source>Fuzzy match</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="616064537937996961" datatype="html">
+        <source>Auto</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>

From a67443c195047cfebf0338e7e071941118497039 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 29 Dec 2020 16:53:42 -0800
Subject: [PATCH 0501/1300] Compatability with new settings service

---
 src-ui/src/app/services/app-view.service.ts | 14 +++++++++-----
 src-ui/src/app/services/settings.service.ts |  6 +++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/services/app-view.service.ts b/src-ui/src/app/services/app-view.service.ts
index b44c8965f..6af2e43af 100644
--- a/src-ui/src/app/services/app-view.service.ts
+++ b/src-ui/src/app/services/app-view.service.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
-import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
+import { SettingsService, SETTINGS_KEYS } from './settings.service';
 
 @Injectable({
   providedIn: 'root'
@@ -8,22 +8,26 @@ import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
 export class AppViewService {
   private renderer: Renderer2;
 
-  constructor(rendererFactory: RendererFactory2, @Inject(DOCUMENT) private document) {
+  constructor(
+    private settings: SettingsService,
+    private rendererFactory: RendererFactory2,
+    @Inject(DOCUMENT) private document
+  ) {
     this.renderer = rendererFactory.createRenderer(null, null);
 
     this.updateDarkModeSettings()
   }
 
   updateDarkModeSettings() {
-    let darkModeUseSystem = JSON.parse(localStorage.getItem(GENERAL_SETTINGS.DARK_MODE_USE_SYSTEM)) && GENERAL_SETTINGS.DARK_MODE_USE_SYSTEM_DEFAULT
-    let darkModeEnabled = JSON.parse(localStorage.getItem(GENERAL_SETTINGS.DARK_MODE_ENABLED)) || GENERAL_SETTINGS.DARK_MODE_ENABLED_DEFAULT
+    let darkModeUseSystem = this.settings.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM)
+    let darkModeEnabled = this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED)
 
     if (darkModeUseSystem) {
       this.renderer.addClass(this.document.body, 'color-scheme-system')
       this.renderer.removeClass(this.document.body, 'color-scheme-dark')
     } else {
       this.renderer.removeClass(this.document.body, 'color-scheme-system')
-      darkModeEnabled ? this.renderer.addClass(this.document.body, 'color-scheme-dark') : this.renderer.removeClass(this.document.body, 'dark-mode')
+      darkModeEnabled ? this.renderer.addClass(this.document.body, 'color-scheme-dark') : this.renderer.removeClass(this.document.body, 'color-scheme-dark')
     }
 
   }
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index 00e6ff639..7b1cfe9e3 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -10,12 +10,16 @@ export const SETTINGS_KEYS = {
   BULK_EDIT_CONFIRMATION_DIALOGS: 'general-settings:bulk-edit:confirmation-dialogs',
   BULK_EDIT_APPLY_ON_CLOSE: 'general-settings:bulk-edit:apply-on-close',
   DOCUMENT_LIST_SIZE: 'general-settings:documentListSize',
+  DARK_MODE_USE_SYSTEM: 'general-settings:dark-mode:use-system',
+  DARK_MODE_ENABLED: 'general-settings:dark-mode:enabled'
 }
 
 const SETTINGS: PaperlessSettings[] = [
   {key: SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS, type: "boolean", default: true},
   {key: SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, type: "boolean", default: false},
-  {key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, type: "number", default: 50}
+  {key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, type: "number", default: 50},
+  {key: SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, type: "boolean", default: true},
+  {key: SETTINGS_KEYS.DARK_MODE_ENABLED, type: "boolean", default: false}
 ]
 
 @Injectable({

From ebe2ba401d6ba43c6ccb79881ae9e4003216ef3c Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 29 Dec 2020 16:58:19 -0800
Subject: [PATCH 0502/1300] Consistent settings screen

---
 .../manage/settings/settings.component.html          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index d15c7fe2b..93c7c98b4 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -39,14 +39,16 @@
               <label class="custom-control-label" for="darkModeEnabled">Enabled</label>
             </div>
           </div>
-
-  
         </div>
 
-        <h4 i18n>Bulk editing</h4>
+        <h4 class="mt-4" i18n>Bulk editing</h4>
 
-        <app-input-check i18n-title title="Show confirmation dialogs" formControlName="bulkEditConfirmationDialogs" i18n-hint hint="Deleting documents will always ask for confirmation."></app-input-check>
-        <app-input-check i18n-title title="Apply on close" formControlName="bulkEditApplyOnClose"></app-input-check>
+        <div class="form-row form-group">
+          <div class="offset-md-3 col">
+            <app-input-check i18n-title title="Show confirmation dialogs" formControlName="bulkEditConfirmationDialogs" i18n-hint hint="Deleting documents will always ask for confirmation."></app-input-check>
+            <app-input-check i18n-title title="Apply on close" formControlName="bulkEditApplyOnClose"></app-input-check>
+          </div>
+        </div>
 
       </ng-template>
     </li>

From 57da323cea85bf65f50ed4c0d7e77cddf46ccae9 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <dev@jpwinkler.de>
Date: Wed, 30 Dec 2020 03:39:25 +0100
Subject: [PATCH 0503/1300] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eea41ce05..5c5fa4a76 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/jonaswinkler/paperless-ng.svg?branch=master)](https://travis-ci.org/jonaswinkler/paperless-ng)
+[![Build Status](https://travis-ci.com/jonaswinkler/paperless-ng.svg?branch=master)](https://travis-ci.com/jonaswinkler/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)

From 118149c53907e52b9ae84eaf424f14fec748b0be Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 11:33:56 +0100
Subject: [PATCH 0504/1300] more translation work

---
 src-ui/messages.xlf                           | 94 ++++++++++++++-----
 .../filterable-dropdown.component.html        |  2 +-
 .../filterable-dropdown.component.ts          |  5 +-
 .../upload-file-widget.component.html         |  2 +-
 .../welcome-widget.component.html             |  4 +-
 .../bulk-editor/bulk-editor.component.html    |  9 +-
 .../bulk-editor/bulk-editor.component.ts      | 14 +--
 .../filter-editor.component.html              | 38 ++++++--
 .../correspondent-list.component.ts           |  2 +-
 .../document-type-list.component.ts           |  2 +-
 .../manage/tag-list/tag-list.component.ts     |  3 +-
 11 files changed, 126 insertions(+), 49 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 6270f5373..18eeec0ef 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -373,11 +373,11 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2133075428913430816" datatype="html">
-        <source>Do you really want to delete the tag <x id="PH" equiv-text="object.name"/>?</source>
+      <trans-unit id="93754014749412887" datatype="html">
+        <source>Do you really want to delete the tag &quot;<x id="PH" equiv-text="object.name"/>&quot;?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
-          <context context-type="linenumber">30</context>
+          <context context-type="linenumber">31</context>
         </context-group>
       </trans-unit>
       <trans-unit id="70a67e04629f6d412db0a12d51820b480788d795" datatype="html">
@@ -436,8 +436,8 @@
           <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="3954409824493602446" datatype="html">
-        <source>Do you really want to delete the document type <x id="PH" equiv-text="object.name"/>?</source>
+      <trans-unit id="4990731724078522539" datatype="html">
+        <source>Do you really want to delete the document type &quot;<x id="PH" equiv-text="object.name"/>&quot;?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
           <context context-type="linenumber">26</context>
@@ -576,8 +576,8 @@
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2337099367951805921" datatype="html">
-        <source>Do you really want to delete the correspondent <x id="PH" equiv-text="object.name"/>?</source>
+      <trans-unit id="7427874343955308724" datatype="html">
+        <source>Do you really want to delete the correspondent &quot;<x id="PH" equiv-text="object.name"/>&quot;?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
           <context context-type="linenumber">26</context>
@@ -878,11 +878,32 @@
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="02d184c288f567825a1fcbf83bcd3099a10853d5" datatype="html">
+        <source>Filter tags</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4b089ca12c472cf0b46167bb5afe4b527b301bbc" datatype="html">
+        <source>Filter correspondents</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0ad509732aaf702b7ea8c771c7809fa84bc85908" datatype="html">
+        <source>Filter document types</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="2f33515a935c36763660e8420940b8a7e11fb1f4" datatype="html">
         <source>Clear all filters</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">47</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7593728289020204896" datatype="html">
@@ -891,6 +912,7 @@
           <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
           <context context-type="linenumber">145</context>
         </context-group>
+        <note priority="1" from="description">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
       </trans-unit>
       <trans-unit id="c2d0ac9f528bbd5f53fd34269fde8b59e029621b" datatype="html">
         <source>Apply</source>
@@ -990,12 +1012,20 @@
           <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5033601776243148314" datatype="html">
-        <source><x id="PH" equiv-text="items[0].name"/> and <x id="PH_1" equiv-text="items[1].name"/></source>
+      <trans-unit id="8639884465898458690" datatype="html">
+        <source>&quot;<x id="PH" equiv-text="items[0].name"/>&quot; and &quot;<x id="PH_1" equiv-text="items[1].name"/>&quot;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">103</context>
         </context-group>
+        <note priority="1" from="description">This is for messages like &apos;modify &quot;tag1&quot; and &quot;tag2&quot;&apos;</note>
+      </trans-unit>
+      <trans-unit id="7894972847287473517" datatype="html">
+        <source>&quot;<x id="PH" equiv-text="i.name"/>&quot;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="760986369763309193" datatype="html">
         <source>, </source>
@@ -1003,6 +1033,15 @@
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">105</context>
         </context-group>
+        <note priority="1" from="description">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
+      </trans-unit>
+      <trans-unit id="1822679894391095557" datatype="html">
+        <source><x id="PH" equiv-text="list"/> and &quot;<x id="PH_1" equiv-text="items[items.length - 1].name"/>&quot;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+        <note priority="1" from="description">this is for messages like &apos;modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;&apos;</note>
       </trans-unit>
       <trans-unit id="4137232459980262849" datatype="html">
         <source>Confirm tags assignment</source>
@@ -1011,8 +1050,8 @@
           <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5778291417880283825" datatype="html">
-        <source>This operation will add the tag <x id="PH" equiv-text="tag.name"/> to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="8965789168028339624" datatype="html">
+        <source>This operation will add the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">118</context>
@@ -1025,8 +1064,8 @@
           <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="7202114001606049276" datatype="html">
-        <source>This operation will remove the tag <x id="PH" equiv-text="tag.name"/> from all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="7567916006270093567" datatype="html">
+        <source>This operation will remove the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; from all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">123</context>
@@ -1053,8 +1092,8 @@
           <context context-type="linenumber">157</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="9000739289559833849" datatype="html">
-        <source>This operation will assign the correspondent <x id="PH" equiv-text="correspondent.name"/> to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="3171547143349510312" datatype="html">
+        <source>This operation will assign the correspondent &quot;<x id="PH" equiv-text="correspondent.name"/>&quot; to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">159</context>
@@ -1074,8 +1113,8 @@
           <context context-type="linenumber">190</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="471313288900612996" datatype="html">
-        <source>This operation will assign the document type <x id="PH" equiv-text="documentType.name"/> to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="5346233369873832070" datatype="html">
+        <source>This operation will assign the document type &quot;<x id="PH" equiv-text="documentType.name"/>&quot; to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">192</context>
@@ -1214,8 +1253,15 @@
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1be5ea6494cb95abc74f42ee9cfddb7ba3a53709" datatype="html">
-        <source>Uploading <x id="INTERPOLATION" equiv-text="{{uploadStatus.length}}"/> file(s)</source>
+      <trans-unit id="a7b50b2df68e875a918d1f4f98f358d756139c13" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {file} =other {<x id="INTERPOLATION"/> files}}</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ec37c68a90632530f5cc8b7e5245cab89ef8bf82" datatype="html">
+        <source>Uploading <x id="ICU" equiv-text="{uploadStatus.length, plural, =1 {file} =other {{{uploadStatus.length}} files}}"/>...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
           <context context-type="linenumber">13</context>
@@ -1235,15 +1281,15 @@
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="73d73c4f994d21fcb441cf316884db54693be3fa" datatype="html">
-        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they&apos;ll start showing up in the documents list. After you&apos;ve added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as &apos;Recently added&apos;, &apos;Tagged TODO&apos;) and have them displayed on the dashboard instead of this message.</source>
+      <trans-unit id="80e9f19d307b1611c56aa0bdddc930d85418734c" datatype="html">
+        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they&apos;ll start showing up in the documents list. After you&apos;ve added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as &apos;Recently added&apos;, &apos;Tagged TODO&apos;) and have they will be shown on the dashboard instead of this message.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
           <context context-type="linenumber">6,7</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="0b87e4267fd45103b1a9c474d243b3366dbf12ee" datatype="html">
-        <source>Paperless offers some more features that try to make your life easier, such as:</source>
+      <trans-unit id="cf5f85690feaba6e29343f9881e57a6c0ea6e82b" datatype="html">
+        <source>Paperless offers some more features that try to make your life easier:</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
           <context context-type="linenumber">8</context>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 7215faa79..015269c17 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -16,7 +16,7 @@
     <div class="list-group list-group-flush">
       <div class="list-group-item">
         <div class="input-group input-group-sm">
-          <input class="form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
+          <input class="form-control" type="text" [(ngModel)]="filterText" [placeholder]="filterPlaceholder" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
         </div>
       </div>
       <div *ngIf="selectionModel.items" class="items">
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index 915d10677..e1aa6a06a 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -142,7 +142,7 @@ export class FilterableDropdownComponent {
     if (items) {
       this._selectionModel.items = Array.from(items)
       this._selectionModel.items.unshift({
-        name: $localize`Not assigned`,
+        name: $localize`:Filter drop down element to filter for documents with no correspondent/type/tag assigned:Not assigned`,
         id: null
       })
     }
@@ -186,6 +186,9 @@ export class FilterableDropdownComponent {
   @Input()
   title: string
 
+  @Input()
+  filterPlaceholder: string = ""
+
   @Input()
   icon: string
 
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index 91fff4e83..38aff96ab 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -10,7 +10,7 @@
       </ngx-file-drop>
     </form>
     <div *ngIf="uploadVisible" class="mt-3">
-      <p i18n>Uploading {{uploadStatus.length}} file(s)</p>
+      <p i18n>Uploading {uploadStatus.length, plural, =1 {file} =other {{{uploadStatus.length}} files}}...</p>
       <ngb-progressbar [value]="loadedSum" [max]="totalSum" [striped]="true" [animated]="uploadStatus.length > 0">
       </ngb-progressbar>
     </div>
diff --git a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html
index 6c9c34d5b..7a2bbcb3c 100644
--- a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html
@@ -4,8 +4,8 @@
     <img src="assets/save-filter.png" class="float-right">
     <p i18n>Paperless is running! :)</p>
     <p i18n>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list.
-      After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and have them displayed on the dashboard instead of this message.</p>
-    <p i18n>Paperless offers some more features that try to make your life easier, such as:</p>
+      After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and have they will be shown on the dashboard instead of this message.</p>
+    <p i18n>Paperless offers some more features that try to make your life easier:</p>
     <ul>
       <li i18n>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</li>
       <li i18n>You can configure paperless to read your mails and add documents from attached files.</li>
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 62a2bb95d..b9912ec1d 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -26,7 +26,8 @@
   <div class="col-auto mb-2 mb-xl-0">
     <div class="d-flex">
       <label class="ml-auto mt-1 mb-0 mr-2" i18n>Edit:</label>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill"
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" i18n-title
+        filterPlaceholder="Filter tags" i18n-filterPlaceholder
         [items]="tags"
         [editing]="true"
         [multiple]="true"
@@ -35,7 +36,8 @@
         [(selectionModel)]="tagSelectionModel"
         (apply)="setTags($event)">
       </app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill"
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" i18n-title
+        filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
         [items]="correspondents"
         [editing]="true"
         [applyOnClose]="applyOnClose"
@@ -43,7 +45,8 @@
         [(selectionModel)]="correspondentSelectionModel"
         (apply)="setCorrespondents($event)">
       </app-filterable-dropdown>
-      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill"
+      <app-filterable-dropdown class="mr-2 mr-md-3" title="Document type" icon="file-earmark-fill" i18n-title
+        filterPlaceholder="Filter document types" i18n-filterPlaceholder
         [items]="documentTypes"
         [editing]="true"
         [applyOnClose]="applyOnClose"
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 88efcee06..1347cb138 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -100,10 +100,10 @@ export class BulkEditorComponent {
     } else if (items.length == 1) {
       return items[0].name
     } else if (items.length == 2) {
-      return $localize`${items[0].name} and ${items[1].name}`
+      return $localize`:This is for messages like 'modify "tag1" and "tag2"':"${items[0].name}" and "${items[1].name}"`
     } else {
-      let list = items.slice(0, items.length - 1).map(i => i.name).join($localize`, `)
-      return $localize`${list} and ${items[items.length - 1].name}`
+      let list = items.slice(0, items.length - 1).map(i => $localize`"${i.name}"`).join($localize`:this is used to separate enumerations and should probably be a comma and a whitespace in most languages:, `)
+      return $localize`:this is for messages like 'modify "tag1", "tag2" and "tag3"':${list} and "${items[items.length - 1].name}"`
     }
   }
 
@@ -115,12 +115,12 @@ export class BulkEditorComponent {
       modal.componentInstance.title = $localize`Confirm tags assignment`
       if (changedTags.itemsToAdd.length == 1 && changedTags.itemsToRemove.length == 0) {
         let tag = changedTags.itemsToAdd[0]
-        modal.componentInstance.message = $localize`This operation will add the tag ${tag.name} to all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will add the tag "${tag.name}" to all ${this.list.selected.size} selected document(s).`
       } else if (changedTags.itemsToAdd.length > 1 && changedTags.itemsToRemove.length == 0) {
         modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} to all ${this.list.selected.size} selected document(s).`
       } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 1) {
         let tag = changedTags.itemsToRemove[0]
-        modal.componentInstance.message = $localize`This operation will remove the tag ${tag.name} from all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will remove the tag "${tag.name}" from all ${this.list.selected.size} selected document(s).`
       } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length > 1) {
         modal.componentInstance.message = $localize`This operation will remove the tags ${this._localizeList(changedTags.itemsToRemove)} from all ${this.list.selected.size} selected document(s).`
       } else {
@@ -156,7 +156,7 @@ export class BulkEditorComponent {
       let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
       modal.componentInstance.title = $localize`Confirm correspondent assignment`
       if (correspondent) {
-        modal.componentInstance.message = $localize`This operation will assign the correspondent ${correspondent.name} to all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will assign the correspondent "${correspondent.name}" to all ${this.list.selected.size} selected document(s).`
       } else {
         modal.componentInstance.message = $localize`This operation will remove the correspondent from all ${this.list.selected.size} selected document(s).`
       }
@@ -189,7 +189,7 @@ export class BulkEditorComponent {
       let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
       modal.componentInstance.title = $localize`Confirm document type assignment`
       if (documentType) {
-        modal.componentInstance.message = $localize`This operation will assign the document type ${documentType.name} to all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will assign the document type "${documentType.name}" to all ${this.list.selected.size} selected document(s).`
       } else {
         modal.componentInstance.message = $localize`This operation will remove the document type from all ${this.list.selected.size} selected document(s).`
       }
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index f0c83ae73..efbf6ce7e 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -6,13 +6,37 @@
      </div>
   </div>
   <div class="w-100 d-xl-none"></div>
-   <div class="col col-xl-auto mb-2 mb-xl-0">
-     <div class="d-flex">
-       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="tags" [(selectionModel)]="tagSelectionModel" (selectionModelChange)="updateRules()" [multiple]="true" [allowSelectNone]="true" title="Tags" icon="tag-fill" i18n-title></app-filterable-dropdown>
-       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="correspondents" [(selectionModel)]="correspondentSelectionModel" (selectionModelChange)="updateRules()" [allowSelectNone]="true" title="Correspondents" icon="person-fill" i18n-title></app-filterable-dropdown>
-       <app-filterable-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [(selectionModel)]="documentTypeSelectionModel" (selectionModelChange)="updateRules()" [allowSelectNone]="true" title="Document types" icon="file-earmark-fill" i18n-title></app-filterable-dropdown>
-       <app-date-dropdown class="mr-2 mr-md-3" [(dateBefore)]="dateCreatedBefore" [(dateAfter)]="dateCreatedAfter" title="Created" (datesSet)="updateRules()" i18n-title></app-date-dropdown>
-       <app-date-dropdown [(dateBefore)]="dateAddedBefore" [(dateAfter)]="dateAddedAfter" title="Added"  (datesSet)="updateRules()" i18n-title></app-date-dropdown>
+    <div class="col col-xl-auto mb-2 mb-xl-0">
+      <div class="d-flex">
+        <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" i18n-title
+          filterPlaceholder="Filter tags" i18n-filterPlaceholder
+          [items]="tags"
+          [(selectionModel)]="tagSelectionModel"
+          (selectionModelChange)="updateRules()"
+          [multiple]="true"
+          [allowSelectNone]="true"></app-filterable-dropdown>
+        <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" i18n-title
+          filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
+          [items]="correspondents"
+          [(selectionModel)]="correspondentSelectionModel"
+          (selectionModelChange)="updateRules()"
+          [allowSelectNone]="true"></app-filterable-dropdown>
+        <app-filterable-dropdown class="mr-2 mr-md-3" title="Document type" icon="file-earmark-fill" i18n-title
+          filterPlaceholder="Filter document types" i18n-filterPlaceholder
+          [items]="documentTypes"
+          [(selectionModel)]="documentTypeSelectionModel"
+          (selectionModelChange)="updateRules()"
+          [allowSelectNone]="true"></app-filterable-dropdown>
+        <app-date-dropdown class="mr-2 mr-md-3"
+          title="Created" i18n-title
+          (datesSet)="updateRules()"
+          [(dateBefore)]="dateCreatedBefore"
+          [(dateAfter)]="dateCreatedAfter"></app-date-dropdown>
+        <app-date-dropdown
+          [(dateBefore)]="dateAddedBefore"
+          [(dateAfter)]="dateAddedAfter"
+          title="Added" i18n-title
+          (datesSet)="updateRules()"></app-date-dropdown>
      </div>
    </div>
    <div class="w-100 d-xl-none"></div>
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
index bc3bf7b02..d3b71b4ab 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
@@ -23,7 +23,7 @@ export class CorrespondentListComponent extends GenericListComponent<PaperlessCo
   }
 
   getDeleteMessage(object: PaperlessCorrespondent) {
-    return $localize`Do you really want to delete the correspondent ${object.name}?`
+    return $localize`Do you really want to delete the correspondent "${object.name}"?`
   }
 
   filterDocuments(object: PaperlessCorrespondent) {
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
index b376b2576..66469619c 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
@@ -23,7 +23,7 @@ export class DocumentTypeListComponent extends GenericListComponent<PaperlessDoc
   }
 
   getDeleteMessage(object: PaperlessDocumentType) {
-    return $localize`Do you really want to delete the document type ${object.name}?`
+    return $localize`Do you really want to delete the document type "${object.name}"?`
   }
 
 
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
index e43410f41..3d1ccd778 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
@@ -27,7 +27,8 @@ export class TagListComponent extends GenericListComponent<PaperlessTag> {
   }
 
   getDeleteMessage(object: PaperlessTag) {
-    return $localize`Do you really want to delete the tag ${object.name}?`
+    
+    return $localize`Do you really want to delete the tag "${object.name}"?`
   }
 
   filterDocuments(object: PaperlessTag) {

From 17ded123756be90afa37f84a735f4a490d08ba60 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 12:21:13 +0100
Subject: [PATCH 0505/1300] bugfix

---
 src-ui/src/app/services/open-documents.service.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src-ui/src/app/services/open-documents.service.ts b/src-ui/src/app/services/open-documents.service.ts
index c91031f83..9e5746c10 100644
--- a/src-ui/src/app/services/open-documents.service.ts
+++ b/src-ui/src/app/services/open-documents.service.ts
@@ -28,6 +28,9 @@ export class OpenDocumentsService {
     if (index > -1) {
       this.documentService.get(id).subscribe(doc => {
         this.openDocuments[index] = doc
+      }, error => {
+        this.openDocuments.splice(index, 1)
+        this.save()
       })
     }
   }

From b092bb6848d34e12d13487f82f935667f5cf407d Mon Sep 17 00:00:00 2001
From: Jan Wiebe <janwiebe@janwie.be>
Date: Wed, 30 Dec 2020 14:45:15 +0100
Subject: [PATCH 0506/1300] Add manifest file to add to home screen and launch
 in full screen mode.

---
 src-ui/angular.json             | 264 ++++++++++++++++----------------
 src-ui/src/index.html           |   2 +
 src-ui/src/manifest.webmanifest |  14 ++
 3 files changed, 149 insertions(+), 131 deletions(-)
 create mode 100644 src-ui/src/manifest.webmanifest

diff --git a/src-ui/angular.json b/src-ui/angular.json
index 79233eeda..04a1bec50 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -1,133 +1,135 @@
 {
-	"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-	"version": 1,
-	"newProjectRoot": "projects",
-	"projects": {
-		"paperless-ui": {
-			"projectType": "application",
-			"schematics": {
-				"@schematics/angular:component": {
-					"style": "scss"
-				}
-			},
-			"root": "",
-			"sourceRoot": "src",
-			"prefix": "app",
-			"architect": {
-				"build": {
-					"builder": "@angular-devkit/build-angular:browser",
-					"options": {
-						"outputPath": "dist/paperless-ui",
-						"outputHashing": "none",
-						"index": "src/index.html",
-						"main": "src/main.ts",
-						"polyfills": "src/polyfills.ts",
-						"tsConfig": "tsconfig.app.json",
-						"aot": true,
-						"assets": [
-							"src/favicon.ico",
-							"src/assets"
-						],
-						"styles": [
-							"src/styles.scss"
-						],
-						"scripts": [],
-						"allowedCommonJsDependencies": [
-							"ng2-pdf-viewer"
-						]
-					},
-					"configurations": {
-						"production": {
-							"fileReplacements": [
-								{
-									"replace": "src/environments/environment.ts",
-									"with": "src/environments/environment.prod.ts"
-								}
-							],
-							"optimization": true,
-							"outputHashing": "none",
-							"sourceMap": false,
-							"extractCss": true,
-							"namedChunks": false,
-							"extractLicenses": true,
-							"vendorChunk": false,
-							"buildOptimizer": true,
-							"budgets": [
-								{
-									"type": "initial",
-									"maximumWarning": "2mb",
-									"maximumError": "5mb"
-								},
-								{
-									"type": "anyComponentStyle",
-									"maximumWarning": "6kb",
-									"maximumError": "10kb"
-								}
-							]
-						}
-					}
-				},
-				"serve": {
-					"builder": "@angular-devkit/build-angular:dev-server",
-					"options": {
-						"browserTarget": "paperless-ui:build"
-					},
-					"configurations": {
-						"production": {
-							"browserTarget": "paperless-ui:build:production"
-						}
-					}
-				},
-				"extract-i18n": {
-					"builder": "@angular-devkit/build-angular:extract-i18n",
-					"options": {
-						"browserTarget": "paperless-ui:build"
-					}
-				},
-				"test": {
-					"builder": "@angular-devkit/build-angular:karma",
-					"options": {
-						"main": "src/test.ts",
-						"polyfills": "src/polyfills.ts",
-						"tsConfig": "tsconfig.spec.json",
-						"karmaConfig": "karma.conf.js",
-						"assets": [
-							"src/favicon.ico",
-							"src/assets"
-						],
-						"styles": [
-							"src/styles.scss"
-						],
-						"scripts": []
-					}
-				},
-				"lint": {
-					"builder": "@angular-devkit/build-angular:tslint",
-					"options": {
-						"tsConfig": [
-							"tsconfig.app.json",
-							"tsconfig.spec.json",
-							"e2e/tsconfig.json"
-						],
-						"exclude": [
-							"**/node_modules/**"
-						]
-					}
-				},
-				"e2e": {
-					"builder": "@angular-devkit/build-angular:protractor",
-					"options": {
-						"protractorConfig": "e2e/protractor.conf.js",
-						"devServerTarget": "paperless-ui:serve"
-					},
-					"configurations": {
-						"production": {
-							"devServerTarget": "paperless-ui:serve:production"
-						}
-					}
-				}
-			}
-		}
-	},
-	"defaultProject": "paperless-ui"
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "paperless-ui": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/paperless-ui",
+            "outputHashing": "none",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
+            "aot": true,
+            "assets": [
+              "src/favicon.ico",
+              "src/assets",
+              "src/manifest.webmanifest"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": [],
+            "allowedCommonJsDependencies": [
+              "ng2-pdf-viewer"
+            ]
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "none",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "paperless-ui:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "paperless-ui:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "paperless-ui:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets",
+              "src/manifest.webmanifest"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": []
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        },
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "paperless-ui:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "paperless-ui:serve:production"
+            }
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "paperless-ui"
 }
diff --git a/src-ui/src/index.html b/src-ui/src/index.html
index f82399ce6..08ab3d931 100644
--- a/src-ui/src/index.html
+++ b/src-ui/src/index.html
@@ -5,6 +5,8 @@
   <title>Paperless-ng</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="theme-color" content="#17541f" />
+  <link rel="manifest" href="manifest.webmanifest">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
 <body>
diff --git a/src-ui/src/manifest.webmanifest b/src-ui/src/manifest.webmanifest
new file mode 100644
index 000000000..60151bb5c
--- /dev/null
+++ b/src-ui/src/manifest.webmanifest
@@ -0,0 +1,14 @@
+{
+  "background_color": "white",
+  "description": "A supercharged version of paperless: scan, index and archive all your physical documents",
+  "display": "fullscreen",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "128x128"
+    }
+  ],
+  "name": "Paperless NG",
+  "short_name": "Paperless NG",
+  "start_url": "/"
+}

From ab5098a036f25b4b46ce72e6b3c5bd911cee9509 Mon Sep 17 00:00:00 2001
From: Jan Wiebe <janwiebe@janwie.be>
Date: Wed, 30 Dec 2020 14:52:20 +0100
Subject: [PATCH 0507/1300] Fix  indentation of angular.json

---
 src-ui/angular.json | 260 ++++++++++++++++++++++----------------------
 1 file changed, 130 insertions(+), 130 deletions(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index 04a1bec50..6a689c115 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -1,135 +1,135 @@
 {
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "version": 1,
-  "newProjectRoot": "projects",
-  "projects": {
-    "paperless-ui": {
-      "projectType": "application",
-      "schematics": {
-        "@schematics/angular:component": {
-          "style": "scss"
-        }
-      },
-      "root": "",
-      "sourceRoot": "src",
-      "prefix": "app",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
-          "options": {
-            "outputPath": "dist/paperless-ui",
-            "outputHashing": "none",
-            "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.app.json",
-            "aot": true,
-            "assets": [
-              "src/favicon.ico",
-              "src/assets",
-              "src/manifest.webmanifest"
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
+	"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+	"version": 1,
+	"newProjectRoot": "projects",
+	"projects": {
+		"paperless-ui": {
+			"projectType": "application",
+			"schematics": {
+				"@schematics/angular:component": {
+					"style": "scss"
+				}
+			},
+			"root": "",
+			"sourceRoot": "src",
+			"prefix": "app",
+			"architect": {
+				"build": {
+					"builder": "@angular-devkit/build-angular:browser",
+					"options": {
+						"outputPath": "dist/paperless-ui",
+						"outputHashing": "none",
+						"index": "src/index.html",
+						"main": "src/main.ts",
+						"polyfills": "src/polyfills.ts",
+						"tsConfig": "tsconfig.app.json",
+						"aot": true,
+						"assets": [
+							"src/favicon.ico",
+							"src/assets",
+							"src/manifest.webmanifest"
+						],
+						"styles": [
+							"src/styles.scss"
+						],
             "scripts": [],
             "allowedCommonJsDependencies": [
               "ng2-pdf-viewer"
             ]
-          },
-          "configurations": {
-            "production": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "none",
-              "sourceMap": false,
-              "extractCss": true,
-              "namedChunks": false,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "6kb",
-                  "maximumError": "10kb"
-                }
-              ]
-            }
-          }
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "paperless-ui:build"
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "paperless-ui:build:production"
-            }
-          }
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "paperless-ui:build"
-          }
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets",
-              "src/manifest.webmanifest"
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
-            "scripts": []
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        },
-        "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
-          "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "paperless-ui:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "paperless-ui:serve:production"
-            }
-          }
-        }
-      }
-    }
-  },
-  "defaultProject": "paperless-ui"
-}
+					},
+					"configurations": {
+						"production": {
+							"fileReplacements": [
+								{
+									"replace": "src/environments/environment.ts",
+									"with": "src/environments/environment.prod.ts"
+								}
+							],
+							"optimization": true,
+							"outputHashing": "none",
+							"sourceMap": false,
+							"extractCss": true,
+							"namedChunks": false,
+							"extractLicenses": true,
+							"vendorChunk": false,
+							"buildOptimizer": true,
+							"budgets": [
+								{
+									"type": "initial",
+									"maximumWarning": "2mb",
+									"maximumError": "5mb"
+								},
+								{
+									"type": "anyComponentStyle",
+									"maximumWarning": "6kb",
+									"maximumError": "10kb"
+								}
+							]
+						}
+					}
+				},
+				"serve": {
+					"builder": "@angular-devkit/build-angular:dev-server",
+					"options": {
+						"browserTarget": "paperless-ui:build"
+					},
+					"configurations": {
+						"production": {
+							"browserTarget": "paperless-ui:build:production"
+						}
+					}
+				},
+				"extract-i18n": {
+					"builder": "@angular-devkit/build-angular:extract-i18n",
+					"options": {
+						"browserTarget": "paperless-ui:build"
+					}
+				},
+				"test": {
+					"builder": "@angular-devkit/build-angular:karma",
+					"options": {
+						"main": "src/test.ts",
+						"polyfills": "src/polyfills.ts",
+						"tsConfig": "tsconfig.spec.json",
+						"karmaConfig": "karma.conf.js",
+						"assets": [
+							"src/favicon.ico",
+							"src/assets",
+							"src/manifest.webmanifest"
+						],
+						"styles": [
+							"src/styles.scss"
+						],
+						"scripts": []
+					}
+				},
+				"lint": {
+					"builder": "@angular-devkit/build-angular:tslint",
+					"options": {
+						"tsConfig": [
+							"tsconfig.app.json",
+							"tsconfig.spec.json",
+							"e2e/tsconfig.json"
+						],
+						"exclude": [
+							"**/node_modules/**"
+						]
+					}
+				},
+				"e2e": {
+					"builder": "@angular-devkit/build-angular:protractor",
+					"options": {
+						"protractorConfig": "e2e/protractor.conf.js",
+						"devServerTarget": "paperless-ui:serve"
+					},
+					"configurations": {
+						"production": {
+							"devServerTarget": "paperless-ui:serve:production"
+						}
+					}
+				}
+			}
+		}
+	},
+	"defaultProject": "paperless-ui"
+}
\ No newline at end of file

From 9fe6c5c3a95c7b2e38cf9fa31015cd622b573fb4 Mon Sep 17 00:00:00 2001
From: Jan Wiebe <janwiebe@janwie.be>
Date: Wed, 30 Dec 2020 14:55:49 +0100
Subject: [PATCH 0508/1300] Fix indentation

---
 src-ui/angular.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index 6a689c115..f0acd5950 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -32,10 +32,10 @@
 						"styles": [
 							"src/styles.scss"
 						],
-            "scripts": [],
-            "allowedCommonJsDependencies": [
-              "ng2-pdf-viewer"
-            ]
+						"scripts": [],
+						"allowedCommonJsDependencies": [
+							"ng2-pdf-viewer"
+						]
 					},
 					"configurations": {
 						"production": {

From 664280ccce5ef14cc38aca5b140a01610f708a90 Mon Sep 17 00:00:00 2001
From: Jan Wiebe <janwiebe@janwie.be>
Date: Wed, 30 Dec 2020 14:56:18 +0100
Subject: [PATCH 0509/1300] Add newline to end of file

---
 src-ui/angular.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index f0acd5950..ce2dd82f7 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -132,4 +132,4 @@
 		}
 	},
 	"defaultProject": "paperless-ui"
-}
\ No newline at end of file
+}

From 713985f2592e60506c0baebcbcacefa01dcff510 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 15:12:16 +0100
Subject: [PATCH 0510/1300] fixes #218

---
 src/documents/parsers.py           | 2 ++
 src/paperless_tesseract/parsers.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index cbbb912de..725e605a2 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -117,6 +117,7 @@ def run_convert(input_file,
                 trim=False,
                 type=None,
                 depth=None,
+                auto_orient=False,
                 extra=None,
                 logging_group=None):
 
@@ -134,6 +135,7 @@ def run_convert(input_file,
     args += ['-trim'] if trim else []
     args += ['-type', str(type)] if type else []
     args += ['-depth', str(depth)] if depth else []
+    args += ['-auto-orient'] if auto_orient else []
     args += [input_file, output_file]
 
     logger.debug("Execute: " + " ".join(args), extra={'group': logging_group})
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 80e200f27..4da5af2c0 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -60,6 +60,7 @@ class RasterisedDocumentParser(DocumentParser):
                         alpha="remove",
                         strip=True,
                         trim=False,
+                        auto_orient=True,
                         input_file="{}[0]".format(document_path),
                         output_file=out_path,
                         logging_group=self.logging_group)
@@ -84,6 +85,7 @@ class RasterisedDocumentParser(DocumentParser):
                         alpha="remove",
                         strip=True,
                         trim=False,
+                        auto_orient=True,
                         input_file=gs_out_path,
                         output_file=out_path,
                         logging_group=self.logging_group)

From 400392655ec7d398b3e84cb4e5ba5f3159085840 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 15:46:56 +0100
Subject: [PATCH 0511/1300] adds a command to regenerate thumbnails #218

---
 .../commands/document_thumbnails.py           | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 src/documents/management/commands/document_thumbnails.py

diff --git a/src/documents/management/commands/document_thumbnails.py b/src/documents/management/commands/document_thumbnails.py
new file mode 100644
index 000000000..41ddec86e
--- /dev/null
+++ b/src/documents/management/commands/document_thumbnails.py
@@ -0,0 +1,65 @@
+import logging
+import multiprocessing
+import shutil
+
+import tqdm
+from django import db
+from django.core.management.base import BaseCommand
+
+from documents.models import Document
+from ...mixins import Renderable
+from ...parsers import get_parser_class_for_mime_type
+
+
+def _process_document(doc_in):
+    document = Document.objects.get(id=doc_in)
+    parser = get_parser_class_for_mime_type(document.mime_type)(
+        logging_group=None)
+    try:
+        thumb = parser.get_optimised_thumbnail(
+            document.source_path, document.mime_type)
+
+        shutil.move(thumb, document.thumbnail_path)
+    finally:
+        parser.cleanup()
+
+class Command(Renderable, BaseCommand):
+
+    help = """
+        This will regenerate the thumbnails for all documents.
+    """.replace("    ", "")
+
+    def __init__(self, *args, **kwargs):
+        self.verbosity = 0
+        BaseCommand.__init__(self, *args, **kwargs)
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "-d", "--document",
+            default=None,
+            type=int,
+            required=False,
+            help="Specify the ID of a document, and this command will only "
+                 "run on this specific document."
+        )
+
+    def handle(self, *args, **options):
+
+        self.verbosity = options["verbosity"]
+
+        logging.getLogger().handlers[0].level = logging.ERROR
+
+        if options['document']:
+            documents = Document.objects.filter(pk=options['document'])
+        else:
+            documents = Document.objects.all()
+
+        ids = [doc.id for doc in documents]
+
+        # Note to future self: this prevents django from reusing database
+        # conncetions between processes, which is bad and does not work
+        # with postgres.
+        db.connections.close_all()
+
+        with multiprocessing.Pool() as pool:
+            list(tqdm.tqdm(pool.imap_unordered(_process_document, ids), total=len(ids)))

From aacf7ba275eb602d4a6cd97d4ad3b6a351d8a9d6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 16:29:22 +0100
Subject: [PATCH 0512/1300] language fixes

---
 .../welcome-widget.component.html             |  2 +-
 .../document-detail.component.ts              |  2 +-
 .../bulk-editor/bulk-editor.component.ts      | 20 +++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html
index 7a2bbcb3c..6320189cc 100644
--- a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html
@@ -4,7 +4,7 @@
     <img src="assets/save-filter.png" class="float-right">
     <p i18n>Paperless is running! :)</p>
     <p i18n>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list.
-      After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and have they will be shown on the dashboard instead of this message.</p>
+      After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message.</p>
     <p i18n>Paperless offers some more features that try to make your life easier:</p>
     <ul>
       <li i18n>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</li>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 2efd32f27..053258f34 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -159,7 +159,7 @@ export class DocumentDetailComponent implements OnInit {
   delete() {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.title = $localize`Confirm delete`
-    modal.componentInstance.messageBold = $localize`Do you really want to delete document '${this.document.title}'?`
+    modal.componentInstance.messageBold = $localize`Do you really want to delete document "${this.document.title}"?`
     modal.componentInstance.message = $localize`The files for this document will be deleted permanently. This operation cannot be undone.`
     modal.componentInstance.btnClass = "btn-danger"
     modal.componentInstance.btnCaption = $localize`Delete document`
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 1347cb138..e69ab241b 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -115,16 +115,16 @@ export class BulkEditorComponent {
       modal.componentInstance.title = $localize`Confirm tags assignment`
       if (changedTags.itemsToAdd.length == 1 && changedTags.itemsToRemove.length == 0) {
         let tag = changedTags.itemsToAdd[0]
-        modal.componentInstance.message = $localize`This operation will add the tag "${tag.name}" to all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will add the tag "${tag.name}" to ${this.list.selected.size} selected document(s).`
       } else if (changedTags.itemsToAdd.length > 1 && changedTags.itemsToRemove.length == 0) {
-        modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} to all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} to ${this.list.selected.size} selected document(s).`
       } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 1) {
         let tag = changedTags.itemsToRemove[0]
-        modal.componentInstance.message = $localize`This operation will remove the tag "${tag.name}" from all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will remove the tag "${tag.name}" from ${this.list.selected.size} selected document(s).`
       } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length > 1) {
-        modal.componentInstance.message = $localize`This operation will remove the tags ${this._localizeList(changedTags.itemsToRemove)} from all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will remove the tags ${this._localizeList(changedTags.itemsToRemove)} from ${this.list.selected.size} selected document(s).`
       } else {
-        modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} and remove the tags ${this._localizeList(changedTags.itemsToRemove)} on all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} and remove the tags ${this._localizeList(changedTags.itemsToRemove)} on ${this.list.selected.size} selected document(s).`
       }
       
       modal.componentInstance.btnClass = "btn-warning"
@@ -156,9 +156,9 @@ export class BulkEditorComponent {
       let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
       modal.componentInstance.title = $localize`Confirm correspondent assignment`
       if (correspondent) {
-        modal.componentInstance.message = $localize`This operation will assign the correspondent "${correspondent.name}" to all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will assign the correspondent "${correspondent.name}" to ${this.list.selected.size} selected document(s).`
       } else {
-        modal.componentInstance.message = $localize`This operation will remove the correspondent from all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will remove the correspondent from ${this.list.selected.size} selected document(s).`
       }
       modal.componentInstance.btnClass = "btn-warning"
       modal.componentInstance.btnCaption = $localize`Confirm`
@@ -189,9 +189,9 @@ export class BulkEditorComponent {
       let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
       modal.componentInstance.title = $localize`Confirm document type assignment`
       if (documentType) {
-        modal.componentInstance.message = $localize`This operation will assign the document type "${documentType.name}" to all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will assign the document type "${documentType.name}" to ${this.list.selected.size} selected document(s).`
       } else {
-        modal.componentInstance.message = $localize`This operation will remove the document type from all ${this.list.selected.size} selected document(s).`
+        modal.componentInstance.message = $localize`This operation will remove the document type from ${this.list.selected.size} selected document(s).`
       }
       modal.componentInstance.btnClass = "btn-warning"
       modal.componentInstance.btnCaption = $localize`Confirm`
@@ -217,7 +217,7 @@ export class BulkEditorComponent {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.delayConfirm(5)
     modal.componentInstance.title = $localize`Delete confirm`
-    modal.componentInstance.messageBold = $localize`This operation will permanently delete all ${this.list.selected.size} selected document(s).`
+    modal.componentInstance.messageBold = $localize`This operation will permanently delete ${this.list.selected.size} selected document(s).`
     modal.componentInstance.message = $localize`This operation cannot be undone.`
     modal.componentInstance.btnClass = "btn-danger"
     modal.componentInstance.btnCaption = $localize`Delete document(s)`

From eb47fb5501de405b7e049d06f60d477d76717457 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 30 Dec 2020 15:35:33 +0000
Subject: [PATCH 0513/1300] Translate /src-ui/messages.xlf in de_DE

at least 50% translated for the source file '/src-ui/messages.xlf'
on the 'de_DE' language.

 Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
---
 src-ui/src/locale/messages.de_DE.xlf | 1819 ++++++++++++++++++++++++++
 1 file changed, 1819 insertions(+)
 create mode 100644 src-ui/src/locale/messages.de_DE.xlf

diff --git a/src-ui/src/locale/messages.de_DE.xlf b/src-ui/src/locale/messages.de_DE.xlf
new file mode 100644
index 000000000..2b23832df
--- /dev/null
+++ b/src-ui/src/locale/messages.de_DE.xlf
@@ -0,0 +1,1819 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="plaintext" original="ng2.template" source-language="en-US" target-language="de-DE">
+    <body>
+      <trans-unit datatype="html" id="4733307402565258070">
+        <source>Documents</source>
+        <target>Dokumente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2155249406916744630">
+        <source>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; saved successfully.</source>
+        <target>Ansicht &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; erfolgreich gespeichert.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6837554170707123455">
+        <source>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; created successfully.</source>
+        <target>Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; erfolgreich erstellt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
+        <source>Select</source>
+        <target>Auswählen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7e1f9a7054aff842832620c03dedae894787ba41">
+        <source>Select none</source>
+        <target>Nichts auswählen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9">
+        <source>Select page</source>
+        <target>Seite auswählen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74">
+        <source>Select all</source>
+        <target>Alles auswählen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ec97f67072a83aaa972536b18d83179f6e4bbec9">
+        <source>Sort by</source>
+        <target>Sortieren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b7641aed03492978b4ec6843b1e53f30464294d9">
+        <source>Views</source>
+        <target>Ansicht</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b69d81ff62cdc22b6bf88fe0b72dc1f66ccfa44f">
+        <source>Save as...</source>
+        <target>Speichern als...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="72e7d343f9165602cce1ca7faffbc565fd31ef92">
+        <source>Save &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
+        <target>&quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot; speichern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="546b2014cc578af06b6023a7f38fa77aa9d58f5d">
+        <source>{VAR_PLURAL, plural, =1 {document} other {documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Dokument} other {Dokumente}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3c298bb50741c8b2641889b0a0e0009769e66370">
+        <source>Selected <x equiv-text="{{list.selected.size}}" id="INTERPOLATION"/> of <x equiv-text="{{list.collectionSize || 0}}" id="INTERPOLATION_1"/> <x equiv-text="{list.collectionSize, plural, =1 {document} other {documents}}" id="ICU"/></source>
+        <target><x equiv-text="{{list.selected.size}}" id="INTERPOLATION"/> von <x equiv-text="{{list.collectionSize || 0}}" id="INTERPOLATION_1"/> <x equiv-text="{list.collectionSize, plural, =1 {document} other {documents}}" id="ICU"/> ausgewählt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8b04a8e375ac6760a54aabaf5df0287d53ce4a4a">
+        <source>{VAR_PLURAL, plural, =1 {1 document} other {<x id="INTERPOLATION"/> documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {1 Dokument} other {<x id="INTERPOLATION"/> Dokumente}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
+        <source>ASN</source>
+        <target>ASN</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">100</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
+        <source>Correspondent</source>
+        <target>Korrespondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">101</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
+        <source>Title</source>
+        <target>Titel</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">102</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
+        <source>Document type</source>
+        <target>Dokumenttyp</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
+        <source>Created</source>
+        <target>Erstellt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">104</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
+        <source>Added</source>
+        <target>Hinzugefügt</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9021887951960049161">
+        <source>Confirm delete</source>
+        <target>Löschen bestätigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5277522254327902345">
+        <source>Do you really want to delete document '<x equiv-text="this.document.title" id="PH"/>'?</source>
+        <target>Möchten Sie das Dokument '<x equiv-text="this.document.title" id="PH"/>' wirklich löschen?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">162</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6691075929777935948">
+        <source>The files for this document will be deleted permanently. This operation cannot be undone.</source>
+        <target>Die Dateien dieses Dokuments werden permanent gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">163</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="719892092227206532">
+        <source>Delete document</source>
+        <target>Dokument löschen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">165</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
+        <source>Delete</source>
+        <target>Löschen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dc75033a5238fdc4f462212c847a45ba8018a3fd">
+        <source>Download</source>
+        <target>Herunterladen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4ea3c236bca3528318e3b3a411a20909e5fa8be4">
+        <source>More like this</source>
+        <target>Ähnliche Dokumente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f4e529ae5ffd73001d1ff4bbdeeb0a72e342e5c8">
+        <source>Close</source>
+        <target>Schließen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4f8b2bb476981727ab34ed40fde1218361f92c45">
+        <source>Details</source>
+        <target>Details</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4ab4cb601522b9194922554d934c4c30bd93567d">
+        <source>Content</source>
+        <target>Inhalt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f721a500a68c357e8f2a01e60510f6a01e4ba529">
+        <source>Metadata</source>
+        <target>Metadaten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7">
+        <source>Discard</source>
+        <target>Verwerfen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="52c9a103b812f258bcddc3d90a6e3f46871d25fe">
+        <source>Save</source>
+        <target>Speichern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3">
+        <source>Page</source>
+        <target>Seite</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c972a8e7d09f86e0c408a80349990fb213b32c08">
+        <source>of <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></source>
+        <target>von <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a071e35fecc10753065b1cb5b38608be66da2c8b">
+        <source>Download original</source>
+        <target>Original herunterladen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9b3996b5ddcc628a999a7df72fbfc2a2eae8c8a5">
+        <source>Archive serial number</source>
+        <target>Archiv-Seriennummer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="30eebc2dd656dbcb259d8d5286d244ee397d63bd">
+        <source>Date created</source>
+        <target>Erstellt am</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
+        <source>Tags</source>
+        <target>Tags</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720">
+        <source>Date modified</source>
+        <target>Geändert am</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269">
+        <source>Date added</source>
+        <target>Hinzugefügt am</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3">
+        <source>Media filename</source>
+        <target>Media-Dateiname</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">99</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8">
+        <source>Original MD5 checksum</source>
+        <target>MD5-Prüfsumme Original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e92ca184ea785769fb26138fc25ee9fa06fff6e5">
+        <source>Original file size</source>
+        <target>Dateigröße Original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd">
+        <source>Original mime type</source>
+        <target>MIME-Typ Original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="edbf54e4117606b5dd87aaea3c14b21ebf398020">
+        <source>Archive MD5 checksum</source>
+        <target>MD5-Prüfsumme Archiv</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e6bf12eadecbfd80016eca15fa78651c6ca90c64">
+        <source>Archive file size</source>
+        <target>Dateigröße Archiv</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">119</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f">
+        <source>Original document metadata</source>
+        <target>Original-Metadaten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7174dcea4a3d0b743e7e4a78747e902230727f67">
+        <source>Archived document metadata</source>
+        <target>Metadaten des archivierten Dokuments</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">126</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3fb9f1a31c3798173b2fea72638732c783b152fe">
+        <source>Save &amp; next</source>
+        <target>Speichern &amp; weiter</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8765497970646365998">
+        <source>Hello <x equiv-text="this.displayName" id="PH"/>, welcome to Paperless-ng!</source>
+        <target>Hallo <x equiv-text="this.displayName" id="PH"/>, Willkommen zu Paperless-ng</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7016571167317583872">
+        <source>Welcome to Paperless-ng!</source>
+        <target>Willkommen zu Paperless-ng!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f65253954b66e929a8b4d5ecaf61f9129f8cec64">
+        <source>Dashboard</source>
+        <target>Startseite</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="93754014749412887">
+        <source>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Möchten Sie das Tag &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="70a67e04629f6d412db0a12d51820b480788d795">
+        <source>Create</source>
+        <target>Erstellen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cff1428d10d59d14e45edec3c735a27b5482db59">
+        <source>Name</source>
+        <target>Name</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
+        <source>Color</source>
+        <target>Farbe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d0c4488f742efeba0915e90e285a022da813deff">
+        <source>Matching</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9bcf8d20d23c111eca1431abd2d2ce0de324499c">
+        <source>Document count</source>
+        <target>Anzahl Dokumente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="030b4423b92167200e39519599f9b863b4f7c62c">
+        <source>Actions</source>
+        <target>Aktionen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9d51b3c90afda70700229d1b8a55371c13cb3bce">
+        <source>Documents</source>
+        <target>Dokumente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
+        <source>Edit</source>
+        <target>Bearbeiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4990731724078522539">
+        <source>Do you really want to delete the document type &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Möchten Sie den Dokumenttyp &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8">
+        <source>Document types</source>
+        <target>Dokumenttypen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="eb3d5aefff38a814b76da74371cbf02c0789a1ef">
+        <source>Logs</source>
+        <target>Protokoll</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5ca707824ab93066c7d9b44e1b8bf216725c2c22">
+        <source>Filter</source>
+        <target>Filtern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1153806754022288374">
+        <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/> deleted.</source>
+        <target>Ansicht <x equiv-text="savedView.name" id="PH"/> gelöscht.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5647210819299459618">
+        <source>Settings saved successfully.</source>
+        <target>Einstellungen erfolgreich gespeichert.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8488620293789898901">
+        <source>Error while storing settings on server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Fehler beim Speichern der Einstellungen auf dem Server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">73</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="11ebd254cc9294717105c5982eb0cd2af30a446d">
+        <source>General settings</source>
+        <target>Allgemeine Einstellungen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="99dee94e92dbd9e21a008d4569f9719ed206ae37">
+        <source>Saved views</source>
+        <target>Gespeicherte Ansichten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0d8ceb153aa715eb905da0710cc0b2ac73159abc">
+        <source>Document list</source>
+        <target>Dokumentliste</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
+        <source>Items per page</source>
+        <target>Dokumente pro Seite</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
+        <source>Bulk editing</source>
+        <target>Massenbearbeitung</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
+        <source>Show confirmation dialogs</source>
+        <target>Bestätigungsdialoge anzeigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
+        <source>Deleting documents will always ask for confirmation.</source>
+        <target>Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
+        <source>Apply on close</source>
+        <target>Anwenden beim Schließen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
+        <source>Appears on</source>
+        <target>Erscheint auf</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">53</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
+        <source>Show on dashboard</source>
+        <target>Auf Startseite zeigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
+        <source>Show in sidebar</source>
+        <target>In Seitenleiste zeigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">60</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
+        <source>No saved views defined.</source>
+        <target>Keine gespeicherten Ansichten vorhanden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
+        <source>404 Not Found</source>
+        <target>404 Nicht gefunden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/not-found/not-found.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7427874343955308724">
+        <source>Do you really want to delete the correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Möchten Sie den Korrespondenten &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c3f3334de899327bf3ec8999236e10798ff76e72">
+        <source>Correspondents</source>
+        <target>Korrespondenten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0488919cff4fcc2174d34e4a1167f1b3c586ca37">
+        <source>Last correspondence</source>
+        <target>Letzter Kontakt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1234709746630139322">
+        <source>Confirmation</source>
+        <target>Bestätigung</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9178182467454450952">
+        <source>Confirm</source>
+        <target>Bestätigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6457471243969293847">
+        <source>Create new correspondent</source>
+        <target>Neuen Korrespondenten erstellen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2059822531169388684">
+        <source>Edit correspondent</source>
+        <target>Korrespondenten bearbeiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3025930461519142465">
+        <source>Could not save correspondent: <x equiv-text="error" id="PH"/></source>
+        <target>Konnte Korrespondent nicht speichern: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3d5caa52b0a51bfd2757215f7614183554d740f0">
+        <source>Matching algorithm</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="180092a6b8a6151a05f4a7552a2fb75fd159dfa8">
+        <source>Match</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a1923dd970db4f74b4417b80b4a14e250fd116ff">
+        <source>Auto matching does not require you to fill in this field.</source>
+        <target>Für Automatische Zuweisung muss dieses Feld nicht ausgefüllt werden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
+        <source>Case insensitive</source>
+        <target>Groß-/Kleinschreibung irrelevant</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="85e19678590a8b3ac1dff9d69c7a7610d1742e5a">
+        <source>Auto matching ignores this option.</source>
+        <target>Automatische Zuweisung beachtet diese Einstellung nicht.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
+        <source>Cancel</source>
+        <target>Abbrechen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9153094873118985366">
+        <source>Create new tag</source>
+        <target>Neues Tag erstellen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5872175735754226507">
+        <source>Edit tag</source>
+        <target>Tag bearbeiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2861521377141790537">
+        <source>Could not save tag: <x equiv-text="error" id="PH"/></source>
+        <target>Konnte Tag nicht speichern: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42">
+        <source>Inbox tag</source>
+        <target>Posteingangs-Tag</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5e2f1a4ea12a1b8606ee3f0548d0ba64bf266077">
+        <source>Inbox tags are automatically assigned to all consumed documents.</source>
+        <target>Ein Tag mit dieser Option wird automatisch allen neuen Dokumenten zugewiesen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6672809941092516947">
+        <source>Create new document type</source>
+        <target>Neuen Dokumenttyp erstellen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="36335016091244220">
+        <source>Edit document type</source>
+        <target>Dokumenttyp bearbeiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5647767513381010218">
+        <source>Could not save document type: <x equiv-text="error" id="PH"/></source>
+        <target>Konnte Dokumenttyp nicht speichern: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="49c9ede51100b454f7841b24cd02355c6622bf44">
+        <source>Search results</source>
+        <target>Suchergebnisse</target>
+        <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 datatype="html" id="31976d04f98e8a38098f66ac3a83ad33b576e5db">
+        <source>Invalid search query: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></source>
+        <target>Ungültige Suchanfrage: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></target>
+        <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 datatype="html" id="2abff6a01d9b342a5a14b7fb90309a95ce934f8e">
+        <source> Showing documents similar to <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></source>
+        <target>Zeige ähnliche Dokumente zu <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></target>
+        <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 datatype="html" id="6e0b0a1ea16f18f2fb1586c53d99d2f22e1aee2e">
+        <source>Search query: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></source>
+        <target>Suchanfrage: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></target>
+        <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 datatype="html" id="afa760e48c97d64d19c1455d18b7834a2256e23f">
+        <source>Did you mean &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</source>
+        <target>Meinten Sie &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</target>
+        <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 datatype="html" id="fe6ced3fcc803bba5a2e6c1a067b9ce62542500e">
+        <source>{VAR_PLURAL, plural, =0 {No results} =1 {One result} other {<x id="INTERPOLATION"/> results}}</source>
+        <target>{VAR_PLURAL, plural, =0 {Keine Ergebnisse} =1 {Ein Ergebnis} other {<x id="INTERPOLATION"/> Ergebnisse}}</target>
+        <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 datatype="html" id="41147374f427980a9f1a8cd5e3f4b1666e6f2418">
+        <source>Paperless-ng</source>
+        <target>Paperless-ng</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+        <note from="description" priority="1">app title</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="8d667444401ef6380fd262e4fe4795f261a427b1">
+        <source>Search for documents</source>
+        <target>Nach Dokumenten suchen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="68949525c4d9a901e0cd15a94e3fc8d2711e9918">
+        <source>Manage</source>
+        <target>Verwalten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">77</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
+        <source>Settings</source>
+        <target>Einstellungen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="408cb6073e60c5d966296a3207fc596adca75e01">
+        <source>Admin</source>
+        <target>Administration</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">119</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
+        <source>Misc</source>
+        <target>Weiteres</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
+        <source>Documentation</source>
+        <target>Dokumentation</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">132</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
+        <source>GitHub</source>
+        <target>GitHub</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">139</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb694b49d408265c91c62799c2b3a7e3151c824d">
+        <source>Logout</source>
+        <target>Abmelden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">146</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4f55b670f49d927c6026bb614c7c62b1f2a394c0">
+        <source>Open documents</source>
+        <target>Geöffnete Dokumente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">57</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dca5bf9344a759fa5a07f1b21f50286ec242ba44">
+        <source>Close all</source>
+        <target>Alle schließen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5195932016807797291">
+        <source>Correspondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></source>
+        <target>Korrespondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8705701325879965907">
+        <source>Type: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></source>
+        <target>Typ: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8180755793012580465">
+        <source>Tag: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></source>
+        <target>Tag: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
+        <source>Filter by:</source>
+        <target>Filtern nach:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
+        <source>Filter tags</source>
+        <target>Tags filtern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4b089ca12c472cf0b46167bb5afe4b527b301bbc">
+        <source>Filter correspondents</source>
+        <target>Korrespondenten filtern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0ad509732aaf702b7ea8c771c7809fa84bc85908">
+        <source>Filter document types</source>
+        <target>Dokumenttypen filtern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2f33515a935c36763660e8420940b8a7e11fb1f4">
+        <source>Clear all filters</source>
+        <target>Filter zurücksetzen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">47</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7593728289020204896">
+        <source>Not assigned</source>
+        <target>Nicht zugewiesen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
+          <context context-type="linenumber">145</context>
+        </context-group>
+        <note from="description" priority="1">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="c2d0ac9f528bbd5f53fd34269fde8b59e029621b">
+        <source>Apply</source>
+        <target>Anwenden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4873149362496451858">
+        <source>Last 7 days</source>
+        <target>Letzte 7 Tage</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4463380307954693363">
+        <source>Last month</source>
+        <target>Letzten Monat</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8697368973702409683">
+        <source>Last 3 months</source>
+        <target>Letzte 3 Monate</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3566342898065860218">
+        <source>Last year</source>
+        <target>Letztes Jahr</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="be2add3a3d9e4e2556b8f9048a15a9c0f00bf1ad">
+        <source>After</source>
+        <target>Nach</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8785188e6c678b842fcb93b7392faf86db7ec676">
+        <source>Before</source>
+        <target>Vor</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="99ee4faa69cd2ea8e3678c1f557c0ff1f05aae46">
+        <source>Clear</source>
+        <target>Zurücksetzen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6829218544e108e152f5fa72cb79c4ccb82e0d06">
+        <source>View</source>
+        <target>Anzeigen</target>
+        <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 datatype="html" id="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60">
+        <source>Score:</source>
+        <target>Relevanz:</target>
+        <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">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e">
+        <source>Created: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></source>
+        <target>Erstellt: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></target>
+        <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">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8">
+        <source>Filter by correspondent</source>
+        <target>Nach Korrespondent filtern</target>
+        <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">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bdb9a910523610254872e147222689e9a4115b84">
+        <source>Filter by tag</source>
+        <target>Nach Tag filtern</target>
+        <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">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2840db547019ce8c76b2cdbe3a1653c5b68b06af">
+        <source>View in browser</source>
+        <target>Im Browser anzeigen</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8639884465898458690">
+        <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
+        <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; und &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+        <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="7894972847287473517">
+        <source>&quot;<x equiv-text="i.name" id="PH"/>&quot;</source>
+        <target>&quot;<x equiv-text="i.name" id="PH"/>&quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="760986369763309193">
+        <source>, </source>
+        <target>, </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
+        <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="1822679894391095557">
+        <source><x equiv-text="list" id="PH"/> and &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</source>
+        <target><x equiv-text="list" id="PH"/> und &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+        <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="4137232459980262849">
+        <source>Confirm tags assignment</source>
+        <target>Tag-Zuweisung bestätigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8965789168028339624">
+        <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to all <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird das Tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; allen <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten hinzufügen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4791265247184178563">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> to all <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird die Tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> allen <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten hinzufügen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">120</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7567916006270093567">
+        <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from all <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="247266594076352528">
+        <source>This operation will remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> from all <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4286636723521919383">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> and remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> on all <x equiv-text="this.list.selected.size" id="PH_2"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">127</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2996713129519325161">
+        <source>Confirm correspondent assignment</source>
+        <target>Korrespondent-Zuweisung bestätigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">157</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3171547143349510312">
+        <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to all <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">159</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5197985579238314950">
+        <source>This operation will remove the correspondent from all <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5393409374423140648">
+        <source>Confirm document type assignment</source>
+        <target>Dokumenttyp-Zuweisung bestätigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">190</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5346233369873832070">
+        <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to all <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">192</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6005206188202839923">
+        <source>This operation will remove the document type from all <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">194</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="749430623564850405">
+        <source>Delete confirm</source>
+        <target>Löschen bestätigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">219</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3928393581343272038">
+        <source>This operation will permanently delete all <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Diese Aktion wird alle <x equiv-text="this.list.selected.size" id="PH"/> ausgewählte(n) Dokument(e) entgültig löschen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">220</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5641451190833696892">
+        <source>This operation cannot be undone.</source>
+        <target>Diese Aktion kann nicht rückgängig gemacht werden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">221</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6734339521247847366">
+        <source>Delete document(s)</source>
+        <target>Dokument(e) löschen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">223</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
+        <source>Select:</source>
+        <target>Auswählen:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dfc3c34e182ea73c5d784ff7c8135f087992dac1">
+        <source>All</source>
+        <target>Alle</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="907df6a2b68daecc3c399cf40a764b358bd9fd84">
+        <source>Edit:</source>
+        <target>Bearbeiten:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">
+        <source>Save current view</source>
+        <target>Aktuelle Ansicht speichern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4eb84de23219c85432e38fb4fbdeb6c0f103ff8b">
+        <source>Show all</source>
+        <target>Alle anzeigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="61e0f26d843eec0b33ff475e111b0c2f7a80b835">
+        <source>Statistics</source>
+        <target>Statistiken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="46c8fe557cf52c9389783627d4f85453f4ddb459">
+        <source>Documents in inbox: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></source>
+        <target>Dokumente im Posteingang: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438">
+        <source>Total documents: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></source>
+        <target>Anzahl Dokumente gesamt: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8705589528094706681">
+        <source>The document has been uploaded and will be processed by the consumer shortly.</source>
+        <target>Das Dokument wurde hochgeladen und wird in Kürze durch Paperless-ng verarbeitet.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4956689020592747108">
+        <source>There was an error while uploading the document: <x equiv-text="error.error.document" id="PH"/></source>
+        <target>Konnte Dokument nicht hochladen: <x equiv-text="error.error.document" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7554858521017940575">
+        <source>An error has occurred while uploading the document. Sorry!</source>
+        <target>Beim Hochladen trat ein Fehler auf. Entschuldigung!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
+        <source>Upload new documents</source>
+        <target>Neue Dokumente hochladen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="52d5d56b6667ba3f7c759cbc0d4c39d34a99701e">
+        <source>Drop documents here or</source>
+        <target>Dokumente hier ablegen oder</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="865c511f4a24558ed0e954f9bbbff557bbb8954d">
+        <source>Browse files</source>
+        <target>Datei auswählen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a7b50b2df68e875a918d1f4f98f358d756139c13">
+        <source>{VAR_PLURAL, plural, =1 {file} =other {<x id="INTERPOLATION"/> files}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Datei} =other {<x id="INTERPOLATION"/> Dateien}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ec37c68a90632530f5cc8b7e5245cab89ef8bf82">
+        <source>Uploading <x equiv-text="{uploadStatus.length, plural, =1 {file} =other {{{uploadStatus.length}} files}}" id="ICU"/>...</source>
+        <target>Lade <x equiv-text="{uploadStatus.length, plural, =1 {file} =other {{{uploadStatus.length}} files}}" id="ICU"/> hoch...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="45854ddec74086b271e62be6a363f4fa5036f7fc">
+        <source>First steps</source>
+        <target>Erste Schritte</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a0dc8218a6fcc5d11a4723ed127bd6be9d6d3ef3">
+        <source>Paperless is running! :)</source>
+        <target>Paperless ist startbereit! :)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="80e9f19d307b1611c56aa0bdddc930d85418734c">
+        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and have they will be shown on the dashboard instead of this message.</source>
+        <target>Sie können Ihre Dokumente hochladen, indem Sie sie in die Hochladebox auf der rechten Seite ziehen oder in den konfigurierten Ablageordner kopieren/verschieben. Danach werden sie inder Dokumentliste erscheinen. Nachdem Sie den Dokumenten einige Metadaten zugewiesen haben, können Sie die Filtermechanismen zur Erstellung individueller Ansichten benutzen (zum Beispiel &quot;Kürzlich hinzugefügt&quot; oder &quot;Mit TODO markiert&quot;) und die Ansichten werden auf der Startseite erscheinen und diese Nachricht ersetzen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">6,7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cf5f85690feaba6e29343f9881e57a6c0ea6e82b">
+        <source>Paperless offers some more features that try to make your life easier:</source>
+        <target>Paperless bietet darüber hinaus einige erweiterte Funktionen:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="edb41dc36af2e70789d8e3422325d930e783253e">
+        <source>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</source>
+        <target>Nachdem Sie einige Dokumente hochgeladen und mit Metadatebn haben, kann Paperless diese Metadaten automatisch passenden neuen Dokumenten zuweisen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9dca488928c0b7af46c3866f86a6c2c8548399aa">
+        <source>You can configure paperless to read your mails and add documents from attached files.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d282f6277cbf6704f697170d2ad19ce500790e20">
+        <source>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="218403386307979629">
+        <source>Metadata</source>
+        <target>Metadaten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3797570084942068182">
+        <source>Select</source>
+        <target>Auswählen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7103181924469214926">
+        <source>Please select an object</source>
+        <target>Bitte wählen Sie ein Element aus</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2807800733729323332">
+        <source>Yes</source>
+        <target>Ja</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3542042671420335679">
+        <source>No</source>
+        <target>Nein</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7536524521722799066">
+        <source>(no title)</source>
+        <target>(kein Titel)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/document-title.pipe.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1519954996184640001">
+        <source>Error</source>
+        <target>Fehler</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5037437391296624618">
+        <source>Information</source>
+        <target>Information</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2691296884221415710">
+        <source>Correspondent</source>
+        <target>Korrespondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5066119607229701477">
+        <source>Document type</source>
+        <target>Dokumenttyp</target>
+        <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 datatype="html" id="5701618810648052610">
+        <source>Title</source>
+        <target>Titel</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7517688192215738656">
+        <source>ASN</source>
+        <target>ASN</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4207916966377787111">
+        <source>Created</source>
+        <target>Erstellt am</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="231679111972850796">
+        <source>Added</source>
+        <target>Hinzugefügt am</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3553216189604488439">
+        <source>Modified</source>
+        <target>Geändert am</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2056433880533904076">
+        <source>Light blue</source>
+        <target>Hellblau</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4082253113407591781">
+        <source>Blue</source>
+        <target>Blau</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1143414876575720034">
+        <source>Light green</source>
+        <target>Hellgrün</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="119581980963263815">
+        <source>Green</source>
+        <target>Grün</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3250646524116252719">
+        <source>Light red</source>
+        <target>Hellrot</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1628552745302385832">
+        <source>Red </source>
+        <target>Rot</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5479028842846122610">
+        <source>Light orange</source>
+        <target>Hellorange</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8598918991528773310">
+        <source>Orange</source>
+        <target>Orange</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1789283185177957430">
+        <source>Light violet</source>
+        <target>Hellviolet</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2682868487071320453">
+        <source>Violet</source>
+        <target>Violet</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1449010446077321264">
+        <source>Brown</source>
+        <target>Braun</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="30300572504753589">
+        <source>Black</source>
+        <target>Schwarz</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="461048771215121187">
+        <source>Light grey</source>
+        <target>Hellgrau</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4561076822163447092">
+        <source>Create new item</source>
+        <target>Neues Element erstellen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5324147361912094446">
+        <source>Edit item</source>
+        <target>Element bearbeiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1699589597032579396">
+        <source>Could not save element: <x equiv-text="error" id="PH"/></source>
+        <target>Konnte Element nicht speichern: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="810888510148304696">
+        <source>Automatic</source>
+        <target>Automatisch</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5044611416737085530">
+        <source>Do you really want to delete this element?</source>
+        <target>Möchten Sie dieses Element wirklich löschen?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8371896857609524947">
+        <source>Associated documents will not be deleted.</source>
+        <target>Assoziierte Dokumente werden nicht gelöscht.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7022070615528435141">
+        <source>Delete</source>
+        <target>Löschen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">97</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3184700926171002527">
+        <source>Any</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1616102757855967475">
+        <source>All</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1968183742008490888">
+        <source>Literal</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1338733395833138319">
+        <source>Regular expression</source>
+        <target>Regulärer Ausdruck</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="701356546322112069">
+        <source>Fuzzy match</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="616064537937996961">
+        <source>Auto</source>
+        <target>Automatisch</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file

From b6722fdd848484709d1aecbb20ee5848e350a1bf Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 17:14:08 +0100
Subject: [PATCH 0514/1300] update angular messages

---
 src-ui/messages.xlf | 48 ++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 18eeec0ef..5f12c504c 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -149,8 +149,8 @@
           <context context-type="linenumber">161</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5277522254327902345" datatype="html">
-        <source>Do you really want to delete document &apos;<x id="PH" equiv-text="this.document.title"/>&apos;?</source>
+      <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">162</context>
@@ -1050,36 +1050,36 @@
           <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8965789168028339624" datatype="html">
-        <source>This operation will add the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="6619516195038467207" datatype="html">
+        <source>This operation will add the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">118</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4791265247184178563" datatype="html">
-        <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToAdd)"/> to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="1894412783609570695" datatype="html">
+        <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToAdd)"/> to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="7567916006270093567" datatype="html">
-        <source>This operation will remove the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; from all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="7181166515756808573" datatype="html">
+        <source>This operation will remove the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="247266594076352528" datatype="html">
-        <source>This operation will remove the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToRemove)"/> from all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="3819792277998068944" datatype="html">
+        <source>This operation will remove the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToRemove)"/> from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4286636723521919383" datatype="html">
-        <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToAdd)"/> and remove the tags <x id="PH_1" equiv-text="this._localizeList(changedTags.itemsToRemove)"/> on all <x id="PH_2" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="2739066218579571288" datatype="html">
+        <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToAdd)"/> and remove the tags <x id="PH_1" equiv-text="this._localizeList(changedTags.itemsToRemove)"/> on <x id="PH_2" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">127</context>
@@ -1092,15 +1092,15 @@
           <context context-type="linenumber">157</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="3171547143349510312" datatype="html">
-        <source>This operation will assign the correspondent &quot;<x id="PH" equiv-text="correspondent.name"/>&quot; to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="6900893559485781849" datatype="html">
+        <source>This operation will assign the correspondent &quot;<x id="PH" equiv-text="correspondent.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">159</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5197985579238314950" datatype="html">
-        <source>This operation will remove the correspondent from all <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="1257522660364398440" datatype="html">
+        <source>This operation will remove the correspondent from <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">161</context>
@@ -1113,15 +1113,15 @@
           <context context-type="linenumber">190</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5346233369873832070" datatype="html">
-        <source>This operation will assign the document type &quot;<x id="PH" equiv-text="documentType.name"/>&quot; to all <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="332180123895325027" datatype="html">
+        <source>This operation will assign the document type &quot;<x id="PH" equiv-text="documentType.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">192</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="6005206188202839923" datatype="html">
-        <source>This operation will remove the document type from all <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="2236642492594872779" datatype="html">
+        <source>This operation will remove the document type from <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">194</context>
@@ -1134,8 +1134,8 @@
           <context context-type="linenumber">219</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="3928393581343272038" datatype="html">
-        <source>This operation will permanently delete all <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
+      <trans-unit id="4303174930844518780" datatype="html">
+        <source>This operation will permanently delete <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">220</context>
@@ -1281,8 +1281,8 @@
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="80e9f19d307b1611c56aa0bdddc930d85418734c" datatype="html">
-        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they&apos;ll start showing up in the documents list. After you&apos;ve added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as &apos;Recently added&apos;, &apos;Tagged TODO&apos;) and have they will be shown on the dashboard instead of this message.</source>
+      <trans-unit id="ea8d9a9486d5639d1c38c012900b8d34d5e4135d" datatype="html">
+        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they&apos;ll start showing up in the documents list. After you&apos;ve added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as &apos;Recently added&apos;, &apos;Tagged TODO&apos;) and they will appear on the dashboard instead of this message.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
           <context context-type="linenumber">6,7</context>

From beed820602ed782883820d56b4bbb604abf4b7a7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 17:17:36 +0100
Subject: [PATCH 0515/1300] improve file renaming speed.

---
 src/documents/signals/handlers.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 586897585..f2743c212 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -276,13 +276,6 @@ def update_filename_and_move_files(sender, instance, **kwargs):
             Document.objects.filter(pk=instance.pk).update(
                 filename=new_filename)
 
-            logging.getLogger(__name__).debug(
-                f"Moved file {old_source_path} to {new_source_path}.")
-
-            if instance.archive_checksum:
-                logging.getLogger(__name__).debug(
-                    f"Moved file {old_archive_path} to {new_archive_path}.")
-
         except OSError as e:
             instance.filename = old_filename
             # this happens when we can't move a file. If that's the case for

From 1df922ef166b38eb87949d57d90dd41325ea0f55 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 17:18:27 +0100
Subject: [PATCH 0516/1300] Do file renaming first, since this is the important
 step, and indexing takes a while.

---
 src/documents/tasks.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index f9937c177..ba7010ea9 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -94,7 +94,10 @@ def bulk_update_documents(document_ids):
     documents = Document.objects.filter(id__in=document_ids)
 
     ix = index.open_index()
+
+    for doc in documents:
+        post_save.send(Document, instance=doc, created=False)
+
     with AsyncWriter(ix) as writer:
         for doc in documents:
             index.update_document(writer, doc)
-            post_save.send(Document, instance=doc, created=False)

From a0f983f05d13af767dcf92a2b1e84213902eb7b2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 17:20:03 +0100
Subject: [PATCH 0517/1300] codestyle

---
 src/documents/management/commands/document_thumbnails.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/documents/management/commands/document_thumbnails.py b/src/documents/management/commands/document_thumbnails.py
index 41ddec86e..01df14624 100644
--- a/src/documents/management/commands/document_thumbnails.py
+++ b/src/documents/management/commands/document_thumbnails.py
@@ -23,6 +23,7 @@ def _process_document(doc_in):
     finally:
         parser.cleanup()
 
+
 class Command(Renderable, BaseCommand):
 
     help = """
@@ -62,4 +63,6 @@ class Command(Renderable, BaseCommand):
         db.connections.close_all()
 
         with multiprocessing.Pool() as pool:
-            list(tqdm.tqdm(pool.imap_unordered(_process_document, ids), total=len(ids)))
+            list(tqdm.tqdm(
+                pool.imap_unordered(_process_document, ids), total=len(ids)
+            ))

From 750d08ec015016be80b1ecb24985b16cf538d9e1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 21:48:34 +0100
Subject: [PATCH 0518/1300] add more translation

---
 src/documents/models.py                | 200 +++++++++------
 src/locale/de/LC_MESSAGES/django.po    | 298 ++++++++++++++++++++++-
 src/locale/en-us/LC_MESSAGES/django.po | 322 +++++++++++++++++++++++++
 3 files changed, 748 insertions(+), 72 deletions(-)
 create mode 100644 src/locale/en-us/LC_MESSAGES/django.po

diff --git a/src/documents/models.py b/src/documents/models.py
index 168dd8c7b..6395d66aa 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -13,6 +13,8 @@ from django.contrib.auth.models import User
 from django.db import models
 from django.utils import timezone
 
+from django.utils.translation import gettext_lazy as _
+
 from documents.file_handling import archive_name_from_filename
 from documents.parsers import get_default_file_extension
 
@@ -27,36 +29,31 @@ class MatchingModel(models.Model):
     MATCH_AUTO = 6
 
     MATCHING_ALGORITHMS = (
-        (MATCH_ANY, "Any"),
-        (MATCH_ALL, "All"),
-        (MATCH_LITERAL, "Literal"),
-        (MATCH_REGEX, "Regular Expression"),
-        (MATCH_FUZZY, "Fuzzy Match"),
-        (MATCH_AUTO, "Automatic Classification"),
+        (MATCH_ANY, _("Any")),
+        (MATCH_ALL, _("All")),
+        (MATCH_LITERAL, _("Literal")),
+        (MATCH_REGEX, _("Regular Expression")),
+        (MATCH_FUZZY, _("Fuzzy Match")),
+        (MATCH_AUTO, _("Automatic Classification")),
     )
 
-    name = models.CharField(max_length=128, unique=True)
+    name = models.CharField(
+        _("name"),
+        max_length=128, unique=True)
+
+    match = models.CharField(
+        _("match"),
+        max_length=256, blank=True)
 
-    match = models.CharField(max_length=256, blank=True)
     matching_algorithm = models.PositiveIntegerField(
+        _("matching algorithm"),
         choices=MATCHING_ALGORITHMS,
-        default=MATCH_ANY,
-        help_text=(
-            "Which algorithm you want to use when matching text to the OCR'd "
-            "PDF.  Here, \"any\" looks for any occurrence of any word "
-            "provided in the PDF, while \"all\" requires that every word "
-            "provided appear in the PDF, albeit not in the order provided.  A "
-            "\"literal\" match means that the text you enter must appear in "
-            "the PDF exactly as you've entered it, and \"regular expression\" "
-            "uses a regex to match the PDF.  (If you don't know what a regex "
-            "is, you probably don't want this option.)  Finally, a \"fuzzy "
-            "match\" looks for words or phrases that are mostly—but not "
-            "exactly—the same, which can be useful for matching against "
-            "documents containg imperfections that foil accurate OCR."
-        )
+        default=MATCH_ANY
     )
 
-    is_insensitive = models.BooleanField(default=True)
+    is_insensitive = models.BooleanField(
+        _("is insensitive"),
+        default=True)
 
     class Meta:
         abstract = True
@@ -80,6 +77,8 @@ class Correspondent(MatchingModel):
 
     class Meta:
         ordering = ("name",)
+        verbose_name = _("correspondent")
+        verbose_name_plural = _("correspondents")
 
 
 class Tag(MatchingModel):
@@ -100,18 +99,28 @@ class Tag(MatchingModel):
         (13, "#cccccc")
     )
 
-    colour = models.PositiveIntegerField(choices=COLOURS, default=1)
+    colour = models.PositiveIntegerField(
+        _("color"),
+        choices=COLOURS, default=1)
 
     is_inbox_tag = models.BooleanField(
+        _("is inbox tag"),
         default=False,
-        help_text="Marks this tag as an inbox tag: All newly consumed "
-                  "documents will be tagged with inbox tags."
+        help_text=_("Marks this tag as an inbox tag: All newly consumed "
+                    "documents will be tagged with inbox tags.")
     )
 
+    class Meta:
+        verbose_name = _("tag")
+        verbose_name_plural = _("tags")
+
 
 class DocumentType(MatchingModel):
 
-    pass
+    class Meta:
+        verbose_name = _("document type")
+        verbose_name_plural = _("document types")
+
 
 
 class Document(models.Model):
@@ -119,8 +128,8 @@ class Document(models.Model):
     STORAGE_TYPE_UNENCRYPTED = "unencrypted"
     STORAGE_TYPE_GPG = "gpg"
     STORAGE_TYPES = (
-        (STORAGE_TYPE_UNENCRYPTED, "Unencrypted"),
-        (STORAGE_TYPE_GPG, "Encrypted with GNU Privacy Guard")
+        (STORAGE_TYPE_UNENCRYPTED, _("Unencrypted")),
+        (STORAGE_TYPE_GPG, _("Encrypted with GNU Privacy Guard"))
     )
 
     correspondent = models.ForeignKey(
@@ -128,55 +137,68 @@ class Document(models.Model):
         blank=True,
         null=True,
         related_name="documents",
-        on_delete=models.SET_NULL
+        on_delete=models.SET_NULL,
+        verbose_name=_("correspondent")
     )
 
-    title = models.CharField(max_length=128, blank=True, db_index=True)
+    title = models.CharField(
+        _("title"),
+        max_length=128, blank=True, db_index=True)
 
     document_type = models.ForeignKey(
         DocumentType,
         blank=True,
         null=True,
         related_name="documents",
-        on_delete=models.SET_NULL
+        on_delete=models.SET_NULL,
+        verbose_name=_("document type")
     )
 
     content = models.TextField(
+        _("content"),
         blank=True,
-        help_text="The raw, text-only data of the document. This field is "
-                  "primarily used for searching."
+        help_text=_("The raw, text-only data of the document. This field is "
+                    "primarily used for searching.")
     )
 
     mime_type = models.CharField(
+        _("mime type"),
         max_length=256,
         editable=False
     )
 
     tags = models.ManyToManyField(
-        Tag, related_name="documents", blank=True)
+        Tag, related_name="documents", blank=True,
+        verbose_name=_("tags")
+    )
 
     checksum = models.CharField(
+        _("checksum"),
         max_length=32,
         editable=False,
         unique=True,
-        help_text="The checksum of the original document."
+        help_text=_("The checksum of the original document.")
     )
 
     archive_checksum = models.CharField(
+        _("archive checksum"),
         max_length=32,
         editable=False,
         blank=True,
         null=True,
-        help_text="The checksum of the archived document."
+        help_text=_("The checksum of the archived document.")
     )
 
     created = models.DateTimeField(
+        _("created"),
         default=timezone.now, db_index=True)
 
     modified = models.DateTimeField(
+        _("modified"),
         auto_now=True, editable=False, db_index=True)
 
     storage_type = models.CharField(
+        _("storage type"),
         max_length=11,
         choices=STORAGE_TYPES,
         default=STORAGE_TYPE_UNENCRYPTED,
@@ -184,27 +206,32 @@ class Document(models.Model):
     )
 
     added = models.DateTimeField(
+        _("added"),
         default=timezone.now, editable=False, db_index=True)
 
     filename = models.FilePathField(
+        _("filename"),
         max_length=1024,
         editable=False,
         default=None,
         null=True,
-        help_text="Current filename in storage"
+        help_text=_("Current filename in storage")
     )
 
     archive_serial_number = models.IntegerField(
+        _("archive serial number"),
         blank=True,
         null=True,
         unique=True,
         db_index=True,
-        help_text="The position of this document in your physical document "
-                  "archive."
+        help_text=_("The position of this document in your physical document "
+                    "archive.")
     )
 
     class Meta:
         ordering = ("-created",)
+        verbose_name = _("Document")
+        verbose_name_plural = _("Documents")
 
     def __str__(self):
         created = datetime.date.isoformat(self.created)
@@ -293,13 +320,22 @@ class Log(models.Model):
         (logging.CRITICAL, "Critical"),
     )
 
-    group = models.UUIDField(blank=True, null=True)
-    message = models.TextField()
-    level = models.PositiveIntegerField(choices=LEVELS, default=logging.INFO)
-    created = models.DateTimeField(auto_now_add=True)
+    group = models.UUIDField(
+        _("group"),
+        blank=True, null=True)
+
+    message = models.TextField(_("message"))
+
+    level = models.PositiveIntegerField(
+        _("level"),
+        choices=LEVELS, default=logging.INFO)
+
+    created = models.DateTimeField(_("created"), auto_now_add=True)
 
     class Meta:
         ordering = ("-created",)
+        verbose_name = _("log")
+        verbose_name_plural = _("logs")
 
     def __str__(self):
         return self.message
@@ -310,48 +346,70 @@ class SavedView(models.Model):
     class Meta:
 
         ordering = ("name",)
+        verbose_name = _("saved view")
+        verbose_name_plural = _("saved views")
 
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
-    name = models.CharField(max_length=128)
+    user = models.ForeignKey(User, on_delete=models.CASCADE,
+                             verbose_name=_("user"))
+    name = models.CharField(
+        _("name"),
+        max_length=128)
 
-    show_on_dashboard = models.BooleanField()
-    show_in_sidebar = models.BooleanField()
+    show_on_dashboard = models.BooleanField(
+        _("show on dashboard"),
+    )
+    show_in_sidebar = models.BooleanField(
+        _("show in sidebar"),
+    )
 
-    sort_field = models.CharField(max_length=128)
-    sort_reverse = models.BooleanField(default=False)
+    sort_field = models.CharField(
+        _("sort field"),
+        max_length=128)
+    sort_reverse = models.BooleanField(
+        _("sort reverse"),
+        default=False)
 
 
 class SavedViewFilterRule(models.Model):
     RULE_TYPES = [
-        (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"),
+        (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")),
     ]
 
     saved_view = models.ForeignKey(
         SavedView,
         on_delete=models.CASCADE,
-        related_name="filter_rules"
+        related_name="filter_rules",
+        verbose_name=_("saved view")
     )
 
-    rule_type = models.PositiveIntegerField(choices=RULE_TYPES)
+    rule_type = models.PositiveIntegerField(
+        _("rule type"),
+        choices=RULE_TYPES)
 
-    value = models.CharField(max_length=128)
+    value = models.CharField(
+        _("value"),
+        max_length=128)
+
+    class Meta:
+        verbose_name = _("filter rule")
+        verbose_name_plural = _("filter rules")
 
 
 # TODO: why is this in the models file?
diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po
index bbab220a7..db1d2c437 100644
--- a/src/locale/de/LC_MESSAGES/django.po
+++ b/src/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-30 00:37+0000\n"
+"POT-Creation-Date: 2020-12-30 19:20+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,6 +18,302 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: documents/models.py:32
+msgid "Any"
+msgstr ""
+
+#: documents/models.py:33
+msgid "All"
+msgstr ""
+
+#: documents/models.py:34
+msgid "Literal"
+msgstr ""
+
+#: documents/models.py:35
+msgid "Regular Expression"
+msgstr ""
+
+#: documents/models.py:36
+msgid "Fuzzy Match"
+msgstr ""
+
+#: documents/models.py:37
+msgid "Automatic Classification"
+msgstr ""
+
+#: documents/models.py:41 documents/models.py:355
+msgid "name"
+msgstr ""
+
+#: documents/models.py:45
+msgid "match"
+msgstr ""
+
+#: documents/models.py:49
+msgid "matching algorithm"
+msgstr ""
+
+#: documents/models.py:55
+msgid "is insensitive"
+msgstr ""
+
+#: documents/models.py:80 documents/models.py:141
+msgid "correspondent"
+msgstr ""
+
+#: documents/models.py:81
+msgid "correspondents"
+msgstr ""
+
+#: documents/models.py:103
+msgid "color"
+msgstr ""
+
+#: documents/models.py:107
+msgid "is inbox tag"
+msgstr ""
+
+#: documents/models.py:109
+msgid ""
+"Marks this tag as an inbox tag: All newly consumed documents will be tagged "
+"with inbox tags."
+msgstr ""
+
+#: documents/models.py:114
+msgid "tag"
+msgstr ""
+
+#: documents/models.py:115 documents/models.py:172
+msgid "tags"
+msgstr ""
+
+#: documents/models.py:121 documents/models.py:154
+msgid "document type"
+msgstr "Dokumenttyp"
+
+#: documents/models.py:122
+msgid "document types"
+msgstr "Dokumenttypen"
+
+#: documents/models.py:131
+msgid "Unencrypted"
+msgstr ""
+
+#: documents/models.py:132
+msgid "Encrypted with GNU Privacy Guard"
+msgstr ""
+
+#: documents/models.py:145
+msgid "title"
+msgstr ""
+
+#: documents/models.py:158
+msgid "content"
+msgstr ""
+
+#: documents/models.py:160
+msgid ""
+"The raw, text-only data of the document. This field is primarily used for "
+"searching."
+msgstr ""
+
+#: documents/models.py:165
+msgid "mime type"
+msgstr ""
+
+#: documents/models.py:176
+msgid "checksum"
+msgstr ""
+
+#: documents/models.py:180
+msgid "The checksum of the original document."
+msgstr ""
+
+#: documents/models.py:184
+msgid "archive checksum"
+msgstr ""
+
+#: documents/models.py:189
+msgid "The checksum of the archived document."
+msgstr ""
+
+#: documents/models.py:193 documents/models.py:333
+msgid "created"
+msgstr ""
+
+#: documents/models.py:197
+msgid "modified"
+msgstr ""
+
+#: documents/models.py:201
+msgid "storage type"
+msgstr ""
+
+#: documents/models.py:209
+msgid "added"
+msgstr ""
+
+#: documents/models.py:213
+msgid "filename"
+msgstr ""
+
+#: documents/models.py:218
+msgid "Current filename in storage"
+msgstr ""
+
+#: documents/models.py:222
+msgid "archive serial number"
+msgstr ""
+
+#: documents/models.py:227
+msgid "The position of this document in your physical document archive."
+msgstr ""
+
+#: documents/models.py:233
+msgid "Document"
+msgstr ""
+
+#: documents/models.py:234
+msgid "Documents"
+msgstr ""
+
+#: documents/models.py:324
+msgid "group"
+msgstr ""
+
+#: documents/models.py:327
+msgid "message"
+msgstr ""
+
+#: documents/models.py:330
+msgid "level"
+msgstr ""
+
+#: documents/models.py:337
+msgid "log"
+msgstr ""
+
+#: documents/models.py:338
+msgid "logs"
+msgstr ""
+
+#: documents/models.py:349 documents/models.py:399
+msgid "saved view"
+msgstr ""
+
+#: documents/models.py:350
+msgid "saved views"
+msgstr ""
+
+#: documents/models.py:353
+msgid "user"
+msgstr "Benutzer"
+
+#: documents/models.py:359
+msgid "show on dashboard"
+msgstr ""
+
+#: documents/models.py:362
+msgid "show in sidebar"
+msgstr ""
+
+#: documents/models.py:366
+msgid "sort field"
+msgstr ""
+
+#: documents/models.py:369
+msgid "sort reverse"
+msgstr ""
+
+#: documents/models.py:375
+msgid "title contains"
+msgstr ""
+
+#: documents/models.py:376
+msgid "content contains"
+msgstr ""
+
+#: documents/models.py:377
+msgid "ASN is"
+msgstr ""
+
+#: documents/models.py:378
+msgid "correspondent is"
+msgstr ""
+
+#: documents/models.py:379
+msgid "document type is"
+msgstr ""
+
+#: documents/models.py:380
+msgid "is in inbox"
+msgstr ""
+
+#: documents/models.py:381
+msgid "has tag"
+msgstr ""
+
+#: documents/models.py:382
+msgid "has any tag"
+msgstr ""
+
+#: documents/models.py:383
+msgid "created before"
+msgstr ""
+
+#: documents/models.py:384
+msgid "created after"
+msgstr ""
+
+#: documents/models.py:385
+msgid "created year is"
+msgstr ""
+
+#: documents/models.py:386
+msgid "created month is"
+msgstr ""
+
+#: documents/models.py:387
+msgid "created day is"
+msgstr ""
+
+#: documents/models.py:388
+msgid "added before"
+msgstr ""
+
+#: documents/models.py:389
+msgid "added after"
+msgstr ""
+
+#: documents/models.py:390
+msgid "modified before"
+msgstr ""
+
+#: documents/models.py:391
+msgid "modified after"
+msgstr ""
+
+#: documents/models.py:392
+msgid "does not have tag"
+msgstr ""
+
+#: documents/models.py:403
+msgid "rule type"
+msgstr ""
+
+#: documents/models.py:407
+msgid "value"
+msgstr ""
+
+#: documents/models.py:411
+msgid "filter rule"
+msgstr ""
+
+#: documents/models.py:412
+msgid "filter rules"
+msgstr "Filterregeln"
+
 #: paperless/settings.py:253
 msgid "English"
 msgstr ""
diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en-us/LC_MESSAGES/django.po
new file mode 100644
index 000000000..c3c76c5a4
--- /dev/null
+++ b/src/locale/en-us/LC_MESSAGES/django.po
@@ -0,0 +1,322 @@
+# 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.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-12-30 19:20+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: documents/models.py:32
+msgid "Any"
+msgstr ""
+
+#: documents/models.py:33
+msgid "All"
+msgstr ""
+
+#: documents/models.py:34
+msgid "Literal"
+msgstr ""
+
+#: documents/models.py:35
+msgid "Regular Expression"
+msgstr ""
+
+#: documents/models.py:36
+msgid "Fuzzy Match"
+msgstr ""
+
+#: documents/models.py:37
+msgid "Automatic Classification"
+msgstr ""
+
+#: documents/models.py:41 documents/models.py:355
+msgid "name"
+msgstr ""
+
+#: documents/models.py:45
+msgid "match"
+msgstr ""
+
+#: documents/models.py:49
+msgid "matching algorithm"
+msgstr ""
+
+#: documents/models.py:55
+msgid "is insensitive"
+msgstr ""
+
+#: documents/models.py:80 documents/models.py:141
+msgid "correspondent"
+msgstr ""
+
+#: documents/models.py:81
+msgid "correspondents"
+msgstr ""
+
+#: documents/models.py:103
+msgid "color"
+msgstr ""
+
+#: documents/models.py:107
+msgid "is inbox tag"
+msgstr ""
+
+#: documents/models.py:109
+msgid ""
+"Marks this tag as an inbox tag: All newly consumed documents will be tagged "
+"with inbox tags."
+msgstr ""
+
+#: documents/models.py:114
+msgid "tag"
+msgstr ""
+
+#: documents/models.py:115 documents/models.py:172
+msgid "tags"
+msgstr ""
+
+#: documents/models.py:121 documents/models.py:154
+msgid "document type"
+msgstr ""
+
+#: documents/models.py:122
+msgid "document types"
+msgstr ""
+
+#: documents/models.py:131
+msgid "Unencrypted"
+msgstr ""
+
+#: documents/models.py:132
+msgid "Encrypted with GNU Privacy Guard"
+msgstr ""
+
+#: documents/models.py:145
+msgid "title"
+msgstr ""
+
+#: documents/models.py:158
+msgid "content"
+msgstr ""
+
+#: documents/models.py:160
+msgid ""
+"The raw, text-only data of the document. This field is primarily used for "
+"searching."
+msgstr ""
+
+#: documents/models.py:165
+msgid "mime type"
+msgstr ""
+
+#: documents/models.py:176
+msgid "checksum"
+msgstr ""
+
+#: documents/models.py:180
+msgid "The checksum of the original document."
+msgstr ""
+
+#: documents/models.py:184
+msgid "archive checksum"
+msgstr ""
+
+#: documents/models.py:189
+msgid "The checksum of the archived document."
+msgstr ""
+
+#: documents/models.py:193 documents/models.py:333
+msgid "created"
+msgstr ""
+
+#: documents/models.py:197
+msgid "modified"
+msgstr ""
+
+#: documents/models.py:201
+msgid "storage type"
+msgstr ""
+
+#: documents/models.py:209
+msgid "added"
+msgstr ""
+
+#: documents/models.py:213
+msgid "filename"
+msgstr ""
+
+#: documents/models.py:218
+msgid "Current filename in storage"
+msgstr ""
+
+#: documents/models.py:222
+msgid "archive serial number"
+msgstr ""
+
+#: documents/models.py:227
+msgid "The position of this document in your physical document archive."
+msgstr ""
+
+#: documents/models.py:233
+msgid "Document"
+msgstr ""
+
+#: documents/models.py:234
+msgid "Documents"
+msgstr ""
+
+#: documents/models.py:324
+msgid "group"
+msgstr ""
+
+#: documents/models.py:327
+msgid "message"
+msgstr ""
+
+#: documents/models.py:330
+msgid "level"
+msgstr ""
+
+#: documents/models.py:337
+msgid "log"
+msgstr ""
+
+#: documents/models.py:338
+msgid "logs"
+msgstr ""
+
+#: documents/models.py:349 documents/models.py:399
+msgid "saved view"
+msgstr ""
+
+#: documents/models.py:350
+msgid "saved views"
+msgstr ""
+
+#: documents/models.py:353
+msgid "user"
+msgstr ""
+
+#: documents/models.py:359
+msgid "show on dashboard"
+msgstr ""
+
+#: documents/models.py:362
+msgid "show in sidebar"
+msgstr ""
+
+#: documents/models.py:366
+msgid "sort field"
+msgstr ""
+
+#: documents/models.py:369
+msgid "sort reverse"
+msgstr ""
+
+#: documents/models.py:375
+msgid "title contains"
+msgstr ""
+
+#: documents/models.py:376
+msgid "content contains"
+msgstr ""
+
+#: documents/models.py:377
+msgid "ASN is"
+msgstr ""
+
+#: documents/models.py:378
+msgid "correspondent is"
+msgstr ""
+
+#: documents/models.py:379
+msgid "document type is"
+msgstr ""
+
+#: documents/models.py:380
+msgid "is in inbox"
+msgstr ""
+
+#: documents/models.py:381
+msgid "has tag"
+msgstr ""
+
+#: documents/models.py:382
+msgid "has any tag"
+msgstr ""
+
+#: documents/models.py:383
+msgid "created before"
+msgstr ""
+
+#: documents/models.py:384
+msgid "created after"
+msgstr ""
+
+#: documents/models.py:385
+msgid "created year is"
+msgstr ""
+
+#: documents/models.py:386
+msgid "created month is"
+msgstr ""
+
+#: documents/models.py:387
+msgid "created day is"
+msgstr ""
+
+#: documents/models.py:388
+msgid "added before"
+msgstr ""
+
+#: documents/models.py:389
+msgid "added after"
+msgstr ""
+
+#: documents/models.py:390
+msgid "modified before"
+msgstr ""
+
+#: documents/models.py:391
+msgid "modified after"
+msgstr ""
+
+#: documents/models.py:392
+msgid "does not have tag"
+msgstr ""
+
+#: documents/models.py:403
+msgid "rule type"
+msgstr ""
+
+#: documents/models.py:407
+msgid "value"
+msgstr ""
+
+#: documents/models.py:411
+msgid "filter rule"
+msgstr ""
+
+#: documents/models.py:412
+msgid "filter rules"
+msgstr ""
+
+#: paperless/settings.py:253
+msgid "English"
+msgstr ""
+
+#: paperless/settings.py:254
+msgid "German"
+msgstr ""

From 208f4291d6bc217bdef85da9c828f9db8f27c4bb Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 21:54:36 +0100
Subject: [PATCH 0519/1300] fixes #222

---
 src/documents/consumer.py                              | 2 +-
 src/documents/management/commands/document_retagger.py | 2 +-
 src/documents/tasks.py                                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 4bcb6d1d9..5a06194b7 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -158,7 +158,7 @@ class Consumer(LoggingMixin):
         try:
             classifier = DocumentClassifier()
             classifier.reload()
-        except (FileNotFoundError, IncompatibleClassifierVersionError) as e:
+        except (OSError, EOFError, IncompatibleClassifierVersionError) as e:
             self.log(
                 "warning",
                 f"Cannot classify documents: {e}.")
diff --git a/src/documents/management/commands/document_retagger.py b/src/documents/management/commands/document_retagger.py
index cf014dc6f..0fb9782c1 100755
--- a/src/documents/management/commands/document_retagger.py
+++ b/src/documents/management/commands/document_retagger.py
@@ -73,7 +73,7 @@ class Command(Renderable, BaseCommand):
         classifier = DocumentClassifier()
         try:
             classifier.reload()
-        except (FileNotFoundError, IncompatibleClassifierVersionError) as e:
+        except (OSError, EOFError, IncompatibleClassifierVersionError) as e:
             logging.getLogger(__name__).warning(
                 f"Cannot classify documents: {e}.")
             classifier = None
diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index ba7010ea9..38ff532b5 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -35,9 +35,9 @@ def train_classifier():
     try:
         # load the classifier, since we might not have to train it again.
         classifier.reload()
-    except (FileNotFoundError, IncompatibleClassifierVersionError):
+    except (OSError, EOFError, IncompatibleClassifierVersionError):
         # This is what we're going to fix here.
-        pass
+        classifier = DocumentClassifier()
 
     try:
         if classifier.train():

From 63b841c496845b21200bf84c8cc05e36501b1a44 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 23:01:34 +0100
Subject: [PATCH 0520/1300] fixes #224

---
 src-ui/src/app/components/common/input/tags/tags.component.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html
index 8a5dbc4f2..01b3fe755 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.html
+++ b/src-ui/src/app/components/common/input/tags/tags.component.html
@@ -5,7 +5,9 @@
     <ng-select name="tags" [items]="tags" bindLabel="name" bindValue="id" [(ngModel)]="displayValue"
       [multiple]="true"
       [closeOnSelect]="false"
+      [clearSearchOnAdd]="true"
       [disabled]="disabled"
+      [hideSelected]="true"
       (change)="ngSelectChange()">
 
       <ng-template ng-label-tmp let-item="item">

From 1428b2670361e968a52a14308362026ab0575fca Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 23:34:21 +0100
Subject: [PATCH 0521/1300] this immensely improves resposibility

---
 .../app/components/document-list/document-list.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index bc1047ba9..e627c428d 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -78,8 +78,8 @@
 </app-page-header>
 
 <div class="w-100 mb-2 mb-sm-4">
-  <app-filter-editor *ngIf="!isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
-  <app-bulk-editor *ngIf="isBulkEditing"></app-bulk-editor>
+  <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
+  <app-bulk-editor [hidden]="!isBulkEditing"></app-bulk-editor>
 </div>
 
 <div class="d-flex justify-content-between align-items-center">

From ef1ee8e0c0acadaaa9d4778dee69f60d1beab5a6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 30 Dec 2020 23:34:50 +0100
Subject: [PATCH 0522/1300] fixes a bug with invisible selection

---
 .../correspondent-list.component.ts                   |  9 ++-------
 .../document-type-list.component.ts                   |  7 +------
 .../components/manage/tag-list/tag-list.component.ts  |  9 ++-------
 src-ui/src/app/services/document-list-view.service.ts | 11 ++++++++++-
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
index d3b71b4ab..37b6fa66e 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
@@ -1,5 +1,4 @@
-import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { Component } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { FILTER_CORRESPONDENT } from 'src/app/data/filter-rule-type';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
@@ -16,7 +15,6 @@ import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/co
 export class CorrespondentListComponent extends GenericListComponent<PaperlessCorrespondent> {
 
   constructor(correspondentsService: CorrespondentService, modalService: NgbModal,
-    private router: Router,
     private list: DocumentListViewService
   ) { 
     super(correspondentsService,modalService,CorrespondentEditDialogComponent)
@@ -27,9 +25,6 @@ export class CorrespondentListComponent extends GenericListComponent<PaperlessCo
   }
 
   filterDocuments(object: PaperlessCorrespondent) {
-    this.list.documentListView.filter_rules = [
-      {rule_type: FILTER_CORRESPONDENT, value: object.id.toString()}
-    ]
-    this.router.navigate(["documents"])
+    this.list.quickFilter([{rule_type: FILTER_CORRESPONDENT, value: object.id.toString()}])
   }
 }
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
index 66469619c..68c8b6f91 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { FILTER_DOCUMENT_TYPE } from 'src/app/data/filter-rule-type';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
@@ -16,7 +15,6 @@ import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/doc
 export class DocumentTypeListComponent extends GenericListComponent<PaperlessDocumentType> {
 
   constructor(service: DocumentTypeService, modalService: NgbModal,
-    private router: Router,
     private list: DocumentListViewService
   ) {
     super(service, modalService, DocumentTypeEditDialogComponent)
@@ -28,9 +26,6 @@ export class DocumentTypeListComponent extends GenericListComponent<PaperlessDoc
 
 
   filterDocuments(object: PaperlessDocumentType) {
-    this.list.documentListView.filter_rules = [
-      {rule_type: FILTER_DOCUMENT_TYPE, value: object.id.toString()}
-    ]
-    this.router.navigate(["documents"])
+    this.list.quickFilter([{rule_type: FILTER_DOCUMENT_TYPE, value: object.id.toString()}])
   }
 }
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
index 3d1ccd778..2c70ffef1 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { FILTER_HAS_TAG } from 'src/app/data/filter-rule-type';
 import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag';
@@ -16,7 +15,6 @@ import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.compon
 export class TagListComponent extends GenericListComponent<PaperlessTag> {
 
   constructor(tagService: TagService, modalService: NgbModal,
-    private router: Router,
     private list: DocumentListViewService
   ) {
     super(tagService, modalService, TagEditDialogComponent)
@@ -27,14 +25,11 @@ export class TagListComponent extends GenericListComponent<PaperlessTag> {
   }
 
   getDeleteMessage(object: PaperlessTag) {
-    
     return $localize`Do you really want to delete the tag "${object.name}"?`
   }
 
   filterDocuments(object: PaperlessTag) {
-    this.list.documentListView.filter_rules = [
-      {rule_type: FILTER_HAS_TAG, value: object.id.toString()}
-    ]
-    this.router.navigate(["documents"])
+    this.list.quickFilter([{rule_type: FILTER_HAS_TAG, value: object.id.toString()}])
+
   }
 }
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index dfcf9c0c5..eb69439ec 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
 import { cloneFilterRules, FilterRule } from '../data/filter-rule';
 import { PaperlessDocument } from '../data/paperless-document';
@@ -155,6 +156,14 @@ export class DocumentListViewService {
     sessionStorage.setItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG, JSON.stringify(this.documentListView))
   }
 
+  quickFilter(filterRules: FilterRule[]) {
+    this.savedView = null
+    this.view.filter_rules = filterRules
+    this.reduceSelectionToFilter()
+    this.saveDocumentListView()
+    this.router.navigate(["documents"])
+  }
+
   getLastPage(): number {
     return Math.ceil(this.collectionSize / this.currentPageSize)
   }
@@ -240,7 +249,7 @@ export class DocumentListViewService {
     }
   }
 
-  constructor(private documentService: DocumentService, private settings: SettingsService) {
+  constructor(private documentService: DocumentService, private settings: SettingsService, private router: Router) {
     let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
     if (documentListViewConfigJson) {
       try {

From 6066d00c5e39bfba468d7a89175960554379a15f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 31 Dec 2020 00:56:53 +0100
Subject: [PATCH 0523/1300] intelligent sorting of the bulk edit drop downs

---
 .../filterable-dropdown.component.html           |  2 +-
 .../filterable-dropdown.component.ts             | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index 015269c17..b09491683 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -20,7 +20,7 @@
         </div>
       </div>
       <div *ngIf="selectionModel.items" class="items">
-        <ng-container *ngFor="let item of selectionModel.items | filter: filterText">
+        <ng-container *ngFor="let item of selectionModel.itemsSorted | filter: filterText">
           <app-toggleable-dropdown-button *ngIf="allowSelectNone || item.id" [item]="item" [state]="selectionModel.get(item.id)" (toggle)="selectionModel.toggle(item.id)"></app-toggleable-dropdown-button>
         </ng-container>
       </div>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index e1aa6a06a..b51923c27 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -18,6 +18,18 @@ export class FilterableDropdownSelectionModel {
 
   items: MatchingModel[] = []
 
+  get itemsSorted(): MatchingModel[] {
+    return this.items.sort((a,b) => {
+      if (this.getNonTemporary(a.id) == ToggleableItemState.NotSelected && this.getNonTemporary(b.id) != ToggleableItemState.NotSelected) {
+        return 1
+      } else if (this.getNonTemporary(a.id) != ToggleableItemState.NotSelected && this.getNonTemporary(b.id) == ToggleableItemState.NotSelected) {
+        return -1
+      } else {
+        return a.name.localeCompare(b.name)
+      }
+    })
+  }
+
   private selectionStates = new Map<number, ToggleableItemState>()
 
   private temporarySelectionStates = new Map<number, ToggleableItemState>()
@@ -69,6 +81,10 @@ export class FilterableDropdownSelectionModel {
     
   }
 
+  private getNonTemporary(id: number) {
+    return this.selectionStates.get(id) || ToggleableItemState.NotSelected
+  }
+
   get(id: number) {
     return this.temporarySelectionStates.get(id) || ToggleableItemState.NotSelected
   }

From 45e52aa985c35256f0c7a00b5294c0504a64552e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 31 Dec 2020 01:20:38 +0100
Subject: [PATCH 0524/1300] add the manifest to the frontend entry page #219

---
 src/documents/templates/index.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html
index 47a352cd5..83544b5e4 100644
--- a/src/documents/templates/index.html
+++ b/src/documents/templates/index.html
@@ -12,7 +12,9 @@
 	<meta name="full_name" content="{{full_name}}">
 	<meta name="cookie_prefix" content="{{cookie_prefix}}">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-<link rel="stylesheet" href="{% static 'frontend/styles.css' %}"></head>
+  <link rel="manifest" href="{% static 'frontend/manifest.webmanifest' %}">
+	<link rel="stylesheet" href="{% static 'frontend/styles.css' %}">
+</head>
 <body>
   <app-root>Loading...</app-root>
 	<script src="{% static 'frontend/runtime.js' %}" defer></script>

From 4c63dad309c8f71a752eb767fb3821517af6fd07 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 31 Dec 2020 01:43:04 +0100
Subject: [PATCH 0525/1300] fix sorting for "not assigned"

---
 .../filterable-dropdown/filterable-dropdown.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index b09491683..a0e833c98 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -20,7 +20,7 @@
         </div>
       </div>
       <div *ngIf="selectionModel.items" class="items">
-        <ng-container *ngFor="let item of selectionModel.itemsSorted | filter: filterText">
+        <ng-container *ngFor="let item of (editing ? selectionModel.itemsSorted : selectionModel.items) | filter: filterText">
           <app-toggleable-dropdown-button *ngIf="allowSelectNone || item.id" [item]="item" [state]="selectionModel.get(item.id)" (toggle)="selectionModel.toggle(item.id)"></app-toggleable-dropdown-button>
         </ng-container>
       </div>

From 9eb377703e935cb7bac72aa5519ea444b5aef4eb Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 31 Dec 2020 01:58:32 +0100
Subject: [PATCH 0526/1300] fix hover for check boxes

---
 .../document-card-small/document-card-small.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index e0d8d28e1..f6128e077 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/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" [class.card-selected]="selected">
+  <div class="card h-100 shadow-sm document-card" [class.card-selected]="selected">
     <div class="border-bottom" [class.doc-img-background-selected]="selected">
       <img class="card-img doc-img" [src]="getThumbUrl()" (click)="setSelected(!selected)">
 

From 70f052cb5cd6684f04ff12a088eeba347ddee94f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 31 Dec 2020 02:15:16 +0100
Subject: [PATCH 0527/1300] changelog

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4357a981b..bba0d087f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -25,6 +25,8 @@ paperless-ng 0.9.10
   * Added missing dependencies for Raspberry Pi builds.
   * Fixed an issue with plain text file consumption: Thumbnail generation failed due to missing fonts.
   * An issue with the search index reporting missing documents after bulk deletes was fixed.
+  * Issue with the tag selector not clearing input correctly.
+  * The consumer used to stop working when encountering an incomplete classifier model file.
 
 .. note::
 

From 3b17f9d6ecc6d1e3459619458ea3fefb260a116d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 31 Dec 2020 02:40:43 +0100
Subject: [PATCH 0528/1300] changelog

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index bba0d087f..fe4d89a55 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -15,6 +15,7 @@ paperless-ng 0.9.10
 
 * Other changes and additions
   
+  * Thanks to `zjean`_, paperless now publishes a webmanifest, which is useful for adding the application to home screens on mobile devices.
   * The Paperless-ng logo now navigates to the dashboard.
   * Filter for documents that don't have any correspondents, types or tags assigned.
   * Tags, types and correspondents are now sorted case insensitive.
@@ -958,6 +959,7 @@ bulk of the work on this big change.
 
 * Initial release
 
+.. _zjean: https://github.com/zjean
 .. _rYR79435: https://github.com/rYR79435
 .. _Michael Shamoon: https://github.com/shamoon
 .. _jayme-github: http://github.com/jayme-github

From 020696fb176bc262469d9a78f10814feabb724bb Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 30 Dec 2020 23:16:30 -0800
Subject: [PATCH 0529/1300] Fix overflowing document titles on homepage mobile
 view

---
 .../saved-view-widget/saved-view-widget.component.scss     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss
index e69de29bb..40d1c836b 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss
@@ -0,0 +1,7 @@
+table {
+  overflow-wrap: anywhere;
+}
+
+th:first-child {
+  min-width: 5rem;
+}

From d42c13a9c6d71edb083f6e8162b30f1c197be969 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 30 Dec 2020 23:39:07 -0800
Subject: [PATCH 0530/1300] Reorganized navbar

Updated search field, new user menu
---
 .../app-frame/app-frame.component.html        | 58 +++++++++++--------
 .../app-frame/app-frame.component.scss        | 45 ++++++++++----
 2 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index d191ec0de..9d6c4924f 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -1,17 +1,43 @@
 <nav class="navbar navbar-dark sticky-top bg-primary flex-md-nowrap p-0 shadow">
-  <a class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" routerLink="/dashboard">
-    <img src="assets/logo-dark-notext.svg" height="18px" class="mr-2">
-    <ng-container i18n="app title">Paperless-ng</ng-container>
-  </a>
-  <button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-toggle="collapse"
+  <button class="navbar-toggler d-md-none collapsed border-0" type="button" data-toggle="collapse"
     data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"
     (click)="isMenuCollapsed = !isMenuCollapsed">
     <span class="navbar-toggler-icon"></span>
   </button>
-  <form (ngSubmit)="search()" class="w-100 m-1">
-    <input class="form-control form-control-dark" type="text" placeholder="Search for documents" aria-label="Search"
-      [formControl]="searchField" [ngbTypeahead]="searchAutoComplete" (selectItem)="itemSelected($event)" i18n-placeholder>
-  </form>
+  <a class="navbar-brand col-auto col-md-3 col-lg-2 mr-0 px-3 py-3 order-sm-0" routerLink="/dashboard">
+    <img src="assets/logo-dark-notext.svg" height="18px" class="mr-2">
+    <ng-container i18n="app title">Paperless-ng</ng-container>
+  </a>
+  <div class="search-form-container flex-grow-1 py-2 pb-3 pb-sm-2 px-3 mr-sm-auto order-3 order-sm-1">
+    <form (ngSubmit)="search()" class="form-inline flex-grow-1">
+      <input class="form-control form-control-sm" type="text" placeholder="Search documents" aria-label="Search"
+        [formControl]="searchField" [ngbTypeahead]="searchAutoComplete" (selectItem)="itemSelected($event)" i18n-placeholder>
+      <svg width="1em" height="1em">
+        <use xlink:href="assets/bootstrap-icons.svg#search"/>
+      </svg>
+    </form>
+  </div>
+  <ul ngbNav class="order-sm-3">
+    <li ngbDropdown class="nav-item dropdown">
+      <button class="btn text-light" id="userDropdown" ngbDropdownToggle>
+        <svg width="1.3em" height="1.3em">
+          <use xlink:href="assets/bootstrap-icons.svg#person-circle"/>
+        </svg>
+      </button>
+      <div ngbDropdownMenu class="dropdown-menu-right shadow mr-2" aria-labelledby="userDropdown">
+          <a ngbDropdownItem class="nav-link" routerLink="settings" routerLinkActive="active" (click)="closeMenu()">
+            <svg class="sidebaricon" fill="currentColor">
+              <use xlink:href="assets/bootstrap-icons.svg#gear"/>
+            </svg>&nbsp;<ng-container i18n>Settings</ng-container>
+          </a>
+          <a ngbDropdownItem class="nav-link" href="accounts/logout/">
+            <svg class="sidebaricon" fill="currentColor">
+              <use xlink:href="assets/bootstrap-icons.svg#door-open"/>
+            </svg>&nbsp;<ng-container i18n>Logout</ng-container>
+          </a>
+      </div>
+    </li>
+  </ul>
 </nav>
 
 <div class="container-fluid">
@@ -105,13 +131,6 @@
               </svg>&nbsp;<ng-container i18n>Logs</ng-container>
             </a>
           </li>
-          <li class="nav-item">
-            <a class="nav-link" routerLink="settings" routerLinkActive="active" (click)="closeMenu()">
-              <svg class="sidebaricon" fill="currentColor">
-                <use xlink:href="assets/bootstrap-icons.svg#gear"/>
-              </svg>&nbsp;<ng-container i18n>Settings</ng-container>
-            </a>
-          </li>
           <li class="nav-item">
             <a class="nav-link" href="admin/">
               <svg class="sidebaricon" fill="currentColor">
@@ -139,13 +158,6 @@
               </svg>&nbsp;<ng-container i18n>GitHub</ng-container>
             </a>
           </li>
-          <li class="nav-item">
-            <a class="nav-link" href="accounts/logout/">
-              <svg class="sidebaricon" fill="currentColor">
-                <use xlink:href="assets/bootstrap-icons.svg#door-open"/>
-              </svg>&nbsp;<ng-container i18n>Logout</ng-container>
-            </a>
-          </li>
         </ul>
       </div>
     </nav>
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index 5ace8a2ff..433fe3054 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -72,17 +72,42 @@
   padding-top: .75rem;
   padding-bottom: .75rem;
   font-size: 1rem;
-  background-color: rgba(0, 0, 0, .25);
-  box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25);
 }
 
-.navbar .navbar-toggler {
-  top: .25rem;
-  right: 1rem;
-}
+.navbar .search-form-container {
+  max-width: 550px;
+  position: relative;
 
-.navbar .form-control {
-  padding: .75rem 1rem;
-  border-width: 0;
-  border-radius: 0;
+  svg {
+    position: absolute;
+    left: 1.8em;
+    color: rgba(255, 255, 255, 0.6);
+  }
+
+  &:focus-within {
+    svg {
+      display: none;
+    }
+  }
+
+  .form-control {
+    color: rgba(255, 255, 255, 0.5);
+    background-color: rgba(0, 0, 0, 0.2);
+    padding-left: 1.8rem;
+    border-color: rgba(255, 255, 255, 0.5);
+    transition: flex 0.3s ease;
+    max-width: 600px;
+    min-width: 300px; // 1/2 max
+
+    &::placeholder {
+      color: rgba(255, 255, 255, 0.5);
+    }
+
+    &:focus {
+      background-color: #fff;
+      color: initial;
+      flex-grow: 1;
+      padding-left: 0.5rem;
+    }
+  }
 }

From 2e544326e57fadd108c8473e3c6b6c0ec3ff9b4e Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 31 Dec 2020 00:35:54 -0800
Subject: [PATCH 0531/1300] Toggle caret tweaks

---
 .../app-frame/app-frame.component.scss        | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index 433fe3054..44b1531b1 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -1,23 +1,19 @@
-
 @import "/src/theme";
-
-  /*
+/*
  * Sidebar
  */
-
- .sidebar {
+.sidebar {
   position: fixed;
   top: 0;
   bottom: 0;
   left: 0;
   z-index: 100; /* Behind the navbar */
-  padding: 48px 0 0; /* Height of navbar */
+  padding: 50px 0 0; /* Height of navbar */
   box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
 }
-
 @media (max-width: 767.98px) {
   .sidebar {
-    top: 3rem;
+    top: 3.5rem;
   }
 }
 
@@ -26,11 +22,11 @@
   top: 0;
   /* height: calc(100vh - 48px); */
   height: 100%;
-  padding-top: .5rem;
+  padding-top: 0.5rem;
   overflow-x: hidden;
-  overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
+  overflow-y: auto;
+  /* Scrollable contents if viewport is shorter than content. */
 }
-
 @supports ((position: -webkit-sticky) or (position: sticky)) {
   .sidebar-sticky {
     position: -webkit-sticky;
@@ -53,27 +49,33 @@
   font-weight: bold;
 }
 
-.sidebar .nav-link:hover .sidebaricon,
-.sidebar .nav-link.active .sidebaricon {
+.sidebar .nav-link.active .sidebaricon,
+.sidebar .nav-link:hover .sidebaricon {
   color: inherit;
 }
 
 .sidebar-heading {
-  font-size: .75rem;
+  font-size: 0.75rem;
   text-transform: uppercase;
 }
 
-
 /*
  * Navbar
  */
-
- .navbar-brand {
-  padding-top: .75rem;
-  padding-bottom: .75rem;
+.navbar-brand {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
   font-size: 1rem;
 }
 
+.navbar-toggler {
+}
+
+.dropdown-toggle::after {
+  margin-left: 0.4em;
+  vertical-align: 0.155em;
+}
+
 .navbar .search-form-container {
   max-width: 550px;
   position: relative;
@@ -91,16 +93,16 @@
   }
 
   .form-control {
-    color: rgba(255, 255, 255, 0.5);
-    background-color: rgba(0, 0, 0, 0.2);
+    color: rgba(255, 255, 255, 0.3);
+    background-color: rgba(0, 0, 0, 0.15);
     padding-left: 1.8rem;
-    border-color: rgba(255, 255, 255, 0.5);
+    border-color: rgba(255, 255, 255, 0.2);
     transition: flex 0.3s ease;
     max-width: 600px;
     min-width: 300px; // 1/2 max
 
     &::placeholder {
-      color: rgba(255, 255, 255, 0.5);
+      color: rgba(255, 255, 255, 0.4);
     }
 
     &:focus {

From a74404170ddd2a9cd66d0e46c58b041ca9841bb4 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Thu, 31 Dec 2020 09:53:29 +0100
Subject: [PATCH 0532/1300] Update to 0.9.10

---
 ansible/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml
index 2504f18dc..adfdb2b87 100644
--- a/ansible/defaults/main.yml
+++ b/ansible/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-paperlessng_version: 0.9.9
+paperlessng_version: 0.9.10
 paperlessng_directory: /opt/paperless-ng
 paperlessng_consumption_dir: "{{ paperlessng_directory }}/consumption"
 paperlessng_data_dir: "{{ paperlessng_directory }}/data"

From be56707a8a508953d605d4f6bb554ef27646dba1 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Thu, 31 Dec 2020 10:01:57 +0100
Subject: [PATCH 0533/1300] Change default OCRmyPDF args

Clean is hardcoded as True, anyway
Deskew breaks tesseract redo
---
 ansible/defaults/main.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml
index adfdb2b87..a2c560701 100644
--- a/ansible/defaults/main.yml
+++ b/ansible/defaults/main.yml
@@ -13,8 +13,7 @@ paperlessng_ocr_languages:
 paperlessng_time_zone: Europe/Berlin
 # see https://ocrmypdf.readthedocs.io/en/latest/api.html#ocrmypdf.ocr
 paperlessng_ocrmypdf_args:
-  - "deskew": true
-  - "clean": true
+  #- "deskew": true
   - "optimize": 1
 paperlessng_use_jbig2enc: true
 paperlessng_big2enc_lossy: false

From 2a744a3a83cab33d37458bdb79c996c3ee040cf2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 31 Dec 2020 11:12:46 +0100
Subject: [PATCH 0534/1300] roll back changes #184 #227

---
 docker/gunicorn.conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/gunicorn.conf.py b/docker/gunicorn.conf.py
index 5c9c0eb37..edfb362d9 100644
--- a/docker/gunicorn.conf.py
+++ b/docker/gunicorn.conf.py
@@ -1,4 +1,4 @@
-bind = ['[::]:8000', 'localhost:8000']
+bind = '0.0.0.0:8000'
 backlog = 2048
 workers = 3
 worker_class = 'sync'

From 70cb27bf0a04eab157bc1d91d7084f1a29a6bbc3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 31 Dec 2020 11:23:03 +0100
Subject: [PATCH 0535/1300] bump versions

---
 docker/hub/docker-compose.postgres.yml      | 2 +-
 docker/hub/docker-compose.sqlite.yml        | 2 +-
 docs/changelog.rst                          | 7 +++++++
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index c2b599e52..0779cea22 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.10
+    image: jonaswinkler/paperless-ng:0.9.11
     restart: always
     depends_on:
       - db
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index 429d42c06..3eed96cc3 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.10
+    image: jonaswinkler/paperless-ng:0.9.11
     restart: always
     depends_on:
       - broker
diff --git a/docs/changelog.rst b/docs/changelog.rst
index fe4d89a55..70f5cf683 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,13 @@
 Changelog
 *********
 
+
+paperless-ng 0.9.11
+###################
+
+* Fixed an issue with the docker image not starting at all due to a configuration change of the web server.
+
+
 paperless-ng 0.9.10
 ###################
 
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 7b707f014..1ac69bc39 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,5 +2,5 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "0.9.10"
+  version: "0.9.11"
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index facb097fc..e1ba14cb4 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (0, 9, 10)
+__version__ = (0, 9, 11)

From fc31195fa0bd307e2a640dce7ef98cbc6e3df7fb Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Thu, 31 Dec 2020 11:47:54 +0100
Subject: [PATCH 0536/1300] Update to 0.9.11

---
 ansible/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml
index a2c560701..da38ca300 100644
--- a/ansible/defaults/main.yml
+++ b/ansible/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-paperlessng_version: 0.9.10
+paperlessng_version: 0.9.11
 paperlessng_directory: /opt/paperless-ng
 paperlessng_consumption_dir: "{{ paperlessng_directory }}/consumption"
 paperlessng_data_dir: "{{ paperlessng_directory }}/data"

From b855222ee150e419930054ad3ea750a584c2b58b Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 31 Dec 2020 13:24:57 +0100
Subject: [PATCH 0537/1300] Removing travis in favor of github actions

---
 .travis.yml | 153 ----------------------------------------------------
 1 file changed, 153 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index f4873cf3c..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,153 +0,0 @@
-language: python
-
-dist: focal
-os: linux
-
-stages:
- - name: test
- - name: build_docker
-   if: branch =~ /^(master|dev|ng-.*)$/
- - name: publish_manifest
-   if: branch =~ /^(master|dev|ng-.*)$/
-
-jobs:
-  include:
-    - name: "Paperless on Python 3.6"
-      stage: test
-      python: "3.6"
-
-    - name: "Paperless on Python 3.7"
-      stage: test
-      python: "3.7"
-
-    - name: "Paperless on Python 3.8"
-      stage: test
-      python: "3.8"
-
-    - name: "Documentation"
-      stage: test
-      script:
-        - cd docs/
-        - make html
-      after_success: true
-
-    - name: "Front end"
-      stage: test
-      language: node_js
-      node_js:
-        - 15
-      before_install: true
-      install:
-        - cd src-ui/
-        - npm install -g @angular/cli
-        - npm install
-      script:
-        - ng build --prod
-      after_success: true
-
-    - stage: build_docker
-      name: amd64 docker build
-      services:
-        - docker
-      before_install:
-        - true
-      install:
-        - true
-      after_success:
-        - true
-      script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-        - docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 .
-        - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64
-    - stage: build_docker
-      name: arm64v8 docker build
-      services:
-        - docker
-      before_install:
-        - true
-      install:
-        - true
-      after_success:
-        - true
-      script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-        # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
-        - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
-        - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
-      arch: arm64-graviton2
-      virt: vm
-      group: edge
-    - stage: build_docker
-      name: arm32v7 docker build
-      services:
-        - docker
-      before_install:
-        - true
-      install:
-        - true
-      after_success:
-        - true
-      script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-        # register binfmt stuff for qemu-static binaries so we can use userland-emulation
-        - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-        # replace the multi-arch reference with a specific, arm32v7 version. else docker will use the platform specific one,
-        # which is amd64.
-        - sed -i "s/FROM node:15/FROM node@$(docker manifest inspect node:15 | jq -r '.manifests [] | select (.platform.variant == "v7") | .digest')/g" Dockerfile
-        - sed -i "s/FROM python:3.7-slim/FROM python@$(docker manifest inspect python:3.7-slim | jq -r '.manifests [] | select (.platform.variant == "v7") | .digest')/g" Dockerfile
-        # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
-        - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 .
-        - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
-      env:
-        - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
-    - stage: publish_manifest
-      env:
-        - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
-      services:
-        - docker
-      before_install:
-        - true
-      install:
-        - true
-      after_success:
-        - true
-      script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-        - docker manifest create ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
-        - docker manifest annotate ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 --os linux --arch arm --variant v7
-        - docker manifest annotate ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 --os linux --arch arm64 --variant v8
-        - docker manifest push --purge ${DOCKER_REPO}:${TRAVIS_COMMIT}
-        - |
-          if [ "${TRAVIS_BRANCH}" = "master" ]; then
-            echo "Master branch detected"
-            DOCKER_TAG="latest"
-          else
-            DOCKER_TAG=${TRAVIS_TAG}
-          fi
-        - |
-          if [ "${DOCKER_TAG}" != "" ]; then
-            echo "Create Tag ${DOCKER_TAG}"
-            docker manifest create ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
-            docker manifest annotate ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 --os linux --arch arm --variant v7
-            docker manifest annotate ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 --os linux --arch arm64 --variant v8
-            docker manifest push --purge ${DOCKER_REPO}:${DOCKER_TAG}
-          else
-            echo "Not a tag and not on master, so not pushing tag/master specific manifest"
-          fi
-
-
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-
-install:
-  - pip install --upgrade pipenv
-  - pipenv install --system --dev
-
-script:
-  - cd src/
-  - pipenv run pytest --cov
-  - pipenv run pycodestyle
-
-after_success:
-  - pipenv run coveralls

From 916ea79e5749f295ad4652fe46862015cbd259c7 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 31 Dec 2020 13:27:22 +0100
Subject: [PATCH 0538/1300] Experimenting with github actions

---
 .github/workflows/docker-publish.yml | 63 ++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 .github/workflows/docker-publish.yml

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
new file mode 100644
index 000000000..f2da6b3b8
--- /dev/null
+++ b/.github/workflows/docker-publish.yml
@@ -0,0 +1,63 @@
+name: Docker
+
+on:
+  push:
+    branches: travis-multiarch-builds
+
+jobs:
+  # Build and push image to docker hub.
+  buildx:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Prepare
+        id: prepare
+        run: |
+          DOCKER_IMAGE=MarkSchmitt/paperless-ng
+          DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64/v8
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/v}
+          fi
+          if [ "${{ github.event_name }}" = "schedule" ]; then
+            VERSION=nightly
+          fi
+          TAGS="--tag ${DOCKER_IMAGE}:${VERSION}"
+          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest"
+          fi
+          echo ::set-output name=docker_image::${DOCKER_IMAGE}
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
+            --build-arg VERSION=${VERSION} \
+            --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
+            --build-arg VCS_REF=${GITHUB_SHA::8} \
+            ${TAGS} --file ./Dockerfile .
+      - name: install buildx
+        id: buildx
+        uses: crazy-max/ghaction-docker-buildx@v3.1.0
+
+      - name: Docker Buildx (build)
+        run: |
+          docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
+      - name: Docker Login
+        if: success() && github.event_name != 'pull_request'
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+      - name: Docker Buildx (push)
+        if: success() && github.event_name != 'pull_request'
+        run: |
+          docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
+      - name: Docker Check Manifest
+        if: always() && github.event_name != 'pull_request'
+        run: |
+          docker run --rm mplatform/mquery ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}
+      - name: Clear
+        if: always() && github.event_name != 'pull_request'
+        run: |
+          rm -f ${HOME}/.docker/config.json
\ No newline at end of file

From 5236f4e58d26508a4c4d06c1b2e8a4a18822fc2f Mon Sep 17 00:00:00 2001
From: Jo Vandeginste <Jo.Vandeginste@kuleuven.be>
Date: Thu, 31 Dec 2020 14:41:47 +0100
Subject: [PATCH 0539/1300] Refactor after feedback:

- rename PAPERLESS_TIKA to PAPERLESS_TIKA_ENABLED
- all other env params now start with PAPERLESS_TIKA
- convert_to_pdf as class instance method
- smaller details

Signed-off-by: Jo Vandeginste <Jo.Vandeginste@kuleuven.be>
---
 docker/hub/docker-compose.tika.yml   |  6 +--
 docker/local/docker-compose.tika.yml |  6 +--
 docs/configuration.rst               |  6 +--
 src/paperless/settings.py            |  7 ++-
 src/paperless_tika/apps.py           |  2 +-
 src/paperless_tika/parsers.py        | 65 +++++++++++++---------------
 src/paperless_tika/test.py           |  3 --
 7 files changed, 46 insertions(+), 49 deletions(-)
 delete mode 100644 src/paperless_tika/test.py

diff --git a/docker/hub/docker-compose.tika.yml b/docker/hub/docker-compose.tika.yml
index 04dd3260e..af8f575a0 100644
--- a/docker/hub/docker-compose.tika.yml
+++ b/docker/hub/docker-compose.tika.yml
@@ -24,9 +24,9 @@ services:
     env_file: docker-compose.env
     environment:
       PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_TIKA: 1
-      GOTENBERG_SERVER_ENDPOINT: http://gotenberg:3000
-      TIKA_SERVER_ENDPOINT: http://tika:9998
+      PAPERLESS_TIKA_ENABLED: 1
+      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
+      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
 
   gotenberg:
     image: thecodingmachine/gotenberg
diff --git a/docker/local/docker-compose.tika.yml b/docker/local/docker-compose.tika.yml
index ab901f306..889713908 100644
--- a/docker/local/docker-compose.tika.yml
+++ b/docker/local/docker-compose.tika.yml
@@ -24,9 +24,9 @@ services:
     env_file: docker-compose.env
     environment:
       PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_TIKA: 1
-      GOTENBERG_SERVER_ENDPOINT: http://gotenberg:3000
-      TIKA_SERVER_ENDPOINT: http://tika:9998
+      PAPERLESS_TIKA_ENABLED: 1
+      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
+      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
 
   gotenberg:
     image: thecodingmachine/gotenberg
diff --git a/docs/configuration.rst b/docs/configuration.rst
index f53acb633..49c95bff1 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -291,17 +291,17 @@ configure their endpoints, and enable the feature.
 If you run paperless on docker, you can add those services to the docker-compose
 file (see the examples provided).
 
-PAPERLESS_TIKA=<bool>
+PAPERLESS_TIKA_ENABLED=<bool>
     Enable (or disable) the Tika parser.
 
     Defaults to false.
 
-TIKA_SERVER_ENDPOINT=<url>
+PAPERLESS_TIKA_ENDPOINT=<url>
     Set the endpoint URL were Paperless can reach your Tika server.
 
     Defaults to "http://localhost:9998".
 
-GOTENBERG_SERVER_ENDPOINT=<url>
+PAPERLESS_TIKA_GOTENBERG_ENDPOINT=<url>
     Set the endpoint URL were Paperless can reach your Gotenberg server.
 
     Defaults to "http://localhost:3000".
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 219166cf5..caa1b9b18 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -427,5 +427,8 @@ PAPERLESS_FILENAME_FORMAT = os.getenv("PAPERLESS_FILENAME_FORMAT")
 THUMBNAIL_FONT_NAME = os.getenv("PAPERLESS_THUMBNAIL_FONT_NAME", "/usr/share/fonts/liberation/LiberationSerif-Regular.ttf")
 
 # Tika settings
-PAPERLESS_TIKA = __get_boolean("PAPERLESS_TIKA", "NO")
-GOTENBERG_SERVER_ENDPOINT = os.getenv("GOTENBERG_SERVER_ENDPOINT", "http://localhost:3000")
+PAPERLESS_TIKA_ENABLED = __get_boolean("PAPERLESS_TIKA_ENABLED", "NO")
+PAPERLESS_TIKA_ENDPOINT = os.getenv("PAPERLESS_TIKA_ENDPOINT", "http://localhost:9998")
+PAPERLESS_TIKA_GOTENBERG_ENDPOINT = os.getenv(
+    "PAPERLESS_TIKA_GOTENBERG_ENDPOINT", "http://localhost:3000"
+)
diff --git a/src/paperless_tika/apps.py b/src/paperless_tika/apps.py
index c29586d6a..5cab21427 100644
--- a/src/paperless_tika/apps.py
+++ b/src/paperless_tika/apps.py
@@ -9,6 +9,6 @@ class PaperlessTikaConfig(AppConfig):
     def ready(self):
         from documents.signals import document_consumer_declaration
 
-        if settings.PAPERLESS_TIKA:
+        if settings.PAPERLESS_TIKA_ENABLED:
             document_consumer_declaration.connect(tika_consumer_declaration)
         AppConfig.ready(self)
diff --git a/src/paperless_tika/parsers.py b/src/paperless_tika/parsers.py
index 5a77681f2..81f213a6b 100644
--- a/src/paperless_tika/parsers.py
+++ b/src/paperless_tika/parsers.py
@@ -70,49 +70,46 @@ class TikaDocumentParser(DocumentParser):
 
     def parse(self, document_path, mime_type):
         self.log("info", f"[TIKA_PARSE] Sending {document_path} to Tika server")
+        tika_server = settings.PAPERLESS_TIKA_ENDPOINT
 
         try:
-            parsed = parser.from_file(document_path)
+            parsed = parser.from_file(document_path, tika_server)
         except requests.exceptions.HTTPError as err:
-            raise ParseError(f"Could not parse {document_path} with tika server: {err}")
-
-        try:
-            content = parsed["content"].strip()
-        except:
-            content = ""
-
-        try:
-            creation_date = dateutil.parser.isoparse(
-                parsed["metadata"]["Creation-Date"]
+            raise ParseError(
+                f"Could not parse {document_path} with tika server at {tika_server}: {err}"
             )
+
+        try:
+            self.text = parsed["content"].strip()
         except:
-            creation_date = None
+            pass
+
+        try:
+            self.date = dateutil.parser.isoparse(parsed["metadata"]["Creation-Date"])
+        except:
+            pass
 
         archive_path = os.path.join(self.tempdir, "convert.pdf")
-        convert_to_pdf(self, document_path, archive_path)
-
+        convert_to_pdf(document_path, archive_path)
         self.archive_path = archive_path
-        self.date = creation_date
-        self.text = content
 
+    def convert_to_pdf(document_path, pdf_path):
+        pdf_path = os.path.join(self.tempdir, "convert.pdf")
+        gotenberg_server = settings.PAPERLESS_TIKA_GOTENBERG_ENDPOINT
+        url = gotenberg_server + "/convert/office"
 
-def convert_to_pdf(self, document_path, pdf_path):
-    pdf_path = os.path.join(self.tempdir, "convert.pdf")
-    gotenberg_server = settings.GOTENBERG_SERVER_ENDPOINT
-    url = gotenberg_server + "/convert/office"
+        self.log("info", f"[TIKA] Converting {document_path} to PDF as {pdf_path}")
+        files = {"files": open(document_path, "rb")}
+        headers = {}
 
-    self.log("info", f"[TIKA] Converting {document_path} to PDF as {pdf_path}")
-    files = {"files": open(document_path, "rb")}
-    headers = {}
+        try:
+            response = requests.post(url, files=files, headers=headers)
+            response.raise_for_status()  # ensure we notice bad responses
+        except requests.exceptions.HTTPError as err:
+            raise ParseError(
+                f"Could not contact gotenberg server at {gotenberg_server}: {err}"
+            )
 
-    try:
-        response = requests.post(url, files=files, headers=headers)
-        response.raise_for_status()  # ensure we notice bad responses
-    except requests.exceptions.HTTPError as err:
-        raise ParseError(
-            f"Could not contact gotenberg server at {gotenberg_server}: {err}"
-        )
-
-    file = open(pdf_path, "wb")
-    file.write(response.content)
-    file.close()
+        file = open(pdf_path, "wb")
+        file.write(response.content)
+        file.close()
diff --git a/src/paperless_tika/test.py b/src/paperless_tika/test.py
deleted file mode 100644
index 0a2885226..000000000
--- a/src/paperless_tika/test.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import magic
-m = magic.from_file("/nfsstorage/jo/syncthing/Documenten/20R-309.153.052.pdf")
-print(m)

From aa7e2594e2c747dedefd113e88ad28464c5a3747 Mon Sep 17 00:00:00 2001
From: Stefan <dev@sisao.de>
Date: Thu, 31 Dec 2020 15:07:35 +0100
Subject: [PATCH 0540/1300] self serve pdf.worker.min.js

---
 src-ui/angular.json             | 6 +++++-
 src-ui/src/app/app.component.ts | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index ce2dd82f7..db8c66b19 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -27,7 +27,11 @@
 						"assets": [
 							"src/favicon.ico",
 							"src/assets",
-							"src/manifest.webmanifest"
+							"src/manifest.webmanifest", {
+								"glob": "pdf.worker.min.js",
+								"input": "node_modules/pdfjs-dist/build/",
+								"output": "/assets/js/"
+							}
 						],
 						"styles": [
 							"src/styles.scss"
diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts
index 84c173a18..330f8f157 100644
--- a/src-ui/src/app/app.component.ts
+++ b/src-ui/src/app/app.component.ts
@@ -6,8 +6,9 @@ import { Component } from '@angular/core';
   styleUrls: ['./app.component.scss']
 })
 export class AppComponent {
-  
+
   constructor () {
+    (window as any).pdfWorkerSrc = '/assets/js/pdf.worker.min.js';
   }
 
 

From fddda75f75e6ae207d91d252c2ac3195c29aef9a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 31 Dec 2020 15:59:12 +0100
Subject: [PATCH 0541/1300] more translation

---
 src/documents/models.py      |  5 +-
 src/paperless_mail/admin.py  | 26 +++++-----
 src/paperless_mail/models.py | 96 ++++++++++++++++++++++++------------
 3 files changed, 81 insertions(+), 46 deletions(-)

diff --git a/src/documents/models.py b/src/documents/models.py
index 6395d66aa..2349dacd1 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -122,7 +122,6 @@ class DocumentType(MatchingModel):
         verbose_name_plural = _("document types")
 
 
-
 class Document(models.Model):
 
     STORAGE_TYPE_UNENCRYPTED = "unencrypted"
@@ -230,8 +229,8 @@ class Document(models.Model):
 
     class Meta:
         ordering = ("-created",)
-        verbose_name = _("Document")
-        verbose_name_plural = _("Documents")
+        verbose_name = _("document")
+        verbose_name_plural = _("documents")
 
     def __str__(self):
         created = datetime.date.isoformat(self.created)
diff --git a/src/paperless_mail/admin.py b/src/paperless_mail/admin.py
index 0440234b7..4c63c2b29 100644
--- a/src/paperless_mail/admin.py
+++ b/src/paperless_mail/admin.py
@@ -1,6 +1,8 @@
 from django.contrib import admin
 from paperless_mail.models import MailAccount, MailRule
 
+from django.utils.translation import gettext_lazy as _
+
 
 class MailAccountAdmin(admin.ModelAdmin):
 
@@ -19,31 +21,31 @@ class MailRuleAdmin(admin.ModelAdmin):
         (None, {
             'fields': ('name', 'order', 'account', 'folder')
         }),
-        ("Filter", {
+        (_("Filter"), {
             'description':
-                "Paperless will only process mails that match ALL of the "
-                "filters given below.",
+                _("Paperless will only process mails that match ALL of the "
+                  "filters given below."),
             'fields':
                 ('filter_from',
                  'filter_subject',
                  'filter_body',
                  'maximum_age')
         }),
-        ("Actions", {
+        (_("Actions"), {
             'description':
-                "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.",
+                _("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."),
             'fields': (
                 'action',
                 'action_parameter')
         }),
-        ("Metadata", {
+        (_("Metadata"), {
             'description':
-                "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.",
+                _("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."),
             "fields": (
                 'assign_title_from',
                 'assign_tag',
diff --git a/src/paperless_mail/models.py b/src/paperless_mail/models.py
index aa1ac5684..d585d7c1c 100644
--- a/src/paperless_mail/models.py
+++ b/src/paperless_mail/models.py
@@ -2,6 +2,8 @@ from django.db import models
 
 import documents.models as document_models
 
+from django.utils.translation import gettext_lazy as _
+
 
 class MailAccount(models.Model):
 
@@ -10,29 +12,39 @@ class MailAccount(models.Model):
     IMAP_SECURITY_STARTTLS = 3
 
     IMAP_SECURITY_OPTIONS = (
-        (IMAP_SECURITY_NONE, "No encryption"),
-        (IMAP_SECURITY_SSL, "Use SSL"),
-        (IMAP_SECURITY_STARTTLS, "Use STARTTLS"),
+        (IMAP_SECURITY_NONE, _("No encryption")),
+        (IMAP_SECURITY_SSL, _("Use SSL")),
+        (IMAP_SECURITY_STARTTLS, _("Use STARTTLS")),
     )
 
-    name = models.CharField(max_length=256, unique=True)
+    name = models.CharField(
+        _("name"),
+        max_length=256, unique=True)
 
-    imap_server = models.CharField(max_length=256)
+    imap_server = models.CharField(
+        _("imap server"),
+        max_length=256)
 
     imap_port = models.IntegerField(
+        _("imap port"),
         blank=True,
         null=True,
-        help_text="This is usually 143 for unencrypted and STARTTLS "
-                  "connections, and 993 for SSL connections.")
+        help_text=_("This is usually 143 for unencrypted and STARTTLS "
+                    "connections, and 993 for SSL connections."))
 
     imap_security = models.PositiveIntegerField(
+        _("imap security"),
         choices=IMAP_SECURITY_OPTIONS,
         default=IMAP_SECURITY_SSL
     )
 
-    username = models.CharField(max_length=256)
+    username = models.CharField(
+        _("username"),
+        max_length=256)
 
-    password = models.CharField(max_length=256)
+    password = models.CharField(
+        _("password"),
+        max_length=256)
 
     def __str__(self):
         return self.name
@@ -46,18 +58,18 @@ class MailRule(models.Model):
     ACTION_FLAG = 4
 
     ACTIONS = (
-        (ACTION_MARK_READ, "Mark as read, don't process read mails"),
-        (ACTION_FLAG, "Flag the mail, don't process flagged mails"),
-        (ACTION_MOVE, "Move to specified folder"),
-        (ACTION_DELETE, "Delete"),
+        (ACTION_MARK_READ, _("Mark as read, don't process read mails")),
+        (ACTION_FLAG, _("Flag the mail, don't process flagged mails")),
+        (ACTION_MOVE, _("Move to specified folder")),
+        (ACTION_DELETE, _("Delete")),
     )
 
     TITLE_FROM_SUBJECT = 1
     TITLE_FROM_FILENAME = 2
 
     TITLE_SELECTOR = (
-        (TITLE_FROM_SUBJECT, "Use subject as title"),
-        (TITLE_FROM_FILENAME, "Use attachment filename as title")
+        (TITLE_FROM_SUBJECT, _("Use subject as title")),
+        (TITLE_FROM_FILENAME, _("Use attachment filename as title"))
     )
 
     CORRESPONDENT_FROM_NOTHING = 1
@@ -67,47 +79,65 @@ class MailRule(models.Model):
 
     CORRESPONDENT_SELECTOR = (
         (CORRESPONDENT_FROM_NOTHING,
-         "Do not assign a correspondent"),
+         _("Do not assign a correspondent")),
         (CORRESPONDENT_FROM_EMAIL,
          "Use mail address"),
         (CORRESPONDENT_FROM_NAME,
-         "Use name (or mail address if not available)"),
+         _("Use name (or mail address if not available)")),
         (CORRESPONDENT_FROM_CUSTOM,
-         "Use correspondent selected below")
+         _("Use correspondent selected below"))
     )
 
-    name = models.CharField(max_length=256, unique=True)
+    name = models.CharField(
+        _("name"),
+        max_length=256, unique=True)
 
-    order = models.IntegerField(default=0)
+    order = models.IntegerField(
+        _("order"),
+        default=0)
 
     account = models.ForeignKey(
         MailAccount,
         related_name="rules",
-        on_delete=models.CASCADE
+        on_delete=models.CASCADE,
+        verbose_name=_("account")
     )
 
-    folder = models.CharField(default='INBOX', max_length=256)
+    folder = models.CharField(
+        _("folder"),
+        default='INBOX', max_length=256)
 
-    filter_from = models.CharField(max_length=256, null=True, blank=True)
-    filter_subject = models.CharField(max_length=256, null=True, blank=True)
-    filter_body = models.CharField(max_length=256, null=True, blank=True)
+    filter_from = models.CharField(
+        _("filter from"),
+        max_length=256, null=True, blank=True)
+    filter_subject = models.CharField(
+        _("filter subject"),
+        max_length=256, null=True, blank=True)
+    filter_body = models.CharField(
+        _("filter body"),
+        max_length=256, null=True, blank=True)
 
     maximum_age = models.PositiveIntegerField(
+        _("maximum age"),
         default=30,
-        help_text="Specified in days.")
+        help_text=_("Specified in days."))
 
     action = models.PositiveIntegerField(
+        _("action"),
         choices=ACTIONS,
         default=ACTION_MARK_READ,
     )
 
     action_parameter = models.CharField(
+        _("action parameter"),
         max_length=256, blank=True, null=True,
-        help_text="Additional parameter for the action selected above, i.e., "
-                  "the target folder of the move to folder action."
+        help_text=_("Additional parameter for the action selected above, "
+                    "i.e., "
+                    "the target folder of the move to folder action.")
     )
 
     assign_title_from = models.PositiveIntegerField(
+        _("assign title from"),
         choices=TITLE_SELECTOR,
         default=TITLE_FROM_SUBJECT
     )
@@ -116,17 +146,20 @@ class MailRule(models.Model):
         document_models.Tag,
         null=True,
         blank=True,
-        on_delete=models.SET_NULL
+        on_delete=models.SET_NULL,
+        verbose_name=_("assign this tag"),
     )
 
     assign_document_type = models.ForeignKey(
         document_models.DocumentType,
         null=True,
         blank=True,
-        on_delete=models.SET_NULL
+        on_delete=models.SET_NULL,
+        verbose_name=_("assign this document type"),
     )
 
     assign_correspondent_from = models.PositiveIntegerField(
+        _("assign correspondent from"),
         choices=CORRESPONDENT_SELECTOR,
         default=CORRESPONDENT_FROM_NOTHING
     )
@@ -135,7 +168,8 @@ class MailRule(models.Model):
         document_models.Correspondent,
         null=True,
         blank=True,
-        on_delete=models.SET_NULL
+        on_delete=models.SET_NULL,
+        verbose_name=_("assign this correspondent")
     )
 
     def __str__(self):

From 71d7aa3fb25544df35e4156d2162aca245abff90 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 31 Dec 2020 16:00:24 +0100
Subject: [PATCH 0542/1300] update message file

---
 src/locale/en-us/LC_MESSAGES/django.po | 296 +++++++++++++++++++------
 1 file changed, 234 insertions(+), 62 deletions(-)

diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en-us/LC_MESSAGES/django.po
index c3c76c5a4..0af8b7217 100644
--- a/src/locale/en-us/LC_MESSAGES/django.po
+++ b/src/locale/en-us/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-30 19:20+0000\n"
+"POT-Creation-Date: 2020-12-31 14:39+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,7 +41,8 @@ msgstr ""
 msgid "Automatic Classification"
 msgstr ""
 
-#: documents/models.py:41 documents/models.py:355
+#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:21
+#: paperless_mail/models.py:92
 msgid "name"
 msgstr ""
 
@@ -57,7 +58,7 @@ msgstr ""
 msgid "is insensitive"
 msgstr ""
 
-#: documents/models.py:80 documents/models.py:141
+#: documents/models.py:80 documents/models.py:140
 msgid "correspondent"
 msgstr ""
 
@@ -83,11 +84,11 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: documents/models.py:115 documents/models.py:172
+#: documents/models.py:115 documents/models.py:171
 msgid "tags"
 msgstr ""
 
-#: documents/models.py:121 documents/models.py:154
+#: documents/models.py:121 documents/models.py:153
 msgid "document type"
 msgstr ""
 
@@ -95,221 +96,221 @@ msgstr ""
 msgid "document types"
 msgstr ""
 
-#: documents/models.py:131
+#: documents/models.py:130
 msgid "Unencrypted"
 msgstr ""
 
-#: documents/models.py:132
+#: documents/models.py:131
 msgid "Encrypted with GNU Privacy Guard"
 msgstr ""
 
-#: documents/models.py:145
+#: documents/models.py:144
 msgid "title"
 msgstr ""
 
-#: documents/models.py:158
+#: documents/models.py:157
 msgid "content"
 msgstr ""
 
-#: documents/models.py:160
+#: documents/models.py:159
 msgid ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
 msgstr ""
 
-#: documents/models.py:165
+#: documents/models.py:164
 msgid "mime type"
 msgstr ""
 
-#: documents/models.py:176
+#: documents/models.py:175
 msgid "checksum"
 msgstr ""
 
-#: documents/models.py:180
+#: documents/models.py:179
 msgid "The checksum of the original document."
 msgstr ""
 
-#: documents/models.py:184
+#: documents/models.py:183
 msgid "archive checksum"
 msgstr ""
 
-#: documents/models.py:189
+#: documents/models.py:188
 msgid "The checksum of the archived document."
 msgstr ""
 
-#: documents/models.py:193 documents/models.py:333
+#: documents/models.py:192 documents/models.py:332
 msgid "created"
 msgstr ""
 
-#: documents/models.py:197
+#: documents/models.py:196
 msgid "modified"
 msgstr ""
 
-#: documents/models.py:201
+#: documents/models.py:200
 msgid "storage type"
 msgstr ""
 
-#: documents/models.py:209
+#: documents/models.py:208
 msgid "added"
 msgstr ""
 
-#: documents/models.py:213
+#: documents/models.py:212
 msgid "filename"
 msgstr ""
 
-#: documents/models.py:218
+#: documents/models.py:217
 msgid "Current filename in storage"
 msgstr ""
 
-#: documents/models.py:222
+#: documents/models.py:221
 msgid "archive serial number"
 msgstr ""
 
-#: documents/models.py:227
+#: documents/models.py:226
 msgid "The position of this document in your physical document archive."
 msgstr ""
 
+#: documents/models.py:232
+msgid "document"
+msgstr ""
+
 #: documents/models.py:233
-msgid "Document"
+msgid "documents"
 msgstr ""
 
-#: documents/models.py:234
-msgid "Documents"
-msgstr ""
-
-#: documents/models.py:324
+#: documents/models.py:323
 msgid "group"
 msgstr ""
 
-#: documents/models.py:327
+#: documents/models.py:326
 msgid "message"
 msgstr ""
 
-#: documents/models.py:330
+#: documents/models.py:329
 msgid "level"
 msgstr ""
 
-#: documents/models.py:337
+#: documents/models.py:336
 msgid "log"
 msgstr ""
 
-#: documents/models.py:338
+#: documents/models.py:337
 msgid "logs"
 msgstr ""
 
-#: documents/models.py:349 documents/models.py:399
+#: documents/models.py:348 documents/models.py:398
 msgid "saved view"
 msgstr ""
 
-#: documents/models.py:350
+#: documents/models.py:349
 msgid "saved views"
 msgstr ""
 
-#: documents/models.py:353
+#: documents/models.py:352
 msgid "user"
 msgstr ""
 
-#: documents/models.py:359
+#: documents/models.py:358
 msgid "show on dashboard"
 msgstr ""
 
-#: documents/models.py:362
+#: documents/models.py:361
 msgid "show in sidebar"
 msgstr ""
 
-#: documents/models.py:366
+#: documents/models.py:365
 msgid "sort field"
 msgstr ""
 
-#: documents/models.py:369
+#: documents/models.py:368
 msgid "sort reverse"
 msgstr ""
 
-#: documents/models.py:375
+#: documents/models.py:374
 msgid "title contains"
 msgstr ""
 
-#: documents/models.py:376
+#: documents/models.py:375
 msgid "content contains"
 msgstr ""
 
-#: documents/models.py:377
+#: documents/models.py:376
 msgid "ASN is"
 msgstr ""
 
-#: documents/models.py:378
+#: documents/models.py:377
 msgid "correspondent is"
 msgstr ""
 
-#: documents/models.py:379
+#: documents/models.py:378
 msgid "document type is"
 msgstr ""
 
-#: documents/models.py:380
+#: documents/models.py:379
 msgid "is in inbox"
 msgstr ""
 
-#: documents/models.py:381
+#: documents/models.py:380
 msgid "has tag"
 msgstr ""
 
-#: documents/models.py:382
+#: documents/models.py:381
 msgid "has any tag"
 msgstr ""
 
-#: documents/models.py:383
+#: documents/models.py:382
 msgid "created before"
 msgstr ""
 
-#: documents/models.py:384
+#: documents/models.py:383
 msgid "created after"
 msgstr ""
 
-#: documents/models.py:385
+#: documents/models.py:384
 msgid "created year is"
 msgstr ""
 
-#: documents/models.py:386
+#: documents/models.py:385
 msgid "created month is"
 msgstr ""
 
-#: documents/models.py:387
+#: documents/models.py:386
 msgid "created day is"
 msgstr ""
 
-#: documents/models.py:388
+#: documents/models.py:387
 msgid "added before"
 msgstr ""
 
-#: documents/models.py:389
+#: documents/models.py:388
 msgid "added after"
 msgstr ""
 
-#: documents/models.py:390
+#: documents/models.py:389
 msgid "modified before"
 msgstr ""
 
-#: documents/models.py:391
+#: documents/models.py:390
 msgid "modified after"
 msgstr ""
 
-#: documents/models.py:392
+#: documents/models.py:391
 msgid "does not have tag"
 msgstr ""
 
-#: documents/models.py:403
+#: documents/models.py:402
 msgid "rule type"
 msgstr ""
 
-#: documents/models.py:407
+#: documents/models.py:406
 msgid "value"
 msgstr ""
 
-#: documents/models.py:411
+#: documents/models.py:410
 msgid "filter rule"
 msgstr ""
 
-#: documents/models.py:412
+#: documents/models.py:411
 msgid "filter rules"
 msgstr ""
 
@@ -320,3 +321,174 @@ msgstr ""
 #: paperless/settings.py:254
 msgid "German"
 msgstr ""
+
+#: paperless_mail/admin.py:24
+msgid "Filter"
+msgstr ""
+
+#: paperless_mail/admin.py:26
+msgid ""
+"Paperless will only process mails that match ALL of the filters given below."
+msgstr ""
+
+#: paperless_mail/admin.py:34
+msgid "Actions"
+msgstr ""
+
+#: paperless_mail/admin.py:36
+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 ""
+
+#: paperless_mail/admin.py:43
+msgid "Metadata"
+msgstr ""
+
+#: paperless_mail/admin.py:45
+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 ""
+
+#: paperless_mail/models.py:15
+msgid "No encryption"
+msgstr ""
+
+#: paperless_mail/models.py:16
+msgid "Use SSL"
+msgstr ""
+
+#: paperless_mail/models.py:17
+msgid "Use STARTTLS"
+msgstr ""
+
+#: paperless_mail/models.py:25
+msgid "imap server"
+msgstr ""
+
+#: paperless_mail/models.py:29
+msgid "imap port"
+msgstr ""
+
+#: paperless_mail/models.py:32
+msgid ""
+"This is usually 143 for unencrypted and STARTTLS connections, and 993 for "
+"SSL connections."
+msgstr ""
+
+#: paperless_mail/models.py:36
+msgid "imap security"
+msgstr ""
+
+#: paperless_mail/models.py:42
+msgid "username"
+msgstr ""
+
+#: paperless_mail/models.py:46
+msgid "password"
+msgstr ""
+
+#: paperless_mail/models.py:61
+msgid "Mark as read, don't process read mails"
+msgstr ""
+
+#: paperless_mail/models.py:62
+msgid "Flag the mail, don't process flagged mails"
+msgstr ""
+
+#: paperless_mail/models.py:63
+msgid "Move to specified folder"
+msgstr ""
+
+#: paperless_mail/models.py:64
+msgid "Delete"
+msgstr ""
+
+#: paperless_mail/models.py:71
+msgid "Use subject as title"
+msgstr ""
+
+#: paperless_mail/models.py:72
+msgid "Use attachment filename as title"
+msgstr ""
+
+#: paperless_mail/models.py:82
+msgid "Do not assign a correspondent"
+msgstr ""
+
+#: paperless_mail/models.py:86
+msgid "Use name (or mail address if not available)"
+msgstr ""
+
+#: paperless_mail/models.py:88
+msgid "Use correspondent selected below"
+msgstr ""
+
+#: paperless_mail/models.py:96
+msgid "order"
+msgstr ""
+
+#: paperless_mail/models.py:103
+msgid "account"
+msgstr ""
+
+#: paperless_mail/models.py:107
+msgid "folder"
+msgstr ""
+
+#: paperless_mail/models.py:111
+msgid "filter from"
+msgstr ""
+
+#: paperless_mail/models.py:114
+msgid "filter subject"
+msgstr ""
+
+#: paperless_mail/models.py:117
+msgid "filter body"
+msgstr ""
+
+#: paperless_mail/models.py:121
+msgid "maximum age"
+msgstr ""
+
+#: paperless_mail/models.py:123
+msgid "Specified in days."
+msgstr ""
+
+#: paperless_mail/models.py:126
+msgid "action"
+msgstr ""
+
+#: paperless_mail/models.py:132
+msgid "action parameter"
+msgstr ""
+
+#: paperless_mail/models.py:134
+msgid ""
+"Additional parameter for the action selected above, i.e., the target folder "
+"of the move to folder action."
+msgstr ""
+
+#: paperless_mail/models.py:140
+msgid "assign title from"
+msgstr ""
+
+#: paperless_mail/models.py:150
+msgid "assign this tag"
+msgstr ""
+
+#: paperless_mail/models.py:158
+msgid "assign this document type"
+msgstr ""
+
+#: paperless_mail/models.py:162
+msgid "assign correspondent from"
+msgstr ""
+
+#: paperless_mail/models.py:172
+msgid "assign this correspondent"
+msgstr ""

From be7bf5288b698359849552469a3114c13a44104e Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 31 Dec 2020 07:52:14 -0800
Subject: [PATCH 0543/1300] Fix alignment

---
 src-ui/src/app/components/app-frame/app-frame.component.html | 2 +-
 src-ui/src/app/components/app-frame/app-frame.component.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 9d6c4924f..8029edc98 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -8,7 +8,7 @@
     <img src="assets/logo-dark-notext.svg" height="18px" class="mr-2">
     <ng-container i18n="app title">Paperless-ng</ng-container>
   </a>
-  <div class="search-form-container flex-grow-1 py-2 pb-3 pb-sm-2 px-3 mr-sm-auto order-3 order-sm-1">
+  <div class="search-form-container flex-grow-1 py-2 pb-3 pb-sm-2 px-3 pl-md-4 mr-sm-auto order-3 order-sm-1">
     <form (ngSubmit)="search()" class="form-inline flex-grow-1">
       <input class="form-control form-control-sm" type="text" placeholder="Search documents" aria-label="Search"
         [formControl]="searchField" [ngbTypeahead]="searchAutoComplete" (selectItem)="itemSelected($event)" i18n-placeholder>
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index 44b1531b1..f62eccf96 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -82,7 +82,7 @@
 
   svg {
     position: absolute;
-    left: 1.8em;
+    left: 2rem;
     color: rgba(255, 255, 255, 0.6);
   }
 

From 3f01a9e1e274105296fc52add82b6fd486abb988 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 31 Dec 2020 19:32:04 +0100
Subject: [PATCH 0544/1300] Update docker-publish.yml

---
 .github/workflows/docker-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index f2da6b3b8..5ee210ef2 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Prepare
         id: prepare
         run: |
-          DOCKER_IMAGE=MarkSchmitt/paperless-ng
+          DOCKER_IMAGE=moztr/paperless-ng
           DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64/v8
           VERSION=edge
           if [[ $GITHUB_REF == refs/tags/* ]]; then
@@ -60,4 +60,4 @@ jobs:
       - name: Clear
         if: always() && github.event_name != 'pull_request'
         run: |
-          rm -f ${HOME}/.docker/config.json
\ No newline at end of file
+          rm -f ${HOME}/.docker/config.json

From f090537ef4c5650277b2b7f00fc29173e827f64f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 31 Dec 2020 16:23:08 -0800
Subject: [PATCH 0545/1300] tweak username display, dropdown size + spacing

---
 .../app-frame/app-frame.component.html        | 27 ++++++++++++-------
 .../app-frame/app-frame.component.scss        | 13 ++++++++-
 .../app-frame/app-frame.component.ts          | 23 +++++++++++++---
 3 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 8029edc98..a05b691af 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -20,21 +20,28 @@
   <ul ngbNav class="order-sm-3">
     <li ngbDropdown class="nav-item dropdown">
       <button class="btn text-light" id="userDropdown" ngbDropdownToggle>
+        <span *ngIf="displayName" class="navbar-text small mr-2 text-light d-none d-sm-inline">
+          {{displayName}}
+        </span>
         <svg width="1.3em" height="1.3em">
           <use xlink:href="assets/bootstrap-icons.svg#person-circle"/>
         </svg>
       </button>
       <div ngbDropdownMenu class="dropdown-menu-right shadow mr-2" aria-labelledby="userDropdown">
-          <a ngbDropdownItem class="nav-link" routerLink="settings" routerLinkActive="active" (click)="closeMenu()">
-            <svg class="sidebaricon" fill="currentColor">
-              <use xlink:href="assets/bootstrap-icons.svg#gear"/>
-            </svg>&nbsp;<ng-container i18n>Settings</ng-container>
-          </a>
-          <a ngbDropdownItem class="nav-link" href="accounts/logout/">
-            <svg class="sidebaricon" fill="currentColor">
-              <use xlink:href="assets/bootstrap-icons.svg#door-open"/>
-            </svg>&nbsp;<ng-container i18n>Logout</ng-container>
-          </a>
+        <div *ngIf="displayName" class="d-sm-none">
+          <p class="small mb-0 px-3" i18n>Logged in as {{displayName}}</p>
+          <div class="dropdown-divider"></div>
+        </div>
+        <a ngbDropdownItem class="nav-link" routerLink="settings" routerLinkActive="active" (click)="closeMenu()">
+          <svg class="sidebaricon mr-2" fill="currentColor">
+            <use xlink:href="assets/bootstrap-icons.svg#gear"/>
+          </svg><ng-container i18n>Settings</ng-container>
+        </a>
+        <a ngbDropdownItem class="nav-link" href="accounts/logout/">
+          <svg class="sidebaricon mr-2" fill="currentColor">
+            <use xlink:href="assets/bootstrap-icons.svg#door-open"/>
+          </svg><ng-container i18n>Logout</ng-container>
+        </a>
       </div>
     </li>
   </ul>
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index f62eccf96..f2abb80f9 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -62,13 +62,16 @@
 /*
  * Navbar
  */
+
 .navbar-brand {
   padding-top: 0.75rem;
   padding-bottom: 0.75rem;
   font-size: 1rem;
 }
 
-.navbar-toggler {
+.dropdown.show .dropdown-toggle,
+.dropdown-toggle:hover {
+  opacity: 0.7;
 }
 
 .dropdown-toggle::after {
@@ -76,6 +79,14 @@
   vertical-align: 0.155em;
 }
 
+.navbar .dropdown-menu {
+  font-size: 0.875rem; // body size
+
+  a svg {
+    opacity: 0.6;
+  }
+}
+
 .navbar .search-form-container {
   max-width: 550px;
   position: relative;
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts
index c4c00843d..dca0d9106 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.ts
+++ b/src-ui/src/app/components/app-frame/app-frame.component.ts
@@ -9,7 +9,8 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 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';
+
 @Component({
   selector: 'app-app-frame',
   templateUrl: './app-frame.component.html',
@@ -22,8 +23,11 @@ export class AppFrameComponent implements OnInit, OnDestroy {
     private activatedRoute: ActivatedRoute,
     private openDocumentsService: OpenDocumentsService,
     private searchService: SearchService,
-    public savedViewService: SavedViewService
+    public savedViewService: SavedViewService,
+    private meta: Meta
     ) {
+      console.log(meta);
+
   }
 
   versionString = `${environment.appTitle} ${environment.version}`
@@ -55,7 +59,7 @@ export class AppFrameComponent implements OnInit, OnDestroy {
         term.length < 2 ? from([[]]) : this.searchService.autocomplete(term)
       )
     )
-  
+
   itemSelected(event) {
     event.preventDefault()
     let currentSearch: string = this.searchField.value
@@ -98,4 +102,17 @@ export class AppFrameComponent implements OnInit, OnDestroy {
     }
   }
 
+  get displayName() {
+    // TODO: taken from dashboard component, is this the best way to pass around username?
+    let tagFullName = this.meta.getTag('name=full_name')
+    let tagUsername = this.meta.getTag('name=username')
+    if (tagFullName && tagFullName.content) {
+      return tagFullName.content
+    } else if (tagUsername && tagUsername.content) {
+      return tagUsername.content
+    } else {
+      return null
+    }
+  }
+
 }

From 97d068c3bbd79002eca7147190ec0d61234f1278 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 1 Jan 2021 12:53:16 +0100
Subject: [PATCH 0546/1300] Removed separate build step

It looks like part of the build step is repeated in the push step
due to bad caching possibly.
---
 .github/workflows/docker-publish.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 5ee210ef2..53d53e25c 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -38,10 +38,6 @@ jobs:
       - name: install buildx
         id: buildx
         uses: crazy-max/ghaction-docker-buildx@v3.1.0
-
-      - name: Docker Buildx (build)
-        run: |
-          docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
       - name: Docker Login
         if: success() && github.event_name != 'pull_request'
         env:

From 564f3b9170c68edc94f187320797a3b61c747cfd Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 20:23:32 +0100
Subject: [PATCH 0547/1300] fix some messages

---
 src/locale/en-us/LC_MESSAGES/django.po | 12 ++++++++----
 src/paperless_mail/models.py           |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en-us/LC_MESSAGES/django.po
index 0af8b7217..7b9435883 100644
--- a/src/locale/en-us/LC_MESSAGES/django.po
+++ b/src/locale/en-us/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-31 14:39+0000\n"
+"POT-Creation-Date: 2021-01-01 19:09+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -366,11 +366,11 @@ msgid "Use STARTTLS"
 msgstr ""
 
 #: paperless_mail/models.py:25
-msgid "imap server"
+msgid "IMAP server"
 msgstr ""
 
 #: paperless_mail/models.py:29
-msgid "imap port"
+msgid "IMAP port"
 msgstr ""
 
 #: paperless_mail/models.py:32
@@ -380,7 +380,7 @@ msgid ""
 msgstr ""
 
 #: paperless_mail/models.py:36
-msgid "imap security"
+msgid "IMAP security"
 msgstr ""
 
 #: paperless_mail/models.py:42
@@ -419,6 +419,10 @@ msgstr ""
 msgid "Do not assign a correspondent"
 msgstr ""
 
+#: paperless_mail/models.py:84
+msgid "Use mail address"
+msgstr ""
+
 #: paperless_mail/models.py:86
 msgid "Use name (or mail address if not available)"
 msgstr ""
diff --git a/src/paperless_mail/models.py b/src/paperless_mail/models.py
index d585d7c1c..44682cfbf 100644
--- a/src/paperless_mail/models.py
+++ b/src/paperless_mail/models.py
@@ -22,18 +22,18 @@ class MailAccount(models.Model):
         max_length=256, unique=True)
 
     imap_server = models.CharField(
-        _("imap server"),
+        _("IMAP server"),
         max_length=256)
 
     imap_port = models.IntegerField(
-        _("imap port"),
+        _("IMAP port"),
         blank=True,
         null=True,
         help_text=_("This is usually 143 for unencrypted and STARTTLS "
                     "connections, and 993 for SSL connections."))
 
     imap_security = models.PositiveIntegerField(
-        _("imap security"),
+        _("IMAP security"),
         choices=IMAP_SECURITY_OPTIONS,
         default=IMAP_SECURITY_SSL
     )
@@ -81,7 +81,7 @@ class MailRule(models.Model):
         (CORRESPONDENT_FROM_NOTHING,
          _("Do not assign a correspondent")),
         (CORRESPONDENT_FROM_EMAIL,
-         "Use mail address"),
+         _("Use mail address")),
         (CORRESPONDENT_FROM_NAME,
          _("Use name (or mail address if not available)")),
         (CORRESPONDENT_FROM_CUSTOM,

From dc525783ee396cd43f961d9e1a8d8a985afa58e8 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 1 Jan 2021 12:25:16 -0800
Subject: [PATCH 0548/1300] search icon position

---
 .../src/app/components/app-frame/app-frame.component.scss  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index f2abb80f9..473e6f85b 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -89,11 +89,14 @@
 
 .navbar .search-form-container {
   max-width: 550px;
-  position: relative;
+
+  form {
+    position: relative;
+  }
 
   svg {
     position: absolute;
-    left: 2rem;
+    left: 0.6rem;
     color: rgba(255, 255, 255, 0.6);
   }
 

From 54a0da8151995d0182665d6e58535ef9d5276c44 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 1 Jan 2021 12:29:52 -0800
Subject: [PATCH 0549/1300] Dark mode compatability

---
 .../src/app/components/app-frame/app-frame.component.scss   | 6 +++++-
 src-ui/src/theme_dark.scss                                  | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index 473e6f85b..2d3cc5f04 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -104,6 +104,10 @@
     svg {
       display: none;
     }
+
+    .form-control::placeholder {
+      color: rgba(255, 255, 255, 0);
+    }
   }
 
   .form-control {
@@ -121,7 +125,7 @@
 
     &:focus {
       background-color: #fff;
-      color: initial;
+      color: #212529;
       flex-grow: 1;
       padding-left: 0.5rem;
     }
diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index a122f1d86..5f08583e8 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -36,6 +36,10 @@ $border-color-dark-mode: #47494f;
     }
   }
 
+  .text-light {
+    color: $text-color-dark-mode !important;
+  }
+
   .border {
     border-color: $border-color-dark-mode !important;
   }

From a4e5d36a021440c86c65b32db512e85eee118d08 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 1 Jan 2021 12:36:19 -0800
Subject: [PATCH 0550/1300] Linting

---
 .../src/app/components/app-frame/app-frame.component.scss   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index 2d3cc5f04..26c4db273 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -19,13 +19,11 @@
 
 .sidebar-sticky {
   position: relative;
-  top: 0;
-  /* height: calc(100vh - 48px); */
+  top: 0;  /* height: calc(100vh - 48px); */
   height: 100%;
   padding-top: 0.5rem;
   overflow-x: hidden;
-  overflow-y: auto;
-  /* Scrollable contents if viewport is shorter than content. */
+  overflow-y: auto;  /* Scrollable contents if viewport is shorter than content. */
 }
 @supports ((position: -webkit-sticky) or (position: sticky)) {
   .sidebar-sticky {

From 6566e36141a6268ab294efb1f6f883678faf028b Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 1 Jan 2021 12:41:05 -0800
Subject: [PATCH 0551/1300] Mistakenly overwritten files from merge of dev
 branch

---
 src-ui/angular.json                    | 275 +++++++++++++------------
 src-ui/src/environments/environment.ts |   2 +-
 2 files changed, 139 insertions(+), 138 deletions(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index f081430c7..db8c66b19 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -1,138 +1,139 @@
 {
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "version": 1,
-  "newProjectRoot": "projects",
-  "projects": {
-    "paperless-ui": {
-      "projectType": "application",
-      "schematics": {
-        "@schematics/angular:component": {
-          "style": "scss"
-        }
-      },
-      "root": "",
-      "sourceRoot": "src",
-      "prefix": "app",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
-          "options": {
-            "outputPath": "dist/paperless-ui",
-            "outputHashing": "none",
-            "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.app.json",
-            "aot": true,
-            "assets": [
-              "src/favicon.ico",
-              "src/assets",
-              "src/manifest.webmanifest"
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
-            "scripts": [],
-            "allowedCommonJsDependencies": [
-              "ng2-pdf-viewer"
-            ]
-          },
-          "configurations": {
-            "production": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "none",
-              "sourceMap": false,
-              "extractCss": true,
-              "namedChunks": false,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "6kb",
-                  "maximumError": "10kb"
-                }
-              ]
-            }
-          }
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "paperless-ui:build"
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "paperless-ui:build:production"
-            }
-          }
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "paperless-ui:build"
-          }
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets",
-              "src/manifest.webmanifest"
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
-            "scripts": []
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        },
-        "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
-          "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "paperless-ui:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "paperless-ui:serve:production"
-            }
-          }
-        }
-      }
-    }
-  },
-  "defaultProject": "paperless-ui",
-  "cli": {
-    "analytics": "7c47c2bc-b97e-4014-85ae-b0c99b5750b4"
-  }
-}
\ No newline at end of file
+	"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+	"version": 1,
+	"newProjectRoot": "projects",
+	"projects": {
+		"paperless-ui": {
+			"projectType": "application",
+			"schematics": {
+				"@schematics/angular:component": {
+					"style": "scss"
+				}
+			},
+			"root": "",
+			"sourceRoot": "src",
+			"prefix": "app",
+			"architect": {
+				"build": {
+					"builder": "@angular-devkit/build-angular:browser",
+					"options": {
+						"outputPath": "dist/paperless-ui",
+						"outputHashing": "none",
+						"index": "src/index.html",
+						"main": "src/main.ts",
+						"polyfills": "src/polyfills.ts",
+						"tsConfig": "tsconfig.app.json",
+						"aot": true,
+						"assets": [
+							"src/favicon.ico",
+							"src/assets",
+							"src/manifest.webmanifest", {
+								"glob": "pdf.worker.min.js",
+								"input": "node_modules/pdfjs-dist/build/",
+								"output": "/assets/js/"
+							}
+						],
+						"styles": [
+							"src/styles.scss"
+						],
+						"scripts": [],
+						"allowedCommonJsDependencies": [
+							"ng2-pdf-viewer"
+						]
+					},
+					"configurations": {
+						"production": {
+							"fileReplacements": [
+								{
+									"replace": "src/environments/environment.ts",
+									"with": "src/environments/environment.prod.ts"
+								}
+							],
+							"optimization": true,
+							"outputHashing": "none",
+							"sourceMap": false,
+							"extractCss": true,
+							"namedChunks": false,
+							"extractLicenses": true,
+							"vendorChunk": false,
+							"buildOptimizer": true,
+							"budgets": [
+								{
+									"type": "initial",
+									"maximumWarning": "2mb",
+									"maximumError": "5mb"
+								},
+								{
+									"type": "anyComponentStyle",
+									"maximumWarning": "6kb",
+									"maximumError": "10kb"
+								}
+							]
+						}
+					}
+				},
+				"serve": {
+					"builder": "@angular-devkit/build-angular:dev-server",
+					"options": {
+						"browserTarget": "paperless-ui:build"
+					},
+					"configurations": {
+						"production": {
+							"browserTarget": "paperless-ui:build:production"
+						}
+					}
+				},
+				"extract-i18n": {
+					"builder": "@angular-devkit/build-angular:extract-i18n",
+					"options": {
+						"browserTarget": "paperless-ui:build"
+					}
+				},
+				"test": {
+					"builder": "@angular-devkit/build-angular:karma",
+					"options": {
+						"main": "src/test.ts",
+						"polyfills": "src/polyfills.ts",
+						"tsConfig": "tsconfig.spec.json",
+						"karmaConfig": "karma.conf.js",
+						"assets": [
+							"src/favicon.ico",
+							"src/assets",
+							"src/manifest.webmanifest"
+						],
+						"styles": [
+							"src/styles.scss"
+						],
+						"scripts": []
+					}
+				},
+				"lint": {
+					"builder": "@angular-devkit/build-angular:tslint",
+					"options": {
+						"tsConfig": [
+							"tsconfig.app.json",
+							"tsconfig.spec.json",
+							"e2e/tsconfig.json"
+						],
+						"exclude": [
+							"**/node_modules/**"
+						]
+					}
+				},
+				"e2e": {
+					"builder": "@angular-devkit/build-angular:protractor",
+					"options": {
+						"protractorConfig": "e2e/protractor.conf.js",
+						"devServerTarget": "paperless-ui:serve"
+					},
+					"configurations": {
+						"production": {
+							"devServerTarget": "paperless-ui:serve:production"
+						}
+					}
+				}
+			}
+		}
+	},
+	"defaultProject": "paperless-ui"
+}
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts
index 7c5b29e82..29a8f3af6 100644
--- a/src-ui/src/environments/environment.ts
+++ b/src-ui/src/environments/environment.ts
@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  apiBaseUrl: "http://10.0.1.26:8000/api/",
+  apiBaseUrl: "http://localhost:8000/api/",
   appTitle: "Paperless-ng",
   version: "DEVELOPMENT"
 };

From 77409616974f5c59cd3a7af253ea108bf074e0b9 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 1 Jan 2021 12:42:58 -0800
Subject: [PATCH 0552/1300] Spaces

---
 src-ui/src/app/components/app-frame/app-frame.component.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index 26c4db273..d23ee8141 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -19,11 +19,11 @@
 
 .sidebar-sticky {
   position: relative;
-  top: 0;  /* height: calc(100vh - 48px); */
+  top: 0; /* height: calc(100vh - 48px); */
   height: 100%;
   padding-top: 0.5rem;
   overflow-x: hidden;
-  overflow-y: auto;  /* Scrollable contents if viewport is shorter than content. */
+  overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
 }
 @supports ((position: -webkit-sticky) or (position: sticky)) {
   .sidebar-sticky {

From 3d2d9cb3a2e00052b0390e1f09ba55fd1b4d4374 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 1 Jan 2021 12:43:19 -0800
Subject: [PATCH 0553/1300] Remove unused line

---
 src-ui/src/app/components/app-frame/app-frame.component.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index d23ee8141..6809875eb 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -19,7 +19,7 @@
 
 .sidebar-sticky {
   position: relative;
-  top: 0; /* height: calc(100vh - 48px); */
+  top: 0;
   height: 100%;
   padding-top: 0.5rem;
   overflow-x: hidden;

From 1234634ba3a301394aa5816affb7e70bd17ba563 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 1 Jan 2021 12:49:48 -0800
Subject: [PATCH 0554/1300] Not sure why Typescript complained about this

---
 src-ui/src/app/app.component.ts             | 2 +-
 src-ui/src/app/services/app-view.service.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts
index 1c2001043..30ecb40d0 100644
--- a/src-ui/src/app/app.component.ts
+++ b/src-ui/src/app/app.component.ts
@@ -9,8 +9,8 @@ import { AppViewService } from './services/app-view.service';
 export class AppComponent {
 
   constructor (appViewService: AppViewService) {
-    appViewService.updateDarkModeSettings()
     (window as any).pdfWorkerSrc = '/assets/js/pdf.worker.min.js';
+    appViewService.updateDarkModeSettings()
   }
 
 
diff --git a/src-ui/src/app/services/app-view.service.ts b/src-ui/src/app/services/app-view.service.ts
index 6af2e43af..67a429ffe 100644
--- a/src-ui/src/app/services/app-view.service.ts
+++ b/src-ui/src/app/services/app-view.service.ts
@@ -18,7 +18,7 @@ export class AppViewService {
     this.updateDarkModeSettings()
   }
 
-  updateDarkModeSettings() {
+  updateDarkModeSettings(): void {
     let darkModeUseSystem = this.settings.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM)
     let darkModeEnabled = this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED)
 

From 8490b65bcc81130052863577d9511cad546347ee Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 21:50:23 +0100
Subject: [PATCH 0555/1300] update lockfile

---
 Pipfile.lock | 57 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 1cfccb8ff..c6621b543 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "3d576f289958226a7583e4c471c7f8c11bff6933bf093185f623cfb381a92412"
+            "sha256": "993e362c31af6b8094693075f614270a820cf0b557369d66d674e1a107b7bd31"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -44,6 +44,13 @@
             ],
             "version": "==1.17.12"
         },
+        "certifi": {
+            "hashes": [
+                "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c",
+                "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"
+            ],
+            "version": "==2020.12.5"
+        },
         "cffi": {
             "hashes": [
                 "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e",
@@ -229,6 +236,15 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==9.0"
         },
+        "idna": {
+            "hashes": [
+                "sha256:4a57a6379512ade94fa99e2fa46d3cd0f2f553040548d0e2958c6ed90ee48226",
+                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
+                "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.10"
+        },
         "imap-tools": {
             "hashes": [
                 "sha256:72bf46dc135b039a5d5b59f4e079242ac15eac02a30038e8cb2dec7b153cab65",
@@ -683,6 +699,14 @@
             ],
             "version": "==3.5.56"
         },
+        "requests": {
+            "hashes": [
+                "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804",
+                "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==2.25.1"
+        },
         "scikit-learn": {
             "hashes": [
                 "sha256:090bbf144fd5823c1f2efa3e1a9bf180295b24294ca8f478e75b40ed54f8036e",
@@ -769,6 +793,14 @@
             "markers": "python_version >= '3.5'",
             "version": "==2.1.0"
         },
+        "tika": {
+            "hashes": [
+                "sha256:c2c50f405622f74531841104f9e85c17511aede11de8e5385eab1a29a31f191b",
+                "sha256:d1f2eddb93caa9a2857569486aa2bc0320d0bf1796cdbe03066954cbc4b4bf62"
+            ],
+            "index": "pypi",
+            "version": "==1.24"
+        },
         "tqdm": {
             "hashes": [
                 "sha256:38b658a3e4ecf9b4f6f8ff75ca16221ae3378b2e175d846b6b33ea3a20852cf5",
@@ -777,6 +809,15 @@
             "index": "pypi",
             "version": "==4.54.1"
         },
+        "typing-extensions": {
+            "hashes": [
+                "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
+                "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
+                "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==3.7.4.3"
+        },
         "tzlocal": {
             "hashes": [
                 "sha256:643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44",
@@ -784,6 +825,14 @@
             ],
             "version": "==2.1"
         },
+        "urllib3": {
+            "hashes": [
+                "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08",
+                "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
+            "version": "==1.26.2"
+        },
         "watchdog": {
             "hashes": [
                 "sha256:3caefdcc8f06a57fdc5ef2d22aa7c0bfda4f55e71a0bee74cbf3176d97536ef3",
@@ -1197,11 +1246,11 @@
         },
         "requests": {
             "hashes": [
-                "sha256:7f1a0b932f4a60a1a65caa4263921bb7d9ee911957e0ae4a23a6dd08185ad5f8",
-                "sha256:e786fa28d8c9154e6a4de5d46a1d921b8749f8b74e28bde23768e5e16eece998"
+                "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804",
+                "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==2.25.0"
+            "version": "==2.25.1"
         },
         "six": {
             "hashes": [

From 279e269a66f9e929089fc05e5426eac6b4d42e76 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 21:50:32 +0100
Subject: [PATCH 0556/1300] update start_services.sh script

---
 scripts/start_services.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/start_services.sh b/scripts/start_services.sh
index e566f59b3..cbab7ac9e 100755
--- a/scripts/start_services.sh
+++ b/scripts/start_services.sh
@@ -1,2 +1,4 @@
 docker run -p 5432:5432 -v paperless_pgdata:/var/lib/postgresql/data -d postgres:13
 docker run -d -p 6379:6379 redis:latest
+docker run -p 3000:3000 -d thecodingmachine/gotenberg
+docker run -p 9998:9998 -d apache/tika

From c05bfb894ae5fad60760a47cf44bb34510274808 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 21:50:45 +0100
Subject: [PATCH 0557/1300] remove duplicate code

---
 src/documents/parsers.py           | 46 ++++++++++++++++++++
 src/paperless_tesseract/parsers.py | 50 ++--------------------
 src/paperless_tika/parsers.py      | 67 +++++-------------------------
 3 files changed, 60 insertions(+), 103 deletions(-)

diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index 725e605a2..65d321ce5 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -144,6 +144,52 @@ def run_convert(input_file,
         raise ParseError("Convert failed at {}".format(args))
 
 
+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.
+    """
+    out_path = os.path.join(temp_dir, "convert.png")
+
+    # Run convert to get a decent thumbnail
+    try:
+        run_convert(density=300,
+                    scale="500x5000>",
+                    alpha="remove",
+                    strip=True,
+                    trim=False,
+                    auto_orient=True,
+                    input_file="{}[0]".format(in_path),
+                    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)
+
+    return out_path
+
 def parse_date(filename, text):
     """
     Returns the date of the document.
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 4da5af2c0..fc8702eac 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -1,7 +1,6 @@
 import json
 import os
 import re
-import subprocess
 
 import ocrmypdf
 import pdftotext
@@ -10,7 +9,8 @@ from PIL import Image
 from django.conf import settings
 from ocrmypdf import InputFileError, EncryptedPdfError
 
-from documents.parsers import DocumentParser, ParseError, run_convert
+from documents.parsers import DocumentParser, ParseError, \
+    make_thumbnail_from_pdf
 
 
 class RasterisedDocumentParser(DocumentParser):
@@ -47,50 +47,8 @@ class RasterisedDocumentParser(DocumentParser):
         return result
 
     def get_thumbnail(self, document_path, mime_type):
-        """
-        The thumbnail of a PDF is just a 500px wide image of the first page.
-        """
-
-        out_path = os.path.join(self.tempdir, "convert.png")
-
-        # Run convert to get a decent thumbnail
-        try:
-            run_convert(density=300,
-                        scale="500x5000>",
-                        alpha="remove",
-                        strip=True,
-                        trim=False,
-                        auto_orient=True,
-                        input_file="{}[0]".format(document_path),
-                        output_file=out_path,
-                        logging_group=self.logging_group)
-        except ParseError:
-            # if convert fails, fall back to extracting
-            # the first PDF page as a PNG using Ghostscript
-            self.log(
-                'warning',
-                "Thumbnail generation with ImageMagick failed, falling back "
-                "to ghostscript. Check your /etc/ImageMagick-x/policy.xml!")
-            gs_out_path = os.path.join(self.tempdir, "gs_out.png")
-            cmd = [settings.GS_BINARY,
-                   "-q",
-                   "-sDEVICE=pngalpha",
-                   "-o", gs_out_path,
-                   document_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=self.logging_group)
-
-        return out_path
+        return make_thumbnail_from_pdf(
+            document_path, self.tempdir, self.logging_group)
 
     def is_image(self, mime_type):
         return mime_type in [
diff --git a/src/paperless_tika/parsers.py b/src/paperless_tika/parsers.py
index 81f213a6b..8ee10632f 100644
--- a/src/paperless_tika/parsers.py
+++ b/src/paperless_tika/parsers.py
@@ -1,14 +1,11 @@
 import os
-import subprocess
-import tika
 import requests
 import dateutil.parser
 
-from PIL import ImageDraw, ImageFont, Image
 from django.conf import settings
 
-from documents.parsers import DocumentParser, ParseError, run_convert
-from paperless_tesseract.parsers import RasterisedDocumentParser
+from documents.parsers import DocumentParser, ParseError, \
+    make_thumbnail_from_pdf
 from tika import parser
 
 
@@ -18,55 +15,11 @@ class TikaDocumentParser(DocumentParser):
     """
 
     def get_thumbnail(self, document_path, mime_type):
-        self.log("info", f"[TIKA_THUMB] Generating thumbnail for{document_path}")
-        archive_path = self.archive_path
+        if not self.archive_path:
+            self.archive_path = self.convert_to_pdf(document_path)
 
-        out_path = os.path.join(self.tempdir, "convert.png")
-
-        # Run convert to get a decent thumbnail
-        try:
-            run_convert(
-                density=300,
-                scale="500x5000>",
-                alpha="remove",
-                strip=True,
-                trim=False,
-                input_file="{}[0]".format(archive_path),
-                output_file=out_path,
-                logging_group=self.logging_group,
-            )
-        except ParseError:
-            # if convert fails, fall back to extracting
-            # the first PDF page as a PNG using Ghostscript
-            self.log(
-                "warning",
-                "Thumbnail generation with ImageMagick failed, falling back "
-                "to ghostscript. Check your /etc/ImageMagick-x/policy.xml!",
-            )
-            gs_out_path = os.path.join(self.tempdir, "gs_out.png")
-            cmd = [
-                settings.GS_BINARY,
-                "-q",
-                "-sDEVICE=pngalpha",
-                "-o",
-                gs_out_path,
-                archive_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,
-                input_file=gs_out_path,
-                output_file=out_path,
-                logging_group=self.logging_group,
-            )
-
-        return out_path
+        return make_thumbnail_from_pdf(
+            self.archive_path, self.tempdir, self.logging_group)
 
     def parse(self, document_path, mime_type):
         self.log("info", f"[TIKA_PARSE] Sending {document_path} to Tika server")
@@ -89,11 +42,9 @@ class TikaDocumentParser(DocumentParser):
         except:
             pass
 
-        archive_path = os.path.join(self.tempdir, "convert.pdf")
-        convert_to_pdf(document_path, archive_path)
-        self.archive_path = archive_path
+        self.archive_path = self.convert_to_pdf(document_path)
 
-    def convert_to_pdf(document_path, pdf_path):
+    def convert_to_pdf(self, document_path):
         pdf_path = os.path.join(self.tempdir, "convert.pdf")
         gotenberg_server = settings.PAPERLESS_TIKA_GOTENBERG_ENDPOINT
         url = gotenberg_server + "/convert/office"
@@ -113,3 +64,5 @@ class TikaDocumentParser(DocumentParser):
         file = open(pdf_path, "wb")
         file.write(response.content)
         file.close()
+
+        return pdf_path

From 1e541b688ddd5dc3f85a739a9acf51554d5ca31b Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 1 Jan 2021 12:52:35 -0800
Subject: [PATCH 0558/1300] brand width rem

---
 src-ui/src/app/components/app-frame/app-frame.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 36408dce5..46065a102 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/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="16px" class="mr-2" fill="currentColor">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 198.43 238.91" width="1rem" 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>

From de32addf76f8e041808a3551998e3de847ef0c5c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 21:59:21 +0100
Subject: [PATCH 0559/1300] fix up the tika parser

---
 src/paperless_tika/parsers.py | 44 ++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/paperless_tika/parsers.py b/src/paperless_tika/parsers.py
index 8ee10632f..56792fb51 100644
--- a/src/paperless_tika/parsers.py
+++ b/src/paperless_tika/parsers.py
@@ -21,26 +21,44 @@ class TikaDocumentParser(DocumentParser):
         return make_thumbnail_from_pdf(
             self.archive_path, self.tempdir, self.logging_group)
 
+    def extract_metadata(self, document_path, mime_type):
+        tika_server = settings.PAPERLESS_TIKA_ENDPOINT
+        try:
+            parsed = parser.from_file(document_path, tika_server)
+        except Exception as e:
+            self.log("warning", f"Error while fetching document metadata for "
+                                f"{document_path}: {e}")
+            return []
+
+        return [
+            {
+                "namespace": "",
+                "prefix": "",
+                "key": key,
+                "value": parsed['metadata'][key]
+            } for key in parsed['metadata']
+        ]
+
     def parse(self, document_path, mime_type):
-        self.log("info", f"[TIKA_PARSE] Sending {document_path} to Tika server")
+        self.log("info", f"Sending {document_path} to Tika server")
         tika_server = settings.PAPERLESS_TIKA_ENDPOINT
 
         try:
             parsed = parser.from_file(document_path, tika_server)
-        except requests.exceptions.HTTPError as err:
+        except Exception as err:
             raise ParseError(
-                f"Could not parse {document_path} with tika server at {tika_server}: {err}"
+                f"Could not parse {document_path} with tika server at "
+                f"{tika_server}: {err}"
             )
 
-        try:
-            self.text = parsed["content"].strip()
-        except:
-            pass
+        self.text = parsed["content"].strip()
 
         try:
-            self.date = dateutil.parser.isoparse(parsed["metadata"]["Creation-Date"])
-        except:
-            pass
+            self.date = dateutil.parser.isoparse(
+                parsed["metadata"]["Creation-Date"])
+        except Exception as e:
+            self.log("warning", f"Unable to extract date for document "
+                                f"{document_path}: {e}")
 
         self.archive_path = self.convert_to_pdf(document_path)
 
@@ -49,16 +67,16 @@ class TikaDocumentParser(DocumentParser):
         gotenberg_server = settings.PAPERLESS_TIKA_GOTENBERG_ENDPOINT
         url = gotenberg_server + "/convert/office"
 
-        self.log("info", f"[TIKA] Converting {document_path} to PDF as {pdf_path}")
+        self.log("info", f"Converting {document_path} to PDF as {pdf_path}")
         files = {"files": open(document_path, "rb")}
         headers = {}
 
         try:
             response = requests.post(url, files=files, headers=headers)
             response.raise_for_status()  # ensure we notice bad responses
-        except requests.exceptions.HTTPError as err:
+        except Exception as err:
             raise ParseError(
-                f"Could not contact gotenberg server at {gotenberg_server}: {err}"
+                f"Error while converting document to PDF: {err}"
             )
 
         file = open(pdf_path, "wb")

From 40ef375c15c319d18ab81c6bc265f352f52de52f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 22:19:43 +0100
Subject: [PATCH 0560/1300] supply file_name for tika parser

---
 src/documents/consumer.py            | 3 +--
 src/documents/parsers.py             | 2 +-
 src/documents/tests/test_consumer.py | 4 ++--
 src/paperless_tesseract/parsers.py   | 2 +-
 src/paperless_text/parsers.py        | 2 +-
 src/paperless_tika/parsers.py        | 8 ++++----
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 5a06194b7..abd12d802 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -1,6 +1,5 @@
 import datetime
 import hashlib
-import logging
 import os
 
 import magic
@@ -130,7 +129,7 @@ class Consumer(LoggingMixin):
 
         try:
             self.log("debug", "Parsing {}...".format(self.filename))
-            document_parser.parse(self.path, mime_type)
+            document_parser.parse(self.path, mime_type, self.filename)
 
             self.log("debug", f"Generating thumbnail for {self.filename}...")
             thumbnail = document_parser.get_optimised_thumbnail(
diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index 65d321ce5..e14607bd0 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -267,7 +267,7 @@ class DocumentParser(LoggingMixin):
     def extract_metadata(self, document_path, mime_type):
         return []
 
-    def parse(self, document_path, mime_type):
+    def parse(self, document_path, mime_type, file_name=None):
         raise NotImplementedError()
 
     def get_archive_path(self):
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 795ca7f95..90c034f9e 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -177,7 +177,7 @@ class DummyParser(DocumentParser):
     def get_optimised_thumbnail(self, document_path, mime_type):
         return self.fake_thumb
 
-    def parse(self, document_path, mime_type):
+    def parse(self, document_path, mime_type, file_name=None):
         self.text = "The Text"
 
 
@@ -194,7 +194,7 @@ class FaultyParser(DocumentParser):
     def get_optimised_thumbnail(self, document_path, mime_type):
         return self.fake_thumb
 
-    def parse(self, document_path, mime_type):
+    def parse(self, document_path, mime_type, file_name=None):
         raise ParseError("Does not compute.")
 
 
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index fc8702eac..31e956284 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -88,7 +88,7 @@ class RasterisedDocumentParser(DocumentParser):
                 f"Error while calculating DPI for image {image}: {e}")
             return None
 
-    def parse(self, document_path, mime_type):
+    def parse(self, document_path, mime_type, file_name=None):
         mode = settings.OCR_MODE
 
         text_original = get_text_from_pdf(document_path)
diff --git a/src/paperless_text/parsers.py b/src/paperless_text/parsers.py
index a38bd7a91..c1afe07fc 100644
--- a/src/paperless_text/parsers.py
+++ b/src/paperless_text/parsers.py
@@ -32,6 +32,6 @@ class TextDocumentParser(DocumentParser):
 
         return out_path
 
-    def parse(self, document_path, mime_type):
+    def parse(self, document_path, mime_type, file_name=None):
         with open(document_path, 'r') as f:
             self.text = f.read()
diff --git a/src/paperless_tika/parsers.py b/src/paperless_tika/parsers.py
index 56792fb51..13e937daa 100644
--- a/src/paperless_tika/parsers.py
+++ b/src/paperless_tika/parsers.py
@@ -39,7 +39,7 @@ class TikaDocumentParser(DocumentParser):
             } for key in parsed['metadata']
         ]
 
-    def parse(self, document_path, mime_type):
+    def parse(self, document_path, mime_type, file_name=None):
         self.log("info", f"Sending {document_path} to Tika server")
         tika_server = settings.PAPERLESS_TIKA_ENDPOINT
 
@@ -60,15 +60,15 @@ class TikaDocumentParser(DocumentParser):
             self.log("warning", f"Unable to extract date for document "
                                 f"{document_path}: {e}")
 
-        self.archive_path = self.convert_to_pdf(document_path)
+        self.archive_path = self.convert_to_pdf(document_path, file_name)
 
-    def convert_to_pdf(self, document_path):
+    def convert_to_pdf(self, document_path, file_name):
         pdf_path = os.path.join(self.tempdir, "convert.pdf")
         gotenberg_server = settings.PAPERLESS_TIKA_GOTENBERG_ENDPOINT
         url = gotenberg_server + "/convert/office"
 
         self.log("info", f"Converting {document_path} to PDF as {pdf_path}")
-        files = {"files": open(document_path, "rb")}
+        files = {"files": (file_name, open(document_path, "rb"))}
         headers = {}
 
         try:

From d5601b7ec0efe0d5af92da224c30d5d650522c8c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 22:29:25 +0100
Subject: [PATCH 0561/1300] remove active class from user menu

---
 src-ui/src/app/components/app-frame/app-frame.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 46065a102..42273ca3a 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -34,7 +34,7 @@
           <p class="small mb-0 px-3" i18n>Logged in as {{displayName}}</p>
           <div class="dropdown-divider"></div>
         </div>
-        <a ngbDropdownItem class="nav-link" routerLink="settings" routerLinkActive="active" (click)="closeMenu()">
+        <a ngbDropdownItem class="nav-link" routerLink="settings" (click)="closeMenu()">
           <svg class="sidebaricon mr-2" fill="currentColor">
             <use xlink:href="assets/bootstrap-icons.svg#gear"/>
           </svg><ng-container i18n>Settings</ng-container>

From 0a7412424d988bc606e8fcfffefaaec4cce7c023 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 22:38:26 +0100
Subject: [PATCH 0562/1300] refactored app-view service

---
 src-ui/src/app/app.component.ts               | 10 +++---
 .../app-frame/app-frame.component.ts          |  3 +-
 .../manage/settings/settings.component.ts     |  6 ++--
 .../src/app/services/app-view.service.spec.ts | 16 ---------
 src-ui/src/app/services/app-view.service.ts   | 35 -------------------
 src-ui/src/app/services/settings.service.ts   | 28 +++++++++++++--
 6 files changed, 34 insertions(+), 64 deletions(-)
 delete mode 100644 src-ui/src/app/services/app-view.service.spec.ts
 delete mode 100644 src-ui/src/app/services/app-view.service.ts

diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts
index 30ecb40d0..73c5fc861 100644
--- a/src-ui/src/app/app.component.ts
+++ b/src-ui/src/app/app.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { AppViewService } from './services/app-view.service';
+import { SettingsService } from './services/settings.service';
 
 @Component({
   selector: 'app-root',
@@ -8,10 +8,10 @@ import { AppViewService } from './services/app-view.service';
 })
 export class AppComponent {
 
-  constructor (appViewService: AppViewService) {
-    (window as any).pdfWorkerSrc = '/assets/js/pdf.worker.min.js';
-    appViewService.updateDarkModeSettings()
+  constructor (private settings: SettingsService) {
+    let anyWindow = (window as any)
+    anyWindow.pdfWorkerSrc = '/assets/js/pdf.worker.min.js';
+    this.settings.updateDarkModeSettings()
   }
 
-
 }
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts
index dca0d9106..ad4460f16 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.ts
+++ b/src-ui/src/app/components/app-frame/app-frame.component.ts
@@ -26,8 +26,7 @@ export class AppFrameComponent implements OnInit, OnDestroy {
     public savedViewService: SavedViewService,
     private meta: Meta
     ) {
-      console.log(meta);
-
+      
   }
 
   versionString = `${environment.appTitle} ${environment.version}`
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index df3015e21..0b0646157 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -5,7 +5,6 @@ import { DocumentListViewService } from 'src/app/services/document-list-view.ser
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service';
 import { ToastService } from 'src/app/services/toast.service';
-import { AppViewService } from 'src/app/services/app-view.service';
 
 @Component({
   selector: 'app-settings',
@@ -31,8 +30,7 @@ export class SettingsComponent implements OnInit {
     public savedViewService: SavedViewService,
     private documentListViewService: DocumentListViewService,
     private toastService: ToastService,
-    private settings: SettingsService,
-    private appViewService: AppViewService
+    private settings: SettingsService
   ) { }
 
   ngOnInit() {
@@ -72,7 +70,7 @@ export class SettingsComponent implements OnInit {
     this.settings.set(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, this.settingsForm.value.darkModeUseSystem)
     this.settings.set(SETTINGS_KEYS.DARK_MODE_ENABLED, (this.settingsForm.value.darkModeEnabled == true).toString())
     this.documentListViewService.updatePageSize()
-    this.appViewService.updateDarkModeSettings()
+    this.settings.updateDarkModeSettings()
     this.toastService.showInfo($localize`Settings saved successfully.`)
   }
 
diff --git a/src-ui/src/app/services/app-view.service.spec.ts b/src-ui/src/app/services/app-view.service.spec.ts
deleted file mode 100644
index fc44ed3a4..000000000
--- a/src-ui/src/app/services/app-view.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { AppViewService } from './app-view.service';
-
-describe('AppViewService', () => {
-  let service: AppViewService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(AppViewService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src-ui/src/app/services/app-view.service.ts b/src-ui/src/app/services/app-view.service.ts
deleted file mode 100644
index 67a429ffe..000000000
--- a/src-ui/src/app/services/app-view.service.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core';
-import { DOCUMENT } from '@angular/common';
-import { SettingsService, SETTINGS_KEYS } from './settings.service';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class AppViewService {
-  private renderer: Renderer2;
-
-  constructor(
-    private settings: SettingsService,
-    private rendererFactory: RendererFactory2,
-    @Inject(DOCUMENT) private document
-  ) {
-    this.renderer = rendererFactory.createRenderer(null, null);
-
-    this.updateDarkModeSettings()
-  }
-
-  updateDarkModeSettings(): void {
-    let darkModeUseSystem = this.settings.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM)
-    let darkModeEnabled = this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED)
-
-    if (darkModeUseSystem) {
-      this.renderer.addClass(this.document.body, 'color-scheme-system')
-      this.renderer.removeClass(this.document.body, 'color-scheme-dark')
-    } else {
-      this.renderer.removeClass(this.document.body, 'color-scheme-system')
-      darkModeEnabled ? this.renderer.addClass(this.document.body, 'color-scheme-dark') : this.renderer.removeClass(this.document.body, 'color-scheme-dark')
-    }
-
-  }
-
-}
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index 7b1cfe9e3..a8f85972d 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -1,4 +1,5 @@
-import { Injectable } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core';
 
 export interface PaperlessSettings {
   key: string
@@ -27,7 +28,30 @@ const SETTINGS: PaperlessSettings[] = [
 })
 export class SettingsService {
 
-  constructor() { }
+  private renderer: Renderer2;
+
+  constructor(
+    private rendererFactory: RendererFactory2,
+    @Inject(DOCUMENT) private document
+  ) {
+    this.renderer = rendererFactory.createRenderer(null, null);
+
+    this.updateDarkModeSettings()
+  }
+
+  updateDarkModeSettings(): void {
+    let darkModeUseSystem = this.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM)
+    let darkModeEnabled = this.get(SETTINGS_KEYS.DARK_MODE_ENABLED)
+
+    if (darkModeUseSystem) {
+      this.renderer.addClass(this.document.body, 'color-scheme-system')
+      this.renderer.removeClass(this.document.body, 'color-scheme-dark')
+    } else {
+      this.renderer.removeClass(this.document.body, 'color-scheme-system')
+      darkModeEnabled ? this.renderer.addClass(this.document.body, 'color-scheme-dark') : this.renderer.removeClass(this.document.body, 'color-scheme-dark')
+    }
+
+  }
 
   get(key: string): any {
     let setting = SETTINGS.find(s => s.key == key)

From bac0dbb70b6ceb925888db33882a5e3774a3239c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 22:38:33 +0100
Subject: [PATCH 0563/1300] messages

---
 src-ui/messages.xlf | 97 +++++++++++++++++++++++++++------------------
 1 file changed, 59 insertions(+), 38 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 5f12c504c..133d1ae96 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -377,7 +377,7 @@
         <source>Do you really want to delete the tag &quot;<x id="PH" equiv-text="object.name"/>&quot;?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">28</context>
         </context-group>
       </trans-unit>
       <trans-unit id="70a67e04629f6d412db0a12d51820b480788d795" datatype="html">
@@ -440,7 +440,7 @@
         <source>Do you really want to delete the document type &quot;<x id="PH" equiv-text="object.name"/>&quot;?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
-          <context context-type="linenumber">26</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8" datatype="html">
@@ -468,21 +468,21 @@
         <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/> deleted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">54</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5647210819299459618" datatype="html">
         <source>Settings saved successfully.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">74</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8488620293789898901" datatype="html">
         <source>Error while storing settings on server: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit id="11ebd254cc9294717105c5982eb0cd2af30a446d" datatype="html">
@@ -496,11 +496,11 @@
         <source>Saved views</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="0d8ceb153aa715eb905da0710cc0b2ac73159abc" datatype="html">
-        <source>Document list</source>
+      <trans-unit id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13" datatype="html">
+        <source>Appearance</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">13</context>
@@ -513,60 +513,74 @@
           <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff" datatype="html">
+        <source>Dark mode</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637" datatype="html">
+        <source>Use system settings</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="3863a86cd9e69a61d143d3daf51df44203df4a82" datatype="html">
         <source>Bulk editing</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586" datatype="html">
         <source>Show confirmation dialogs</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">48</context>
         </context-group>
       </trans-unit>
       <trans-unit id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a" datatype="html">
         <source>Deleting documents will always ask for confirmation.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">48</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8cfddc13e04f5545ac63f419ef363505d6f78c2e" datatype="html">
         <source>Apply on close</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8cb90334f5dfd7fc67205085f59381e2a334ccfc" datatype="html">
         <source>Appears on</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">68</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5" datatype="html">
         <source>Show on dashboard</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
       <trans-unit id="541bfc5b123b3f8867fd681eaceefb663a811973" datatype="html">
         <source>Show in sidebar</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">60</context>
+          <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit>
       <trans-unit id="abba764a7a595d04dc8c3b26e04b3780d4fdb540" datatype="html">
         <source>No saved views defined.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ef60a738a565f498b858e903e42bc5ffc3cc1299" datatype="html">
@@ -580,7 +594,7 @@
         <source>Do you really want to delete the correspondent &quot;<x id="PH" equiv-text="object.name"/>&quot;?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
-          <context context-type="linenumber">26</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c3f3334de899327bf3ec8999236e10798ff76e72" datatype="html">
@@ -776,26 +790,33 @@
         <source>Paperless-ng</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">4</context>
+          <context context-type="linenumber">11</context>
         </context-group>
         <note priority="1" from="description">app title</note>
       </trans-unit>
-      <trans-unit id="8d667444401ef6380fd262e4fe4795f261a427b1" datatype="html">
-        <source>Search for documents</source>
+      <trans-unit id="069566c6ed4f051b5b5617ef1935837226585dad" datatype="html">
+        <source>Search documents</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="68949525c4d9a901e0cd15a94e3fc8d2711e9918" datatype="html">
-        <source>Manage</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
       <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
         <source>Settings</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">40</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bb694b49d408265c91c62799c2b3a7e3151c824d" datatype="html">
+        <source>Logout</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="68949525c4d9a901e0cd15a94e3fc8d2711e9918" datatype="html">
+        <source>Manage</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
           <context context-type="linenumber">112</context>
@@ -805,49 +826,49 @@
         <source>Admin</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">119</context>
+          <context context-type="linenumber">147</context>
         </context-group>
       </trans-unit>
       <trans-unit id="46aa32e581922d6d2c3d7bc4c87209ad5808b029" datatype="html">
         <source>Misc</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">153</context>
         </context-group>
       </trans-unit>
       <trans-unit id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7" datatype="html">
         <source>Documentation</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">132</context>
+          <context context-type="linenumber">160</context>
         </context-group>
       </trans-unit>
       <trans-unit id="355a222236bc01b9a8cd3cb9ecf76891125aed69" datatype="html">
         <source>GitHub</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">139</context>
+          <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="bb694b49d408265c91c62799c2b3a7e3151c824d" datatype="html">
-        <source>Logout</source>
+      <trans-unit id="af665f8de8fabe306aaf27443957e69bcbbce63c" datatype="html">
+        <source>Logged in as <x id="INTERPOLATION" equiv-text="{{displayName}}"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">146</context>
+          <context context-type="linenumber">34</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4f55b670f49d927c6026bb614c7c62b1f2a394c0" datatype="html">
         <source>Open documents</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">57</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="dca5bf9344a759fa5a07f1b21f50286ec242ba44" datatype="html">
         <source>Close all</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5195932016807797291" datatype="html">
@@ -910,7 +931,7 @@
         <source>Not assigned</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
-          <context context-type="linenumber">145</context>
+          <context context-type="linenumber">161</context>
         </context-group>
         <note priority="1" from="description">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
       </trans-unit>

From ebdddc4fe4ee98e35cab3ffe1867c12048e401a9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 22:44:10 +0100
Subject: [PATCH 0564/1300] fix metadata column

---
 .../metadata-collapse/metadata-collapse.component.html         | 2 +-
 .../metadata-collapse/metadata-collapse.component.scss         | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html
index e8fda1d0b..ac42860c9 100644
--- a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html
+++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html
@@ -16,7 +16,7 @@
       <tbody>
           <tr *ngFor="let m of metadata">
               <td>{{m.prefix}}:{{m.key}}</td>
-              <td>{{m.value}}</td>
+              <td class="metadata-column">{{m.value}}</td>
           </tr>
       </tbody>
   </table>
diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.scss b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.scss
index e69de29bb..b946da146 100644
--- a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.scss
+++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.scss
@@ -0,0 +1,3 @@
+.metadata-column {
+  overflow-wrap: anywhere;
+}
\ No newline at end of file

From c4367818b73100f00d68469c81c1531ae9548b05 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 23:08:02 +0100
Subject: [PATCH 0565/1300] better matching algorithm descriptions

---
 .../correspondent-edit-dialog.component.html         |  2 +-
 .../document-type-edit-dialog.component.html         |  2 +-
 .../manage/generic-list/generic-list.component.ts    |  2 +-
 .../tag-edit-dialog/tag-edit-dialog.component.html   |  2 +-
 src-ui/src/app/data/matching-model.ts                | 12 ++++++------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
index e35c57e26..fd6b01de9 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
@@ -9,7 +9,7 @@
     
     <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
     <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-    <app-input-text i18n-title title="Match" formControlName="match" i18n-hint hint="Auto matching does not require you to fill in this field."></app-input-text>
+    <app-input-text i18n-title title="Matching pattern" formControlName="match" i18n-hint hint="Auto matching does not require you to fill in this field."></app-input-text>
     <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" i18n-hint hint="Auto matching ignores this option."></app-input-check>
   </div>
   <div class="modal-footer">
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
index 458fbb4bc..9466b433d 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
@@ -9,7 +9,7 @@
       
       <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
       <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-      <app-input-text i18n-title title="Match" formControlName="match" i18n-hint hint="Auto matching does not require you to fill in this field."></app-input-text>
+      <app-input-text i18n-title title="Matching pattern" formControlName="match" i18n-hint hint="Auto matching does not require you to fill in this field."></app-input-text>
       <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" i18n-hint hint="Auto matching ignores this option."></app-input-check>
 
     </div>
diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
index 1f9cc65f9..b31231bc8 100644
--- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
+++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
@@ -30,7 +30,7 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
     if (o.matching_algorithm == MATCH_AUTO) {
       return $localize`Automatic`
     } else if (o.match && o.match.length > 0) {
-      return `${o.match} (${MATCHING_ALGORITHMS.find(a => a.id == o.matching_algorithm).name})`
+      return `${MATCHING_ALGORITHMS.find(a => a.id == o.matching_algorithm).shortName}: ${o.match}`
     } else {
       return "-"
     }
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
index bbb96fb6b..7efaac4b9 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
@@ -20,7 +20,7 @@
      
       <app-input-check i18n-title title="Inbox tag" formControlName="is_inbox_tag" i18n-hint hint="Inbox tags are automatically assigned to all consumed documents."></app-input-check>
       <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-      <app-input-text i18n-title title="Match" formControlName="match" i18n-hint hint="Auto matching does not require you to fill in this field."></app-input-text>
+      <app-input-text i18n-title title="Matching pattern" formControlName="match" i18n-hint hint="Auto matching does not require you to fill in this field."></app-input-text>
       <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" i18n-hint hint="Auto matching ignores this option."></app-input-check>
     </div>
     <div class="modal-footer">
diff --git a/src-ui/src/app/data/matching-model.ts b/src-ui/src/app/data/matching-model.ts
index dfb007ecb..5d8695d6b 100644
--- a/src-ui/src/app/data/matching-model.ts
+++ b/src-ui/src/app/data/matching-model.ts
@@ -9,12 +9,12 @@ export const MATCH_FUZZY = 5
 export const MATCH_AUTO = 6
 
 export const MATCHING_ALGORITHMS = [
-    {id: MATCH_ANY, name: $localize`Any`},
-    {id: MATCH_ALL, name: $localize`All`},
-    {id: MATCH_LITERAL, name: $localize`Literal`},
-    {id: MATCH_REGEX, name: $localize`Regular expression`},
-    {id: MATCH_FUZZY, name: $localize`Fuzzy match`},
-    {id: MATCH_AUTO, name: $localize`Auto`},
+    {id: MATCH_ANY, shortName: $localize`Any word`, name: $localize`Any: Document contains any of these words (space separated)`},
+    {id: MATCH_ALL, shortName: $localize`All words`, name: $localize`All: Document contains all of these words (space separated)`},
+    {id: MATCH_LITERAL, shortName: $localize`Exact match`, name: $localize`Exact: Document contains this string`},
+    {id: MATCH_REGEX, shortName: $localize`Regular expression`, name: $localize`Regular expression: Document matches this regular expression`},
+    {id: MATCH_FUZZY, shortName: $localize`Fuzzy word`, name: $localize`Fuzzy: Document contains a word similar to this word`},
+    {id: MATCH_AUTO, shortName: $localize`Automatic`, name: $localize`Auto: Learn matching automatically.`},
 ]
 
 export interface MatchingModel extends ObjectWithId {

From 6d554bace104c7c32e6f6f371e84ec80d426f9a5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 23:08:49 +0100
Subject: [PATCH 0566/1300] fix #238

---
 src-ui/messages.xlf                           | 86 +++++++++++++++----
 .../filter-editor/filter-editor.component.ts  | 17 +++-
 .../migrations/1010_auto_20210101_2159.py     | 18 ++++
 src/documents/models.py                       |  5 +-
 4 files changed, 108 insertions(+), 18 deletions(-)
 create mode 100644 src/documents/migrations/1010_auto_20210101_2159.py

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 133d1ae96..76c4a4fb9 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -653,8 +653,8 @@
           <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="180092a6b8a6151a05f4a7552a2fb75fd159dfa8" datatype="html">
-        <source>Match</source>
+      <trans-unit id="eab7fc7cf2d663e54de934b779fce4275a303f0f" datatype="html">
+        <source>Matching pattern</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
           <context context-type="linenumber">12</context>
@@ -875,21 +875,42 @@
         <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">28</context>
+          <context context-type="linenumber">29</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">31</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">31</context>
+          <context context-type="linenumber">36</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">38</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">34</context>
+          <context context-type="linenumber">42</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">46</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ddb40946e790522301687ecddb9ce1cb8ad40dd1" datatype="html">
@@ -1582,22 +1603,43 @@
           <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="3184700926171002527" datatype="html">
-        <source>Any</source>
+      <trans-unit id="5851669019930456395" datatype="html">
+        <source>Any word</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1616102757855967475" datatype="html">
-        <source>All</source>
+      <trans-unit id="7517655726614958140" datatype="html">
+        <source>Any: Document contains any of these words (space separated)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="700315718208181326" datatype="html">
+        <source>All words</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1968183742008490888" datatype="html">
-        <source>Literal</source>
+      <trans-unit id="111914402588955480" datatype="html">
+        <source>All: Document contains all of these words (space separated)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9180173992399180575" datatype="html">
+        <source>Exact match</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7109184332944610787" datatype="html">
+        <source>Exact: Document contains this string</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">14</context>
@@ -1610,15 +1652,29 @@
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="701356546322112069" datatype="html">
-        <source>Fuzzy match</source>
+      <trans-unit id="7548151332424148033" datatype="html">
+        <source>Regular expression: Document matches this regular expression</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1856513373880048959" datatype="html">
+        <source>Fuzzy word</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="616064537937996961" datatype="html">
-        <source>Auto</source>
+      <trans-unit id="8419167206585286450" datatype="html">
+        <source>Fuzzy: Document contains a word similar to this word</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2147958104253035821" datatype="html">
+        <source>Auto: Learn matching automatically.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">17</context>
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index 4b62d6a51..b160ae073 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -25,13 +25,26 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
       switch(this.filterRules[0].rule_type) {
 
         case FILTER_CORRESPONDENT:
-          return $localize`Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}`
+          if (rule.value) {
+            return $localize`Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}`
+          } else {
+            return $localize`Without correspondent`
+          }
 
         case FILTER_DOCUMENT_TYPE:
-          return $localize`Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}`
+          if (rule.value) {
+            return $localize`Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}`
+          } else {
+            return $localize`Without document type`
+          }
 
         case FILTER_HAS_TAG:
           return $localize`Tag: ${this.tags.find(t => t.id == +rule.value)?.name}`
+        
+        case FILTER_HAS_ANY_TAG:
+          if (rule.value == "false") {
+            return $localize`Without any tag`
+          }
 
       }
     }
diff --git a/src/documents/migrations/1010_auto_20210101_2159.py b/src/documents/migrations/1010_auto_20210101_2159.py
new file mode 100644
index 000000000..4c30125be
--- /dev/null
+++ b/src/documents/migrations/1010_auto_20210101_2159.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.4 on 2021-01-01 21:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '1009_auto_20201216_2005'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='savedviewfilterrule',
+            name='value',
+            field=models.CharField(blank=True, max_length=128, null=True),
+        ),
+    ]
diff --git a/src/documents/models.py b/src/documents/models.py
index 168dd8c7b..bf59fb1f0 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -351,7 +351,10 @@ class SavedViewFilterRule(models.Model):
 
     rule_type = models.PositiveIntegerField(choices=RULE_TYPES)
 
-    value = models.CharField(max_length=128)
+    value = models.CharField(
+        max_length=128,
+        blank=True,
+        null=True)
 
 
 # TODO: why is this in the models file?

From 4b74cd567734f9605bc7ddf1dabcd7d06ef10d0f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 1 Jan 2021 23:27:55 +0100
Subject: [PATCH 0567/1300] fix #236

---
 src/documents/apps.py                         |  8 ---
 src/documents/consumer.py                     | 40 +++++++++++++
 src/documents/signals/handlers.py             | 27 ---------
 src/documents/tests/test_consumer.py          | 50 +++++++++++++++++
 .../tests/test_post_consume_handlers.py       | 56 -------------------
 5 files changed, 90 insertions(+), 91 deletions(-)
 delete mode 100644 src/documents/tests/test_post_consume_handlers.py

diff --git a/src/documents/apps.py b/src/documents/apps.py
index 2cd7d6c0e..4278029cc 100644
--- a/src/documents/apps.py
+++ b/src/documents/apps.py
@@ -6,29 +6,21 @@ class DocumentsConfig(AppConfig):
     name = "documents"
 
     def ready(self):
-
-        from .signals import document_consumption_started
         from .signals import document_consumption_finished
         from .signals.handlers import (
             add_inbox_tags,
-            run_pre_consume_script,
-            run_post_consume_script,
             set_log_entry,
             set_correspondent,
             set_document_type,
             set_tags,
             add_to_index
-
         )
 
-        document_consumption_started.connect(run_pre_consume_script)
-
         document_consumption_finished.connect(add_inbox_tags)
         document_consumption_finished.connect(set_correspondent)
         document_consumption_finished.connect(set_document_type)
         document_consumption_finished.connect(set_tags)
         document_consumption_finished.connect(set_log_entry)
         document_consumption_finished.connect(add_to_index)
-        document_consumption_finished.connect(run_post_consume_script)
 
         AppConfig.ready(self)
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index abd12d802..480537279 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -1,6 +1,7 @@
 import datetime
 import hashlib
 import os
+from subprocess import Popen
 
 import magic
 from django.conf import settings
@@ -8,6 +9,7 @@ from django.db import transaction
 from django.db.models import Q
 from django.utils import timezone
 from filelock import FileLock
+from rest_framework.reverse import reverse
 
 from .classifier import DocumentClassifier, IncompatibleClassifierVersionError
 from .file_handling import create_source_path_directory, \
@@ -65,6 +67,39 @@ class Consumer(LoggingMixin):
         os.makedirs(settings.ORIGINALS_DIR, exist_ok=True)
         os.makedirs(settings.ARCHIVE_DIR, exist_ok=True)
 
+    def run_pre_consume_script(self):
+        if not settings.PRE_CONSUME_SCRIPT:
+            return
+
+        try:
+            Popen((settings.PRE_CONSUME_SCRIPT, self.path)).wait()
+        except Exception as e:
+            raise ConsumerError(
+                f"Error while executing pre-consume script: {e}"
+            )
+
+    def run_post_consume_script(self, document):
+        if not settings.POST_CONSUME_SCRIPT:
+            return
+
+        try:
+            Popen((
+                settings.POST_CONSUME_SCRIPT,
+                str(document.pk),
+                document.get_public_filename(),
+                os.path.normpath(document.source_path),
+                os.path.normpath(document.thumbnail_path),
+                reverse("document-download", kwargs={"pk": document.pk}),
+                reverse("document-thumb", kwargs={"pk": document.pk}),
+                str(document.correspondent),
+                str(",".join(document.tags.all().values_list(
+                    "name", flat=True)))
+            )).wait()
+        except Exception as e:
+            raise ConsumerError(
+                f"Error while executing pre-consume script: {e}"
+            )
+
     def try_consume_file(self,
                          path,
                          override_filename=None,
@@ -118,6 +153,8 @@ class Consumer(LoggingMixin):
             logging_group=self.logging_group
         )
 
+        self.run_pre_consume_script()
+
         # This doesn't parse the document yet, but gives us a parser.
 
         document_parser = parser_class(self.logging_group)
@@ -214,6 +251,9 @@ class Consumer(LoggingMixin):
                 # Delete the file only if it was successfully consumed
                 self.log("debug", "Deleting file {}".format(self.path))
                 os.unlink(self.path)
+
+                self.run_post_consume_script(document)
+
         except Exception as e:
             self.log(
                 "error",
diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index f2743c212..be101b3af 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -11,7 +11,6 @@ from django.db.models import Q
 from django.dispatch import receiver
 from django.utils import timezone
 from filelock import FileLock
-from rest_framework.reverse import reverse
 
 from .. import index, matching
 from ..file_handling import delete_empty_directories, \
@@ -147,32 +146,6 @@ def set_tags(sender,
     document.tags.add(*relevant_tags)
 
 
-def run_pre_consume_script(sender, filename, **kwargs):
-
-    if not settings.PRE_CONSUME_SCRIPT:
-        return
-
-    Popen((settings.PRE_CONSUME_SCRIPT, filename)).wait()
-
-
-def run_post_consume_script(sender, document, **kwargs):
-
-    if not settings.POST_CONSUME_SCRIPT:
-        return
-
-    Popen((
-        settings.POST_CONSUME_SCRIPT,
-        str(document.pk),
-        document.get_public_filename(),
-        os.path.normpath(document.source_path),
-        os.path.normpath(document.thumbnail_path),
-        reverse("document-download", kwargs={"pk": document.pk}),
-        reverse("document-thumb", kwargs={"pk": document.pk}),
-        str(document.correspondent),
-        str(",".join(document.tags.all().values_list("name", flat=True)))
-    )).wait()
-
-
 @receiver(models.signals.post_delete, sender=Document)
 def cleanup_document_deletion(sender, instance, using, **kwargs):
     with FileLock(settings.MEDIA_LOCK):
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 90c034f9e..743c43846 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -466,3 +466,53 @@ class TestConsumer(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(dst))
         self.assertRaises(ConsumerError, self.consumer.try_consume_file, dst)
         self.assertTrue(os.path.isfile(dst))
+
+
+class PostConsumeTestCase(TestCase):
+
+    @mock.patch("documents.signals.handlers.Popen")
+    @override_settings(POST_CONSUME_SCRIPT=None)
+    def test_no_post_consume_script(self, m):
+        doc = Document.objects.create(title="Test", mime_type="application/pdf")
+        tag1 = Tag.objects.create(name="a")
+        tag2 = Tag.objects.create(name="b")
+        doc.tags.add(tag1)
+        doc.tags.add(tag2)
+
+        Consumer().run_post_consume_script(doc)
+
+        m.assert_not_called()
+
+    @mock.patch("documents.signals.handlers.Popen")
+    @override_settings(POST_CONSUME_SCRIPT="script")
+    def test_post_consume_script_simple(self, m):
+        doc = Document.objects.create(title="Test", mime_type="application/pdf")
+
+        Consumer().run_post_consume_script(doc)
+
+        m.assert_called_once()
+
+    @mock.patch("documents.signals.handlers.Popen")
+    @override_settings(POST_CONSUME_SCRIPT="script")
+    def test_post_consume_script_with_correspondent(self, m):
+        c = Correspondent.objects.create(name="my_bank")
+        doc = Document.objects.create(title="Test", mime_type="application/pdf", correspondent=c)
+        tag1 = Tag.objects.create(name="a")
+        tag2 = Tag.objects.create(name="b")
+        doc.tags.add(tag1)
+        doc.tags.add(tag2)
+
+        Consumer().run_post_consume_script(doc)
+
+        m.assert_called_once()
+
+        args, kwargs = m.call_args
+
+        command = args[0]
+
+        self.assertEqual(command[0], "script")
+        self.assertEqual(command[1], str(doc.pk))
+        self.assertEqual(command[5], f"/api/documents/{doc.pk}/download/")
+        self.assertEqual(command[6], f"/api/documents/{doc.pk}/thumb/")
+        self.assertEqual(command[7], "my_bank")
+        self.assertCountEqual(command[8].split(","), ["a", "b"])
diff --git a/src/documents/tests/test_post_consume_handlers.py b/src/documents/tests/test_post_consume_handlers.py
deleted file mode 100644
index b4357448c..000000000
--- a/src/documents/tests/test_post_consume_handlers.py
+++ /dev/null
@@ -1,56 +0,0 @@
-from unittest import mock
-
-from django.test import TestCase, override_settings
-
-from documents.models import Document, Tag, Correspondent
-from documents.signals.handlers import run_post_consume_script
-
-
-class PostConsumeTestCase(TestCase):
-
-    @mock.patch("documents.signals.handlers.Popen")
-    @override_settings(POST_CONSUME_SCRIPT=None)
-    def test_no_post_consume_script(self, m):
-        doc = Document.objects.create(title="Test", mime_type="application/pdf")
-        tag1 = Tag.objects.create(name="a")
-        tag2 = Tag.objects.create(name="b")
-        doc.tags.add(tag1)
-        doc.tags.add(tag2)
-
-        run_post_consume_script(None, doc)
-
-        m.assert_not_called()
-
-    @mock.patch("documents.signals.handlers.Popen")
-    @override_settings(POST_CONSUME_SCRIPT="script")
-    def test_post_consume_script_simple(self, m):
-        doc = Document.objects.create(title="Test", mime_type="application/pdf")
-
-        run_post_consume_script(None, doc)
-
-        m.assert_called_once()
-
-    @mock.patch("documents.signals.handlers.Popen")
-    @override_settings(POST_CONSUME_SCRIPT="script")
-    def test_post_consume_script_with_correspondent(self, m):
-        c = Correspondent.objects.create(name="my_bank")
-        doc = Document.objects.create(title="Test", mime_type="application/pdf", correspondent=c)
-        tag1 = Tag.objects.create(name="a")
-        tag2 = Tag.objects.create(name="b")
-        doc.tags.add(tag1)
-        doc.tags.add(tag2)
-
-        run_post_consume_script(None, doc)
-
-        m.assert_called_once()
-
-        args, kwargs = m.call_args
-
-        command = args[0]
-
-        self.assertEqual(command[0], "script")
-        self.assertEqual(command[1], str(doc.pk))
-        self.assertEqual(command[5], f"/api/documents/{doc.pk}/download/")
-        self.assertEqual(command[6], f"/api/documents/{doc.pk}/thumb/")
-        self.assertEqual(command[7], "my_bank")
-        self.assertCountEqual(command[8].split(","), ["a", "b"])

From a3b4349b1c9367c389bba4981531c5e709e1cecc Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 1 Jan 2021 14:50:25 -0800
Subject: [PATCH 0568/1300] Increase contrast of text, fix large card anchor
 color

Increased brightness of dark-mode primary + danger, use darker bg for tables, fix some button hover/active states
---
 src-ui/src/theme_dark.scss | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index 5f08583e8..88c2b8014 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -1,5 +1,5 @@
-$primary-dark-mode: #346e2c;
-$danger-dark-mode: #9c142a;
+$primary-dark-mode: #45973a;
+$danger-dark-mode: #b71631;
 $bg-dark-mode: #161618;
 $bg-light-dark-mode: #1c1c1f;
 $text-color-dark-mode: #abb2bf;
@@ -160,7 +160,8 @@ $border-color-dark-mode: #47494f;
     background-color: opacify($bg-dark-mode, .85);
   }
 
-  a {
+  a,
+  .card-title a {
     color: $primary-dark-mode;
 
     &:hover {
@@ -169,7 +170,7 @@ $border-color-dark-mode: #47494f;
   }
 
   table {
-    background-color: $bg-light-dark-mode;
+    background-color: $bg-dark-mode;
     color: $text-color-dark-mode;
     border-color: $border-color-dark-mode;
 
@@ -193,12 +194,14 @@ $border-color-dark-mode: #47494f;
     text-shadow: 0 1px 0 #666;
   }
 
-  .btn-outline-primary{
+  .btn-outline-primary {
     border-color: $primary-dark-mode;
     color: $primary-dark-mode;
 
-    &:hover {
+    &:not(:disabled):not(.disabled).active,
+    &:not(:disabled):not(.disabled):hover {
       background-color: darken($primary-dark-mode, 10%);
+      border-color: darken($primary-dark-mode, 10%);
       color: $text-color-dark-mode-accent;
     }
   }
@@ -207,7 +210,7 @@ $border-color-dark-mode: #47494f;
     border-color: $text-color-dark-mode;
     color: $text-color-dark-mode;
 
-    &:hover {
+    &:not(:disabled):not(.disabled):hover {
       background-color: $bg-dark-mode;
     }
   }
@@ -216,8 +219,9 @@ $border-color-dark-mode: #47494f;
     border-color: $danger-dark-mode;
     color: $danger-dark-mode;
 
-    &:hover {
+    &:not(:disabled):not(.disabled):hover {
       background-color: darken($danger-dark-mode, 10%);
+      border-color: darken($danger-dark-mode, 10%);
       color: $text-color-dark-mode-accent;
     }
   }
@@ -226,7 +230,7 @@ $border-color-dark-mode: #47494f;
     border-color: $border-color-dark-mode;
     color: $text-color-dark-mode;
 
-    &:hover {
+    &:not(:disabled):not(.disabled):hover {
       color: $text-color-dark-mode-accent;
     }
   }

From 70e49a61faa9b72af8623eab9183cbb64a5c949c Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 23:06:19 +0000
Subject: [PATCH 0569/1300] Translate /src-ui/messages.xlf in de_DE

translation completed for the source file '/src-ui/messages.xlf'
on the 'de_DE' language.
---
 src-ui/src/locale/messages.de_DE.xlf | 276 ++++++++++++++++++---------
 1 file changed, 190 insertions(+), 86 deletions(-)

diff --git a/src-ui/src/locale/messages.de_DE.xlf b/src-ui/src/locale/messages.de_DE.xlf
index 2b23832df..84548bf18 100644
--- a/src-ui/src/locale/messages.de_DE.xlf
+++ b/src-ui/src/locale/messages.de_DE.xlf
@@ -169,9 +169,9 @@
           <context context-type="linenumber">161</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5277522254327902345">
-        <source>Do you really want to delete document '<x equiv-text="this.document.title" id="PH"/>'?</source>
-        <target>Möchten Sie das Dokument '<x equiv-text="this.document.title" id="PH"/>' wirklich löschen?</target>
+      <trans-unit datatype="html" id="5382975254277698192">
+        <source>Do you really want to delete document &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</source>
+        <target>Möchten Sie das Dokument &quot;<x equiv-text="this.document.title" id="PH"/>&quot; wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
           <context context-type="linenumber">162</context>
@@ -430,7 +430,7 @@
         <target>Möchten Sie das Tag &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">28</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="70a67e04629f6d412db0a12d51820b480788d795">
@@ -459,6 +459,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="d0c4488f742efeba0915e90e285a022da813deff">
         <source>Matching</source>
+        <target>Zuweisung</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
           <context context-type="linenumber">15</context>
@@ -501,7 +502,7 @@
         <target>Möchten Sie den Dokumenttyp &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
-          <context context-type="linenumber">26</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8">
@@ -533,7 +534,7 @@
         <target>Ansicht <x equiv-text="savedView.name" id="PH"/> gelöscht.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">54</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -541,7 +542,7 @@
         <target>Einstellungen erfolgreich gespeichert.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">74</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -549,7 +550,7 @@
         <target>Fehler beim Speichern der Einstellungen auf dem Server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="11ebd254cc9294717105c5982eb0cd2af30a446d">
@@ -565,12 +566,12 @@
         <target>Gespeicherte Ansichten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="0d8ceb153aa715eb905da0710cc0b2ac73159abc">
-        <source>Document list</source>
-        <target>Dokumentliste</target>
+      <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
+        <source>Appearance</source>
+        <target>Erscheinungsbild</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">13</context>
@@ -584,12 +585,28 @@
           <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
+        <source>Dark mode</source>
+        <target>Dunkler Modus</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
+        <source>Use system settings</source>
+        <target>Benutze Systemeinstellungen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
         <source>Bulk editing</source>
         <target>Massenbearbeitung</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
@@ -597,7 +614,7 @@
         <target>Bestätigungsdialoge anzeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">48</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
@@ -605,7 +622,7 @@
         <target>Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">48</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
@@ -613,7 +630,7 @@
         <target>Anwenden beim Schließen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -621,7 +638,7 @@
         <target>Erscheint auf</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">68</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -629,7 +646,7 @@
         <target>Auf Startseite zeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -637,7 +654,7 @@
         <target>In Seitenleiste zeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">60</context>
+          <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -645,7 +662,7 @@
         <target>Keine gespeicherten Ansichten vorhanden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -661,7 +678,7 @@
         <target>Möchten Sie den Korrespondenten &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
-          <context context-type="linenumber">26</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c3f3334de899327bf3ec8999236e10798ff76e72">
@@ -722,13 +739,15 @@
       </trans-unit>
       <trans-unit datatype="html" id="3d5caa52b0a51bfd2757215f7614183554d740f0">
         <source>Matching algorithm</source>
+        <target>Zuweisungsalgorithmus</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
           <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="180092a6b8a6151a05f4a7552a2fb75fd159dfa8">
-        <source>Match</source>
+      <trans-unit datatype="html" id="eab7fc7cf2d663e54de934b779fce4275a303f0f">
+        <source>Matching pattern</source>
+        <target>Zuweisungsmuster</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
           <context context-type="linenumber">12</context>
@@ -883,29 +902,37 @@
         <target>Paperless-ng</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">4</context>
+          <context context-type="linenumber">11</context>
         </context-group>
         <note from="description" priority="1">app title</note>
       </trans-unit>
-      <trans-unit datatype="html" id="8d667444401ef6380fd262e4fe4795f261a427b1">
-        <source>Search for documents</source>
-        <target>Nach Dokumenten suchen</target>
+      <trans-unit datatype="html" id="069566c6ed4f051b5b5617ef1935837226585dad">
+        <source>Search documents</source>
+        <target>Dokumente suchen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="68949525c4d9a901e0cd15a94e3fc8d2711e9918">
-        <source>Manage</source>
-        <target>Verwalten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
         <source>Settings</source>
         <target>Einstellungen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">40</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb694b49d408265c91c62799c2b3a7e3151c824d">
+        <source>Logout</source>
+        <target>Abmelden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="68949525c4d9a901e0cd15a94e3fc8d2711e9918">
+        <source>Manage</source>
+        <target>Verwalten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
           <context context-type="linenumber">112</context>
@@ -916,7 +943,7 @@
         <target>Administration</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">119</context>
+          <context context-type="linenumber">147</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
@@ -924,7 +951,7 @@
         <target>Weiteres</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">153</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
@@ -932,7 +959,7 @@
         <target>Dokumentation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">132</context>
+          <context context-type="linenumber">160</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
@@ -940,15 +967,15 @@
         <target>GitHub</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">139</context>
+          <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="bb694b49d408265c91c62799c2b3a7e3151c824d">
-        <source>Logout</source>
-        <target>Abmelden</target>
+      <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
+        <source>Logged in as <x equiv-text="{{displayName}}" id="INTERPOLATION"/></source>
+        <target>Angemeldet als <x equiv-text="{{displayName}}" id="INTERPOLATION"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">146</context>
+          <context context-type="linenumber">34</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4f55b670f49d927c6026bb614c7c62b1f2a394c0">
@@ -956,7 +983,7 @@
         <target>Geöffnete Dokumente</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">57</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="dca5bf9344a759fa5a07f1b21f50286ec242ba44">
@@ -964,7 +991,7 @@
         <target>Alle schließen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5195932016807797291">
@@ -972,7 +999,15 @@
         <target>Korrespondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8170755470576301659">
+        <source>Without correspondent</source>
+        <target>Ohne Korrespondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">31</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8705701325879965907">
@@ -980,7 +1015,15 @@
         <target>Typ: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4362173610367509215">
+        <source>Without document type</source>
+        <target>Ohne Dokumenttyp</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8180755793012580465">
@@ -988,7 +1031,15 @@
         <target>Tag: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></target>
         <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">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6494566478302448576">
+        <source>Without any tag</source>
+        <target>Ohne Tag</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">46</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
@@ -1036,7 +1087,7 @@
         <target>Nicht zugewiesen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
-          <context context-type="linenumber">145</context>
+          <context context-type="linenumber">161</context>
         </context-group>
         <note from="description" priority="1">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
       </trans-unit>
@@ -1195,38 +1246,41 @@
           <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="8965789168028339624">
-        <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to all <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Diese Aktion wird das Tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; allen <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten hinzufügen.</target>
+      <trans-unit datatype="html" id="6619516195038467207">
+        <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten das Tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; hinzufügen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">118</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="4791265247184178563">
-        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> to all <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Diese Aktion wird die Tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> allen <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten hinzufügen.</target>
+      <trans-unit datatype="html" id="1894412783609570695">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten die Tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> hinzufügen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="7567916006270093567">
-        <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from all <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+      <trans-unit datatype="html" id="7181166515756808573">
+        <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird das Tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; von <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="247266594076352528">
-        <source>This operation will remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> from all <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+      <trans-unit datatype="html" id="3819792277998068944">
+        <source>This operation will remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird die Tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> von <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="4286636723521919383">
-        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> and remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> on all <x equiv-text="this.list.selected.size" id="PH_2"/> selected document(s).</source>
+      <trans-unit datatype="html" id="2739066218579571288">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> and remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> on <x equiv-text="this.list.selected.size" id="PH_2"/> selected document(s).</source>
+        <target>Diese Aktion wird die Tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> den <x equiv-text="this.list.selected.size" id="PH_2"/> ausgewählten Dokumenten hinzufügen und die Tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">127</context>
@@ -1240,15 +1294,17 @@
           <context context-type="linenumber">157</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="3171547143349510312">
-        <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to all <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+      <trans-unit datatype="html" id="6900893559485781849">
+        <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten den Korrespondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; zuweisen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">159</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5197985579238314950">
-        <source>This operation will remove the correspondent from all <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+      <trans-unit datatype="html" id="1257522660364398440">
+        <source>This operation will remove the correspondent from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Diese Aktion wird bei <x equiv-text="this.list.selected.size" id="PH"/> ausgewählten Dokumenten den Korrespondent entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">161</context>
@@ -1262,15 +1318,17 @@
           <context context-type="linenumber">190</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5346233369873832070">
-        <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to all <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+      <trans-unit datatype="html" id="332180123895325027">
+        <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten den Dokumenttyp &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; zuweisen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">192</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="6005206188202839923">
-        <source>This operation will remove the document type from all <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+      <trans-unit datatype="html" id="2236642492594872779">
+        <source>This operation will remove the document type from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Diese Aktion wird bei <x equiv-text="this.list.selected.size" id="PH"/> ausgewählten Dokumenten den Dokumenttyp entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">194</context>
@@ -1284,9 +1342,9 @@
           <context context-type="linenumber">219</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="3928393581343272038">
-        <source>This operation will permanently delete all <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
-        <target>Diese Aktion wird alle <x equiv-text="this.list.selected.size" id="PH"/> ausgewählte(n) Dokument(e) entgültig löschen.</target>
+      <trans-unit datatype="html" id="4303174930844518780">
+        <source>This operation will permanently delete <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH"/> ausgewählte Dokumente unwiderruflich löschen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">220</context>
@@ -1452,8 +1510,8 @@
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="80e9f19d307b1611c56aa0bdddc930d85418734c">
-        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and have they will be shown on the dashboard instead of this message.</source>
+      <trans-unit datatype="html" id="ea8d9a9486d5639d1c38c012900b8d34d5e4135d">
+        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message.</source>
         <target>Sie können Ihre Dokumente hochladen, indem Sie sie in die Hochladebox auf der rechten Seite ziehen oder in den konfigurierten Ablageordner kopieren/verschieben. Danach werden sie inder Dokumentliste erscheinen. Nachdem Sie den Dokumenten einige Metadaten zugewiesen haben, können Sie die Filtermechanismen zur Erstellung individueller Ansichten benutzen (zum Beispiel &quot;Kürzlich hinzugefügt&quot; oder &quot;Mit TODO markiert&quot;) und die Ansichten werden auf der Startseite erscheinen und diese Nachricht ersetzen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
@@ -1478,6 +1536,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="9dca488928c0b7af46c3866f86a6c2c8548399aa">
         <source>You can configure paperless to read your mails and add documents from attached files.</source>
+        <target>Sie können in Paperless Ihre E-Mail-Konten einrichten und Paperless wird automatisch Dokumente aus Dateianhängen erzeugen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
           <context context-type="linenumber">11</context>
@@ -1485,6 +1544,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="d282f6277cbf6704f697170d2ad19ce500790e20">
         <source>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</source>
+        <target>Die Dokumentation enthält mehr Informationen, wie diese Funktionen benutzt werden. Der Abschnitt zur allgemeinen Verwendung enthält zudem wertvolle Informationen zur generellen Verwendung von Paperless.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
           <context context-type="linenumber">13</context>
@@ -1770,22 +1830,49 @@
           <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="3184700926171002527">
-        <source>Any</source>
+      <trans-unit datatype="html" id="5851669019930456395">
+        <source>Any word</source>
+        <target>Irgendein Wort</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="1616102757855967475">
-        <source>All</source>
+      <trans-unit datatype="html" id="7517655726614958140">
+        <source>Any: Document contains any of these words (space separated)</source>
+        <target>Irgendein Wort: Dokument enthält eins der folgender Wörter</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="700315718208181326">
+        <source>All words</source>
+        <target>Alle Wörter</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="1968183742008490888">
-        <source>Literal</source>
+      <trans-unit datatype="html" id="111914402588955480">
+        <source>All: Document contains all of these words (space separated)</source>
+        <target>Alle: Dokument enthält alle folgenden Wörter</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9180173992399180575">
+        <source>Exact match</source>
+        <target>Exakte Übereinstimmung</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7109184332944610787">
+        <source>Exact: Document contains this string</source>
+        <target>Exakt: Dokument enthält die folgende Zeichenkette</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">14</context>
@@ -1799,16 +1886,33 @@
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="701356546322112069">
-        <source>Fuzzy match</source>
+      <trans-unit datatype="html" id="7548151332424148033">
+        <source>Regular expression: Document matches this regular expression</source>
+        <target>Regulärer Ausdruck: Dokument passt zum folgenden Audruck</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1856513373880048959">
+        <source>Fuzzy word</source>
+        <target>Ungenaues Wort</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="616064537937996961">
-        <source>Auto</source>
-        <target>Automatisch</target>
+      <trans-unit datatype="html" id="8419167206585286450">
+        <source>Fuzzy: Document contains a word similar to this word</source>
+        <target>Ungenau: Dokument enthält ein zum folgdendem Wort ähnliches Wort</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2147958104253035821">
+        <source>Auto: Learn matching automatically.</source>
+        <target>Auto: Zuweisung automatisch erlernen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">17</context>

From 52aa78acab3b26a3369fbc5079a552e2ebcd0804 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 00:10:22 +0100
Subject: [PATCH 0570/1300] fix some messages

---
 src-ui/messages.xlf                   | 4 ++--
 src-ui/src/app/data/matching-model.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 76c4a4fb9..a0c94de3e 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -1673,8 +1673,8 @@
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2147958104253035821" datatype="html">
-        <source>Auto: Learn matching automatically.</source>
+      <trans-unit id="2167862279705099846" datatype="html">
+        <source>Auto: Learn matching automatically</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">17</context>
diff --git a/src-ui/src/app/data/matching-model.ts b/src-ui/src/app/data/matching-model.ts
index 5d8695d6b..49cb5cad4 100644
--- a/src-ui/src/app/data/matching-model.ts
+++ b/src-ui/src/app/data/matching-model.ts
@@ -14,7 +14,7 @@ export const MATCHING_ALGORITHMS = [
     {id: MATCH_LITERAL, shortName: $localize`Exact match`, name: $localize`Exact: Document contains this string`},
     {id: MATCH_REGEX, shortName: $localize`Regular expression`, name: $localize`Regular expression: Document matches this regular expression`},
     {id: MATCH_FUZZY, shortName: $localize`Fuzzy word`, name: $localize`Fuzzy: Document contains a word similar to this word`},
-    {id: MATCH_AUTO, shortName: $localize`Automatic`, name: $localize`Auto: Learn matching automatically.`},
+    {id: MATCH_AUTO, shortName: $localize`Automatic`, name: $localize`Auto: Learn matching automatically`},
 ]
 
 export interface MatchingModel extends ObjectWithId {

From 70d48b39f375ea2892d37b43a32d8dae0fed8ccd Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 23:11:08 +0000
Subject: [PATCH 0571/1300] Translate /src-ui/messages.xlf in de_DE

translation completed for the source file '/src-ui/messages.xlf'
on the 'de_DE' language.
---
 src-ui/src/locale/messages.de_DE.xlf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/locale/messages.de_DE.xlf b/src-ui/src/locale/messages.de_DE.xlf
index 84548bf18..c0181da7b 100644
--- a/src-ui/src/locale/messages.de_DE.xlf
+++ b/src-ui/src/locale/messages.de_DE.xlf
@@ -1910,8 +1910,8 @@
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="2147958104253035821">
-        <source>Auto: Learn matching automatically.</source>
+      <trans-unit datatype="html" id="2167862279705099846">
+        <source>Auto: Learn matching automatically</source>
         <target>Auto: Zuweisung automatisch erlernen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>

From eaeda47690b4f910154fbae36a27b0253fc9007a Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 23:42:43 +0000
Subject: [PATCH 0572/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 1923 +++++++++++++++++++++++++++++
 1 file changed, 1923 insertions(+)
 create mode 100644 src-ui/src/locale/messages.de.xlf

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
new file mode 100644
index 000000000..9ad3b5dc7
--- /dev/null
+++ b/src-ui/src/locale/messages.de.xlf
@@ -0,0 +1,1923 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="plaintext" original="ng2.template" source-language="en-US" target-language="de">
+    <body>
+      <trans-unit datatype="html" id="4733307402565258070">
+        <source>Documents</source>
+        <target>Dokumente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2155249406916744630">
+        <source>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; saved successfully.</source>
+        <target>Ansicht &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; erfolgreich gespeichert.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6837554170707123455">
+        <source>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; created successfully.</source>
+        <target>Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; erfolgreich erstellt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
+        <source>Select</source>
+        <target>Auswählen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7e1f9a7054aff842832620c03dedae894787ba41">
+        <source>Select none</source>
+        <target>Nichts auswählen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9">
+        <source>Select page</source>
+        <target>Seite auswählen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74">
+        <source>Select all</source>
+        <target>Alles auswählen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ec97f67072a83aaa972536b18d83179f6e4bbec9">
+        <source>Sort by</source>
+        <target>Sortieren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b7641aed03492978b4ec6843b1e53f30464294d9">
+        <source>Views</source>
+        <target>Ansicht</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b69d81ff62cdc22b6bf88fe0b72dc1f66ccfa44f">
+        <source>Save as...</source>
+        <target>Speichern als...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="72e7d343f9165602cce1ca7faffbc565fd31ef92">
+        <source>Save &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
+        <target>&quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot; speichern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="546b2014cc578af06b6023a7f38fa77aa9d58f5d">
+        <source>{VAR_PLURAL, plural, =1 {document} other {documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Dokument} other {Dokumente}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3c298bb50741c8b2641889b0a0e0009769e66370">
+        <source>Selected <x equiv-text="{{list.selected.size}}" id="INTERPOLATION"/> of <x equiv-text="{{list.collectionSize || 0}}" id="INTERPOLATION_1"/> <x equiv-text="{list.collectionSize, plural, =1 {document} other {documents}}" id="ICU"/></source>
+        <target><x equiv-text="{{list.selected.size}}" id="INTERPOLATION"/> von <x equiv-text="{{list.collectionSize || 0}}" id="INTERPOLATION_1"/> <x equiv-text="{list.collectionSize, plural, =1 {document} other {documents}}" id="ICU"/> ausgewählt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8b04a8e375ac6760a54aabaf5df0287d53ce4a4a">
+        <source>{VAR_PLURAL, plural, =1 {1 document} other {<x id="INTERPOLATION"/> documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {1 Dokument} other {<x id="INTERPOLATION"/> Dokumente}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
+        <source>ASN</source>
+        <target>ASN</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">100</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
+        <source>Correspondent</source>
+        <target>Korrespondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">101</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
+        <source>Title</source>
+        <target>Titel</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">102</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
+        <source>Document type</source>
+        <target>Dokumenttyp</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
+        <source>Created</source>
+        <target>Erstellt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">104</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
+        <source>Added</source>
+        <target>Hinzugefügt</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9021887951960049161">
+        <source>Confirm delete</source>
+        <target>Löschen bestätigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5382975254277698192">
+        <source>Do you really want to delete document &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</source>
+        <target>Möchten Sie das Dokument &quot;<x equiv-text="this.document.title" id="PH"/>&quot; wirklich löschen?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">162</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6691075929777935948">
+        <source>The files for this document will be deleted permanently. This operation cannot be undone.</source>
+        <target>Die Dateien dieses Dokuments werden permanent gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">163</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="719892092227206532">
+        <source>Delete document</source>
+        <target>Dokument löschen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">165</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
+        <source>Delete</source>
+        <target>Löschen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dc75033a5238fdc4f462212c847a45ba8018a3fd">
+        <source>Download</source>
+        <target>Herunterladen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4ea3c236bca3528318e3b3a411a20909e5fa8be4">
+        <source>More like this</source>
+        <target>Ähnliche Dokumente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f4e529ae5ffd73001d1ff4bbdeeb0a72e342e5c8">
+        <source>Close</source>
+        <target>Schließen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4f8b2bb476981727ab34ed40fde1218361f92c45">
+        <source>Details</source>
+        <target>Details</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4ab4cb601522b9194922554d934c4c30bd93567d">
+        <source>Content</source>
+        <target>Inhalt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f721a500a68c357e8f2a01e60510f6a01e4ba529">
+        <source>Metadata</source>
+        <target>Metadaten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7">
+        <source>Discard</source>
+        <target>Verwerfen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="52c9a103b812f258bcddc3d90a6e3f46871d25fe">
+        <source>Save</source>
+        <target>Speichern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3">
+        <source>Page</source>
+        <target>Seite</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c972a8e7d09f86e0c408a80349990fb213b32c08">
+        <source>of <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></source>
+        <target>von <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a071e35fecc10753065b1cb5b38608be66da2c8b">
+        <source>Download original</source>
+        <target>Original herunterladen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9b3996b5ddcc628a999a7df72fbfc2a2eae8c8a5">
+        <source>Archive serial number</source>
+        <target>Archiv-Seriennummer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="30eebc2dd656dbcb259d8d5286d244ee397d63bd">
+        <source>Date created</source>
+        <target>Erstellt am</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
+        <source>Tags</source>
+        <target>Tags</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720">
+        <source>Date modified</source>
+        <target>Geändert am</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269">
+        <source>Date added</source>
+        <target>Hinzugefügt am</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3">
+        <source>Media filename</source>
+        <target>Media-Dateiname</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">99</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8">
+        <source>Original MD5 checksum</source>
+        <target>MD5-Prüfsumme Original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e92ca184ea785769fb26138fc25ee9fa06fff6e5">
+        <source>Original file size</source>
+        <target>Dateigröße Original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd">
+        <source>Original mime type</source>
+        <target>MIME-Typ Original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="edbf54e4117606b5dd87aaea3c14b21ebf398020">
+        <source>Archive MD5 checksum</source>
+        <target>MD5-Prüfsumme Archiv</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e6bf12eadecbfd80016eca15fa78651c6ca90c64">
+        <source>Archive file size</source>
+        <target>Dateigröße Archiv</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">119</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f">
+        <source>Original document metadata</source>
+        <target>Original-Metadaten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7174dcea4a3d0b743e7e4a78747e902230727f67">
+        <source>Archived document metadata</source>
+        <target>Metadaten des archivierten Dokuments</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">126</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3fb9f1a31c3798173b2fea72638732c783b152fe">
+        <source>Save &amp; next</source>
+        <target>Speichern &amp; weiter</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8765497970646365998">
+        <source>Hello <x equiv-text="this.displayName" id="PH"/>, welcome to Paperless-ng!</source>
+        <target>Hallo <x equiv-text="this.displayName" id="PH"/>, Willkommen zu Paperless-ng</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7016571167317583872">
+        <source>Welcome to Paperless-ng!</source>
+        <target>Willkommen zu Paperless-ng!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f65253954b66e929a8b4d5ecaf61f9129f8cec64">
+        <source>Dashboard</source>
+        <target>Startseite</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="93754014749412887">
+        <source>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Möchten Sie das Tag &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="70a67e04629f6d412db0a12d51820b480788d795">
+        <source>Create</source>
+        <target>Erstellen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cff1428d10d59d14e45edec3c735a27b5482db59">
+        <source>Name</source>
+        <target>Name</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
+        <source>Color</source>
+        <target>Farbe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d0c4488f742efeba0915e90e285a022da813deff">
+        <source>Matching</source>
+        <target>Zuweisung</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9bcf8d20d23c111eca1431abd2d2ce0de324499c">
+        <source>Document count</source>
+        <target>Anzahl Dokumente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="030b4423b92167200e39519599f9b863b4f7c62c">
+        <source>Actions</source>
+        <target>Aktionen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9d51b3c90afda70700229d1b8a55371c13cb3bce">
+        <source>Documents</source>
+        <target>Dokumente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
+        <source>Edit</source>
+        <target>Bearbeiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4990731724078522539">
+        <source>Do you really want to delete the document type &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Möchten Sie den Dokumenttyp &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8">
+        <source>Document types</source>
+        <target>Dokumenttypen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="eb3d5aefff38a814b76da74371cbf02c0789a1ef">
+        <source>Logs</source>
+        <target>Protokoll</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5ca707824ab93066c7d9b44e1b8bf216725c2c22">
+        <source>Filter</source>
+        <target>Filtern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1153806754022288374">
+        <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/> deleted.</source>
+        <target>Ansicht <x equiv-text="savedView.name" id="PH"/> gelöscht.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">54</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5647210819299459618">
+        <source>Settings saved successfully.</source>
+        <target>Einstellungen erfolgreich gespeichert.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">74</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8488620293789898901">
+        <source>Error while storing settings on server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Fehler beim Speichern der Einstellungen auf dem Server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="11ebd254cc9294717105c5982eb0cd2af30a446d">
+        <source>General settings</source>
+        <target>Allgemeine Einstellungen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="99dee94e92dbd9e21a008d4569f9719ed206ae37">
+        <source>Saved views</source>
+        <target>Gespeicherte Ansichten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
+        <source>Appearance</source>
+        <target>Erscheinungsbild</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
+        <source>Items per page</source>
+        <target>Dokumente pro Seite</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
+        <source>Dark mode</source>
+        <target>Dunkler Modus</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
+        <source>Use system settings</source>
+        <target>Benutze Systemeinstellungen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
+        <source>Bulk editing</source>
+        <target>Massenbearbeitung</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
+        <source>Show confirmation dialogs</source>
+        <target>Bestätigungsdialoge anzeigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
+        <source>Deleting documents will always ask for confirmation.</source>
+        <target>Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
+        <source>Apply on close</source>
+        <target>Anwenden beim Schließen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">49</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
+        <source>Appears on</source>
+        <target>Erscheint auf</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">68</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
+        <source>Show on dashboard</source>
+        <target>Auf Startseite zeigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
+        <source>Show in sidebar</source>
+        <target>In Seitenleiste zeigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
+        <source>No saved views defined.</source>
+        <target>Keine gespeicherten Ansichten vorhanden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
+        <source>404 Not Found</source>
+        <target>404 Nicht gefunden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/not-found/not-found.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7427874343955308724">
+        <source>Do you really want to delete the correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Möchten Sie den Korrespondenten &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c3f3334de899327bf3ec8999236e10798ff76e72">
+        <source>Correspondents</source>
+        <target>Korrespondenten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0488919cff4fcc2174d34e4a1167f1b3c586ca37">
+        <source>Last correspondence</source>
+        <target>Letzter Kontakt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1234709746630139322">
+        <source>Confirmation</source>
+        <target>Bestätigung</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9178182467454450952">
+        <source>Confirm</source>
+        <target>Bestätigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6457471243969293847">
+        <source>Create new correspondent</source>
+        <target>Neuen Korrespondenten erstellen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2059822531169388684">
+        <source>Edit correspondent</source>
+        <target>Korrespondenten bearbeiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3025930461519142465">
+        <source>Could not save correspondent: <x equiv-text="error" id="PH"/></source>
+        <target>Konnte Korrespondent nicht speichern: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3d5caa52b0a51bfd2757215f7614183554d740f0">
+        <source>Matching algorithm</source>
+        <target>Zuweisungsalgorithmus</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="eab7fc7cf2d663e54de934b779fce4275a303f0f">
+        <source>Matching pattern</source>
+        <target>Zuweisungsmuster</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a1923dd970db4f74b4417b80b4a14e250fd116ff">
+        <source>Auto matching does not require you to fill in this field.</source>
+        <target>Für Automatische Zuweisung muss dieses Feld nicht ausgefüllt werden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
+        <source>Case insensitive</source>
+        <target>Groß-/Kleinschreibung irrelevant</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="85e19678590a8b3ac1dff9d69c7a7610d1742e5a">
+        <source>Auto matching ignores this option.</source>
+        <target>Automatische Zuweisung beachtet diese Einstellung nicht.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
+        <source>Cancel</source>
+        <target>Abbrechen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9153094873118985366">
+        <source>Create new tag</source>
+        <target>Neues Tag erstellen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5872175735754226507">
+        <source>Edit tag</source>
+        <target>Tag bearbeiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2861521377141790537">
+        <source>Could not save tag: <x equiv-text="error" id="PH"/></source>
+        <target>Konnte Tag nicht speichern: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42">
+        <source>Inbox tag</source>
+        <target>Posteingangs-Tag</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5e2f1a4ea12a1b8606ee3f0548d0ba64bf266077">
+        <source>Inbox tags are automatically assigned to all consumed documents.</source>
+        <target>Ein Tag mit dieser Option wird automatisch allen neuen Dokumenten zugewiesen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6672809941092516947">
+        <source>Create new document type</source>
+        <target>Neuen Dokumenttyp erstellen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="36335016091244220">
+        <source>Edit document type</source>
+        <target>Dokumenttyp bearbeiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5647767513381010218">
+        <source>Could not save document type: <x equiv-text="error" id="PH"/></source>
+        <target>Konnte Dokumenttyp nicht speichern: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="49c9ede51100b454f7841b24cd02355c6622bf44">
+        <source>Search results</source>
+        <target>Suchergebnisse</target>
+        <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 datatype="html" id="31976d04f98e8a38098f66ac3a83ad33b576e5db">
+        <source>Invalid search query: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></source>
+        <target>Ungültige Suchanfrage: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></target>
+        <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 datatype="html" id="2abff6a01d9b342a5a14b7fb90309a95ce934f8e">
+        <source> Showing documents similar to <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></source>
+        <target>Zeige ähnliche Dokumente zu <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></target>
+        <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 datatype="html" id="6e0b0a1ea16f18f2fb1586c53d99d2f22e1aee2e">
+        <source>Search query: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></source>
+        <target>Suchanfrage: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></target>
+        <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 datatype="html" id="afa760e48c97d64d19c1455d18b7834a2256e23f">
+        <source>Did you mean &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</source>
+        <target>Meinten Sie &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</target>
+        <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 datatype="html" id="fe6ced3fcc803bba5a2e6c1a067b9ce62542500e">
+        <source>{VAR_PLURAL, plural, =0 {No results} =1 {One result} other {<x id="INTERPOLATION"/> results}}</source>
+        <target>{VAR_PLURAL, plural, =0 {Keine Ergebnisse} =1 {Ein Ergebnis} other {<x id="INTERPOLATION"/> Ergebnisse}}</target>
+        <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 datatype="html" id="41147374f427980a9f1a8cd5e3f4b1666e6f2418">
+        <source>Paperless-ng</source>
+        <target>Paperless-ng</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+        <note from="description" priority="1">app title</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="069566c6ed4f051b5b5617ef1935837226585dad">
+        <source>Search documents</source>
+        <target>Dokumente suchen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
+        <source>Settings</source>
+        <target>Einstellungen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">40</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb694b49d408265c91c62799c2b3a7e3151c824d">
+        <source>Logout</source>
+        <target>Abmelden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="68949525c4d9a901e0cd15a94e3fc8d2711e9918">
+        <source>Manage</source>
+        <target>Verwalten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="408cb6073e60c5d966296a3207fc596adca75e01">
+        <source>Admin</source>
+        <target>Administration</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">147</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
+        <source>Misc</source>
+        <target>Weiteres</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">153</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
+        <source>Documentation</source>
+        <target>Dokumentation</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">160</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
+        <source>GitHub</source>
+        <target>GitHub</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">167</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
+        <source>Logged in as <x equiv-text="{{displayName}}" id="INTERPOLATION"/></source>
+        <target>Angemeldet als <x equiv-text="{{displayName}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">34</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4f55b670f49d927c6026bb614c7c62b1f2a394c0">
+        <source>Open documents</source>
+        <target>Geöffnete Dokumente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">92</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dca5bf9344a759fa5a07f1b21f50286ec242ba44">
+        <source>Close all</source>
+        <target>Alle schließen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5195932016807797291">
+        <source>Correspondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></source>
+        <target>Korrespondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8170755470576301659">
+        <source>Without correspondent</source>
+        <target>Ohne Korrespondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8705701325879965907">
+        <source>Type: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></source>
+        <target>Typ: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4362173610367509215">
+        <source>Without document type</source>
+        <target>Ohne Dokumenttyp</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8180755793012580465">
+        <source>Tag: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></source>
+        <target>Tag: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6494566478302448576">
+        <source>Without any tag</source>
+        <target>Ohne Tag</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
+        <source>Filter by:</source>
+        <target>Filtern nach:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
+        <source>Filter tags</source>
+        <target>Tags filtern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4b089ca12c472cf0b46167bb5afe4b527b301bbc">
+        <source>Filter correspondents</source>
+        <target>Korrespondenten filtern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0ad509732aaf702b7ea8c771c7809fa84bc85908">
+        <source>Filter document types</source>
+        <target>Dokumenttypen filtern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2f33515a935c36763660e8420940b8a7e11fb1f4">
+        <source>Clear all filters</source>
+        <target>Filter zurücksetzen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">47</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7593728289020204896">
+        <source>Not assigned</source>
+        <target>Nicht zugewiesen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+        <note from="description" priority="1">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="c2d0ac9f528bbd5f53fd34269fde8b59e029621b">
+        <source>Apply</source>
+        <target>Anwenden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4873149362496451858">
+        <source>Last 7 days</source>
+        <target>Letzte 7 Tage</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4463380307954693363">
+        <source>Last month</source>
+        <target>Letzten Monat</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8697368973702409683">
+        <source>Last 3 months</source>
+        <target>Letzte 3 Monate</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3566342898065860218">
+        <source>Last year</source>
+        <target>Letztes Jahr</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="be2add3a3d9e4e2556b8f9048a15a9c0f00bf1ad">
+        <source>After</source>
+        <target>Nach</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8785188e6c678b842fcb93b7392faf86db7ec676">
+        <source>Before</source>
+        <target>Vor</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="99ee4faa69cd2ea8e3678c1f557c0ff1f05aae46">
+        <source>Clear</source>
+        <target>Zurücksetzen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6829218544e108e152f5fa72cb79c4ccb82e0d06">
+        <source>View</source>
+        <target>Anzeigen</target>
+        <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 datatype="html" id="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60">
+        <source>Score:</source>
+        <target>Relevanz:</target>
+        <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">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e">
+        <source>Created: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></source>
+        <target>Erstellt: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></target>
+        <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">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8">
+        <source>Filter by correspondent</source>
+        <target>Nach Korrespondent filtern</target>
+        <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">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bdb9a910523610254872e147222689e9a4115b84">
+        <source>Filter by tag</source>
+        <target>Nach Tag filtern</target>
+        <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">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2840db547019ce8c76b2cdbe3a1653c5b68b06af">
+        <source>View in browser</source>
+        <target>Im Browser anzeigen</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8639884465898458690">
+        <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
+        <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; und &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+        <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="7894972847287473517">
+        <source>&quot;<x equiv-text="i.name" id="PH"/>&quot;</source>
+        <target>&quot;<x equiv-text="i.name" id="PH"/>&quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="760986369763309193">
+        <source>, </source>
+        <target>, </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
+        <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="1822679894391095557">
+        <source><x equiv-text="list" id="PH"/> and &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</source>
+        <target><x equiv-text="list" id="PH"/> und &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+        <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="4137232459980262849">
+        <source>Confirm tags assignment</source>
+        <target>Tag-Zuweisung bestätigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6619516195038467207">
+        <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten das Tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; hinzufügen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1894412783609570695">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten die Tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> hinzufügen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">120</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7181166515756808573">
+        <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird das Tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; von <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten entfernen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3819792277998068944">
+        <source>This operation will remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird die Tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> von <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten entfernen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2739066218579571288">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> and remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> on <x equiv-text="this.list.selected.size" id="PH_2"/> selected document(s).</source>
+        <target>Diese Aktion wird die Tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> den <x equiv-text="this.list.selected.size" id="PH_2"/> ausgewählten Dokumenten hinzufügen und die Tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> entfernen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">127</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2996713129519325161">
+        <source>Confirm correspondent assignment</source>
+        <target>Korrespondent-Zuweisung bestätigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">157</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6900893559485781849">
+        <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten den Korrespondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; zuweisen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">159</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1257522660364398440">
+        <source>This operation will remove the correspondent from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Diese Aktion wird bei <x equiv-text="this.list.selected.size" id="PH"/> ausgewählten Dokumenten den Korrespondent entfernen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5393409374423140648">
+        <source>Confirm document type assignment</source>
+        <target>Dokumenttyp-Zuweisung bestätigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">190</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="332180123895325027">
+        <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten den Dokumenttyp &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; zuweisen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">192</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2236642492594872779">
+        <source>This operation will remove the document type from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Diese Aktion wird bei <x equiv-text="this.list.selected.size" id="PH"/> ausgewählten Dokumenten den Dokumenttyp entfernen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">194</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="749430623564850405">
+        <source>Delete confirm</source>
+        <target>Löschen bestätigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">219</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4303174930844518780">
+        <source>This operation will permanently delete <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH"/> ausgewählte Dokumente unwiderruflich löschen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">220</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5641451190833696892">
+        <source>This operation cannot be undone.</source>
+        <target>Diese Aktion kann nicht rückgängig gemacht werden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">221</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6734339521247847366">
+        <source>Delete document(s)</source>
+        <target>Dokument(e) löschen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">223</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
+        <source>Select:</source>
+        <target>Auswählen:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dfc3c34e182ea73c5d784ff7c8135f087992dac1">
+        <source>All</source>
+        <target>Alle</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="907df6a2b68daecc3c399cf40a764b358bd9fd84">
+        <source>Edit:</source>
+        <target>Bearbeiten:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">
+        <source>Save current view</source>
+        <target>Aktuelle Ansicht speichern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4eb84de23219c85432e38fb4fbdeb6c0f103ff8b">
+        <source>Show all</source>
+        <target>Alle anzeigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="61e0f26d843eec0b33ff475e111b0c2f7a80b835">
+        <source>Statistics</source>
+        <target>Statistiken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="46c8fe557cf52c9389783627d4f85453f4ddb459">
+        <source>Documents in inbox: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></source>
+        <target>Dokumente im Posteingang: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438">
+        <source>Total documents: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></source>
+        <target>Anzahl Dokumente gesamt: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8705589528094706681">
+        <source>The document has been uploaded and will be processed by the consumer shortly.</source>
+        <target>Das Dokument wurde hochgeladen und wird in Kürze durch Paperless-ng verarbeitet.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4956689020592747108">
+        <source>There was an error while uploading the document: <x equiv-text="error.error.document" id="PH"/></source>
+        <target>Konnte Dokument nicht hochladen: <x equiv-text="error.error.document" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7554858521017940575">
+        <source>An error has occurred while uploading the document. Sorry!</source>
+        <target>Beim Hochladen trat ein Fehler auf. Entschuldigung!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
+        <source>Upload new documents</source>
+        <target>Neue Dokumente hochladen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="52d5d56b6667ba3f7c759cbc0d4c39d34a99701e">
+        <source>Drop documents here or</source>
+        <target>Dokumente hier ablegen oder</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="865c511f4a24558ed0e954f9bbbff557bbb8954d">
+        <source>Browse files</source>
+        <target>Datei auswählen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a7b50b2df68e875a918d1f4f98f358d756139c13">
+        <source>{VAR_PLURAL, plural, =1 {file} =other {<x id="INTERPOLATION"/> files}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Datei} =other {<x id="INTERPOLATION"/> Dateien}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ec37c68a90632530f5cc8b7e5245cab89ef8bf82">
+        <source>Uploading <x equiv-text="{uploadStatus.length, plural, =1 {file} =other {{{uploadStatus.length}} files}}" id="ICU"/>...</source>
+        <target>Lade <x equiv-text="{uploadStatus.length, plural, =1 {file} =other {{{uploadStatus.length}} files}}" id="ICU"/> hoch...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="45854ddec74086b271e62be6a363f4fa5036f7fc">
+        <source>First steps</source>
+        <target>Erste Schritte</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a0dc8218a6fcc5d11a4723ed127bd6be9d6d3ef3">
+        <source>Paperless is running! :)</source>
+        <target>Paperless ist startbereit! :)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ea8d9a9486d5639d1c38c012900b8d34d5e4135d">
+        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message.</source>
+        <target>Sie können Ihre Dokumente hochladen, indem Sie sie in die Hochladebox auf der rechten Seite ziehen oder in den konfigurierten Ablageordner kopieren/verschieben. Danach werden sie inder Dokumentliste erscheinen. Nachdem Sie den Dokumenten einige Metadaten zugewiesen haben, können Sie die Filtermechanismen zur Erstellung individueller Ansichten benutzen (zum Beispiel &quot;Kürzlich hinzugefügt&quot; oder &quot;Mit TODO markiert&quot;) und die Ansichten werden auf der Startseite erscheinen und diese Nachricht ersetzen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">6,7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cf5f85690feaba6e29343f9881e57a6c0ea6e82b">
+        <source>Paperless offers some more features that try to make your life easier:</source>
+        <target>Paperless bietet darüber hinaus einige erweiterte Funktionen:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="edb41dc36af2e70789d8e3422325d930e783253e">
+        <source>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</source>
+        <target>Nachdem Sie einige Dokumente hochgeladen und mit Metadatebn haben, kann Paperless diese Metadaten automatisch passenden neuen Dokumenten zuweisen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9dca488928c0b7af46c3866f86a6c2c8548399aa">
+        <source>You can configure paperless to read your mails and add documents from attached files.</source>
+        <target>Sie können in Paperless Ihre E-Mail-Konten einrichten und Paperless wird automatisch Dokumente aus Dateianhängen erzeugen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d282f6277cbf6704f697170d2ad19ce500790e20">
+        <source>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</source>
+        <target>Die Dokumentation enthält mehr Informationen, wie diese Funktionen benutzt werden. Der Abschnitt zur allgemeinen Verwendung enthält zudem wertvolle Informationen zur generellen Verwendung von Paperless.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="218403386307979629">
+        <source>Metadata</source>
+        <target>Metadaten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3797570084942068182">
+        <source>Select</source>
+        <target>Auswählen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7103181924469214926">
+        <source>Please select an object</source>
+        <target>Bitte wählen Sie ein Element aus</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2807800733729323332">
+        <source>Yes</source>
+        <target>Ja</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3542042671420335679">
+        <source>No</source>
+        <target>Nein</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7536524521722799066">
+        <source>(no title)</source>
+        <target>(kein Titel)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/document-title.pipe.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1519954996184640001">
+        <source>Error</source>
+        <target>Fehler</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5037437391296624618">
+        <source>Information</source>
+        <target>Information</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2691296884221415710">
+        <source>Correspondent</source>
+        <target>Korrespondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5066119607229701477">
+        <source>Document type</source>
+        <target>Dokumenttyp</target>
+        <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 datatype="html" id="5701618810648052610">
+        <source>Title</source>
+        <target>Titel</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7517688192215738656">
+        <source>ASN</source>
+        <target>ASN</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4207916966377787111">
+        <source>Created</source>
+        <target>Erstellt am</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="231679111972850796">
+        <source>Added</source>
+        <target>Hinzugefügt am</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3553216189604488439">
+        <source>Modified</source>
+        <target>Geändert am</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2056433880533904076">
+        <source>Light blue</source>
+        <target>Hellblau</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4082253113407591781">
+        <source>Blue</source>
+        <target>Blau</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1143414876575720034">
+        <source>Light green</source>
+        <target>Hellgrün</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="119581980963263815">
+        <source>Green</source>
+        <target>Grün</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3250646524116252719">
+        <source>Light red</source>
+        <target>Hellrot</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1628552745302385832">
+        <source>Red </source>
+        <target>Rot</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5479028842846122610">
+        <source>Light orange</source>
+        <target>Hellorange</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8598918991528773310">
+        <source>Orange</source>
+        <target>Orange</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1789283185177957430">
+        <source>Light violet</source>
+        <target>Hellviolet</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2682868487071320453">
+        <source>Violet</source>
+        <target>Violet</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1449010446077321264">
+        <source>Brown</source>
+        <target>Braun</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="30300572504753589">
+        <source>Black</source>
+        <target>Schwarz</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="461048771215121187">
+        <source>Light grey</source>
+        <target>Hellgrau</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4561076822163447092">
+        <source>Create new item</source>
+        <target>Neues Element erstellen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5324147361912094446">
+        <source>Edit item</source>
+        <target>Element bearbeiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1699589597032579396">
+        <source>Could not save element: <x equiv-text="error" id="PH"/></source>
+        <target>Konnte Element nicht speichern: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="810888510148304696">
+        <source>Automatic</source>
+        <target>Automatisch</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5044611416737085530">
+        <source>Do you really want to delete this element?</source>
+        <target>Möchten Sie dieses Element wirklich löschen?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8371896857609524947">
+        <source>Associated documents will not be deleted.</source>
+        <target>Assoziierte Dokumente werden nicht gelöscht.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7022070615528435141">
+        <source>Delete</source>
+        <target>Löschen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">97</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5851669019930456395">
+        <source>Any word</source>
+        <target>Irgendein Wort</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7517655726614958140">
+        <source>Any: Document contains any of these words (space separated)</source>
+        <target>Irgendein Wort: Dokument enthält eins der folgender Wörter</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="700315718208181326">
+        <source>All words</source>
+        <target>Alle Wörter</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="111914402588955480">
+        <source>All: Document contains all of these words (space separated)</source>
+        <target>Alle: Dokument enthält alle folgenden Wörter</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9180173992399180575">
+        <source>Exact match</source>
+        <target>Exakte Übereinstimmung</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7109184332944610787">
+        <source>Exact: Document contains this string</source>
+        <target>Exakt: Dokument enthält die folgende Zeichenkette</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1338733395833138319">
+        <source>Regular expression</source>
+        <target>Regulärer Ausdruck</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7548151332424148033">
+        <source>Regular expression: Document matches this regular expression</source>
+        <target>Regulärer Ausdruck: Dokument passt zum folgenden Audruck</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1856513373880048959">
+        <source>Fuzzy word</source>
+        <target>Ungenaues Wort</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8419167206585286450">
+        <source>Fuzzy: Document contains a word similar to this word</source>
+        <target>Ungenau: Dokument enthält ein zum folgdendem Wort ähnliches Wort</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2167862279705099846">
+        <source>Auto: Learn matching automatically</source>
+        <target>Auto: Zuweisung automatisch erlernen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file

From 110ef17ed8975d856d6b105e745ea6740c68641f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 00:44:14 +0100
Subject: [PATCH 0573/1300] fix angular language mapping

---
 src-ui/angular.json                  |    2 +-
 src-ui/src/locale/messages.de_DE.xlf | 1923 --------------------------
 2 files changed, 1 insertion(+), 1924 deletions(-)
 delete mode 100644 src-ui/src/locale/messages.de_DE.xlf

diff --git a/src-ui/angular.json b/src-ui/angular.json
index 3c2dfcc38..0e35c9d59 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -16,7 +16,7 @@
 			"i18n": {
 				"sourceLocale": "en-US",
 				"locales": {
-					"de": "src/locale/messages.de-DE.xlf"
+					"de": "src/locale/messages.de.xlf"
 				}
 			},
 			"architect": {
diff --git a/src-ui/src/locale/messages.de_DE.xlf b/src-ui/src/locale/messages.de_DE.xlf
deleted file mode 100644
index 84548bf18..000000000
--- a/src-ui/src/locale/messages.de_DE.xlf
+++ /dev/null
@@ -1,1923 +0,0 @@
-<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-  <file datatype="plaintext" original="ng2.template" source-language="en-US" target-language="de-DE">
-    <body>
-      <trans-unit datatype="html" id="4733307402565258070">
-        <source>Documents</source>
-        <target>Dokumente</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">38</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2155249406916744630">
-        <source>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; saved successfully.</source>
-        <target>Ansicht &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; erfolgreich gespeichert.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">84</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="6837554170707123455">
-        <source>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; created successfully.</source>
-        <target>Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; erfolgreich erstellt.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">103</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
-        <source>Select</source>
-        <target>Auswählen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7e1f9a7054aff842832620c03dedae894787ba41">
-        <source>Select none</source>
-        <target>Nichts auswählen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9">
-        <source>Select page</source>
-        <target>Seite auswählen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74">
-        <source>Select all</source>
-        <target>Alles auswählen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="ec97f67072a83aaa972536b18d83179f6e4bbec9">
-        <source>Sort by</source>
-        <target>Sortieren</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">41</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="b7641aed03492978b4ec6843b1e53f30464294d9">
-        <source>Views</source>
-        <target>Ansicht</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">64</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="b69d81ff62cdc22b6bf88fe0b72dc1f66ccfa44f">
-        <source>Save as...</source>
-        <target>Speichern als...</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">72</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="72e7d343f9165602cce1ca7faffbc565fd31ef92">
-        <source>Save &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
-        <target>&quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot; speichern</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">71</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="546b2014cc578af06b6023a7f38fa77aa9d58f5d">
-        <source>{VAR_PLURAL, plural, =1 {document} other {documents}}</source>
-        <target>{VAR_PLURAL, plural, =1 {Dokument} other {Dokumente}}</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">86</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3c298bb50741c8b2641889b0a0e0009769e66370">
-        <source>Selected <x equiv-text="{{list.selected.size}}" id="INTERPOLATION"/> of <x equiv-text="{{list.collectionSize || 0}}" id="INTERPOLATION_1"/> <x equiv-text="{list.collectionSize, plural, =1 {document} other {documents}}" id="ICU"/></source>
-        <target><x equiv-text="{{list.selected.size}}" id="INTERPOLATION"/> von <x equiv-text="{{list.collectionSize || 0}}" id="INTERPOLATION_1"/> <x equiv-text="{list.collectionSize, plural, =1 {document} other {documents}}" id="ICU"/> ausgewählt</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">86</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8b04a8e375ac6760a54aabaf5df0287d53ce4a4a">
-        <source>{VAR_PLURAL, plural, =1 {1 document} other {<x id="INTERPOLATION"/> documents}}</source>
-        <target>{VAR_PLURAL, plural, =1 {1 Dokument} other {<x id="INTERPOLATION"/> Dokumente}}</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">87</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
-        <source>ASN</source>
-        <target>ASN</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">100</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
-        <source>Correspondent</source>
-        <target>Korrespondent</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">101</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
-        <source>Title</source>
-        <target>Titel</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">102</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
-        <source>Document type</source>
-        <target>Dokumenttyp</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">103</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
-        <source>Created</source>
-        <target>Erstellt</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">104</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
-        <source>Added</source>
-        <target>Hinzugefügt</target>
-        <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-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="9021887951960049161">
-        <source>Confirm delete</source>
-        <target>Löschen bestätigen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">161</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5382975254277698192">
-        <source>Do you really want to delete document &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</source>
-        <target>Möchten Sie das Dokument &quot;<x equiv-text="this.document.title" id="PH"/>&quot; wirklich löschen?</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">162</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="6691075929777935948">
-        <source>The files for this document will be deleted permanently. This operation cannot be undone.</source>
-        <target>Die Dateien dieses Dokuments werden permanent gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">163</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="719892092227206532">
-        <source>Delete document</source>
-        <target>Dokument löschen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">165</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
-        <source>Delete</source>
-        <target>Löschen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="dc75033a5238fdc4f462212c847a45ba8018a3fd">
-        <source>Download</source>
-        <target>Herunterladen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">23</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4ea3c236bca3528318e3b3a411a20909e5fa8be4">
-        <source>More like this</source>
-        <target>Ähnliche Dokumente</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">38</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="f4e529ae5ffd73001d1ff4bbdeeb0a72e342e5c8">
-        <source>Close</source>
-        <target>Schließen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">44</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4f8b2bb476981727ab34ed40fde1218361f92c45">
-        <source>Details</source>
-        <target>Details</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">56</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4ab4cb601522b9194922554d934c4c30bd93567d">
-        <source>Content</source>
-        <target>Inhalt</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">76</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="f721a500a68c357e8f2a01e60510f6a01e4ba529">
-        <source>Metadata</source>
-        <target>Metadaten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">85</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7">
-        <source>Discard</source>
-        <target>Verwerfen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">134</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="52c9a103b812f258bcddc3d90a6e3f46871d25fe">
-        <source>Save</source>
-        <target>Speichern</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">136</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3">
-        <source>Page</source>
-        <target>Seite</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c972a8e7d09f86e0c408a80349990fb213b32c08">
-        <source>of <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></source>
-        <target>von <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">8</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="a071e35fecc10753065b1cb5b38608be66da2c8b">
-        <source>Download original</source>
-        <target>Original herunterladen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="9b3996b5ddcc628a999a7df72fbfc2a2eae8c8a5">
-        <source>Archive serial number</source>
-        <target>Archiv-Seriennummer</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">61</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="30eebc2dd656dbcb259d8d5286d244ee397d63bd">
-        <source>Date created</source>
-        <target>Erstellt am</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">65</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
-        <source>Tags</source>
-        <target>Tags</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">70</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720">
-        <source>Date modified</source>
-        <target>Geändert am</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">91</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269">
-        <source>Date added</source>
-        <target>Hinzugefügt am</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">95</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3">
-        <source>Media filename</source>
-        <target>Media-Dateiname</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">99</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8">
-        <source>Original MD5 checksum</source>
-        <target>MD5-Prüfsumme Original</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">103</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="e92ca184ea785769fb26138fc25ee9fa06fff6e5">
-        <source>Original file size</source>
-        <target>Dateigröße Original</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">107</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd">
-        <source>Original mime type</source>
-        <target>MIME-Typ Original</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">111</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="edbf54e4117606b5dd87aaea3c14b21ebf398020">
-        <source>Archive MD5 checksum</source>
-        <target>MD5-Prüfsumme Archiv</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">115</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="e6bf12eadecbfd80016eca15fa78651c6ca90c64">
-        <source>Archive file size</source>
-        <target>Dateigröße Archiv</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">119</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f">
-        <source>Original document metadata</source>
-        <target>Original-Metadaten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">125</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7174dcea4a3d0b743e7e4a78747e902230727f67">
-        <source>Archived document metadata</source>
-        <target>Metadaten des archivierten Dokuments</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">126</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3fb9f1a31c3798173b2fea72638732c783b152fe">
-        <source>Save &amp; next</source>
-        <target>Speichern &amp; weiter</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">135</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8765497970646365998">
-        <source>Hello <x equiv-text="this.displayName" id="PH"/>, welcome to Paperless-ng!</source>
-        <target>Hallo <x equiv-text="this.displayName" id="PH"/>, Willkommen zu Paperless-ng</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
-          <context context-type="linenumber">33</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7016571167317583872">
-        <source>Welcome to Paperless-ng!</source>
-        <target>Willkommen zu Paperless-ng!</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
-          <context context-type="linenumber">35</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="f65253954b66e929a8b4d5ecaf61f9129f8cec64">
-        <source>Dashboard</source>
-        <target>Startseite</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="93754014749412887">
-        <source>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Möchten Sie das Tag &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
-          <context context-type="linenumber">28</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="70a67e04629f6d412db0a12d51820b480788d795">
-        <source>Create</source>
-        <target>Erstellen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">2</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="cff1428d10d59d14e45edec3c735a27b5482db59">
-        <source>Name</source>
-        <target>Name</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
-        <source>Color</source>
-        <target>Farbe</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">14</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="d0c4488f742efeba0915e90e285a022da813deff">
-        <source>Matching</source>
-        <target>Zuweisung</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="9bcf8d20d23c111eca1431abd2d2ce0de324499c">
-        <source>Document count</source>
-        <target>Anzahl Dokumente</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="030b4423b92167200e39519599f9b863b4f7c62c">
-        <source>Actions</source>
-        <target>Aktionen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">17</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="9d51b3c90afda70700229d1b8a55371c13cb3bce">
-        <source>Documents</source>
-        <target>Dokumente</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">32</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
-        <source>Edit</source>
-        <target>Bearbeiten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">37</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4990731724078522539">
-        <source>Do you really want to delete the document type &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Möchten Sie den Dokumenttyp &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
-          <context context-type="linenumber">24</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8">
-        <source>Document types</source>
-        <target>Dokumenttypen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.html</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="eb3d5aefff38a814b76da74371cbf02c0789a1ef">
-        <source>Logs</source>
-        <target>Protokoll</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5ca707824ab93066c7d9b44e1b8bf216725c2c22">
-        <source>Filter</source>
-        <target>Filtern</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1153806754022288374">
-        <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/> deleted.</source>
-        <target>Ansicht <x equiv-text="savedView.name" id="PH"/> gelöscht.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">54</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5647210819299459618">
-        <source>Settings saved successfully.</source>
-        <target>Einstellungen erfolgreich gespeichert.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">74</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8488620293789898901">
-        <source>Error while storing settings on server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
-        <target>Fehler beim Speichern der Einstellungen auf dem Server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">86</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="11ebd254cc9294717105c5982eb0cd2af30a446d">
-        <source>General settings</source>
-        <target>Allgemeine Einstellungen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">10</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="99dee94e92dbd9e21a008d4569f9719ed206ae37">
-        <source>Saved views</source>
-        <target>Gespeicherte Ansichten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">56</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
-        <source>Appearance</source>
-        <target>Erscheinungsbild</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
-        <source>Items per page</source>
-        <target>Dokumente pro Seite</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">17</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
-        <source>Dark mode</source>
-        <target>Dunkler Modus</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">33</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
-        <source>Use system settings</source>
-        <target>Benutze Systemeinstellungen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">36</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
-        <source>Bulk editing</source>
-        <target>Massenbearbeitung</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">44</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
-        <source>Show confirmation dialogs</source>
-        <target>Bestätigungsdialoge anzeigen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
-        <source>Deleting documents will always ask for confirmation.</source>
-        <target>Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
-        <source>Apply on close</source>
-        <target>Anwenden beim Schließen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">49</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
-        <source>Appears on</source>
-        <target>Erscheint auf</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">68</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
-        <source>Show on dashboard</source>
-        <target>Auf Startseite zeigen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">71</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
-        <source>Show in sidebar</source>
-        <target>In Seitenleiste zeigen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">75</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
-        <source>No saved views defined.</source>
-        <target>Keine gespeicherten Ansichten vorhanden.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">85</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
-        <source>404 Not Found</source>
-        <target>404 Nicht gefunden</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/not-found/not-found.component.html</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7427874343955308724">
-        <source>Do you really want to delete the correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Möchten Sie den Korrespondenten &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
-          <context context-type="linenumber">24</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c3f3334de899327bf3ec8999236e10798ff76e72">
-        <source>Correspondents</source>
-        <target>Korrespondenten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="0488919cff4fcc2174d34e4a1167f1b3c586ca37">
-        <source>Last correspondence</source>
-        <target>Letzter Kontakt</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1234709746630139322">
-        <source>Confirmation</source>
-        <target>Bestätigung</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
-          <context context-type="linenumber">17</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="9178182467454450952">
-        <source>Confirm</source>
-        <target>Bestätigen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="6457471243969293847">
-        <source>Create new correspondent</source>
-        <target>Neuen Korrespondenten erstellen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
-          <context context-type="linenumber">21</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2059822531169388684">
-        <source>Edit correspondent</source>
-        <target>Korrespondenten bearbeiten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
-          <context context-type="linenumber">25</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3025930461519142465">
-        <source>Could not save correspondent: <x equiv-text="error" id="PH"/></source>
-        <target>Konnte Korrespondent nicht speichern: <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3d5caa52b0a51bfd2757215f7614183554d740f0">
-        <source>Matching algorithm</source>
-        <target>Zuweisungsalgorithmus</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="eab7fc7cf2d663e54de934b779fce4275a303f0f">
-        <source>Matching pattern</source>
-        <target>Zuweisungsmuster</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="a1923dd970db4f74b4417b80b4a14e250fd116ff">
-        <source>Auto matching does not require you to fill in this field.</source>
-        <target>Für Automatische Zuweisung muss dieses Feld nicht ausgefüllt werden.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
-        <source>Case insensitive</source>
-        <target>Groß-/Kleinschreibung irrelevant</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="85e19678590a8b3ac1dff9d69c7a7610d1742e5a">
-        <source>Auto matching ignores this option.</source>
-        <target>Automatische Zuweisung beachtet diese Einstellung nicht.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
-        <source>Cancel</source>
-        <target>Abbrechen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="9153094873118985366">
-        <source>Create new tag</source>
-        <target>Neues Tag erstellen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
-          <context context-type="linenumber">21</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5872175735754226507">
-        <source>Edit tag</source>
-        <target>Tag bearbeiten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
-          <context context-type="linenumber">25</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2861521377141790537">
-        <source>Could not save tag: <x equiv-text="error" id="PH"/></source>
-        <target>Konnte Tag nicht speichern: <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42">
-        <source>Inbox tag</source>
-        <target>Posteingangs-Tag</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
-          <context context-type="linenumber">21</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5e2f1a4ea12a1b8606ee3f0548d0ba64bf266077">
-        <source>Inbox tags are automatically assigned to all consumed documents.</source>
-        <target>Ein Tag mit dieser Option wird automatisch allen neuen Dokumenten zugewiesen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
-          <context context-type="linenumber">21</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="6672809941092516947">
-        <source>Create new document type</source>
-        <target>Neuen Dokumenttyp erstellen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
-          <context context-type="linenumber">21</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="36335016091244220">
-        <source>Edit document type</source>
-        <target>Dokumenttyp bearbeiten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
-          <context context-type="linenumber">25</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5647767513381010218">
-        <source>Could not save document type: <x equiv-text="error" id="PH"/></source>
-        <target>Konnte Dokumenttyp nicht speichern: <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="49c9ede51100b454f7841b24cd02355c6622bf44">
-        <source>Search results</source>
-        <target>Suchergebnisse</target>
-        <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 datatype="html" id="31976d04f98e8a38098f66ac3a83ad33b576e5db">
-        <source>Invalid search query: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></source>
-        <target>Ungültige Suchanfrage: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></target>
-        <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 datatype="html" id="2abff6a01d9b342a5a14b7fb90309a95ce934f8e">
-        <source> Showing documents similar to <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></source>
-        <target>Zeige ähnliche Dokumente zu <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></target>
-        <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 datatype="html" id="6e0b0a1ea16f18f2fb1586c53d99d2f22e1aee2e">
-        <source>Search query: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></source>
-        <target>Suchanfrage: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></target>
-        <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 datatype="html" id="afa760e48c97d64d19c1455d18b7834a2256e23f">
-        <source>Did you mean &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</source>
-        <target>Meinten Sie &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</target>
-        <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 datatype="html" id="fe6ced3fcc803bba5a2e6c1a067b9ce62542500e">
-        <source>{VAR_PLURAL, plural, =0 {No results} =1 {One result} other {<x id="INTERPOLATION"/> results}}</source>
-        <target>{VAR_PLURAL, plural, =0 {Keine Ergebnisse} =1 {Ein Ergebnis} other {<x id="INTERPOLATION"/> Ergebnisse}}</target>
-        <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 datatype="html" id="41147374f427980a9f1a8cd5e3f4b1666e6f2418">
-        <source>Paperless-ng</source>
-        <target>Paperless-ng</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-        <note from="description" priority="1">app title</note>
-      </trans-unit>
-      <trans-unit datatype="html" id="069566c6ed4f051b5b5617ef1935837226585dad">
-        <source>Search documents</source>
-        <target>Dokumente suchen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
-        <source>Settings</source>
-        <target>Einstellungen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">40</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="bb694b49d408265c91c62799c2b3a7e3151c824d">
-        <source>Logout</source>
-        <target>Abmelden</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">45</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="68949525c4d9a901e0cd15a94e3fc8d2711e9918">
-        <source>Manage</source>
-        <target>Verwalten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">112</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="408cb6073e60c5d966296a3207fc596adca75e01">
-        <source>Admin</source>
-        <target>Administration</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">147</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
-        <source>Misc</source>
-        <target>Weiteres</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">153</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
-        <source>Documentation</source>
-        <target>Dokumentation</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">160</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
-        <source>GitHub</source>
-        <target>GitHub</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">167</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
-        <source>Logged in as <x equiv-text="{{displayName}}" id="INTERPOLATION"/></source>
-        <target>Angemeldet als <x equiv-text="{{displayName}}" id="INTERPOLATION"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">34</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4f55b670f49d927c6026bb614c7c62b1f2a394c0">
-        <source>Open documents</source>
-        <target>Geöffnete Dokumente</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">92</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="dca5bf9344a759fa5a07f1b21f50286ec242ba44">
-        <source>Close all</source>
-        <target>Alle schließen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">106</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5195932016807797291">
-        <source>Correspondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></source>
-        <target>Korrespondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8170755470576301659">
-        <source>Without correspondent</source>
-        <target>Ohne Korrespondent</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">31</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8705701325879965907">
-        <source>Type: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></source>
-        <target>Typ: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">36</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4362173610367509215">
-        <source>Without document type</source>
-        <target>Ohne Dokumenttyp</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">38</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8180755793012580465">
-        <source>Tag: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></source>
-        <target>Tag: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">42</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="6494566478302448576">
-        <source>Without any tag</source>
-        <target>Ohne Tag</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">46</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
-        <source>Filter by:</source>
-        <target>Filtern nach:</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
-        <source>Filter tags</source>
-        <target>Tags filtern</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4b089ca12c472cf0b46167bb5afe4b527b301bbc">
-        <source>Filter correspondents</source>
-        <target>Korrespondenten filtern</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">19</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="0ad509732aaf702b7ea8c771c7809fa84bc85908">
-        <source>Filter document types</source>
-        <target>Dokumenttypen filtern</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">25</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2f33515a935c36763660e8420940b8a7e11fb1f4">
-        <source>Clear all filters</source>
-        <target>Filter zurücksetzen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">47</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7593728289020204896">
-        <source>Not assigned</source>
-        <target>Nicht zugewiesen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
-          <context context-type="linenumber">161</context>
-        </context-group>
-        <note from="description" priority="1">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
-      </trans-unit>
-      <trans-unit datatype="html" id="c2d0ac9f528bbd5f53fd34269fde8b59e029621b">
-        <source>Apply</source>
-        <target>Anwenden</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
-          <context context-type="linenumber">28</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4873149362496451858">
-        <source>Last 7 days</source>
-        <target>Letzte 7 Tage</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
-          <context context-type="linenumber">24</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4463380307954693363">
-        <source>Last month</source>
-        <target>Letzten Monat</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
-          <context context-type="linenumber">25</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8697368973702409683">
-        <source>Last 3 months</source>
-        <target>Letzte 3 Monate</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
-          <context context-type="linenumber">26</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3566342898065860218">
-        <source>Last year</source>
-        <target>Letztes Jahr</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
-          <context context-type="linenumber">27</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="be2add3a3d9e4e2556b8f9048a15a9c0f00bf1ad">
-        <source>After</source>
-        <target>Nach</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8785188e6c678b842fcb93b7392faf86db7ec676">
-        <source>Before</source>
-        <target>Vor</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="99ee4faa69cd2ea8e3678c1f557c0ff1f05aae46">
-        <source>Clear</source>
-        <target>Zurücksetzen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
-          <context context-type="linenumber">18</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="6829218544e108e152f5fa72cb79c4ccb82e0d06">
-        <source>View</source>
-        <target>Anzeigen</target>
-        <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 datatype="html" id="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60">
-        <source>Score:</source>
-        <target>Relevanz:</target>
-        <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">61</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e">
-        <source>Created: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></source>
-        <target>Erstellt: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></target>
-        <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">65</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8">
-        <source>Filter by correspondent</source>
-        <target>Nach Korrespondent filtern</target>
-        <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">20</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="bdb9a910523610254872e147222689e9a4115b84">
-        <source>Filter by tag</source>
-        <target>Nach Tag filtern</target>
-        <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">24</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2840db547019ce8c76b2cdbe3a1653c5b68b06af">
-        <source>View in browser</source>
-        <target>Im Browser anzeigen</target>
-        <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-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8639884465898458690">
-        <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
-        <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; und &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">103</context>
-        </context-group>
-        <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
-      </trans-unit>
-      <trans-unit datatype="html" id="7894972847287473517">
-        <source>&quot;<x equiv-text="i.name" id="PH"/>&quot;</source>
-        <target>&quot;<x equiv-text="i.name" id="PH"/>&quot;</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">105</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="760986369763309193">
-        <source>, </source>
-        <target>, </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">105</context>
-        </context-group>
-        <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
-      </trans-unit>
-      <trans-unit datatype="html" id="1822679894391095557">
-        <source><x equiv-text="list" id="PH"/> and &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</source>
-        <target><x equiv-text="list" id="PH"/> und &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">106</context>
-        </context-group>
-        <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
-      </trans-unit>
-      <trans-unit datatype="html" id="4137232459980262849">
-        <source>Confirm tags assignment</source>
-        <target>Tag-Zuweisung bestätigen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">115</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="6619516195038467207">
-        <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten das Tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; hinzufügen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">118</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1894412783609570695">
-        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten die Tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> hinzufügen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">120</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7181166515756808573">
-        <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Diese Aktion wird das Tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; von <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten entfernen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">123</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3819792277998068944">
-        <source>This operation will remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Diese Aktion wird die Tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> von <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten entfernen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">125</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2739066218579571288">
-        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> and remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> on <x equiv-text="this.list.selected.size" id="PH_2"/> selected document(s).</source>
-        <target>Diese Aktion wird die Tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> den <x equiv-text="this.list.selected.size" id="PH_2"/> ausgewählten Dokumenten hinzufügen und die Tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> entfernen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">127</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2996713129519325161">
-        <source>Confirm correspondent assignment</source>
-        <target>Korrespondent-Zuweisung bestätigen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">157</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="6900893559485781849">
-        <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten den Korrespondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; zuweisen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">159</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1257522660364398440">
-        <source>This operation will remove the correspondent from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
-        <target>Diese Aktion wird bei <x equiv-text="this.list.selected.size" id="PH"/> ausgewählten Dokumenten den Korrespondent entfernen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">161</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5393409374423140648">
-        <source>Confirm document type assignment</source>
-        <target>Dokumenttyp-Zuweisung bestätigen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">190</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="332180123895325027">
-        <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten den Dokumenttyp &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; zuweisen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">192</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2236642492594872779">
-        <source>This operation will remove the document type from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
-        <target>Diese Aktion wird bei <x equiv-text="this.list.selected.size" id="PH"/> ausgewählten Dokumenten den Dokumenttyp entfernen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">194</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="749430623564850405">
-        <source>Delete confirm</source>
-        <target>Löschen bestätigen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">219</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4303174930844518780">
-        <source>This operation will permanently delete <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
-        <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH"/> ausgewählte Dokumente unwiderruflich löschen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">220</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5641451190833696892">
-        <source>This operation cannot be undone.</source>
-        <target>Diese Aktion kann nicht rückgängig gemacht werden.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">221</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="6734339521247847366">
-        <source>Delete document(s)</source>
-        <target>Dokument(e) löschen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">223</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
-        <source>Select:</source>
-        <target>Auswählen:</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="dfc3c34e182ea73c5d784ff7c8135f087992dac1">
-        <source>All</source>
-        <target>Alle</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">21</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="907df6a2b68daecc3c399cf40a764b358bd9fd84">
-        <source>Edit:</source>
-        <target>Bearbeiten:</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">28</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">
-        <source>Save current view</source>
-        <target>Aktuelle Ansicht speichern</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4eb84de23219c85432e38fb4fbdeb6c0f103ff8b">
-        <source>Show all</source>
-        <target>Alle anzeigen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="61e0f26d843eec0b33ff475e111b0c2f7a80b835">
-        <source>Statistics</source>
-        <target>Statistiken</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="46c8fe557cf52c9389783627d4f85453f4ddb459">
-        <source>Documents in inbox: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></source>
-        <target>Dokumente im Posteingang: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438">
-        <source>Total documents: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></source>
-        <target>Anzahl Dokumente gesamt: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8705589528094706681">
-        <source>The document has been uploaded and will be processed by the consumer shortly.</source>
-        <target>Das Dokument wurde hochgeladen und wird in Kürze durch Paperless-ng verarbeitet.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">63</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4956689020592747108">
-        <source>There was an error while uploading the document: <x equiv-text="error.error.document" id="PH"/></source>
-        <target>Konnte Dokument nicht hochladen: <x equiv-text="error.error.document" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">71</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7554858521017940575">
-        <source>An error has occurred while uploading the document. Sorry!</source>
-        <target>Beim Hochladen trat ein Fehler auf. Entschuldigung!</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">75</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
-        <source>Upload new documents</source>
-        <target>Neue Dokumente hochladen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="52d5d56b6667ba3f7c759cbc0d4c39d34a99701e">
-        <source>Drop documents here or</source>
-        <target>Dokumente hier ablegen oder</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">5</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="865c511f4a24558ed0e954f9bbbff557bbb8954d">
-        <source>Browse files</source>
-        <target>Datei auswählen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">5</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="a7b50b2df68e875a918d1f4f98f358d756139c13">
-        <source>{VAR_PLURAL, plural, =1 {file} =other {<x id="INTERPOLATION"/> files}}</source>
-        <target>{VAR_PLURAL, plural, =1 {Datei} =other {<x id="INTERPOLATION"/> Dateien}}</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="ec37c68a90632530f5cc8b7e5245cab89ef8bf82">
-        <source>Uploading <x equiv-text="{uploadStatus.length, plural, =1 {file} =other {{{uploadStatus.length}} files}}" id="ICU"/>...</source>
-        <target>Lade <x equiv-text="{uploadStatus.length, plural, =1 {file} =other {{{uploadStatus.length}} files}}" id="ICU"/> hoch...</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="45854ddec74086b271e62be6a363f4fa5036f7fc">
-        <source>First steps</source>
-        <target>Erste Schritte</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="a0dc8218a6fcc5d11a4723ed127bd6be9d6d3ef3">
-        <source>Paperless is running! :)</source>
-        <target>Paperless ist startbereit! :)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
-          <context context-type="linenumber">5</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="ea8d9a9486d5639d1c38c012900b8d34d5e4135d">
-        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message.</source>
-        <target>Sie können Ihre Dokumente hochladen, indem Sie sie in die Hochladebox auf der rechten Seite ziehen oder in den konfigurierten Ablageordner kopieren/verschieben. Danach werden sie inder Dokumentliste erscheinen. Nachdem Sie den Dokumenten einige Metadaten zugewiesen haben, können Sie die Filtermechanismen zur Erstellung individueller Ansichten benutzen (zum Beispiel &quot;Kürzlich hinzugefügt&quot; oder &quot;Mit TODO markiert&quot;) und die Ansichten werden auf der Startseite erscheinen und diese Nachricht ersetzen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
-          <context context-type="linenumber">6,7</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="cf5f85690feaba6e29343f9881e57a6c0ea6e82b">
-        <source>Paperless offers some more features that try to make your life easier:</source>
-        <target>Paperless bietet darüber hinaus einige erweiterte Funktionen:</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
-          <context context-type="linenumber">8</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="edb41dc36af2e70789d8e3422325d930e783253e">
-        <source>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</source>
-        <target>Nachdem Sie einige Dokumente hochgeladen und mit Metadatebn haben, kann Paperless diese Metadaten automatisch passenden neuen Dokumenten zuweisen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
-          <context context-type="linenumber">10</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="9dca488928c0b7af46c3866f86a6c2c8548399aa">
-        <source>You can configure paperless to read your mails and add documents from attached files.</source>
-        <target>Sie können in Paperless Ihre E-Mail-Konten einrichten und Paperless wird automatisch Dokumente aus Dateianhängen erzeugen.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="d282f6277cbf6704f697170d2ad19ce500790e20">
-        <source>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</source>
-        <target>Die Dokumentation enthält mehr Informationen, wie diese Funktionen benutzt werden. Der Abschnitt zur allgemeinen Verwendung enthält zudem wertvolle Informationen zur generellen Verwendung von Paperless.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="218403386307979629">
-        <source>Metadata</source>
-        <target>Metadaten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts</context>
-          <context context-type="linenumber">18</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3797570084942068182">
-        <source>Select</source>
-        <target>Auswählen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
-          <context context-type="linenumber">18</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7103181924469214926">
-        <source>Please select an object</source>
-        <target>Bitte wählen Sie ein Element aus</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
-          <context context-type="linenumber">21</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2807800733729323332">
-        <source>Yes</source>
-        <target>Ja</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
-          <context context-type="linenumber">9</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3542042671420335679">
-        <source>No</source>
-        <target>Nein</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
-          <context context-type="linenumber">9</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7536524521722799066">
-        <source>(no title)</source>
-        <target>(kein Titel)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/pipes/document-title.pipe.ts</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1519954996184640001">
-        <source>Error</source>
-        <target>Fehler</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
-          <context context-type="linenumber">31</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5037437391296624618">
-        <source>Information</source>
-        <target>Information</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
-          <context context-type="linenumber">35</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2691296884221415710">
-        <source>Correspondent</source>
-        <target>Korrespondent</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5066119607229701477">
-        <source>Document type</source>
-        <target>Dokumenttyp</target>
-        <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 datatype="html" id="5701618810648052610">
-        <source>Title</source>
-        <target>Titel</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">18</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7517688192215738656">
-        <source>ASN</source>
-        <target>ASN</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">19</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4207916966377787111">
-        <source>Created</source>
-        <target>Erstellt am</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">20</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="231679111972850796">
-        <source>Added</source>
-        <target>Hinzugefügt am</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">21</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3553216189604488439">
-        <source>Modified</source>
-        <target>Geändert am</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">22</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2056433880533904076">
-        <source>Light blue</source>
-        <target>Hellblau</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">6</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4082253113407591781">
-        <source>Blue</source>
-        <target>Blau</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1143414876575720034">
-        <source>Light green</source>
-        <target>Hellgrün</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">8</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="119581980963263815">
-        <source>Green</source>
-        <target>Grün</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">9</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3250646524116252719">
-        <source>Light red</source>
-        <target>Hellrot</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">10</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1628552745302385832">
-        <source>Red </source>
-        <target>Rot</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5479028842846122610">
-        <source>Light orange</source>
-        <target>Hellorange</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8598918991528773310">
-        <source>Orange</source>
-        <target>Orange</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1789283185177957430">
-        <source>Light violet</source>
-        <target>Hellviolet</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">14</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2682868487071320453">
-        <source>Violet</source>
-        <target>Violet</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1449010446077321264">
-        <source>Brown</source>
-        <target>Braun</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="30300572504753589">
-        <source>Black</source>
-        <target>Schwarz</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">17</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="461048771215121187">
-        <source>Light grey</source>
-        <target>Hellgrau</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
-          <context context-type="linenumber">18</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4561076822163447092">
-        <source>Create new item</source>
-        <target>Neues Element erstellen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">38</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5324147361912094446">
-        <source>Edit item</source>
-        <target>Element bearbeiten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">42</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1699589597032579396">
-        <source>Could not save element: <x equiv-text="error" id="PH"/></source>
-        <target>Konnte Element nicht speichern: <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">46</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="810888510148304696">
-        <source>Automatic</source>
-        <target>Automatisch</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">31</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5044611416737085530">
-        <source>Do you really want to delete this element?</source>
-        <target>Möchten Sie dieses Element wirklich löschen?</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">88</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8371896857609524947">
-        <source>Associated documents will not be deleted.</source>
-        <target>Assoziierte Dokumente werden nicht gelöscht.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">95</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7022070615528435141">
-        <source>Delete</source>
-        <target>Löschen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">97</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="5851669019930456395">
-        <source>Any word</source>
-        <target>Irgendein Wort</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7517655726614958140">
-        <source>Any: Document contains any of these words (space separated)</source>
-        <target>Irgendein Wort: Dokument enthält eins der folgender Wörter</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="700315718208181326">
-        <source>All words</source>
-        <target>Alle Wörter</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="111914402588955480">
-        <source>All: Document contains all of these words (space separated)</source>
-        <target>Alle: Dokument enthält alle folgenden Wörter</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="9180173992399180575">
-        <source>Exact match</source>
-        <target>Exakte Übereinstimmung</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
-          <context context-type="linenumber">14</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7109184332944610787">
-        <source>Exact: Document contains this string</source>
-        <target>Exakt: Dokument enthält die folgende Zeichenkette</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
-          <context context-type="linenumber">14</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1338733395833138319">
-        <source>Regular expression</source>
-        <target>Regulärer Ausdruck</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="7548151332424148033">
-        <source>Regular expression: Document matches this regular expression</source>
-        <target>Regulärer Ausdruck: Dokument passt zum folgenden Audruck</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="1856513373880048959">
-        <source>Fuzzy word</source>
-        <target>Ungenaues Wort</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8419167206585286450">
-        <source>Fuzzy: Document contains a word similar to this word</source>
-        <target>Ungenau: Dokument enthält ein zum folgdendem Wort ähnliches Wort</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2147958104253035821">
-        <source>Auto: Learn matching automatically.</source>
-        <target>Auto: Zuweisung automatisch erlernen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
-          <context context-type="linenumber">17</context>
-        </context-group>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
\ No newline at end of file

From bcf17bfdc0974fcbf5fc368d2cc49866c92e61c8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 00:45:23 +0100
Subject: [PATCH 0574/1300] fix some translation issues

---
 src/documents/apps.py        |  4 ++++
 src/documents/models.py      | 22 +++++++++++-----------
 src/paperless/urls.py        |  4 +++-
 src/paperless_mail/apps.py   |  4 +++-
 src/paperless_mail/models.py |  8 ++++++++
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/documents/apps.py b/src/documents/apps.py
index 4278029cc..e21e14097 100644
--- a/src/documents/apps.py
+++ b/src/documents/apps.py
@@ -1,10 +1,14 @@
 from django.apps import AppConfig
 
+from django.utils.translation import gettext_lazy as _
+
 
 class DocumentsConfig(AppConfig):
 
     name = "documents"
 
+    verbose_name = _("Documents")
+
     def ready(self):
         from .signals import document_consumption_finished
         from .signals.handlers import (
diff --git a/src/documents/models.py b/src/documents/models.py
index 3022b45a8..3f0e331d0 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -29,12 +29,12 @@ class MatchingModel(models.Model):
     MATCH_AUTO = 6
 
     MATCHING_ALGORITHMS = (
-        (MATCH_ANY, _("Any")),
-        (MATCH_ALL, _("All")),
-        (MATCH_LITERAL, _("Literal")),
-        (MATCH_REGEX, _("Regular Expression")),
-        (MATCH_FUZZY, _("Fuzzy Match")),
-        (MATCH_AUTO, _("Automatic Classification")),
+        (MATCH_ANY, _("Any word")),
+        (MATCH_ALL, _("All words")),
+        (MATCH_LITERAL, _("Exact match")),
+        (MATCH_REGEX, _("Regular expression")),
+        (MATCH_FUZZY, _("Fuzzy word")),
+        (MATCH_AUTO, _("Automatic")),
     )
 
     name = models.CharField(
@@ -312,11 +312,11 @@ class Document(models.Model):
 class Log(models.Model):
 
     LEVELS = (
-        (logging.DEBUG, "Debugging"),
-        (logging.INFO, "Informational"),
-        (logging.WARNING, "Warning"),
-        (logging.ERROR, "Error"),
-        (logging.CRITICAL, "Critical"),
+        (logging.DEBUG, _("debug")),
+        (logging.INFO, _("information")),
+        (logging.WARNING, _("warning")),
+        (logging.ERROR, _("error")),
+        (logging.CRITICAL, _("critical")),
     )
 
     group = models.UUIDField(
diff --git a/src/paperless/urls.py b/src/paperless/urls.py
index e44762aee..6adb1be5b 100755
--- a/src/paperless/urls.py
+++ b/src/paperless/urls.py
@@ -7,6 +7,8 @@ from django.views.generic import RedirectView
 from rest_framework.authtoken import views
 from rest_framework.routers import DefaultRouter
 
+from django.utils.translation import gettext_lazy as _
+
 from documents.views import (
     CorrespondentViewSet,
     DocumentViewSet,
@@ -103,4 +105,4 @@ admin.site.site_header = 'Paperless-ng'
 # Text at the end of each page's <title>.
 admin.site.site_title = 'Paperless-ng'
 # Text at the top of the admin index page.
-admin.site.index_title = 'Paperless-ng administration'
+admin.site.index_title = _('Paperless-ng administration')
diff --git a/src/paperless_mail/apps.py b/src/paperless_mail/apps.py
index 18c15a4f4..efbea745b 100644
--- a/src/paperless_mail/apps.py
+++ b/src/paperless_mail/apps.py
@@ -1,7 +1,9 @@
 from django.apps import AppConfig
 
+from django.utils.translation import gettext_lazy as _
+
 
 class PaperlessMailConfig(AppConfig):
     name = 'paperless_mail'
 
-    verbose_name = 'Paperless Mail'
+    verbose_name = _('Paperless mail')
diff --git a/src/paperless_mail/models.py b/src/paperless_mail/models.py
index 44682cfbf..ddfb4d43c 100644
--- a/src/paperless_mail/models.py
+++ b/src/paperless_mail/models.py
@@ -7,6 +7,10 @@ from django.utils.translation import gettext_lazy as _
 
 class MailAccount(models.Model):
 
+    class Meta:
+        verbose_name = _("mail account")
+        verbose_name_plural = _("mail accounts")
+
     IMAP_SECURITY_NONE = 1
     IMAP_SECURITY_SSL = 2
     IMAP_SECURITY_STARTTLS = 3
@@ -52,6 +56,10 @@ class MailAccount(models.Model):
 
 class MailRule(models.Model):
 
+    class Meta:
+        verbose_name = _("mail rule")
+        verbose_name_plural = _("mail rules")
+
     ACTION_DELETE = 1
     ACTION_MOVE = 2
     ACTION_MARK_READ = 3

From a9b331c5fd75e9a00bb4adfc240d826c0797e134 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 01:13:34 +0100
Subject: [PATCH 0575/1300] missed a translation string

---
 src-ui/messages.xlf                                | 14 +++++++-------
 .../manage/settings/settings.component.html        |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index a0c94de3e..314766dfb 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -485,6 +485,13 @@
           <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
+        <source>Settings</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="11ebd254cc9294717105c5982eb0cd2af30a446d" datatype="html">
         <source>General settings</source>
         <context-group purpose="location">
@@ -801,13 +808,6 @@
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
-        <source>Settings</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">40</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="bb694b49d408265c91c62799c2b3a7e3151c824d" datatype="html">
         <source>Logout</source>
         <context-group purpose="location">
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 93c7c98b4..103b5bb65 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -1,4 +1,4 @@
-<app-page-header title="Settings">
+<app-page-header title="Settings" i18n-title>
 
 </app-page-header>
 

From c6af2044ce6d987c11e84b3e32aa7946e1d6c162 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 01:18:32 +0100
Subject: [PATCH 0576/1300] bugfix

---
 .../document-card-large/document-card-large.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index 56047fc1e..a658229a6 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -58,7 +58,7 @@
 
           </div>
 
-          <small class="text-muted ml-auto" i18n>Score:</small>
+          <small *ngIf="searchScore" class="text-muted ml-auto" i18n>Score:</small>
 
           <ngb-progressbar *ngIf="searchScore" [type]="searchScoreClass" [value]="searchScore" class="search-score-bar mx-2" [max]="1"></ngb-progressbar>
 

From bf198f37db7cf16b32b0d0eb0925c0ac3c46b99a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 01:19:01 +0100
Subject: [PATCH 0577/1300] fix locale discovery by django app

---
 src/documents/templates/index.html |  2 +-
 src/documents/views.py             | 22 ++++++++++++++++++----
 src/paperless/urls.py              |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html
index 753aa766c..21112b643 100644
--- a/src/documents/templates/index.html
+++ b/src/documents/templates/index.html
@@ -12,7 +12,7 @@
 	<meta name="full_name" content="{{full_name}}">
 	<meta name="cookie_prefix" content="{{cookie_prefix}}">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-  <link rel="manifest" href="{% static 'frontend/manifest.webmanifest' %}">
+  <link rel="manifest" href="{% static webmanifest %}">
 	<link rel="stylesheet" href="{% static styles_css %}">
 </head>
 <body>
diff --git a/src/documents/views.py b/src/documents/views.py
index 7dc3ae3e6..8af29ce05 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -57,15 +57,29 @@ from .serialisers import (
 class IndexView(TemplateView):
     template_name = "index.html"
 
+    def get_language(self):
+        # This is here for the following reason:
+        # Django identifies languages in the form "en-us"
+        # However, angular generates locales as "en-US".
+        # this translates between these two forms.
+        lang = get_language()
+        if "-" in lang:
+            first = lang[:lang.index("-")]
+            second = lang[lang.index("-")+1:]
+            return f"{first}-{second.upper()}"
+        else:
+            return lang
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['cookie_prefix'] = settings.COOKIE_PREFIX
         context['username'] = self.request.user.username
         context['full_name'] = self.request.user.get_full_name()
-        context['styles_css'] = f"frontend/{get_language()}/styles.css"
-        context['runtime_js'] = f"frontend/{get_language()}/runtime.js"
-        context['polyfills_js'] = f"frontend/{get_language()}/polyfills.js"
-        context['main_js'] = f"frontend/{get_language()}/main.js"
+        context['styles_css'] = f"frontend/{self.get_language()}/styles.css"
+        context['runtime_js'] = f"frontend/{self.get_language()}/runtime.js"
+        context['polyfills_js'] = f"frontend/{self.get_language()}/polyfills.js"  # NOQA: E501
+        context['main_js'] = f"frontend/{self.get_language()}/main.js"
+        context['manifest'] = f"frontend/{self.get_language()}/manifest.webmanifest"  # NOQA: E501
         return context
 
 
diff --git a/src/paperless/urls.py b/src/paperless/urls.py
index 6adb1be5b..49e6e8b7a 100755
--- a/src/paperless/urls.py
+++ b/src/paperless/urls.py
@@ -90,7 +90,7 @@ urlpatterns = [
 
     # Frontend assets TODO: this is pretty bad, but it works.
     path('assets/<path:path>',
-         RedirectView.as_view(url='/static/frontend/en-us/assets/%(path)s')),
+         RedirectView.as_view(url='/static/frontend/en-US/assets/%(path)s')),
     # TODO: with localization, this is even worse! :/
 
     # login, logout

From 0d5d8f7c805e67e06b980abd53ef2bc397338736 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 01:21:44 +0100
Subject: [PATCH 0578/1300] add missing migrations

---
 .../migrations/1011_auto_20210101_2340.py     | 250 ++++++++++++++++++
 .../migrations/0006_auto_20210101_2340.py     | 128 +++++++++
 2 files changed, 378 insertions(+)
 create mode 100644 src/documents/migrations/1011_auto_20210101_2340.py
 create mode 100644 src/paperless_mail/migrations/0006_auto_20210101_2340.py

diff --git a/src/documents/migrations/1011_auto_20210101_2340.py b/src/documents/migrations/1011_auto_20210101_2340.py
new file mode 100644
index 000000000..9405a5210
--- /dev/null
+++ b/src/documents/migrations/1011_auto_20210101_2340.py
@@ -0,0 +1,250 @@
+# Generated by Django 3.1.4 on 2021-01-01 23:40
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('documents', '1010_auto_20210101_2159'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='correspondent',
+            options={'ordering': ('name',), 'verbose_name': 'correspondent', 'verbose_name_plural': 'correspondents'},
+        ),
+        migrations.AlterModelOptions(
+            name='document',
+            options={'ordering': ('-created',), 'verbose_name': 'document', 'verbose_name_plural': 'documents'},
+        ),
+        migrations.AlterModelOptions(
+            name='documenttype',
+            options={'verbose_name': 'document type', 'verbose_name_plural': 'document types'},
+        ),
+        migrations.AlterModelOptions(
+            name='log',
+            options={'ordering': ('-created',), 'verbose_name': 'log', 'verbose_name_plural': 'logs'},
+        ),
+        migrations.AlterModelOptions(
+            name='savedview',
+            options={'ordering': ('name',), 'verbose_name': 'saved view', 'verbose_name_plural': 'saved views'},
+        ),
+        migrations.AlterModelOptions(
+            name='savedviewfilterrule',
+            options={'verbose_name': 'filter rule', 'verbose_name_plural': 'filter rules'},
+        ),
+        migrations.AlterModelOptions(
+            name='tag',
+            options={'verbose_name': 'tag', 'verbose_name_plural': 'tags'},
+        ),
+        migrations.AlterField(
+            model_name='correspondent',
+            name='is_insensitive',
+            field=models.BooleanField(default=True, verbose_name='is insensitive'),
+        ),
+        migrations.AlterField(
+            model_name='correspondent',
+            name='match',
+            field=models.CharField(blank=True, max_length=256, verbose_name='match'),
+        ),
+        migrations.AlterField(
+            model_name='correspondent',
+            name='matching_algorithm',
+            field=models.PositiveIntegerField(choices=[(1, 'Any word'), (2, 'All words'), (3, 'Exact match'), (4, 'Regular expression'), (5, 'Fuzzy word'), (6, 'Automatic')], default=1, verbose_name='matching algorithm'),
+        ),
+        migrations.AlterField(
+            model_name='correspondent',
+            name='name',
+            field=models.CharField(max_length=128, unique=True, verbose_name='name'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='added',
+            field=models.DateTimeField(db_index=True, default=django.utils.timezone.now, editable=False, verbose_name='added'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='archive_checksum',
+            field=models.CharField(blank=True, editable=False, help_text='The checksum of the archived document.', max_length=32, null=True, verbose_name='archive checksum'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='archive_serial_number',
+            field=models.IntegerField(blank=True, db_index=True, help_text='The position of this document in your physical document archive.', null=True, unique=True, verbose_name='archive serial number'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='checksum',
+            field=models.CharField(editable=False, help_text='The checksum of the original document.', max_length=32, unique=True, verbose_name='checksum'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='content',
+            field=models.TextField(blank=True, help_text='The raw, text-only data of the document. This field is primarily used for searching.', verbose_name='content'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='correspondent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='documents', to='documents.correspondent', verbose_name='correspondent'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='created',
+            field=models.DateTimeField(db_index=True, default=django.utils.timezone.now, verbose_name='created'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='document_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='documents', to='documents.documenttype', verbose_name='document type'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='filename',
+            field=models.FilePathField(default=None, editable=False, help_text='Current filename in storage', max_length=1024, null=True, verbose_name='filename'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='mime_type',
+            field=models.CharField(editable=False, max_length=256, verbose_name='mime type'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='modified',
+            field=models.DateTimeField(auto_now=True, db_index=True, verbose_name='modified'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='storage_type',
+            field=models.CharField(choices=[('unencrypted', 'Unencrypted'), ('gpg', 'Encrypted with GNU Privacy Guard')], default='unencrypted', editable=False, max_length=11, verbose_name='storage type'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='tags',
+            field=models.ManyToManyField(blank=True, related_name='documents', to='documents.Tag', verbose_name='tags'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='title',
+            field=models.CharField(blank=True, db_index=True, max_length=128, verbose_name='title'),
+        ),
+        migrations.AlterField(
+            model_name='documenttype',
+            name='is_insensitive',
+            field=models.BooleanField(default=True, verbose_name='is insensitive'),
+        ),
+        migrations.AlterField(
+            model_name='documenttype',
+            name='match',
+            field=models.CharField(blank=True, max_length=256, verbose_name='match'),
+        ),
+        migrations.AlterField(
+            model_name='documenttype',
+            name='matching_algorithm',
+            field=models.PositiveIntegerField(choices=[(1, 'Any word'), (2, 'All words'), (3, 'Exact match'), (4, 'Regular expression'), (5, 'Fuzzy word'), (6, 'Automatic')], default=1, verbose_name='matching algorithm'),
+        ),
+        migrations.AlterField(
+            model_name='documenttype',
+            name='name',
+            field=models.CharField(max_length=128, unique=True, verbose_name='name'),
+        ),
+        migrations.AlterField(
+            model_name='log',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='created'),
+        ),
+        migrations.AlterField(
+            model_name='log',
+            name='group',
+            field=models.UUIDField(blank=True, null=True, verbose_name='group'),
+        ),
+        migrations.AlterField(
+            model_name='log',
+            name='level',
+            field=models.PositiveIntegerField(choices=[(10, 'debug'), (20, 'information'), (30, 'warning'), (40, 'error'), (50, 'critical')], default=20, verbose_name='level'),
+        ),
+        migrations.AlterField(
+            model_name='log',
+            name='message',
+            field=models.TextField(verbose_name='message'),
+        ),
+        migrations.AlterField(
+            model_name='savedview',
+            name='name',
+            field=models.CharField(max_length=128, verbose_name='name'),
+        ),
+        migrations.AlterField(
+            model_name='savedview',
+            name='show_in_sidebar',
+            field=models.BooleanField(verbose_name='show in sidebar'),
+        ),
+        migrations.AlterField(
+            model_name='savedview',
+            name='show_on_dashboard',
+            field=models.BooleanField(verbose_name='show on dashboard'),
+        ),
+        migrations.AlterField(
+            model_name='savedview',
+            name='sort_field',
+            field=models.CharField(max_length=128, verbose_name='sort field'),
+        ),
+        migrations.AlterField(
+            model_name='savedview',
+            name='sort_reverse',
+            field=models.BooleanField(default=False, verbose_name='sort reverse'),
+        ),
+        migrations.AlterField(
+            model_name='savedview',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user'),
+        ),
+        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')], verbose_name='rule type'),
+        ),
+        migrations.AlterField(
+            model_name='savedviewfilterrule',
+            name='saved_view',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='filter_rules', to='documents.savedview', verbose_name='saved view'),
+        ),
+        migrations.AlterField(
+            model_name='savedviewfilterrule',
+            name='value',
+            field=models.CharField(blank=True, max_length=128, null=True, verbose_name='value'),
+        ),
+        migrations.AlterField(
+            model_name='tag',
+            name='colour',
+            field=models.PositiveIntegerField(choices=[(1, '#a6cee3'), (2, '#1f78b4'), (3, '#b2df8a'), (4, '#33a02c'), (5, '#fb9a99'), (6, '#e31a1c'), (7, '#fdbf6f'), (8, '#ff7f00'), (9, '#cab2d6'), (10, '#6a3d9a'), (11, '#b15928'), (12, '#000000'), (13, '#cccccc')], default=1, verbose_name='color'),
+        ),
+        migrations.AlterField(
+            model_name='tag',
+            name='is_inbox_tag',
+            field=models.BooleanField(default=False, help_text='Marks this tag as an inbox tag: All newly consumed documents will be tagged with inbox tags.', verbose_name='is inbox tag'),
+        ),
+        migrations.AlterField(
+            model_name='tag',
+            name='is_insensitive',
+            field=models.BooleanField(default=True, verbose_name='is insensitive'),
+        ),
+        migrations.AlterField(
+            model_name='tag',
+            name='match',
+            field=models.CharField(blank=True, max_length=256, verbose_name='match'),
+        ),
+        migrations.AlterField(
+            model_name='tag',
+            name='matching_algorithm',
+            field=models.PositiveIntegerField(choices=[(1, 'Any word'), (2, 'All words'), (3, 'Exact match'), (4, 'Regular expression'), (5, 'Fuzzy word'), (6, 'Automatic')], default=1, verbose_name='matching algorithm'),
+        ),
+        migrations.AlterField(
+            model_name='tag',
+            name='name',
+            field=models.CharField(max_length=128, unique=True, verbose_name='name'),
+        ),
+    ]
diff --git a/src/paperless_mail/migrations/0006_auto_20210101_2340.py b/src/paperless_mail/migrations/0006_auto_20210101_2340.py
new file mode 100644
index 000000000..c03ee627d
--- /dev/null
+++ b/src/paperless_mail/migrations/0006_auto_20210101_2340.py
@@ -0,0 +1,128 @@
+# Generated by Django 3.1.4 on 2021-01-01 23:40
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '1011_auto_20210101_2340'),
+        ('paperless_mail', '0005_help_texts'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='mailaccount',
+            options={'verbose_name': 'mail account', 'verbose_name_plural': 'mail accounts'},
+        ),
+        migrations.AlterModelOptions(
+            name='mailrule',
+            options={'verbose_name': 'mail rule', 'verbose_name_plural': 'mail rules'},
+        ),
+        migrations.AlterField(
+            model_name='mailaccount',
+            name='imap_port',
+            field=models.IntegerField(blank=True, help_text='This is usually 143 for unencrypted and STARTTLS connections, and 993 for SSL connections.', null=True, verbose_name='IMAP port'),
+        ),
+        migrations.AlterField(
+            model_name='mailaccount',
+            name='imap_security',
+            field=models.PositiveIntegerField(choices=[(1, 'No encryption'), (2, 'Use SSL'), (3, 'Use STARTTLS')], default=2, verbose_name='IMAP security'),
+        ),
+        migrations.AlterField(
+            model_name='mailaccount',
+            name='imap_server',
+            field=models.CharField(max_length=256, verbose_name='IMAP server'),
+        ),
+        migrations.AlterField(
+            model_name='mailaccount',
+            name='name',
+            field=models.CharField(max_length=256, unique=True, verbose_name='name'),
+        ),
+        migrations.AlterField(
+            model_name='mailaccount',
+            name='password',
+            field=models.CharField(max_length=256, verbose_name='password'),
+        ),
+        migrations.AlterField(
+            model_name='mailaccount',
+            name='username',
+            field=models.CharField(max_length=256, verbose_name='username'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='account',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rules', to='paperless_mail.mailaccount', verbose_name='account'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='action',
+            field=models.PositiveIntegerField(choices=[(3, "Mark as read, don't process read mails"), (4, "Flag the mail, don't process flagged mails"), (2, 'Move to specified folder'), (1, 'Delete')], default=3, verbose_name='action'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='action_parameter',
+            field=models.CharField(blank=True, help_text='Additional parameter for the action selected above, i.e., the target folder of the move to folder action.', max_length=256, null=True, verbose_name='action parameter'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='assign_correspondent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='documents.correspondent', verbose_name='assign this correspondent'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='assign_correspondent_from',
+            field=models.PositiveIntegerField(choices=[(1, 'Do not assign a correspondent'), (2, 'Use mail address'), (3, 'Use name (or mail address if not available)'), (4, 'Use correspondent selected below')], default=1, verbose_name='assign correspondent from'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='assign_document_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='documents.documenttype', verbose_name='assign this document type'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='assign_tag',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='documents.tag', verbose_name='assign this tag'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='assign_title_from',
+            field=models.PositiveIntegerField(choices=[(1, 'Use subject as title'), (2, 'Use attachment filename as title')], default=1, verbose_name='assign title from'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='filter_body',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='filter body'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='filter_from',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='filter from'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='filter_subject',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='filter subject'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='folder',
+            field=models.CharField(default='INBOX', max_length=256, verbose_name='folder'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='maximum_age',
+            field=models.PositiveIntegerField(default=30, help_text='Specified in days.', verbose_name='maximum age'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='name',
+            field=models.CharField(max_length=256, unique=True, verbose_name='name'),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='order',
+            field=models.IntegerField(default=0, verbose_name='order'),
+        ),
+    ]

From 820920839d2666611734821a5f44118632ac8d37 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 01:26:34 +0100
Subject: [PATCH 0579/1300] update some messages

---
 src/locale/en-us/LC_MESSAGES/django.po | 142 +++++++++++++++++--------
 1 file changed, 95 insertions(+), 47 deletions(-)

diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en-us/LC_MESSAGES/django.po
index 7b9435883..9af185626 100644
--- a/src/locale/en-us/LC_MESSAGES/django.po
+++ b/src/locale/en-us/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-01 19:09+0000\n"
+"POT-Creation-Date: 2021-01-02 00:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,32 +17,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: documents/apps.py:10
+msgid "Documents"
+msgstr ""
+
 #: documents/models.py:32
-msgid "Any"
+msgid "Any word"
 msgstr ""
 
 #: documents/models.py:33
-msgid "All"
+msgid "All words"
 msgstr ""
 
 #: documents/models.py:34
-msgid "Literal"
+msgid "Exact match"
 msgstr ""
 
 #: documents/models.py:35
-msgid "Regular Expression"
+msgid "Regular expression"
 msgstr ""
 
 #: documents/models.py:36
-msgid "Fuzzy Match"
+msgid "Fuzzy word"
 msgstr ""
 
 #: documents/models.py:37
-msgid "Automatic Classification"
+msgid "Automatic"
 msgstr ""
 
-#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:21
-#: paperless_mail/models.py:92
+#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
+#: paperless_mail/models.py:100
 msgid "name"
 msgstr ""
 
@@ -178,6 +182,26 @@ msgstr ""
 msgid "documents"
 msgstr ""
 
+#: documents/models.py:315
+msgid "debug"
+msgstr ""
+
+#: documents/models.py:316
+msgid "information"
+msgstr ""
+
+#: documents/models.py:317
+msgid "warning"
+msgstr ""
+
+#: documents/models.py:318
+msgid "error"
+msgstr ""
+
+#: documents/models.py:319
+msgid "critical"
+msgstr ""
+
 #: documents/models.py:323
 msgid "group"
 msgstr ""
@@ -306,22 +330,26 @@ msgstr ""
 msgid "value"
 msgstr ""
 
-#: documents/models.py:410
+#: documents/models.py:412
 msgid "filter rule"
 msgstr ""
 
-#: documents/models.py:411
+#: documents/models.py:413
 msgid "filter rules"
 msgstr ""
 
-#: paperless/settings.py:253
+#: paperless/settings.py:254
 msgid "English"
 msgstr ""
 
-#: paperless/settings.py:254
+#: paperless/settings.py:255
 msgid "German"
 msgstr ""
 
+#: paperless/urls.py:108
+msgid "Paperless-ng administration"
+msgstr ""
+
 #: paperless_mail/admin.py:24
 msgid "Filter"
 msgstr ""
@@ -353,146 +381,166 @@ msgid ""
 "process all matching rules that you have defined."
 msgstr ""
 
-#: paperless_mail/models.py:15
+#: paperless_mail/apps.py:9
+msgid "Paperless mail"
+msgstr ""
+
+#: paperless_mail/models.py:11
+msgid "mail account"
+msgstr ""
+
+#: paperless_mail/models.py:12
+msgid "mail accounts"
+msgstr ""
+
+#: paperless_mail/models.py:19
 msgid "No encryption"
 msgstr ""
 
-#: paperless_mail/models.py:16
+#: paperless_mail/models.py:20
 msgid "Use SSL"
 msgstr ""
 
-#: paperless_mail/models.py:17
+#: paperless_mail/models.py:21
 msgid "Use STARTTLS"
 msgstr ""
 
-#: paperless_mail/models.py:25
+#: paperless_mail/models.py:29
 msgid "IMAP server"
 msgstr ""
 
-#: paperless_mail/models.py:29
+#: paperless_mail/models.py:33
 msgid "IMAP port"
 msgstr ""
 
-#: paperless_mail/models.py:32
+#: paperless_mail/models.py:36
 msgid ""
 "This is usually 143 for unencrypted and STARTTLS connections, and 993 for "
 "SSL connections."
 msgstr ""
 
-#: paperless_mail/models.py:36
+#: paperless_mail/models.py:40
 msgid "IMAP security"
 msgstr ""
 
-#: paperless_mail/models.py:42
+#: paperless_mail/models.py:46
 msgid "username"
 msgstr ""
 
-#: paperless_mail/models.py:46
+#: paperless_mail/models.py:50
 msgid "password"
 msgstr ""
 
+#: paperless_mail/models.py:60
+msgid "mail rule"
+msgstr ""
+
 #: paperless_mail/models.py:61
+msgid "mail rules"
+msgstr ""
+
+#: paperless_mail/models.py:69
 msgid "Mark as read, don't process read mails"
 msgstr ""
 
-#: paperless_mail/models.py:62
+#: paperless_mail/models.py:70
 msgid "Flag the mail, don't process flagged mails"
 msgstr ""
 
-#: paperless_mail/models.py:63
+#: paperless_mail/models.py:71
 msgid "Move to specified folder"
 msgstr ""
 
-#: paperless_mail/models.py:64
+#: paperless_mail/models.py:72
 msgid "Delete"
 msgstr ""
 
-#: paperless_mail/models.py:71
+#: paperless_mail/models.py:79
 msgid "Use subject as title"
 msgstr ""
 
-#: paperless_mail/models.py:72
+#: paperless_mail/models.py:80
 msgid "Use attachment filename as title"
 msgstr ""
 
-#: paperless_mail/models.py:82
+#: paperless_mail/models.py:90
 msgid "Do not assign a correspondent"
 msgstr ""
 
-#: paperless_mail/models.py:84
+#: paperless_mail/models.py:92
 msgid "Use mail address"
 msgstr ""
 
-#: paperless_mail/models.py:86
+#: paperless_mail/models.py:94
 msgid "Use name (or mail address if not available)"
 msgstr ""
 
-#: paperless_mail/models.py:88
+#: paperless_mail/models.py:96
 msgid "Use correspondent selected below"
 msgstr ""
 
-#: paperless_mail/models.py:96
+#: paperless_mail/models.py:104
 msgid "order"
 msgstr ""
 
-#: paperless_mail/models.py:103
+#: paperless_mail/models.py:111
 msgid "account"
 msgstr ""
 
-#: paperless_mail/models.py:107
+#: paperless_mail/models.py:115
 msgid "folder"
 msgstr ""
 
-#: paperless_mail/models.py:111
+#: paperless_mail/models.py:119
 msgid "filter from"
 msgstr ""
 
-#: paperless_mail/models.py:114
+#: paperless_mail/models.py:122
 msgid "filter subject"
 msgstr ""
 
-#: paperless_mail/models.py:117
+#: paperless_mail/models.py:125
 msgid "filter body"
 msgstr ""
 
-#: paperless_mail/models.py:121
+#: paperless_mail/models.py:129
 msgid "maximum age"
 msgstr ""
 
-#: paperless_mail/models.py:123
+#: paperless_mail/models.py:131
 msgid "Specified in days."
 msgstr ""
 
-#: paperless_mail/models.py:126
+#: paperless_mail/models.py:134
 msgid "action"
 msgstr ""
 
-#: paperless_mail/models.py:132
+#: paperless_mail/models.py:140
 msgid "action parameter"
 msgstr ""
 
-#: paperless_mail/models.py:134
+#: paperless_mail/models.py:142
 msgid ""
 "Additional parameter for the action selected above, i.e., the target folder "
 "of the move to folder action."
 msgstr ""
 
-#: paperless_mail/models.py:140
+#: paperless_mail/models.py:148
 msgid "assign title from"
 msgstr ""
 
-#: paperless_mail/models.py:150
+#: paperless_mail/models.py:158
 msgid "assign this tag"
 msgstr ""
 
-#: paperless_mail/models.py:158
+#: paperless_mail/models.py:166
 msgid "assign this document type"
 msgstr ""
 
-#: paperless_mail/models.py:162
+#: paperless_mail/models.py:170
 msgid "assign correspondent from"
 msgstr ""
 
-#: paperless_mail/models.py:172
+#: paperless_mail/models.py:180
 msgid "assign this correspondent"
 msgstr ""

From a2f0a9687d2bf0a603a926cccfa834e3dae0a393 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sat, 2 Jan 2021 00:30:20 +0000
Subject: [PATCH 0580/1300] Apply translations in de

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'de' language.
---
 src/locale/de/LC_MESSAGES/django.po | 534 ++++++++++++++++++++--------
 1 file changed, 389 insertions(+), 145 deletions(-)

diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po
index db1d2c437..76cc28bec 100644
--- a/src/locale/de/LC_MESSAGES/django.po
+++ b/src/locale/de/LC_MESSAGES/django.po
@@ -2,93 +2,103 @@
 # 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 <dev@jpwinkler.de>, 2021
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-30 19:20+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2021-01-02 00:26+0000\n"
+"PO-Revision-Date: 2020-12-30 19:27+0000\n"
+"Last-Translator: Jonas Winkler <dev@jpwinkler.de>, 2021\n"
+"Language-Team: German (https://www.transifex.com/paperless/teams/115905/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"
 
+#: documents/apps.py:10
+msgid "Documents"
+msgstr "Dokumente"
+
 #: documents/models.py:32
-msgid "Any"
-msgstr ""
+msgid "Any word"
+msgstr "Irgendein Wort"
 
 #: documents/models.py:33
-msgid "All"
-msgstr ""
+msgid "All words"
+msgstr "Alle Wörter"
 
 #: documents/models.py:34
-msgid "Literal"
-msgstr ""
+msgid "Exact match"
+msgstr "Exakte Übereinstimmung"
 
 #: documents/models.py:35
-msgid "Regular Expression"
-msgstr ""
+msgid "Regular expression"
+msgstr "Regulärer Ausdruck"
 
 #: documents/models.py:36
-msgid "Fuzzy Match"
-msgstr ""
+msgid "Fuzzy word"
+msgstr "Ungenaues Wort"
 
 #: documents/models.py:37
-msgid "Automatic Classification"
-msgstr ""
+msgid "Automatic"
+msgstr "Automatisch"
 
-#: documents/models.py:41 documents/models.py:355
+#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
+#: paperless_mail/models.py:100
 msgid "name"
-msgstr ""
+msgstr "Name"
 
 #: documents/models.py:45
 msgid "match"
-msgstr ""
+msgstr "Zuweisungsmuster"
 
 #: documents/models.py:49
 msgid "matching algorithm"
-msgstr ""
+msgstr "Zuweisungsalgorithmus"
 
 #: documents/models.py:55
 msgid "is insensitive"
-msgstr ""
+msgstr "Groß-/Kleinschreibung irrelevant"
 
-#: documents/models.py:80 documents/models.py:141
+#: documents/models.py:80 documents/models.py:140
 msgid "correspondent"
-msgstr ""
+msgstr "Korrespondent"
 
 #: documents/models.py:81
 msgid "correspondents"
-msgstr ""
+msgstr "Korrespondenten"
 
 #: documents/models.py:103
 msgid "color"
-msgstr ""
+msgstr "Farbe"
 
 #: documents/models.py:107
 msgid "is inbox tag"
-msgstr ""
+msgstr "Posteingangs-Tag"
 
 #: documents/models.py:109
 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:114
 msgid "tag"
-msgstr ""
+msgstr "Tag"
 
-#: documents/models.py:115 documents/models.py:172
+#: documents/models.py:115 documents/models.py:171
 msgid "tags"
-msgstr ""
+msgstr "Tags"
 
-#: documents/models.py:121 documents/models.py:154
+#: documents/models.py:121 documents/models.py:153
 msgid "document type"
 msgstr "Dokumenttyp"
 
@@ -96,228 +106,462 @@ msgstr "Dokumenttyp"
 msgid "document types"
 msgstr "Dokumenttypen"
 
-#: documents/models.py:131
+#: documents/models.py:130
 msgid "Unencrypted"
-msgstr ""
+msgstr "Nicht verschlüsselt"
 
-#: documents/models.py:132
+#: documents/models.py:131
 msgid "Encrypted with GNU Privacy Guard"
-msgstr ""
+msgstr "Verschlüsselt mit GNU Privacy Guard"
 
-#: documents/models.py:145
+#: documents/models.py:144
 msgid "title"
-msgstr ""
+msgstr "Titel"
 
-#: documents/models.py:158
+#: documents/models.py:157
 msgid "content"
-msgstr ""
+msgstr "Inhalt"
 
-#: documents/models.py:160
+#: documents/models.py:159
 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:165
+#: documents/models.py:164
 msgid "mime type"
-msgstr ""
+msgstr "MIME-Typ"
 
-#: documents/models.py:176
+#: documents/models.py:175
 msgid "checksum"
-msgstr ""
+msgstr "Prüfsumme"
 
-#: documents/models.py:180
+#: documents/models.py:179
 msgid "The checksum of the original document."
-msgstr ""
+msgstr "Die Prüfsumme des originalen Dokuments."
 
-#: documents/models.py:184
+#: documents/models.py:183
 msgid "archive checksum"
-msgstr ""
+msgstr "Archiv-Prüfsumme"
 
-#: documents/models.py:189
+#: documents/models.py:188
 msgid "The checksum of the archived document."
-msgstr ""
+msgstr "Die Prüfsumme des archivierten Dokuments."
 
-#: documents/models.py:193 documents/models.py:333
+#: documents/models.py:192 documents/models.py:332
 msgid "created"
-msgstr ""
+msgstr "Erstellt"
 
-#: documents/models.py:197
+#: documents/models.py:196
 msgid "modified"
-msgstr ""
+msgstr "Geändert"
 
-#: documents/models.py:201
+#: documents/models.py:200
 msgid "storage type"
-msgstr ""
+msgstr "Speichertyp"
 
-#: documents/models.py:209
+#: documents/models.py:208
 msgid "added"
-msgstr ""
+msgstr "Hinzugefügt"
 
-#: documents/models.py:213
+#: documents/models.py:212
 msgid "filename"
-msgstr ""
+msgstr "Dateiname"
 
-#: documents/models.py:218
+#: documents/models.py:217
 msgid "Current filename in storage"
-msgstr ""
+msgstr "Aktueller Dateiname im Datenspeicher"
 
-#: documents/models.py:222
+#: documents/models.py:221
 msgid "archive serial number"
-msgstr ""
+msgstr "Archiv-Seriennummer"
 
-#: documents/models.py:227
+#: documents/models.py:226
 msgid "The position of this document in your physical document archive."
-msgstr ""
+msgstr "Die Position dieses Dokuments in Ihrem physischen Dokumentenarchiv."
+
+#: documents/models.py:232
+msgid "document"
+msgstr "Dokument"
 
 #: documents/models.py:233
-msgid "Document"
-msgstr ""
+msgid "documents"
+msgstr "Dokumente"
 
-#: documents/models.py:234
-msgid "Documents"
-msgstr ""
+#: documents/models.py:315
+msgid "debug"
+msgstr "Debug"
 
-#: documents/models.py:324
+#: documents/models.py:316
+msgid "information"
+msgstr "Information"
+
+#: documents/models.py:317
+msgid "warning"
+msgstr "Warnung"
+
+#: documents/models.py:318
+msgid "error"
+msgstr "Fehler"
+
+#: documents/models.py:319
+msgid "critical"
+msgstr "Kritisch"
+
+#: documents/models.py:323
 msgid "group"
-msgstr ""
+msgstr "Gruppe"
 
-#: documents/models.py:327
+#: documents/models.py:326
 msgid "message"
-msgstr ""
+msgstr "Nachricht"
 
-#: documents/models.py:330
+#: documents/models.py:329
 msgid "level"
-msgstr ""
+msgstr "Level"
+
+#: documents/models.py:336
+msgid "log"
+msgstr "Protokoll"
 
 #: documents/models.py:337
-msgid "log"
-msgstr ""
-
-#: documents/models.py:338
 msgid "logs"
-msgstr ""
+msgstr "Protokoll"
 
-#: documents/models.py:349 documents/models.py:399
+#: documents/models.py:348 documents/models.py:398
 msgid "saved view"
-msgstr ""
+msgstr "Gespeicherte Ansicht"
 
-#: documents/models.py:350
+#: documents/models.py:349
 msgid "saved views"
-msgstr ""
+msgstr "Gespeicherte Ansichten"
 
-#: documents/models.py:353
+#: documents/models.py:352
 msgid "user"
 msgstr "Benutzer"
 
-#: documents/models.py:359
+#: documents/models.py:358
 msgid "show on dashboard"
-msgstr ""
+msgstr "Auf Startseite zeigen"
 
-#: documents/models.py:362
+#: documents/models.py:361
 msgid "show in sidebar"
-msgstr ""
+msgstr "In Seitenleiste zeigen"
 
-#: documents/models.py:366
+#: documents/models.py:365
 msgid "sort field"
-msgstr ""
+msgstr "Sortierfeld"
 
-#: documents/models.py:369
+#: documents/models.py:368
 msgid "sort reverse"
-msgstr ""
+msgstr "Umgekehrte Sortierung"
+
+#: documents/models.py:374
+msgid "title contains"
+msgstr "Titel enthält"
 
 #: documents/models.py:375
-msgid "title contains"
-msgstr ""
+msgid "content contains"
+msgstr "Inhalt enthält"
 
 #: documents/models.py:376
-msgid "content contains"
-msgstr ""
+msgid "ASN is"
+msgstr "ASN ist"
 
 #: documents/models.py:377
-msgid "ASN is"
-msgstr ""
+msgid "correspondent is"
+msgstr "Korrespondent ist"
 
 #: documents/models.py:378
-msgid "correspondent is"
-msgstr ""
+msgid "document type is"
+msgstr "Dokumenttyp ist"
 
 #: documents/models.py:379
-msgid "document type is"
-msgstr ""
+msgid "is in inbox"
+msgstr "Ist im Posteingang"
 
 #: documents/models.py:380
-msgid "is in inbox"
-msgstr ""
+msgid "has tag"
+msgstr "Hat Tag"
 
 #: documents/models.py:381
-msgid "has tag"
-msgstr ""
+msgid "has any tag"
+msgstr "Hat irgendein Tag"
 
 #: documents/models.py:382
-msgid "has any tag"
-msgstr ""
+msgid "created before"
+msgstr "Erstellt vor"
 
 #: documents/models.py:383
-msgid "created before"
-msgstr ""
+msgid "created after"
+msgstr "Erstellt nach"
 
 #: documents/models.py:384
-msgid "created after"
-msgstr ""
+msgid "created year is"
+msgstr "Erstellt im Jahr"
 
 #: documents/models.py:385
-msgid "created year is"
-msgstr ""
+msgid "created month is"
+msgstr "Erstellt im Monat"
 
 #: documents/models.py:386
-msgid "created month is"
-msgstr ""
+msgid "created day is"
+msgstr "Erstellt am Tag"
 
 #: documents/models.py:387
-msgid "created day is"
-msgstr ""
+msgid "added before"
+msgstr "Hinzugefügt vor"
 
 #: documents/models.py:388
-msgid "added before"
-msgstr ""
+msgid "added after"
+msgstr "Hinzugefügt nach"
 
 #: documents/models.py:389
-msgid "added after"
-msgstr ""
+msgid "modified before"
+msgstr "Geändert vor"
 
 #: documents/models.py:390
-msgid "modified before"
-msgstr ""
+msgid "modified after"
+msgstr "Geändert nach"
 
 #: documents/models.py:391
-msgid "modified after"
-msgstr ""
-
-#: documents/models.py:392
 msgid "does not have tag"
-msgstr ""
+msgstr "Hat nicht folgendes Tag"
 
-#: documents/models.py:403
+#: documents/models.py:402
 msgid "rule type"
-msgstr ""
+msgstr "Regeltyp"
 
-#: documents/models.py:407
+#: documents/models.py:406
 msgid "value"
-msgstr ""
-
-#: documents/models.py:411
-msgid "filter rule"
-msgstr ""
+msgstr "Wert"
 
 #: documents/models.py:412
+msgid "filter rule"
+msgstr "Filterregel"
+
+#: documents/models.py:413
 msgid "filter rules"
 msgstr "Filterregeln"
 
-#: paperless/settings.py:253
-msgid "English"
-msgstr ""
-
 #: paperless/settings.py:254
+msgid "English"
+msgstr "Englisch"
+
+#: paperless/settings.py:255
 msgid "German"
+msgstr "Deutsch"
+
+#: paperless/urls.py:108
+msgid "Paperless-ng administration"
+msgstr "Paperless-ng Administration"
+
+#: paperless_mail/admin.py:24
+msgid "Filter"
+msgstr "Filter"
+
+#: paperless_mail/admin.py:26
+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:34
+msgid "Actions"
+msgstr "Aktionen"
+
+#: paperless_mail/admin.py:36
+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:43
+msgid "Metadata"
+msgstr "Metadaten"
+
+#: paperless_mail/admin.py:45
+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"
+msgstr "Paperless E-Mail"
+
+#: paperless_mail/models.py:11
+msgid "mail account"
+msgstr "E-Mail-Konto"
+
+#: paperless_mail/models.py:12
+msgid "mail accounts"
+msgstr "E-Mail-Konten"
+
+#: paperless_mail/models.py:19
+msgid "No encryption"
+msgstr "Keine Verschlüsselung"
+
+#: paperless_mail/models.py:20
+msgid "Use SSL"
+msgstr "SSL benutzen"
+
+#: paperless_mail/models.py:21
+msgid "Use STARTTLS"
+msgstr "STARTTLS benutzen"
+
+#: paperless_mail/models.py:29
+msgid "IMAP server"
+msgstr "IMAP-Server"
+
+#: paperless_mail/models.py:33
+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."
+
+#: paperless_mail/models.py:40
+msgid "IMAP security"
+msgstr "IMAP-Sicherheit"
+
+#: paperless_mail/models.py:46
+msgid "username"
+msgstr "Benutzername"
+
+#: paperless_mail/models.py:50
+msgid "password"
+msgstr "Password"
+
+#: paperless_mail/models.py:60
+msgid "mail rule"
+msgstr "E-Mail-Regel"
+
+#: paperless_mail/models.py:61
+msgid "mail rules"
+msgstr "E-Mail-Regeln"
+
+#: paperless_mail/models.py:69
+msgid "Mark as read, don't process read mails"
+msgstr "Als gelesen markieren, gelesene E-Mails nicht verarbeiten"
+
+#: paperless_mail/models.py:70
+msgid "Flag the mail, don't process flagged mails"
+msgstr "Als wichtig markieren, markierte E-Mails nicht verarbeiten"
+
+#: paperless_mail/models.py:71
+msgid "Move to specified folder"
+msgstr "In angegebenen Ordner verschieben"
+
+#: paperless_mail/models.py:72
+msgid "Delete"
+msgstr "Löschen"
+
+#: paperless_mail/models.py:79
+msgid "Use subject as title"
+msgstr "Betreff als Titel verwenden"
+
+#: paperless_mail/models.py:80
+msgid "Use attachment filename as title"
+msgstr "Dateiname des Anhangs als Titel verwenden"
+
+#: paperless_mail/models.py:90
+msgid "Do not assign a correspondent"
+msgstr "Keinen Korrespondenten zuweisen"
+
+#: paperless_mail/models.py:92
+msgid "Use mail address"
+msgstr "E-Mail-Adresse benutzen"
+
+#: paperless_mail/models.py:94
+msgid "Use name (or mail address if not available)"
+msgstr "Absendername benutzen (oder E-Mail-Adressen, wenn nicht verfügbar)"
+
+#: paperless_mail/models.py:96
+msgid "Use correspondent selected below"
+msgstr "Nachfolgend ausgewählten Korrespondent verwenden"
+
+#: paperless_mail/models.py:104
+msgid "order"
+msgstr "Reihenfolge"
+
+#: paperless_mail/models.py:111
+msgid "account"
+msgstr "Konto"
+
+#: paperless_mail/models.py:115
+msgid "folder"
+msgstr "Ordner"
+
+#: paperless_mail/models.py:119
+msgid "filter from"
+msgstr "Absender filtern"
+
+#: paperless_mail/models.py:122
+msgid "filter subject"
+msgstr "Betreff filtern"
+
+#: paperless_mail/models.py:125
+msgid "filter body"
+msgstr "Nachrichteninhalt filtern"
+
+#: paperless_mail/models.py:129
+msgid "maximum age"
+msgstr "Maximales Alter"
+
+#: paperless_mail/models.py:131
+msgid "Specified in days."
+msgstr "Angegeben in Tagen."
+
+#: paperless_mail/models.py:134
+msgid "action"
+msgstr "Aktion"
+
+#: paperless_mail/models.py:140
+msgid "action parameter"
+msgstr "Parameter für Aktion"
+
+#: paperless_mail/models.py:142
+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:148
+msgid "assign title from"
+msgstr "Titel zuweisen von"
+
+#: paperless_mail/models.py:158
+msgid "assign this tag"
+msgstr "Dieses Tag zuweisen"
+
+#: paperless_mail/models.py:166
+msgid "assign this document type"
+msgstr "Diesen Dokumenttyp zuweisen"
+
+#: paperless_mail/models.py:170
+msgid "assign correspondent from"
+msgstr "Korrespondent zuweisen von"
+
+#: paperless_mail/models.py:180
+msgid "assign this correspondent"
+msgstr "Diesen Korrespondent zuweisen"

From 729e5ee0e1279ed79fd466997a2b4746d8e48636 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 01:57:26 +0100
Subject: [PATCH 0581/1300] compile messages build step

---
 docker/local/Dockerfile | 2 ++
 docs/administration.rst | 6 ++++++
 docs/setup.rst          | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index 1fd5e24fa..1160cc9a6 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -63,6 +63,8 @@ WORKDIR /usr/src/paperless/src/
 
 RUN sudo -HEu paperless python3 manage.py collectstatic --clear --no-input
 
+RUN sudo -HEu paperless python3 manage.py compilemessages
+
 VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/usr/src/paperless/consume", "/usr/src/paperless/export"]
 ENTRYPOINT ["/sbin/docker-entrypoint.sh"]
 EXPOSE 8000
diff --git a/docs/administration.rst b/docs/administration.rst
index 8885b7322..727d9a9d5 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -148,7 +148,13 @@ After grabbing the new release and unpacking the contents, do the following:
 
         $ cd src
         $ pipenv run python3 manage.py migrate
+    
+5.  Update translation files.
 
+    .. code:: shell-session
+
+        $ cd src
+        $ pipenv run python3 manage.py compilemessages
         
 Management utilities
 ####################
diff --git a/docs/setup.rst b/docs/setup.rst
index 437409194..e51c4c878 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -292,6 +292,9 @@ writing. Windows is not and will never be supported.
         
         # This creates the database schema.
         python3 manage.py migrate
+        
+        # This creates the translation files for paperless.
+        python3 manage.py compilemessages
 
         # This creates your first paperless user
         python3 manage.py createsuperuser

From ef9d8c64fc223c0eea5cf1e2906e24047dd96934 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 02:01:07 +0100
Subject: [PATCH 0582/1300] layout fix

---
 .../document-card-large/document-card-large.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index a658229a6..d2f5ebba2 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -62,7 +62,7 @@
 
           <ngb-progressbar *ngIf="searchScore" [type]="searchScoreClass" [value]="searchScore" class="search-score-bar mx-2" [max]="1"></ngb-progressbar>
 
-          <small class="text-muted" i18n>Created: {{document.created | date}}</small>
+          <small class="text-muted" [class.ml-auto]="!searchScore" i18n>Created: {{document.created | date}}</small>
         </div>
 
       </div>

From 659c7cdbd856ba42815941f22ba181c31a6c4c79 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 1 Jan 2021 20:57:57 -0800
Subject: [PATCH 0583/1300] Hide matching pattern if algorithm is auto

---
 .../components/common/edit-dialog/edit-dialog.component.ts  | 6 +++++-
 .../correspondent-edit-dialog.component.html                | 6 +++---
 .../document-type-edit-dialog.component.html                | 6 +++---
 .../tag-list/tag-edit-dialog/tag-edit-dialog.component.html | 4 ++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
index ea96be90a..8f7af1418 100644
--- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
@@ -2,7 +2,7 @@ import { Directive, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Observable } from 'rxjs';
-import { MATCHING_ALGORITHMS } from 'src/app/data/matching-model';
+import { MATCHING_ALGORITHMS, MATCH_AUTO } from 'src/app/data/matching-model';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
 import { ToastService } from 'src/app/services/toast.service';
@@ -61,6 +61,10 @@ export abstract class EditDialogComponent<T extends ObjectWithId> implements OnI
     return MATCHING_ALGORITHMS
   }
 
+  get patternRequired(): boolean {
+    return this.objectForm?.value.matching_algorithm !== MATCH_AUTO
+  }
+
   save() {
     var newObject = Object.assign(Object.assign({}, this.object), this.objectForm.value)
     var serverResponse: Observable<T>
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
index fd6b01de9..bc6cb90f9 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
@@ -6,14 +6,14 @@
     </button>
   </div>
   <div class="modal-body">
-    
+
     <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
     <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-    <app-input-text i18n-title title="Matching pattern" formControlName="match" i18n-hint hint="Auto matching does not require you to fill in this field."></app-input-text>
+    <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match"></app-input-text>
     <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" i18n-hint hint="Auto matching ignores this option."></app-input-check>
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
     <button type="submit" class="btn btn-primary" i18n>Save</button>
   </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
index 9466b433d..264e971ea 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
@@ -6,10 +6,10 @@
       </button>
     </div>
     <div class="modal-body">
-      
+
       <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
       <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-      <app-input-text i18n-title title="Matching pattern" formControlName="match" i18n-hint hint="Auto matching does not require you to fill in this field."></app-input-text>
+      <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match"></app-input-text>
       <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" i18n-hint hint="Auto matching ignores this option."></app-input-check>
 
     </div>
@@ -17,4 +17,4 @@
       <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
       <button type="submit" class="btn btn-primary" i18n>Save</button>
     </div>
-  </form>
\ No newline at end of file
+  </form>
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
index 7efaac4b9..34145517e 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
@@ -17,10 +17,10 @@
           </ng-template>
         </ng-select>
       </div>
-     
+
       <app-input-check i18n-title title="Inbox tag" formControlName="is_inbox_tag" i18n-hint hint="Inbox tags are automatically assigned to all consumed documents."></app-input-check>
       <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-      <app-input-text i18n-title title="Matching pattern" formControlName="match" i18n-hint hint="Auto matching does not require you to fill in this field."></app-input-text>
+      <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match"></app-input-text>
       <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" i18n-hint hint="Auto matching ignores this option."></app-input-check>
     </div>
     <div class="modal-footer">

From 8ab251c5f7d86fce37bd92f6cb18e070c0f67221 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:04:46 +0100
Subject: [PATCH 0584/1300] Execute python tests

---
 .github/workflows/docker-publish.yml | 41 ++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 53d53e25c..a2897c05b 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -5,6 +5,47 @@ on:
     branches: travis-multiarch-builds
 
 jobs:
+  tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        python-version: [3.7, 3.8, 3.9]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+    - name: Persistent Github pip cache
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key: ${{ runner.os }}-pip${{ matrix.python-version }}
+    - name: Update system, install system requirements
+      run: |
+        apt-get update -qq
+        apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
+    - name: Upgrade pip, Install dependencies
+      run: |
+        pip install --upgrade pip pipenv sphinx
+        pipenv lock -r > requirements.txt
+        pip install -r requirements.txt
+    - name: Run sphinx
+      run: |
+        sphinx-build -b html ../docs ../docs/_build -W    
+    - name: Execute Tests
+      run: |
+        cd src/
+        pytest --cov
+        pycodestyle
+    - name: Execute coveralls
+      run: |
+        coveralls
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest

From 41c1b711c2d29692c4d366dd2ba789b91bb2c15c Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:08:19 +0100
Subject: [PATCH 0585/1300] Use sudo for apt

---
 .github/workflows/docker-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a2897c05b..f6ac55c1e 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -28,8 +28,8 @@ jobs:
         key: ${{ runner.os }}-pip${{ matrix.python-version }}
     - name: Update system, install system requirements
       run: |
-        apt-get update -qq
-        apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
+        sudo apt-get update -qq
+        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip, Install dependencies
       run: |
         pip install --upgrade pip pipenv sphinx

From b8b0b61e67725a215e341f2ed967343b7e5cd81f Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:15:10 +0100
Subject: [PATCH 0586/1300] Execute pip commands one after the other to find
 issue

---
 .github/workflows/docker-publish.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index f6ac55c1e..a810f134f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -30,10 +30,14 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
-    - name: Upgrade pip, Install dependencies
+    - name: Upgrade pip
       run: |
         pip install --upgrade pip pipenv sphinx
+    - name: Gather pip requirements
+      run: |
         pipenv lock -r > requirements.txt
+    - name: Insall pip requirements
+      run: |
         pip install -r requirements.txt
     - name: Run sphinx
       run: |

From ef28ae811767a51a94d1cf0b94584c852f9ab383 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:19:58 +0100
Subject: [PATCH 0587/1300] Move sphinx step below tests step as it used to be

---
 .github/workflows/docker-publish.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a810f134f..e020fb66b 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -36,17 +36,17 @@ jobs:
     - name: Gather pip requirements
       run: |
         pipenv lock -r > requirements.txt
-    - name: Insall pip requirements
+    - name: Install pip requirements
       run: |
         pip install -r requirements.txt
-    - name: Run sphinx
-      run: |
-        sphinx-build -b html ../docs ../docs/_build -W    
     - name: Execute Tests
       run: |
         cd src/
         pytest --cov
         pycodestyle
+    - name: Run sphinx
+      run: |
+        sphinx-build -b html ../docs ../docs/_build -W    
     - name: Execute coveralls
       run: |
         coveralls

From 4a45a77753addc28f9b845a51978d8729b1c2db8 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:23:49 +0100
Subject: [PATCH 0588/1300] Add pytest to install step

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index e020fb66b..c074b1d2f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -32,7 +32,7 @@ jobs:
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip
       run: |
-        pip install --upgrade pip pipenv sphinx
+        pip install --upgrade pip pipenv sphinx pytest
     - name: Gather pip requirements
       run: |
         pipenv lock -r > requirements.txt

From d292f710077ad6fca94f64902b3ed9a2dc70888a Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:31:20 +0100
Subject: [PATCH 0589/1300] Add pytest-cov to install

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index c074b1d2f..9bba2e031 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -32,7 +32,7 @@ jobs:
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip
       run: |
-        pip install --upgrade pip pipenv sphinx pytest
+        pip install --upgrade pip pipenv sphinx pytest pytest-cov
     - name: Gather pip requirements
       run: |
         pipenv lock -r > requirements.txt

From 90f4ccfb941c4d973094d84b1dc8ce7f0605ad48 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:41:21 +0100
Subject: [PATCH 0590/1300] Remove cache to see if that helps with pytest-cov
 issues

---
 .github/workflows/docker-publish.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 9bba2e031..090cfa937 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -17,15 +17,6 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-    - name: Persistent Github pip cache
-      uses: actions/cache@v2
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip${{ matrix.python-version }}
     - name: Update system, install system requirements
       run: |
         sudo apt-get update -qq

From 4bea504690611de0340150a75b205f31d8638665 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:44:08 +0100
Subject: [PATCH 0591/1300] Try o make pipenv also install dev dependencies

---
 .github/workflows/docker-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 090cfa937..24c3fe062 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -23,10 +23,10 @@ jobs:
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip
       run: |
-        pip install --upgrade pip pipenv sphinx pytest pytest-cov
+        pip install --upgrade pip pipenv sphinx
     - name: Gather pip requirements
       run: |
-        pipenv lock -r > requirements.txt
+        pipenv lock --dev -r > requirements.txt
     - name: Install pip requirements
       run: |
         pip install -r requirements.txt

From 4684d199538c2b49ba5372f3db7bd99e99c8524b Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 11:23:30 +0100
Subject: [PATCH 0592/1300] github-actions: readding explicit install

explicitly install pytest, pytest-cov and coveralls.
I think travis already did that and we need to explicitly do so now.
removed installing dev-dependencies, do it explicitly.
(just trying to reproduce the travis-ci build)
---
 .github/workflows/docker-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 24c3fe062..afbb2571f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -23,10 +23,10 @@ jobs:
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip
       run: |
-        pip install --upgrade pip pipenv sphinx
+        pip install --upgrade pip pipenv sphinx pytest pytest-cov coveralls
     - name: Gather pip requirements
       run: |
-        pipenv lock --dev -r > requirements.txt
+        pipenv lock -r > requirements.txt
     - name: Install pip requirements
       run: |
         pip install -r requirements.txt

From 376efcde27f6f3c0b9f55695ea8013a2af63e650 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 11:27:38 +0100
Subject: [PATCH 0593/1300] github-actions: removing unsupported parameter

I don't understand what the "-n auto" parameter does, pytest doesn't either
(in the version installed) - so removing it to see if that produces something
usable.
---
 src/setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/setup.cfg b/src/setup.cfg
index 2a1a348bd..f43c9adf6 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -3,7 +3,7 @@ exclude = migrations, paperless/settings.py, .tox, */tests/*
 
 [tool:pytest]
 DJANGO_SETTINGS_MODULE=paperless.settings
-addopts = --pythonwarnings=all --cov --cov-report=html -n auto
+addopts = --pythonwarnings=all --cov --cov-report=html
 env =
   PAPERLESS_DISABLE_DBHANDLER=true
 

From 28209bb4746f048c42d2285aa36328e91bf57558 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 11:30:12 +0100
Subject: [PATCH 0594/1300] github-actions: also install wheel

There's an error about pip wheel not being available and falling back
to some legacy version. Let's see if this helps.
---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index afbb2571f..a7a399c3f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -23,7 +23,7 @@ jobs:
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip
       run: |
-        pip install --upgrade pip pipenv sphinx pytest pytest-cov coveralls
+        pip install --upgrade pip pipenv wheel sphinx pytest pytest-cov coveralls
     - name: Gather pip requirements
       run: |
         pipenv lock -r > requirements.txt

From a21fb36cd27e381d5297113ddb9ca442e138ca7c Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 11:33:56 +0100
Subject: [PATCH 0595/1300] github-actions: readding previously removed "-n
 auto"

possibly this is fixed by the wheel dependency that was missing before.
---
 src/setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/setup.cfg b/src/setup.cfg
index f43c9adf6..2a1a348bd 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -3,7 +3,7 @@ exclude = migrations, paperless/settings.py, .tox, */tests/*
 
 [tool:pytest]
 DJANGO_SETTINGS_MODULE=paperless.settings
-addopts = --pythonwarnings=all --cov --cov-report=html
+addopts = --pythonwarnings=all --cov --cov-report=html -n auto
 env =
   PAPERLESS_DISABLE_DBHANDLER=true
 

From eb91ac0c3ccd06426c53405842fe3a2919d58e13 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 12:52:10 +0100
Subject: [PATCH 0596/1300] cleared up some plural forms

---
 src-ui/messages.xlf                           | 36 ++++++-------------
 .../upload-file-widget.component.html         |  2 +-
 .../document-list.component.html              |  4 +--
 3 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 314766dfb..079fd41c1 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -79,15 +79,8 @@
           <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="546b2014cc578af06b6023a7f38fa77aa9d58f5d" datatype="html">
-        <source>{VAR_PLURAL, plural, =1 {document} other {documents}}</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">86</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="3c298bb50741c8b2641889b0a0e0009769e66370" datatype="html">
-        <source>Selected <x id="INTERPOLATION" equiv-text="{{list.selected.size}}"/> of <x id="INTERPOLATION_1" equiv-text="{{list.collectionSize || 0}}"/> <x id="ICU" equiv-text="{list.collectionSize, plural, =1 {document} other {documents}}"/></source>
+      <trans-unit id="08064670ae1497e47fb040ce7f610e55744b8889" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">86</context>
@@ -1019,13 +1012,6 @@
           <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60" datatype="html">
-        <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">61</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e" datatype="html">
         <source>Created: <x id="INTERPOLATION" equiv-text="{{document.created | date}}"/></source>
         <context-group purpose="location">
@@ -1047,6 +1033,13 @@
           <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60" datatype="html">
+        <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">61</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="2840db547019ce8c76b2cdbe3a1653c5b68b06af" datatype="html">
         <source>View in browser</source>
         <context-group purpose="location">
@@ -1295,15 +1288,8 @@
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="a7b50b2df68e875a918d1f4f98f358d756139c13" datatype="html">
-        <source>{VAR_PLURAL, plural, =1 {file} =other {<x id="INTERPOLATION"/> files}}</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="ec37c68a90632530f5cc8b7e5245cab89ef8bf82" datatype="html">
-        <source>Uploading <x id="ICU" equiv-text="{uploadStatus.length, plural, =1 {file} =other {{{uploadStatus.length}} files}}"/>...</source>
+      <trans-unit id="33c76d75ce25ce3b05ab22877f1b6b09dcf603ae" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {Uploading file...} =other {Uploading <x id="INTERPOLATION"/> files...}}</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
           <context context-type="linenumber">13</context>
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index 38aff96ab..aa317bd52 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -10,7 +10,7 @@
       </ngx-file-drop>
     </form>
     <div *ngIf="uploadVisible" class="mt-3">
-      <p i18n>Uploading {uploadStatus.length, plural, =1 {file} =other {{{uploadStatus.length}} files}}...</p>
+      <p i18n>{uploadStatus.length, plural, =1 {Uploading file...} =other {Uploading {{uploadStatus.length}} files...}}</p>
       <ngb-progressbar [value]="loadedSum" [max]="totalSum" [striped]="true" [animated]="uploadStatus.length > 0">
       </ngb-progressbar>
     </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index e627c428d..bd7797e14 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -83,8 +83,8 @@
 </div>
 
 <div class="d-flex justify-content-between align-items-center">
-  <p i18n *ngIf="list.selected.size > 0">Selected {{list.selected.size}} of {{list.collectionSize || 0}} {list.collectionSize, plural, =1 {document} other {documents}}</p>
-  <p *ngIf="list.selected.size == 0">{list.collectionSize, plural, =1 {1 document} other {{{list.collectionSize || 0}} documents}}</p>
+  <p i18n *ngIf="list.selected.size > 0">{list.collectionSize, plural, =1 {Selected {{list.selected.size}} of {{list.collectionSize || 0}} document} other {Selected {{list.selected.size}} of {{list.collectionSize || 0}} documents}}</p>
+  <p i18n *ngIf="list.selected.size == 0">{list.collectionSize, plural, =1 {1 document} other {{{list.collectionSize || 0}} documents}}</p>
   <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
   [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
 </div>

From 86677ee6b45c666b21b8613f3e708fd5cfb18c89 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 12:54:25 +0100
Subject: [PATCH 0597/1300] messages updates

---
 src-ui/messages.xlf                                       | 8 ++++----
 .../components/document-list/document-list.component.html | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 079fd41c1..73936a511 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -79,15 +79,15 @@
           <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="08064670ae1497e47fb040ce7f610e55744b8889" datatype="html">
-        <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source>
+      <trans-unit id="439e7cc3c1ecefded167ed4d37f7d22dad6a9159" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8b04a8e375ac6760a54aabaf5df0287d53ce4a4a" datatype="html">
-        <source>{VAR_PLURAL, plural, =1 {1 document} other {<x id="INTERPOLATION"/> documents}}</source>
+      <trans-unit id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">87</context>
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index bd7797e14..e4d7256e1 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -83,8 +83,8 @@
 </div>
 
 <div class="d-flex justify-content-between align-items-center">
-  <p i18n *ngIf="list.selected.size > 0">{list.collectionSize, plural, =1 {Selected {{list.selected.size}} of {{list.collectionSize || 0}} document} other {Selected {{list.selected.size}} of {{list.collectionSize || 0}} documents}}</p>
-  <p i18n *ngIf="list.selected.size == 0">{list.collectionSize, plural, =1 {1 document} other {{{list.collectionSize || 0}} documents}}</p>
+  <p i18n *ngIf="list.selected.size > 0">{list.collectionSize, plural, =1 {Selected {{list.selected.size}} of one document} other {Selected {{list.selected.size}} of {{list.collectionSize || 0}} documents}}</p>
+  <p i18n *ngIf="list.selected.size == 0">{list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}}</p>
   <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
   [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
 </div>

From a0505aa8e90b92531e927f738f3a7d0a380e008d Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sat, 2 Jan 2021 11:56:20 +0000
Subject: [PATCH 0598/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 66 ++++++++++++-------------------
 1 file changed, 25 insertions(+), 41 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index 9ad3b5dc7..fc8d0ffcc 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -89,25 +89,17 @@
           <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="546b2014cc578af06b6023a7f38fa77aa9d58f5d">
-        <source>{VAR_PLURAL, plural, =1 {document} other {documents}}</source>
-        <target>{VAR_PLURAL, plural, =1 {Dokument} other {Dokumente}}</target>
+      <trans-unit datatype="html" id="439e7cc3c1ecefded167ed4d37f7d22dad6a9159">
+        <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 { <x id="INTERPOLATION"/> von 1 Dokumente ausgewählt} other {<x id="INTERPOLATION"/> von <x id="INTERPOLATION_1"/> Dokumente ausgewählt}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="3c298bb50741c8b2641889b0a0e0009769e66370">
-        <source>Selected <x equiv-text="{{list.selected.size}}" id="INTERPOLATION"/> of <x equiv-text="{{list.collectionSize || 0}}" id="INTERPOLATION_1"/> <x equiv-text="{list.collectionSize, plural, =1 {document} other {documents}}" id="ICU"/></source>
-        <target><x equiv-text="{{list.selected.size}}" id="INTERPOLATION"/> von <x equiv-text="{{list.collectionSize || 0}}" id="INTERPOLATION_1"/> <x equiv-text="{list.collectionSize, plural, =1 {document} other {documents}}" id="ICU"/> ausgewählt</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">86</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8b04a8e375ac6760a54aabaf5df0287d53ce4a4a">
-        <source>{VAR_PLURAL, plural, =1 {1 document} other {<x id="INTERPOLATION"/> documents}}</source>
-        <target>{VAR_PLURAL, plural, =1 {1 Dokument} other {<x id="INTERPOLATION"/> Dokumente}}</target>
+      <trans-unit datatype="html" id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9">
+        <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Ein Dokument} other {<x id="INTERPOLATION"/> Dokumente}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">87</context>
@@ -553,6 +545,14 @@
           <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
+        <source>Settings</source>
+        <target>Einstellungen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="11ebd254cc9294717105c5982eb0cd2af30a446d">
         <source>General settings</source>
         <target>Allgemeine Einstellungen</target>
@@ -914,14 +914,6 @@
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
-        <source>Settings</source>
-        <target>Einstellungen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">40</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="bb694b49d408265c91c62799c2b3a7e3151c824d">
         <source>Logout</source>
         <target>Abmelden</target>
@@ -1163,14 +1155,6 @@
           <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60">
-        <source>Score:</source>
-        <target>Relevanz:</target>
-        <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">61</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e">
         <source>Created: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></source>
         <target>Erstellt: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></target>
@@ -1195,6 +1179,14 @@
           <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60">
+        <source>Score:</source>
+        <target>Relevanz:</target>
+        <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">61</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="2840db547019ce8c76b2cdbe3a1653c5b68b06af">
         <source>View in browser</source>
         <target>Im Browser anzeigen</target>
@@ -1478,17 +1470,9 @@
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="a7b50b2df68e875a918d1f4f98f358d756139c13">
-        <source>{VAR_PLURAL, plural, =1 {file} =other {<x id="INTERPOLATION"/> files}}</source>
-        <target>{VAR_PLURAL, plural, =1 {Datei} =other {<x id="INTERPOLATION"/> Dateien}}</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="ec37c68a90632530f5cc8b7e5245cab89ef8bf82">
-        <source>Uploading <x equiv-text="{uploadStatus.length, plural, =1 {file} =other {{{uploadStatus.length}} files}}" id="ICU"/>...</source>
-        <target>Lade <x equiv-text="{uploadStatus.length, plural, =1 {file} =other {{{uploadStatus.length}} files}}" id="ICU"/> hoch...</target>
+      <trans-unit datatype="html" id="33c76d75ce25ce3b05ab22877f1b6b09dcf603ae">
+        <source>{VAR_PLURAL, plural, =1 {Uploading file...} =other {Uploading <x id="INTERPOLATION"/> files...}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Lade Datei hoch...} =other {Lade <x id="INTERPOLATION"/> Dateien hoch...}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
           <context context-type="linenumber">13</context>

From 158e83c425685bab2700f38919d5b6180c9bc3c0 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 14:18:20 +0100
Subject: [PATCH 0599/1300] fixed quotes

---
 src-ui/messages.xlf                                           | 4 ++--
 .../src/app/components/manage/settings/settings.component.ts  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 73936a511..4a84cfd64 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -457,8 +457,8 @@
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1153806754022288374" datatype="html">
-        <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/> deleted.</source>
+      <trans-unit id="5610279464668232148" datatype="html">
+        <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/>&quot; deleted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
           <context context-type="linenumber">54</context>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 0b0646157..559ffe00f 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -51,7 +51,7 @@ export class SettingsComponent implements OnInit {
     this.savedViewService.delete(savedView).subscribe(() => {
       this.savedViewGroup.removeControl(savedView.id.toString())
       this.savedViews.splice(this.savedViews.indexOf(savedView), 1)
-      this.toastService.showInfo($localize`Saved view "${savedView.name} deleted.`)
+      this.toastService.showInfo($localize`Saved view "${savedView.name}" deleted.`)
     })
   }
 

From 4d7d3afc7d230884a64334e5139ee306a82c244e Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sat, 2 Jan 2021 13:19:36 +0000
Subject: [PATCH 0600/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index fc8d0ffcc..98a3b057c 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -521,9 +521,9 @@
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="1153806754022288374">
-        <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/> deleted.</source>
-        <target>Ansicht <x equiv-text="savedView.name" id="PH"/> gelöscht.</target>
+      <trans-unit datatype="html" id="5610279464668232148">
+        <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
+        <target>Gespeicherte Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; gelöscht.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
           <context context-type="linenumber">54</context>

From 654ee4e62e774aad562bfd708fe873e21fbcee1c Mon Sep 17 00:00:00 2001
From: jayme-github <jayme-github@users.noreply.github.com>
Date: Sat, 2 Jan 2021 14:40:56 +0100
Subject: [PATCH 0601/1300] Add option to ignore certain dates in parse_date

PAPERLESS_IGNORE_DATES allows to specify a comma separated list of dates
to ignore during date parsing (from filename and content). This can be
used so specify dates that do appear often in documents but are usually
not the documents creation date (like your date of birth).
---
 src/documents/parsers.py                 | 15 +++++++++++----
 src/documents/tests/test_date_parsing.py | 15 +++++++++++++++
 src/paperless/settings.py                |  8 ++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index e14607bd0..cf413a449 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -209,6 +209,13 @@ def parse_date(filename, text):
             }
         )
 
+    def __filter(date):
+        if date and date.year > 1900 and \
+                date <= timezone.now() and \
+                date.date() not in settings.IGNORE_DATES:
+            return date
+        return None
+
     date = None
 
     # if filename date parsing is enabled, search there first:
@@ -222,7 +229,8 @@ def parse_date(filename, text):
                 # Skip all matches that do not parse to a proper date
                 continue
 
-            if date and date.year > 1900 and date <= timezone.now():
+            date = __filter(date)
+            if date is not None:
                 return date
 
     # Iterate through all regex matches in text and try to parse the date
@@ -235,10 +243,9 @@ def parse_date(filename, text):
             # Skip all matches that do not parse to a proper date
             continue
 
-        if date and date.year > 1900 and date <= timezone.now():
+        date = __filter(date)
+        if date is not None:
             break
-        else:
-            date = None
 
     return date
 
diff --git a/src/documents/tests/test_date_parsing.py b/src/documents/tests/test_date_parsing.py
index 357b0937e..9cbb19c2b 100644
--- a/src/documents/tests/test_date_parsing.py
+++ b/src/documents/tests/test_date_parsing.py
@@ -138,3 +138,18 @@ class TestDate(TestCase):
     @override_settings(FILENAME_DATE_ORDER="YMD")
     def test_filename_date_parse_invalid(self, *args):
         self.assertIsNone(parse_date("/tmp/20 408000l 2475 - test.pdf", "No date in here"))
+
+    @override_settings(IGNORE_DATES=(datetime.date(2019, 11, 3), datetime.date(2020, 1, 17)))
+    def test_ignored_dates(self, *args):
+        text = (
+            "lorem ipsum 110319, 20200117 and lorem 13.02.2018 lorem "
+            "ipsum"
+        )
+        date = parse_date("", text)
+        self.assertEqual(
+            date,
+            datetime.datetime(
+                2018, 2, 13, 0, 0,
+                tzinfo=tz.gettz(settings.TIME_ZONE)
+            )
+        )
\ No newline at end of file
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index e8b44e8cd..5191803d0 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -4,6 +4,7 @@ import multiprocessing
 import os
 import re
 
+import dateparser
 from dotenv import load_dotenv
 
 from django.utils.translation import gettext_lazy as _
@@ -444,3 +445,10 @@ PAPERLESS_TIKA_ENDPOINT = os.getenv("PAPERLESS_TIKA_ENDPOINT", "http://localhost
 PAPERLESS_TIKA_GOTENBERG_ENDPOINT = os.getenv(
     "PAPERLESS_TIKA_GOTENBERG_ENDPOINT", "http://localhost:3000"
 )
+
+# List dates that should be ignored when trying to parse date from document text
+IGNORE_DATES = set()
+for s in os.getenv("PAPERLESS_IGNORE_DATES", "").split(","):
+    d = dateparser.parse(s)
+    if d:
+        IGNORE_DATES.add(d.date())

From 97e96d02f2f11de7bd1493398d4e20067de2f698 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 15:25:13 +0100
Subject: [PATCH 0602/1300] test cases

---
 src/paperless_tika/parsers.py                |  3 +-
 src/paperless_tika/tests/test_tika_parser.py | 60 ++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 src/paperless_tika/tests/test_tika_parser.py

diff --git a/src/paperless_tika/parsers.py b/src/paperless_tika/parsers.py
index 13e937daa..cde6543be 100644
--- a/src/paperless_tika/parsers.py
+++ b/src/paperless_tika/parsers.py
@@ -68,7 +68,8 @@ class TikaDocumentParser(DocumentParser):
         url = gotenberg_server + "/convert/office"
 
         self.log("info", f"Converting {document_path} to PDF as {pdf_path}")
-        files = {"files": (file_name, open(document_path, "rb"))}
+        files = {"files": (file_name or os.path.basename(document_path),
+                           open(document_path, "rb"))}
         headers = {}
 
         try:
diff --git a/src/paperless_tika/tests/test_tika_parser.py b/src/paperless_tika/tests/test_tika_parser.py
new file mode 100644
index 000000000..67563e5fe
--- /dev/null
+++ b/src/paperless_tika/tests/test_tika_parser.py
@@ -0,0 +1,60 @@
+import datetime
+import os
+from pathlib import Path
+from unittest import mock
+
+from django.test import TestCase
+from requests import Response
+
+from paperless_tika.parsers import TikaDocumentParser
+
+
+class TestTikaParser(TestCase):
+
+    def setUp(self) -> None:
+        self.parser = TikaDocumentParser(logging_group=None)
+
+    def tearDown(self) -> None:
+        self.parser.cleanup()
+
+    @mock.patch("paperless_tika.parsers.parser.from_file")
+    @mock.patch("paperless_tika.parsers.requests.post")
+    def test_parse(self, post, from_file):
+        from_file.return_value = {
+            "content": "the content",
+            "metadata": {
+                "Creation-Date": "2020-11-21"
+            }
+        }
+        response = Response()
+        response._content = b"PDF document"
+        response.status_code = 200
+        post.return_value = response
+
+        file = os.path.join(self.parser.tempdir, "input.odt")
+        Path(file).touch()
+        self.parser.parse(file, "application/vnd.oasis.opendocument.text")
+
+        self.assertEqual(self.parser.text, "the content")
+        self.assertIsNotNone(self.parser.archive_path)
+        with open(self.parser.archive_path, "rb") as f:
+            self.assertEqual(f.read(), b"PDF document")
+
+        self.assertEqual(self.parser.date, datetime.datetime(2020, 11, 21))
+
+    @mock.patch("paperless_tika.parsers.parser.from_file")
+    def test_metadata(self, from_file):
+        from_file.return_value = {
+            "metadata": {
+                "Creation-Date": "2020-11-21",
+                "Some-key": "value"
+            }
+        }
+
+        file = os.path.join(self.parser.tempdir, "input.odt")
+        Path(file).touch()
+
+        metadata = self.parser.extract_metadata(file, "application/vnd.oasis.opendocument.text")
+
+        self.assertTrue("Creation-Date" in [m['key'] for m in metadata])
+        self.assertTrue("Some-key" in [m['key'] for m in metadata])

From e97ff3d671bc9551b21aa426222c9e80227ddce4 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 15:26:09 +0100
Subject: [PATCH 0603/1300] code style

---
 src/documents/parsers.py      | 1 +
 src/paperless_tika/signals.py | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index e14607bd0..371a53c4b 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -190,6 +190,7 @@ def make_thumbnail_from_pdf(in_path, temp_dir, logging_group=None):
 
     return out_path
 
+
 def parse_date(filename, text):
     """
     Returns the date of the document.
diff --git a/src/paperless_tika/signals.py b/src/paperless_tika/signals.py
index 409daebe2..137416abb 100644
--- a/src/paperless_tika/signals.py
+++ b/src/paperless_tika/signals.py
@@ -7,12 +7,12 @@ def tika_consumer_declaration(sender, **kwargs):
         "weight": 10,
         "mime_types": {
             "application/msword": ".doc",
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.document": ".docx",
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.document": ".docx",  # NOQA: E501
             "application/vnd.ms-excel": ".xls",
-            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": ".xlsx",
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": ".xlsx",  # NOQA: E501
             "application/vnd.ms-powerpoint": ".ppt",
-            "application/vnd.openxmlformats-officedocument.presentationml.presentation": ".pptx",
-            "application/vnd.openxmlformats-officedocument.presentationml.slideshow": ".ppsx",
+            "application/vnd.openxmlformats-officedocument.presentationml.presentation": ".pptx",  # NOQA: E501
+            "application/vnd.openxmlformats-officedocument.presentationml.slideshow": ".ppsx",  # NOQA: E501
             "application/vnd.oasis.opendocument.presentation": ".odp",
             "application/vnd.oasis.opendocument.spreadsheet": ".ods",
             "application/vnd.oasis.opendocument.text": ".odt",

From 4cef4adc7e42d0514c5659d1376f9fbda8b76047 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 15:30:52 +0100
Subject: [PATCH 0604/1300] config file

---
 paperless.conf.example | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/paperless.conf.example b/paperless.conf.example
index d9d0f5b06..d732bb5cb 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -56,6 +56,12 @@
 #PAPERLESS_FILENAME_PARSE_TRANSFORMS=[]
 #PAPERLESS_THUMBNAIL_FONT_NAME=
 
+# Tika settings
+
+#PAPERLESS_TIKA_ENABLED=false
+#PAPERLESS_TIKA_ENDPOINT=http://localhost:9998
+#PAPERLESS_TIKA_GOTENBERG_ENDPOINT=http://localhost:3000
+
 # Binaries
 
 #PAPERLESS_CONVERT_BINARY=/usr/bin/convert

From 89d6e422f5929eabb1e1b263a06b7f164eda2038 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 15:37:27 +0100
Subject: [PATCH 0605/1300] fix bugs and test cases

---
 src/documents/file_handling.py               | 4 +++-
 src/paperless_tesseract/tests/test_parser.py | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index 5643756ac..a5274a5f4 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -100,7 +100,9 @@ def generate_filename(doc, counter=0):
                                     many_to_dictionary(doc.tags))
 
             tag_list = pathvalidate.sanitize_filename(
-                ",".join([tag.name for tag in doc.tags.all()]),
+                ",".join(sorted(
+                    [tag.name for tag in doc.tags.all()]
+                )),
                 replacement_text="-"
             )
 
diff --git a/src/paperless_tesseract/tests/test_parser.py b/src/paperless_tesseract/tests/test_parser.py
index 7be176663..644587de0 100644
--- a/src/paperless_tesseract/tests/test_parser.py
+++ b/src/paperless_tesseract/tests/test_parser.py
@@ -78,7 +78,7 @@ class TestParser(DirectoriesMixin, TestCase):
         parser.get_thumbnail(os.path.join(self.SAMPLE_FILES, 'simple-digital.pdf'), "application/pdf")
         # dont really know how to test it, just call it and assert that it does not raise anything.
 
-    @mock.patch("paperless_tesseract.parsers.run_convert")
+    @mock.patch("documents.parsers.run_convert")
     def test_thumbnail_fallback(self, m):
 
         def call_convert(input_file, output_file, **kwargs):

From 57f77c465728625653ef171a7c8780ce94675aa5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 2 Jan 2021 15:52:02 +0100
Subject: [PATCH 0606/1300] fix test case

---
 src/documents/tests/test_consumer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 743c43846..5049c1dd2 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -470,7 +470,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
 class PostConsumeTestCase(TestCase):
 
-    @mock.patch("documents.signals.handlers.Popen")
+    @mock.patch("documents.consumer.Popen")
     @override_settings(POST_CONSUME_SCRIPT=None)
     def test_no_post_consume_script(self, m):
         doc = Document.objects.create(title="Test", mime_type="application/pdf")
@@ -483,7 +483,7 @@ class PostConsumeTestCase(TestCase):
 
         m.assert_not_called()
 
-    @mock.patch("documents.signals.handlers.Popen")
+    @mock.patch("documents.consumer.Popen")
     @override_settings(POST_CONSUME_SCRIPT="script")
     def test_post_consume_script_simple(self, m):
         doc = Document.objects.create(title="Test", mime_type="application/pdf")
@@ -492,7 +492,7 @@ class PostConsumeTestCase(TestCase):
 
         m.assert_called_once()
 
-    @mock.patch("documents.signals.handlers.Popen")
+    @mock.patch("documents.consumer.Popen")
     @override_settings(POST_CONSUME_SCRIPT="script")
     def test_post_consume_script_with_correspondent(self, m):
         c = Correspondent.objects.create(name="my_bank")

From 0e4597131b258e0bbfc258ff0a879ed931359d83 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 2 Jan 2021 07:24:48 -0800
Subject: [PATCH 0607/1300] Also hide case insensitive checkbox for auto
 matching algorithm

---
 .../correspondent-edit-dialog.component.html                    | 2 +-
 .../document-type-edit-dialog.component.html                    | 2 +-
 .../tag-list/tag-edit-dialog/tag-edit-dialog.component.html     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
index bc6cb90f9..48477b229 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
@@ -10,7 +10,7 @@
     <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
     <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
     <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match"></app-input-text>
-    <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" i18n-hint hint="Auto matching ignores this option."></app-input-check>
+    <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive"></app-input-check>
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
index 264e971ea..ba017faf7 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
@@ -10,7 +10,7 @@
       <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
       <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
       <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match"></app-input-text>
-      <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" i18n-hint hint="Auto matching ignores this option."></app-input-check>
+      <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive"></app-input-check>
 
     </div>
     <div class="modal-footer">
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
index 34145517e..9929b54d5 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
@@ -21,7 +21,7 @@
       <app-input-check i18n-title title="Inbox tag" formControlName="is_inbox_tag" i18n-hint hint="Inbox tags are automatically assigned to all consumed documents."></app-input-check>
       <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
       <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match"></app-input-text>
-      <app-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" i18n-hint hint="Auto matching ignores this option."></app-input-check>
+      <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive"></app-input-check>
     </div>
     <div class="modal-footer">
       <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>

From 4ddc034e9ce554bdb6e0189caab630e155dcd76f Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sat, 2 Jan 2021 23:58:13 +0000
Subject: [PATCH 0608/1300] Apply translations in nl_NL

at least 80% translated for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'nl_NL' language.

 Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
---
 src/locale/nl_NL/LC_MESSAGES/django.po | 563 +++++++++++++++++++++++++
 1 file changed, 563 insertions(+)
 create mode 100644 src/locale/nl_NL/LC_MESSAGES/django.po

diff --git a/src/locale/nl_NL/LC_MESSAGES/django.po b/src/locale/nl_NL/LC_MESSAGES/django.po
new file mode 100644
index 000000000..7a79df41d
--- /dev/null
+++ b/src/locale/nl_NL/LC_MESSAGES/django.po
@@ -0,0 +1,563 @@
+# 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:
+# Ben Zweekhorst <bzweekhorst@gmail.com>, 2021
+# J V <bugs.github@dwarfy.be>, 2021
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-01-02 00:26+0000\n"
+"PO-Revision-Date: 2020-12-30 19:27+0000\n"
+"Last-Translator: J V <bugs.github@dwarfy.be>, 2021\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/paperless/teams/115905/nl_NL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl_NL\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: documents/apps.py:10
+msgid "Documents"
+msgstr "Documenten"
+
+#: documents/models.py:32
+msgid "Any word"
+msgstr "Eender welk woord"
+
+#: documents/models.py:33
+msgid "All words"
+msgstr "Alle woorden"
+
+#: documents/models.py:34
+msgid "Exact match"
+msgstr "Exacte overeenkomst"
+
+#: documents/models.py:35
+msgid "Regular expression"
+msgstr "Reguliere expressie"
+
+#: documents/models.py:36
+msgid "Fuzzy word"
+msgstr "Vaag woord"
+
+#: documents/models.py:37
+msgid "Automatic"
+msgstr "Automatisch"
+
+#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
+#: paperless_mail/models.py:100
+msgid "name"
+msgstr "naam"
+
+#: documents/models.py:45
+msgid "match"
+msgstr "Overeenkomst"
+
+#: documents/models.py:49
+msgid "matching algorithm"
+msgstr "Algoritme voor het bepalen van de overeenkomst"
+
+#: documents/models.py:55
+msgid "is insensitive"
+msgstr "is niet hoofdlettergevoelig"
+
+#: documents/models.py:80 documents/models.py:140
+msgid "correspondent"
+msgstr "correspondent"
+
+#: documents/models.py:81
+msgid "correspondents"
+msgstr "correspondenten"
+
+#: documents/models.py:103
+msgid "color"
+msgstr "Kleur"
+
+#: documents/models.py:107
+msgid "is inbox tag"
+msgstr "is \"Postvak in\"-etiket"
+
+#: documents/models.py:109
+msgid ""
+"Marks this tag as an inbox tag: All newly consumed documents will be tagged "
+"with inbox tags."
+msgstr ""
+"Markeer dit etiket als een \"Postvak in\"-etiket: alle nieuw verwerkte "
+"documenten krijgen de \"Postvak in\"-etiketten."
+
+#: documents/models.py:114
+msgid "tag"
+msgstr "tag"
+
+#: documents/models.py:115 documents/models.py:171
+msgid "tags"
+msgstr "tags"
+
+#: documents/models.py:121 documents/models.py:153
+msgid "document type"
+msgstr "documenttype"
+
+#: documents/models.py:122
+msgid "document types"
+msgstr "documenttypen"
+
+#: documents/models.py:130
+msgid "Unencrypted"
+msgstr "Niet versleuteld"
+
+#: documents/models.py:131
+msgid "Encrypted with GNU Privacy Guard"
+msgstr "Versleuteld met GNU Privacy Guard"
+
+#: documents/models.py:144
+msgid "title"
+msgstr "titel"
+
+#: documents/models.py:157
+msgid "content"
+msgstr "inhoud"
+
+#: documents/models.py:159
+msgid ""
+"The raw, text-only data of the document. This field is primarily used for "
+"searching."
+msgstr ""
+"De onbewerkte gegevens van het document. Dit veld wordt voornamelijk "
+"gebruikt om te zoeken."
+
+#: documents/models.py:164
+msgid "mime type"
+msgstr ""
+
+#: documents/models.py:175
+msgid "checksum"
+msgstr "checksum"
+
+#: documents/models.py:179
+msgid "The checksum of the original document."
+msgstr ""
+
+#: documents/models.py:183
+msgid "archive checksum"
+msgstr "archief checksum"
+
+#: documents/models.py:188
+msgid "The checksum of the archived document."
+msgstr "De checksum van het gearchiveerde document."
+
+#: documents/models.py:192 documents/models.py:332
+msgid "created"
+msgstr "aangemaakt"
+
+#: documents/models.py:196
+msgid "modified"
+msgstr "gewijzigd"
+
+#: documents/models.py:200
+msgid "storage type"
+msgstr "type opslag"
+
+#: documents/models.py:208
+msgid "added"
+msgstr "toegevoegd"
+
+#: documents/models.py:212
+msgid "filename"
+msgstr "bestandsnaam"
+
+#: documents/models.py:217
+msgid "Current filename in storage"
+msgstr ""
+
+#: documents/models.py:221
+msgid "archive serial number"
+msgstr ""
+
+#: documents/models.py:226
+msgid "The position of this document in your physical document archive."
+msgstr ""
+
+#: documents/models.py:232
+msgid "document"
+msgstr "document"
+
+#: documents/models.py:233
+msgid "documents"
+msgstr "documenten"
+
+#: documents/models.py:315
+msgid "debug"
+msgstr ""
+
+#: documents/models.py:316
+msgid "information"
+msgstr "informatie"
+
+#: documents/models.py:317
+msgid "warning"
+msgstr "waarschuwing"
+
+#: documents/models.py:318
+msgid "error"
+msgstr "fout"
+
+#: documents/models.py:319
+msgid "critical"
+msgstr "kritisch"
+
+#: documents/models.py:323
+msgid "group"
+msgstr "groep"
+
+#: documents/models.py:326
+msgid "message"
+msgstr "bericht"
+
+#: documents/models.py:329
+msgid "level"
+msgstr "niveau"
+
+#: documents/models.py:336
+msgid "log"
+msgstr ""
+
+#: documents/models.py:337
+msgid "logs"
+msgstr ""
+
+#: documents/models.py:348 documents/models.py:398
+msgid "saved view"
+msgstr ""
+
+#: documents/models.py:349
+msgid "saved views"
+msgstr ""
+
+#: documents/models.py:352
+msgid "user"
+msgstr "gebruiker"
+
+#: documents/models.py:358
+msgid "show on dashboard"
+msgstr "weergeven op dashboard"
+
+#: documents/models.py:361
+msgid "show in sidebar"
+msgstr "weergeven in zijbalk"
+
+#: documents/models.py:365
+msgid "sort field"
+msgstr "sorteerveld"
+
+#: documents/models.py:368
+msgid "sort reverse"
+msgstr "omgekeerd sorteren"
+
+#: documents/models.py:374
+msgid "title contains"
+msgstr "titel bevat"
+
+#: documents/models.py:375
+msgid "content contains"
+msgstr "inhoud bevat"
+
+#: documents/models.py:376
+msgid "ASN is"
+msgstr "ASN is"
+
+#: documents/models.py:377
+msgid "correspondent is"
+msgstr "correspondent is"
+
+#: documents/models.py:378
+msgid "document type is"
+msgstr "documenttype is"
+
+#: documents/models.py:379
+msgid "is in inbox"
+msgstr "zit in \"Postvak in\""
+
+#: documents/models.py:380
+msgid "has tag"
+msgstr "heeft tag"
+
+#: documents/models.py:381
+msgid "has any tag"
+msgstr "heeft elke tag"
+
+#: documents/models.py:382
+msgid "created before"
+msgstr "aangemaakt voor"
+
+#: documents/models.py:383
+msgid "created after"
+msgstr "aangemaakt na"
+
+#: documents/models.py:384
+msgid "created year is"
+msgstr "aangemaakt jaar is"
+
+#: documents/models.py:385
+msgid "created month is"
+msgstr "aangemaakte maand is"
+
+#: documents/models.py:386
+msgid "created day is"
+msgstr "aangemaakte dag is"
+
+#: documents/models.py:387
+msgid "added before"
+msgstr "toegevoegd voor"
+
+#: documents/models.py:388
+msgid "added after"
+msgstr "toegevoegd na"
+
+#: documents/models.py:389
+msgid "modified before"
+msgstr "gewijzigd voor"
+
+#: documents/models.py:390
+msgid "modified after"
+msgstr "gewijzigd na"
+
+#: documents/models.py:391
+msgid "does not have tag"
+msgstr "heeft geen tag"
+
+#: documents/models.py:402
+msgid "rule type"
+msgstr "type regel"
+
+#: documents/models.py:406
+msgid "value"
+msgstr "waarde"
+
+#: documents/models.py:412
+msgid "filter rule"
+msgstr "filterregel"
+
+#: documents/models.py:413
+msgid "filter rules"
+msgstr "filterregels"
+
+#: paperless/settings.py:254
+msgid "English"
+msgstr "Engels"
+
+#: paperless/settings.py:255
+msgid "German"
+msgstr "Duits"
+
+#: paperless/urls.py:108
+msgid "Paperless-ng administration"
+msgstr "Paperless-ng administratie"
+
+#: paperless_mail/admin.py:24
+msgid "Filter"
+msgstr "Filter"
+
+#: paperless_mail/admin.py:26
+msgid ""
+"Paperless will only process mails that match ALL of the filters given below."
+msgstr ""
+"Paperless verwerkt alleen e-mails die voldoen aan ALLE onderstaande filters."
+
+#: paperless_mail/admin.py:34
+msgid "Actions"
+msgstr "Acties"
+
+#: paperless_mail/admin.py:36
+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 ""
+"De actie die wordt toegepast op de mail. Deze actie wordt alleen uitgevoerd "
+"wanneer documenten verwerkt werden uit de mail. Mails zonder bijlage blijven"
+" onaangeroerd."
+
+#: paperless_mail/admin.py:43
+msgid "Metadata"
+msgstr "Metadata"
+
+#: paperless_mail/admin.py:45
+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 ""
+
+#: paperless_mail/apps.py:9
+msgid "Paperless mail"
+msgstr ""
+
+#: paperless_mail/models.py:11
+msgid "mail account"
+msgstr "email account"
+
+#: paperless_mail/models.py:12
+msgid "mail accounts"
+msgstr "email accounts"
+
+#: paperless_mail/models.py:19
+msgid "No encryption"
+msgstr "Geen versleuteling"
+
+#: paperless_mail/models.py:20
+msgid "Use SSL"
+msgstr "Gebruik SSL"
+
+#: paperless_mail/models.py:21
+msgid "Use STARTTLS"
+msgstr "Gebruik STARTTLS"
+
+#: paperless_mail/models.py:29
+msgid "IMAP server"
+msgstr "IMAP-server"
+
+#: paperless_mail/models.py:33
+msgid "IMAP port"
+msgstr "IMAP-poort"
+
+#: paperless_mail/models.py:36
+msgid ""
+"This is usually 143 for unencrypted and STARTTLS connections, and 993 for "
+"SSL connections."
+msgstr ""
+"Dit is gewoonlijk 143 voor onversleutelde of STARTTLS verbindingen, en 993 "
+"voor SSL verbindingen."
+
+#: paperless_mail/models.py:40
+msgid "IMAP security"
+msgstr "IMAP-beveiliging"
+
+#: paperless_mail/models.py:46
+msgid "username"
+msgstr "gebruikersnaam"
+
+#: paperless_mail/models.py:50
+msgid "password"
+msgstr "wachtwoord"
+
+#: paperless_mail/models.py:60
+msgid "mail rule"
+msgstr "email-regel"
+
+#: paperless_mail/models.py:61
+msgid "mail rules"
+msgstr "email-regels"
+
+#: paperless_mail/models.py:69
+msgid "Mark as read, don't process read mails"
+msgstr "Markeer als gelezen, verwerk geen gelezen mails"
+
+#: paperless_mail/models.py:70
+msgid "Flag the mail, don't process flagged mails"
+msgstr "Markeer de mail, verwerk geen mails met markering"
+
+#: paperless_mail/models.py:71
+msgid "Move to specified folder"
+msgstr "Verplaats naar gegeven map"
+
+#: paperless_mail/models.py:72
+msgid "Delete"
+msgstr "Verwijder"
+
+#: paperless_mail/models.py:79
+msgid "Use subject as title"
+msgstr "Gebruik onderwerp als titel"
+
+#: paperless_mail/models.py:80
+msgid "Use attachment filename as title"
+msgstr "Gebruik naam van bijlage als titel"
+
+#: paperless_mail/models.py:90
+msgid "Do not assign a correspondent"
+msgstr "Wijs geen correspondent toe"
+
+#: paperless_mail/models.py:92
+msgid "Use mail address"
+msgstr "Gebruik het email-adres"
+
+#: paperless_mail/models.py:94
+msgid "Use name (or mail address if not available)"
+msgstr "Gebruik de naam, en anders het email-adres"
+
+#: paperless_mail/models.py:96
+msgid "Use correspondent selected below"
+msgstr "Gebruik de hieronder aangeduide correspondent"
+
+#: paperless_mail/models.py:104
+msgid "order"
+msgstr ""
+
+#: paperless_mail/models.py:111
+msgid "account"
+msgstr "account"
+
+#: paperless_mail/models.py:115
+msgid "folder"
+msgstr "map"
+
+#: paperless_mail/models.py:119
+msgid "filter from"
+msgstr "filter afzender"
+
+#: paperless_mail/models.py:122
+msgid "filter subject"
+msgstr "filter onderwerp"
+
+#: paperless_mail/models.py:125
+msgid "filter body"
+msgstr "filter inhoud"
+
+#: paperless_mail/models.py:129
+msgid "maximum age"
+msgstr "Maximale leeftijd"
+
+#: paperless_mail/models.py:131
+msgid "Specified in days."
+msgstr "Aangegeven in dagen"
+
+#: paperless_mail/models.py:134
+msgid "action"
+msgstr "actie"
+
+#: paperless_mail/models.py:140
+msgid "action parameter"
+msgstr "actie parameters"
+
+#: paperless_mail/models.py:142
+msgid ""
+"Additional parameter for the action selected above, i.e., the target folder "
+"of the move to folder action."
+msgstr ""
+"Extra parameters voor de hierboven gekozen actie, met andere woorden: de "
+"bestemmingsmap voor de verplaats-actie."
+
+#: paperless_mail/models.py:148
+msgid "assign title from"
+msgstr ""
+
+#: paperless_mail/models.py:158
+msgid "assign this tag"
+msgstr "wijs dit etiket toe"
+
+#: paperless_mail/models.py:166
+msgid "assign this document type"
+msgstr "wijs dit documenttype toe"
+
+#: paperless_mail/models.py:170
+msgid "assign correspondent from"
+msgstr "wijs correspondent toe van"
+
+#: paperless_mail/models.py:180
+msgid "assign this correspondent"
+msgstr "wijs deze correspondent toe"

From 74cf5373b969e1204845f7da1f5cc5962a4a362c Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sat, 2 Jan 2021 23:58:17 +0000
Subject: [PATCH 0609/1300] Apply translations in de

at least 80% translated for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'de' language.

 Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format

From d93ec0d5c7e919b6d70c820e3bb0704fed3f9250 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sat, 2 Jan 2021 23:58:23 +0000
Subject: [PATCH 0610/1300] Translate /src-ui/messages.xlf in de

at least 80% translated for the source file '/src-ui/messages.xlf'
on the 'de' language.

 Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format

From c15e94f75967e295b7c9f7c16cfdddac60be4864 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 3 Jan 2021 01:25:26 +0100
Subject: [PATCH 0611/1300] bugfix

---
 .../document-list/filter-editor/filter-editor.component.ts   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index b160ae073..e6565beac 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -78,6 +78,11 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     this.documentTypeSelectionModel.clear(false)
     this.tagSelectionModel.clear(false)
     this.correspondentSelectionModel.clear(false)
+    this._titleFilter = null
+    this.dateAddedBefore = null
+    this.dateAddedAfter = null
+    this.dateCreatedBefore = null
+    this.dateCreatedAfter = null
 
     value.forEach(rule => {
       switch (rule.rule_type) {

From e05f365e6a597314383f44ad6623fba050eebcae Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 3 Jan 2021 01:25:35 +0100
Subject: [PATCH 0612/1300] fix "ng serve"

---
 src-ui/angular.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index 0e35c9d59..df53224ca 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -76,13 +76,16 @@
 									"maximumError": "10kb"
 								}
 							]
+						},
+						"en-US": {
+							"localize": ["en-US"]
 						}
 					}
 				},
 				"serve": {
 					"builder": "@angular-devkit/build-angular:dev-server",
 					"options": {
-						"browserTarget": "paperless-ui:build"
+						"browserTarget": "paperless-ui:build:en-US"
 					},
 					"configurations": {
 						"production": {

From 7b56ad9dad620cb359b128e83b7a5aa49067dacb Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 3 Jan 2021 00:37:19 -0800
Subject: [PATCH 0613/1300] Allow authentication via HTTP_REMOTE_USER

---
 docs/configuration.rst    | 18 ++++++++++++------
 paperless.conf.example    |  1 +
 src/paperless/auth.py     | 19 +++++++++++++++++++
 src/paperless/settings.py |  7 +++++++
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 5ccb80b3a..c72027574 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -162,6 +162,12 @@ PAPERLESS_COOKIE_PREFIX=<str>
 
     Defaults to ``""``, which does not alter the cookie names.
 
+PAPERLESS_ENABLE_HTTP_REMOTE_USER=<bool>
+    Allows authentication via HTTP_REMOTE_USER which is used by some SSO
+    applications.
+
+    Defaults to `false` which disables this feature.
+
 .. _configuration-ocr:
 
 OCR settings
@@ -210,20 +216,20 @@ PAPERLESS_OCR_MODE=<mode>
         into images and puts the OCRed text on top. This works for all documents,
         however, the resulting document may be significantly larger and text
         won't appear as sharp when zoomed in.
-    
+
     The default is ``skip``, which only performs OCR when necessary and always
     creates archived documents.
 
 PAPERLESS_OCR_OUTPUT_TYPE=<type>
     Specify the the type of PDF documents that paperless should produce.
-    
+
     *   ``pdf``: Modify the PDF document as little as possible.
     *   ``pdfa``: Convert PDF documents into PDF/A-2b documents, which is a
         subset of the entire PDF specification and meant for storing
         documents long term.
     *   ``pdfa-1``, ``pdfa-2``, ``pdfa-3`` to specify the exact version of
         PDF/A you wish to use.
-    
+
     If not specified, ``pdfa`` is used. Remember that paperless also keeps
     the original input file as well as the archived version.
 
@@ -275,9 +281,9 @@ PAPERLESS_OCR_USER_ARG=<json>
 
     .. code:: json
 
-        {"deskew": true, "optimize": 3, "unpaper_args": "--pre-rotate 90"}    
-    
-    
+        {"deskew": true, "optimize": 3, "unpaper_args": "--pre-rotate 90"}
+
+
 Software tweaks
 ###############
 
diff --git a/paperless.conf.example b/paperless.conf.example
index 139453cf3..c55b7f5f4 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -31,6 +31,7 @@
 #PAPERLESS_STATIC_URL=/static/
 #PAPERLESS_AUTO_LOGIN_USERNAME=
 #PAPERLESS_COOKIE_PREFIX=
+#PAPERLESS_ENABLE_HTTP_REMOTE_USER=false
 
 # OCR settings
 
diff --git a/src/paperless/auth.py b/src/paperless/auth.py
index ece5d0eba..d92dc7671 100644
--- a/src/paperless/auth.py
+++ b/src/paperless/auth.py
@@ -2,6 +2,7 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.utils.deprecation import MiddlewareMixin
 from rest_framework import authentication
+from rest_framework import exceptions
 
 
 class AutoLoginMiddleware(MiddlewareMixin):
@@ -26,3 +27,21 @@ class AngularApiAuthenticationOverride(authentication.BaseAuthentication):
             return (user, None)
         else:
             return None
+
+
+class HttpRemoteUserAuthentication(authentication.BaseAuthentication):
+    """ This class allows authentication via HTTP_REMOTE_USER which is set for
+        example by certain SSO applications.
+    """
+
+    def authenticate(self, request):
+        username = request.META.get('HTTP_REMOTE_USER')
+        if not username:
+            return None
+
+        try:
+            user = User.objects.get(username=username)
+        except User.DoesNotExist:
+            raise exceptions.AuthenticationFailed('No such user')
+
+        return (user, None)
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 5af1be85e..f522c4c0b 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -112,6 +112,13 @@ if DEBUG:
         'paperless.auth.AngularApiAuthenticationOverride'
     )
 
+ENABLE_HTTP_REMOTE_USER = __get_boolean("PAPERLESS_ENABLE_HTTP_REMOTE_USER")
+
+if ENABLE_HTTP_REMOTE_USER:
+    REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'].append(
+        'paperless.auth.HttpRemoteUserAuthentication'
+    )
+
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'whitenoise.middleware.WhiteNoiseMiddleware',

From a96ab9a9a414fb4a367efb9322b0c73692f1ac22 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 3 Jan 2021 13:09:16 +0100
Subject: [PATCH 0614/1300] form field validation (much better error messages)

---
 src-ui/src/app/app.module.ts                  |  4 ++-
 .../edit-dialog/edit-dialog.component.ts      | 10 +++++++-
 .../components/common/input/abstract-input.ts |  3 +++
 .../common/input/number/number.component.html |  8 ++++++
 .../common/input/number/number.component.scss |  0
 .../input/number/number.component.spec.ts     | 25 +++++++++++++++++++
 .../common/input/number/number.component.ts   | 21 ++++++++++++++++
 .../common/input/text/text.component.html     |  5 +++-
 .../document-detail.component.html            |  8 ++----
 .../document-detail.component.ts              | 22 ++++++++++++++--
 .../correspondent-edit-dialog.component.html  |  6 ++---
 .../correspondent-edit-dialog.component.ts    |  4 ---
 .../document-type-edit-dialog.component.html  |  4 +--
 .../document-type-edit-dialog.component.ts    |  4 ---
 .../tag-edit-dialog.component.html            |  4 +--
 .../tag-edit-dialog.component.ts              |  4 ---
 16 files changed, 102 insertions(+), 30 deletions(-)
 create mode 100644 src-ui/src/app/components/common/input/number/number.component.html
 create mode 100644 src-ui/src/app/components/common/input/number/number.component.scss
 create mode 100644 src-ui/src/app/components/common/input/number/number.component.spec.ts
 create mode 100644 src-ui/src/app/components/common/input/number/number.component.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index c78dc3cfe..8cd28b6fc 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -57,6 +57,7 @@ import { DocumentTitlePipe } from './pipes/document-title.pipe';
 import { MetadataCollapseComponent } from './components/document-detail/metadata-collapse/metadata-collapse.component';
 import { SelectDialogComponent } from './components/common/select-dialog/select-dialog.component';
 import { NgSelectModule } from '@ng-select/ng-select';
+import { NumberComponent } from './components/common/input/number/number.component';
 
 @NgModule({
   declarations: [
@@ -104,7 +105,8 @@ import { NgSelectModule } from '@ng-select/ng-select';
     FilterPipe,
     DocumentTitlePipe,
     MetadataCollapseComponent,
-    SelectDialogComponent
+    SelectDialogComponent,
+    NumberComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
index 8f7af1418..ff4660ca3 100644
--- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
@@ -2,6 +2,7 @@ import { Directive, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 import { MATCHING_ALGORITHMS, MATCH_AUTO } from 'src/app/data/matching-model';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
@@ -24,6 +25,10 @@ export abstract class EditDialogComponent<T extends ObjectWithId> implements OnI
   @Output()
   success = new EventEmitter()
 
+  networkActive = false
+
+  error = null
+
   abstract getForm(): FormGroup
 
   objectForm: FormGroup = this.getForm()
@@ -77,11 +82,14 @@ export abstract class EditDialogComponent<T extends ObjectWithId> implements OnI
       default:
         break;
     }
+    this.networkActive = true
     serverResponse.subscribe(result => {
       this.activeModal.close()
       this.success.emit(result)
+      this.networkActive = false
     }, error => {
-      this.toastService.showError(this.getSaveErrorMessage(error.error.name))
+      this.error = error.error
+      this.networkActive = false
     })
   }
 
diff --git a/src-ui/src/app/components/common/input/abstract-input.ts b/src-ui/src/app/components/common/input/abstract-input.ts
index 78a4a1b69..f6039d2ec 100644
--- a/src-ui/src/app/components/common/input/abstract-input.ts
+++ b/src-ui/src/app/components/common/input/abstract-input.ts
@@ -30,6 +30,9 @@ export class AbstractInputComponent<T> implements OnInit, ControlValueAccessor {
   @Input()
   disabled = false;
 
+  @Input()
+  error: string
+
   value: T
 
   ngOnInit(): void {
diff --git a/src-ui/src/app/components/common/input/number/number.component.html b/src-ui/src/app/components/common/input/number/number.component.html
new file mode 100644
index 000000000..aa3a893d3
--- /dev/null
+++ b/src-ui/src/app/components/common/input/number/number.component.html
@@ -0,0 +1,8 @@
+<div class="form-group">
+  <label [for]="inputId">{{title}}</label>
+  <input type="number" class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)">
+  <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
+  <div class="invalid-feedback">
+    {{error}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/src-ui/src/app/components/common/input/number/number.component.scss b/src-ui/src/app/components/common/input/number/number.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src-ui/src/app/components/common/input/number/number.component.spec.ts b/src-ui/src/app/components/common/input/number/number.component.spec.ts
new file mode 100644
index 000000000..3476cbc22
--- /dev/null
+++ b/src-ui/src/app/components/common/input/number/number.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NumberComponent } from './number.component';
+
+describe('NumberComponent', () => {
+  let component: NumberComponent;
+  let fixture: ComponentFixture<NumberComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ NumberComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NumberComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/common/input/number/number.component.ts b/src-ui/src/app/components/common/input/number/number.component.ts
new file mode 100644
index 000000000..987a4090b
--- /dev/null
+++ b/src-ui/src/app/components/common/input/number/number.component.ts
@@ -0,0 +1,21 @@
+import { Component, forwardRef } from '@angular/core';
+import { NG_VALUE_ACCESSOR } from '@angular/forms';
+import { AbstractInputComponent } from '../abstract-input';
+
+@Component({
+  providers: [{
+    provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => NumberComponent),
+    multi: true
+  }],
+  selector: 'app-input-number',
+  templateUrl: './number.component.html',
+  styleUrls: ['./number.component.scss']
+})
+export class NumberComponent extends AbstractInputComponent<number> {
+
+  constructor() {
+    super()
+  }
+
+}
diff --git a/src-ui/src/app/components/common/input/text/text.component.html b/src-ui/src/app/components/common/input/text/text.component.html
index 3a43b052f..78aa76577 100644
--- a/src-ui/src/app/components/common/input/text/text.component.html
+++ b/src-ui/src/app/components/common/input/text/text.component.html
@@ -1,5 +1,8 @@
 <div class="form-group">
   <label [for]="inputId">{{title}}</label>
-  <input type="text" class="form-control" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)">
+  <input type="text" class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)">
   <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
+  <div class="invalid-feedback">
+    {{error}}
+  </div>
 </div>
\ No newline at end of file
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index eae3367c1..4092b5a60 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -56,12 +56,8 @@
                     <a ngbNavLink i18n>Details</a>
                     <ng-template ngbNavContent>
 
-                        <app-input-text i18n-title title="Title" formControlName="title"></app-input-text>
-                        <div class="form-group">
-                            <label for="archive_serial_number" i18n>Archive serial number</label>
-                            <input type="number" class="form-control" id="archive_serial_number"
-                                formControlName='archive_serial_number'>
-                        </div>
+                        <app-input-text i18n-title title="Title" formControlName="title" [error]="error?.title"></app-input-text>
+                        <app-input-number i18n-title title="Archive serial number" [error]="error?.archive_serial_number" formControlName='archive_serial_number'></app-input-number>
                         <app-input-date-time i18n-titleDate titleDate="Date created" formControlName="created"></app-input-date-time>
                         <app-input-select [items]="correspondents" i18n-title title="Correspondent" formControlName="correspondent" [allowNull]="true"
                             (createNew)="createCorrespondent()"></app-input-select>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 053258f34..84a03446a 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -24,8 +24,12 @@ import { PDFDocumentProxy } from 'ng2-pdf-viewer';
 })
 export class DocumentDetailComponent implements OnInit {
 
-  public expandOriginalMetadata = false;
-  public expandArchivedMetadata = false;
+  expandOriginalMetadata = false
+  expandArchivedMetadata = false
+
+  error: any
+
+  networkActive = false
 
   documentId: number
   document: PaperlessDocument
@@ -131,19 +135,33 @@ export class DocumentDetailComponent implements OnInit {
   }
 
   save() {
+    this.networkActive = true
     this.documentsService.update(this.document).subscribe(result => {
       this.close()
+      this.networkActive = false
+      this.error = null
+    }, error => {
+      this.networkActive = false
+      this.error = error.error
     })
   }
 
   saveEditNext() {
+    this.networkActive = true
     this.documentsService.update(this.document).subscribe(result => {
+      this.error = null
       this.documentListViewService.getNext(this.document.id).subscribe(nextDocId => {
+        this.networkActive = false
         if (nextDocId) {
           this.openDocumentService.closeDocument(this.document)
           this.router.navigate(['documents', nextDocId])
         }
+      }, error => {
+        this.networkActive = false
       })
+    }, error => {
+      this.networkActive = false
+      this.error = error.error
     })
   }
 
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
index 48477b229..e2b7f13e0 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
@@ -1,4 +1,4 @@
-<form [formGroup]="objectForm" class="needs-validation" novalidate (ngSubmit)="save()">
+<form [formGroup]="objectForm" (ngSubmit)="save()">
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
     <button type="button" class="close" aria-label="Close" (click)="cancel()">
@@ -7,10 +7,10 @@
   </div>
   <div class="modal-body">
 
-    <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
+    <app-input-text i18n-title title="Name" formControlName="name" [error]="error?.name"></app-input-text>
     <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
     <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match"></app-input-text>
-    <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive"></app-input-check>
+    <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive" novalidate></app-input-check>
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts
index b6c3e08d4..a94cbf909 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts
@@ -25,10 +25,6 @@ export class CorrespondentEditDialogComponent extends EditDialogComponent<Paperl
     return $localize`Edit correspondent`
   }
 
-  getSaveErrorMessage(error: string) {
-    return $localize`Could not save correspondent: ${error}`
-  }
-
   getForm(): FormGroup {
     return new FormGroup({
       name: new FormControl(''),
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
index ba017faf7..d672c5bd8 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
@@ -1,4 +1,4 @@
-<form [formGroup]="objectForm" class="needs-validation" novalidate (ngSubmit)="save()">
+<form [formGroup]="objectForm" (ngSubmit)="save()">
     <div class="modal-header">
       <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
       <button type="button" class="close" aria-label="Close" (click)="cancel()">
@@ -7,7 +7,7 @@
     </div>
     <div class="modal-body">
 
-      <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
+      <app-input-text i18n-title title="Name" formControlName="name" [error]="error?.name"></app-input-text>
       <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
       <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match"></app-input-text>
       <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive"></app-input-check>
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts
index df81f88c9..a0cbd25f1 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts
@@ -25,10 +25,6 @@ export class DocumentTypeEditDialogComponent extends EditDialogComponent<Paperle
     return $localize`Edit document type`
   }
 
-  getSaveErrorMessage(error: string) {
-    return $localize`Could not save document type: ${error}`
-  }
-
   getForm(): FormGroup {
     return new FormGroup({
       name: new FormControl(''),
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
index 9929b54d5..502502c5c 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
@@ -1,4 +1,4 @@
-  <form [formGroup]="objectForm" class="needs-validation" novalidate (ngSubmit)="save()">
+  <form [formGroup]="objectForm" (ngSubmit)="save()">
     <div class="modal-header">
       <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
       <button type="button" class="close" aria-label="Close" (click)="cancel()">
@@ -6,7 +6,7 @@
       </button>
     </div>
     <div class="modal-body">
-      <app-input-text title="Name" formControlName="name"></app-input-text>
+      <app-input-text title="Name" formControlName="name" [error]="error?.name"></app-input-text>
 
 
       <div class="form-group paperless-input-select">
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts
index ceca19142..d67369a8b 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts
@@ -25,10 +25,6 @@ export class TagEditDialogComponent extends EditDialogComponent<PaperlessTag> {
     return $localize`Edit tag`
   }
 
-  getSaveErrorMessage(error: string) {
-    return $localize`Could not save tag: ${error}`
-  }
-
   getForm(): FormGroup {
     return new FormGroup({
       name: new FormControl(''),

From cd5d762cbc98610fa6785792f86730b731a4e8fd Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 3 Jan 2021 12:23:57 +0000
Subject: [PATCH 0615/1300] Apply translations in nl_NL

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'nl_NL' language.
---
 src/locale/nl_NL/LC_MESSAGES/django.po | 29 ++++++++++++++------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/locale/nl_NL/LC_MESSAGES/django.po b/src/locale/nl_NL/LC_MESSAGES/django.po
index 7a79df41d..9778d46bc 100644
--- a/src/locale/nl_NL/LC_MESSAGES/django.po
+++ b/src/locale/nl_NL/LC_MESSAGES/django.po
@@ -133,7 +133,7 @@ msgstr ""
 
 #: documents/models.py:164
 msgid "mime type"
-msgstr ""
+msgstr "mimetype"
 
 #: documents/models.py:175
 msgid "checksum"
@@ -141,7 +141,7 @@ msgstr "checksum"
 
 #: documents/models.py:179
 msgid "The checksum of the original document."
-msgstr ""
+msgstr "Het controlecijfer van het originele document."
 
 #: documents/models.py:183
 msgid "archive checksum"
@@ -173,15 +173,15 @@ msgstr "bestandsnaam"
 
 #: documents/models.py:217
 msgid "Current filename in storage"
-msgstr ""
+msgstr "Huidige bestandsnaam in opslag"
 
 #: documents/models.py:221
 msgid "archive serial number"
-msgstr ""
+msgstr "serienummer in archief"
 
 #: documents/models.py:226
 msgid "The position of this document in your physical document archive."
-msgstr ""
+msgstr "De positie van dit document in je fysieke documentenarchief."
 
 #: documents/models.py:232
 msgid "document"
@@ -193,7 +193,7 @@ msgstr "documenten"
 
 #: documents/models.py:315
 msgid "debug"
-msgstr ""
+msgstr "debug"
 
 #: documents/models.py:316
 msgid "information"
@@ -225,19 +225,19 @@ msgstr "niveau"
 
 #: documents/models.py:336
 msgid "log"
-msgstr ""
+msgstr "bericht"
 
 #: documents/models.py:337
 msgid "logs"
-msgstr ""
+msgstr "berichten"
 
 #: documents/models.py:348 documents/models.py:398
 msgid "saved view"
-msgstr ""
+msgstr "opgeslagen view"
 
 #: documents/models.py:349
 msgid "saved views"
-msgstr ""
+msgstr "opgeslagen views"
 
 #: documents/models.py:352
 msgid "user"
@@ -393,10 +393,13 @@ msgid ""
 "do not assign tags, types or correspondents here, paperless will still "
 "process all matching rules that you have defined."
 msgstr ""
+"Automatisch metadata toewijzen aan documenten vanuit deze regel. Indien je "
+"geen etiketten, documenttypes of correspondenten toewijst, zal Paperless nog"
+" steeds alle regels verwerken die je hebt gedefinieerd."
 
 #: paperless_mail/apps.py:9
 msgid "Paperless mail"
-msgstr ""
+msgstr "Paperless email"
 
 #: paperless_mail/models.py:11
 msgid "mail account"
@@ -496,7 +499,7 @@ msgstr "Gebruik de hieronder aangeduide correspondent"
 
 #: paperless_mail/models.py:104
 msgid "order"
-msgstr ""
+msgstr "volgorde"
 
 #: paperless_mail/models.py:111
 msgid "account"
@@ -544,7 +547,7 @@ msgstr ""
 
 #: paperless_mail/models.py:148
 msgid "assign title from"
-msgstr ""
+msgstr "wijs titel toe van"
 
 #: paperless_mail/models.py:158
 msgid "assign this tag"

From a89d4ee434f3a5c8e82f0a8fa45a3d88a7084d13 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 3 Jan 2021 12:28:10 +0000
Subject: [PATCH 0616/1300] Translate /src-ui/messages.xlf in nl_NL

translation completed for the source file '/src-ui/messages.xlf'
on the 'nl_NL' language.
---
 src-ui/src/locale/messages.nl_NL.xlf | 1907 ++++++++++++++++++++++++++
 1 file changed, 1907 insertions(+)
 create mode 100644 src-ui/src/locale/messages.nl_NL.xlf

diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf
new file mode 100644
index 000000000..6301f95e6
--- /dev/null
+++ b/src-ui/src/locale/messages.nl_NL.xlf
@@ -0,0 +1,1907 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="plaintext" original="ng2.template" source-language="en-US" target-language="nl-NL">
+    <body>
+      <trans-unit datatype="html" id="4733307402565258070">
+        <source>Documents</source>
+        <target>Documenten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2155249406916744630">
+        <source>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; saved successfully.</source>
+        <target>View &amp;quot;<x equiv-text="this.list.savedView.name" id="PH"/>&amp;quot; met succes opgeslagen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6837554170707123455">
+        <source>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; created successfully.</source>
+        <target>View &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; met succes gemaakt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
+        <source>Select</source>
+        <target>Selecteer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7e1f9a7054aff842832620c03dedae894787ba41">
+        <source>Select none</source>
+        <target>Niets selecteren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9">
+        <source>Select page</source>
+        <target>Selecteer pagina</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74">
+        <source>Select all</source>
+        <target>Alles selecteren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ec97f67072a83aaa972536b18d83179f6e4bbec9">
+        <source>Sort by</source>
+        <target>Sorteer op</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b7641aed03492978b4ec6843b1e53f30464294d9">
+        <source>Views</source>
+        <target>Views</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b69d81ff62cdc22b6bf88fe0b72dc1f66ccfa44f">
+        <source>Save as...</source>
+        <target>Opslaan als...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="72e7d343f9165602cce1ca7faffbc565fd31ef92">
+        <source>Save &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
+        <target>Opslaan &amp;quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="439e7cc3c1ecefded167ed4d37f7d22dad6a9159">
+        <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {<x id="INTERPOLATION"/> van één document geselecteerd} other {<x id="INTERPOLATION"/> van <x id="INTERPOLATION_1"/> documenten geselecteerd}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9">
+        <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Eén document} other {<x id="INTERPOLATION"/> documenten}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
+        <source>ASN</source>
+        <target>ASN</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">100</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
+        <source>Correspondent</source>
+        <target>Correspondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">101</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
+        <source>Title</source>
+        <target>Titel</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">102</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
+        <source>Document type</source>
+        <target>Documenttype</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
+        <source>Created</source>
+        <target>Aangemaakt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">104</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
+        <source>Added</source>
+        <target>Toegevoegd</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9021887951960049161">
+        <source>Confirm delete</source>
+        <target>Bevestig het verwijderen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5382975254277698192">
+        <source>Do you really want to delete document &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</source>
+        <target>Wilt u het document echt verwijderen &amp;quot;<x equiv-text="this.document.title" id="PH"/>&amp;quot;?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">162</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6691075929777935948">
+        <source>The files for this document will be deleted permanently. This operation cannot be undone.</source>
+        <target>De bestanden voor dit document worden definitief verwijderd. Deze bewerking kan niet ongedaan worden gemaakt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">163</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="719892092227206532">
+        <source>Delete document</source>
+        <target>Verwijder document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">165</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
+        <source>Delete</source>
+        <target>Verwijderen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dc75033a5238fdc4f462212c847a45ba8018a3fd">
+        <source>Download</source>
+        <target>Download</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4ea3c236bca3528318e3b3a411a20909e5fa8be4">
+        <source>More like this</source>
+        <target>Meer zoals dit</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f4e529ae5ffd73001d1ff4bbdeeb0a72e342e5c8">
+        <source>Close</source>
+        <target>Sluiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4f8b2bb476981727ab34ed40fde1218361f92c45">
+        <source>Details</source>
+        <target>Details</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4ab4cb601522b9194922554d934c4c30bd93567d">
+        <source>Content</source>
+        <target>Inhoud</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f721a500a68c357e8f2a01e60510f6a01e4ba529">
+        <source>Metadata</source>
+        <target>Metadata</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7">
+        <source>Discard</source>
+        <target>Negeren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="52c9a103b812f258bcddc3d90a6e3f46871d25fe">
+        <source>Save</source>
+        <target>Opslaan</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3">
+        <source>Page</source>
+        <target>Pagina</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c972a8e7d09f86e0c408a80349990fb213b32c08">
+        <source>of <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></source>
+        <target>van <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a071e35fecc10753065b1cb5b38608be66da2c8b">
+        <source>Download original</source>
+        <target>Download origineel</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9b3996b5ddcc628a999a7df72fbfc2a2eae8c8a5">
+        <source>Archive serial number</source>
+        <target>Archief serienummer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="30eebc2dd656dbcb259d8d5286d244ee397d63bd">
+        <source>Date created</source>
+        <target>Aanmaakdatum</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
+        <source>Tags</source>
+        <target>Tags</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720">
+        <source>Date modified</source>
+        <target>Wijzigingsdatum</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269">
+        <source>Date added</source>
+        <target>Datum toegevoegd</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3">
+        <source>Media filename</source>
+        <target>Media bestandsnaam</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">99</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8">
+        <source>Original MD5 checksum</source>
+        <target>Originele MD5 checksum</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e92ca184ea785769fb26138fc25ee9fa06fff6e5">
+        <source>Original file size</source>
+        <target>Originele bestandsgrootte</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd">
+        <source>Original mime type</source>
+        <target>Oorspronkelijke mime-type</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="edbf54e4117606b5dd87aaea3c14b21ebf398020">
+        <source>Archive MD5 checksum</source>
+        <target>Archief MD5 checksum</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e6bf12eadecbfd80016eca15fa78651c6ca90c64">
+        <source>Archive file size</source>
+        <target>Archief bestandsgrootte</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">119</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f">
+        <source>Original document metadata</source>
+        <target>Originele document metadata</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7174dcea4a3d0b743e7e4a78747e902230727f67">
+        <source>Archived document metadata</source>
+        <target>Gearchiveerde document metadata</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">126</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3fb9f1a31c3798173b2fea72638732c783b152fe">
+        <source>Save &amp; next</source>
+        <target>Opslaan &amp; volgende</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8765497970646365998">
+        <source>Hello <x equiv-text="this.displayName" id="PH"/>, welcome to Paperless-ng!</source>
+        <target>Hallo <x equiv-text="this.displayName" id="PH"/>, welkom bij Paperless-ng!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7016571167317583872">
+        <source>Welcome to Paperless-ng!</source>
+        <target>Welkom bij Paperless-ng!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f65253954b66e929a8b4d5ecaf61f9129f8cec64">
+        <source>Dashboard</source>
+        <target>Dashboard</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="93754014749412887">
+        <source>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Wil je de tag echt verwijderen &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="70a67e04629f6d412db0a12d51820b480788d795">
+        <source>Create</source>
+        <target>Maak</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cff1428d10d59d14e45edec3c735a27b5482db59">
+        <source>Name</source>
+        <target>Naam</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
+        <source>Color</source>
+        <target>Kleur</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d0c4488f742efeba0915e90e285a022da813deff">
+        <source>Matching</source>
+        <target>Overeenkomend</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9bcf8d20d23c111eca1431abd2d2ce0de324499c">
+        <source>Document count</source>
+        <target>Aantal documenten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="030b4423b92167200e39519599f9b863b4f7c62c">
+        <source>Actions</source>
+        <target>Acties</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9d51b3c90afda70700229d1b8a55371c13cb3bce">
+        <source>Documents</source>
+        <target>Documenten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
+        <source>Edit</source>
+        <target>Bewerk</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4990731724078522539">
+        <source>Do you really want to delete the document type &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Wilt u het documenttype echt verwijderen &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8">
+        <source>Document types</source>
+        <target>Documenttypen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="eb3d5aefff38a814b76da74371cbf02c0789a1ef">
+        <source>Logs</source>
+        <target>Logs</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5ca707824ab93066c7d9b44e1b8bf216725c2c22">
+        <source>Filter</source>
+        <target>Filter</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5610279464668232148">
+        <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
+        <target>Opgeslagen view &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; verwijderd.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">54</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5647210819299459618">
+        <source>Settings saved successfully.</source>
+        <target>Instellingen succesvol opgeslagen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">74</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8488620293789898901">
+        <source>Error while storing settings on server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Fout bij het opslaan van de instellingen: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
+        <source>Settings</source>
+        <target>Instellingen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="11ebd254cc9294717105c5982eb0cd2af30a446d">
+        <source>General settings</source>
+        <target>Algemene instellingen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="99dee94e92dbd9e21a008d4569f9719ed206ae37">
+        <source>Saved views</source>
+        <target>Opgeslagen views</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
+        <source>Appearance</source>
+        <target>Uiterlijk</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
+        <source>Items per page</source>
+        <target>Resultaten per pagina</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
+        <source>Dark mode</source>
+        <target>Nachtmodus</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
+        <source>Use system settings</source>
+        <target>Gebruik systeeminstellingen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
+        <source>Bulk editing</source>
+        <target>Massabewerking</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
+        <source>Show confirmation dialogs</source>
+        <target>Toon dialoogvenster ter bevestiging</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
+        <source>Deleting documents will always ask for confirmation.</source>
+        <target>Er zal altijd om bevestiging gevraagd worden voor het verwijderen van documenten.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
+        <source>Apply on close</source>
+        <target>Toepassen bij het sluiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">49</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
+        <source>Appears on</source>
+        <target>Komt voor bij</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">68</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
+        <source>Show on dashboard</source>
+        <target>Toon op het dashboard</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
+        <source>Show in sidebar</source>
+        <target>Toon in de zijbalk</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
+        <source>No saved views defined.</source>
+        <target>Geen opgeslagen views gedefinieerd.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
+        <source>404 Not Found</source>
+        <target>404 Niet Gevonden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/not-found/not-found.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7427874343955308724">
+        <source>Do you really want to delete the correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Bent u zeker dat u correspondent &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot; wilt verwijderen?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c3f3334de899327bf3ec8999236e10798ff76e72">
+        <source>Correspondents</source>
+        <target>Correspondenten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0488919cff4fcc2174d34e4a1167f1b3c586ca37">
+        <source>Last correspondence</source>
+        <target>Laatste correspondentie</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1234709746630139322">
+        <source>Confirmation</source>
+        <target>Bevestiging</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9178182467454450952">
+        <source>Confirm</source>
+        <target>Bevestig</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6457471243969293847">
+        <source>Create new correspondent</source>
+        <target>Nieuwe correspondent maken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2059822531169388684">
+        <source>Edit correspondent</source>
+        <target>Correspondent bewerken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3025930461519142465">
+        <source>Could not save correspondent: <x equiv-text="error" id="PH"/></source>
+        <target>Kon de correspondent niet opslaan: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3d5caa52b0a51bfd2757215f7614183554d740f0">
+        <source>Matching algorithm</source>
+        <target>Algoritme voor het bepalen van de overeenkomst</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="eab7fc7cf2d663e54de934b779fce4275a303f0f">
+        <source>Matching pattern</source>
+        <target>Patroon voor overeenkomst</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a1923dd970db4f74b4417b80b4a14e250fd116ff">
+        <source>Auto matching does not require you to fill in this field.</source>
+        <target>Dit veld hoeft niet ingevuld te worden indien automatisch overeenkomsten gezocht worden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
+        <source>Case insensitive</source>
+        <target>Niet hoofdlettergevoelig</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="85e19678590a8b3ac1dff9d69c7a7610d1742e5a">
+        <source>Auto matching ignores this option.</source>
+        <target>Deze optie wordt genegeerd bij het automatisch zoeken naar overeenkomsten.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
+        <source>Cancel</source>
+        <target>Annuleren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9153094873118985366">
+        <source>Create new tag</source>
+        <target>Nieuw etiket maken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5872175735754226507">
+        <source>Edit tag</source>
+        <target>Etiket bewerken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2861521377141790537">
+        <source>Could not save tag: <x equiv-text="error" id="PH"/></source>
+        <target>Kon het etiket niet opslaan: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42">
+        <source>Inbox tag</source>
+        <target>&quot;Postvak in&quot;-etiket</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5e2f1a4ea12a1b8606ee3f0548d0ba64bf266077">
+        <source>Inbox tags are automatically assigned to all consumed documents.</source>
+        <target>&quot;Postvak in&quot;-etiketten worden automatisch toegewezen aan alle verwerkte documenten.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6672809941092516947">
+        <source>Create new document type</source>
+        <target>Nieuw documenttype maken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="36335016091244220">
+        <source>Edit document type</source>
+        <target>Documenttype bewerken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5647767513381010218">
+        <source>Could not save document type: <x equiv-text="error" id="PH"/></source>
+        <target>Kon documenttype niet opslaan: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="49c9ede51100b454f7841b24cd02355c6622bf44">
+        <source>Search results</source>
+        <target>Zoekresultaten</target>
+        <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 datatype="html" id="31976d04f98e8a38098f66ac3a83ad33b576e5db">
+        <source>Invalid search query: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></source>
+        <target>Ongeldige zoekopdracht: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></target>
+        <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 datatype="html" id="2abff6a01d9b342a5a14b7fb90309a95ce934f8e">
+        <source> Showing documents similar to <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></source>
+        <target>Toon documenten die lijken op <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></target>
+        <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 datatype="html" id="6e0b0a1ea16f18f2fb1586c53d99d2f22e1aee2e">
+        <source>Search query: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></source>
+        <target>Zoekopdracht: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></target>
+        <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 datatype="html" id="afa760e48c97d64d19c1455d18b7834a2256e23f">
+        <source>Did you mean &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</source>
+        <target>Bedoelde u &amp;quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&amp;quot;?</target>
+        <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 datatype="html" id="fe6ced3fcc803bba5a2e6c1a067b9ce62542500e">
+        <source>{VAR_PLURAL, plural, =0 {No results} =1 {One result} other {<x id="INTERPOLATION"/> results}}</source>
+        <target>{VAR_PLURAL, plural, =0 {Geen resultaten} =1 {Eén resultaat} other {<x id="INTERPOLATION"/> resultaten}}</target>
+        <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 datatype="html" id="41147374f427980a9f1a8cd5e3f4b1666e6f2418">
+        <source>Paperless-ng</source>
+        <target>Paperless-ng</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+        <note from="description" priority="1">app title</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="069566c6ed4f051b5b5617ef1935837226585dad">
+        <source>Search documents</source>
+        <target>Documenten doorzoeken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb694b49d408265c91c62799c2b3a7e3151c824d">
+        <source>Logout</source>
+        <target>Afmelden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="68949525c4d9a901e0cd15a94e3fc8d2711e9918">
+        <source>Manage</source>
+        <target>Beheren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="408cb6073e60c5d966296a3207fc596adca75e01">
+        <source>Admin</source>
+        <target>Beheer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">147</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
+        <source>Misc</source>
+        <target>Andere</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">153</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
+        <source>Documentation</source>
+        <target>Handleiding</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">160</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
+        <source>GitHub</source>
+        <target>GitHub</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">167</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
+        <source>Logged in as <x equiv-text="{{displayName}}" id="INTERPOLATION"/></source>
+        <target>Aangemeld als <x equiv-text="{{displayName}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">34</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4f55b670f49d927c6026bb614c7c62b1f2a394c0">
+        <source>Open documents</source>
+        <target>Open documenten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">92</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dca5bf9344a759fa5a07f1b21f50286ec242ba44">
+        <source>Close all</source>
+        <target>Alles sluiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5195932016807797291">
+        <source>Correspondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></source>
+        <target>Correspondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8170755470576301659">
+        <source>Without correspondent</source>
+        <target>Zonder correspondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8705701325879965907">
+        <source>Type: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></source>
+        <target>Type: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4362173610367509215">
+        <source>Without document type</source>
+        <target>Zonder documenttype</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8180755793012580465">
+        <source>Tag: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></source>
+        <target>Etiket: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6494566478302448576">
+        <source>Without any tag</source>
+        <target>Zonder enig etiket</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
+        <source>Filter by:</source>
+        <target>Filter op:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
+        <source>Filter tags</source>
+        <target>Etiketten filteren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4b089ca12c472cf0b46167bb5afe4b527b301bbc">
+        <source>Filter correspondents</source>
+        <target>Correspondenten filteren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0ad509732aaf702b7ea8c771c7809fa84bc85908">
+        <source>Filter document types</source>
+        <target>Documenttypes filteren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2f33515a935c36763660e8420940b8a7e11fb1f4">
+        <source>Clear all filters</source>
+        <target>Alle filters wegdoen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">47</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7593728289020204896">
+        <source>Not assigned</source>
+        <target>Niet toegekend</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+        <note from="description" priority="1">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="c2d0ac9f528bbd5f53fd34269fde8b59e029621b">
+        <source>Apply</source>
+        <target>Toepassen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4873149362496451858">
+        <source>Last 7 days</source>
+        <target>Afgelopen 7 dagen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4463380307954693363">
+        <source>Last month</source>
+        <target>Afgelopen maand</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8697368973702409683">
+        <source>Last 3 months</source>
+        <target>Afgelopen 3 maanden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3566342898065860218">
+        <source>Last year</source>
+        <target>Afgelopen jaar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="be2add3a3d9e4e2556b8f9048a15a9c0f00bf1ad">
+        <source>After</source>
+        <target>Na</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8785188e6c678b842fcb93b7392faf86db7ec676">
+        <source>Before</source>
+        <target>Voor</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="99ee4faa69cd2ea8e3678c1f557c0ff1f05aae46">
+        <source>Clear</source>
+        <target>Leegmaken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6829218544e108e152f5fa72cb79c4ccb82e0d06">
+        <source>View</source>
+        <target>Bekijken</target>
+        <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 datatype="html" id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e">
+        <source>Created: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></source>
+        <target>Aangemaakt op: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></target>
+        <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">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8">
+        <source>Filter by correspondent</source>
+        <target>Op correspondent filteren</target>
+        <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">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bdb9a910523610254872e147222689e9a4115b84">
+        <source>Filter by tag</source>
+        <target>Op etiket filteren</target>
+        <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">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60">
+        <source>Score:</source>
+        <target>Score:</target>
+        <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">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2840db547019ce8c76b2cdbe3a1653c5b68b06af">
+        <source>View in browser</source>
+        <target>In uw browser bekijken</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8639884465898458690">
+        <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
+        <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot; en &amp;quot;<x equiv-text="items[1].name" id="PH_1"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+        <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="7894972847287473517">
+        <source>&quot;<x equiv-text="i.name" id="PH"/>&quot;</source>
+        <target>&amp;quot;<x equiv-text="i.name" id="PH"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="760986369763309193">
+        <source>, </source>
+        <target>, </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
+        <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="1822679894391095557">
+        <source><x equiv-text="list" id="PH"/> and &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</source>
+        <target><x equiv-text="list" id="PH"/> en &amp;quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+        <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="4137232459980262849">
+        <source>Confirm tags assignment</source>
+        <target>Bevestig toewijzen van etiketten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6619516195038467207">
+        <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Het etiket &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1894412783609570695">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>De etiketten <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> zullen aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">120</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7181166515756808573">
+        <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Het etiket &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; zal verwijderd worden van <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3819792277998068944">
+        <source>This operation will remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>De etiketten <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> zullen verwijderd worden van <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2739066218579571288">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> and remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> on <x equiv-text="this.list.selected.size" id="PH_2"/> selected document(s).</source>
+        <target>De etiketten <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> zullen toegevoegd worden aan, en de etiketten <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> zullen verwijderd worden van <x equiv-text="this.list.selected.size" id="PH_2"/> geselecteerd(e) document(en).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">127</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2996713129519325161">
+        <source>Confirm correspondent assignment</source>
+        <target>Bevestig toewijzen van correspondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">157</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6900893559485781849">
+        <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>De correspondent &amp;quot;<x equiv-text="correspondent.name" id="PH"/>&amp;quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">159</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1257522660364398440">
+        <source>This operation will remove the correspondent from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>De correspondent zal verwijderd worden van <x equiv-text="this.list.selected.size" id="PH"/> geselecteerd(e) document(en).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5393409374423140648">
+        <source>Confirm document type assignment</source>
+        <target>Bevestig toewijzen van documenttype</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">190</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="332180123895325027">
+        <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Het documenttype &amp;quot;<x equiv-text="documentType.name" id="PH"/>&amp;quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">192</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2236642492594872779">
+        <source>This operation will remove the document type from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Het documenttype zal verwijderd worden van <x equiv-text="this.list.selected.size" id="PH"/> geselecteerd(e) document(en).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">194</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="749430623564850405">
+        <source>Delete confirm</source>
+        <target>Bevestig verwijderen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">219</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4303174930844518780">
+        <source>This operation will permanently delete <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target><x equiv-text="this.list.selected.size" id="PH"/> geselecteerd(e) document(en) zullen permanent worden verwijderd.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">220</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5641451190833696892">
+        <source>This operation cannot be undone.</source>
+        <target>Deze actie kan niet ongedaan worden gemaakt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">221</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6734339521247847366">
+        <source>Delete document(s)</source>
+        <target>Verwijder document(en)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">223</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
+        <source>Select:</source>
+        <target>Selecteer:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dfc3c34e182ea73c5d784ff7c8135f087992dac1">
+        <source>All</source>
+        <target>Alles</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="907df6a2b68daecc3c399cf40a764b358bd9fd84">
+        <source>Edit:</source>
+        <target>Bewerk:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">
+        <source>Save current view</source>
+        <target>Huidige view opslaan</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4eb84de23219c85432e38fb4fbdeb6c0f103ff8b">
+        <source>Show all</source>
+        <target>Toon alles</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="61e0f26d843eec0b33ff475e111b0c2f7a80b835">
+        <source>Statistics</source>
+        <target>Statistieken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="46c8fe557cf52c9389783627d4f85453f4ddb459">
+        <source>Documents in inbox: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></source>
+        <target>Documenten in &quot;Postvak in&quot;: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438">
+        <source>Total documents: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></source>
+        <target>Totaal aantal documenten: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8705589528094706681">
+        <source>The document has been uploaded and will be processed by the consumer shortly.</source>
+        <target>Het document werd opgeladen en zal binnenkort worden verwerkt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4956689020592747108">
+        <source>There was an error while uploading the document: <x equiv-text="error.error.document" id="PH"/></source>
+        <target>Fout bij het opladen van het document: <x equiv-text="error.error.document" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7554858521017940575">
+        <source>An error has occurred while uploading the document. Sorry!</source>
+        <target>Er ging iets mis bij het opladen van het document. Onze excuses!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
+        <source>Upload new documents</source>
+        <target>Nieuwe documenten opladen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="52d5d56b6667ba3f7c759cbc0d4c39d34a99701e">
+        <source>Drop documents here or</source>
+        <target>Sleep documenten hierheen, of</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="865c511f4a24558ed0e954f9bbbff557bbb8954d">
+        <source>Browse files</source>
+        <target>Kies bestanden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="33c76d75ce25ce3b05ab22877f1b6b09dcf603ae">
+        <source>{VAR_PLURAL, plural, =1 {Uploading file...} =other {Uploading <x id="INTERPOLATION"/> files...}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Bezig met opladen van het bestand...} =other {Bezig met opladen van <x id="INTERPOLATION"/> bestanden...}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="45854ddec74086b271e62be6a363f4fa5036f7fc">
+        <source>First steps</source>
+        <target>Laten we aan de slag gaan</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a0dc8218a6fcc5d11a4723ed127bd6be9d6d3ef3">
+        <source>Paperless is running! :)</source>
+        <target>Paperless is gestart! :)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ea8d9a9486d5639d1c38c012900b8d34d5e4135d">
+        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message.</source>
+        <target>Je kunt documenten uploaden door bestanden in het oplaadvak rechts te slepen of door ze in de map te kopiëren die geconfigureerd werd als consumptiemap. Ze zullen vervolgens beginnen verschijnen in de lijst met documenten. Nadat je metadata hebt toegevoegd aan je documenten, kun je de filters in Paperless gebruiken om eigen views te maken (zoals 'Recent toegevoegd', 'Te bekijken'). Deze views zullen hier verschijnen in plaats van dit bericht.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">6,7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cf5f85690feaba6e29343f9881e57a6c0ea6e82b">
+        <source>Paperless offers some more features that try to make your life easier:</source>
+        <target>Paperless heeft nog meer in petto om jouw leven makkelijker te maken:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="edb41dc36af2e70789d8e3422325d930e783253e">
+        <source>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</source>
+        <target>Eenmaal je documenten hebt toegevoegd en metadata hebt toegewezen, kan Paperless automatisch die metadata aan nieuwe documenten toewijzen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9dca488928c0b7af46c3866f86a6c2c8548399aa">
+        <source>You can configure paperless to read your mails and add documents from attached files.</source>
+        <target>Je kunt Paperless configureren om mails te lezen en documenten toe te voegen vanuit bijlagen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d282f6277cbf6704f697170d2ad19ce500790e20">
+        <source>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</source>
+        <target>Lees de documentatie na om deze functies te ontdekken. Het hoofdstuk over basisgebruik biedt ook inzichten over het gebruik van Paperless in het algemeen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="218403386307979629">
+        <source>Metadata</source>
+        <target>Metadata</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3797570084942068182">
+        <source>Select</source>
+        <target>Selecteer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7103181924469214926">
+        <source>Please select an object</source>
+        <target>Selecteer een object</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2807800733729323332">
+        <source>Yes</source>
+        <target>Ja</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3542042671420335679">
+        <source>No</source>
+        <target>Nee</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7536524521722799066">
+        <source>(no title)</source>
+        <target>(geen titel)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/document-title.pipe.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1519954996184640001">
+        <source>Error</source>
+        <target>Fout</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5037437391296624618">
+        <source>Information</source>
+        <target>Informatie</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2691296884221415710">
+        <source>Correspondent</source>
+        <target>Correspondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5066119607229701477">
+        <source>Document type</source>
+        <target>Documenttype</target>
+        <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 datatype="html" id="5701618810648052610">
+        <source>Title</source>
+        <target>Titel</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7517688192215738656">
+        <source>ASN</source>
+        <target>ASN</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4207916966377787111">
+        <source>Created</source>
+        <target>Aangemaakt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="231679111972850796">
+        <source>Added</source>
+        <target>Toegevoegd</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3553216189604488439">
+        <source>Modified</source>
+        <target>Gewijzigd</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2056433880533904076">
+        <source>Light blue</source>
+        <target>Licht blauw</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4082253113407591781">
+        <source>Blue</source>
+        <target>Blauw</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1143414876575720034">
+        <source>Light green</source>
+        <target>Licht groen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="119581980963263815">
+        <source>Green</source>
+        <target>Groen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3250646524116252719">
+        <source>Light red</source>
+        <target>Licht rood</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1628552745302385832">
+        <source>Red </source>
+        <target>Rood</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5479028842846122610">
+        <source>Light orange</source>
+        <target>Licht oranje</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8598918991528773310">
+        <source>Orange</source>
+        <target>Oranje</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1789283185177957430">
+        <source>Light violet</source>
+        <target>Licht paars</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2682868487071320453">
+        <source>Violet</source>
+        <target>Paars</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1449010446077321264">
+        <source>Brown</source>
+        <target>Bruin</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="30300572504753589">
+        <source>Black</source>
+        <target>Zwart</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="461048771215121187">
+        <source>Light grey</source>
+        <target>Licht grijs</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4561076822163447092">
+        <source>Create new item</source>
+        <target>Maak nieuw item</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5324147361912094446">
+        <source>Edit item</source>
+        <target>Item bewerken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1699589597032579396">
+        <source>Could not save element: <x equiv-text="error" id="PH"/></source>
+        <target>Kon het element niet opslaan: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="810888510148304696">
+        <source>Automatic</source>
+        <target>Automatisch</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5044611416737085530">
+        <source>Do you really want to delete this element?</source>
+        <target>Wil je dit element echt verwijderen?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8371896857609524947">
+        <source>Associated documents will not be deleted.</source>
+        <target>Geassocieerde documenten zullen niet verwijderd worden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7022070615528435141">
+        <source>Delete</source>
+        <target>Verwijderen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">97</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5851669019930456395">
+        <source>Any word</source>
+        <target>Eender welk woord</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7517655726614958140">
+        <source>Any: Document contains any of these words (space separated)</source>
+        <target>Eender welk: Documenten die eender welk van deze woorden bevatten (gescheiden door spaties)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="700315718208181326">
+        <source>All words</source>
+        <target>Alle woorden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="111914402588955480">
+        <source>All: Document contains all of these words (space separated)</source>
+        <target>Alle: Documenten die elk van deze woorden bevatten (gescheiden door spaties)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9180173992399180575">
+        <source>Exact match</source>
+        <target>Exacte overeenkomst</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7109184332944610787">
+        <source>Exact: Document contains this string</source>
+        <target>Exact: Document bevat deze tekenreeks</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1338733395833138319">
+        <source>Regular expression</source>
+        <target>Reguliere expressie</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7548151332424148033">
+        <source>Regular expression: Document matches this regular expression</source>
+        <target>Reguliere expressie: Document voldoet aan deze reguliere expressie</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1856513373880048959">
+        <source>Fuzzy word</source>
+        <target>Vaag woord</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8419167206585286450">
+        <source>Fuzzy: Document contains a word similar to this word</source>
+        <target>Vaag: Document bevat een woord dat lijkt op dit woord</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2167862279705099846">
+        <source>Auto: Learn matching automatically</source>
+        <target>Auto: Automatisch overeenkomsten aanleren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file

From 2aa2086dfbdbdef5839f35e08d2cc8a996ca4446 Mon Sep 17 00:00:00 2001
From: jayme-github <jayme-github@users.noreply.github.com>
Date: Sun, 3 Jan 2021 14:35:28 +0100
Subject: [PATCH 0617/1300] Add missing config options to example file

---
 paperless.conf.example | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/paperless.conf.example b/paperless.conf.example
index d9d0f5b06..2e46b91de 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -50,11 +50,14 @@
 #PAPERLESS_TIME_ZONE=UTC
 #PAPERLESS_CONSUMER_POLLING=10
 #PAPERLESS_CONSUMER_DELETE_DUPLICATES=false
+#PAPERLESS_CONSUMER_RECURSIVE=false
+#PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS=false
 #PAPERLESS_OPTIMIZE_THUMBNAILS=true
 #PAPERLESS_POST_CONSUME_SCRIPT=/path/to/an/arbitrary/script.sh
 #PAPERLESS_FILENAME_DATE_ORDER=YMD
 #PAPERLESS_FILENAME_PARSE_TRANSFORMS=[]
 #PAPERLESS_THUMBNAIL_FONT_NAME=
+#PAPERLESS_IGNORE_DATES=
 
 # Binaries
 

From be2061b74d9ad99a4caf0568aa49275bc5eb2eb7 Mon Sep 17 00:00:00 2001
From: jayme-github <jayme-github@users.noreply.github.com>
Date: Sun, 3 Jan 2021 14:47:04 +0100
Subject: [PATCH 0618/1300] Add PAPERLESS_IGNORE_DATES to docs

---
 docs/configuration.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 49c95bff1..5036d6aa4 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -438,6 +438,19 @@ PAPERLESS_THUMBNAIL_FONT_NAME=<filename>
 
     Defaults to ``/usr/share/fonts/liberation/LiberationSerif-Regular.ttf``.
 
+PAPERLESS_IGNORE_DATES=<string>
+    Paperless parses a documents creation date from filename and file content.
+    You may specify a comma separated list of dates that should be ignored during
+    this process. This is useful for special dates (like date of birth) that appear
+    in documents regularly but are very unlikely to be the documents creation date.
+
+    You may specify dates in a multitude of formats supported by dateparser (see
+    https://dateparser.readthedocs.io/en/latest/#popular-formats) but as the dates
+    need to be comma separated, the options are limited.
+    Example: "2020-12-02,22.04.1999"
+
+    Defaults to an empty string to not ignore any dates.
+
 
 Binaries
 ########

From d935dcd350da4e066d9a9e3dcd4402ca0d253188 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 3 Jan 2021 21:44:53 +0100
Subject: [PATCH 0619/1300] fixes #98

---
 .../confirm-dialog.component.html             |  4 +-
 .../confirm-dialog.component.ts               |  3 +
 .../document-detail.component.html            |  6 +-
 .../document-detail.component.ts              |  8 +-
 .../bulk-editor/bulk-editor.component.ts      | 74 +++++++------------
 .../document-list/document-list.component.ts  |  4 +
 .../save-view-config-dialog.component.html    |  8 +-
 .../save-view-config-dialog.component.ts      |  7 +-
 .../correspondent-edit-dialog.component.html  |  4 +-
 .../correspondent-list.component.ts           |  6 +-
 .../document-type-edit-dialog.component.html  |  4 +-
 .../document-type-list.component.ts           |  6 +-
 .../generic-list/generic-list.component.ts    |  8 +-
 .../tag-edit-dialog.component.html            |  4 +-
 .../manage/tag-list/tag-list.component.ts     |  6 +-
 15 files changed, 80 insertions(+), 72 deletions(-)

diff --git a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html
index f4dffa7d1..565829f21 100644
--- a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html
+++ b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html
@@ -9,8 +9,8 @@
       <p *ngIf="message">{{message}}</p>
     </div>
     <div class="modal-footer">
-      <button type="button" class="btn btn-outline-dark" (click)="cancelClicked()">Cancel</button>
-      <button type="button" class="btn" [class]="btnClass" (click)="confirmClicked.emit()" [disabled]="!confirmButtonEnabled">
+      <button type="button" class="btn btn-outline-dark" (click)="cancelClicked()" [disabled]="!buttonsEnabled">Cancel</button>
+      <button type="button" class="btn" [class]="btnClass" (click)="confirmClicked.emit()" [disabled]="!confirmButtonEnabled || !buttonsEnabled">
         {{btnCaption}}
         <span *ngIf="!confirmButtonEnabled"> ({{seconds}})</span>
       </button>
diff --git a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts
index c397811a4..835499ba5 100644
--- a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts
+++ b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts
@@ -28,6 +28,9 @@ export class ConfirmDialogComponent implements OnInit {
   @Input()
   btnCaption = $localize`Confirm`
 
+  @Input()
+  buttonsEnabled = true
+  
   confirmButtonEnabled = true
   seconds = 0
 
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 4092b5a60..a724ae031 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -127,9 +127,9 @@
 
             <div [ngbNavOutlet]="nav" class="mt-2"></div>
 
-            <button type="button" class="btn btn-outline-secondary" (click)="discard()" i18n>Discard</button>&nbsp;
-            <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()" i18n>Save & next</button>&nbsp;
-            <button type="submit" class="btn btn-primary" i18n>Save</button>&nbsp;
+            <button type="button" class="btn btn-outline-secondary" (click)="discard()" i18n [disabled]="networkActive">Discard</button>&nbsp;
+            <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()" i18n [disabled]="networkActive">Save & next</button>&nbsp;
+            <button type="submit" class="btn btn-primary" i18n [disabled]="networkActive">Save</button>&nbsp;
         </form>
     </div>
 
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 84a03446a..4dbb6ab16 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -16,6 +16,7 @@ import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.
 import { CorrespondentEditDialogComponent } from '../manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component';
 import { DocumentTypeEditDialogComponent } from '../manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component';
 import { PDFDocumentProxy } from 'ng2-pdf-viewer';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-document-detail',
@@ -64,7 +65,8 @@ export class DocumentDetailComponent implements OnInit {
     private modalService: NgbModal,
     private openDocumentService: OpenDocumentsService,
     private documentListViewService: DocumentListViewService,
-    private documentTitlePipe: DocumentTitlePipe) { }
+    private documentTitlePipe: DocumentTitlePipe,
+    private toastService: ToastService) { }
 
   getContentType() {
     return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type
@@ -182,9 +184,13 @@ export class DocumentDetailComponent implements OnInit {
     modal.componentInstance.btnClass = "btn-danger"
     modal.componentInstance.btnCaption = $localize`Delete document`
     modal.componentInstance.confirmClicked.subscribe(() => {
+      modal.componentInstance.buttonsEnabled = false
       this.documentsService.delete(this.document).subscribe(() => {
         modal.close()
         this.close()
+      }, error => {
+        this.toastService.showError($localize`Error deleting document: ${JSON.stringify(error)}`)
+        modal.componentInstance.buttonsEnabled = true
       })
     })
 
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index e69ab241b..6b2598fe8 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -1,6 +1,4 @@
 import { Component } from '@angular/core';
-import { Observable } from 'rxjs';
-import { tap } from 'rxjs/operators';
 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';
@@ -16,6 +14,7 @@ import { ChangedItems, FilterableDropdownSelectionModel } from '../../common/fil
 import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
 import { MatchingModel } from 'src/app/data/matching-model';
 import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-bulk-editor',
@@ -40,7 +39,8 @@ export class BulkEditorComponent {
     private documentService: DocumentService,
     private modalService: NgbModal,
     private openDocumentService: OpenDocumentsService,
-    private settings: SettingsService
+    private settings: SettingsService,
+    private toastService: ToastService
   ) { }
 
   applyOnClose: boolean = this.settings.get(SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE)
@@ -52,15 +52,26 @@ export class BulkEditorComponent {
     this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
   }
 
-  private executeBulkOperation(method: string, args): Observable<any> {
-    return this.documentService.bulkEdit(Array.from(this.list.selected), method, args).pipe(
-      tap(() => {
+  private executeBulkOperation(modal, method: string, args) {
+    if (modal) {
+      modal.componentInstance.buttonsEnabled = false
+    }
+    this.documentService.bulkEdit(Array.from(this.list.selected), method, args).subscribe(
+      response => {
         this.list.reload()
         this.list.reduceSelectionToFilter()
         this.list.selected.forEach(id => {
           this.openDocumentService.refreshDocument(id)
         })
-      })
+        if (modal) {
+          modal.close()
+        }
+      }, error => {
+        if (modal) {
+          modal.componentInstance.buttonsEnabled = true
+        }
+        this.toastService.showError($localize`Error executing bulk operation: ${JSON.stringify(error.error)}`)
+      }
     )
   }
 
@@ -130,23 +141,13 @@ export class BulkEditorComponent {
       modal.componentInstance.btnClass = "btn-warning"
       modal.componentInstance.btnCaption = $localize`Confirm`
       modal.componentInstance.confirmClicked.subscribe(() => {
-        this.performSetTags(modal, changedTags)
+        this.executeBulkOperation(modal, 'modify_tags', {"add_tags": changedTags.itemsToAdd.map(t => t.id), "remove_tags": changedTags.itemsToRemove.map(t => t.id)})
       })
     } else {
-      this.performSetTags(null, changedTags)
+      this.executeBulkOperation(null, 'modify_tags', {"add_tags": changedTags.itemsToAdd.map(t => t.id), "remove_tags": changedTags.itemsToRemove.map(t => t.id)})
     }
   }
 
-  private performSetTags(modal, changedTags: ChangedItems) {
-    this.executeBulkOperation('modify_tags', {"add_tags": changedTags.itemsToAdd.map(t => t.id), "remove_tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe(
-      response => {
-        if (modal) {
-          modal.close()
-        }
-      }
-    )
-  }
-
   setCorrespondents(changedCorrespondents: ChangedItems) {
     if (changedCorrespondents.itemsToAdd.length == 0 && changedCorrespondents.itemsToRemove.length == 0) return
 
@@ -163,23 +164,13 @@ export class BulkEditorComponent {
       modal.componentInstance.btnClass = "btn-warning"
       modal.componentInstance.btnCaption = $localize`Confirm`
       modal.componentInstance.confirmClicked.subscribe(() => {
-        this.performSetCorrespondents(modal, correspondent)
+        this.executeBulkOperation(modal, 'set_correspondent', {"correspondent": correspondent ? correspondent.id : null})
       })
     } else {
-      this.performSetCorrespondents(null, correspondent)
+      this.executeBulkOperation(null, 'set_correspondent', {"correspondent": correspondent ? correspondent.id : null})
     }
   }
 
-  private performSetCorrespondents(modal, correspondent: MatchingModel) {
-    this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
-      response => {
-        if (modal) {
-          modal.close()
-        }
-      }
-    )
-  }
-
   setDocumentTypes(changedDocumentTypes: ChangedItems) {
     if (changedDocumentTypes.itemsToAdd.length == 0 && changedDocumentTypes.itemsToRemove.length == 0) return
 
@@ -196,23 +187,13 @@ export class BulkEditorComponent {
       modal.componentInstance.btnClass = "btn-warning"
       modal.componentInstance.btnCaption = $localize`Confirm`
       modal.componentInstance.confirmClicked.subscribe(() => {
-        this.performSetDocumentTypes(modal, documentType)
+        this.executeBulkOperation(modal, 'set_document_type', {"document_type": documentType ? documentType.id : null})
       })
     } else {
-      this.performSetDocumentTypes(null, documentType)
+      this.executeBulkOperation(null, 'set_document_type', {"document_type": documentType ? documentType.id : null})
     }
   }
 
-  private performSetDocumentTypes(modal, documentType) {
-    this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
-      response => {
-        if (modal) {
-          modal.close()
-        }
-      }
-    )
-  }
-
   applyDelete() {
     let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     modal.componentInstance.delayConfirm(5)
@@ -222,11 +203,8 @@ export class BulkEditorComponent {
     modal.componentInstance.btnClass = "btn-danger"
     modal.componentInstance.btnCaption = $localize`Delete document(s)`
     modal.componentInstance.confirmClicked.subscribe(() => {
-      this.executeBulkOperation("delete", {}).subscribe(
-        response => {
-          modal.close()
-        }
-      )
+      modal.componentInstance.buttonsEnabled = false
+      this.executeBulkOperation(modal, "delete", {})
     })
   }
 }
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index fbd8065ae..1f29cb901 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -90,6 +90,7 @@ export class DocumentListComponent implements OnInit {
     let modal = this.modalService.open(SaveViewConfigDialogComponent, {backdrop: 'static'})
     modal.componentInstance.defaultName = this.filterEditor.generateFilterName()
     modal.componentInstance.saveClicked.subscribe(formValue => {
+      modal.componentInstance.buttonsEnabled = false
       let savedView = {
         name: formValue.name,
         show_on_dashboard: formValue.showOnDashboard,
@@ -101,6 +102,9 @@ export class DocumentListComponent implements OnInit {
       this.savedViewService.create(savedView).subscribe(() => {
         modal.close()
         this.toastService.showInfo($localize`View "${savedView.name}" created successfully.`)
+      }, error => {
+        modal.componentInstance.error = error.error
+        modal.componentInstance.buttonsEnabled = true
       })
     })
   }
diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
index 9e28448a2..f2063df7e 100644
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
@@ -1,4 +1,4 @@
-<form [formGroup]="saveViewConfigForm" class="needs-validation" novalidate (ngSubmit)="save()">
+<form [formGroup]="saveViewConfigForm" (ngSubmit)="save()">
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title" i18n>Save current view</h4>
     <button type="button" class="close" aria-label="Close" (click)="cancel()">
@@ -6,12 +6,12 @@
     </button>
   </div>
   <div class="modal-body">
-    <app-input-text i18n-title title="Name" formControlName="name"></app-input-text>
+    <app-input-text i18n-title title="Name" formControlName="name" [error]="error?.name"></app-input-text>
     <app-input-check i18n-title title="Show in sidebar" formControlName="showInSideBar"></app-input-check>
     <app-input-check i18n-title title="Show on dashboard" formControlName="showOnDashboard"></app-input-check>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
-    <button type="submit" class="btn btn-primary" i18n>Save</button>
+    <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n [disabled]="!buttonsEnabled">Cancel</button>
+    <button type="submit" class="btn btn-primary" i18n [disabled]="!buttonsEnabled">Save</button>
   </div>
 </form>
diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
index 8f0eb26f2..e930ffaed 100644
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
@@ -14,6 +14,12 @@ export class SaveViewConfigDialogComponent implements OnInit {
   @Output()
   public saveClicked = new EventEmitter()
 
+  @Input()
+  error
+
+  @Input()
+  buttonsEnabled = true
+
   _defaultName = ""
 
   get defaultName() {
@@ -26,7 +32,6 @@ export class SaveViewConfigDialogComponent implements OnInit {
     this.saveViewConfigForm.patchValue({name: value})
   }
   
-
   saveViewConfigForm = new FormGroup({
     name: new FormControl(''),
     showInSideBar: new FormControl(false),
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
index e2b7f13e0..3544aeed0 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
@@ -13,7 +13,7 @@
     <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive" novalidate></app-input-check>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
-    <button type="submit" class="btn btn-primary" i18n>Save</button>
+    <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n [disabled]="networkActive">Cancel</button>
+    <button type="submit" class="btn btn-primary" i18n [disabled]="networkActive">Save</button>
   </div>
 </form>
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
index 37b6fa66e..25ea653fa 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
@@ -4,6 +4,7 @@ import { FILTER_CORRESPONDENT } from 'src/app/data/filter-rule-type';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
+import { ToastService } from 'src/app/services/toast.service';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/correspondent-edit-dialog.component';
 
@@ -15,9 +16,10 @@ import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/co
 export class CorrespondentListComponent extends GenericListComponent<PaperlessCorrespondent> {
 
   constructor(correspondentsService: CorrespondentService, modalService: NgbModal,
-    private list: DocumentListViewService
+    private list: DocumentListViewService,
+    toastService: ToastService
   ) { 
-    super(correspondentsService,modalService,CorrespondentEditDialogComponent)
+    super(correspondentsService,modalService,CorrespondentEditDialogComponent, toastService)
   }
 
   getDeleteMessage(object: PaperlessCorrespondent) {
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
index d672c5bd8..8c3e848f5 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
@@ -14,7 +14,7 @@
 
     </div>
     <div class="modal-footer">
-      <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
-      <button type="submit" class="btn btn-primary" i18n>Save</button>
+      <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n [disabled]="networkActive">Cancel</button>
+      <button type="submit" class="btn btn-primary" i18n [disabled]="networkActive">Save</button>
     </div>
   </form>
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
index 68c8b6f91..02b9231ee 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
@@ -4,6 +4,7 @@ import { FILTER_DOCUMENT_TYPE } from 'src/app/data/filter-rule-type';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
+import { ToastService } from 'src/app/services/toast.service';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/document-type-edit-dialog.component';
 
@@ -15,9 +16,10 @@ import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/doc
 export class DocumentTypeListComponent extends GenericListComponent<PaperlessDocumentType> {
 
   constructor(service: DocumentTypeService, modalService: NgbModal,
-    private list: DocumentListViewService
+    private list: DocumentListViewService,
+    toastService: ToastService
   ) {
-    super(service, modalService, DocumentTypeEditDialogComponent)
+    super(service, modalService, DocumentTypeEditDialogComponent, toastService)
   }
 
   getDeleteMessage(object: PaperlessDocumentType) {
diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
index b31231bc8..bedf7167d 100644
--- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
+++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
@@ -4,6 +4,7 @@ import { MatchingModel, MATCHING_ALGORITHMS, MATCH_AUTO } from 'src/app/data/mat
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { SortableDirective, SortEvent } from 'src/app/directives/sortable.directive';
 import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
+import { ToastService } from 'src/app/services/toast.service';
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component';
 
 @Directive()
@@ -12,7 +13,8 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
   constructor(
     private service: AbstractPaperlessService<T>,
     private modalService: NgbModal,
-    private editDialogComponent: any) {
+    private editDialogComponent: any,
+    private toastService: ToastService) {
     }
 
   @ViewChildren(SortableDirective) headers: QueryList<SortableDirective>;
@@ -96,9 +98,13 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
     activeModal.componentInstance.btnClass = "btn-danger"
     activeModal.componentInstance.btnCaption = $localize`Delete`
     activeModal.componentInstance.confirmClicked.subscribe(() => {
+      activeModal.componentInstance.buttonsEnabled = false
       this.service.delete(object).subscribe(_ => {
         activeModal.close()
         this.reloadData()
+      }, error => {
+        activeModal.componentInstance.buttonsEnabled = true
+        this.toastService.showError($localize`Error while deleting element: ${JSON.stringify(error.error)}`)
       })
     }
     )
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
index 502502c5c..ad40659fb 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
@@ -24,7 +24,7 @@
       <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive"></app-input-check>
     </div>
     <div class="modal-footer">
-      <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n>Cancel</button>
-      <button type="submit" class="btn btn-primary" i18n>Save</button>
+      <button type="button" class="btn btn-outline-dark" (click)="cancel()" i18n [disabled]="networkActive">Cancel</button>
+      <button type="submit" class="btn btn-primary" i18n [disabled]="networkActive">Save</button>
     </div>
   </form>
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
index 2c70ffef1..f9d0678ab 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
@@ -4,6 +4,7 @@ import { FILTER_HAS_TAG } from 'src/app/data/filter-rule-type';
 import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { TagService } from 'src/app/services/rest/tag.service';
+import { ToastService } from 'src/app/services/toast.service';
 import { GenericListComponent } from '../generic-list/generic-list.component';
 import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.component';
 
@@ -15,9 +16,10 @@ import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.compon
 export class TagListComponent extends GenericListComponent<PaperlessTag> {
 
   constructor(tagService: TagService, modalService: NgbModal,
-    private list: DocumentListViewService
+    private list: DocumentListViewService,
+    toastService: ToastService
   ) {
-    super(tagService, modalService, TagEditDialogComponent)
+    super(tagService, modalService, TagEditDialogComponent, toastService)
   }
 
   getColor(id) {

From 5e75d84920e7a1d151f9e5c37b7e89405b9b502b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 3 Jan 2021 22:25:12 +0100
Subject: [PATCH 0620/1300] add dutch language

---
 src-ui/angular.json       | 3 ++-
 src/paperless/settings.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index df53224ca..d3530d507 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -16,7 +16,8 @@
 			"i18n": {
 				"sourceLocale": "en-US",
 				"locales": {
-					"de": "src/locale/messages.de.xlf"
+					"de": "src/locale/messages.de.xlf",
+					"nl-NL": "src/locale/messages.nl_NL.xlf"
 				}
 			},
 			"architect": {
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index e8b44e8cd..b8048eaac 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -252,7 +252,8 @@ LANGUAGE_CODE = 'en-us'
 
 LANGUAGES = [
     ("en-us", _("English")),
-    ("de", _("German"))
+    ("de", _("German")),
+    ("nl-nl", _("Dutch"))
 ]
 
 LOCALE_PATHS = [

From 610fa075f600e2be4c677fdee1165ff87c3d162e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 3 Jan 2021 23:56:13 +0100
Subject: [PATCH 0621/1300] fixed missing (filtered) text

---
 .../components/document-list/document-list.component.html   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index e4d7256e1..3bdf8a8ce 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -83,8 +83,10 @@
 </div>
 
 <div class="d-flex justify-content-between align-items-center">
-  <p i18n *ngIf="list.selected.size > 0">{list.collectionSize, plural, =1 {Selected {{list.selected.size}} of one document} other {Selected {{list.selected.size}} of {{list.collectionSize || 0}} documents}}</p>
-  <p i18n *ngIf="list.selected.size == 0">{list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}}</p>
+  <p>
+    <span i18n *ngIf="list.selected.size > 0">{list.collectionSize, plural, =1 {Selected {{list.selected.size}} of one document} other {Selected {{list.selected.size}} of {{list.collectionSize || 0}} documents}}</span>
+    <span i18n *ngIf="list.selected.size == 0">{list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}}</span>&nbsp;<span i18n *ngIf="isFiltered">(filtered)</span>
+  </p>
   <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
   [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
 </div>

From e07128a1451b3f2c2207d6ad2f031a18c3df1113 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 00:03:31 +0100
Subject: [PATCH 0622/1300] don't run post-consume script inside transaction
 #259

---
 src/documents/consumer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 480537279..134137e2f 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -252,8 +252,6 @@ class Consumer(LoggingMixin):
                 self.log("debug", "Deleting file {}".format(self.path))
                 os.unlink(self.path)
 
-                self.run_post_consume_script(document)
-
         except Exception as e:
             self.log(
                 "error",
@@ -264,6 +262,8 @@ class Consumer(LoggingMixin):
         finally:
             document_parser.cleanup()
 
+        self.run_post_consume_script(document)
+
         self.log(
             "info",
             "Document {} consumption finished".format(document)

From 111ed38cce0c887ffa615651ca85adf827bbb877 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 00:38:29 +0100
Subject: [PATCH 0623/1300] fixes #121

---
 .../common/input/number/number.component.html | 10 ++++++++--
 .../common/input/number/number.component.ts   | 20 ++++++++++++++++++-
 src-ui/src/app/data/filter-rule-type.ts       |  3 +++
 src/documents/filters.py                      |  2 +-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/common/input/number/number.component.html b/src-ui/src/app/components/common/input/number/number.component.html
index aa3a893d3..7b4dcca54 100644
--- a/src-ui/src/app/components/common/input/number/number.component.html
+++ b/src-ui/src/app/components/common/input/number/number.component.html
@@ -1,8 +1,14 @@
 <div class="form-group">
   <label [for]="inputId">{{title}}</label>
-  <input type="number" class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)">
-  <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
+  <div class="input-group" [class.is-invalid]="error">
+    <input type="number" class="form-control" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)" [class.is-invalid]="error">
+    <div class="input-group-append">
+      <button class="btn btn-outline-secondary" type="button" id="button-addon1" (click)="nextAsn()" [disabled]="value">+1</button>
+    </div>
+  </div>
   <div class="invalid-feedback">
     {{error}}
   </div>
+  <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
+
 </div>
\ No newline at end of file
diff --git a/src-ui/src/app/components/common/input/number/number.component.ts b/src-ui/src/app/components/common/input/number/number.component.ts
index 987a4090b..cdc52344d 100644
--- a/src-ui/src/app/components/common/input/number/number.component.ts
+++ b/src-ui/src/app/components/common/input/number/number.component.ts
@@ -1,5 +1,7 @@
 import { Component, forwardRef } from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
+import { FILTER_ASN_ISNULL } from 'src/app/data/filter-rule-type';
+import { DocumentService } from 'src/app/services/rest/document.service';
 import { AbstractInputComponent } from '../abstract-input';
 
 @Component({
@@ -14,8 +16,24 @@ import { AbstractInputComponent } from '../abstract-input';
 })
 export class NumberComponent extends AbstractInputComponent<number> {
 
-  constructor() {
+  constructor(private documentService: DocumentService) {
     super()
   }
 
+  nextAsn() {
+    if (this.value) {
+      return
+    }
+    this.documentService.listFiltered(1, 1, "archive_serial_number", true, [{rule_type: FILTER_ASN_ISNULL, value: "false"}]).subscribe(
+      results => {
+        if (results.count > 0) {
+          this.value = results.results[0].archive_serial_number + 1
+        } else {
+          this.value + 1
+        }
+        this.onChange(this.value)
+      }
+    )
+  }
+
 }
diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts
index 173425c92..577e304d2 100644
--- a/src-ui/src/app/data/filter-rule-type.ts
+++ b/src-ui/src/app/data/filter-rule-type.ts
@@ -18,6 +18,8 @@ export const FILTER_MODIFIED_AFTER = 16
 
 export const FILTER_DOES_NOT_HAVE_TAG = 17
 
+export const FILTER_ASN_ISNULL = 18
+
 export const FILTER_RULE_TYPES: FilterRuleType[] = [
 
   {id: FILTER_TITLE, name: "Title contains", filtervar: "title__icontains", datatype: "string", multi: false, default: ""},
@@ -45,6 +47,7 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
 
   {id: FILTER_MODIFIED_BEFORE, name: "Modified before", filtervar: "modified__date__lt", datatype: "date", multi: false},
   {id: FILTER_MODIFIED_AFTER, name: "Modified after", filtervar: "modified__date__gt", datatype: "date", multi: false},
+  {id: FILTER_ASN_ISNULL, name: "ASN is null", filtervar: "archive_serial_number__isnull", datatype: "boolean", multi: false}
 ]
 
 export interface FilterRuleType {
diff --git a/src/documents/filters.py b/src/documents/filters.py
index 4614d292b..2201298f3 100755
--- a/src/documents/filters.py
+++ b/src/documents/filters.py
@@ -4,7 +4,7 @@ from .models import Correspondent, Document, Tag, DocumentType, Log
 
 CHAR_KWARGS = ["istartswith", "iendswith", "icontains", "iexact"]
 ID_KWARGS = ["in", "exact"]
-INT_KWARGS = ["exact", "gt", "gte", "lt", "lte"]
+INT_KWARGS = ["exact", "gt", "gte", "lt", "lte", "isnull"]
 DATE_KWARGS = ["year", "month", "day", "date__gt", "gt", "date__lt", "lt"]
 
 

From 426ad30a52a5326d808ab1ba242d97ab85cc9d4d Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 3 Jan 2021 21:21:39 -0800
Subject: [PATCH 0624/1300] Refactor to extend RemoteUserMiddleware & add
 authentication for Django

---
 src/paperless/auth.py     | 16 +++-------------
 src/paperless/settings.py | 21 ++++++++++++++-------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/paperless/auth.py b/src/paperless/auth.py
index d92dc7671..cd717e56b 100644
--- a/src/paperless/auth.py
+++ b/src/paperless/auth.py
@@ -2,7 +2,7 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.utils.deprecation import MiddlewareMixin
 from rest_framework import authentication
-from rest_framework import exceptions
+from django.contrib.auth.middleware import RemoteUserMiddleware
 
 
 class AutoLoginMiddleware(MiddlewareMixin):
@@ -29,19 +29,9 @@ class AngularApiAuthenticationOverride(authentication.BaseAuthentication):
             return None
 
 
-class HttpRemoteUserAuthentication(authentication.BaseAuthentication):
+class HttpRemoteUserMiddleware(RemoteUserMiddleware):
     """ This class allows authentication via HTTP_REMOTE_USER which is set for
         example by certain SSO applications.
     """
 
-    def authenticate(self, request):
-        username = request.META.get('HTTP_REMOTE_USER')
-        if not username:
-            return None
-
-        try:
-            user = User.objects.get(username=username)
-        except User.DoesNotExist:
-            raise exceptions.AuthenticationFailed('No such user')
-
-        return (user, None)
+    header = 'HTTP_REMOTE_USER'
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index dd0d4a7d9..afbc667e0 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -115,13 +115,6 @@ if DEBUG:
         'paperless.auth.AngularApiAuthenticationOverride'
     )
 
-ENABLE_HTTP_REMOTE_USER = __get_boolean("PAPERLESS_ENABLE_HTTP_REMOTE_USER")
-
-if ENABLE_HTTP_REMOTE_USER:
-    REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'].append(
-        'paperless.auth.HttpRemoteUserAuthentication'
-    )
-
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'whitenoise.middleware.WhiteNoiseMiddleware',
@@ -135,6 +128,20 @@ MIDDLEWARE = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
+ENABLE_HTTP_REMOTE_USER = __get_boolean("PAPERLESS_ENABLE_HTTP_REMOTE_USER")
+
+if ENABLE_HTTP_REMOTE_USER:
+    MIDDLEWARE.append(
+        'paperless.auth.HttpRemoteUserMiddleware'
+    )
+    AUTHENTICATION_BACKENDS = [
+        'django.contrib.auth.backends.RemoteUserBackend',
+        'django.contrib.auth.backends.ModelBackend'
+    ]
+    REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'].append(
+        'rest_framework.authentication.RemoteUserAuthentication'
+    )
+
 ROOT_URLCONF = 'paperless.urls'
 
 FORCE_SCRIPT_NAME = os.getenv("PAPERLESS_FORCE_SCRIPT_NAME")

From 51fd19c3156b5056db8478ea525e5f2d07255631 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Thu, 31 Dec 2020 11:48:05 +0100
Subject: [PATCH 0625/1300] Switch to github actions

---
 .github/workflows/ansible.yml | 33 +++++++++++++++++++++++++++++++++
 .travis.yml                   | 10 ----------
 2 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 .github/workflows/ansible.yml

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
new file mode 100644
index 000000000..41c13c774
--- /dev/null
+++ b/.github/workflows/ansible.yml
@@ -0,0 +1,33 @@
+---
+name: Ansible Role
+
+on: push
+
+jobs:
+  test:
+  # https://molecule.readthedocs.io/en/latest/ci.html#github-actions
+    runs-on: ubuntu-latest
+    # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
+    if: contains(github.ref, 'refs/heads/')
+    steps:
+      - name: Check out the codebase
+        uses: actions/checkout@v2
+        with:
+          path: "${{ github.repository }}"
+      - name: Set up Python
+        uses: actions/setup-python@v2
+      - name: Set up Docker 
+        uses: docker-practice/actions-setup-docker@master
+      - name: Install dependencies
+        run: |
+          python3 -m pip install --upgrade pip
+          python3 -m pip install molecule[ansible,docker]
+          ansible --version
+          docker --version
+          molecule --version
+          python --version
+      - name: Test with molecule
+        run: |
+          cd ansible
+          molecule test
+        working-directory: "${{ github.repository }}"
diff --git a/.travis.yml b/.travis.yml
index e36b1ca99..b745d6bd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,16 +33,6 @@ jobs:
         - ng build --prod
       after_success: true
 
-    - name: "Ansible role"
-      sudo: required
-      services:
-        - docker
-      install:
-        - python3 -m pip install molecule[ansible,docker]
-      script:
-        - cd ansible/
-        - molecule test
-      after_success: true
 
 before_install:
   - sudo apt-get update -qq

From 586db3bc5e9bdd7962721f8bc0efee2af1e178a2 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Thu, 31 Dec 2020 13:21:42 +0100
Subject: [PATCH 0626/1300] Deploy role to ansible galaxy

Happens only when a new tag is pushed
---
 .github/workflows/ansible.yml | 32 +++++++++++++++++++++++++----
 ansible/README.md             | 38 +++++++++++++++++++++++++++++++++++
 ansible/meta/main.yml         | 17 ++++++++++++++++
 3 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 ansible/README.md
 create mode 100644 ansible/meta/main.yml

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index 41c13c774..67383ecf8 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -1,14 +1,14 @@
 ---
 name: Ansible Role
 
-on: push
+on: [push, pull_request]
 
 jobs:
-  test:
   # https://molecule.readthedocs.io/en/latest/ci.html#github-actions
+  test:
     runs-on: ubuntu-latest
     # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
-    if: contains(github.ref, 'refs/heads/')
+    if: github.event_name == 'pull_request' || (github.event_name == 'push' && contains(github.ref, 'refs/heads/'))
     steps:
       - name: Check out the codebase
         uses: actions/checkout@v2
@@ -16,7 +16,7 @@ jobs:
           path: "${{ github.repository }}"
       - name: Set up Python
         uses: actions/setup-python@v2
-      - name: Set up Docker 
+      - name: Set up Docker
         uses: docker-practice/actions-setup-docker@master
       - name: Install dependencies
         run: |
@@ -31,3 +31,27 @@ jobs:
           cd ansible
           molecule test
         working-directory: "${{ github.repository }}"
+  # https://galaxy.ansible.com/docs/contributing/importing.html
+  release:
+    runs-on: ubuntu-latest
+    needs:
+      - test
+    # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
+    if: contains(github.ref, 'refs/tags/')
+    steps:
+      - name: Check out the codebase
+        uses: actions/checkout@v2
+        with:
+          path: "${{ github.repository }}"
+      - name: Set up Python
+        uses: actions/setup-python@v2
+      - name: Install dependencies
+        run: |
+          python3 -m pip install --upgrade ansible-base
+          ansible --version
+          python --version
+      - name: Trigger a new import on Galaxy
+        run: |
+          cd ansible
+          ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
+        working-directory: "${{ github.repository }}"
diff --git a/ansible/README.md b/ansible/README.md
new file mode 100644
index 000000000..225dd44b9
--- /dev/null
+++ b/ansible/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/ansible/meta/main.yml b/ansible/meta/main.yml
new file mode 100644
index 000000000..78a4c1a41
--- /dev/null
+++ b/ansible/meta/main.yml
@@ -0,0 +1,17 @@
+dependencies: []
+
+galaxy_info:
+  author: C0nsultant
+  description: Bare-metal deployment of paperless-ng DMS
+  license: license (GPLv3)
+  min_ansible_version: 2.7
+
+  platforms:
+    - name: Debian
+      versions:
+        - buster
+    - name: Ubuntu
+      versions:
+        - focal
+
+  galaxy_tags: [EDMS, django, python, web]

From 7e36986a26110373f26559818e44d2282f260837 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 4 Jan 2021 00:20:10 -0800
Subject: [PATCH 0627/1300] Clearing filters on saved views should reset them
 to initial rules

---
 .../document-list.component.html              |  4 +-
 .../document-list/document-list.component.ts  | 45 +++++++++++++++----
 .../filter-editor.component.html              |  6 +--
 .../filter-editor/filter-editor.component.ts  | 28 +++++-------
 4 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index e4d7256e1..90893baee 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -5,7 +5,7 @@
       <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#text-indent-left" />
       </svg>&nbsp;<ng-container i18n>Select</ng-container>
-      
+
     </button>
     <div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow">
       <button ngbDropdownItem (click)="list.selectNone()" i18n>Select none</button>
@@ -78,7 +78,7 @@
 </app-page-header>
 
 <div class="w-100 mb-2 mb-sm-4">
-  <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
+  <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" [rulesModified]="filterRulesModified" (reset)="resetFilters()" #filterEditor></app-filter-editor>
   <app-bulk-editor [hidden]="!isBulkEditing"></app-bulk-editor>
 </div>
 
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 1f29cb901..685d40a44 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -30,10 +30,6 @@ export class DocumentListComponent implements OnInit {
 
   displayMode = 'smallCards' // largeCards, smallCards, details
 
-  get isFiltered() {
-    return this.list.filterRules?.length > 0
-  }
-
   getTitle() {
     return this.list.savedViewTitle || $localize`Documents`
   }
@@ -62,18 +58,16 @@ export class DocumentListComponent implements OnInit {
             this.router.navigate(["404"])
             return
           }
-
           this.list.savedView = view
-          this.list.reload()
         })
       } else {
         this.list.savedView = null
-        this.list.reload()
       }
+
+      this.list.reload()
     })
   }
 
-
   loadViewConfig(view: PaperlessSavedView) {
     this.list.load(view)
     this.list.reload()
@@ -99,6 +93,7 @@ export class DocumentListComponent implements OnInit {
         sort_reverse: this.list.sortReverse,
         sort_field: this.list.sortField
       }
+
       this.savedViewService.create(savedView).subscribe(() => {
         modal.close()
         this.toastService.showInfo($localize`View "${savedView.name}" created successfully.`)
@@ -109,6 +104,40 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
+  resetFilters(): void {
+    if (this.list.savedViewId) {
+      this.savedViewService.getCached(this.list.savedViewId).subscribe(viewUntouched => {
+        this.list.filterRules = viewUntouched.filter_rules
+      })
+    } else {
+      this.list.filterRules = []
+    }
+    this.list.reload()
+  }
+
+  get filterRulesModified(): boolean {
+    if (this.list.savedView == null) {
+      return this.list.filterRules.length > 0 // documents list is modified if it has any filters
+    } else {
+      // compare savedView current filters vs original
+      let modified = false
+      this.savedViewService.getCached(this.list.savedViewId).subscribe(view => {
+        let filterRulesInitial = view.filter_rules
+
+        if (this.list.filterRules.length !== filterRulesInitial.length) modified = true
+        else {
+          this.list.filterRules.forEach(rule => {
+            if (filterRulesInitial.find(fri => fri.rule_type == rule.rule_type && fri.value == rule.value) == undefined) modified = true
+          })
+          filterRulesInitial.forEach(rule => {
+            if (this.list.filterRules.find(fr => fr.rule_type == rule.rule_type && fr.value == rule.value) == undefined) modified = true
+          })
+        }
+      })
+      return modified
+    }
+  }
+
   clickTag(tagID: number) {
     this.list.selectNone()
     setTimeout(() => {
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index efbf6ce7e..02a51238d 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -41,11 +41,11 @@
    </div>
    <div class="w-100 d-xl-none"></div>
    <div class="col col-xl-auto mb-2 mb-xl-0">
-     <button class="btn btn-link btn-sm px-0 mx-0 ml-xl-n4" [disabled]="!hasFilters()" (click)="clearSelected()">
+     <button class="btn btn-link btn-sm px-0 mx-0 ml-xl-n4" [disabled]="!rulesModified" (click)="resetSelected()">
        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
          <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
-       </svg>&nbsp;<ng-container i18n>Clear all filters</ng-container>
-       
+       </svg>&nbsp;<ng-container i18n>Reset filters</ng-container>
+
      </button>
    </div>
 </div>
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index e6565beac..febb9dd84 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -40,7 +40,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
         case FILTER_HAS_TAG:
           return $localize`Tag: ${this.tags.find(t => t.id == +rule.value)?.name}`
-        
+
         case FILTER_HAS_ANY_TAG:
           if (rule.value == "false") {
             return $localize`Without any tag`
@@ -127,7 +127,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     } else {
       this.tagSelectionModel.getSelectedItems().filter(tag => tag.id).forEach(tag => {
         filterRules.push({rule_type: FILTER_HAS_TAG, value: tag.id?.toString()})
-      })  
+      })
     }
     this.correspondentSelectionModel.getSelectedItems().forEach(correspondent => {
       filterRules.push({rule_type: FILTER_CORRESPONDENT, value: correspondent.id?.toString()})
@@ -153,16 +153,16 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   @Output()
   filterRulesChange = new EventEmitter<FilterRule[]>()
 
+  @Output()
+  reset = new EventEmitter()
+
+  @Input()
+  rulesModified: boolean = false
+
   updateRules() {
     this.filterRulesChange.next(this.filterRules)
   }
 
-  hasFilters() {
-    return this._titleFilter || 
-      this.dateAddedAfter || this.dateAddedBefore || this.dateCreatedAfter || this.dateCreatedBefore ||
-      this.tagSelectionModel.selectionSize() || this.correspondentSelectionModel.selectionSize() || this.documentTypeSelectionModel.selectionSize()
-  }
-
   get titleFilter() {
     return this._titleFilter
   }
@@ -194,16 +194,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     this.titleFilterDebounce.complete()
   }
 
-  clearSelected() {
-    this._titleFilter = ""
-    this.tagSelectionModel.clear(false)
-    this.documentTypeSelectionModel.clear(false)
-    this.correspondentSelectionModel.clear(false)
-    this.dateAddedBefore = null
-    this.dateAddedAfter = null
-    this.dateCreatedBefore = null
-    this.dateCreatedAfter = null
-    this.updateRules()
+  resetSelected() {
+    this.reset.next()
   }
 
   toggleTag(tagId: number) {

From 2e641b0e3037fe76044a51129c0dc4b08624f6c2 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 12:18:56 +0100
Subject: [PATCH 0628/1300] Explicitly set ubuntu-20.04 as OS and install dev
 dependencies

---
 .github/workflows/docker-publish.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a7a399c3f..d29fd7740 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -9,8 +9,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        python-version: [3.7, 3.8, 3.9]
+        os: [ubuntu-20.04]
+        python-version: 3.7
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -23,10 +23,10 @@ jobs:
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip
       run: |
-        pip install --upgrade pip pipenv wheel sphinx pytest pytest-cov coveralls
+        pip install --upgrade pip pipenv
     - name: Gather pip requirements
       run: |
-        pipenv lock -r > requirements.txt
+        pipenv lock --dev -r > requirements.txt
     - name: Install pip requirements
       run: |
         pip install -r requirements.txt

From e91befabc06f0e611c5d6a63d9df35d8b346bd36 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 12:22:35 +0100
Subject: [PATCH 0629/1300] Revert job strategy matrix change

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index d29fd7740..cfda3d10d 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: 3.7
+        python-version: [3.7, 3.8, 3.9]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

From 05f57249d6fdfa89fba0e3966528a62116d0dbde Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 12:24:48 +0100
Subject: [PATCH 0630/1300] Only build python 3.7 and say so in the Pipfile too

---
 .github/workflows/docker-publish.yml | 2 +-
 Pipfile                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index cfda3d10d..0d2c8bd68 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.7]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/Pipfile b/Pipfile
index 48759307c..e0f1d83d8 100644
--- a/Pipfile
+++ b/Pipfile
@@ -9,7 +9,7 @@ verify_ssl = true
 name = "piwheels"
 
 [requires]
-python_version = "3.6"
+python_version = "3.7"
 
 [packages]
 dateparser = "~=0.7.6"

From ed6f2e40cfaf125d9b1273c49d47b693635ad4c5 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Mon, 4 Jan 2021 11:36:18 +0000
Subject: [PATCH 0631/1300] Translate /src-ui/messages.xlf in fr

translation completed for the source file '/src-ui/messages.xlf'
on the 'fr' language.
---
 src-ui/src/locale/messages.fr.xlf | 1907 +++++++++++++++++++++++++++++
 1 file changed, 1907 insertions(+)
 create mode 100644 src-ui/src/locale/messages.fr.xlf

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
new file mode 100644
index 000000000..994db6c1d
--- /dev/null
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -0,0 +1,1907 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="plaintext" original="ng2.template" source-language="en-US" target-language="fr">
+    <body>
+      <trans-unit datatype="html" id="4733307402565258070">
+        <source>Documents</source>
+        <target>Documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2155249406916744630">
+        <source>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; saved successfully.</source>
+        <target>Vue &amp;quot;<x equiv-text="this.list.savedView.name" id="PH"/>&amp;quot; enregistrée avec succès.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6837554170707123455">
+        <source>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; created successfully.</source>
+        <target>Vue &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; créée avec succès.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
+        <source>Select</source>
+        <target>Sélectionner</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7e1f9a7054aff842832620c03dedae894787ba41">
+        <source>Select none</source>
+        <target>Sélectionner aucun</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9">
+        <source>Select page</source>
+        <target>Sélectionner la page</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74">
+        <source>Select all</source>
+        <target>Sélectionner tout</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ec97f67072a83aaa972536b18d83179f6e4bbec9">
+        <source>Sort by</source>
+        <target>Trier par</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b7641aed03492978b4ec6843b1e53f30464294d9">
+        <source>Views</source>
+        <target>Vues</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b69d81ff62cdc22b6bf88fe0b72dc1f66ccfa44f">
+        <source>Save as...</source>
+        <target>Enregistrer sous...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="72e7d343f9165602cce1ca7faffbc565fd31ef92">
+        <source>Save &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
+        <target>Enregistrer &amp;quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="439e7cc3c1ecefded167ed4d37f7d22dad6a9159">
+        <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {<x id="INTERPOLATION"/> document sélectionné sur 1} other {<x id="INTERPOLATION"/> document(s) sélectionné(s) sur <x id="INTERPOLATION_1"/>}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9">
+        <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Un document} other {<x id="INTERPOLATION"/> documents}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
+        <source>ASN</source>
+        <target>NSA</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">100</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
+        <source>Correspondent</source>
+        <target>Correspondant</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">101</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
+        <source>Title</source>
+        <target>Titre</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">102</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
+        <source>Document type</source>
+        <target>Type de document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
+        <source>Created</source>
+        <target>Date de création</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">104</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
+        <source>Added</source>
+        <target>Date d'ajout</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9021887951960049161">
+        <source>Confirm delete</source>
+        <target>Confirmer la suppression</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5382975254277698192">
+        <source>Do you really want to delete document &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</source>
+        <target>Voulez-vous vraiment supprimer le document &amp;quot;<x equiv-text="this.document.title" id="PH"/>&amp;quot; ?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">162</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6691075929777935948">
+        <source>The files for this document will be deleted permanently. This operation cannot be undone.</source>
+        <target>Les fichiers liés à ce document seront supprimés définitivement. Cette action est irréversible.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">163</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="719892092227206532">
+        <source>Delete document</source>
+        <target>Supprimer le document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">165</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
+        <source>Delete</source>
+        <target>Supprimer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dc75033a5238fdc4f462212c847a45ba8018a3fd">
+        <source>Download</source>
+        <target>Télécharger</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4ea3c236bca3528318e3b3a411a20909e5fa8be4">
+        <source>More like this</source>
+        <target>Documents relatifs</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f4e529ae5ffd73001d1ff4bbdeeb0a72e342e5c8">
+        <source>Close</source>
+        <target>Fermer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4f8b2bb476981727ab34ed40fde1218361f92c45">
+        <source>Details</source>
+        <target>Détails</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4ab4cb601522b9194922554d934c4c30bd93567d">
+        <source>Content</source>
+        <target>Contenu</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f721a500a68c357e8f2a01e60510f6a01e4ba529">
+        <source>Metadata</source>
+        <target>Métadonnées</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7">
+        <source>Discard</source>
+        <target>Abandonner</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="52c9a103b812f258bcddc3d90a6e3f46871d25fe">
+        <source>Save</source>
+        <target>Enregistrer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3">
+        <source>Page</source>
+        <target>Page</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c972a8e7d09f86e0c408a80349990fb213b32c08">
+        <source>of <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></source>
+        <target>sur <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a071e35fecc10753065b1cb5b38608be66da2c8b">
+        <source>Download original</source>
+        <target>Télécharger l'original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9b3996b5ddcc628a999a7df72fbfc2a2eae8c8a5">
+        <source>Archive serial number</source>
+        <target>Numéro de série de l'archive</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="30eebc2dd656dbcb259d8d5286d244ee397d63bd">
+        <source>Date created</source>
+        <target>Date de création</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
+        <source>Tags</source>
+        <target>Étiquettes</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720">
+        <source>Date modified</source>
+        <target>Modifié le</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269">
+        <source>Date added</source>
+        <target>Date d'ajout</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3">
+        <source>Media filename</source>
+        <target>Nom de fichier du média</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">99</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8">
+        <source>Original MD5 checksum</source>
+        <target>Somme de contrôle MD5 de l'original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e92ca184ea785769fb26138fc25ee9fa06fff6e5">
+        <source>Original file size</source>
+        <target>Taille de fichier de l'original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd">
+        <source>Original mime type</source>
+        <target>Type mime de l'original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="edbf54e4117606b5dd87aaea3c14b21ebf398020">
+        <source>Archive MD5 checksum</source>
+        <target>Somme de contrôle MD5 de l'archive</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e6bf12eadecbfd80016eca15fa78651c6ca90c64">
+        <source>Archive file size</source>
+        <target>Taille de fichier de l'archive</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">119</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f">
+        <source>Original document metadata</source>
+        <target>Métadonnées du document original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7174dcea4a3d0b743e7e4a78747e902230727f67">
+        <source>Archived document metadata</source>
+        <target>Métadonnées du document archivé</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">126</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3fb9f1a31c3798173b2fea72638732c783b152fe">
+        <source>Save &amp; next</source>
+        <target>Enregistrer &amp; suivant</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8765497970646365998">
+        <source>Hello <x equiv-text="this.displayName" id="PH"/>, welcome to Paperless-ng!</source>
+        <target>Bonjour <x equiv-text="this.displayName" id="PH"/>, bienvenue dans Paperless-ng !</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7016571167317583872">
+        <source>Welcome to Paperless-ng!</source>
+        <target>Bienvenue dans Paperless-ng !</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f65253954b66e929a8b4d5ecaf61f9129f8cec64">
+        <source>Dashboard</source>
+        <target>Tableau de bord</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="93754014749412887">
+        <source>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Voulez-vous vraiment supprimer l'étiquette &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot; ?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="70a67e04629f6d412db0a12d51820b480788d795">
+        <source>Create</source>
+        <target>Créer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cff1428d10d59d14e45edec3c735a27b5482db59">
+        <source>Name</source>
+        <target>Nom</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
+        <source>Color</source>
+        <target>Couleur</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d0c4488f742efeba0915e90e285a022da813deff">
+        <source>Matching</source>
+        <target>Rapprochement</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9bcf8d20d23c111eca1431abd2d2ce0de324499c">
+        <source>Document count</source>
+        <target>Nombre de documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="030b4423b92167200e39519599f9b863b4f7c62c">
+        <source>Actions</source>
+        <target>Actions</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9d51b3c90afda70700229d1b8a55371c13cb3bce">
+        <source>Documents</source>
+        <target>Documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
+        <source>Edit</source>
+        <target>Éditer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4990731724078522539">
+        <source>Do you really want to delete the document type &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Voulez-vous vraiment supprimer le type de document &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot; ?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8">
+        <source>Document types</source>
+        <target>Types de document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="eb3d5aefff38a814b76da74371cbf02c0789a1ef">
+        <source>Logs</source>
+        <target>Rapports</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5ca707824ab93066c7d9b44e1b8bf216725c2c22">
+        <source>Filter</source>
+        <target>Filtrer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5610279464668232148">
+        <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
+        <target>Vue &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; supprimée.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">54</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5647210819299459618">
+        <source>Settings saved successfully.</source>
+        <target>Paramètres enregistrés avec succès.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">74</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8488620293789898901">
+        <source>Error while storing settings on server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Une erreur s'est produite lors de l'enregistrement des paramètres sur le serveur : <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
+        <source>Settings</source>
+        <target>Paramètres</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="11ebd254cc9294717105c5982eb0cd2af30a446d">
+        <source>General settings</source>
+        <target>Paramètres généraux</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="99dee94e92dbd9e21a008d4569f9719ed206ae37">
+        <source>Saved views</source>
+        <target>Vues enregistrées</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
+        <source>Appearance</source>
+        <target>Apparition</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
+        <source>Items per page</source>
+        <target>Éléments par page</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
+        <source>Dark mode</source>
+        <target>Mode sombre</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
+        <source>Use system settings</source>
+        <target>Utiliser les paramètres du système</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
+        <source>Bulk editing</source>
+        <target>Edition en masse</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
+        <source>Show confirmation dialogs</source>
+        <target>Afficher les messages de confirmation</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
+        <source>Deleting documents will always ask for confirmation.</source>
+        <target>La suppression de documents requiert toujours une confirmation.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
+        <source>Apply on close</source>
+        <target>Appliquer lors de la fermeture</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">49</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
+        <source>Appears on</source>
+        <target>Apparaît sur</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">68</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
+        <source>Show on dashboard</source>
+        <target>Montrer sur le tableau de bord</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
+        <source>Show in sidebar</source>
+        <target>Montrer dans la barre latérale</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
+        <source>No saved views defined.</source>
+        <target>Aucune vue sauvegardée n'est définie.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
+        <source>404 Not Found</source>
+        <target>404 Non trouvé</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/not-found/not-found.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7427874343955308724">
+        <source>Do you really want to delete the correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Voulez-vous vraiment supprimer le correspondant &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot; ?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c3f3334de899327bf3ec8999236e10798ff76e72">
+        <source>Correspondents</source>
+        <target>Correspondants</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0488919cff4fcc2174d34e4a1167f1b3c586ca37">
+        <source>Last correspondence</source>
+        <target>Dernière correspondance</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1234709746630139322">
+        <source>Confirmation</source>
+        <target>Confirmation</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9178182467454450952">
+        <source>Confirm</source>
+        <target>Confirmer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6457471243969293847">
+        <source>Create new correspondent</source>
+        <target>Créer un nouveau correspondant</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2059822531169388684">
+        <source>Edit correspondent</source>
+        <target>Éditer le correspondant</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3025930461519142465">
+        <source>Could not save correspondent: <x equiv-text="error" id="PH"/></source>
+        <target>Impossible d'enregistrer le correspondant : <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3d5caa52b0a51bfd2757215f7614183554d740f0">
+        <source>Matching algorithm</source>
+        <target>Algorithme de rapprochement</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="eab7fc7cf2d663e54de934b779fce4275a303f0f">
+        <source>Matching pattern</source>
+        <target>Modèle de rapprochement</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a1923dd970db4f74b4417b80b4a14e250fd116ff">
+        <source>Auto matching does not require you to fill in this field.</source>
+        <target>Le rapprochement automatique ne nécessite pas que vous remplissiez ce champ.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
+        <source>Case insensitive</source>
+        <target>Insensible à la casse</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="85e19678590a8b3ac1dff9d69c7a7610d1742e5a">
+        <source>Auto matching ignores this option.</source>
+        <target>Le rapprochement automatique ne tient pas compte de cette option.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
+        <source>Cancel</source>
+        <target>Annuler</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9153094873118985366">
+        <source>Create new tag</source>
+        <target>Créer une nouvelle étiquette</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5872175735754226507">
+        <source>Edit tag</source>
+        <target>Éditer l'étiquette</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2861521377141790537">
+        <source>Could not save tag: <x equiv-text="error" id="PH"/></source>
+        <target>Impossible d'enregistrer l'étiquette : <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42">
+        <source>Inbox tag</source>
+        <target>Étiquette de boîte de réception</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5e2f1a4ea12a1b8606ee3f0548d0ba64bf266077">
+        <source>Inbox tags are automatically assigned to all consumed documents.</source>
+        <target>Les étiquettes de boîte de réception sont automatiquement affectées à tous les documents traités.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6672809941092516947">
+        <source>Create new document type</source>
+        <target>Créer un nouveau type de document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="36335016091244220">
+        <source>Edit document type</source>
+        <target>Éditer le type de document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5647767513381010218">
+        <source>Could not save document type: <x equiv-text="error" id="PH"/></source>
+        <target>Impossible d'enregistrer le type de document : <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="49c9ede51100b454f7841b24cd02355c6622bf44">
+        <source>Search results</source>
+        <target>Résultats de la recherche</target>
+        <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 datatype="html" id="31976d04f98e8a38098f66ac3a83ad33b576e5db">
+        <source>Invalid search query: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></source>
+        <target>Requête de recherche invalide : <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></target>
+        <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 datatype="html" id="2abff6a01d9b342a5a14b7fb90309a95ce934f8e">
+        <source> Showing documents similar to <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></source>
+        <target>Présentation des documents similaires à <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></target>
+        <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 datatype="html" id="6e0b0a1ea16f18f2fb1586c53d99d2f22e1aee2e">
+        <source>Search query: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></source>
+        <target>Requête de recherche : <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></target>
+        <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 datatype="html" id="afa760e48c97d64d19c1455d18b7834a2256e23f">
+        <source>Did you mean &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</source>
+        <target>Vouliez-vous dire &amp;quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&amp;quot; ?</target>
+        <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 datatype="html" id="fe6ced3fcc803bba5a2e6c1a067b9ce62542500e">
+        <source>{VAR_PLURAL, plural, =0 {No results} =1 {One result} other {<x id="INTERPOLATION"/> results}}</source>
+        <target>{VAR_PLURAL, plural, =0 {Aucun résultat} =1 {Un résultat} other {<x id="INTERPOLATION"/> résultats}}</target>
+        <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 datatype="html" id="41147374f427980a9f1a8cd5e3f4b1666e6f2418">
+        <source>Paperless-ng</source>
+        <target>Paperless-ng</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+        <note from="description" priority="1">app title</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="069566c6ed4f051b5b5617ef1935837226585dad">
+        <source>Search documents</source>
+        <target>Rechercher des documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb694b49d408265c91c62799c2b3a7e3151c824d">
+        <source>Logout</source>
+        <target>Déconnexion</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="68949525c4d9a901e0cd15a94e3fc8d2711e9918">
+        <source>Manage</source>
+        <target>Gestion</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="408cb6073e60c5d966296a3207fc596adca75e01">
+        <source>Admin</source>
+        <target>Administration</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">147</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
+        <source>Misc</source>
+        <target>Divers</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">153</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
+        <source>Documentation</source>
+        <target>Documentation</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">160</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
+        <source>GitHub</source>
+        <target>GitHub</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">167</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
+        <source>Logged in as <x equiv-text="{{displayName}}" id="INTERPOLATION"/></source>
+        <target>Connexion en tant que <x equiv-text="{{displayName}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">34</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4f55b670f49d927c6026bb614c7c62b1f2a394c0">
+        <source>Open documents</source>
+        <target>Documents ouverts</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">92</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dca5bf9344a759fa5a07f1b21f50286ec242ba44">
+        <source>Close all</source>
+        <target>Fermer tout</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5195932016807797291">
+        <source>Correspondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></source>
+        <target>Correspondant : <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8170755470576301659">
+        <source>Without correspondent</source>
+        <target>Sans correspondant</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8705701325879965907">
+        <source>Type: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></source>
+        <target>Type : <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4362173610367509215">
+        <source>Without document type</source>
+        <target>Sans type de document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8180755793012580465">
+        <source>Tag: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></source>
+        <target>Étiquette : <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6494566478302448576">
+        <source>Without any tag</source>
+        <target>Sans étiquette</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
+        <source>Filter by:</source>
+        <target>Filtrer par : </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
+        <source>Filter tags</source>
+        <target>Filtrer les étiquettes</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4b089ca12c472cf0b46167bb5afe4b527b301bbc">
+        <source>Filter correspondents</source>
+        <target>Filtrer les correspondants</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0ad509732aaf702b7ea8c771c7809fa84bc85908">
+        <source>Filter document types</source>
+        <target>Filtrer les types de documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2f33515a935c36763660e8420940b8a7e11fb1f4">
+        <source>Clear all filters</source>
+        <target>Réinitialiser tous les filtres</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">47</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7593728289020204896">
+        <source>Not assigned</source>
+        <target>Non affecté</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+        <note from="description" priority="1">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="c2d0ac9f528bbd5f53fd34269fde8b59e029621b">
+        <source>Apply</source>
+        <target>Appliquer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4873149362496451858">
+        <source>Last 7 days</source>
+        <target>Les 7 derniers jours</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4463380307954693363">
+        <source>Last month</source>
+        <target>Le mois dernier</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8697368973702409683">
+        <source>Last 3 months</source>
+        <target>Les 3 derniers mois</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3566342898065860218">
+        <source>Last year</source>
+        <target>L'année passée</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="be2add3a3d9e4e2556b8f9048a15a9c0f00bf1ad">
+        <source>After</source>
+        <target>Après</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8785188e6c678b842fcb93b7392faf86db7ec676">
+        <source>Before</source>
+        <target>Avant</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="99ee4faa69cd2ea8e3678c1f557c0ff1f05aae46">
+        <source>Clear</source>
+        <target>Réinitialiser</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6829218544e108e152f5fa72cb79c4ccb82e0d06">
+        <source>View</source>
+        <target>Vue</target>
+        <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 datatype="html" id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e">
+        <source>Created: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></source>
+        <target>Créé le : <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></target>
+        <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">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8">
+        <source>Filter by correspondent</source>
+        <target>Filtrer par correspondant</target>
+        <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">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bdb9a910523610254872e147222689e9a4115b84">
+        <source>Filter by tag</source>
+        <target>Filtrer par étiquette</target>
+        <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">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60">
+        <source>Score:</source>
+        <target>Score :</target>
+        <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">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2840db547019ce8c76b2cdbe3a1653c5b68b06af">
+        <source>View in browser</source>
+        <target>Afficher dans le navigateur</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8639884465898458690">
+        <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
+        <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot; et &amp;quot;<x equiv-text="items[1].name" id="PH_1"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+        <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="7894972847287473517">
+        <source>&quot;<x equiv-text="i.name" id="PH"/>&quot;</source>
+        <target>&amp;quot;<x equiv-text="i.name" id="PH"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="760986369763309193">
+        <source>, </source>
+        <target>, </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
+        <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="1822679894391095557">
+        <source><x equiv-text="list" id="PH"/> and &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</source>
+        <target><x equiv-text="list" id="PH"/> et &amp;quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+        <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="4137232459980262849">
+        <source>Confirm tags assignment</source>
+        <target>Confirmer l'affectation des étiquettes</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6619516195038467207">
+        <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Cette action affectera l'étiquette &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1894412783609570695">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Cette action affectera les étiquettes <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">120</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7181166515756808573">
+        <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Cette action supprimera l'étiquette &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; de(s) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3819792277998068944">
+        <source>This operation will remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Cette action supprimera les étiquettes <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> de(s) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2739066218579571288">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> and remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> on <x equiv-text="this.list.selected.size" id="PH_2"/> selected document(s).</source>
+        <target>Cette action affectera les étiquettes <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> et supprimera les étiquettes <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> de(s) <x equiv-text="this.list.selected.size" id="PH_2"/> document(s) sélectionné(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">127</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2996713129519325161">
+        <source>Confirm correspondent assignment</source>
+        <target>Confirmer l'affectation du correspondant</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">157</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6900893559485781849">
+        <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Cette action affectera le correspondant &amp;quot;<x equiv-text="correspondent.name" id="PH"/>&amp;quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/>document(s) sélectionné(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">159</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1257522660364398440">
+        <source>This operation will remove the correspondent from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Cette action supprimera le correspondant de(s) <x equiv-text="this.list.selected.size" id="PH"/> document(s) sélectionné(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5393409374423140648">
+        <source>Confirm document type assignment</source>
+        <target>Confirmer l'affectation du type de document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">190</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="332180123895325027">
+        <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Cette action affectera le type de document &amp;quot;<x equiv-text="documentType.name" id="PH"/>&amp;quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">192</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2236642492594872779">
+        <source>This operation will remove the document type from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Cette action supprimera le type de document de(s) <x equiv-text="this.list.selected.size" id="PH"/> document(s) sélectionné(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">194</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="749430623564850405">
+        <source>Delete confirm</source>
+        <target>Confirmer la suppression</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">219</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4303174930844518780">
+        <source>This operation will permanently delete <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Cette action supprimera définitivement <x equiv-text="this.list.selected.size" id="PH"/> document(s) sélectionné(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">220</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5641451190833696892">
+        <source>This operation cannot be undone.</source>
+        <target>Cette action est irréversible.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">221</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6734339521247847366">
+        <source>Delete document(s)</source>
+        <target>Supprimer le(s) document(s)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">223</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
+        <source>Select:</source>
+        <target>Sélectionner :</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dfc3c34e182ea73c5d784ff7c8135f087992dac1">
+        <source>All</source>
+        <target>Tout</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="907df6a2b68daecc3c399cf40a764b358bd9fd84">
+        <source>Edit:</source>
+        <target>Éditer :</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">
+        <source>Save current view</source>
+        <target>Enregistrer la vue actuelle</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4eb84de23219c85432e38fb4fbdeb6c0f103ff8b">
+        <source>Show all</source>
+        <target>Tout afficher</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="61e0f26d843eec0b33ff475e111b0c2f7a80b835">
+        <source>Statistics</source>
+        <target>Statistiques</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="46c8fe557cf52c9389783627d4f85453f4ddb459">
+        <source>Documents in inbox: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></source>
+        <target>Documents dans la boîte de réception : <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438">
+        <source>Total documents: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></source>
+        <target>Nombre total de documents : <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8705589528094706681">
+        <source>The document has been uploaded and will be processed by the consumer shortly.</source>
+        <target>Le document a été transmis et sera traité sous peu.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4956689020592747108">
+        <source>There was an error while uploading the document: <x equiv-text="error.error.document" id="PH"/></source>
+        <target>Une erreur s'est produite lors du téléchargement du document : <x equiv-text="error.error.document" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7554858521017940575">
+        <source>An error has occurred while uploading the document. Sorry!</source>
+        <target>Une erreur s'est produite lors du téléchargement du document. Désolé !</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
+        <source>Upload new documents</source>
+        <target>Charger de nouveaux documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="52d5d56b6667ba3f7c759cbc0d4c39d34a99701e">
+        <source>Drop documents here or</source>
+        <target>Déposer des documents ici ou</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="865c511f4a24558ed0e954f9bbbff557bbb8954d">
+        <source>Browse files</source>
+        <target>Parcourir les fichiers</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="33c76d75ce25ce3b05ab22877f1b6b09dcf603ae">
+        <source>{VAR_PLURAL, plural, =1 {Uploading file...} =other {Uploading <x id="INTERPOLATION"/> files...}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Chargement du fichier...} =other {Chargement des <x id="INTERPOLATION"/> fichiers...}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="45854ddec74086b271e62be6a363f4fa5036f7fc">
+        <source>First steps</source>
+        <target>Premiers pas</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a0dc8218a6fcc5d11a4723ed127bd6be9d6d3ef3">
+        <source>Paperless is running! :)</source>
+        <target>Paperless-ng fonctionne ! :)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ea8d9a9486d5639d1c38c012900b8d34d5e4135d">
+        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message.</source>
+        <target>Vous pouvez commencer par télécharger des documents en les déposant dans la boîte de téléchargement de fichiers à droite ou en les déposant dans le dossier de traitement configuré, et ils commenceront à apparaître dans la liste des documents. Une fois que vous avez ajouté des métadonnées à vos documents, utilisez les mécanismes de filtrage de Paperless-ng pour créer des vues personnalisées (telles que &quot;Récemment ajouté&quot;, &quot;Marqué À FAIRE&quot;) et elles apparaîtront sur le tableau de bord à la place de ce message.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">6,7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cf5f85690feaba6e29343f9881e57a6c0ea6e82b">
+        <source>Paperless offers some more features that try to make your life easier:</source>
+        <target>Paperless-ng offre quelques fonctionnalités supplémentaires qui tendent à vous faciliter la vie :</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="edb41dc36af2e70789d8e3422325d930e783253e">
+        <source>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</source>
+        <target>Une fois que vous avez quelques documents dans Paperless-ng et que vous y avez ajouté des métadonnées, Paperless-ng peut attribuer automatiquement ces métadonnées à de nouveaux documents.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9dca488928c0b7af46c3866f86a6c2c8548399aa">
+        <source>You can configure paperless to read your mails and add documents from attached files.</source>
+        <target>Vous pouvez configurer Paperless-ng pour lire vos courriels et ajouter des documents à partir des pièces jointes.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d282f6277cbf6704f697170d2ad19ce500790e20">
+        <source>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</source>
+        <target>Consultez la documentation sur l'utilisation de ces fonctionnalités. La section sur l'utilisation de base contient également des informations sur la manière d'utiliser Paperless-ng en général.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="218403386307979629">
+        <source>Metadata</source>
+        <target>Métadonnées</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3797570084942068182">
+        <source>Select</source>
+        <target>Sélectionner</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7103181924469214926">
+        <source>Please select an object</source>
+        <target>Veuillez sélectionner un objet</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2807800733729323332">
+        <source>Yes</source>
+        <target>Oui</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3542042671420335679">
+        <source>No</source>
+        <target>Non</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7536524521722799066">
+        <source>(no title)</source>
+        <target>(sans titre)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/document-title.pipe.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1519954996184640001">
+        <source>Error</source>
+        <target>Erreur</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5037437391296624618">
+        <source>Information</source>
+        <target>Information</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2691296884221415710">
+        <source>Correspondent</source>
+        <target>Correspondant</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5066119607229701477">
+        <source>Document type</source>
+        <target>Type de document</target>
+        <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 datatype="html" id="5701618810648052610">
+        <source>Title</source>
+        <target>Titre</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7517688192215738656">
+        <source>ASN</source>
+        <target>NSA</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4207916966377787111">
+        <source>Created</source>
+        <target>Date de création</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="231679111972850796">
+        <source>Added</source>
+        <target>Date d'ajout</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3553216189604488439">
+        <source>Modified</source>
+        <target>Date de modification</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2056433880533904076">
+        <source>Light blue</source>
+        <target>Bleu clair</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4082253113407591781">
+        <source>Blue</source>
+        <target>Bleu</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1143414876575720034">
+        <source>Light green</source>
+        <target>Vert clair</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="119581980963263815">
+        <source>Green</source>
+        <target>Vert</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3250646524116252719">
+        <source>Light red</source>
+        <target>Rouge clair</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1628552745302385832">
+        <source>Red </source>
+        <target>Rouge</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5479028842846122610">
+        <source>Light orange</source>
+        <target>Orange clair</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8598918991528773310">
+        <source>Orange</source>
+        <target>Orange</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1789283185177957430">
+        <source>Light violet</source>
+        <target>Violet clair</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2682868487071320453">
+        <source>Violet</source>
+        <target>Violet</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1449010446077321264">
+        <source>Brown</source>
+        <target>Brun</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="30300572504753589">
+        <source>Black</source>
+        <target>Noir</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="461048771215121187">
+        <source>Light grey</source>
+        <target>Gris clair</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4561076822163447092">
+        <source>Create new item</source>
+        <target>Créer un nouvel élément</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5324147361912094446">
+        <source>Edit item</source>
+        <target>Éditer l'élément</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1699589597032579396">
+        <source>Could not save element: <x equiv-text="error" id="PH"/></source>
+        <target>Impossible d'enregistrer l'élément : <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="810888510148304696">
+        <source>Automatic</source>
+        <target>Automatique</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5044611416737085530">
+        <source>Do you really want to delete this element?</source>
+        <target>Voulez-vous vraiment supprimer cet élément ?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8371896857609524947">
+        <source>Associated documents will not be deleted.</source>
+        <target>Les documents associés ne seront pas supprimés.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7022070615528435141">
+        <source>Delete</source>
+        <target>Supprimer</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">97</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5851669019930456395">
+        <source>Any word</source>
+        <target>Un des mots</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7517655726614958140">
+        <source>Any: Document contains any of these words (space separated)</source>
+        <target>Un des mots : le document contient l'un de ces mots (séparés par des espaces)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="700315718208181326">
+        <source>All words</source>
+        <target>Tous les mots</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="111914402588955480">
+        <source>All: Document contains all of these words (space separated)</source>
+        <target>Tous les mots : le document contient tous ces mots (séparés par des espaces)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9180173992399180575">
+        <source>Exact match</source>
+        <target>Concordance exacte</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7109184332944610787">
+        <source>Exact: Document contains this string</source>
+        <target>Concordance exacte : le document contient cette chaîne de caractères</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1338733395833138319">
+        <source>Regular expression</source>
+        <target>Expression régulière</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7548151332424148033">
+        <source>Regular expression: Document matches this regular expression</source>
+        <target>Expression régulière : le document correspond à cette expression régulière</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1856513373880048959">
+        <source>Fuzzy word</source>
+        <target>Mot approximatif</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8419167206585286450">
+        <source>Fuzzy: Document contains a word similar to this word</source>
+        <target>Mot approximatif : le document contient un mot similaire à ce mot</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2167862279705099846">
+        <source>Auto: Learn matching automatically</source>
+        <target>Automatique : apprentissage automatique du rapprochement</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file

From e139ce77eeb92e816caabffe6d55f664bb332930 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Mon, 4 Jan 2021 11:39:33 +0000
Subject: [PATCH 0632/1300] Apply translations in fr

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'fr' language.
---
 src/locale/fr/LC_MESSAGES/django.po | 569 ++++++++++++++++++++++++++++
 1 file changed, 569 insertions(+)
 create mode 100644 src/locale/fr/LC_MESSAGES/django.po

diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po
new file mode 100644
index 000000000..295b9fd86
--- /dev/null
+++ b/src/locale/fr/LC_MESSAGES/django.po
@@ -0,0 +1,569 @@
+# 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 <dev@jpwinkler.de>, 2020
+# Philmo67, 2021
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-01-02 00:26+0000\n"
+"PO-Revision-Date: 2020-12-30 19:27+0000\n"
+"Last-Translator: Philmo67, 2021\n"
+"Language-Team: French (https://www.transifex.com/paperless/teams/115905/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: documents/apps.py:10
+msgid "Documents"
+msgstr "Documents"
+
+#: documents/models.py:32
+msgid "Any word"
+msgstr "Un des mots"
+
+#: documents/models.py:33
+msgid "All words"
+msgstr "Tous les mots"
+
+#: documents/models.py:34
+msgid "Exact match"
+msgstr "Concordance exacte"
+
+#: documents/models.py:35
+msgid "Regular expression"
+msgstr "Expression régulière"
+
+#: documents/models.py:36
+msgid "Fuzzy word"
+msgstr "Mot approximatif"
+
+#: documents/models.py:37
+msgid "Automatic"
+msgstr "Automatique"
+
+#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
+#: paperless_mail/models.py:100
+msgid "name"
+msgstr "nom"
+
+#: documents/models.py:45
+msgid "match"
+msgstr "rapprochement"
+
+#: documents/models.py:49
+msgid "matching algorithm"
+msgstr "algorithme de rapprochement"
+
+#: documents/models.py:55
+msgid "is insensitive"
+msgstr "est insensible à la casse"
+
+#: documents/models.py:80 documents/models.py:140
+msgid "correspondent"
+msgstr "correspondant"
+
+#: documents/models.py:81
+msgid "correspondents"
+msgstr "correspondants"
+
+#: documents/models.py:103
+msgid "color"
+msgstr "couleur"
+
+#: documents/models.py:107
+msgid "is inbox tag"
+msgstr "est une étiquette de boîte de réception"
+
+#: documents/models.py:109
+msgid ""
+"Marks this tag as an inbox tag: All newly consumed documents will be tagged "
+"with inbox tags."
+msgstr ""
+"Marque cette étiquette comme étiquette de boîte de réception : ces "
+"étiquettes sont affectées à tous les documents nouvellement traités."
+
+#: documents/models.py:114
+msgid "tag"
+msgstr "étiquette"
+
+#: documents/models.py:115 documents/models.py:171
+msgid "tags"
+msgstr "étiquettes"
+
+#: documents/models.py:121 documents/models.py:153
+msgid "document type"
+msgstr "type de document"
+
+#: documents/models.py:122
+msgid "document types"
+msgstr "types de document"
+
+#: documents/models.py:130
+msgid "Unencrypted"
+msgstr "Non chiffré"
+
+#: documents/models.py:131
+msgid "Encrypted with GNU Privacy Guard"
+msgstr "Chiffré avec GNU Privacy Guard"
+
+#: documents/models.py:144
+msgid "title"
+msgstr "titre"
+
+#: documents/models.py:157
+msgid "content"
+msgstr "contenu"
+
+#: documents/models.py:159
+msgid ""
+"The raw, text-only data of the document. This field is primarily used for "
+"searching."
+msgstr ""
+"Les données brutes du document, en format texte uniquement. Ce champ est "
+"principalement utilisé pour la recherche."
+
+#: documents/models.py:164
+msgid "mime type"
+msgstr "type mime"
+
+#: documents/models.py:175
+msgid "checksum"
+msgstr "somme de contrôle"
+
+#: documents/models.py:179
+msgid "The checksum of the original document."
+msgstr "La somme de contrôle du document original."
+
+#: documents/models.py:183
+msgid "archive checksum"
+msgstr "somme de contrôle de l'archive"
+
+#: documents/models.py:188
+msgid "The checksum of the archived document."
+msgstr "La somme de contrôle du document archivé."
+
+#: documents/models.py:192 documents/models.py:332
+msgid "created"
+msgstr "créé le"
+
+#: documents/models.py:196
+msgid "modified"
+msgstr "modifié"
+
+#: documents/models.py:200
+msgid "storage type"
+msgstr "forme d'enregistrement :"
+
+#: documents/models.py:208
+msgid "added"
+msgstr "date d'ajout"
+
+#: documents/models.py:212
+msgid "filename"
+msgstr "nom du fichier"
+
+#: documents/models.py:217
+msgid "Current filename in storage"
+msgstr "Nom du fichier courant en base de données"
+
+#: documents/models.py:221
+msgid "archive serial number"
+msgstr "numéro de série de l'archive"
+
+#: documents/models.py:226
+msgid "The position of this document in your physical document archive."
+msgstr ""
+"Le classement de ce document dans votre archive de documents physiques."
+
+#: documents/models.py:232
+msgid "document"
+msgstr "document"
+
+#: documents/models.py:233
+msgid "documents"
+msgstr "documents"
+
+#: documents/models.py:315
+msgid "debug"
+msgstr "débogage"
+
+#: documents/models.py:316
+msgid "information"
+msgstr "information"
+
+#: documents/models.py:317
+msgid "warning"
+msgstr "avertissement"
+
+#: documents/models.py:318
+msgid "error"
+msgstr "erreur"
+
+#: documents/models.py:319
+msgid "critical"
+msgstr "critique"
+
+#: documents/models.py:323
+msgid "group"
+msgstr "groupe"
+
+#: documents/models.py:326
+msgid "message"
+msgstr "message"
+
+#: documents/models.py:329
+msgid "level"
+msgstr "niveau"
+
+#: documents/models.py:336
+msgid "log"
+msgstr "rapport"
+
+#: documents/models.py:337
+msgid "logs"
+msgstr "rapports"
+
+#: documents/models.py:348 documents/models.py:398
+msgid "saved view"
+msgstr "vue enregistrée"
+
+#: documents/models.py:349
+msgid "saved views"
+msgstr "vues enregistrées"
+
+#: documents/models.py:352
+msgid "user"
+msgstr "utilisateur"
+
+#: documents/models.py:358
+msgid "show on dashboard"
+msgstr "montrer sur le tableau de bord"
+
+#: documents/models.py:361
+msgid "show in sidebar"
+msgstr "montrer dans la barre latérale"
+
+#: documents/models.py:365
+msgid "sort field"
+msgstr "champ de tri"
+
+#: documents/models.py:368
+msgid "sort reverse"
+msgstr "tri inverse"
+
+#: documents/models.py:374
+msgid "title contains"
+msgstr "le titre contient"
+
+#: documents/models.py:375
+msgid "content contains"
+msgstr "le contenu contient"
+
+#: documents/models.py:376
+msgid "ASN is"
+msgstr "le NSA est"
+
+#: documents/models.py:377
+msgid "correspondent is"
+msgstr "le correspondant est"
+
+#: documents/models.py:378
+msgid "document type is"
+msgstr "le type de document est"
+
+#: documents/models.py:379
+msgid "is in inbox"
+msgstr "est dans la boîte de réception"
+
+#: documents/models.py:380
+msgid "has tag"
+msgstr "porte l'étiquette"
+
+#: documents/models.py:381
+msgid "has any tag"
+msgstr "porte l'une des étiquettes"
+
+#: documents/models.py:382
+msgid "created before"
+msgstr "créé avant"
+
+#: documents/models.py:383
+msgid "created after"
+msgstr "créé après"
+
+#: documents/models.py:384
+msgid "created year is"
+msgstr "l'année de création est"
+
+#: documents/models.py:385
+msgid "created month is"
+msgstr "le mois de création est"
+
+#: documents/models.py:386
+msgid "created day is"
+msgstr "le jour de création est"
+
+#: documents/models.py:387
+msgid "added before"
+msgstr "ajouté avant"
+
+#: documents/models.py:388
+msgid "added after"
+msgstr "ajouté après"
+
+#: documents/models.py:389
+msgid "modified before"
+msgstr "modifié avant"
+
+#: documents/models.py:390
+msgid "modified after"
+msgstr "modifié après"
+
+#: documents/models.py:391
+msgid "does not have tag"
+msgstr "ne porte pas d'étiquette"
+
+#: documents/models.py:402
+msgid "rule type"
+msgstr "type de règle"
+
+#: documents/models.py:406
+msgid "value"
+msgstr "valeur"
+
+#: documents/models.py:412
+msgid "filter rule"
+msgstr "règle de filtrage"
+
+#: documents/models.py:413
+msgid "filter rules"
+msgstr "règles de filtrage"
+
+#: paperless/settings.py:254
+msgid "English"
+msgstr "Anglais"
+
+#: paperless/settings.py:255
+msgid "German"
+msgstr "Allemand"
+
+#: paperless/urls.py:108
+msgid "Paperless-ng administration"
+msgstr "Administration de Paperless-ng"
+
+#: paperless_mail/admin.py:24
+msgid "Filter"
+msgstr "Filtrage"
+
+#: paperless_mail/admin.py:26
+msgid ""
+"Paperless will only process mails that match ALL of the filters given below."
+msgstr ""
+"Paperless-ng ne traitera que les courriers qui correspondent à TOUS les "
+"filtres ci-dessous."
+
+#: paperless_mail/admin.py:34
+msgid "Actions"
+msgstr "Actions"
+
+#: paperless_mail/admin.py:36
+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 ""
+"Action appliquée au courriel. Cette action n'est exécutée que lorsque les "
+"documents ont été traités depuis des courriels. Les courriels sans pièces "
+"jointes demeurent totalement inchangés."
+
+#: paperless_mail/admin.py:43
+msgid "Metadata"
+msgstr "Métadonnées"
+
+#: paperless_mail/admin.py:45
+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 ""
+"Affecter automatiquement des métadonnées aux documents traités à partir de "
+"cette règle. Si vous n'affectez pas d'étiquettes, de types ou de "
+"correspondants ici, Paperless-ng traitera quand même toutes les règles de "
+"rapprochement que vous avez définies."
+
+#: paperless_mail/apps.py:9
+msgid "Paperless mail"
+msgstr "Paperless-ng pour le courriel"
+
+#: paperless_mail/models.py:11
+msgid "mail account"
+msgstr "compte de messagerie"
+
+#: paperless_mail/models.py:12
+msgid "mail accounts"
+msgstr "comptes de messagerie"
+
+#: paperless_mail/models.py:19
+msgid "No encryption"
+msgstr "Pas de chiffrement"
+
+#: paperless_mail/models.py:20
+msgid "Use SSL"
+msgstr "Utiliser SSL"
+
+#: paperless_mail/models.py:21
+msgid "Use STARTTLS"
+msgstr "Utiliser STARTTLS"
+
+#: paperless_mail/models.py:29
+msgid "IMAP server"
+msgstr "Serveur IMAP"
+
+#: paperless_mail/models.py:33
+msgid "IMAP port"
+msgstr "Port IMAP"
+
+#: paperless_mail/models.py:36
+msgid ""
+"This is usually 143 for unencrypted and STARTTLS connections, and 993 for "
+"SSL connections."
+msgstr ""
+"Généralement 143 pour les connexions non chiffrées et STARTTLS, et 993 pour "
+"les connexions SSL."
+
+#: paperless_mail/models.py:40
+msgid "IMAP security"
+msgstr "Sécurité IMAP"
+
+#: paperless_mail/models.py:46
+msgid "username"
+msgstr "nom d'utilisateur"
+
+#: paperless_mail/models.py:50
+msgid "password"
+msgstr "mot de passe"
+
+#: paperless_mail/models.py:60
+msgid "mail rule"
+msgstr "règle de courriel"
+
+#: paperless_mail/models.py:61
+msgid "mail rules"
+msgstr "règles de courriel"
+
+#: paperless_mail/models.py:69
+msgid "Mark as read, don't process read mails"
+msgstr "Marquer comme lu, ne pas traiter les courriels lus"
+
+#: paperless_mail/models.py:70
+msgid "Flag the mail, don't process flagged mails"
+msgstr "Marquer le courriel, ne pas traiter les courriels marqués"
+
+#: paperless_mail/models.py:71
+msgid "Move to specified folder"
+msgstr "Déplacer vers le dossier spécifié"
+
+#: paperless_mail/models.py:72
+msgid "Delete"
+msgstr "Supprimer"
+
+#: paperless_mail/models.py:79
+msgid "Use subject as title"
+msgstr "Utiliser le sujet en tant que titre"
+
+#: paperless_mail/models.py:80
+msgid "Use attachment filename as title"
+msgstr "Utiliser le nom de la pièce jointe en tant que titre"
+
+#: paperless_mail/models.py:90
+msgid "Do not assign a correspondent"
+msgstr "Ne pas affecter de correspondant"
+
+#: paperless_mail/models.py:92
+msgid "Use mail address"
+msgstr "Utiliser l'adresse électronique"
+
+#: paperless_mail/models.py:94
+msgid "Use name (or mail address if not available)"
+msgstr "Utiliser le nom (ou l'adresse électronique s'il n'est pas disponible)"
+
+#: paperless_mail/models.py:96
+msgid "Use correspondent selected below"
+msgstr "Utiliser le correspondant sélectionné ci-dessous"
+
+#: paperless_mail/models.py:104
+msgid "order"
+msgstr "ordre"
+
+#: paperless_mail/models.py:111
+msgid "account"
+msgstr "compte"
+
+#: paperless_mail/models.py:115
+msgid "folder"
+msgstr "répertoire"
+
+#: paperless_mail/models.py:119
+msgid "filter from"
+msgstr "filtrer l'expéditeur"
+
+#: paperless_mail/models.py:122
+msgid "filter subject"
+msgstr "filtrer le sujet"
+
+#: paperless_mail/models.py:125
+msgid "filter body"
+msgstr "filtrer le corps du message"
+
+#: paperless_mail/models.py:129
+msgid "maximum age"
+msgstr "âge maximum"
+
+#: paperless_mail/models.py:131
+msgid "Specified in days."
+msgstr "En jours."
+
+#: paperless_mail/models.py:134
+msgid "action"
+msgstr "action"
+
+#: paperless_mail/models.py:140
+msgid "action parameter"
+msgstr "paramètre d'action"
+
+#: paperless_mail/models.py:142
+msgid ""
+"Additional parameter for the action selected above, i.e., the target folder "
+"of the move to folder action."
+msgstr ""
+"Paramètre supplémentaire pour l'action sélectionnée ci-dessus, par exemple "
+"le dossier cible de l'action de déplacement vers un dossier."
+
+#: paperless_mail/models.py:148
+msgid "assign title from"
+msgstr "affecter le titre depuis"
+
+#: paperless_mail/models.py:158
+msgid "assign this tag"
+msgstr "affecter cette étiquette"
+
+#: paperless_mail/models.py:166
+msgid "assign this document type"
+msgstr "affecter ce type de document"
+
+#: paperless_mail/models.py:170
+msgid "assign correspondent from"
+msgstr "affecter le correspondant depuis"
+
+#: paperless_mail/models.py:180
+msgid "assign this correspondent"
+msgstr "affecter ce correspondant"

From 8268607a568cb03f3adbb0aca4bcbe6bf2b24275 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 14:15:34 +0100
Subject: [PATCH 0633/1300] add french to paperless

---
 src-ui/angular.json       | 3 ++-
 src/paperless/settings.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index d3530d507..414cd4f64 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -17,7 +17,8 @@
 				"sourceLocale": "en-US",
 				"locales": {
 					"de": "src/locale/messages.de.xlf",
-					"nl-NL": "src/locale/messages.nl_NL.xlf"
+					"nl-NL": "src/locale/messages.nl_NL.xlf",
+					"fr": "src/locale/messages.fr.xlf"
 				}
 			},
 			"architect": {
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index b8048eaac..1fd54823f 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -253,7 +253,8 @@ LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ("en-us", _("English")),
     ("de", _("German")),
-    ("nl-nl", _("Dutch"))
+    ("nl-nl", _("Dutch")),
+    ("fr", _("French"))
 ]
 
 LOCALE_PATHS = [

From 69ac7b9bcf0efbfeadbfe4210c991e601674ce7e Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:00:35 +0100
Subject: [PATCH 0634/1300] Revert python version in Pipfile to 3.6

---
 Pipfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Pipfile b/Pipfile
index e0f1d83d8..48759307c 100644
--- a/Pipfile
+++ b/Pipfile
@@ -9,7 +9,7 @@ verify_ssl = true
 name = "piwheels"
 
 [requires]
-python_version = "3.7"
+python_version = "3.6"
 
 [packages]
 dateparser = "~=0.7.6"

From c9de5928320a74ad016128bfae5531c0220d208d Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:10:16 +0100
Subject: [PATCH 0635/1300] Try to reproduce exactly what's done in the travis
 build to test

---
 .github/workflows/docker-publish.yml | 30 ++++++++--------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 0d2c8bd68..66bc73ea8 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,37 +10,23 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.7]
+        python-version: [3.6, 3.7, 3.8]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Update system, install system requirements
+    - name: Tests
       run: |
         sudo apt-get update -qq
-        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
-    - name: Upgrade pip
-      run: |
-        pip install --upgrade pip pipenv
-    - name: Gather pip requirements
-      run: |
-        pipenv lock --dev -r > requirements.txt
-    - name: Install pip requirements
-      run: |
-        pip install -r requirements.txt
-    - name: Execute Tests
-      run: |
+        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+        pip install --upgrade pipenv
+        pipenv install --system --dev
         cd src/
-        pytest --cov
-        pycodestyle
-    - name: Run sphinx
-      run: |
-        sphinx-build -b html ../docs ../docs/_build -W    
-    - name: Execute coveralls
-      run: |
-        coveralls
+        pipenv run pytest --cov
+        pipenv run pycodestyle
+        pipenv run coveralls
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest

From 7e99d7515f82dfbd3de680a3250796bcd907c7cb Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:17:13 +0100
Subject: [PATCH 0636/1300] Try manually replacing the python-version

---
 .github/workflows/docker-publish.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 66bc73ea8..264552168 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -21,6 +21,8 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+        echo "Replacing python version with ${matrix.python-version}"
+        sed -i "s/python_version = \"3.6\"/python_version = \"${matrix.python-version}\"/" Pipfile
         pip install --upgrade pipenv
         pipenv install --system --dev
         cd src/

From b41dd2780e4e6cb50a9eb77f5d1034f365a13b08 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:19:00 +0100
Subject: [PATCH 0637/1300] Print the env

---
 .github/workflows/docker-publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 264552168..9904d8623 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -19,6 +19,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Tests
       run: |
+        env
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
         echo "Replacing python version with ${matrix.python-version}"

From 336b908e8f57b41be05cf69cf024c6bc62bb627f Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:28:47 +0100
Subject: [PATCH 0638/1300] Only build for 3.6

---
 .github/workflows/docker-publish.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 9904d8623..23c8aef20 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -19,11 +19,8 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Tests
       run: |
-        env
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-        echo "Replacing python version with ${matrix.python-version}"
-        sed -i "s/python_version = \"3.6\"/python_version = \"${matrix.python-version}\"/" Pipfile
         pip install --upgrade pipenv
         pipenv install --system --dev
         cd src/

From 574ab7d696bdcda4967cbf22d41b8e0ad679c8e1 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:44:02 +0100
Subject: [PATCH 0639/1300] Add GITHUB_TOKEN to python tests

---
 .github/workflows/docker-publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 23c8aef20..01bf72595 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -18,6 +18,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Tests
+      env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng

From b0588321e0ff3d38b4272f0bb8e65124e3e04807 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:45:12 +0100
Subject: [PATCH 0640/1300] Fix yaml

---
 .github/workflows/docker-publish.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 01bf72595..c0a1565c6 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -18,7 +18,8 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Tests
-      env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      env: 
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng

From 052c8c5372d707d44ae70deadb8cc619afb288b6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 15:57:52 +0100
Subject: [PATCH 0641/1300] fix sort field order

---
 src-ui/src/app/services/rest/document.service.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index c42510270..dd2c32fa8 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -13,10 +13,10 @@ import { TagService } from './tag.service';
 import { FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
 
 export const DOCUMENT_SORT_FIELDS = [
-  { field: "correspondent__name", name: $localize`Correspondent` },
-  { field: "document_type__name", name: $localize`Document type` },
-  { field: 'title', name: $localize`Title` },
   { field: 'archive_serial_number', name: $localize`ASN` },
+  { field: "correspondent__name", name: $localize`Correspondent` },
+  { field: 'title', name: $localize`Title` },
+  { field: "document_type__name", name: $localize`Document type` },
   { field: 'created', name: $localize`Created` },
   { field: 'added', name: $localize`Added` },
   { field: 'modified', name: $localize`Modified` }

From 16559e83f5d3cac689f71fb951da41b9bd1bd184 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 15:58:04 +0100
Subject: [PATCH 0642/1300] bugfix

---
 src-ui/src/app/services/document-list-view.service.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index eb69439ec..a9b7d5419 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -152,6 +152,13 @@ export class DocumentListViewService {
     return this.view.sort_reverse
   }
 
+  setSort(field: string, reverse: boolean) {
+    this.view.sort_field = field
+    this.view.sort_reverse = reverse
+    this.saveDocumentListView()
+    this.reload()
+  }
+
   private saveDocumentListView() {
     sessionStorage.setItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG, JSON.stringify(this.documentListView))
   }
@@ -259,7 +266,7 @@ export class DocumentListViewService {
         this.documentListView = null
       }
     }
-    if (!this.documentListView || !this.documentListView.filter_rules || !this.documentListView.sort_reverse || !this.documentListView.sort_field) {
+    if (!this.documentListView || this.documentListView.filter_rules == null || this.documentListView.sort_reverse == null || this.documentListView.sort_field == null) {
       this.documentListView = {
         filter_rules: [],
         sort_reverse: true,

From 32f371fcb684528b8448058224e22116b674785a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 15:58:26 +0100
Subject: [PATCH 0643/1300] better sorting directive

---
 .../generic-list/generic-list.component.ts    | 13 ++++----
 .../src/app/directives/sortable.directive.ts  | 33 +++++++++++++------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
index bedf7167d..7f4e4dbd2 100644
--- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
+++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
@@ -26,7 +26,7 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
   public collectionSize = 0
 
   public sortField: string
-  public sortDirection: string
+  public sortReverse: boolean
 
   getMatching(o: MatchingModel) {
     if (o.matching_algorithm == MATCH_AUTO) {
@@ -40,17 +40,17 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
 
   onSort(event: SortEvent) {
 
-    if (event.direction && event.direction.length > 0) {
+    if (event.sorted) {
       this.sortField = event.column
-      this.sortDirection = event.direction
+      this.sortReverse = event.reverse
     } else {
       this.sortField = null
-      this.sortDirection = null
+      this.sortReverse = false
     }
 
     this.headers.forEach(header => {
       if (header.sortable !== this.sortField) {
-        header.direction = '';
+        header.sorted = false
       }
     });
 
@@ -62,8 +62,7 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
   }
 
   reloadData() {
-    // TODO: this is a hack
-    this.service.list(this.page, null, this.sortField, this.sortDirection == 'des').subscribe(c => {
+    this.service.list(this.page, null, this.sortField, this.sortReverse).subscribe(c => {
       this.data = c.results
       this.collectionSize = c.count
     });
diff --git a/src-ui/src/app/directives/sortable.directive.ts b/src-ui/src/app/directives/sortable.directive.ts
index 11c474dbb..18892a846 100644
--- a/src-ui/src/app/directives/sortable.directive.ts
+++ b/src-ui/src/app/directives/sortable.directive.ts
@@ -1,17 +1,16 @@
 import { Directive, EventEmitter, Input, Output } from '@angular/core';
 
 export interface SortEvent {
-  column: string;
-  direction: string;
+  column: string
+  sorted: boolean
+  reverse: boolean
 }
 
-const rotate: {[key: string]: string} = { 'asc': 'des', 'des': '', '': 'asc' };
-
 @Directive({
   selector: 'th[sortable]',
   host: {
-    '[class.asc]': 'direction === "asc"',
-    '[class.des]': 'direction === "des"',
+    '[class.asc]': 'sorted && !reverse',
+    '[class.des]': 'sorted && reverse',
     '(click)': 'rotate()'
   }
 })
@@ -19,12 +18,26 @@ export class SortableDirective {
 
   constructor() { }
 
-  @Input() sortable: string = '';
-  @Input() direction: string = '';
+  @Input()
+  sortable: string = '';
+
+  @Input()
+  sorted: boolean = false
+
+  @Input()
+  reverse: boolean = false
+
   @Output() sort = new EventEmitter<SortEvent>();
 
   rotate() {
-    this.direction = rotate[this.direction];
-    this.sort.emit({column: this.sortable, direction: this.direction});
+    if (!this.sorted) {
+      this.sorted = true
+      this.reverse = false
+    } else if (this.sorted && !this.reverse) {
+      this.reverse = true
+    } else {
+      this.sorted = false
+    }
+    this.sort.emit({column: this.sortable, sorted: this.sorted, reverse: this.reverse});
   }
 }

From 9bbcb9319c4088e97eca002c2c33561f9964fba0 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 17:08:52 +0100
Subject: [PATCH 0644/1300] fixes #128

---
 .../document-list.component.html              | 54 ++++++++++++++++---
 .../document-list/document-list.component.ts  | 10 +++-
 .../correspondent-list.component.html         |  8 +--
 .../document-type-list.component.html         |  6 +--
 .../generic-list/generic-list.component.ts    | 17 +-----
 .../manage/tag-list/tag-list.component.html   |  6 +--
 .../src/app/directives/sortable.directive.ts  | 21 ++++----
 7 files changed, 77 insertions(+), 45 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 3bdf8a8ce..bb687632d 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -99,12 +99,54 @@
 <table class="table table-sm border shadow-sm" *ngIf="displayMode == 'details'">
   <thead>
     <th></th>
-    <th class="d-none d-lg-table-cell" i18n>ASN</th>
-    <th class="d-none d-md-table-cell" i18n>Correspondent</th>
-    <th i18n>Title</th>
-    <th class="d-none d-xl-table-cell" i18n>Document type</th>
-    <th i18n>Created</th>
-    <th class="d-none d-xl-table-cell" i18n>Added</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" [ngClass]="list.isSelected(d) ? 'table-row-selected' : ''">
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 1f29cb901..84daf7e22 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,8 +1,9 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 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';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
@@ -28,6 +29,8 @@ export class DocumentListComponent implements OnInit {
   @ViewChild("filterEditor")
   private filterEditor: FilterEditorComponent
 
+  @ViewChildren(SortableDirective) headers: QueryList<SortableDirective>;
+  
   displayMode = 'smallCards' // largeCards, smallCards, details
 
   get isFiltered() {
@@ -42,6 +45,10 @@ export class DocumentListComponent implements OnInit {
     return DOCUMENT_SORT_FIELDS
   }
 
+  onSort(event: SortEvent) {
+    this.list.setSort(event.column, event.reverse)
+  }
+
   get isBulkEditing(): boolean {
     return this.list.selected.size > 0
   }
@@ -73,7 +80,6 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
-
   loadViewConfig(view: PaperlessSavedView) {
     this.list.load(view)
     this.list.reload()
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
index 4abc72037..c04a0bcfe 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
@@ -9,10 +9,10 @@
 <table class="table table-striped border shadow">
     <thead>
     <tr>
-      <th scope="col" sortable="name" (sort)="onSort($event)" i18n>Name</th>
-      <th scope="col" sortable="matching_algorithm" (sort)="onSort($event)" i18n>Matching</th>
-      <th scope="col" sortable="document_count" (sort)="onSort($event)" i18n>Document count</th>
-      <th scope="col" sortable="last_correspondence" (sort)="onSort($event)" i18n>Last correspondence</th>
+      <th scope="col" sortable="name" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Name</th>
+      <th scope="col" sortable="matching_algorithm" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Matching</th>
+      <th scope="col" sortable="document_count" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Document count</th>
+      <th scope="col" sortable="last_correspondence" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Last correspondence</th>
       <th scope="col" i18n>Actions</th>
     </tr>
     </thead>
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
index e18d3ec00..0282ae863 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
@@ -10,9 +10,9 @@
 <table class="table table-striped border shadow">
   <thead>
     <tr>
-      <th scope="col" sortable="name" (sort)="onSort($event)" i18n>Name</th>
-      <th scope="col" sortable="matching_algorithm" (sort)="onSort($event)" i18n>Matching</th>
-      <th scope="col" sortable="document_count" (sort)="onSort($event)" i18n>Document count</th>
+      <th scope="col" sortable="name" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Name</th>
+      <th scope="col" sortable="matching_algorithm" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Matching</th>
+      <th scope="col" sortable="document_count" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Document count</th>
       <th scope="col" i18n>Actions</th>
     </tr>
   </thead>
diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
index 7f4e4dbd2..e1d5226f3 100644
--- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
+++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
@@ -39,21 +39,8 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
   }
 
   onSort(event: SortEvent) {
-
-    if (event.sorted) {
-      this.sortField = event.column
-      this.sortReverse = event.reverse
-    } else {
-      this.sortField = null
-      this.sortReverse = false
-    }
-
-    this.headers.forEach(header => {
-      if (header.sortable !== this.sortField) {
-        header.sorted = false
-      }
-    });
-
+    this.sortField = event.column
+    this.sortReverse = event.reverse
     this.reloadData()
   }
 
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.html b/src-ui/src/app/components/manage/tag-list/tag-list.component.html
index 43126f7b2..4af22b3cd 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.html
@@ -10,10 +10,10 @@
 <table class="table table-striped border shadow-sm">
   <thead>
     <tr>
-      <th scope="col" sortable="name" (sort)="onSort($event)" i18n>Name</th>
+      <th scope="col" sortable="name" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Name</th>
       <th scope="col" i18n>Color</th>
-      <th scope="col" sortable="matching_algorithm" (sort)="onSort($event)" i18n>Matching</th>
-      <th scope="col" sortable="document_count" (sort)="onSort($event)" i18n>Document count</th>
+      <th scope="col" sortable="matching_algorithm" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Matching</th>
+      <th scope="col" sortable="document_count" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Document count</th>
       <th scope="col" i18n>Actions</th>
     </tr>
   </thead>
diff --git a/src-ui/src/app/directives/sortable.directive.ts b/src-ui/src/app/directives/sortable.directive.ts
index 18892a846..22750273d 100644
--- a/src-ui/src/app/directives/sortable.directive.ts
+++ b/src-ui/src/app/directives/sortable.directive.ts
@@ -2,15 +2,14 @@ import { Directive, EventEmitter, Input, Output } from '@angular/core';
 
 export interface SortEvent {
   column: string
-  sorted: boolean
   reverse: boolean
 }
 
 @Directive({
   selector: 'th[sortable]',
   host: {
-    '[class.asc]': 'sorted && !reverse',
-    '[class.des]': 'sorted && reverse',
+    '[class.asc]': 'currentSortField == sortable && !currentSortReverse',
+    '[class.des]': 'currentSortField == sortable && currentSortReverse',
     '(click)': 'rotate()'
   }
 })
@@ -22,22 +21,20 @@ export class SortableDirective {
   sortable: string = '';
 
   @Input()
-  sorted: boolean = false
+  currentSortReverse: boolean = false
 
   @Input()
-  reverse: boolean = false
+  currentSortField: string
 
   @Output() sort = new EventEmitter<SortEvent>();
 
   rotate() {
-    if (!this.sorted) {
-      this.sorted = true
-      this.reverse = false
-    } else if (this.sorted && !this.reverse) {
-      this.reverse = true
+    if (this.currentSortField != this.sortable) {
+      this.sort.emit({column: this.sortable, reverse: false});
+    } else if (this.currentSortField == this.sortable && !this.currentSortReverse) {
+      this.sort.emit({column: this.currentSortField, reverse: true});
     } else {
-      this.sorted = false
+      this.sort.emit({column: null, reverse: false});
     }
-    this.sort.emit({column: this.sortable, sorted: this.sorted, reverse: this.reverse});
   }
 }

From cb3001ac3b4a8cbffeabd045dced0435589b2f57 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 17:31:35 +0100
Subject: [PATCH 0645/1300] bugfix

---
 src-ui/src/app/services/document-list-view.service.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index a9b7d5419..1bbcca38e 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -111,7 +111,8 @@ export class DocumentListViewService {
           this.isReloading = false
         },
         error => {
-          if (error.error['detail'] == 'Invalid page.') {
+          if (this.currentPage != 1 && error.status == 404) {
+            // this happens when applying a filter: the current page might not be available anymore due to the reduced result set.
             this.currentPage = 1
             this.reload()
           }

From 50fa69aca4275a6c0f0e27776cceabdf35df6c90 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 17:36:32 +0100
Subject: [PATCH 0646/1300] clarify polling / inotify #118

---
 docs/troubleshooting.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index 4c06ec4cd..8786657db 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -34,6 +34,9 @@ directory at startup, but won't find any other files added later, check out
 the configuration file and enable filesystem polling with the setting
 ``PAPERLESS_CONSUMER_POLLING``.
 
+This will disable listening to filesystem changes with inotify and paperless will
+manually check the consumption directory for changes instead.
+
 Operation not permitted
 #######################
 

From 05c16e15397b85a549804f00566a28b11d3f1f5c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 17:42:42 +0100
Subject: [PATCH 0647/1300] more changes for #118

---
 docs/configuration.rst | 5 ++++-
 docs/setup.rst         | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 49c95bff1..454377283 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -348,11 +348,14 @@ PAPERLESS_TIME_ZONE=<timezone>
     Defaults to UTC.
 
 
+.. _configuration-polling:
+
 PAPERLESS_CONSUMER_POLLING=<num>
     If paperless won't find documents added to your consume folder, it might
     not be able to automatically detect filesystem changes. In that case,
     specify a polling interval in seconds here, which will then cause paperless
-    to periodically check your consumption directory for changes.
+    to periodically check your consumption directory for changes. This will also
+    disable listening for file system changes with ``inotify``.
 
     Defaults to 0, which disables polling and uses filesystem notifications.
 
diff --git a/docs/setup.rst b/docs/setup.rst
index e51c4c878..ddd246b16 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -179,6 +179,14 @@ Docker Route
 
         You can use any settings from the file ``paperless.conf`` in this file.
         Have a look at :ref:`configuration` to see whats available.
+    
+    .. caution::
+
+        Certain file systems such as NFS network shares don't support file system
+        notifications with ``inotify``. When storing the consumption directory
+        on such a file system, paperless will be unable to pick up new files
+        with the default configuration. You will need to use ``PAPERLESS_CONSUMER_POLLING``,
+        which will disable inotify. See :ref:`here <configuration-polling>`.
 
 4.  Run ``docker-compose up -d``. This will create and start the necessary
     containers. This will also build the image of paperless if you grabbed the

From e82700a82631a8efca9e15a03b079ebfbfe92cb4 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 18:40:02 +0100
Subject: [PATCH 0648/1300] update dependencies

---
 Pipfile.lock | 489 ++++++++++++++++++++++++++-------------------------
 1 file changed, 251 insertions(+), 238 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index c6621b543..6d9685f9c 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -96,50 +96,40 @@
         },
         "chardet": {
             "hashes": [
-                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
-                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
+                "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa",
+                "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"
             ],
             "markers": "python_version >= '3.1'",
-            "version": "==3.0.4"
+            "version": "==4.0.0"
         },
         "coloredlogs": {
             "hashes": [
-                "sha256:346f58aad6afd48444c2468618623638dadab76e4e70d5e10822676f2d32226a",
-                "sha256:a1fab193d2053aa6c0a97608c4342d031f1f93a3d1218432c59322441d31a505",
-                "sha256:b0c2124367d4f72bd739f48e1f61491b4baf145d6bda33b606b4a53cb3f96a97"
+                "sha256:5e78691e2673a8e294499e1832bb13efcfb44a86b92e18109fa18951093218ab",
+                "sha256:b7f630a8297a66984b6bae0f6a1b0e0afb9f2f6838ea3bfa58f50d3d13e133d6"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==14.0"
+            "version": "==15.0"
         },
         "cryptography": {
             "hashes": [
-                "sha256:07ca431b788249af92764e3be9a488aa1d39a0bc3be313d826bbec690417e538",
-                "sha256:13b88a0bd044b4eae1ef40e265d006e34dbcde0c2f1e15eb9896501b2d8f6c6f",
-                "sha256:257dab4f368fae15f378ea9a4d2799bf3696668062de0e9fa0ebb7a738a6917d",
-                "sha256:32434673d8505b42c0de4de86da8c1620651abd24afe91ae0335597683ed1b77",
-                "sha256:3cd75a683b15576cfc822c7c5742b3276e50b21a06672dc3a800a2d5da4ecd1b",
-                "sha256:4e7268a0ca14536fecfdf2b00297d4e407da904718658c1ff1961c713f90fd33",
-                "sha256:545a8550782dda68f8cdc75a6e3bf252017aa8f75f19f5a9ca940772fc0cb56e",
-                "sha256:55d0b896631412b6f0c7de56e12eb3e261ac347fbaa5d5e705291a9016e5f8cb",
-                "sha256:5849d59358547bf789ee7e0d7a9036b2d29e9a4ddf1ce5e06bb45634f995c53e",
-                "sha256:59f7d4cfea9ef12eb9b14b83d79b432162a0a24a91ddc15c2c9bf76a68d96f2b",
-                "sha256:6dc59630ecce8c1f558277ceb212c751d6730bd12c80ea96b4ac65637c4f55e7",
-                "sha256:7117319b44ed1842c617d0a452383a5a052ec6aa726dfbaffa8b94c910444297",
-                "sha256:75e8e6684cf0034f6bf2a97095cb95f81537b12b36a8fedf06e73050bb171c2d",
-                "sha256:7b8d9d8d3a9bd240f453342981f765346c87ade811519f98664519696f8e6ab7",
-                "sha256:a035a10686532b0587d58a606004aa20ad895c60c4d029afa245802347fab57b",
-                "sha256:a4e27ed0b2504195f855b52052eadcc9795c59909c9d84314c5408687f933fc7",
-                "sha256:a733671100cd26d816eed39507e585c156e4498293a907029969234e5e634bc4",
-                "sha256:a75f306a16d9f9afebfbedc41c8c2351d8e61e818ba6b4c40815e2b5740bb6b8",
-                "sha256:bd717aa029217b8ef94a7d21632a3bb5a4e7218a4513d2521c2a2fd63011e98b",
-                "sha256:d25cecbac20713a7c3bc544372d42d8eafa89799f492a43b79e1dfd650484851",
-                "sha256:d26a2557d8f9122f9bf445fc7034242f4375bd4e95ecda007667540270965b13",
-                "sha256:d3545829ab42a66b84a9aaabf216a4dce7f16dbc76eb69be5c302ed6b8f4a29b",
-                "sha256:d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3",
-                "sha256:efe15aca4f64f3a7ea0c09c87826490e50ed166ce67368a68f315ea0807a20df"
+                "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d",
+                "sha256:0e85aaae861d0485eb5a79d33226dd6248d2a9f133b81532c8f5aae37de10ff7",
+                "sha256:594a1db4511bc4d960571536abe21b4e5c3003e8750ab8365fafce71c5d86901",
+                "sha256:69e836c9e5ff4373ce6d3ab311c1a2eed274793083858d3cd4c7d12ce20d5f9c",
+                "sha256:788a3c9942df5e4371c199d10383f44a105d67d401fb4304178020142f020244",
+                "sha256:7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6",
+                "sha256:83d9d2dfec70364a74f4e7c70ad04d3ca2e6a08b703606993407bf46b97868c5",
+                "sha256:84ef7a0c10c24a7773163f917f1cb6b4444597efd505a8aed0a22e8c4780f27e",
+                "sha256:982f661bffc7a24b6d4f8ebe3291f17cf3833a0941c6f4d9d55c790b9aa2cdb3",
+                "sha256:9e21301f7a1e7c03dbea73e8602905a4ebba641547a462b26dd03451e5769e7c",
+                "sha256:9f6b0492d111b43de5f70052e24c1f0951cb9e6022188ebcb1cc3a3d301469b0",
+                "sha256:a69bd3c68b98298f490e84519b954335154917eaab52cf582fa2c5c7efc6e812",
+                "sha256:b4890d5fb9b7a23e3bf8abf5a8a7da8e228f1e97dc96b30b95685df840b6914a",
+                "sha256:c366df0401d1ec4e548bebe8f91d55ebcc0ec3137900d214dd7aac8427ef3030",
+                "sha256:dc42f645f8f3a489c3dd416730a514e7a91a59510ddaadc09d04224c098d3302"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==3.2.1"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
+            "version": "==3.3.1"
         },
         "dateparser": {
             "hashes": [
@@ -151,19 +141,19 @@
         },
         "django": {
             "hashes": [
-                "sha256:5c866205f15e7a7123f1eec6ab939d22d5bde1416635cab259684af66d8e48a2",
-                "sha256:edb10b5c45e7e9c0fb1dc00b76ec7449aca258a39ffd613dbd078c51d19c9f03"
+                "sha256:2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7",
+                "sha256:efa2ab96b33b20c2182db93147a0c3cd7769d418926f9e9f140a60dca7c64ca9"
             ],
             "index": "pypi",
-            "version": "==3.1.4"
+            "version": "==3.1.5"
         },
         "django-cors-headers": {
             "hashes": [
-                "sha256:9322255c296d5f75089571f29e520c83ff9693df17aa3cf9f6a4bea7c6740169",
-                "sha256:db82b2840f667d47872ae3e4a4e0a0d72fbecb42779b8aa233fa8bb965f7836a"
+                "sha256:5665fc1b1aabf1b678885cf6f8f8bd7da36ef0a978375e767d491b48d3055d8f",
+                "sha256:ba898dd478cd4be3a38ebc3d8729fa4d044679f8c91b2684edee41129d7e968a"
             ],
             "index": "pypi",
-            "version": "==3.5.0"
+            "version": "==3.6.0"
         },
         "django-extensions": {
             "hashes": [
@@ -230,11 +220,11 @@
         },
         "humanfriendly": {
             "hashes": [
-                "sha256:175ffa628aa76da2c17369a5da5856084562cc66dfe7f82ae93ca3ef175277a6",
-                "sha256:3c9ab8d28e88e6cc998e41963357736dafd555ee5bb666b50e42f6ce28dd3e3d"
+                "sha256:066562956639ab21ff2676d1fda0b5987e985c534fc76700a19bd54bcb81121d",
+                "sha256:d5c731705114b9ad673754f3317d9fa4c23212f36b29bdc4272a892eafc9bc72"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==9.0"
+            "version": "==9.1"
         },
         "idna": {
             "hashes": [
@@ -247,11 +237,11 @@
         },
         "imap-tools": {
             "hashes": [
-                "sha256:72bf46dc135b039a5d5b59f4e079242ac15eac02a30038e8cb2dec7b153cab65",
-                "sha256:75dc1c72dd76d9e577df26a1e0ec3a809b5eebce77678851458dcd2eae127ac9"
+                "sha256:7d2d25b35117a3750c3b561dd93cc2fcb24cdc457830a049796c639f4371e317",
+                "sha256:80088839cd1959f20c44206cdad4463ca1e7647ff67cf5b0e31e810fb6aaa6c4"
             ],
             "index": "pypi",
-            "version": "==0.33.0"
+            "version": "==0.34.0"
         },
         "img2pdf": {
             "hashes": [
@@ -262,11 +252,11 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:6112e21359ef8f344e7178aa5b72dc6e62b38b0d008e6d3cb212c5b84df72013",
-                "sha256:b0c2d3b226157ae4517d9625decf63591461c66b3a808c2666d538946519d170"
+                "sha256:5c5a2720817414a6c41f0a49993908068243ae02c1635a228126519b509c8aed",
+                "sha256:bf792d480abbd5eda85794e4afb09dd538393f7d6e6ffef6e9f03d2014cf9450"
             ],
             "markers": "python_version < '3.8'",
-            "version": "==3.1.1"
+            "version": "==3.3.0"
         },
         "inotify-simple": {
             "hashes": [
@@ -286,11 +276,11 @@
         },
         "joblib": {
             "hashes": [
-                "sha256:698c311779f347cf6b7e6b8a39bb682277b8ee4aba8cf9507bc0cf4cd4737b72",
-                "sha256:9e284edd6be6b71883a63c9b7f124738a3c16195513ad940eae7e3438de885d5"
+                "sha256:75ead23f13484a2a414874779d69ade40d4fa1abe62b222a23cd50d4bc822f6f",
+                "sha256:7ad866067ac1fdec27d51c8678ea760601b70e32ff1881d4dc8e1171f2b64b24"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==0.17.0"
+            "version": "==1.0.0"
         },
         "langdetect": {
             "hashes": [
@@ -389,26 +379,19 @@
         },
         "ocrmypdf": {
             "hashes": [
-                "sha256:91e7394172cedb3be801a229dbd3d308fb5ae80cbc3a77879fa7954beea407b1",
-                "sha256:e550b8e884150accab7ea41f4a576b5844594cb5cbd6ed514fbf1206720343ad"
+                "sha256:161c9dffb61485d30d4caea07dcb6d1b73ffa43f6e8767504a9128c510cc0c8c",
+                "sha256:404e564d0eac076cc520f0742b3e711f2611ae12a7adbc05f1232a77a81d6d61"
             ],
             "index": "pypi",
-            "version": "==11.3.4"
-        },
-        "pathtools": {
-            "hashes": [
-                "sha256:7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0",
-                "sha256:d77d982475e87f32b82157a43b09f0a5ef3e66c1d8f3c7eb8d2580e783cd8202"
-            ],
-            "version": "==0.1.2"
+            "version": "==11.4.4"
         },
         "pathvalidate": {
             "hashes": [
-                "sha256:1697c8ea71ff4c48e7aa0eda72fe4581404be8f41e51a17363ef682dd6824d35",
-                "sha256:32d30dbacb711c16bb188b12ce7e9a46b41785f50a12f64500f747480a4b6ee3"
+                "sha256:378c8b319838a255c00ab37f664686b75f0aabea4444d6c5a34effbec6738285",
+                "sha256:cae8ad5cd9223c5c1f4bc4e2ef0cd4c5e89acd2d698fdb7610ee108b9be654d2"
             ],
             "index": "pypi",
-            "version": "==2.3.0"
+            "version": "==2.3.2"
         },
         "pdfminer.six": {
             "hashes": [
@@ -427,65 +410,65 @@
         },
         "pikepdf": {
             "hashes": [
-                "sha256:0829bd5dacd73bb4a37e7575bae523f49603479755563c92ddb55c206700cab1",
-                "sha256:0d2b631077cd6af6e4d1b396208020705842610a6f13fab489d5f9c47916baa2",
-                "sha256:21c98af08fae4ac9fbcad02b613b6768a4ca300fda4cba867f4a4b6f73c2d04b",
-                "sha256:2240372fed30124ddc35b0c15a613f2b687a426ea2f150091e0a0c58cca7a495",
-                "sha256:2a97f5f1403e058d217d7f6861cf51fca200c5687bce0d052f5f2fa89b5bfa22",
-                "sha256:3faaefca0ae80d19891acec8b0dd5e6235f59f2206d82375eb80d090285e9557",
-                "sha256:48ef45b64882901c0d69af3b85d16a19bd0f3e95b43e614fefb53521d8caf36c",
-                "sha256:5212fe41f2323fc7356ba67caa39737fe13080562cff37bcbb74a8094076c8d0",
-                "sha256:56859c32170663c57bd0658189ce44e180533eebe813853446cd6413810be9eb",
-                "sha256:5f8fd1cb3478c5534222018aca24fbbd2bc74460c899bda988ec76722c13caa9",
-                "sha256:74300a32c41b3d578772f6933f23a88b19f74484185e71e5225ce2f7ea5aea78",
-                "sha256:8cbc946bdd217148f4a9c029fcea62f4ae0f67d5346de4c865f4718cd0ddc37f",
-                "sha256:9ceefd30076f732530cf84a1be2ecb2fa9931af932706ded760a6d37c73b96ad",
-                "sha256:ad69c170fda41b07a4c6b668a3128e7a759f50d9aebcfcde0ccff1358abe0423",
-                "sha256:b715fe182189fb6870fab5b0383bb2fb278c88c46eade346b0f4c1ed8818c09d",
-                "sha256:bb01ecf95083ffcb9ad542dc5342ccc1059e46f1395fd966629d36d9cc766b4a",
-                "sha256:bd6328547219cf48cefb4e0a1bc54442910594de1c5a5feae847d9ff3c629031",
-                "sha256:edb128379bb1dea76b5bdbdacf5657a6e4754bacc2049640762725590d8ed905",
-                "sha256:f8e687900557fcd4c51b4e72b9e337fdae9e2c81049d1d80b624bb2e88b5769d",
-                "sha256:fe0ca120e3347c851c34a91041d574f3c588d832023906d8ae18d66d042e8a52",
-                "sha256:fe8e0152672f24d8bfdecc725f97e9013f2de1b41849150959526ca3562bd3ef"
+                "sha256:05fac9db7d5f5871f7b6598714386ffe56c1589e1d984859fb9e6a4ec8f0ebd0",
+                "sha256:267f76dc2ca107498d9cd90df8b26d36c57faebff933ef4069dffa8d2e14a9e4",
+                "sha256:28d9f436086faf03306d321465a9384aaefe7fb023a46fc177921bc899656c6b",
+                "sha256:2e66e15122f18b1dfbe6f48b90ebfd72c666b16330af5c4849e9b9aa930c8983",
+                "sha256:3147bd0b4f4c6ed42b8dce724aa76d041aa071ebf4b500da302e1b368eb57811",
+                "sha256:385da233cb211f00a154597b437214392b25ba83b88da53124ff01856f4e0753",
+                "sha256:497000a07a1549239a83b3753e38b30257a5978d0c3f1b0ddaf698c2e1722616",
+                "sha256:497c2d9212ec4d08582bdb4bb75d383de9f3d91308092dd23b84fdecffc08fbc",
+                "sha256:62df5bed7aefbfadf29063d1c6bb9d5132bea0f6f40a186b75e068805ba96d45",
+                "sha256:80380933b1423adb25ebee33659614b9e4cd7fdfb655184d5bb8becc2ea5109a",
+                "sha256:8a72fff7adff10f7459670cc7950988cb2863ccfef107460432a7f290d00a9a1",
+                "sha256:a59fe04e67db87a63bc9f3722210e672c0b0577707e51dd121d1480afdec0c28",
+                "sha256:ac163f12a1e07a441976261367e2dfd374e050ec81a199099b9ef01143d3b01b",
+                "sha256:b63b0f6a73df3533181c310af48a5acc6acdb64deb3a36e4082264a7e98f3ca2",
+                "sha256:c3bba19636181cbe9b20dd382eec2c64c1df7ae410089c63ee20aa1d5d14dfa4",
+                "sha256:c8f70fb7453825bcbbe77da56132a22567d4ffbfe8ab8cb801d06fb56b624f6a",
+                "sha256:dd6dd1c15f770da01c03531095b8fbd1932df225297dc13f4987ca1260c2d723",
+                "sha256:e6f5dc7e2a969e73134f7fd7876a7bd2a186e6284e0ed56745d7836626abed15",
+                "sha256:ef8f2935b4380b3ed797bfbb12d143cf01fe62bdec14018813fd4cb029495999",
+                "sha256:f2a75b290f2740ccaad077240ec8d5f963991efd63369b2e4b5d2d046b22632e",
+                "sha256:f81ea51e868f075515bc9f805710105ca759fc01c29ee3cd500186a2d17e21c2"
             ],
             "index": "pypi",
-            "version": "==2.2.0"
+            "version": "==2.2.4"
         },
         "pillow": {
             "hashes": [
-                "sha256:006de60d7580d81f4a1a7e9f0173dc90a932e3905cc4d47ea909bc946302311a",
-                "sha256:0a2e8d03787ec7ad71dc18aec9367c946ef8ef50e1e78c71f743bc3a770f9fae",
-                "sha256:0eeeae397e5a79dc088d8297a4c2c6f901f8fb30db47795113a4a605d0f1e5ce",
-                "sha256:11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e",
-                "sha256:2fb113757a369a6cdb189f8df3226e995acfed0a8919a72416626af1a0a71140",
-                "sha256:4b0ef2470c4979e345e4e0cc1bbac65fda11d0d7b789dbac035e4c6ce3f98adb",
-                "sha256:59e903ca800c8cfd1ebe482349ec7c35687b95e98cefae213e271c8c7fffa021",
-                "sha256:5a3342d34289715928c914ee7f389351eb37fa4857caa9297fc7948f2ed3e53d",
-                "sha256:5abd653a23c35d980b332bc0431d39663b1709d64142e3652890df4c9b6970f6",
-                "sha256:5f9403af9c790cc18411ea398a6950ee2def2a830ad0cfe6dc9122e6d528b302",
-                "sha256:6b4a8fd632b4ebee28282a9fef4c341835a1aa8671e2770b6f89adc8e8c2703c",
-                "sha256:6c1aca8231625115104a06e4389fcd9ec88f0c9befbabd80dc206c35561be271",
-                "sha256:795e91a60f291e75de2e20e6bdd67770f793c8605b553cb6e4387ce0cb302e09",
-                "sha256:7ba0ba61252ab23052e642abdb17fd08fdcfdbbf3b74c969a30c58ac1ade7cd3",
-                "sha256:7c9401e68730d6c4245b8e361d3d13e1035cbc94db86b49dc7da8bec235d0015",
-                "sha256:81f812d8f5e8a09b246515fac141e9d10113229bc33ea073fec11403b016bcf3",
-                "sha256:895d54c0ddc78a478c80f9c438579ac15f3e27bf442c2a9aa74d41d0e4d12544",
-                "sha256:8de332053707c80963b589b22f8e0229f1be1f3ca862a932c1bcd48dafb18dd8",
-                "sha256:92c882b70a40c79de9f5294dc99390671e07fc0b0113d472cbea3fde15db1792",
-                "sha256:95edb1ed513e68bddc2aee3de66ceaf743590bf16c023fb9977adc4be15bd3f0",
-                "sha256:b63d4ff734263ae4ce6593798bcfee6dbfb00523c82753a3a03cbc05555a9cc3",
-                "sha256:bd7bf289e05470b1bc74889d1466d9ad4a56d201f24397557b6f65c24a6844b8",
-                "sha256:cc3ea6b23954da84dbee8025c616040d9aa5eaf34ea6895a0a762ee9d3e12e11",
-                "sha256:cc9ec588c6ef3a1325fa032ec14d97b7309db493782ea8c304666fb10c3bd9a7",
-                "sha256:d3d07c86d4efa1facdf32aa878bd508c0dc4f87c48125cc16b937baa4e5b5e11",
-                "sha256:d8a96747df78cda35980905bf26e72960cba6d355ace4780d4bdde3b217cdf1e",
-                "sha256:e38d58d9138ef972fceb7aeec4be02e3f01d383723965bfcef14d174c8ccd039",
-                "sha256:eb472586374dc66b31e36e14720747595c2b265ae962987261f044e5cce644b5",
-                "sha256:fbd922f702582cb0d71ef94442bfca57624352622d75e3be7a1e7e9360b07e72"
+                "sha256:165c88bc9d8dba670110c689e3cc5c71dbe4bfb984ffa7cbebf1fac9554071d6",
+                "sha256:22d070ca2e60c99929ef274cfced04294d2368193e935c5d6febfd8b601bf865",
+                "sha256:2353834b2c49b95e1313fb34edf18fca4d57446675d05298bb694bca4b194174",
+                "sha256:39725acf2d2e9c17356e6835dccebe7a697db55f25a09207e38b835d5e1bc032",
+                "sha256:3de6b2ee4f78c6b3d89d184ade5d8fa68af0848f9b6b6da2b9ab7943ec46971a",
+                "sha256:47c0d93ee9c8b181f353dbead6530b26980fe4f5485aa18be8f1fd3c3cbc685e",
+                "sha256:5e2fe3bb2363b862671eba632537cd3a823847db4d98be95690b7e382f3d6378",
+                "sha256:604815c55fd92e735f9738f65dabf4edc3e79f88541c221d292faec1904a4b17",
+                "sha256:6c5275bd82711cd3dcd0af8ce0bb99113ae8911fc2952805f1d012de7d600a4c",
+                "sha256:731ca5aabe9085160cf68b2dbef95fc1991015bc0a3a6ea46a371ab88f3d0913",
+                "sha256:7612520e5e1a371d77e1d1ca3a3ee6227eef00d0a9cddb4ef7ecb0b7396eddf7",
+                "sha256:7916cbc94f1c6b1301ac04510d0881b9e9feb20ae34094d3615a8a7c3db0dcc0",
+                "sha256:81c3fa9a75d9f1afafdb916d5995633f319db09bd773cb56b8e39f1e98d90820",
+                "sha256:887668e792b7edbfb1d3c9d8b5d8c859269a0f0eba4dda562adb95500f60dbba",
+                "sha256:8c183b5c60544b49e0a66f924b18c526dfd37774811b627f70836fe01711abd3",
+                "sha256:93a473b53cc6e0b3ce6bf51b1b95b7b1e7e6084be3a07e40f79b42e83503fbf2",
+                "sha256:96d4dc103d1a0fa6d47c6c55a47de5f5dafd5ef0114fa10c85a1fd8e0216284b",
+                "sha256:a3d3e086474ef12ef13d42e5f9b7bbf09d39cf6bd4940f982263d6954b13f6a9",
+                "sha256:b02a0b9f332086657852b1f7cb380f6a42403a6d9c42a4c34a561aa4530d5234",
+                "sha256:b09e10ec453de97f9a23a5aa5e30b334195e8d2ddd1ce76cc32e52ba63c8b31d",
+                "sha256:b6f00ad5ebe846cc91763b1d0c6d30a8042e02b2316e27b05de04fa6ec831ec5",
+                "sha256:bba80df38cfc17f490ec651c73bb37cd896bc2400cfba27d078c2135223c1206",
+                "sha256:c3d911614b008e8a576b8e5303e3db29224b455d3d66d1b2848ba6ca83f9ece9",
+                "sha256:ca20739e303254287138234485579b28cb0d524401f83d5129b5ff9d606cb0a8",
+                "sha256:cb192176b477d49b0a327b2a5a4979552b7a58cd42037034316b8018ac3ebb59",
+                "sha256:cdbbe7dff4a677fb555a54f9bc0450f2a21a93c5ba2b44e09e54fcb72d2bd13d",
+                "sha256:d355502dce85ade85a2511b40b4c61a128902f246504f7de29bbeec1ae27933a",
+                "sha256:dc577f4cfdda354db3ae37a572428a90ffdbe4e51eda7849bf442fb803f09c9b",
+                "sha256:dd9eef866c70d2cbbea1ae58134eaffda0d4bfea403025f4db6859724b18ab3d"
             ],
             "index": "pypi",
-            "version": "==8.0.1"
+            "version": "==8.1.0"
         },
         "pluggy": {
             "hashes": [
@@ -590,10 +573,10 @@
         },
         "pytz": {
             "hashes": [
-                "sha256:3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268",
-                "sha256:5c55e189b682d420be27c6995ba6edce0c0a77dd67bfbe2ae6607134d5851ffd"
+                "sha256:16962c5fb8db4a8f63a26646d8886e9d769b6c511543557bc84e9569fb9a9cb4",
+                "sha256:180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5"
             ],
-            "version": "==2020.4"
+            "version": "==2020.5"
         },
         "redis": {
             "hashes": [
@@ -654,50 +637,50 @@
         },
         "reportlab": {
             "hashes": [
-                "sha256:0008b5baa39d7e3a8132c4b47ecae88d6858ad386518e754e5e7b8025ee4722b",
-                "sha256:0ad5a540c336941272fe161ef3a9830da3d4b3a65a195531cebd3cad5db58b2a",
-                "sha256:0c965a5691686d746f558ee1c52aa9c63a01a0e13cba61ffc661573948e32f61",
-                "sha256:0fd568fa5615ae99f76289c52ff230207852ee942d4934f6c893c93d2a79544e",
-                "sha256:1117d905a3404c696869c7aabec9454b43ed6acbbc73f9256c6fcea23e7ae93e",
-                "sha256:1ea7c388e91ad9d823655ad6a13751ff67e8a0e7cf4065cf051b4c931cdd9450",
-                "sha256:26c0ee8f62652cc7fcdc47a1cb3b34775a4d625738025c1a7edb8718bda5a315",
-                "sha256:368c5b3fc3d5a541cb9dcacefa563fdb445365f517e3cbf64b4326631d1cf13c",
-                "sha256:451d42fdcdd7d84587d6d9c8f5d9a7d0e997305efb606705063ca1fe8bcca551",
-                "sha256:47394acba4da8e56ef8e55d8eb483b868521696ba49ab0f0fcf8a1a4a5ac6e49",
-                "sha256:51b16e297f7b937fc530dd151e4b38f1d305b01c9aa10657bc32a5d2901b8ad7",
-                "sha256:51c0cdcf606ded0a7b4b50050400f25125ea797fbfc3c817135993b38f8b764e",
-                "sha256:55c672c579618843e0fd00140fb71f1ffebc4f1c542ac385c4f4999f2f5398d9",
-                "sha256:5c34a96ecfbf595caf16178a06abcd26a5f8720e01fe1285d4c97333382cfaeb",
-                "sha256:61aa89a00754b18c4f2956b8bff831f1fd3affef6476dc63462d92211941605e",
-                "sha256:62234d29c97279917903e4587faf240a5dea4617be250db55386ff268eb5a7c5",
-                "sha256:670f2a8dcc23bf798c39b95c64bf76ee387549b962f76783670821978a226663",
-                "sha256:69387f171f6c7b55109caa6d061b17a18f2f9e724a0212c07cd692aeb369dd19",
-                "sha256:6c5c8871b659f7c2975382d7b61f3c182701fa9eb62cf649c3c73ba8fc5e2595",
-                "sha256:80139ceb3a568f5be908094f1701fd05391b71425e8b69aaed0d30db647ca2aa",
-                "sha256:80661a76d0019b5e2c315ccd3bc7093d754067d6142b36a3a0ec4f416073d23b",
-                "sha256:85a2236f324ae336da7f4b183fa99bed261bcc00ac1255ee91a504e68b086d00",
-                "sha256:89a3acd98bd4478d6bbc5cb32e0665ea546c98bff8b58d5e1014659daa6ef75a",
-                "sha256:8a39119fcab146bde41fd1c6d148f9ee1e2cca10c6f9c2b7eb4dd710a3a2c6ac",
-                "sha256:9c31c2526401da6cc92018f68483f2aac0a731cb98435445ea4b72d46b438c84",
-                "sha256:9e8ae1c3b8a1697147c5c97f00d66ab1c54d88c4615b0cdd9b1a667d7baf3eb7",
-                "sha256:a479c38ab2b997ce05d3bef906783ac20cf4cb224a154e80c9018c5e4d943a35",
-                "sha256:a79aab8d069543d5085d58260f18705a08acd92a4501a41261913fddc2137d46",
-                "sha256:b0a8314383de853599ca531dfe55eaa49bb8d6b0bb663b2f8479b7a0f3385ea2",
-                "sha256:b3d9926e64bd8008007b2d9819d7b30179b069ce95431d5060f71afc36885389",
-                "sha256:c2a9a77ce4f25ffb52d705be82a9f41b47f6b0da23870ebc3587709e7242da30",
-                "sha256:c578dd0799f70fb577474cd383f035c6e1057e4fe837278113f9cfa6eee4b076",
-                "sha256:c5abd9d0023ad20030524ab0d5fa39d77aed025519b1fa426304ab2dd0328b89",
-                "sha256:ced96125525ba21311e9512adf391170b9e149f89e27e45b06ff07b70f97a0b2",
-                "sha256:d692fb88d6ef5e75242b00009b54953a0425eaa8bd3a36db9db8b396785e1f57",
-                "sha256:d70c2104286459658e61388af9eee838b612986bd8a36e1d21ba36152983ac15",
-                "sha256:de47c65c10ac6f0d2addb28f1b1657b1c707aca014d09d01b3b728cf19e8f791",
-                "sha256:e6e7592527791841db0820a72c6afae52655a05b0b6d4df184fd2bafe82ee1ee",
-                "sha256:e8a7e95ee6ea5566291b59ede5b9fadce809dca43ebfbfe11e3ff3d6492c6f0e",
-                "sha256:f041759138b3a95508c4281b3db3bf9bb28636d84c554272a58a5ca7c9f9bbf4",
-                "sha256:f39c7fc1fa2e4a1d9747a3effd70731a9d0e9eb5738247fa089c059eff19d43e",
-                "sha256:f65ac89ee0ba569f5279360eae08783f7f2e95c9810a9846c957fbd5950f4896"
+                "sha256:009fa61710647cdc62eb373345248d8ebb93583a058990f7c4f9be46d90aa5b1",
+                "sha256:04a08d284da86882ec3a41a7c719833362ef891b09ee8e2fbb47cee352aa684a",
+                "sha256:07bff6742fba612da8d1b1f783c436338c6fdc6962828159827d5ca7d2b67935",
+                "sha256:09fb11ab1500e679fc1b01199d2fed24435499856e75043a9ac0d31dd48fd881",
+                "sha256:18a876449c9000c391dd3415ebc8454cd7bb9e488977b894886a2d7d018f16cd",
+                "sha256:18eec161411026dde49767bee4e5e8eeb8014879554811a62581dc7433628d5b",
+                "sha256:19353aead39fc115a4d6c598d6fb9fa26da7e69160a0443ebb49b02903e704e8",
+                "sha256:1b85c20e89c22ae902ca973df2afdd2d64d27dc4ffd2b29ebad8c805a213756b",
+                "sha256:1da3d7a35f918cee905facfa94bd00ae6091cadc06dca1b0b31b69ae02d41d1d",
+                "sha256:1e484ce83dae26cb40fcbd312d45b8ba921de7856a00339d867dd4ecf145a1e7",
+                "sha256:33f3cfdc492575f8af3225701301a7e62fc478358729820c9e0091aff5831378",
+                "sha256:3b0026c1129147befd4e5a8cf25da8dea1096fce371e7b2412e36d7254019c06",
+                "sha256:3d7713dddaa8081ed709a1fa2456a43f6a74b0f07d605da8441fd53fef334f69",
+                "sha256:3e2b4d69763103b9dc9b54c0952dc3cee05cedd06e28c0987fad7f84705b12c0",
+                "sha256:4ca5233a19a5ceca23546290f43addec2345789c7d65bb32f8b2668aa148351f",
+                "sha256:5214a289cf01ebbd65e49bae83709671dd9edb601891cf0ae8abf85f3c0b392f",
+                "sha256:52f8237654acbc78ea2fa6fb4a6a06e5b023b6da93f7889adfe2deba09473fad",
+                "sha256:5ed00894e0f8281c0b7c0494b4d3067c641fd90c8e5cf933089ec4cc9a48e491",
+                "sha256:6191961533d49c9d860964d42bada4d7ac3bb28502d984feb8034093f2012fa8",
+                "sha256:6f3ad2b1afe99c436563cd436d8693d4a12e2c4bd45f70c7705759ff7837fe53",
+                "sha256:739b743b7ca1ba4b4d64c321de6fccb49b562d0507ea06c817d9cc4faed5cd22",
+                "sha256:792efba0c0c6e4ee94f6dc95f305451733ee9230a1c7d51cb8e5301a549e0dfb",
+                "sha256:79d63ca40231ca3860859b39a92daa5219035ba9553da89a5e1b218550744121",
+                "sha256:83b28104edd58ad65748d2d0e60e0d97e3b91b3e90b4573ea6fe60de6811972c",
+                "sha256:85650446538cd2f606ca234634142a7ccd74cb6db7cfec250f76a4242e0f2431",
+                "sha256:8850eba6de6eb813036eb8dce353e40d60c8af48bbce107de82770b10d3aa525",
+                "sha256:9da445cb79e3f740756924c053edc952cde11a65ff5af8acfda3c0a1317136ef",
+                "sha256:9fabd5fbd24f5971085ffe53150d663f158f7d3050b25c95736e29ebf676d454",
+                "sha256:a0c377bc45e73c3f15f55d7de69fab270d174749d5b454ab0de502b15430ec2a",
+                "sha256:a1d3f7022a920d4a5e165d264581f1862e1c1b877ceeabb96fe98cec98125ae5",
+                "sha256:a315edef5c5610b0c75790142f49487e89ea34397fc247ae8aa890fe6d6dd057",
+                "sha256:a755cca2dcf023130b03bb671670301a992157d5c3151d838c0b68ef89894536",
+                "sha256:b1b20208ecdfffd7ca027955c4fe8972b28b30a4b3b80cf25099a08d3b20ed7c",
+                "sha256:b26d6f416891cef93411d6d478a25db275766081a5fb66368248293ef459f3be",
+                "sha256:b4ba4c30af7044ee987e61c88a5ffb76031ca0c53666bc85d823b7de55ddbc75",
+                "sha256:b71faf3b6e4d7058e1af1b8afedaf39a962db4a219affc8177009d8244ec10d4",
+                "sha256:cfa854bea525f8c913cb77e2bda724d94b965a0eb3bcfc4a645a9baa29bb86e2",
+                "sha256:dd9687359e466086b9f6fe6d8069034017f8b6ca3080944fae5709767ca6814e",
+                "sha256:de0c675fc2998a7eaa929c356ba49c84f53a892e9ab25e8ee7d8ebbbdcb2ac16",
+                "sha256:e2b4e33fea2ce9d3a14ea39191b169e41eb2ac995274f54ac8fd27519974bce8",
+                "sha256:f3d4a1a273dc141e03b72a553c11bc14dd7a27ec7654a071edcf83eb04f004bc",
+                "sha256:ff547cf4c1de7e104cad1a378431ff81efcb03e90e40871ee686107da5b91442"
             ],
-            "version": "==3.5.56"
+            "version": "==3.5.59"
         },
         "requests": {
             "hashes": [
@@ -803,11 +786,11 @@
         },
         "tqdm": {
             "hashes": [
-                "sha256:38b658a3e4ecf9b4f6f8ff75ca16221ae3378b2e175d846b6b33ea3a20852cf5",
-                "sha256:d4f413aecb61c9779888c64ddf0c62910ad56dcbe857d8922bb505d4dbff0df1"
+                "sha256:556c55b081bd9aa746d34125d024b73f0e2a0e62d5927ff0e400e20ee0a03b9a",
+                "sha256:b8b46036fd00176d0870307123ef06bb851096964fa7fc578d789f90ce82c3e4"
             ],
             "index": "pypi",
-            "version": "==4.54.1"
+            "version": "==4.55.1"
         },
         "typing-extensions": {
             "hashes": [
@@ -835,11 +818,26 @@
         },
         "watchdog": {
             "hashes": [
-                "sha256:3caefdcc8f06a57fdc5ef2d22aa7c0bfda4f55e71a0bee74cbf3176d97536ef3",
-                "sha256:e38bffc89b15bafe2a131f0e1c74924cf07dcec020c2e0a26cccd208831fcd43"
+                "sha256:016b01495b9c55b5d4126ed8ae75d93ea0d99377084107c33162df52887cee18",
+                "sha256:101532b8db506559e52a9b5d75a308729b3f68264d930670e6155c976d0e52a0",
+                "sha256:27d9b4666938d5d40afdcdf2c751781e9ce36320788b70208d0f87f7401caf93",
+                "sha256:2f1ade0d0802503fda4340374d333408831cff23da66d7e711e279ba50fe6c4a",
+                "sha256:376cbc2a35c0392b0fe7ff16fbc1b303fd99d4dd9911ab5581ee9d69adc88982",
+                "sha256:57f05e55aa603c3b053eed7e679f0a83873c540255b88d58c6223c7493833bac",
+                "sha256:5f1f3b65142175366ba94c64d8d4c8f4015825e0beaacee1c301823266b47b9b",
+                "sha256:602dbd9498592eacc42e0632c19781c3df1728ef9cbab555fab6778effc29eeb",
+                "sha256:68744de2003a5ea2dfbb104f9a74192cf381334a9e2c0ed2bbe1581828d50b61",
+                "sha256:85e6574395aa6c1e14e0f030d9d7f35c2340a6cf95d5671354ce876ac3ffdd4d",
+                "sha256:b1d723852ce90a14abf0ec0ca9e80689d9509ee4c9ee27163118d87b564a12ac",
+                "sha256:d948ad9ab9aba705f9836625b32e965b9ae607284811cd98334423f659ea537a",
+                "sha256:e2a531e71be7b5cc3499ae2d1494d51b6a26684bcc7c3146f63c810c00e8a3cc",
+                "sha256:e7c73edef48f4ceeebb987317a67e0080e5c9228601ff67b3c4062fa020403c7",
+                "sha256:ee21aeebe6b3e51e4ba64564c94cee8dbe7438b9cb60f0bb350c4fa70d1b52c2",
+                "sha256:f1d0e878fd69129d0d68b87cee5d9543f20d8018e82998efb79f7e412d42154a",
+                "sha256:f84146f7864339c8addf2c2b9903271df21d18d2c721e9a77f779493234a82b5"
             ],
             "index": "pypi",
-            "version": "==0.10.4"
+            "version": "==1.0.2"
         },
         "wcwidth": {
             "hashes": [
@@ -922,53 +920,68 @@
         },
         "chardet": {
             "hashes": [
-                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
-                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
+                "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa",
+                "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"
             ],
             "markers": "python_version >= '3.1'",
-            "version": "==3.0.4"
+            "version": "==4.0.0"
         },
         "coverage": {
             "hashes": [
-                "sha256:0203acd33d2298e19b57451ebb0bed0ab0c602e5cf5a818591b4918b1f97d516",
-                "sha256:0f313707cdecd5cd3e217fc68c78a960b616604b559e9ea60cc16795c4304259",
-                "sha256:1c6703094c81fa55b816f5ae542c6ffc625fec769f22b053adb42ad712d086c9",
-                "sha256:1d44bb3a652fed01f1f2c10d5477956116e9b391320c94d36c6bf13b088a1097",
-                "sha256:280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0",
-                "sha256:29a6272fec10623fcbe158fdf9abc7a5fa032048ac1d8631f14b50fbfc10d17f",
-                "sha256:2b31f46bf7b31e6aa690d4c7a3d51bb262438c6dcb0d528adde446531d0d3bb7",
-                "sha256:2d43af2be93ffbad25dd959899b5b809618a496926146ce98ee0b23683f8c51c",
-                "sha256:3188a7dfd96f734a7498f37cde6598b1e9c084f1ca68bc1aa04e88db31168ab6",
-                "sha256:381ead10b9b9af5f64646cd27107fb27b614ee7040bb1226f9c07ba96625cbb5",
-                "sha256:47a11bdbd8ada9b7ee628596f9d97fbd3851bd9999d398e9436bd67376dbece7",
-                "sha256:4d6a42744139a7fa5b46a264874a781e8694bb32f1d76d8137b68138686f1729",
-                "sha256:50691e744714856f03a86df3e2bff847c2acede4c191f9a1da38f088df342978",
-                "sha256:530cc8aaf11cc2ac7430f3614b04645662ef20c348dce4167c22d99bec3480e9",
-                "sha256:582ddfbe712025448206a5bc45855d16c2e491c2dd102ee9a2841418ac1c629f",
-                "sha256:63808c30b41f3bbf65e29f7280bf793c79f54fb807057de7e5238ffc7cc4d7b9",
-                "sha256:71b69bd716698fa62cd97137d6f2fdf49f534decb23a2c6fc80813e8b7be6822",
-                "sha256:7858847f2d84bf6e64c7f66498e851c54de8ea06a6f96a32a1d192d846734418",
-                "sha256:78e93cc3571fd928a39c0b26767c986188a4118edc67bc0695bc7a284da22e82",
-                "sha256:7f43286f13d91a34fadf61ae252a51a130223c52bfefb50310d5b2deb062cf0f",
-                "sha256:86e9f8cd4b0cdd57b4ae71a9c186717daa4c5a99f3238a8723f416256e0b064d",
-                "sha256:8f264ba2701b8c9f815b272ad568d555ef98dfe1576802ab3149c3629a9f2221",
-                "sha256:9342dd70a1e151684727c9c91ea003b2fb33523bf19385d4554f7897ca0141d4",
-                "sha256:9361de40701666b034c59ad9e317bae95c973b9ff92513dd0eced11c6adf2e21",
-                "sha256:9669179786254a2e7e57f0ecf224e978471491d660aaca833f845b72a2df3709",
-                "sha256:aac1ba0a253e17889550ddb1b60a2063f7474155465577caa2a3b131224cfd54",
-                "sha256:aef72eae10b5e3116bac6957de1df4d75909fc76d1499a53fb6387434b6bcd8d",
-                "sha256:bd3166bb3b111e76a4f8e2980fa1addf2920a4ca9b2b8ca36a3bc3dedc618270",
-                "sha256:c1b78fb9700fc961f53386ad2fd86d87091e06ede5d118b8a50dea285a071c24",
-                "sha256:c3888a051226e676e383de03bf49eb633cd39fc829516e5334e69b8d81aae751",
-                "sha256:c5f17ad25d2c1286436761b462e22b5020d83316f8e8fcb5deb2b3151f8f1d3a",
-                "sha256:c851b35fc078389bc16b915a0a7c1d5923e12e2c5aeec58c52f4aa8085ac8237",
-                "sha256:cb7df71de0af56000115eafd000b867d1261f786b5eebd88a0ca6360cccfaca7",
-                "sha256:cedb2f9e1f990918ea061f28a0f0077a07702e3819602d3507e2ff98c8d20636",
-                "sha256:e8caf961e1b1a945db76f1b5fa9c91498d15f545ac0ababbe575cfab185d3bd8",
-                "sha256:ef221855191457fffeb909d5787d1807800ab4d0111f089e6c93ee68f577634d"
+                "sha256:08b3ba72bd981531fd557f67beee376d6700fba183b167857038997ba30dd297",
+                "sha256:262066798d786ad67a13c7ba869e3ce0e39609f99f6d6c80160ad602c4808e32",
+                "sha256:2757fa64e11ec12220968f65d086b7a29b6583d16e9a544c889b22ba98555ef1",
+                "sha256:3102bb2c206700a7d28181dbe04d66b30780cde1d1c02c5f3c165cf3d2489497",
+                "sha256:3498b27d8236057def41de3585f317abae235dd3a11d33e01736ffedb2ef8606",
+                "sha256:378ac77af41350a8c6b8801a66021b52da8a05fd77e578b7380e876c0ce4f528",
+                "sha256:38f16b1317b8dd82df67ed5daa5f5e7c959e46579840d77a67a4ceb9cef0a50b",
+                "sha256:3911c2ef96e5ddc748a3c8b4702c61986628bb719b8378bf1e4a6184bbd48fe4",
+                "sha256:3a3c3f8863255f3c31db3889f8055989527173ef6192a283eb6f4db3c579d830",
+                "sha256:3b14b1da110ea50c8bcbadc3b82c3933974dbeea1832e814aab93ca1163cd4c1",
+                "sha256:535dc1e6e68fad5355f9984d5637c33badbdc987b0c0d303ee95a6c979c9516f",
+                "sha256:6f61319e33222591f885c598e3e24f6a4be3533c1d70c19e0dc59e83a71ce27d",
+                "sha256:723d22d324e7997a651478e9c5a3120a0ecbc9a7e94071f7e1954562a8806cf3",
+                "sha256:76b2775dda7e78680d688daabcb485dc87cf5e3184a0b3e012e1d40e38527cc8",
+                "sha256:782a5c7df9f91979a7a21792e09b34a658058896628217ae6362088b123c8500",
+                "sha256:7e4d159021c2029b958b2363abec4a11db0ce8cd43abb0d9ce44284cb97217e7",
+                "sha256:8dacc4073c359f40fcf73aede8428c35f84639baad7e1b46fce5ab7a8a7be4bb",
+                "sha256:8f33d1156241c43755137288dea619105477961cfa7e47f48dbf96bc2c30720b",
+                "sha256:8ffd4b204d7de77b5dd558cdff986a8274796a1e57813ed005b33fd97e29f059",
+                "sha256:93a280c9eb736a0dcca19296f3c30c720cb41a71b1f9e617f341f0a8e791a69b",
+                "sha256:9a4f66259bdd6964d8cf26142733c81fb562252db74ea367d9beb4f815478e72",
+                "sha256:9a9d4ff06804920388aab69c5ea8a77525cf165356db70131616acd269e19b36",
+                "sha256:a2070c5affdb3a5e751f24208c5c4f3d5f008fa04d28731416e023c93b275277",
+                "sha256:a4857f7e2bc6921dbd487c5c88b84f5633de3e7d416c4dc0bb70256775551a6c",
+                "sha256:a607ae05b6c96057ba86c811d9c43423f35e03874ffb03fbdcd45e0637e8b631",
+                "sha256:a66ca3bdf21c653e47f726ca57f46ba7fc1f260ad99ba783acc3e58e3ebdb9ff",
+                "sha256:ab110c48bc3d97b4d19af41865e14531f300b482da21783fdaacd159251890e8",
+                "sha256:b239711e774c8eb910e9b1ac719f02f5ae4bf35fa0420f438cdc3a7e4e7dd6ec",
+                "sha256:be0416074d7f253865bb67630cf7210cbc14eb05f4099cc0f82430135aaa7a3b",
+                "sha256:c46643970dff9f5c976c6512fd35768c4a3819f01f61169d8cdac3f9290903b7",
+                "sha256:c5ec71fd4a43b6d84ddb88c1df94572479d9a26ef3f150cef3dacefecf888105",
+                "sha256:c6e5174f8ca585755988bc278c8bb5d02d9dc2e971591ef4a1baabdf2d99589b",
+                "sha256:c89b558f8a9a5a6f2cfc923c304d49f0ce629c3bd85cb442ca258ec20366394c",
+                "sha256:cc44e3545d908ecf3e5773266c487ad1877be718d9dc65fc7eb6e7d14960985b",
+                "sha256:cc6f8246e74dd210d7e2b56c76ceaba1cc52b025cd75dbe96eb48791e0250e98",
+                "sha256:cd556c79ad665faeae28020a0ab3bda6cd47d94bec48e36970719b0b86e4dcf4",
+                "sha256:ce6f3a147b4b1a8b09aae48517ae91139b1b010c5f36423fa2b866a8b23df879",
+                "sha256:ceb499d2b3d1d7b7ba23abe8bf26df5f06ba8c71127f188333dddcf356b4b63f",
+                "sha256:cef06fb382557f66d81d804230c11ab292d94b840b3cb7bf4450778377b592f4",
+                "sha256:e448f56cfeae7b1b3b5bcd99bb377cde7c4eb1970a525c770720a352bc4c8044",
+                "sha256:e52d3d95df81c8f6b2a1685aabffadf2d2d9ad97203a40f8d61e51b70f191e4e",
+                "sha256:eb33c4c858d06bd8d79713c7628d3f2b50fb1c62071e2e88cb44876be03eabe1",
+                "sha256:ee2f1d1c223c3d2c24e3afbb2dd38be3f03b1a8d6a83ee3d9eb8c36a52bee899",
+                "sha256:f2c6888eada180814b8583c3e793f3f343a692fc802546eed45f40a001b1169f",
+                "sha256:f51dbba78d68a44e99d484ca8c8f604f17e957c1ca09c3ebc2c7e3bbd9ba0448",
+                "sha256:f54de00baf200b4539a5a092a759f000b5f45fd226d6d25a76b0dff71177a714",
+                "sha256:fa10fee7e32213f5c7b0d6428ea92e3a3fdd6d725590238a3f92c0de1c78b9d2",
+                "sha256:fabeeb121735d47d8eab8671b6b031ce08514c86b7ad8f7d5490a7b6dcd6267d",
+                "sha256:fac3c432851038b3e6afe086f777732bcf7f6ebbfd90951fa04ee53db6d0bcdd",
+                "sha256:fda29412a66099af6d6de0baa6bd7c52674de177ec2ad2630ca264142d69c6c7",
+                "sha256:ff1330e8bc996570221b450e2d539134baa9465f5cb98aff0e0f73f34172e0ae"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
-            "version": "==5.3"
+            "version": "==5.3.1"
         },
         "coveralls": {
             "hashes": [
@@ -1010,19 +1023,19 @@
         },
         "factory-boy": {
             "hashes": [
-                "sha256:d8626622550c8ba31392f9e19fdbcef9f139cf1ad643c5923f20490a7b3e2e3d",
-                "sha256:ded73e49135c24bd4d3f45bf1eb168f8d290090f5cf4566b8df3698317dc9c08"
+                "sha256:1d3db4b44b8c8c54cdd8b83ae4bdb9aeb121e464400035f1f03ae0e1eade56a4",
+                "sha256:401cc00ff339a022f84d64a4339503d1689e8263a4478d876e58a3295b155c5b"
             ],
             "index": "pypi",
-            "version": "==3.1.0"
+            "version": "==3.2.0"
         },
         "faker": {
             "hashes": [
-                "sha256:1fcb415562ee6e2395b041e85fa6901d4708d30b84d54015226fa754ed0822c3",
-                "sha256:e8beccb398ee9b8cc1a91d9295121d66512b6753b4846eb1e7370545d46b3311"
+                "sha256:7b0c4bb678be21a68640007f254259c73d18f7996a3448267716423360519732",
+                "sha256:7e98483fc273ec5cfe1c9efa9b99adaa2de4c6b610fbc62d3767088e4974b0ce"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==5.0.1"
+            "version": "==5.3.0"
         },
         "filelock": {
             "hashes": [
@@ -1051,19 +1064,19 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:6112e21359ef8f344e7178aa5b72dc6e62b38b0d008e6d3cb212c5b84df72013",
-                "sha256:b0c2d3b226157ae4517d9625decf63591461c66b3a808c2666d538946519d170"
+                "sha256:5c5a2720817414a6c41f0a49993908068243ae02c1635a228126519b509c8aed",
+                "sha256:bf792d480abbd5eda85794e4afb09dd538393f7d6e6ffef6e9f03d2014cf9450"
             ],
             "markers": "python_version < '3.8'",
-            "version": "==3.1.1"
+            "version": "==3.3.0"
         },
         "importlib-resources": {
             "hashes": [
-                "sha256:7b51f0106c8ec564b1bef3d9c588bc694ce2b92125bbb6278f4f2f5b54ec3592",
-                "sha256:a3d34a8464ce1d5d7c92b0ea4e921e696d86f2aa212e684451cb1482c8d84ed5"
+                "sha256:0a948d0c8c3f9344de62997e3f73444dbba233b1eaf24352933c2d264b9e4182",
+                "sha256:6b45007a479c4ec21165ae3ffbe37faf35404e2041fac6ae1da684f38530ca73"
             ],
             "markers": "python_version < '3.7'",
-            "version": "==3.3.0"
+            "version": "==4.1.1"
         },
         "iniconfig": {
             "hashes": [
@@ -1126,11 +1139,11 @@
         },
         "packaging": {
             "hashes": [
-                "sha256:05af3bb85d320377db281cf254ab050e1a7ebcbf5410685a9a407e18a1f81236",
-                "sha256:eb41423378682dadb7166144a4926e443093863024de508ca5c9737d6bc08376"
+                "sha256:24e0da08660a87484d1602c30bb4902d74816b6985b93de36926f5bc95741858",
+                "sha256:78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.7"
+            "version": "==20.8"
         },
         "pluggy": {
             "hashes": [
@@ -1142,11 +1155,11 @@
         },
         "py": {
             "hashes": [
-                "sha256:366389d1db726cd2fcfc79732e75410e5fe4d31db13692115529d34069a043c2",
-                "sha256:9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"
+                "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3",
+                "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.9.0"
+            "version": "==1.10.0"
         },
         "pycodestyle": {
             "hashes": [
@@ -1174,11 +1187,11 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:4288fed0d9153d9646bfcdf0c0428197dba1ecb27a33bb6e031d002fa88653fe",
-                "sha256:c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"
+                "sha256:1969f797a1a0dbd8ccf0fecc80262312729afea9c17f1d70ebf85c5e76c6f7c8",
+                "sha256:66e419b1899bc27346cb2c993e12c5e5e8daba9073c1fbce33b9807abc95c306"
             ],
             "index": "pypi",
-            "version": "==6.1.2"
+            "version": "==6.2.1"
         },
         "pytest-cov": {
             "hashes": [
@@ -1223,11 +1236,11 @@
         },
         "pytest-xdist": {
             "hashes": [
-                "sha256:7c629016b3bb006b88ac68e2b31551e7becf173c76b977768848e2bbed594d90",
-                "sha256:82d938f1a24186520e2d9d3a64ef7d9ac7ecdf1a0659e095d18e596b8cbd0672"
+                "sha256:1d8edbb1a45e8e1f8e44b1260583107fc23f8bc8da6d18cb331ff61d41258ecf",
+                "sha256:f127e11e84ad37cc1de1088cb2990f3c354630d428af3f71282de589c5bb779b"
             ],
             "index": "pypi",
-            "version": "==2.1.0"
+            "version": "==2.2.0"
         },
         "python-dateutil": {
             "hashes": [
@@ -1239,10 +1252,10 @@
         },
         "pytz": {
             "hashes": [
-                "sha256:3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268",
-                "sha256:5c55e189b682d420be27c6995ba6edce0c0a77dd67bfbe2ae6607134d5851ffd"
+                "sha256:16962c5fb8db4a8f63a26646d8886e9d769b6c511543557bc84e9569fb9a9cb4",
+                "sha256:180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5"
             ],
-            "version": "==2020.4"
+            "version": "==2020.5"
         },
         "requests": {
             "hashes": [
@@ -1269,11 +1282,11 @@
         },
         "sphinx": {
             "hashes": [
-                "sha256:1e8d592225447104d1172be415bc2972bd1357e3e12fdc76edf2261105db4300",
-                "sha256:d4e59ad4ea55efbb3c05cde3bfc83bfc14f0c95aa95c3d75346fcce186a47960"
+                "sha256:77dec5ac77ca46eee54f59cf477780f4fb23327b3339ef39c8471abb829c1285",
+                "sha256:b8aa4eb5502c53d3b5ca13a07abeedacd887f7770c198952fd5b9530d973e767"
             ],
             "index": "pypi",
-            "version": "==3.3.1"
+            "version": "==3.4.2"
         },
         "sphinx-rtd-theme": {
             "hashes": [

From e97b06674c1bd5d3618c3905660d069e09ec6d38 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 18:40:09 +0100
Subject: [PATCH 0649/1300] changelog

---
 docs/changelog.rst | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 70f5cf683..2b9d1b5bf 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,40 @@
 Changelog
 *********
 
+paperless-ng 0.9.12
+###################
+
+* Paperless localization
+
+  * Thanks to the combined efforts of many users, Paperless is now available in English, Dutch, French and German.
+
+* Thanks to `Jo Vandeginste`_, Paperless has optional support for Office documents such as .docx, .doc, .odt and more.
+
+  * See the :ref:`configuration<configuration-tika>` on how to enable this feature. This feature requires two additional services
+    (one for parsing Office documents and metadata extraction and another for converting Office documents to PDF), and is therefore
+    not enabled on default installations.
+
+* Dark mode
+
+  * Thanks to `Michael Shamoon`_, paperless now has a dark mode. Configuration is available in the settings.
+
+* Other changes and additions
+
+  * The PDF viewer now uses a local copy of some dependencies instead of fetching them from the internet. Thanks to `slorenz`_.
+  * Revamped search bar styling thanks to `Michael Shamoon`_.
+  * Sorting in the document list by clicking on table headers.
+  * A button was added to the document detail page that assigns a new ASN to a document.
+  * Form field validation: When providing invalid input in a form (such as a duplicate ASN or no name), paperless now has visual
+    indicators and clearer error messages about what's wrong.
+  * Paperless disables buttons with network actions (such as save and delete) when a network action is active. This indicates that
+    something is happening and prevents double clicking.
+
+* Fixes
+
+  * Paperless was unable to save views when "Not assigned" was chosen in one of the filter dropdowns.
+  * Clearer error messages when pre and post consumption scripts do not exist.
+  * The post consumption script is executed later in the consumption process. Before the change, an ID was passed to the script referring to
+    a document that did not yet exist in the database.
 
 paperless-ng 0.9.11
 ###################
@@ -966,6 +1000,8 @@ bulk of the work on this big change.
 
 * Initial release
 
+.. _slorenz: https://github.com/sisao
+.. _Jo Vandeginste: https://github.com/jovandeginste
 .. _zjean: https://github.com/zjean
 .. _rYR79435: https://github.com/rYR79435
 .. _Michael Shamoon: https://github.com/shamoon

From 7587150f96494ef7d7a5e2828edb17b5932f25f2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 18:40:24 +0100
Subject: [PATCH 0650/1300] gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d63794fb3..e58fb12e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,4 @@ scripts/nuke
 
 # this is where the compiled frontend is moved to.
 /src/documents/static/frontend/
+/docs/.vscode/settings.json

From d153672f0d32358a469b33785c4d283782f34c10 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 4 Jan 2021 23:05:16 +0100
Subject: [PATCH 0651/1300] some changes

---
 Pipfile.lock                                  | 420 +++++++++++++++---
 src-ui/src/app/app.component.ts               |   2 +-
 .../common/toasts/toasts.component.html       |   4 +-
 src-ui/src/environments/environment.ts        |   2 +-
 src/documents/consumer.py                     |   2 +-
 src/documents/views.py                        |   2 +-
 6 files changed, 356 insertions(+), 76 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 6d9685f9c..068b7cd07 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "993e362c31af6b8094693075f614270a820cf0b557369d66d674e1a107b7bd31"
+            "sha256": "8dbe59054648cdfec443bad9f73c25263e43f18f35e74dc72a8429a0035ecbeb"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -21,6 +21,13 @@
         ]
     },
     "default": {
+        "aioredis": {
+            "hashes": [
+                "sha256:15f8af30b044c771aee6787e5ec24694c048184c7b9e54c3b60c750a4b93273a",
+                "sha256:b61808d7e97b7cd5a92ed574937a079c9387fdadd22bfbfa7ad2fd319ecc26e3"
+            ],
+            "version": "==1.3.1"
+        },
         "arrow": {
             "hashes": [
                 "sha256:e098abbd9af3665aea81bdd6c869e93af4feb078e98468dd351c383af187aac5",
@@ -37,6 +44,38 @@
             "markers": "python_version >= '3.5'",
             "version": "==3.3.1"
         },
+        "async-timeout": {
+            "hashes": [
+                "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f",
+                "sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3"
+            ],
+            "markers": "python_full_version >= '3.5.3'",
+            "version": "==3.0.1"
+        },
+        "attrs": {
+            "hashes": [
+                "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
+                "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==20.3.0"
+        },
+        "autobahn": {
+            "hashes": [
+                "sha256:410a93e0e29882c8b5d5ab05d220b07609b886ef5f23c0b8d39153254ffd6895",
+                "sha256:52ee4236ff9a1fcbbd9500439dcf3284284b37f8a6b31ecc8a36e00cf9f95049"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==20.12.3"
+        },
+        "automat": {
+            "hashes": [
+                "sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33",
+                "sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111",
+                "sha256:d6d976cf8da698fc85fa7def46e2544493f78cb7ee72d2f4acd1a5c759a3060e"
+            ],
+            "version": "==20.2.0"
+        },
         "blessed": {
             "hashes": [
                 "sha256:0a74a8d3f0366db600d061273df77d44f0db07daade7bb7a4d49c8bc22ed9f74",
@@ -94,6 +133,22 @@
             ],
             "version": "==1.14.4"
         },
+        "channels": {
+            "hashes": [
+                "sha256:056b72e51080a517a0f33a0a30003e03833b551d75394d6636c885d4edb8188f",
+                "sha256:3f15bdd2138bb4796e76ea588a0a344b12a7964ea9b2e456f992fddb988a4317"
+            ],
+            "index": "pypi",
+            "version": "==3.0.3"
+        },
+        "channels-redis": {
+            "hashes": [
+                "sha256:18d63f6462a58011740dc8eeb57ea4b31ec220eb551cb71b27de9c6779a549de",
+                "sha256:2fb31a63b05373f6402da2e6a91a22b9e66eb8b56626c6bfc93e156c734c5ae6"
+            ],
+            "index": "pypi",
+            "version": "==3.2.0"
+        },
         "chardet": {
             "hashes": [
                 "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa",
@@ -110,6 +165,13 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==15.0"
         },
+        "constantly": {
+            "hashes": [
+                "sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35",
+                "sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d"
+            ],
+            "version": "==15.1.0"
+        },
         "cryptography": {
             "hashes": [
                 "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d",
@@ -131,6 +193,14 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
             "version": "==3.3.1"
         },
+        "daphne": {
+            "hashes": [
+                "sha256:0052c9887600c57054a5867d4b0240159fa009faa3bcf6a1627271d9cdcb005a",
+                "sha256:c22b692707f514de9013651ecb687f2abe4f35cf6fe292ece634e9f1737bc7e3"
+            ],
+            "index": "pypi",
+            "version": "==3.0.1"
+        },
         "dateparser": {
             "hashes": [
                 "sha256:7552c994f893b5cb8fcf103b4cd2ff7f57aab9bfd2619fdf0cf571c0740fd90b",
@@ -218,6 +288,60 @@
             "index": "pypi",
             "version": "==20.0.4"
         },
+        "hiredis": {
+            "hashes": [
+                "sha256:06a039208f83744a702279b894c8cf24c14fd63c59cd917dcde168b79eef0680",
+                "sha256:0a909bf501459062aa1552be1461456518f367379fdc9fdb1f2ca5e4a1fdd7c0",
+                "sha256:18402d9e54fb278cb9a8c638df6f1550aca36a009d47ecf5aa263a38600f35b0",
+                "sha256:1e4cbbc3858ec7e680006e5ca590d89a5e083235988f26a004acf7244389ac01",
+                "sha256:23344e3c2177baf6975fbfa361ed92eb7d36d08f454636e5054b3faa7c2aff8a",
+                "sha256:289b31885b4996ce04cadfd5fc03d034dce8e2a8234479f7c9e23b9e245db06b",
+                "sha256:2c1c570ae7bf1bab304f29427e2475fe1856814312c4a1cf1cd0ee133f07a3c6",
+                "sha256:2c227c0ed371771ffda256034427320870e8ea2e4fd0c0a618c766e7c49aad73",
+                "sha256:3bb9b63d319402cead8bbd9dd55dca3b667d2997e9a0d8a1f9b6cc274db4baee",
+                "sha256:3ef2183de67b59930d2db8b8e8d4d58e00a50fcc5e92f4f678f6eed7a1c72d55",
+                "sha256:43b8ed3dbfd9171e44c554cb4acf4ee4505caa84c5e341858b50ea27dd2b6e12",
+                "sha256:47bcf3c5e6c1e87ceb86cdda2ee983fa0fe56a999e6185099b3c93a223f2fa9b",
+                "sha256:5263db1e2e1e8ae30500cdd75a979ff99dcc184201e6b4b820d0de74834d2323",
+                "sha256:5b1451727f02e7acbdf6aae4e06d75f66ee82966ff9114550381c3271a90f56c",
+                "sha256:6996883a8a6ff9117cbb3d6f5b0dcbbae6fb9e31e1a3e4e2f95e0214d9a1c655",
+                "sha256:6c96f64a54f030366657a54bb90b3093afc9c16c8e0dfa29fc0d6dbe169103a5",
+                "sha256:7332d5c3e35154cd234fd79573736ddcf7a0ade7a986db35b6196b9171493e75",
+                "sha256:7885b6f32c4a898e825bb7f56f36a02781ac4a951c63e4169f0afcf9c8c30dfb",
+                "sha256:7b0f63f10a166583ab744a58baad04e0f52cfea1ac27bfa1b0c21a48d1003c23",
+                "sha256:819f95d4eba3f9e484dd115ab7ab72845cf766b84286a00d4ecf76d33f1edca1",
+                "sha256:8968eeaa4d37a38f8ca1f9dbe53526b69628edc9c42229a5b2f56d98bb828c1f",
+                "sha256:89ebf69cb19a33d625db72d2ac589d26e936b8f7628531269accf4a3196e7872",
+                "sha256:8daecd778c1da45b8bd54fd41ffcd471a86beed3d8e57a43acf7a8d63bba4058",
+                "sha256:955ba8ea73cf3ed8bd2f963b4cb9f8f0dcb27becd2f4b3dd536fd24c45533454",
+                "sha256:964f18a59f5a64c0170f684c417f4fe3e695a536612e13074c4dd5d1c6d7c882",
+                "sha256:969843fbdfbf56cdb71da6f0bdf50f9985b8b8aeb630102945306cf10a9c6af2",
+                "sha256:996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132",
+                "sha256:9e9c9078a7ce07e6fce366bd818be89365a35d2e4b163268f0ca9ba7e13bb2f6",
+                "sha256:9f4e67f87e072de981570eaf7cb41444bbac7e92b05c8651dbab6eb1fb8d5a14",
+                "sha256:a04901757cb0fb0f5602ac11dda48f5510f94372144d06c2563ba56c480b467c",
+                "sha256:a7bf1492429f18d205f3a818da3ff1f242f60aa59006e53dee00b4ef592a3363",
+                "sha256:aa0af2deb166a5e26e0d554b824605e660039b161e37ed4f01b8d04beec184f3",
+                "sha256:abfb15a6a7822f0fae681785cb38860e7a2cb1616a708d53df557b3d76c5bfd4",
+                "sha256:b253fe4df2afea4dfa6b1fa8c5fef212aff8bcaaeb4207e81eed05cb5e4a7919",
+                "sha256:b27f082f47d23cffc4cf1388b84fdc45c4ef6015f906cd7e0d988d9e35d36349",
+                "sha256:b33aea449e7f46738811fbc6f0b3177c6777a572207412bbbf6f525ffed001ae",
+                "sha256:b39989b49e8aca9d224324d2650029eda410a4faf43f6afb0eb4f9acb7be6097",
+                "sha256:b44f9421c4505c548435244d74037618f452844c5d3c67719d8a55e2613549da",
+                "sha256:bcc371151d1512201d0214c36c0c150b1dc64f19c2b1a8c9cb1d7c7c15ebd93f",
+                "sha256:c2851deeabd96d3f6283e9c6b26e0bfed4de2dc6fb15edf913e78b79fc5909ed",
+                "sha256:cdfd501c7ac5b198c15df800a3a34c38345f5182e5f80770caf362bccca65628",
+                "sha256:d2c0caffa47606d6d7c8af94ba42547bd2a441f06c74fd90a1ffe328524a6c64",
+                "sha256:dcb2db95e629962db5a355047fb8aefb012df6c8ae608930d391619dbd96fd86",
+                "sha256:e0eeb9c112fec2031927a1745788a181d0eecbacbed941fc5c4f7bc3f7b273bf",
+                "sha256:e154891263306200260d7f3051982774d7b9ef35af3509d5adbbe539afd2610c",
+                "sha256:e2e023a42dcbab8ed31f97c2bcdb980b7fbe0ada34037d87ba9d799664b58ded",
+                "sha256:e64be68255234bb489a574c4f2f8df7029c98c81ec4d160d6cd836e7f0679390",
+                "sha256:e82d6b930e02e80e5109b678c663a9ed210680ded81c1abaf54635d88d1da298"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==1.1.0"
+        },
         "humanfriendly": {
             "hashes": [
                 "sha256:066562956639ab21ff2676d1fda0b5987e985c534fc76700a19bd54bcb81121d",
@@ -226,6 +350,14 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==9.1"
         },
+        "hyperlink": {
+            "hashes": [
+                "sha256:402c1b5fa066ea368f3118fc5a6f8505440b4d1a4ef12a844ca39332a4a29944",
+                "sha256:47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af",
+                "sha256:c528d405766f15a2c536230de7e160b65a08e20264d8891b3eb03307b0df3c63"
+            ],
+            "version": "==20.0.1"
+        },
         "idna": {
             "hashes": [
                 "sha256:4a57a6379512ade94fa99e2fa46d3cd0f2f553040548d0e2958c6ed90ee48226",
@@ -250,13 +382,12 @@
             ],
             "version": "==0.4.0"
         },
-        "importlib-metadata": {
+        "incremental": {
             "hashes": [
-                "sha256:5c5a2720817414a6c41f0a49993908068243ae02c1635a228126519b509c8aed",
-                "sha256:bf792d480abbd5eda85794e4afb09dd538393f7d6e6ffef6e9f03d2014cf9450"
+                "sha256:717e12246dddf231a349175f48d74d93e2897244939173b01974ab6661406b9f",
+                "sha256:7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3"
             ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.3.0"
+            "version": "==17.5.0"
         },
         "inotify-simple": {
             "hashes": [
@@ -336,6 +467,41 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==4.6.2"
         },
+        "msgpack": {
+            "hashes": [
+                "sha256:0cb94ee48675a45d3b86e61d13c1e6f1696f0183f0715544976356ff86f741d9",
+                "sha256:1026dcc10537d27dd2d26c327e552f05ce148977e9d7b9f1718748281b38c841",
+                "sha256:26a1759f1a88df5f1d0b393eb582ec022326994e311ba9c5818adc5374736439",
+                "sha256:2a5866bdc88d77f6e1370f82f2371c9bc6fc92fe898fa2dec0c5d4f5435a2694",
+                "sha256:31c17bbf2ae5e29e48d794c693b7ca7a0c73bd4280976d408c53df421e838d2a",
+                "sha256:497d2c12426adcd27ab83144057a705efb6acc7e85957a51d43cdcf7f258900f",
+                "sha256:5a9ee2540c78659a1dd0b110f73773533ee3108d4e1219b5a15a8d635b7aca0e",
+                "sha256:7307e86f7ce75b49e65b55660b10b258e9e7b5e0f80d31d7a86a278d8204d1b4",
+                "sha256:8521e5be9e3b93d4d5e07cb80b7e32353264d143c1f072309e1863174c6aadb1",
+                "sha256:87869ba567fe371c4555d2e11e4948778ab6b59d6cc9d8460d543e4cfbbddd1c",
+                "sha256:8ffb24a3b7518e843cd83538cf859e026d24ec41ac5721c18ed0c55101f9775b",
+                "sha256:92be4b12de4806d3c36810b0fe2aeedd8d493db39e2eb90742b9c09299eb5759",
+                "sha256:9ea52fff0473f9f3000987f313310208c879493491ef3ccf66268eff8d5a0326",
+                "sha256:a4355d2193106c7aa77c98fc955252a737d8550320ecdb2e9ac701e15e2943bc",
+                "sha256:a99b144475230982aee16b3d249170f1cccebf27fb0a08e9f603b69637a62192",
+                "sha256:ac25f3e0513f6673e8b405c3a80500eb7be1cf8f57584be524c4fa78fe8e0c83",
+                "sha256:b28c0876cce1466d7c2195d7658cf50e4730667196e2f1355c4209444717ee06",
+                "sha256:b55f7db883530b74c857e50e149126b91bb75d35c08b28db12dcb0346f15e46e",
+                "sha256:b6d9e2dae081aa35c44af9c4298de4ee72991305503442a5c74656d82b581fe9",
+                "sha256:c747c0cc08bd6d72a586310bda6ea72eeb28e7505990f342552315b229a19b33",
+                "sha256:c82dc0ba34d620fb94d12a7725e9362958bb1be3938688a061f53ed86bee005a",
+                "sha256:d6c64601af8f3893d17ec233237030e3110f11b8a962cb66720bf70c0141aa54",
+                "sha256:d8167b84af26654c1124857d71650404336f4eb5cc06900667a493fc619ddd9f",
+                "sha256:de6bd7990a2c2dabe926b7e62a92886ccbf809425c347ae7de277067f97c2887",
+                "sha256:e36a812ef4705a291cdb4a2fd352f013134f26c6ff63477f20235138d1d21009",
+                "sha256:e89ec55871ed5473a041c0495b7b4e6099f6263438e0bd04ccd8418f92d5d7f2",
+                "sha256:f3e6aaf217ac1c7ce1563cf52a2f4f5d5b1f64e8729d794165db71da57257f0c",
+                "sha256:f484cd2dca68502de3704f056fa9b318c94b1539ed17a4c784266df5d6978c87",
+                "sha256:fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984",
+                "sha256:fe07bc6735d08e492a327f496b7850e98cb4d112c56df69b0c844dbebcbb47f6"
+            ],
+            "version": "==1.0.2"
+        },
         "numpy": {
             "hashes": [
                 "sha256:08308c38e44cc926bdfce99498b21eec1f848d24c302519e64203a8da99a97db",
@@ -521,6 +687,42 @@
             "index": "pypi",
             "version": "==2.8.6"
         },
+        "pyasn1": {
+            "hashes": [
+                "sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359",
+                "sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576",
+                "sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf",
+                "sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7",
+                "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d",
+                "sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00",
+                "sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8",
+                "sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86",
+                "sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12",
+                "sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776",
+                "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba",
+                "sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2",
+                "sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3"
+            ],
+            "version": "==0.4.8"
+        },
+        "pyasn1-modules": {
+            "hashes": [
+                "sha256:0845a5582f6a02bb3e1bde9ecfc4bfcae6ec3210dd270522fee602365430c3f8",
+                "sha256:0fe1b68d1e486a1ed5473f1302bd991c1611d319bba158e98b106ff86e1d7199",
+                "sha256:15b7c67fabc7fc240d87fb9aabf999cf82311a6d6fb2c70d00d3d0604878c811",
+                "sha256:426edb7a5e8879f1ec54a1864f16b882c2837bfd06eee62f2c982315ee2473ed",
+                "sha256:65cebbaffc913f4fe9e4808735c95ea22d7a7775646ab690518c056784bc21b4",
+                "sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e",
+                "sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74",
+                "sha256:a99324196732f53093a84c4369c996713eb8c89d360a496b599fb1a9c47fc3eb",
+                "sha256:b80486a6c77252ea3a3e9b1e360bc9cf28eaac41263d173c032581ad2f20fe45",
+                "sha256:c29a5e5cc7a3f05926aff34e097e84f8589cd790ce0ed41b67aed6857b26aafd",
+                "sha256:cbac4bc38d117f2a49aeedec4407d23e8866ea4ac27ff2cf7fb3e5b570df19e0",
+                "sha256:f39edd8c4ecaa4556e989147ebf219227e2cd2e8a43c7e7fcb1f1c18c5fd6a3d",
+                "sha256:fe0644d9ab041506b62782e92b06b8c68cca799e1a9636ec398675459e031405"
+            ],
+            "version": "==0.2.8"
+        },
         "pycparser": {
             "hashes": [
                 "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0",
@@ -529,6 +731,22 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.20"
         },
+        "pyhamcrest": {
+            "hashes": [
+                "sha256:412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316",
+                "sha256:7ead136e03655af85069b6f47b23eb7c3e5c221aa9f022a4fbb499f5b7308f29"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==2.0.2"
+        },
+        "pyopenssl": {
+            "hashes": [
+                "sha256:4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51",
+                "sha256:818ae18e06922c066f777a33f1fca45786d85edfe71cd043de6379337a7f274b"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==20.0.1"
+        },
         "python-dateutil": {
             "hashes": [
                 "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c",
@@ -715,35 +933,36 @@
         },
         "scipy": {
             "hashes": [
-                "sha256:168c45c0c32e23f613db7c9e4e780bc61982d71dcd406ead746c7c7c2f2004ce",
-                "sha256:213bc59191da2f479984ad4ec39406bf949a99aba70e9237b916ce7547b6ef42",
-                "sha256:25b241034215247481f53355e05f9e25462682b13bd9191359075682adcd9554",
-                "sha256:2c872de0c69ed20fb1a9b9cf6f77298b04a26f0b8720a5457be08be254366c6e",
-                "sha256:3397c129b479846d7eaa18f999369a24322d008fac0782e7828fa567358c36ce",
-                "sha256:368c0f69f93186309e1b4beb8e26d51dd6f5010b79264c0f1e9ca00cd92ea8c9",
-                "sha256:3d5db5d815370c28d938cf9b0809dade4acf7aba57eaf7ef733bfedc9b2474c4",
-                "sha256:4598cf03136067000855d6b44d7a1f4f46994164bcd450fb2c3d481afc25dd06",
-                "sha256:4a453d5e5689de62e5d38edf40af3f17560bfd63c9c5bd228c18c1f99afa155b",
-                "sha256:4f12d13ffbc16e988fa40809cbbd7a8b45bc05ff6ea0ba8e3e41f6f4db3a9e47",
-                "sha256:634568a3018bc16a83cda28d4f7aed0d803dd5618facb36e977e53b2df868443",
-                "sha256:65923bc3809524e46fb7eb4d6346552cbb6a1ffc41be748535aa502a2e3d3389",
-                "sha256:6b0ceb23560f46dd236a8ad4378fc40bad1783e997604ba845e131d6c680963e",
-                "sha256:8c8d6ca19c8497344b810b0b0344f8375af5f6bb9c98bd42e33f747417ab3f57",
-                "sha256:9ad4fcddcbf5dc67619379782e6aeef41218a79e17979aaed01ed099876c0e62",
-                "sha256:a254b98dbcc744c723a838c03b74a8a34c0558c9ac5c86d5561703362231107d",
-                "sha256:b03c4338d6d3d299e8ca494194c0ae4f611548da59e3c038813f1a43976cb437",
-                "sha256:b5e9d3e4474644915809d6aa1416ff20430a3ed9ae723a5d295da5ddb24985e2",
-                "sha256:cc1f78ebc982cd0602c9a7615d878396bec94908db67d4ecddca864d049112f2",
-                "sha256:d6d25c41a009e3c6b7e757338948d0076ee1dd1770d1c09ec131f11946883c54",
-                "sha256:d84cadd7d7998433334c99fa55bcba0d8b4aeff0edb123b2a1dfcface538e474",
-                "sha256:e360cb2299028d0b0d0f65a5c5e51fc16a335f1603aa2357c25766c8dab56938",
-                "sha256:e98d49a5717369d8241d6cf33ecb0ca72deee392414118198a8e5b4c35c56340",
-                "sha256:ed572470af2438b526ea574ff8f05e7f39b44ac37f712105e57fc4d53a6fb660",
-                "sha256:f87b39f4d69cf7d7529d7b1098cb712033b17ea7714aed831b95628f483fd012",
-                "sha256:fa789583fc94a7689b45834453fec095245c7e69c58561dc159b5d5277057e4c"
+                "sha256:155225621df90fcd151e25d51c50217e412de717475999ebb76e17e310176981",
+                "sha256:1bc5b446600c4ff7ab36bade47180673141322f0febaa555f1c433fe04f2a0e3",
+                "sha256:2f1c2ebca6fd867160e70102200b1bd07b3b2d31a3e6af3c58d688c15d0d07b7",
+                "sha256:313785c4dab65060f9648112d025f6d2fec69a8a889c714328882d678a95f053",
+                "sha256:31ab217b5c27ab429d07428a76002b33662f98986095bbce5d55e0788f7e8b15",
+                "sha256:3d4303e3e21d07d9557b26a1707bb9fc065510ee8501c9bf22a0157249a82fd0",
+                "sha256:4f1d9cc977ac6a4a63c124045c1e8bf67ec37098f67c699887a93736961a00ae",
+                "sha256:58731bbe0103e96b89b2f41516699db9b63066e4317e31b8402891571f6d358f",
+                "sha256:8629135ee00cc2182ac8be8e75643b9f02235942443732c2ed69ab48edcb6614",
+                "sha256:876badc33eec20709d4e042a09834f5953ebdac4088d45a4f3a1f18b56885718",
+                "sha256:8840a9adb4ede3751f49761653d3ebf664f25195fdd42ada394ffea8903dd51d",
+                "sha256:aef3a2dbc436bbe8f6e0b635f0b5fe5ed024b522eee4637dbbe0b974129ca734",
+                "sha256:b8af26839ae343655f3ca377a5d5e5466f1d3b3ac7432a43449154fe958ae0e0",
+                "sha256:c0911f3180de343643f369dc5cfedad6ba9f939c2d516bddea4a6871eb000722",
+                "sha256:cb6dc9f82dfd95f6b9032a8d7ea70efeeb15d5b5fd6ed4e8537bb3c673580566",
+                "sha256:cdbc47628184a0ebeb5c08f1892614e1bd4a51f6e0d609c6eed253823a960f5b",
+                "sha256:d902d3a5ad7f28874c0a82db95246d24ca07ad932741df668595fe00a4819870",
+                "sha256:eab389aba0ad8b5e6b5abdc3337ade46823df75f80a8edd4c67833567577cb3d",
+                "sha256:eb7928275f3560d47e5538e15e9f32b3d64cd30ea8f85f3e82987425476f53f6",
+                "sha256:f68d5761a2d2376e2b194c8e9192bbf7c51306ca176f1a0889990a52ef0d551f"
             ],
-            "markers": "python_version >= '3.6'",
-            "version": "==1.5.4"
+            "markers": "python_version >= '3.7'",
+            "version": "==1.6.0"
+        },
+        "service-identity": {
+            "hashes": [
+                "sha256:001c0707759cb3de7e49c078a7c0c9cd12594161d3bf06b9c254fdcb1a60dc36",
+                "sha256:0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d"
+            ],
+            "version": "==18.1.0"
         },
         "six": {
             "hashes": [
@@ -792,14 +1011,47 @@
             "index": "pypi",
             "version": "==4.55.1"
         },
-        "typing-extensions": {
-            "hashes": [
-                "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
-                "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
-                "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
+        "twisted": {
+            "extras": [
+                "tls"
             ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.7.4.3"
+            "hashes": [
+                "sha256:0150dae5adc962d15e00054cc6926f1e64763fb8dd26e1632593ac06e592104b",
+                "sha256:040eb6641125d2a9a09cf198ec7b83dd8858c6f51f6770325ed9959c00f5098f",
+                "sha256:147780b8caf21ba2aef3688628eaf13d7e7fe02a86747cd54bfaf2140538f042",
+                "sha256:158ddb80719a4813d292293ac44ba41d8b56555ed009d90994a278237ee63d2c",
+                "sha256:15e52271f08f62e2230ff093e0278aa01c9dac057c4557cadadd2429eed86a3e",
+                "sha256:2182000d6ffc05d269e6c03bfcec8b57e20259ca1086180edaedec3f1e689292",
+                "sha256:25ffcf37944bdad4a99981bc74006d735a678d2b5c193781254fbbb6d69e3b22",
+                "sha256:3281d9ce889f7b21bdb73658e887141aa45a102baf3b2320eafcfba954fcefec",
+                "sha256:356e8d8dd3590e790e3dba4db139eb8a17aca64b46629c622e1b1597a4a92478",
+                "sha256:70952c56e4965b9f53b180daecf20a9595cf22b8d0935cd3bd664c90273c3ab2",
+                "sha256:7408c6635ee1b96587289283ebe90ee15dbf9614b05857b446055116bc822d29",
+                "sha256:7c547fd0215db9da8a1bc23182b309e84a232364cc26d829e9ee196ce840b114",
+                "sha256:894f6f3cfa57a15ea0d0714e4283913a5f2511dbd18653dd148eba53b3919797",
+                "sha256:94ac3d55a58c90e2075c5fe1853f2aa3892b73e3bf56395f743aefde8605eeaa",
+                "sha256:a58e61a2a01e5bcbe3b575c0099a2bcb8d70a75b1a087338e0c48dd6e01a5f15",
+                "sha256:c09c47ff9750a8e3aa60ad169c4b95006d455a29b80ad0901f031a103b2991cd",
+                "sha256:ca3a0b8c9110800e576d89b5337373e52018b41069bc879f12fa42b7eb2d0274",
+                "sha256:cd1dc5c85b58494138a3917752b54bb1daa0045d234b7c132c37a61d5483ebad",
+                "sha256:cdbc4c7f0cd7a2218b575844e970f05a1be1861c607b0e048c9bceca0c4d42f7",
+                "sha256:d267125cc0f1e8a0eed6319ba4ac7477da9b78a535601c49ecd20c875576433a",
+                "sha256:d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10",
+                "sha256:d95803193561a243cb0401b0567c6b7987d3f2a67046770e1dccd1c9e49a9780",
+                "sha256:e92703bed0cc21d6cb5c61d66922b3b1564015ca8a51325bd164a5e33798d504",
+                "sha256:f058bd0168271de4dcdc39845b52dd0a4a2fecf5f1246335f13f5e96eaebb467",
+                "sha256:f3c19e5bd42bbe4bf345704ad7c326c74d3fd7a1b3844987853bef180be638d4"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==20.3.0"
+        },
+        "txaio": {
+            "hashes": [
+                "sha256:1488d31d564a116538cc1265ac3f7979fb6223bb5a9e9f1479436ee2c17d8549",
+                "sha256:a8676d6c68aea1f0e2548c4afdb8e6253873af3bc2659bb5bcd9f39dff7ff90f"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==20.12.1"
         },
         "tzlocal": {
             "hashes": [
@@ -863,13 +1115,65 @@
             "index": "pypi",
             "version": "==2.7.4"
         },
-        "zipp": {
+        "zope.interface": {
             "hashes": [
-                "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108",
-                "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"
+                "sha256:05a97ba92c1c7c26f25c9f671aa1ef85ffead6cdad13770e5b689cf983adc7e1",
+                "sha256:07d61722dd7d85547b7c6b0f5486b4338001fab349f2ac5cabc0b7182eb3425d",
+                "sha256:09fc3922f235703c0b76f8234867685eee68a24a49fffa2220975f6142db45f1",
+                "sha256:0a990dcc97806e5980bbb54b2e46b9cde9e48932d8e6984daf71ef1745516123",
+                "sha256:150e8bcb7253a34a4535aeea3de36c0bb3b1a6a47a183a95d65a194b3e07f232",
+                "sha256:1743bcfe45af8846b775086471c28258f4c6e9ee8ef37484de4495f15a98b549",
+                "sha256:1b5f6c8fff4ed32aa2dd43e84061bc8346f32d3ba6ad6e58f088fe109608f102",
+                "sha256:21e49123f375703cf824214939d39df0af62c47d122d955b2a8d9153ea08cfd5",
+                "sha256:21f579134a47083ffb5ddd1307f0405c91aa8b61ad4be6fd5af0171474fe0c45",
+                "sha256:27c267dc38a0f0079e96a2945ee65786d38ef111e413c702fbaaacbab6361d00",
+                "sha256:299bde0ab9e5c4a92f01a152b7fbabb460f31343f1416f9b7b983167ab1e33bc",
+                "sha256:2ab88d8f228f803fcb8cb7d222c579d13dab2d3622c51e8cf321280da01102a7",
+                "sha256:2ced4c35061eea623bc84c7711eedce8ecc3c2c51cd9c6afa6290df3bae9e104",
+                "sha256:2dcab01c660983ba5e5a612e0c935141ccbee67d2e2e14b833e01c2354bd8034",
+                "sha256:32546af61a9a9b141ca38d971aa6eb9800450fa6620ce6323cc30eec447861f3",
+                "sha256:32b40a4c46d199827d79c86bb8cb88b1bbb764f127876f2cb6f3a47f63dbada3",
+                "sha256:3cc94c69f6bd48ed86e8e24f358cb75095c8129827df1298518ab860115269a4",
+                "sha256:42b278ac0989d6f5cf58d7e0828ea6b5951464e3cf2ff229dd09a96cb6ba0c86",
+                "sha256:495b63fd0302f282ee6c1e6ea0f1c12cb3d1a49c8292d27287f01845ff252a96",
+                "sha256:4af87cdc0d4b14e600e6d3d09793dce3b7171348a094ba818e2a68ae7ee67546",
+                "sha256:4b94df9f2fdde7b9314321bab8448e6ad5a23b80542dcab53e329527d4099dcb",
+                "sha256:4c48ddb63e2b20fba4c6a2bf81b4d49e99b6d4587fb67a6cd33a2c1f003af3e3",
+                "sha256:4df9afd17bd5477e9f8c8b6bb8507e18dd0f8b4efe73bb99729ff203279e9e3b",
+                "sha256:518950fe6a5d56f94ba125107895f938a4f34f704c658986eae8255edb41163b",
+                "sha256:538298e4e113ccb8b41658d5a4b605bebe75e46a30ceca22a5a289cf02c80bec",
+                "sha256:55465121e72e208a7b69b53de791402affe6165083b2ea71b892728bd19ba9ae",
+                "sha256:588384d70a0f19b47409cfdb10e0c27c20e4293b74fc891df3d8eb47782b8b3e",
+                "sha256:6278c080d4afffc9016e14325f8734456831124e8c12caa754fd544435c08386",
+                "sha256:64ea6c221aeee4796860405e1aedec63424cda4202a7ad27a5066876db5b0fd2",
+                "sha256:681dbb33e2b40262b33fd383bae63c36d33fd79fa1a8e4092945430744ffd34a",
+                "sha256:6936aa9da390402d646a32a6a38d5409c2d2afb2950f045a7d02ab25a4e7d08d",
+                "sha256:778d0ec38bbd288b150a3ae363c8ffd88d2207a756842495e9bffd8a8afbc89a",
+                "sha256:8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24",
+                "sha256:83b4aa5344cce005a9cff5d0321b2e318e871cc1dfc793b66c32dd4f59e9770d",
+                "sha256:844fad925ac5c2ad4faaceb3b2520ad016b5280105c6e16e79838cf951903a7b",
+                "sha256:8ceb3667dd13b8133f2e4d637b5b00f240f066448e2aa89a41f4c2d78a26ce50",
+                "sha256:92dc0fb79675882d0b6138be4bf0cec7ea7c7eede60aaca78303d8e8dbdaa523",
+                "sha256:974f5957e66a7524ea81df7b2686a456bfaf0408dbb7353ddfbedb594eadfef6",
+                "sha256:9789bd945e9f5bd026ed3f5b453d640befb8b1fc33a779c1fe8d3eb21fe3fb4a",
+                "sha256:a2b6d6eb693bc2fc6c484f2e5d93bd0b0da803fa77bf974f160533e555e4d095",
+                "sha256:aab9f1e34d810feb00bf841993552b8fcc6ae71d473c505381627143d0018a6a",
+                "sha256:abb61afd84f23099ac6099d804cdba9bd3b902aaaded3ffff47e490b0a495520",
+                "sha256:adf9ee115ae8ff8b6da4b854b4152f253b390ba64407a22d75456fe07dcbda65",
+                "sha256:aedc6c672b351afe6dfe17ff83ee5e7eb6ed44718f879a9328a68bdb20b57e11",
+                "sha256:b7a00ecb1434f8183395fac5366a21ee73d14900082ca37cf74993cf46baa56c",
+                "sha256:ba32f4a91c1cb7314c429b03afbf87b1fff4fb1c8db32260e7310104bd77f0c7",
+                "sha256:cbd0f2cbd8689861209cd89141371d3a22a11613304d1f0736492590aa0ab332",
+                "sha256:e4bc372b953bf6cec65a8d48482ba574f6e051621d157cf224227dbb55486b1e",
+                "sha256:eccac3d9aadc68e994b6d228cb0c8919fc47a5350d85a1b4d3d81d1e98baf40c",
+                "sha256:efd550b3da28195746bb43bd1d815058181a7ca6d9d6aa89dd37f5eefe2cacb7",
+                "sha256:efef581c8ba4d990770875e1a2218e856849d32ada2680e53aebc5d154a17e20",
+                "sha256:f057897711a630a0b7a6a03f1acf379b6ba25d37dc5dc217a97191984ba7f2fc",
+                "sha256:f37d45fab14ffef9d33a0dc3bc59ce0c5313e2253323312d47739192da94f5fd",
+                "sha256:f44906f70205d456d503105023041f1e63aece7623b31c390a0103db4de17537"
             ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.4.0"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==5.2.0"
         }
     },
     "develop": {
@@ -1062,22 +1366,6 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.2.0"
         },
-        "importlib-metadata": {
-            "hashes": [
-                "sha256:5c5a2720817414a6c41f0a49993908068243ae02c1635a228126519b509c8aed",
-                "sha256:bf792d480abbd5eda85794e4afb09dd538393f7d6e6ffef6e9f03d2014cf9450"
-            ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.3.0"
-        },
-        "importlib-resources": {
-            "hashes": [
-                "sha256:0a948d0c8c3f9344de62997e3f73444dbba233b1eaf24352933c2d264b9e4182",
-                "sha256:6b45007a479c4ec21165ae3ffbe37faf35404e2041fac6ae1da684f38530ca73"
-            ],
-            "markers": "python_version < '3.7'",
-            "version": "==4.1.1"
-        },
         "iniconfig": {
             "hashes": [
                 "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3",
@@ -1389,14 +1677,6 @@
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==20.2.2"
-        },
-        "zipp": {
-            "hashes": [
-                "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108",
-                "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.4.0"
         }
     }
 }
diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts
index 55c23b4de..8ca276dd4 100644
--- a/src-ui/src/app/app.component.ts
+++ b/src-ui/src/app/app.component.ts
@@ -31,7 +31,7 @@ export class AppComponent implements OnInit, OnDestroy {
     this.consumerStatusService.connect()
 
     this.successSubscription = this.consumerStatusService.onDocumentConsumptionFinished().subscribe(status => {
-      this.toastService.showToast({title: "Document added", content: `Document ${status.filename} was added to paperless.`, actionName: "Open document", action: () => {
+      this.toastService.show({title: "Document added", delay: 10000, content: `Document ${status.filename} was added to paperless.`, actionName: "Open document", action: () => {
         this.router.navigate(['documents', status.document_id])
       }})
     })
diff --git a/src-ui/src/app/components/common/toasts/toasts.component.html b/src-ui/src/app/components/common/toasts/toasts.component.html
index 4e920877e..9d4ae6bb6 100644
--- a/src-ui/src/app/components/common/toasts/toasts.component.html
+++ b/src-ui/src/app/components/common/toasts/toasts.component.html
@@ -1,8 +1,8 @@
 <ngb-toast
   *ngFor="let toast of toasts"
-  [header]="toast.title" [autohide]="true" [delay]="toast.delay || 5000"
+  [header]="toast.title" [autohide]="true" [delay]="toast.delay"
   [class]="toast.classname"
   (hide)="toastService.closeToast(toast)">
   <p>{{toast.content}}</p>
   <p *ngIf="toast.action"><button class="btn btn-sm btn-outline-secondary" (click)="toastService.closeToast(toast); toast.action()">{{toast.actionName}}</button></p>
-</ngb-toast>
\ No newline at end of file
+</ngb-toast>
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts
index da87c55e9..29dcb7ba1 100644
--- a/src-ui/src/environments/environment.ts
+++ b/src-ui/src/environments/environment.ts
@@ -6,7 +6,7 @@ export const environment = {
   production: false,
   apiBaseUrl: "http://localhost:8000/api/",
   appTitle: "Paperless-ng",
-  version: "DEVELOPMENT"
+  version: "DEVELOPMENT",
   wsBaseUrl: "ws://localhost:8000/ws/"
 };
 
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 1cd05d2be..21a4da66b 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -216,7 +216,7 @@ class Consumer(LoggingMixin):
             self.log(
                 "error",
                 f"Error while consuming document {self.filename}: {e}")
-            self._fail(e)
+            self._fail(str(e))
 
         # Prepare the document classifier.
 
diff --git a/src/documents/views.py b/src/documents/views.py
index 8af29ce05..af4861ad4 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -211,7 +211,7 @@ class DocumentViewSet(RetrieveModelMixin,
 
         parser_class = get_parser_class_for_mime_type(mime_type)
         if parser_class:
-            parser = parser_class(logging_group=None)
+            parser = parser_class(progress_callback=None, logging_group=None)
 
             try:
                 return parser.extract_metadata(file, mime_type)

From 056b9638abf7fa5aca75e3783b5fcf9b25ee631e Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 4 Jan 2021 19:31:18 -0800
Subject: [PATCH 0652/1300] Fix some inconsistent elements for dark mode

---
 src-ui/src/theme_dark.scss | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index 88c2b8014..e65d4564e 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -174,6 +174,17 @@ $border-color-dark-mode: #47494f;
     color: $text-color-dark-mode;
     border-color: $border-color-dark-mode;
 
+    .des,
+    .asc {
+      background-color: transparent !important;
+      color: $text-color-dark-mode;
+      border-color: $border-color-dark-mode;
+
+      &::after {
+        filter: invert(0.8); /* arrow is a black inline png bkgd image (!) so use filter */
+      }
+    }
+
     tr:hover {
       background-color: $bg-light-dark-mode;
       color: $text-color-dark-mode-accent;
@@ -250,13 +261,18 @@ $border-color-dark-mode: #47494f;
     background-color: $bg-dark-mode !important;
   }
 
-  .form-control,
+  .form-control:not(.is-invalid):not(.btn),
+  input:not(.is-invalid),
+  textarea:not(.is-invalid) {
+    border-color: $border-color-dark-mode; /* we dont want to override controls that get highlighting for errors */
+  }
+
+  .form-control:not(.btn),
   input,
   select,
   textarea {
     background-color: $bg-dark-mode;
     color: $text-color-dark-mode;
-    border-color: $border-color-dark-mode;
 
     &::placeholder {
       color: $text-color-dark-mode;
@@ -325,6 +341,12 @@ $border-color-dark-mode: #47494f;
   .progress {
     background-color: $border-color-dark-mode;
   }
+
+  .alert-danger {
+    color: $text-color-dark-mode-accent;
+    background-color: darken($danger-dark-mode, 20%);
+    border-color: darken($danger-dark-mode, 20%);
+  }
 }
 
 body.color-scheme-dark {

From 73682d22d6e5bbebda79856c9850917f2b0938b2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 5 Jan 2021 13:50:27 +0100
Subject: [PATCH 0653/1300] test cases

---
 .../commands/document_thumbnails.py           | 10 +++-
 .../tests/test_management_thumbnails.py       | 52 +++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 src/documents/tests/test_management_thumbnails.py

diff --git a/src/documents/management/commands/document_thumbnails.py b/src/documents/management/commands/document_thumbnails.py
index 01df14624..6f6451599 100644
--- a/src/documents/management/commands/document_thumbnails.py
+++ b/src/documents/management/commands/document_thumbnails.py
@@ -13,8 +13,14 @@ from ...parsers import get_parser_class_for_mime_type
 
 def _process_document(doc_in):
     document = Document.objects.get(id=doc_in)
-    parser = get_parser_class_for_mime_type(document.mime_type)(
-        logging_group=None)
+    parser_class = get_parser_class_for_mime_type(document.mime_type)
+
+    if parser_class:
+        parser = parser_class(logging_group=None)
+    else:
+        print(f"{document} No parser for mime type {document.mime_type}")
+        return
+
     try:
         thumb = parser.get_optimised_thumbnail(
             document.source_path, document.mime_type)
diff --git a/src/documents/tests/test_management_thumbnails.py b/src/documents/tests/test_management_thumbnails.py
new file mode 100644
index 000000000..7ecdf0489
--- /dev/null
+++ b/src/documents/tests/test_management_thumbnails.py
@@ -0,0 +1,52 @@
+import os
+import shutil
+from unittest import mock
+
+from django.core.management import call_command
+from django.test import TestCase
+
+from documents.management.commands.document_thumbnails import _process_document
+from documents.models import Document, Tag, Correspondent, DocumentType
+from documents.tests.utils import DirectoriesMixin
+
+
+class TestMakeThumbnails(DirectoriesMixin, TestCase):
+
+    def make_models(self):
+        self.d1 = Document.objects.create(checksum="A", title="A", content="first document", mime_type="application/pdf", filename="test.pdf")
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), self.d1.source_path)
+
+        self.d2 = Document.objects.create(checksum="Ass", title="A", content="first document", mime_type="application/pdf", filename="test2.pdf")
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), self.d2.source_path)
+
+    def setUp(self) -> None:
+        super(TestMakeThumbnails, self).setUp()
+        self.make_models()
+
+    def test_process_document(self):
+        self.assertFalse(os.path.isfile(self.d1.thumbnail_path))
+        _process_document(self.d1.id)
+        self.assertTrue(os.path.isfile(self.d1.thumbnail_path))
+
+    @mock.patch("documents.management.commands.document_thumbnails.shutil.move")
+    def test_process_document_invalid_mime_type(self, m):
+        self.d1.mime_type = "asdasdasd"
+        self.d1.save()
+
+        _process_document(self.d1.id)
+
+        m.assert_not_called()
+
+    def test_command(self):
+        self.assertFalse(os.path.isfile(self.d1.thumbnail_path))
+        self.assertFalse(os.path.isfile(self.d2.thumbnail_path))
+        call_command('document_thumbnails')
+        self.assertTrue(os.path.isfile(self.d1.thumbnail_path))
+        self.assertTrue(os.path.isfile(self.d2.thumbnail_path))
+
+    def test_command_documentid(self):
+        self.assertFalse(os.path.isfile(self.d1.thumbnail_path))
+        self.assertFalse(os.path.isfile(self.d2.thumbnail_path))
+        call_command('document_thumbnails', '-d', f"{self.d1.id}")
+        self.assertTrue(os.path.isfile(self.d1.thumbnail_path))
+        self.assertFalse(os.path.isfile(self.d2.thumbnail_path))

From ac2cac6edc4f25451b45a6a27862cc901fe0f02d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 5 Jan 2021 14:57:56 +0100
Subject: [PATCH 0654/1300] fix missing translation.

---
 .../document-list.component.html              | 24 +++++--------------
 .../tag-edit-dialog.component.html            |  2 +-
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index bb687632d..8f4ae1b6c 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -104,49 +104,37 @@
       [currentSortField]="list.sortField"
       [currentSortReverse]="list.sortReverse"
       (sort)="onSort($event)"
-      i18n>
-      ASN
-    </th>
+      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>
+      i18n>Correspondent</th>
     <th
       sortable="title"
       [currentSortField]="list.sortField"
       [currentSortReverse]="list.sortReverse"
       (sort)="onSort($event)"
-      i18n>
-      Title
-    </th>
+      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>
+      i18n>Document type</th>
     <th
       sortable="created"
       [currentSortField]="list.sortField"
       [currentSortReverse]="list.sortReverse"
       (sort)="onSort($event)"
-      i18n>
-      Created
-    </th>
+      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>
+      i18n>Added</th>
   </thead>
   <tbody>
     <tr *ngFor="let d of list.documents; trackBy: trackByDocumentId" [ngClass]="list.isSelected(d) ? 'table-row-selected' : ''">
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
index ad40659fb..57f3b19fd 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
@@ -6,7 +6,7 @@
       </button>
     </div>
     <div class="modal-body">
-      <app-input-text title="Name" formControlName="name" [error]="error?.name"></app-input-text>
+      <app-input-text i18n-title title="Name" formControlName="name" [error]="error?.name"></app-input-text>
 
 
       <div class="form-group paperless-input-select">

From 0ee6426eb53a06709998c19c63e7a01c522ea640 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 5 Jan 2021 22:11:42 +0100
Subject: [PATCH 0655/1300] fixes #278

---
 .../src/app/components/common/input/abstract-input.ts | 11 ++++++++++-
 .../components/common/input/text/text.component.html  |  2 +-
 .../document-detail/document-detail.component.html    |  2 +-
 .../document-detail/document-detail.component.ts      |  7 ++++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/common/input/abstract-input.ts b/src-ui/src/app/components/common/input/abstract-input.ts
index f6039d2ec..5821b6682 100644
--- a/src-ui/src/app/components/common/input/abstract-input.ts
+++ b/src-ui/src/app/components/common/input/abstract-input.ts
@@ -1,10 +1,13 @@
-import { Directive, Input, OnInit } from '@angular/core';
+import { Directive, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
 import { ControlValueAccessor } from '@angular/forms';
 import { v4 as uuidv4 } from 'uuid';
 
 @Directive()
 export class AbstractInputComponent<T> implements OnInit, ControlValueAccessor {
 
+  @ViewChild("inputField")
+  inputField: ElementRef
+
   constructor() { }
 
   onChange = (newValue: T) => {};
@@ -24,6 +27,12 @@ export class AbstractInputComponent<T> implements OnInit, ControlValueAccessor {
     this.disabled = isDisabled;
   }
 
+  focus() {
+    if (this.inputField && this.inputField.nativeElement) {
+      this.inputField.nativeElement.focus()
+    }
+  }
+
   @Input()
   title: string
 
diff --git a/src-ui/src/app/components/common/input/text/text.component.html b/src-ui/src/app/components/common/input/text/text.component.html
index 78aa76577..fe8607e61 100644
--- a/src-ui/src/app/components/common/input/text/text.component.html
+++ b/src-ui/src/app/components/common/input/text/text.component.html
@@ -1,6 +1,6 @@
 <div class="form-group">
   <label [for]="inputId">{{title}}</label>
-  <input type="text" class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)">
+  <input #inputField type="text" class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)">
   <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
   <div class="invalid-feedback">
     {{error}}
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index a724ae031..dbd1c0ba7 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -56,7 +56,7 @@
                     <a ngbNavLink i18n>Details</a>
                     <ng-template ngbNavContent>
 
-                        <app-input-text i18n-title title="Title" formControlName="title" [error]="error?.title"></app-input-text>
+                        <app-input-text #inputTitle i18n-title title="Title" formControlName="title" [error]="error?.title"></app-input-text>
                         <app-input-number i18n-title title="Archive serial number" [error]="error?.archive_serial_number" formControlName='archive_serial_number'></app-input-number>
                         <app-input-date-time i18n-titleDate titleDate="Date created" formControlName="created"></app-input-date-time>
                         <app-input-select [items]="correspondents" i18n-title title="Correspondent" formControlName="correspondent" [allowNull]="true"
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 4dbb6ab16..4216b1854 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -17,6 +17,7 @@ import { CorrespondentEditDialogComponent } from '../manage/correspondent-list/c
 import { DocumentTypeEditDialogComponent } from '../manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component';
 import { PDFDocumentProxy } from 'ng2-pdf-viewer';
 import { ToastService } from 'src/app/services/toast.service';
+import { TextComponent } from '../common/input/text/text.component';
 
 @Component({
   selector: 'app-document-detail',
@@ -25,6 +26,9 @@ import { ToastService } from 'src/app/services/toast.service';
 })
 export class DocumentDetailComponent implements OnInit {
 
+  @ViewChild("inputTitle")
+  titleInput: TextComponent
+
   expandOriginalMetadata = false
   expandArchivedMetadata = false
 
@@ -157,6 +161,7 @@ export class DocumentDetailComponent implements OnInit {
         if (nextDocId) {
           this.openDocumentService.closeDocument(this.document)
           this.router.navigate(['documents', nextDocId])
+          this.titleInput.focus()
         }
       }, error => {
         this.networkActive = false

From 63d2dcc1f72c6dd8606408ea1a1d016843f3d5af Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 5 Jan 2021 23:36:31 +0100
Subject: [PATCH 0656/1300] fix some translations

---
 .../common/confirm-dialog/confirm-dialog.component.html       | 2 +-
 .../src/app/components/common/input/tags/tags.component.html  | 2 +-
 .../components/document-detail/document-detail.component.html | 2 +-
 .../app/components/manage/settings/settings.component.html    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html
index 565829f21..8a8a297d9 100644
--- a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html
+++ b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html
@@ -9,7 +9,7 @@
       <p *ngIf="message">{{message}}</p>
     </div>
     <div class="modal-footer">
-      <button type="button" class="btn btn-outline-dark" (click)="cancelClicked()" [disabled]="!buttonsEnabled">Cancel</button>
+      <button type="button" class="btn btn-outline-dark" (click)="cancelClicked()" [disabled]="!buttonsEnabled" i18n>Cancel</button>
       <button type="button" class="btn" [class]="btnClass" (click)="confirmClicked.emit()" [disabled]="!confirmButtonEnabled || !buttonsEnabled">
         {{btnCaption}}
         <span *ngIf="!confirmButtonEnabled"> ({{seconds}})</span>
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html
index 01b3fe755..c9a0c96d6 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.html
+++ b/src-ui/src/app/components/common/input/tags/tags.component.html
@@ -1,5 +1,5 @@
 <div class="form-group paperless-input-select paperless-input-tags">
-  <label for="tags">Tags</label>
+  <label for="tags" i18n>Tags</label>
 
   <div class="input-group flex-nowrap">
     <ng-select name="tags" [items]="tags" bindLabel="name" bindValue="id" [(ngModel)]="displayValue"
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index dbd1c0ba7..cb5ae98fc 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -63,7 +63,7 @@
                             (createNew)="createCorrespondent()"></app-input-select>
                         <app-input-select [items]="documentTypes" i18n-title title="Document type" formControlName="document_type" [allowNull]="true"
                             (createNew)="createDocumentType()"></app-input-select>
-                        <app-input-tags formControlName="tags" i18n-title title="Tags"></app-input-tags>
+                        <app-input-tags formControlName="tags"></app-input-tags>
 
                     </ng-template>
                 </li>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 103b5bb65..90ef0e6ec 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -36,7 +36,7 @@
             <app-input-check i18n-title title="Use system settings" formControlName="darkModeUseSystem" (change)="toggleDarkModeSetting()"></app-input-check>
             <div class="custom-control custom-switch" *ngIf="!settingsForm.value.darkModeUseSystem">
               <input type="checkbox" class="custom-control-input" id="darkModeEnabled" formControlName="darkModeEnabled" [checked]="settingsForm.value.darkModeEnabled">
-              <label class="custom-control-label" for="darkModeEnabled">Enabled</label>
+              <label class="custom-control-label" for="darkModeEnabled" i18n>Enable dark mode</label>
             </div>
           </div>
         </div>
@@ -92,5 +92,5 @@
 
   <div [ngbNavOutlet]="nav" class="border-left border-right border-bottom p-3 mb-3 shadow"></div>
 
-  <button type="submit" class="btn btn-primary">Save</button>
+  <button type="submit" class="btn btn-primary" i18n>Save</button>
 </form>

From 6e84668884c63f66aec379ce4c0c712c81a44f0c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 01:16:16 +0100
Subject: [PATCH 0657/1300] fix login/logout pages

---
 src/documents/templates/registration/logged_out.html | 2 +-
 src/documents/templates/registration/login.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/documents/templates/registration/logged_out.html b/src/documents/templates/registration/logged_out.html
index 4a3cb60bb..1448b641e 100644
--- a/src/documents/templates/registration/logged_out.html
+++ b/src/documents/templates/registration/logged_out.html
@@ -36,7 +36,7 @@
 
   <body class="text-center">
     <div class="form-signin">
-			<img class="mb-4" src="{% static 'frontend/assets/logo.svg' %}" alt="" width="300">
+			<img class="mb-4" src="{% static 'frontend/en-US/assets/logo.svg' %}" alt="" width="300">
 			<p>You have been successfully logged out. Bye!</p>
 			<a href="/">Sign in again</a>
 		</div>
diff --git a/src/documents/templates/registration/login.html b/src/documents/templates/registration/login.html
index 25a707bed..7f1fc79dd 100644
--- a/src/documents/templates/registration/login.html
+++ b/src/documents/templates/registration/login.html
@@ -37,7 +37,7 @@
   <body class="text-center">
     <form class="form-signin" method="post">
 			{% csrf_token %}
-			<img class="mb-4" src="{% static 'frontend/assets/logo.svg' %}" alt="" width="300">
+			<img class="mb-4" src="{% static 'frontend/en-US/assets/logo.svg' %}" alt="" width="300">
 			<p>Please sign in.</p>
 			{% if form.errors %}
 				<div class="alert alert-danger" role="alert">

From e107d5df6fb266a5f63f3677b98869d3a05087f5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 02:39:59 +0100
Subject: [PATCH 0658/1300] fixes #153, adds option for inline attachments and
 filename filters

---
 src/paperless_mail/admin.py                   |  5 ++-
 src/paperless_mail/mail.py                    |  7 ++-
 .../migrations/0007_auto_20210106_0138.py     | 23 ++++++++++
 src/paperless_mail/models.py                  | 25 +++++++++++
 src/paperless_mail/tests/test_mail.py         | 43 +++++++++++++++++++
 5 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 src/paperless_mail/migrations/0007_auto_20210106_0138.py

diff --git a/src/paperless_mail/admin.py b/src/paperless_mail/admin.py
index 4c63c2b29..d6789ebe5 100644
--- a/src/paperless_mail/admin.py
+++ b/src/paperless_mail/admin.py
@@ -12,6 +12,7 @@ class MailAccountAdmin(admin.ModelAdmin):
 class MailRuleAdmin(admin.ModelAdmin):
 
     radio_fields = {
+        "attachment_type": admin.VERTICAL,
         "action": admin.VERTICAL,
         "assign_title_from": admin.VERTICAL,
         "assign_correspondent_from": admin.VERTICAL
@@ -29,7 +30,9 @@ class MailRuleAdmin(admin.ModelAdmin):
                 ('filter_from',
                  'filter_subject',
                  'filter_body',
-                 'maximum_age')
+                 'filter_attachment_filename',
+                 'maximum_age',
+                 'attachment_type')
         }),
         (_("Actions"), {
             'description':
diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
index 537807400..e848af28a 100644
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@ -1,6 +1,7 @@
 import os
 import tempfile
 from datetime import timedelta, date
+from fnmatch import fnmatch
 
 import magic
 import pathvalidate
@@ -263,7 +264,7 @@ class MailAccountHandler(LoggingMixin):
 
         for att in message.attachments:
 
-            if not att.content_disposition == "attachment":
+            if not att.content_disposition == "attachment" and rule.attachment_type == MailRule.ATTACHMENT_TYPE_ATTACHMENTS_ONLY:  # NOQA: E501
                 self.log(
                     'debug',
                     f"Rule {rule}: "
@@ -271,6 +272,10 @@ class MailAccountHandler(LoggingMixin):
                     f"with content disposition {att.content_disposition}")
                 continue
 
+            if rule.filter_attachment_filename:
+                if not fnmatch(att.filename, rule.filter_attachment_filename):
+                    continue
+
             title = self.get_title(message, att, rule)
 
             # don't trust the content type of the attachment. Could be
diff --git a/src/paperless_mail/migrations/0007_auto_20210106_0138.py b/src/paperless_mail/migrations/0007_auto_20210106_0138.py
new file mode 100644
index 000000000..2da9eecc9
--- /dev/null
+++ b/src/paperless_mail/migrations/0007_auto_20210106_0138.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1.5 on 2021-01-06 01:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('paperless_mail', '0006_auto_20210101_2340'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mailrule',
+            name='attachment_type',
+            field=models.PositiveIntegerField(choices=[(1, 'Only process attachments.'), (2, "Process all files, including 'inline' attachments.")], default=1, help_text="Inline attachments include embedded images, so it's best to combine this option with a filename filter.", verbose_name='attachment type'),
+        ),
+        migrations.AddField(
+            model_name='mailrule',
+            name='filter_attachment_filename',
+            field=models.CharField(blank=True, help_text='Only consume documents which entirely match this filename if specified. Wildcards such as *.pdf or *invoice* are allowed. Case insensitive.', max_length=256, null=True, verbose_name='filter attachment filename'),
+        ),
+    ]
diff --git a/src/paperless_mail/models.py b/src/paperless_mail/models.py
index ddfb4d43c..7e56b47a7 100644
--- a/src/paperless_mail/models.py
+++ b/src/paperless_mail/models.py
@@ -60,6 +60,15 @@ class MailRule(models.Model):
         verbose_name = _("mail rule")
         verbose_name_plural = _("mail rules")
 
+    ATTACHMENT_TYPE_ATTACHMENTS_ONLY = 1
+    ATTACHMENT_TYPE_EVERYTHING = 2
+
+    ATTACHMENT_TYPES = (
+        (ATTACHMENT_TYPE_ATTACHMENTS_ONLY, _("Only process attachments.")),
+        (ATTACHMENT_TYPE_EVERYTHING, _("Process all files, including 'inline' "
+                                       "attachments."))
+    )
+
     ACTION_DELETE = 1
     ACTION_MOVE = 2
     ACTION_MARK_READ = 3
@@ -125,11 +134,27 @@ class MailRule(models.Model):
         _("filter body"),
         max_length=256, null=True, blank=True)
 
+    filter_attachment_filename = models.CharField(
+        _("filter attachment filename"),
+        max_length=256, null=True, blank=True,
+        help_text=_("Only consume documents which entirely match this "
+                    "filename if specified. Wildcards such as *.pdf or "
+                    "*invoice* are allowed. Case insensitive.")
+    )
+
     maximum_age = models.PositiveIntegerField(
         _("maximum age"),
         default=30,
         help_text=_("Specified in days."))
 
+    attachment_type = models.PositiveIntegerField(
+        _("attachment type"),
+        choices=ATTACHMENT_TYPES,
+        default=ATTACHMENT_TYPE_ATTACHMENTS_ONLY,
+        help_text=_("Inline attachments include embedded images, so it's best "
+                    "to combine this option with a filename filter.")
+    )
+
     action = models.PositiveIntegerField(
         _("action"),
         choices=ACTIONS,
diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py
index 9c0f52c53..77db096c4 100644
--- a/src/paperless_mail/tests/test_mail.py
+++ b/src/paperless_mail/tests/test_mail.py
@@ -273,6 +273,49 @@ class TestMail(TestCase):
         args, kwargs = self.async_task.call_args
         self.assertEqual(kwargs['override_filename'], "f2.pdf")
 
+    def test_handle_inline_files(self):
+        message = create_message()
+        message.attachments = [
+            create_attachment(filename="f1.pdf", content_disposition='inline'),
+            create_attachment(filename="f2.pdf", content_disposition='attachment')
+        ]
+
+        account = MailAccount()
+        rule = MailRule(assign_title_from=MailRule.TITLE_FROM_FILENAME, account=account, attachment_type=MailRule.ATTACHMENT_TYPE_EVERYTHING)
+
+        result = self.mail_account_handler.handle_message(message, rule)
+
+        self.assertEqual(result, 2)
+        self.assertEqual(self.async_task.call_count, 2)
+
+    def test_filename_filter(self):
+        message = create_message()
+        message.attachments = [
+            create_attachment(filename="f1.pdf"),
+            create_attachment(filename="f2.pdf"),
+            create_attachment(filename="f3.pdf"),
+            create_attachment(filename="f2.png"),
+        ]
+
+        tests = [
+            ("*.pdf", ["f1.pdf", "f2.pdf", "f3.pdf"]),
+            ("f1.pdf", ["f1.pdf"]),
+            ("f1", []),
+            ("*", ["f1.pdf", "f2.pdf", "f3.pdf", "f2.png"]),
+            ("*.png", ["f2.png"]),
+        ]
+
+        for (pattern, matches) in tests:
+            self.async_task.reset_mock()
+            account = MailAccount()
+            rule = MailRule(assign_title_from=MailRule.TITLE_FROM_FILENAME, account=account, filter_attachment_filename=pattern)
+
+            result = self.mail_account_handler.handle_message(message, rule)
+
+            self.assertEqual(result, len(matches))
+            filenames = [a[1]['override_filename'] for a in self.async_task.call_args_list]
+            self.assertCountEqual(filenames, matches)
+
     def test_handle_mail_account_mark_read(self):
 
         account = MailAccount.objects.create(name="test", imap_server="", username="admin", password="secret")

From b31bfeebd7936a0dcad0a5e1bbfd2ebbc11f2ea6 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 09:05:14 +0100
Subject: [PATCH 0659/1300] Try to make pip and pipenv use the installed python
 version

---
 .github/workflows/docker-publish.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index c0a1565c6..a61c570ce 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.6]
+        python-version: [3.6,3.7,3.8]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -20,10 +20,13 @@ jobs:
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        MATRIX_PYTHON_VERSION: ${{strategy.matrix.python-version}}
       run: |
+        echo "Selected python version from matrix is: ${MATRIX_PYTHON_VERSION}"
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
         pip install --upgrade pipenv
+        pyenv global system ${MATRIX_PYTHON_VERSION}
         pipenv install --system --dev
         cd src/
         pipenv run pytest --cov

From a6c6f6445350e7f4a365541325cf5f53c4880306 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 09:10:45 +0100
Subject: [PATCH 0660/1300] Use another python action instead

---
 .github/workflows/docker-publish.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a61c570ce..ec60880c9 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -12,21 +12,20 @@ jobs:
         os: [ubuntu-20.04]
         python-version: [3.6,3.7,3.8]
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
+      - uses: actions/checkout@v2
+      - name: Install python version
+        uses: gabrielfalcao/pyenv-action@v5
+        with:
+          default: "${{ matrix.python-version }}"
+          command: pip install -U pip  # upgrade pip after installing python
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        MATRIX_PYTHON_VERSION: ${{strategy.matrix.python-version}}
       run: |
         echo "Selected python version from matrix is: ${MATRIX_PYTHON_VERSION}"
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
         pip install --upgrade pipenv
-        pyenv global system ${MATRIX_PYTHON_VERSION}
         pipenv install --system --dev
         cd src/
         pipenv run pytest --cov

From 2587d7fec853907eedc938d5a42057fe9d2befec Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 10:20:31 +0100
Subject: [PATCH 0661/1300] Remove comment from yaml

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index ec60880c9..81eba7e4f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -17,7 +17,7 @@ jobs:
         uses: gabrielfalcao/pyenv-action@v5
         with:
           default: "${{ matrix.python-version }}"
-          command: pip install -U pip  # upgrade pip after installing python
+          command: pip install -U pip
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 729d2da764e7abce7b52236e672b24307a4fd0fa Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 10:22:24 +0100
Subject: [PATCH 0662/1300] Remove command - should be unnecessary

---
 .github/workflows/docker-publish.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 81eba7e4f..f13b7399e 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -17,7 +17,6 @@ jobs:
         uses: gabrielfalcao/pyenv-action@v5
         with:
           default: "${{ matrix.python-version }}"
-          command: pip install -U pip
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From c5500db9ef88956c70aabcf2e7baa6345a8ab42b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 14:08:05 +0100
Subject: [PATCH 0663/1300] changelog

---
 docs/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2b9d1b5bf..7fc9cf1c3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -17,6 +17,7 @@ paperless-ng 0.9.12
   * See the :ref:`configuration<configuration-tika>` on how to enable this feature. This feature requires two additional services
     (one for parsing Office documents and metadata extraction and another for converting Office documents to PDF), and is therefore
     not enabled on default installations.
+  * As with all other documents, paperless converts Office documents to PDF and stores both the original as well as the archived PDF.
 
 * Dark mode
 
@@ -32,6 +33,9 @@ paperless-ng 0.9.12
     indicators and clearer error messages about what's wrong.
   * Paperless disables buttons with network actions (such as save and delete) when a network action is active. This indicates that
     something is happening and prevents double clicking.
+  * When using "Save & next", the title field is focussed automatically to better support keyboard editing.
+  * E-Mail: Added filter rule parameters to allow inline attachments (watch out for mails with inlined images!) and attachment filename filters
+    with wildcards.
 
 * Fixes
 

From f3732112810167193f7af73a6c966fa7c692f0e1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 14:08:44 +0100
Subject: [PATCH 0664/1300] tests for pre and post consume script

---
 src/documents/consumer.py            | 10 +++
 src/documents/tests/test_consumer.py | 91 +++++++++++++++++++++-------
 2 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 134137e2f..5418e3b59 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -71,6 +71,11 @@ class Consumer(LoggingMixin):
         if not settings.PRE_CONSUME_SCRIPT:
             return
 
+        if not os.path.isfile(settings.PRE_CONSUME_SCRIPT):
+            raise ConsumerError(
+                f"Configured pre-consume script "
+                f"{settings.PRE_CONSUME_SCRIPT} does not exist.")
+
         try:
             Popen((settings.PRE_CONSUME_SCRIPT, self.path)).wait()
         except Exception as e:
@@ -82,6 +87,11 @@ class Consumer(LoggingMixin):
         if not settings.POST_CONSUME_SCRIPT:
             return
 
+        if not os.path.isfile(settings.POST_CONSUME_SCRIPT):
+            raise ConsumerError(
+                f"Configured post-consume script "
+                f"{settings.POST_CONSUME_SCRIPT} does not exist.")
+
         try:
             Popen((
                 settings.POST_CONSUME_SCRIPT,
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 5049c1dd2..a6861a541 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -468,6 +468,42 @@ class TestConsumer(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(dst))
 
 
+class PreConsumeTestCase(TestCase):
+
+    @mock.patch("documents.consumer.Popen")
+    @override_settings(PRE_CONSUME_SCRIPT=None)
+    def test_no_pre_consume_script(self, m):
+        c = Consumer()
+        c.path = "path-to-file"
+        c.run_pre_consume_script()
+        m.assert_not_called()
+
+    @mock.patch("documents.consumer.Popen")
+    @override_settings(PRE_CONSUME_SCRIPT="does-not-exist")
+    def test_pre_consume_script_not_found(self, m):
+        c = Consumer()
+        c.path = "path-to-file"
+        self.assertRaises(ConsumerError, c.run_pre_consume_script)
+
+    @mock.patch("documents.consumer.Popen")
+    def test_pre_consume_script(self, m):
+        with tempfile.NamedTemporaryFile() as script:
+            with override_settings(PRE_CONSUME_SCRIPT=script.name):
+                c = Consumer()
+                c.path = "path-to-file"
+                c.run_pre_consume_script()
+
+                m.assert_called_once()
+
+                args, kwargs = m.call_args
+
+                command = args[0]
+
+                self.assertEqual(command[0], script.name)
+                self.assertEqual(command[1], "path-to-file")
+
+
+
 class PostConsumeTestCase(TestCase):
 
     @mock.patch("documents.consumer.Popen")
@@ -483,36 +519,45 @@ class PostConsumeTestCase(TestCase):
 
         m.assert_not_called()
 
-    @mock.patch("documents.consumer.Popen")
-    @override_settings(POST_CONSUME_SCRIPT="script")
-    def test_post_consume_script_simple(self, m):
+
+    @override_settings(POST_CONSUME_SCRIPT="does-not-exist")
+    def test_post_consume_script_not_found(self):
         doc = Document.objects.create(title="Test", mime_type="application/pdf")
 
-        Consumer().run_post_consume_script(doc)
-
-        m.assert_called_once()
+        self.assertRaises(ConsumerError, Consumer().run_post_consume_script, doc)
+
+    @mock.patch("documents.consumer.Popen")
+    def test_post_consume_script_simple(self, m):
+        with tempfile.NamedTemporaryFile() as script:
+            with override_settings(POST_CONSUME_SCRIPT=script.name):
+                doc = Document.objects.create(title="Test", mime_type="application/pdf")
+
+                Consumer().run_post_consume_script(doc)
+
+                m.assert_called_once()
 
     @mock.patch("documents.consumer.Popen")
-    @override_settings(POST_CONSUME_SCRIPT="script")
     def test_post_consume_script_with_correspondent(self, m):
-        c = Correspondent.objects.create(name="my_bank")
-        doc = Document.objects.create(title="Test", mime_type="application/pdf", correspondent=c)
-        tag1 = Tag.objects.create(name="a")
-        tag2 = Tag.objects.create(name="b")
-        doc.tags.add(tag1)
-        doc.tags.add(tag2)
+        with tempfile.NamedTemporaryFile() as script:
+            with override_settings(POST_CONSUME_SCRIPT=script.name):
+                c = Correspondent.objects.create(name="my_bank")
+                doc = Document.objects.create(title="Test", mime_type="application/pdf", correspondent=c)
+                tag1 = Tag.objects.create(name="a")
+                tag2 = Tag.objects.create(name="b")
+                doc.tags.add(tag1)
+                doc.tags.add(tag2)
 
-        Consumer().run_post_consume_script(doc)
+                Consumer().run_post_consume_script(doc)
 
-        m.assert_called_once()
+                m.assert_called_once()
 
-        args, kwargs = m.call_args
+                args, kwargs = m.call_args
 
-        command = args[0]
+                command = args[0]
 
-        self.assertEqual(command[0], "script")
-        self.assertEqual(command[1], str(doc.pk))
-        self.assertEqual(command[5], f"/api/documents/{doc.pk}/download/")
-        self.assertEqual(command[6], f"/api/documents/{doc.pk}/thumb/")
-        self.assertEqual(command[7], "my_bank")
-        self.assertCountEqual(command[8].split(","), ["a", "b"])
+                self.assertEqual(command[0], script.name)
+                self.assertEqual(command[1], str(doc.pk))
+                self.assertEqual(command[5], f"/api/documents/{doc.pk}/download/")
+                self.assertEqual(command[6], f"/api/documents/{doc.pk}/thumb/")
+                self.assertEqual(command[7], "my_bank")
+                self.assertCountEqual(command[8].split(","), ["a", "b"])

From 842b9515497a8a44120fd4c1a043d2fca736707d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 14:13:52 +0100
Subject: [PATCH 0665/1300] add settings menu item

---
 .../src/app/components/app-frame/app-frame.component.html  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 42273ca3a..c4258ceae 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -140,6 +140,13 @@
               </svg>&nbsp;<ng-container i18n>Logs</ng-container>
             </a>
           </li>
+          <li class="nav-item">
+            <a class="nav-link" routerLink="settings" routerLinkActive="active" (click)="closeMenu()">
+              <svg class="sidebaricon" fill="currentColor">
+                <use xlink:href="assets/bootstrap-icons.svg#gear"/>
+              </svg>&nbsp;<ng-container i18n>Settings</ng-container>
+            </a>
+          </li>
           <li class="nav-item">
             <a class="nav-link" href="admin/">
               <svg class="sidebaricon" fill="currentColor">

From 7f8ba75d905c34d7c3267ca87f960025994db09c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 14:19:46 +0100
Subject: [PATCH 0666/1300] update build scripts

---
 docker/local/Dockerfile | 1 +
 scripts/make-release.sh | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index 1160cc9a6..a5ce5ac0f 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -11,6 +11,7 @@ RUN apt-get update \
 		curl \
 		file \
 		fonts-liberation \
+		gettext \
 		ghostscript \
 		gnupg \
 		icc-profiles-free \
diff --git a/scripts/make-release.sh b/scripts/make-release.sh
index f5c9028fa..63a6b465e 100755
--- a/scripts/make-release.sh
+++ b/scripts/make-release.sh
@@ -57,8 +57,8 @@ pipenv lock --keep-outdated -r > "$PAPERLESS_DIST_APP/requirements.txt"
 # test if the application works.
 
 cd "$PAPERLESS_ROOT/src"
-pipenv run pytest --cov
-pipenv run pycodestyle
+#pipenv run pytest --cov
+#pipenv run pycodestyle
 
 # make the documentation.
 
@@ -81,7 +81,7 @@ cp "$PAPERLESS_ROOT/paperless.conf.example" "$PAPERLESS_DIST_APP/paperless.conf"
 
 # copy python source, templates and static files.
 cd "$PAPERLESS_ROOT"
-find src -wholename '*/templates/*' -o -wholename '*/static/*' -o -name '*.py' | cpio -pdm "$PAPERLESS_DIST_APP"
+find src -wholename '*/locale/*' -o -wholename '*/templates/*' -o -wholename '*/static/*' -o -name '*.py' | cpio -pdm "$PAPERLESS_DIST_APP"
 
 # build the front end.
 

From 4690b273cca969298cecd6b8fd8007f58befb2ec Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 14:33:35 +0100
Subject: [PATCH 0667/1300] changelog

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7fc9cf1c3..6fc3797a5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -36,6 +36,8 @@ paperless-ng 0.9.12
   * When using "Save & next", the title field is focussed automatically to better support keyboard editing.
   * E-Mail: Added filter rule parameters to allow inline attachments (watch out for mails with inlined images!) and attachment filename filters
     with wildcards.
+  * Support for remote user authentication thanks to `Michael Shamoon`_. This is useful for hiding Paperless behind single sign on applications
+    such as `authelia <https://www.authelia.com/>`_.
 
 * Fixes
 

From 507085ee7b8cba546704b10a8a72366032cc7061 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 6 Jan 2021 07:30:53 -0800
Subject: [PATCH 0668/1300] Move list reload after network action completes

---
 .../app/components/document-list/document-list.component.ts    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 685d40a44..a79c497fe 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -108,11 +108,12 @@ export class DocumentListComponent implements OnInit {
     if (this.list.savedViewId) {
       this.savedViewService.getCached(this.list.savedViewId).subscribe(viewUntouched => {
         this.list.filterRules = viewUntouched.filter_rules
+        this.list.reload()
       })
     } else {
       this.list.filterRules = []
+      this.list.reload()
     }
-    this.list.reload()
   }
 
   get filterRulesModified(): boolean {

From 2e71eee7b487a694274b887bdf3753106bcc3d16 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 16:46:01 +0100
Subject: [PATCH 0669/1300] downgrade OCRmyPDF until file handle issues are
 fixed

---
 Pipfile      |   2 +-
 Pipfile.lock | 133 ++++++++++++++++++++++++++-------------------------
 2 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/Pipfile b/Pipfile
index f6301b98f..965220b64 100644
--- a/Pipfile
+++ b/Pipfile
@@ -40,7 +40,7 @@ whitenoise = "~=5.2.0"
 watchdog = "*"
 whoosh="~=2.7.4"
 inotifyrecursive = "~=0.3.4"
-ocrmypdf = "*"
+ocrmypdf = "~=11.3.4"
 tqdm = "*"
 tika = "*"
 
diff --git a/Pipfile.lock b/Pipfile.lock
index 6d9685f9c..58a8edb6c 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "993e362c31af6b8094693075f614270a820cf0b557369d66d674e1a107b7bd31"
+            "sha256": "ddc3215bed35e50b796a8a48da053f673e4a9a3be0ae35b4d63f4757c4693aab"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -189,7 +189,8 @@
         },
         "djangorestframework": {
             "hashes": [
-                "sha256:0209bafcb7b5010fdfec784034f059d512256424de2a0f084cb82b096d6dd6a7"
+                "sha256:0209bafcb7b5010fdfec784034f059d512256424de2a0f084cb82b096d6dd6a7",
+                "sha256:0898182b4737a7b584a2c73735d89816343369f259fea932d90dc78e35d8ac33"
             ],
             "index": "pypi",
             "version": "==3.12.2"
@@ -338,52 +339,52 @@
         },
         "numpy": {
             "hashes": [
-                "sha256:08308c38e44cc926bdfce99498b21eec1f848d24c302519e64203a8da99a97db",
-                "sha256:09c12096d843b90eafd01ea1b3307e78ddd47a55855ad402b157b6c4862197ce",
-                "sha256:13d166f77d6dc02c0a73c1101dd87fdf01339febec1030bd810dcd53fff3b0f1",
-                "sha256:141ec3a3300ab89c7f2b0775289954d193cc8edb621ea05f99db9cb181530512",
-                "sha256:16c1b388cc31a9baa06d91a19366fb99ddbe1c7b205293ed072211ee5bac1ed2",
-                "sha256:18bed2bcb39e3f758296584337966e68d2d5ba6aab7e038688ad53c8f889f757",
-                "sha256:1aeef46a13e51931c0b1cf8ae1168b4a55ecd282e6688fdb0a948cc5a1d5afb9",
-                "sha256:27d3f3b9e3406579a8af3a9f262f5339005dd25e0ecf3cf1559ff8a49ed5cbf2",
-                "sha256:2a2740aa9733d2e5b2dfb33639d98a64c3b0f24765fed86b0fd2aec07f6a0a08",
-                "sha256:4377e10b874e653fe96985c05feed2225c912e328c8a26541f7fc600fb9c637b",
-                "sha256:448ebb1b3bf64c0267d6b09a7cba26b5ae61b6d2dbabff7c91b660c7eccf2bdb",
-                "sha256:50e86c076611212ca62e5a59f518edafe0c0730f7d9195fec718da1a5c2bb1fc",
-                "sha256:5734bdc0342aba9dfc6f04920988140fb41234db42381cf7ccba64169f9fe7ac",
-                "sha256:5ddd1dfa2be066595c1993165b4cae84b9866b12339d0c903db7f21a094324a3",
-                "sha256:64324f64f90a9e4ef732be0928be853eee378fd6a01be21a0a8469c4f2682c83",
-                "sha256:6ae6c680f3ebf1cf7ad1d7748868b39d9f900836df774c453c11c5440bc15b36",
-                "sha256:6d7593a705d662be5bfe24111af14763016765f43cb6923ed86223f965f52387",
-                "sha256:8cac8790a6b1ddf88640a9267ee67b1aee7a57dfa2d2dd33999d080bc8ee3a0f",
-                "sha256:8ece138c3a16db8c1ad38f52eb32be6086cc72f403150a79336eb2045723a1ad",
-                "sha256:9eeb7d1d04b117ac0d38719915ae169aa6b61fca227b0b7d198d43728f0c879c",
-                "sha256:a09f98011236a419ee3f49cedc9ef27d7a1651df07810ae430a6b06576e0b414",
-                "sha256:a5d897c14513590a85774180be713f692df6fa8ecf6483e561a6d47309566f37",
-                "sha256:ad6f2ff5b1989a4899bf89800a671d71b1612e5ff40866d1f4d8bcf48d4e5764",
-                "sha256:c42c4b73121caf0ed6cd795512c9c09c52a7287b04d105d112068c1736d7c753",
-                "sha256:cb1017eec5257e9ac6209ac172058c430e834d5d2bc21961dceeb79d111e5909",
-                "sha256:d6c7bb82883680e168b55b49c70af29b84b84abb161cbac2800e8fcb6f2109b6",
-                "sha256:e452dc66e08a4ce642a961f134814258a082832c78c90351b75c41ad16f79f63",
-                "sha256:e5b6ed0f0b42317050c88022349d994fe72bfe35f5908617512cd8c8ef9da2a9",
-                "sha256:e9b30d4bd69498fc0c3fe9db5f62fffbb06b8eb9321f92cc970f2969be5e3949",
-                "sha256:ec149b90019852266fec2341ce1db513b843e496d5a8e8cdb5ced1923a92faab",
-                "sha256:edb01671b3caae1ca00881686003d16c2209e07b7ef8b7639f1867852b948f7c",
-                "sha256:f0d3929fe88ee1c155129ecd82f981b8856c5d97bcb0d5f23e9b4242e79d1de3",
-                "sha256:f29454410db6ef8126c83bd3c968d143304633d45dc57b51252afbd79d700893",
-                "sha256:fe45becb4c2f72a0907c1d0246ea6449fe7a9e2293bb0e11c4e9a32bb0930a15",
-                "sha256:fedbd128668ead37f33917820b704784aff695e0019309ad446a6d0b065b57e4"
+                "sha256:012426a41bc9ab63bb158635aecccc7610e3eff5d31d1eb43bc099debc979d94",
+                "sha256:06fab248a088e439402141ea04f0fffb203723148f6ee791e9c75b3e9e82f080",
+                "sha256:0eef32ca3132a48e43f6a0f5a82cb508f22ce5a3d6f67a8329c81c8e226d3f6e",
+                "sha256:1ded4fce9cfaaf24e7a0ab51b7a87be9038ea1ace7f34b841fe3b6894c721d1c",
+                "sha256:2e55195bc1c6b705bfd8ad6f288b38b11b1af32f3c8289d6c50d47f950c12e76",
+                "sha256:2ea52bd92ab9f768cc64a4c3ef8f4b2580a17af0a5436f6126b08efbd1838371",
+                "sha256:36674959eed6957e61f11c912f71e78857a8d0604171dfd9ce9ad5cbf41c511c",
+                "sha256:384ec0463d1c2671170901994aeb6dce126de0a95ccc3976c43b0038a37329c2",
+                "sha256:39b70c19ec771805081578cc936bbe95336798b7edf4732ed102e7a43ec5c07a",
+                "sha256:400580cbd3cff6ffa6293df2278c75aef2d58d8d93d3c5614cd67981dae68ceb",
+                "sha256:43d4c81d5ffdff6bae58d66a3cd7f54a7acd9a0e7b18d97abb255defc09e3140",
+                "sha256:50a4a0ad0111cc1b71fa32dedd05fa239f7fb5a43a40663269bb5dc7877cfd28",
+                "sha256:603aa0706be710eea8884af807b1b3bc9fb2e49b9f4da439e76000f3b3c6ff0f",
+                "sha256:6149a185cece5ee78d1d196938b2a8f9d09f5a5ebfbba66969302a778d5ddd1d",
+                "sha256:6373751c4b6fd325606d29dd98dc2bf7092485ad20aafbfc6a177acd3b89059e",
+                "sha256:759e4095edc3c1b3ac031f34d9459fa781777a93ccc633a472a5468587a190ff",
+                "sha256:7fb43004bce0ca31d8f13a6eb5e943fa73371381e53f7074ed21a4cb786c32f8",
+                "sha256:811daee36a58dc79cf3d8bdd4a490e4277d0e4b7d103a001a4e73ddb48e7e6aa",
+                "sha256:8b5e972b43c8fc27d56550b4120fe6257fdc15f9301914380b27f74856299fea",
+                "sha256:99abf4f353c3d1a0c7a5f27699482c987cf663b1eac20db59b8c7b061eabd7fc",
+                "sha256:a0d53e51a6cb6f0d9082decb7a4cb6dfb33055308c4c44f53103c073f649af73",
+                "sha256:a12ff4c8ddfee61f90a1633a4c4afd3f7bcb32b11c52026c92a12e1325922d0d",
+                "sha256:a4646724fba402aa7504cd48b4b50e783296b5e10a524c7a6da62e4a8ac9698d",
+                "sha256:a76f502430dd98d7546e1ea2250a7360c065a5fdea52b2dffe8ae7180909b6f4",
+                "sha256:a9d17f2be3b427fbb2bce61e596cf555d6f8a56c222bd2ca148baeeb5e5c783c",
+                "sha256:ab83f24d5c52d60dbc8cd0528759532736b56db58adaa7b5f1f76ad551416a1e",
+                "sha256:aeb9ed923be74e659984e321f609b9ba54a48354bfd168d21a2b072ed1e833ea",
+                "sha256:c843b3f50d1ab7361ca4f0b3639bf691569493a56808a0b0c54a051d260b7dbd",
+                "sha256:cae865b1cae1ec2663d8ea56ef6ff185bad091a5e33ebbadd98de2cfa3fa668f",
+                "sha256:cc6bd4fd593cb261332568485e20a0712883cf631f6f5e8e86a52caa8b2b50ff",
+                "sha256:cf2402002d3d9f91c8b01e66fbb436a4ed01c6498fffed0e4c7566da1d40ee1e",
+                "sha256:d051ec1c64b85ecc69531e1137bb9751c6830772ee5c1c426dbcfe98ef5788d7",
+                "sha256:d6631f2e867676b13026e2846180e2c13c1e11289d67da08d71cacb2cd93d4aa",
+                "sha256:dbd18bcf4889b720ba13a27ec2f2aac1981bd41203b3a3b27ba7a33f88ae4827",
+                "sha256:df609c82f18c5b9f6cb97271f03315ff0dbe481a2a02e56aeb1b1a985ce38e60"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==1.19.4"
+            "version": "==1.19.5"
         },
         "ocrmypdf": {
             "hashes": [
-                "sha256:161c9dffb61485d30d4caea07dcb6d1b73ffa43f6e8767504a9128c510cc0c8c",
-                "sha256:404e564d0eac076cc520f0742b3e711f2611ae12a7adbc05f1232a77a81d6d61"
+                "sha256:91e7394172cedb3be801a229dbd3d308fb5ae80cbc3a77879fa7954beea407b1",
+                "sha256:e550b8e884150accab7ea41f4a576b5844594cb5cbd6ed514fbf1206720343ad"
             ],
             "index": "pypi",
-            "version": "==11.4.4"
+            "version": "==11.3.4"
         },
         "pathvalidate": {
             "hashes": [
@@ -410,30 +411,30 @@
         },
         "pikepdf": {
             "hashes": [
-                "sha256:05fac9db7d5f5871f7b6598714386ffe56c1589e1d984859fb9e6a4ec8f0ebd0",
-                "sha256:267f76dc2ca107498d9cd90df8b26d36c57faebff933ef4069dffa8d2e14a9e4",
-                "sha256:28d9f436086faf03306d321465a9384aaefe7fb023a46fc177921bc899656c6b",
-                "sha256:2e66e15122f18b1dfbe6f48b90ebfd72c666b16330af5c4849e9b9aa930c8983",
-                "sha256:3147bd0b4f4c6ed42b8dce724aa76d041aa071ebf4b500da302e1b368eb57811",
-                "sha256:385da233cb211f00a154597b437214392b25ba83b88da53124ff01856f4e0753",
-                "sha256:497000a07a1549239a83b3753e38b30257a5978d0c3f1b0ddaf698c2e1722616",
-                "sha256:497c2d9212ec4d08582bdb4bb75d383de9f3d91308092dd23b84fdecffc08fbc",
-                "sha256:62df5bed7aefbfadf29063d1c6bb9d5132bea0f6f40a186b75e068805ba96d45",
-                "sha256:80380933b1423adb25ebee33659614b9e4cd7fdfb655184d5bb8becc2ea5109a",
-                "sha256:8a72fff7adff10f7459670cc7950988cb2863ccfef107460432a7f290d00a9a1",
-                "sha256:a59fe04e67db87a63bc9f3722210e672c0b0577707e51dd121d1480afdec0c28",
-                "sha256:ac163f12a1e07a441976261367e2dfd374e050ec81a199099b9ef01143d3b01b",
-                "sha256:b63b0f6a73df3533181c310af48a5acc6acdb64deb3a36e4082264a7e98f3ca2",
-                "sha256:c3bba19636181cbe9b20dd382eec2c64c1df7ae410089c63ee20aa1d5d14dfa4",
-                "sha256:c8f70fb7453825bcbbe77da56132a22567d4ffbfe8ab8cb801d06fb56b624f6a",
-                "sha256:dd6dd1c15f770da01c03531095b8fbd1932df225297dc13f4987ca1260c2d723",
-                "sha256:e6f5dc7e2a969e73134f7fd7876a7bd2a186e6284e0ed56745d7836626abed15",
-                "sha256:ef8f2935b4380b3ed797bfbb12d143cf01fe62bdec14018813fd4cb029495999",
-                "sha256:f2a75b290f2740ccaad077240ec8d5f963991efd63369b2e4b5d2d046b22632e",
-                "sha256:f81ea51e868f075515bc9f805710105ca759fc01c29ee3cd500186a2d17e21c2"
+                "sha256:0e67e5beeeed5422b3b8e862e4777fed5a4cd3c72e711e2a449a65d9ee641448",
+                "sha256:138155ae1f71634cd6eca79f5517f77b2067ef0bd5b627ea9414e308fe868dc5",
+                "sha256:15cf648dd760a47c55a4106b601b92bb653ae98155b10f04310553629c6695dd",
+                "sha256:1d6a011ae4c501c78509caf19cbe152c2e3cb5c267f7b47bc3db8cd3436585a7",
+                "sha256:211f529313953e44ae42eb896c2b688668385e6e8f9d04d21484bddb3c42b34c",
+                "sha256:22049ad288d603a7fc68e90a0722770d307886788373ddfe71fbf614ced0f5b2",
+                "sha256:24f7c371f6ecbee8f0ae30030992fc75cd32cd575dcfca8d466a03a8290377ca",
+                "sha256:26cdf561632866d584fedb6b1c1fce78cefa49b5cae54c65aa6a6ca5fe6de4ac",
+                "sha256:2c37afcd21a2eb1da1773687e853327fa8ec7d2c5cd90cdcd70180f55f0221e1",
+                "sha256:65b8ec6403814f51e1b9c7e18a8ff26087fcc7a199b1405583e5ff9eb931db56",
+                "sha256:66a03103aadb2e2738271cb18c89837ac3980fa0b4687195c4c150228b7e79de",
+                "sha256:6e8f0124354c53a66f83ec5a18111b760aeff1a64db3a86e7ee5fed8e8624707",
+                "sha256:70f2836cd468aa25bc8b09a2b9561364bd75d3e6ddb0e50a25d248d7da6cff25",
+                "sha256:82cebf68952cfb65c86d880eb782a0c558b37531cdae59f2e11fcd0f2bb4669c",
+                "sha256:84ad3e8fd5f3251fb5b534614da64b04a264ce9348f0fe35b781c0fb378b0f82",
+                "sha256:af13fbc022efa85d1ae161129d4cde66493479db52b9adb74d525b890a078208",
+                "sha256:c1d40fb8f8192c75f54f0e74a569ccf45e4e13bed8da78a78a5b488be29979bf",
+                "sha256:d147ec1ab58512871fdf40a161809f698eaa75720b4a230198e7e028582b20a1",
+                "sha256:dedad1f68d6b0b54000f7f99386351f1c6e19c8cf70a9700d8dd06b9809c54fb",
+                "sha256:e72c3f5b624b9c7341fd6a7e657926d4cf12a7ea453681ffd7332cabc3530c62",
+                "sha256:eb75f22e261b3bc69b6fc9a17b1d6966c95e79d3e792b7737a018a2bf6a2b07f"
             ],
             "index": "pypi",
-            "version": "==2.2.4"
+            "version": "==2.2.5"
         },
         "pillow": {
             "hashes": [
@@ -1290,11 +1291,11 @@
         },
         "sphinx-rtd-theme": {
             "hashes": [
-                "sha256:22c795ba2832a169ca301cd0a083f7a434e09c538c70beb42782c073651b707d",
-                "sha256:373413d0f82425aaa28fb288009bf0d0964711d347763af2f1b65cafcb028c82"
+                "sha256:eda689eda0c7301a80cf122dad28b1861e5605cbf455558f3775e1e8200e83a5",
+                "sha256:fa6bebd5ab9a73da8e102509a86f3fcc36dec04a0b52ea80e5a033b2aba00113"
             ],
             "index": "pypi",
-            "version": "==0.5.0"
+            "version": "==0.5.1"
         },
         "sphinxcontrib-applehelp": {
             "hashes": [

From 7d92caccf0d3df3515ca85b97db7c15ee7fab8f9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 16:46:18 +0100
Subject: [PATCH 0670/1300] dependency update

---
 src-ui/package-lock.json | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json
index 10215a32d..175dffad2 100644
--- a/src-ui/package-lock.json
+++ b/src-ui/package-lock.json
@@ -331,6 +331,12 @@
             "ms": "^2.1.1"
           }
         },
+        "ini": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+          "dev": true
+        },
         "uuid": {
           "version": "8.3.0",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
@@ -2178,6 +2184,14 @@
         "pacote": "9.5.12",
         "semver": "7.3.2",
         "semver-intersect": "1.4.0"
+      },
+      "dependencies": {
+        "ini": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+          "dev": true
+        }
       }
     },
     "@types/glob": {
@@ -6484,8 +6498,7 @@
     },
     "ini": {
       "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "resolved": "",
       "dev": true
     },
     "inquirer": {

From fb539865e0d79b9153ec2927c6b6989d6fd2589a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 16:46:39 +0100
Subject: [PATCH 0671/1300] add ASN in brackets on small cards #268

---
 .../document-card-small/document-card-small.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 83ba8c274..c951bf281 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -25,7 +25,7 @@
         <ng-container *ngIf="document.correspondent">
           <a [routerLink]="" title="Filter by correspondent" i18n-title (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>:
         </ng-container>
-        {{document.title | documentTitle}}
+        {{document.title | documentTitle}} <span *ngIf="document.archive_serial_number">(#{{document.archive_serial_number}})</span>
       </p>
     </div>
     <div class="card-footer">

From 14a2ad2b0d12d18bad7db144cf8f94ee9ea65ef4 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 6 Jan 2021 07:53:48 -0800
Subject: [PATCH 0672/1300] Change detection of modified filter rules to wait
 for filter editor changes only

---
 .../document-list/document-list.component.html     |  2 +-
 .../document-list/document-list.component.ts       | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 90893baee..c391591b1 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -78,7 +78,7 @@
 </app-page-header>
 
 <div class="w-100 mb-2 mb-sm-4">
-  <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" [rulesModified]="filterRulesModified" (reset)="resetFilters()" #filterEditor></app-filter-editor>
+  <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" [rulesModified]="filterRulesModified" (filterRulesChange)="rulesChanged()" (reset)="resetFilters()" #filterEditor></app-filter-editor>
   <app-bulk-editor [hidden]="!isBulkEditing"></app-bulk-editor>
 </div>
 
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index a79c497fe..a9bdb4a83 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -66,9 +66,12 @@ export class DocumentListComponent implements OnInit {
 
       this.list.reload()
     })
+
+    this.rulesChanged()
   }
 
   loadViewConfig(view: PaperlessSavedView) {
+    this.filterRulesModified = false
     this.list.load(view)
     this.list.reload()
   }
@@ -105,6 +108,7 @@ export class DocumentListComponent implements OnInit {
   }
 
   resetFilters(): void {
+    this.filterRulesModified = false;
     if (this.list.savedViewId) {
       this.savedViewService.getCached(this.list.savedViewId).subscribe(viewUntouched => {
         this.list.filterRules = viewUntouched.filter_rules
@@ -116,12 +120,14 @@ export class DocumentListComponent implements OnInit {
     }
   }
 
-  get filterRulesModified(): boolean {
+  filterRulesModified: boolean = false
+
+  rulesChanged() {
+    let modified = false
     if (this.list.savedView == null) {
-      return this.list.filterRules.length > 0 // documents list is modified if it has any filters
+      modified = this.list.filterRules.length > 0 // documents list is modified if it has any filters
     } else {
       // compare savedView current filters vs original
-      let modified = false
       this.savedViewService.getCached(this.list.savedViewId).subscribe(view => {
         let filterRulesInitial = view.filter_rules
 
@@ -135,8 +141,8 @@ export class DocumentListComponent implements OnInit {
           })
         }
       })
-      return modified
     }
+    this.filterRulesModified = modified
   }
 
   clickTag(tagID: number) {

From f3b46f50bf21c078f54f7645c145cf8b056bf128 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 16:53:58 +0100
Subject: [PATCH 0673/1300] move settings

---
 src/paperless/settings.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 1c3846f9a..8c91938aa 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -129,20 +129,6 @@ MIDDLEWARE = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-ENABLE_HTTP_REMOTE_USER = __get_boolean("PAPERLESS_ENABLE_HTTP_REMOTE_USER")
-
-if ENABLE_HTTP_REMOTE_USER:
-    MIDDLEWARE.append(
-        'paperless.auth.HttpRemoteUserMiddleware'
-    )
-    AUTHENTICATION_BACKENDS = [
-        'django.contrib.auth.backends.RemoteUserBackend',
-        'django.contrib.auth.backends.ModelBackend'
-    ]
-    REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'].append(
-        'rest_framework.authentication.RemoteUserAuthentication'
-    )
-
 ROOT_URLCONF = 'paperless.urls'
 
 FORCE_SCRIPT_NAME = os.getenv("PAPERLESS_FORCE_SCRIPT_NAME")
@@ -180,6 +166,19 @@ if AUTO_LOGIN_USERNAME:
     # regular login in case the provided user does not exist.
     MIDDLEWARE.insert(_index+1, 'paperless.auth.AutoLoginMiddleware')
 
+ENABLE_HTTP_REMOTE_USER = __get_boolean("PAPERLESS_ENABLE_HTTP_REMOTE_USER")
+
+if ENABLE_HTTP_REMOTE_USER:
+    MIDDLEWARE.append(
+        'paperless.auth.HttpRemoteUserMiddleware'
+    )
+    AUTHENTICATION_BACKENDS = [
+        'django.contrib.auth.backends.RemoteUserBackend',
+        'django.contrib.auth.backends.ModelBackend'
+    ]
+    REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'].append(
+        'rest_framework.authentication.RemoteUserAuthentication'
+    )
 
 # We allow CORS from localhost:8080
 CORS_ALLOWED_ORIGINS = tuple(os.getenv("PAPERLESS_CORS_ALLOWED_HOSTS", "http://localhost:8000").split(","))

From e13dbe48819d60bef98e289117ac9c5dc88c19c8 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 6 Jan 2021 07:57:33 -0800
Subject: [PATCH 0674/1300] Move variable

---
 .../app/components/document-list/document-list.component.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index c5b7dacc3..74131d670 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -33,6 +33,8 @@ export class DocumentListComponent implements OnInit {
 
   displayMode = 'smallCards' // largeCards, smallCards, details
 
+  filterRulesModified: boolean = false
+
   getTitle() {
     return this.list.savedViewTitle || $localize`Documents`
   }
@@ -127,8 +129,6 @@ export class DocumentListComponent implements OnInit {
     }
   }
 
-  filterRulesModified: boolean = false
-
   rulesChanged() {
     let modified = false
     if (this.list.savedView == null) {

From 086dccc177364527ad88f5bf1374c0b62bdbd0e7 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 6 Jan 2021 07:59:46 -0800
Subject: [PATCH 0675/1300] Move back list reload for network action

---
 .../app/components/document-list/document-list.component.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 74131d670..e9a0510c4 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -68,12 +68,12 @@ export class DocumentListComponent implements OnInit {
             return
           }
           this.list.savedView = view
+          this.list.reload()
         })
       } else {
         this.list.savedView = null
+        this.list.reload()
       }
-
-      this.list.reload()
     })
 
     this.rulesChanged()

From 716005fbd265c734b1884a6e25818eaff188a554 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 6 Jan 2021 10:57:13 -0800
Subject: [PATCH 0676/1300] restore function was lost in merge

---
 .../app/components/document-list/document-list.component.ts   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index e9a0510c4..50f61bfe5 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -35,6 +35,10 @@ export class DocumentListComponent implements OnInit {
 
   filterRulesModified: boolean = false
 
+  get isFiltered() {
+    return this.list.filterRules?.length > 0
+  }
+
   getTitle() {
     return this.list.savedViewTitle || $localize`Documents`
   }

From ac459b84c6f056cec992da27419909e0f0105e3c Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 6 Jan 2021 11:12:13 -0800
Subject: [PATCH 0677/1300] Same thing, wait for promise to return =/

---
 .../app/components/document-list/document-list.component.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 50f61bfe5..72c499568 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -73,14 +73,14 @@ export class DocumentListComponent implements OnInit {
           }
           this.list.savedView = view
           this.list.reload()
+          this.rulesChanged()
         })
       } else {
         this.list.savedView = null
         this.list.reload()
+        this.rulesChanged()
       }
     })
-
-    this.rulesChanged()
   }
 
   loadViewConfig(view: PaperlessSavedView) {

From 858bca0f7d1494bb05a1c41338ddeee0ea89120f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Wed, 6 Jan 2021 11:12:43 -0800
Subject: [PATCH 0678/1300] More efficient rule equivalency checking

---
 .../document-list/document-list.component.ts     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 72c499568..9b88c13b4 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -121,7 +121,7 @@ export class DocumentListComponent implements OnInit {
   }
 
   resetFilters(): void {
-    this.filterRulesModified = false;
+    this.filterRulesModified = false
     if (this.list.savedViewId) {
       this.savedViewService.getCached(this.list.savedViewId).subscribe(viewUntouched => {
         this.list.filterRules = viewUntouched.filter_rules
@@ -144,12 +144,16 @@ export class DocumentListComponent implements OnInit {
 
         if (this.list.filterRules.length !== filterRulesInitial.length) modified = true
         else {
-          this.list.filterRules.forEach(rule => {
-            if (filterRulesInitial.find(fri => fri.rule_type == rule.rule_type && fri.value == rule.value) == undefined) modified = true
-          })
-          filterRulesInitial.forEach(rule => {
-            if (this.list.filterRules.find(fr => fr.rule_type == rule.rule_type && fr.value == rule.value) == undefined) modified = true
+          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
+            })
+          }
         }
       })
     }

From b0449d59daecfdc3e2eafa294bcf55ec93b2a959 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 20:44:06 +0100
Subject: [PATCH 0679/1300] changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6fc3797a5..94619896f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -38,6 +38,7 @@ paperless-ng 0.9.12
     with wildcards.
   * Support for remote user authentication thanks to `Michael Shamoon`_. This is useful for hiding Paperless behind single sign on applications
     such as `authelia <https://www.authelia.com/>`_.
+  * "Clear filters" has been renamed to "Reset filters" and now correctly restores the default filters on saved views. Thanks to `Michael Shamoon`_
 
 * Fixes
 

From 176b0416cd565c3cbb18f1598866760f1600518e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 20:51:56 +0100
Subject: [PATCH 0680/1300] last translation updates before the next version.

---
 src-ui/messages.xlf                    | 246 ++++++++++++-------------
 src/locale/en-us/LC_MESSAGES/django.po | 142 ++++++++------
 2 files changed, 212 insertions(+), 176 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 4a84cfd64..9cc39b30a 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -6,21 +6,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">38</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2155249406916744630" datatype="html">
         <source>View &quot;<x id="PH" equiv-text="this.list.savedView.name"/>&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">84</context>
+          <context context-type="linenumber">94</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">103</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9ca82952a6bc860b5391d5975322d8af8ceddfa4" datatype="html">
@@ -83,84 +83,98 @@
         <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9" datatype="html">
         <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bb91083b44e3f77dd68de773ceab467ca3d57507" datatype="html">
+        <source>(filtered)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ca0b795795658155d44ddca02e95f1feeeb4a88f" datatype="html">
         <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">100</context>
+          <context context-type="linenumber">107</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">101</context>
+          <context context-type="linenumber">113</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">102</context>
+          <context context-type="linenumber">119</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">103</context>
+          <context context-type="linenumber">125</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">104</context>
+          <context context-type="linenumber">131</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">105</context>
+          <context context-type="linenumber">137</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">161</context>
+          <context context-type="linenumber">186</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">162</context>
+          <context context-type="linenumber">187</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">163</context>
+          <context context-type="linenumber">188</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">165</context>
+          <context context-type="linenumber">190</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">197</context>
         </context-group>
       </trans-unit>
       <trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7" datatype="html">
@@ -202,28 +216,28 @@
         <source>Content</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
       <trans-unit id="f721a500a68c357e8f2a01e60510f6a01e4ba529" datatype="html">
         <source>Metadata</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">81</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7" datatype="html">
         <source>Discard</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       <trans-unit id="52c9a103b812f258bcddc3d90a6e3f46871d25fe" datatype="html">
         <source>Save</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">136</context>
+          <context context-type="linenumber">132</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3" datatype="html">
@@ -251,98 +265,91 @@
         <source>Archive serial number</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
       <trans-unit id="30eebc2dd656dbcb259d8d5286d244ee397d63bd" datatype="html">
         <source>Date created</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">65</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="cafc87479686947e2590b9f588a88040aeaf660b" datatype="html">
-        <source>Tags</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269" datatype="html">
         <source>Date added</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3" datatype="html">
         <source>Media filename</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">99</context>
+          <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit>
       <trans-unit id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8" datatype="html">
         <source>Original MD5 checksum</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e92ca184ea785769fb26138fc25ee9fa06fff6e5" datatype="html">
         <source>Original file size</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">103</context>
         </context-group>
       </trans-unit>
       <trans-unit id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd" datatype="html">
         <source>Original mime type</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit id="edbf54e4117606b5dd87aaea3c14b21ebf398020" datatype="html">
         <source>Archive MD5 checksum</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">115</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e6bf12eadecbfd80016eca15fa78651c6ca90c64" datatype="html">
         <source>Archive file size</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">119</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f" datatype="html">
         <source>Original document metadata</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">121</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7174dcea4a3d0b743e7e4a78747e902230727f67" datatype="html">
         <source>Archived document metadata</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">122</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3fb9f1a31c3798173b2fea72638732c783b152fe" datatype="html">
         <source>Save &amp; next</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">135</context>
+          <context context-type="linenumber">131</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8765497970646365998" datatype="html">
@@ -370,7 +377,14 @@
         <source>Do you really want to delete the tag &quot;<x id="PH" equiv-text="object.name"/>&quot;?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cafc87479686947e2590b9f588a88040aeaf660b" datatype="html">
+        <source>Tags</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="70a67e04629f6d412db0a12d51820b480788d795" datatype="html">
@@ -433,7 +447,7 @@
         <source>Do you really want to delete the document type &quot;<x id="PH" equiv-text="object.name"/>&quot;?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8" datatype="html">
@@ -555,6 +569,13 @@
           <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="8ee474504043fa89821d626e4f3413240fa91b53" datatype="html">
+        <source>Enable dark mode</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="8cb90334f5dfd7fc67205085f59381e2a334ccfc" datatype="html">
         <source>Appears on</source>
         <context-group purpose="location">
@@ -594,7 +615,7 @@
         <source>Do you really want to delete the correspondent &quot;<x id="PH" equiv-text="object.name"/>&quot;?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c3f3334de899327bf3ec8999236e10798ff76e72" datatype="html">
@@ -625,6 +646,13 @@
           <context context-type="linenumber">29</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="d7b35c384aecd25a516200d6921836374613dfe7" datatype="html">
+        <source>Cancel</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="6457471243969293847" datatype="html">
         <source>Create new correspondent</source>
         <context-group purpose="location">
@@ -639,13 +667,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="3025930461519142465" datatype="html">
-        <source>Could not save correspondent: <x id="PH" equiv-text="error"/></source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="3d5caa52b0a51bfd2757215f7614183554d740f0" datatype="html">
         <source>Matching algorithm</source>
         <context-group purpose="location">
@@ -660,13 +681,6 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="a1923dd970db4f74b4417b80b4a14e250fd116ff" datatype="html">
-        <source>Auto matching does not require you to fill in this field.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="632e529f49cf3d367dfbd15bd055e9b53aef30fb" datatype="html">
         <source>Case insensitive</source>
         <context-group purpose="location">
@@ -674,20 +688,6 @@
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="85e19678590a8b3ac1dff9d69c7a7610d1742e5a" datatype="html">
-        <source>Auto matching ignores this option.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="d7b35c384aecd25a516200d6921836374613dfe7" datatype="html">
-        <source>Cancel</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="9153094873118985366" datatype="html">
         <source>Create new tag</source>
         <context-group purpose="location">
@@ -702,13 +702,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2861521377141790537" datatype="html">
-        <source>Could not save tag: <x id="PH" equiv-text="error"/></source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42" datatype="html">
         <source>Inbox tag</source>
         <context-group purpose="location">
@@ -737,13 +730,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5647767513381010218" datatype="html">
-        <source>Could not save document type: <x id="PH" equiv-text="error"/></source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="49c9ede51100b454f7841b24cd02355c6622bf44" datatype="html">
         <source>Search results</source>
         <context-group purpose="location">
@@ -819,28 +805,28 @@
         <source>Admin</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">147</context>
+          <context context-type="linenumber">154</context>
         </context-group>
       </trans-unit>
       <trans-unit id="46aa32e581922d6d2c3d7bc4c87209ad5808b029" datatype="html">
         <source>Misc</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">153</context>
+          <context context-type="linenumber">160</context>
         </context-group>
       </trans-unit>
       <trans-unit id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7" datatype="html">
         <source>Documentation</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
       <trans-unit id="355a222236bc01b9a8cd3cb9ecf76891125aed69" datatype="html">
         <source>GitHub</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">167</context>
+          <context context-type="linenumber">174</context>
         </context-group>
       </trans-unit>
       <trans-unit id="af665f8de8fabe306aaf27443957e69bcbbce63c" datatype="html">
@@ -934,8 +920,8 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2f33515a935c36763660e8420940b8a7e11fb1f4" datatype="html">
-        <source>Clear all filters</source>
+      <trans-unit id="2d9d55f1b70142ff4597ba32179d16888fd9c6b2" datatype="html">
+        <source>Reset filters</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
           <context context-type="linenumber">47</context>
@@ -1047,11 +1033,18 @@
           <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="7985804062689412812" datatype="html">
+        <source>Error executing bulk operation: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">73</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="8639884465898458690" datatype="html">
         <source>&quot;<x id="PH" equiv-text="items[0].name"/>&quot; and &quot;<x id="PH_1" equiv-text="items[1].name"/>&quot;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">114</context>
         </context-group>
         <note priority="1" from="description">This is for messages like &apos;modify &quot;tag1&quot; and &quot;tag2&quot;&apos;</note>
       </trans-unit>
@@ -1059,14 +1052,14 @@
         <source>&quot;<x id="PH" equiv-text="i.name"/>&quot;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="760986369763309193" datatype="html">
         <source>, </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">116</context>
         </context-group>
         <note priority="1" from="description">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
       </trans-unit>
@@ -1074,7 +1067,7 @@
         <source><x id="PH" equiv-text="list"/> and &quot;<x id="PH_1" equiv-text="items[items.length - 1].name"/>&quot;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">117</context>
         </context-group>
         <note priority="1" from="description">this is for messages like &apos;modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;&apos;</note>
       </trans-unit>
@@ -1082,112 +1075,112 @@
         <source>Confirm tags assignment</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">115</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6619516195038467207" datatype="html">
         <source>This operation will add the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">118</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1894412783609570695" datatype="html">
         <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToAdd)"/> to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">131</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7181166515756808573" datatype="html">
         <source>This operation will remove the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">123</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3819792277998068944" datatype="html">
         <source>This operation will remove the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToRemove)"/> from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2739066218579571288" datatype="html">
         <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToAdd)"/> and remove the tags <x id="PH_1" equiv-text="this._localizeList(changedTags.itemsToRemove)"/> on <x id="PH_2" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">127</context>
+          <context context-type="linenumber">138</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2996713129519325161" datatype="html">
         <source>Confirm correspondent assignment</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">158</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6900893559485781849" datatype="html">
         <source>This operation will assign the correspondent &quot;<x id="PH" equiv-text="correspondent.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">159</context>
+          <context context-type="linenumber">160</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1257522660364398440" datatype="html">
         <source>This operation will remove the correspondent from <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5393409374423140648" datatype="html">
         <source>Confirm document type assignment</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">190</context>
+          <context context-type="linenumber">181</context>
         </context-group>
       </trans-unit>
       <trans-unit id="332180123895325027" datatype="html">
         <source>This operation will assign the document type &quot;<x id="PH" equiv-text="documentType.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">192</context>
+          <context context-type="linenumber">183</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2236642492594872779" datatype="html">
         <source>This operation will remove the document type from <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">194</context>
+          <context context-type="linenumber">185</context>
         </context-group>
       </trans-unit>
       <trans-unit id="749430623564850405" datatype="html">
         <source>Delete confirm</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">219</context>
+          <context context-type="linenumber">200</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4303174930844518780" datatype="html">
         <source>This operation will permanently delete <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">220</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5641451190833696892" datatype="html">
         <source>This operation cannot be undone.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">221</context>
+          <context context-type="linenumber">202</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6734339521247847366" datatype="html">
         <source>Delete document(s)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">223</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8b0609df23817024b3bed12beb9b64fc1009f588" datatype="html">
@@ -1400,15 +1393,15 @@
           <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2691296884221415710" datatype="html">
-        <source>Correspondent</source>
+      <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">16</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5066119607229701477" datatype="html">
-        <source>Document type</source>
+      <trans-unit id="2691296884221415710" datatype="html">
+        <source>Correspondent</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
           <context context-type="linenumber">17</context>
@@ -1421,8 +1414,8 @@
           <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="7517688192215738656" datatype="html">
-        <source>ASN</source>
+      <trans-unit id="5066119607229701477" datatype="html">
+        <source>Document type</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
           <context context-type="linenumber">19</context>
@@ -1544,49 +1537,56 @@
         <source>Create new item</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5324147361912094446" datatype="html">
         <source>Edit item</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">47</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1699589597032579396" datatype="html">
         <source>Could not save element: <x id="PH" equiv-text="error"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">51</context>
         </context-group>
       </trans-unit>
       <trans-unit id="810888510148304696" datatype="html">
         <source>Automatic</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5044611416737085530" datatype="html">
         <source>Do you really want to delete this element?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8371896857609524947" datatype="html">
         <source>Associated documents will not be deleted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7022070615528435141" datatype="html">
         <source>Delete</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5467489005440577210" datatype="html">
+        <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">93</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5851669019930456395" datatype="html">
diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en-us/LC_MESSAGES/django.po
index 9af185626..b3e448058 100644
--- a/src/locale/en-us/LC_MESSAGES/django.po
+++ b/src/locale/en-us/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-02 00:26+0000\n"
+"POT-Creation-Date: 2021-01-06 19:50+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,7 +46,7 @@ msgid "Automatic"
 msgstr ""
 
 #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
-#: paperless_mail/models.py:100
+#: paperless_mail/models.py:111
 msgid "name"
 msgstr ""
 
@@ -338,43 +338,51 @@ msgstr ""
 msgid "filter rules"
 msgstr ""
 
-#: paperless/settings.py:254
+#: paperless/settings.py:268
 msgid "English"
 msgstr ""
 
-#: paperless/settings.py:255
+#: paperless/settings.py:269
 msgid "German"
 msgstr ""
 
+#: paperless/settings.py:270
+msgid "Dutch"
+msgstr ""
+
+#: paperless/settings.py:271
+msgid "French"
+msgstr ""
+
 #: paperless/urls.py:108
 msgid "Paperless-ng administration"
 msgstr ""
 
-#: paperless_mail/admin.py:24
+#: paperless_mail/admin.py:25
 msgid "Filter"
 msgstr ""
 
-#: paperless_mail/admin.py:26
+#: paperless_mail/admin.py:27
 msgid ""
 "Paperless will only process mails that match ALL of the filters given below."
 msgstr ""
 
-#: paperless_mail/admin.py:34
+#: paperless_mail/admin.py:37
 msgid "Actions"
 msgstr ""
 
-#: paperless_mail/admin.py:36
+#: 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 ""
 
-#: paperless_mail/admin.py:43
+#: paperless_mail/admin.py:46
 msgid "Metadata"
 msgstr ""
 
-#: paperless_mail/admin.py:45
+#: 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 "
@@ -439,108 +447,136 @@ msgstr ""
 msgid "mail rules"
 msgstr ""
 
-#: paperless_mail/models.py:69
-msgid "Mark as read, don't process read mails"
+#: paperless_mail/models.py:67
+msgid "Only process attachments."
 msgstr ""
 
 #: paperless_mail/models.py:70
-msgid "Flag the mail, don't process flagged mails"
-msgstr ""
-
-#: paperless_mail/models.py:71
-msgid "Move to specified folder"
-msgstr ""
-
-#: paperless_mail/models.py:72
-msgid "Delete"
-msgstr ""
-
-#: paperless_mail/models.py:79
-msgid "Use subject as title"
+msgid "Process all files, including 'inline' attachments."
 msgstr ""
 
 #: paperless_mail/models.py:80
-msgid "Use attachment filename as title"
+msgid "Mark as read, don't process read mails"
+msgstr ""
+
+#: paperless_mail/models.py:81
+msgid "Flag the mail, don't process flagged mails"
+msgstr ""
+
+#: paperless_mail/models.py:82
+msgid "Move to specified folder"
+msgstr ""
+
+#: paperless_mail/models.py:83
+msgid "Delete"
 msgstr ""
 
 #: paperless_mail/models.py:90
+msgid "Use subject as title"
+msgstr ""
+
+#: paperless_mail/models.py:91
+msgid "Use attachment filename as title"
+msgstr ""
+
+#: paperless_mail/models.py:101
 msgid "Do not assign a correspondent"
 msgstr ""
 
-#: paperless_mail/models.py:92
+#: paperless_mail/models.py:103
 msgid "Use mail address"
 msgstr ""
 
-#: paperless_mail/models.py:94
+#: paperless_mail/models.py:105
 msgid "Use name (or mail address if not available)"
 msgstr ""
 
-#: paperless_mail/models.py:96
+#: paperless_mail/models.py:107
 msgid "Use correspondent selected below"
 msgstr ""
 
-#: paperless_mail/models.py:104
+#: paperless_mail/models.py:115
 msgid "order"
 msgstr ""
 
-#: paperless_mail/models.py:111
+#: paperless_mail/models.py:122
 msgid "account"
 msgstr ""
 
-#: paperless_mail/models.py:115
+#: paperless_mail/models.py:126
 msgid "folder"
 msgstr ""
 
-#: paperless_mail/models.py:119
+#: paperless_mail/models.py:130
 msgid "filter from"
 msgstr ""
 
-#: paperless_mail/models.py:122
+#: paperless_mail/models.py:133
 msgid "filter subject"
 msgstr ""
 
-#: paperless_mail/models.py:125
+#: paperless_mail/models.py:136
 msgid "filter body"
 msgstr ""
 
-#: paperless_mail/models.py:129
-msgid "maximum age"
-msgstr ""
-
-#: paperless_mail/models.py:131
-msgid "Specified in days."
-msgstr ""
-
-#: paperless_mail/models.py:134
-msgid "action"
-msgstr ""
-
 #: paperless_mail/models.py:140
-msgid "action parameter"
+msgid "filter attachment filename"
 msgstr ""
 
 #: paperless_mail/models.py:142
 msgid ""
+"Only consume documents which entirely match this filename if specified. "
+"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
+msgstr ""
+
+#: paperless_mail/models.py:148
+msgid "maximum age"
+msgstr ""
+
+#: paperless_mail/models.py:150
+msgid "Specified in days."
+msgstr ""
+
+#: paperless_mail/models.py:153
+msgid "attachment type"
+msgstr ""
+
+#: paperless_mail/models.py:156
+msgid ""
+"Inline attachments include embedded images, so it's best to combine this "
+"option with a filename filter."
+msgstr ""
+
+#: paperless_mail/models.py:161
+msgid "action"
+msgstr ""
+
+#: paperless_mail/models.py:167
+msgid "action parameter"
+msgstr ""
+
+#: paperless_mail/models.py:169
+msgid ""
 "Additional parameter for the action selected above, i.e., the target folder "
 "of the move to folder action."
 msgstr ""
 
-#: paperless_mail/models.py:148
+#: paperless_mail/models.py:175
 msgid "assign title from"
 msgstr ""
 
-#: paperless_mail/models.py:158
+#: paperless_mail/models.py:185
 msgid "assign this tag"
 msgstr ""
 
-#: paperless_mail/models.py:166
+#: paperless_mail/models.py:193
 msgid "assign this document type"
 msgstr ""
 
-#: paperless_mail/models.py:170
+#: paperless_mail/models.py:197
 msgid "assign correspondent from"
 msgstr ""
 
-#: paperless_mail/models.py:180
+#: paperless_mail/models.py:207
 msgid "assign this correspondent"
 msgstr ""

From 01df596dc795838850144b2d4d2e220d055d809d Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 6 Jan 2021 19:58:38 +0000
Subject: [PATCH 0681/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 266 +++++++++++++++---------------
 1 file changed, 133 insertions(+), 133 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index 98a3b057c..449b7493c 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -6,7 +6,7 @@
         <target>Dokumente</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
@@ -14,7 +14,7 @@
         <target>Ansicht &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; erfolgreich gespeichert.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
@@ -22,7 +22,7 @@
         <target>Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; erfolgreich erstellt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
@@ -94,7 +94,7 @@
         <target>{VAR_PLURAL, plural, =1 { <x id="INTERPOLATION"/> von 1 Dokumente ausgewählt} other {<x id="INTERPOLATION"/> von <x id="INTERPOLATION_1"/> Dokumente ausgewählt}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9">
@@ -102,7 +102,15 @@
         <target>{VAR_PLURAL, plural, =1 {Ein Dokument} other {<x id="INTERPOLATION"/> Dokumente}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb91083b44e3f77dd68de773ceab467ca3d57507">
+        <source>(filtered)</source>
+        <target>(gefiltert)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
@@ -110,7 +118,7 @@
         <target>ASN</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">100</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
@@ -118,7 +126,7 @@
         <target>Korrespondent</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">101</context>
+          <context context-type="linenumber">113</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
@@ -126,7 +134,7 @@
         <target>Titel</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">102</context>
+          <context context-type="linenumber">119</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
@@ -134,7 +142,7 @@
         <target>Dokumenttyp</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
@@ -142,7 +150,7 @@
         <target>Erstellt</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="linenumber">131</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
@@ -150,7 +158,7 @@
         <target>Hinzugefügt</target>
         <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">137</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9021887951960049161">
@@ -158,7 +166,7 @@
         <target>Löschen bestätigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
@@ -166,7 +174,7 @@
         <target>Möchten Sie das Dokument &quot;<x equiv-text="this.document.title" id="PH"/>&quot; wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">162</context>
+          <context context-type="linenumber">187</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6691075929777935948">
@@ -174,7 +182,7 @@
         <target>Die Dateien dieses Dokuments werden permanent gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">163</context>
+          <context context-type="linenumber">188</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="719892092227206532">
@@ -182,7 +190,15 @@
         <target>Dokument löschen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">165</context>
+          <context context-type="linenumber">190</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1844801255494293730">
+        <source>Error deleting document: <x equiv-text="JSON.stringify(error)" id="PH"/></source>
+        <target>Fehler beim Löschen des Dokuments: <x equiv-text="JSON.stringify(error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">197</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -230,7 +246,7 @@
         <target>Inhalt</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="f721a500a68c357e8f2a01e60510f6a01e4ba529">
@@ -238,7 +254,7 @@
         <target>Metadaten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">81</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7">
@@ -246,7 +262,7 @@
         <target>Verwerfen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="52c9a103b812f258bcddc3d90a6e3f46871d25fe">
@@ -254,7 +270,7 @@
         <target>Speichern</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">136</context>
+          <context context-type="linenumber">132</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3">
@@ -286,7 +302,7 @@
         <target>Archiv-Seriennummer</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="30eebc2dd656dbcb259d8d5286d244ee397d63bd">
@@ -294,15 +310,7 @@
         <target>Erstellt am</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">65</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
-        <source>Tags</source>
-        <target>Tags</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720">
@@ -310,7 +318,7 @@
         <target>Geändert am</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269">
@@ -318,7 +326,7 @@
         <target>Hinzugefügt am</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3">
@@ -326,7 +334,7 @@
         <target>Media-Dateiname</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">99</context>
+          <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8">
@@ -334,7 +342,7 @@
         <target>MD5-Prüfsumme Original</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="e92ca184ea785769fb26138fc25ee9fa06fff6e5">
@@ -342,7 +350,7 @@
         <target>Dateigröße Original</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">103</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd">
@@ -350,7 +358,7 @@
         <target>MIME-Typ Original</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="edbf54e4117606b5dd87aaea3c14b21ebf398020">
@@ -358,7 +366,7 @@
         <target>MD5-Prüfsumme Archiv</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">115</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="e6bf12eadecbfd80016eca15fa78651c6ca90c64">
@@ -366,7 +374,7 @@
         <target>Dateigröße Archiv</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">119</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f">
@@ -374,7 +382,7 @@
         <target>Original-Metadaten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">121</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7174dcea4a3d0b743e7e4a78747e902230727f67">
@@ -382,7 +390,7 @@
         <target>Metadaten des archivierten Dokuments</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">122</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3fb9f1a31c3798173b2fea72638732c783b152fe">
@@ -390,7 +398,7 @@
         <target>Speichern &amp; weiter</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">135</context>
+          <context context-type="linenumber">131</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8765497970646365998">
@@ -422,7 +430,15 @@
         <target>Möchten Sie das Tag &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
+        <source>Tags</source>
+        <target>Tags</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="70a67e04629f6d412db0a12d51820b480788d795">
@@ -494,7 +510,7 @@
         <target>Möchten Sie den Dokumenttyp &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8">
@@ -633,6 +649,14 @@
           <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="8ee474504043fa89821d626e4f3413240fa91b53">
+        <source>Enable dark mode</source>
+        <target>Dunklen Modus aktivieren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
         <source>Appears on</source>
         <target>Erscheint auf</target>
@@ -678,7 +702,7 @@
         <target>Möchten Sie den Korrespondenten &quot;<x equiv-text="object.name" id="PH"/>&quot; wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c3f3334de899327bf3ec8999236e10798ff76e72">
@@ -713,6 +737,14 @@
           <context context-type="linenumber">29</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
+        <source>Cancel</source>
+        <target>Abbrechen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="6457471243969293847">
         <source>Create new correspondent</source>
         <target>Neuen Korrespondenten erstellen</target>
@@ -729,14 +761,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="3025930461519142465">
-        <source>Could not save correspondent: <x equiv-text="error" id="PH"/></source>
-        <target>Konnte Korrespondent nicht speichern: <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="3d5caa52b0a51bfd2757215f7614183554d740f0">
         <source>Matching algorithm</source>
         <target>Zuweisungsalgorithmus</target>
@@ -753,14 +777,6 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="a1923dd970db4f74b4417b80b4a14e250fd116ff">
-        <source>Auto matching does not require you to fill in this field.</source>
-        <target>Für Automatische Zuweisung muss dieses Feld nicht ausgefüllt werden.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
         <source>Case insensitive</source>
         <target>Groß-/Kleinschreibung irrelevant</target>
@@ -769,22 +785,6 @@
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="85e19678590a8b3ac1dff9d69c7a7610d1742e5a">
-        <source>Auto matching ignores this option.</source>
-        <target>Automatische Zuweisung beachtet diese Einstellung nicht.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
-        <source>Cancel</source>
-        <target>Abbrechen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="9153094873118985366">
         <source>Create new tag</source>
         <target>Neues Tag erstellen</target>
@@ -801,14 +801,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="2861521377141790537">
-        <source>Could not save tag: <x equiv-text="error" id="PH"/></source>
-        <target>Konnte Tag nicht speichern: <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42">
         <source>Inbox tag</source>
         <target>Posteingangs-Tag</target>
@@ -841,14 +833,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5647767513381010218">
-        <source>Could not save document type: <x equiv-text="error" id="PH"/></source>
-        <target>Konnte Dokumenttyp nicht speichern: <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="49c9ede51100b454f7841b24cd02355c6622bf44">
         <source>Search results</source>
         <target>Suchergebnisse</target>
@@ -935,7 +919,7 @@
         <target>Administration</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">147</context>
+          <context context-type="linenumber">154</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
@@ -943,7 +927,7 @@
         <target>Weiteres</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">153</context>
+          <context context-type="linenumber">160</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
@@ -951,7 +935,7 @@
         <target>Dokumentation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
@@ -959,7 +943,7 @@
         <target>GitHub</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">167</context>
+          <context context-type="linenumber">174</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
@@ -1066,8 +1050,8 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="2f33515a935c36763660e8420940b8a7e11fb1f4">
-        <source>Clear all filters</source>
+      <trans-unit datatype="html" id="2d9d55f1b70142ff4597ba32179d16888fd9c6b2">
+        <source>Reset filters</source>
         <target>Filter zurücksetzen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
@@ -1195,12 +1179,20 @@
           <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="7985804062689412812">
+        <source>Error executing bulk operation: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Fehler beim Ausführung der Massenverarbeitung: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">73</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
         <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
         <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; und &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">114</context>
         </context-group>
         <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
       </trans-unit>
@@ -1209,7 +1201,7 @@
         <target>&quot;<x equiv-text="i.name" id="PH"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="760986369763309193">
@@ -1217,7 +1209,7 @@
         <target>, </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">116</context>
         </context-group>
         <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
       </trans-unit>
@@ -1226,7 +1218,7 @@
         <target><x equiv-text="list" id="PH"/> und &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">117</context>
         </context-group>
         <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
       </trans-unit>
@@ -1235,7 +1227,7 @@
         <target>Tag-Zuweisung bestätigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">115</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6619516195038467207">
@@ -1243,7 +1235,7 @@
         <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten das Tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; hinzufügen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">118</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1894412783609570695">
@@ -1251,7 +1243,7 @@
         <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten die Tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> hinzufügen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">131</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7181166515756808573">
@@ -1259,7 +1251,7 @@
         <target>Diese Aktion wird das Tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; von <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">123</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3819792277998068944">
@@ -1267,7 +1259,7 @@
         <target>Diese Aktion wird die Tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> von <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2739066218579571288">
@@ -1275,7 +1267,7 @@
         <target>Diese Aktion wird die Tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> den <x equiv-text="this.list.selected.size" id="PH_2"/> ausgewählten Dokumenten hinzufügen und die Tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">127</context>
+          <context context-type="linenumber">138</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2996713129519325161">
@@ -1283,7 +1275,7 @@
         <target>Korrespondent-Zuweisung bestätigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">158</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6900893559485781849">
@@ -1291,7 +1283,7 @@
         <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten den Korrespondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; zuweisen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">159</context>
+          <context context-type="linenumber">160</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1257522660364398440">
@@ -1299,7 +1291,7 @@
         <target>Diese Aktion wird bei <x equiv-text="this.list.selected.size" id="PH"/> ausgewählten Dokumenten den Korrespondent entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5393409374423140648">
@@ -1307,7 +1299,7 @@
         <target>Dokumenttyp-Zuweisung bestätigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">190</context>
+          <context context-type="linenumber">181</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="332180123895325027">
@@ -1315,7 +1307,7 @@
         <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten den Dokumenttyp &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; zuweisen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">192</context>
+          <context context-type="linenumber">183</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2236642492594872779">
@@ -1323,7 +1315,7 @@
         <target>Diese Aktion wird bei <x equiv-text="this.list.selected.size" id="PH"/> ausgewählten Dokumenten den Dokumenttyp entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">194</context>
+          <context context-type="linenumber">185</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="749430623564850405">
@@ -1331,7 +1323,7 @@
         <target>Löschen bestätigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">219</context>
+          <context context-type="linenumber">200</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4303174930844518780">
@@ -1339,7 +1331,7 @@
         <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH"/> ausgewählte Dokumente unwiderruflich löschen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">220</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5641451190833696892">
@@ -1347,7 +1339,7 @@
         <target>Diese Aktion kann nicht rückgängig gemacht werden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">221</context>
+          <context context-type="linenumber">202</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6734339521247847366">
@@ -1355,7 +1347,7 @@
         <target>Dokument(e) löschen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">223</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
@@ -1598,17 +1590,17 @@
           <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="2691296884221415710">
-        <source>Correspondent</source>
-        <target>Korrespondent</target>
+      <trans-unit datatype="html" id="7517688192215738656">
+        <source>ASN</source>
+        <target>ASN</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5066119607229701477">
-        <source>Document type</source>
-        <target>Dokumenttyp</target>
+      <trans-unit datatype="html" id="2691296884221415710">
+        <source>Correspondent</source>
+        <target>Korrespondent</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
           <context context-type="linenumber">17</context>
@@ -1622,9 +1614,9 @@
           <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="7517688192215738656">
-        <source>ASN</source>
-        <target>ASN</target>
+      <trans-unit datatype="html" id="5066119607229701477">
+        <source>Document type</source>
+        <target>Dokumenttyp</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
           <context context-type="linenumber">19</context>
@@ -1763,7 +1755,7 @@
         <target>Neues Element erstellen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5324147361912094446">
@@ -1771,7 +1763,7 @@
         <target>Element bearbeiten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">47</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1699589597032579396">
@@ -1779,7 +1771,7 @@
         <target>Konnte Element nicht speichern: <x equiv-text="error" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">51</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="810888510148304696">
@@ -1787,7 +1779,7 @@
         <target>Automatisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5044611416737085530">
@@ -1795,7 +1787,7 @@
         <target>Möchten Sie dieses Element wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8371896857609524947">
@@ -1803,7 +1795,7 @@
         <target>Assoziierte Dokumente werden nicht gelöscht.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7022070615528435141">
@@ -1811,7 +1803,15 @@
         <target>Löschen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5467489005440577210">
+        <source>Error while deleting element: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Fehler beim Löschen des Elements: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">93</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5851669019930456395">

From a40448a35045545ad7ea2670c1805ace47102a99 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:04:15 +0000
Subject: [PATCH 0682/1300] Apply translations in de

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'de' language.
---
 src/locale/de/LC_MESSAGES/django.po | 113 +++++++++++++++++++---------
 1 file changed, 77 insertions(+), 36 deletions(-)

diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po
index 76cc28bec..dde278835 100644
--- a/src/locale/de/LC_MESSAGES/django.po
+++ b/src/locale/de/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-02 00:26+0000\n"
+"POT-Creation-Date: 2021-01-06 19:50+0000\n"
 "PO-Revision-Date: 2020-12-30 19:27+0000\n"
 "Last-Translator: Jonas Winkler <dev@jpwinkler.de>, 2021\n"
 "Language-Team: German (https://www.transifex.com/paperless/teams/115905/de/)\n"
@@ -50,7 +50,7 @@ msgid "Automatic"
 msgstr "Automatisch"
 
 #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
-#: paperless_mail/models.py:100
+#: paperless_mail/models.py:111
 msgid "name"
 msgstr "Name"
 
@@ -346,34 +346,42 @@ msgstr "Filterregel"
 msgid "filter rules"
 msgstr "Filterregeln"
 
-#: paperless/settings.py:254
+#: paperless/settings.py:268
 msgid "English"
 msgstr "Englisch"
 
-#: paperless/settings.py:255
+#: paperless/settings.py:269
 msgid "German"
 msgstr "Deutsch"
 
+#: paperless/settings.py:270
+msgid "Dutch"
+msgstr "Niederländisch"
+
+#: paperless/settings.py:271
+msgid "French"
+msgstr "Französisch"
+
 #: paperless/urls.py:108
 msgid "Paperless-ng administration"
 msgstr "Paperless-ng Administration"
 
-#: paperless_mail/admin.py:24
+#: paperless_mail/admin.py:25
 msgid "Filter"
 msgstr "Filter"
 
-#: paperless_mail/admin.py:26
+#: 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."
 
-#: paperless_mail/admin.py:34
+#: paperless_mail/admin.py:37
 msgid "Actions"
 msgstr "Aktionen"
 
-#: paperless_mail/admin.py:36
+#: 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"
@@ -383,11 +391,11 @@ msgstr ""
 "auf E-Mails angewendet, aus denen Anhänge verarbeitet wurden. E-Mails ohne "
 "Anhänge werden vollständig ignoriert."
 
-#: paperless_mail/admin.py:43
+#: paperless_mail/admin.py:46
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: paperless_mail/admin.py:45
+#: 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 "
@@ -458,87 +466,120 @@ msgstr "E-Mail-Regel"
 msgid "mail rules"
 msgstr "E-Mail-Regeln"
 
-#: paperless_mail/models.py:69
+#: paperless_mail/models.py:67
+msgid "Only process attachments."
+msgstr "Nur Anhänge verarbeiten."
+
+#: paperless_mail/models.py:70
+msgid "Process all files, including 'inline' attachments."
+msgstr "Alle Dateien verarbeiten, auch 'inline'-Anhänge."
+
+#: paperless_mail/models.py:80
 msgid "Mark as read, don't process read mails"
 msgstr "Als gelesen markieren, gelesene E-Mails nicht verarbeiten"
 
-#: paperless_mail/models.py:70
+#: paperless_mail/models.py:81
 msgid "Flag the mail, don't process flagged mails"
 msgstr "Als wichtig markieren, markierte E-Mails nicht verarbeiten"
 
-#: paperless_mail/models.py:71
+#: paperless_mail/models.py:82
 msgid "Move to specified folder"
 msgstr "In angegebenen Ordner verschieben"
 
-#: paperless_mail/models.py:72
+#: paperless_mail/models.py:83
 msgid "Delete"
 msgstr "Löschen"
 
-#: paperless_mail/models.py:79
+#: paperless_mail/models.py:90
 msgid "Use subject as title"
 msgstr "Betreff als Titel verwenden"
 
-#: paperless_mail/models.py:80
+#: paperless_mail/models.py:91
 msgid "Use attachment filename as title"
 msgstr "Dateiname des Anhangs als Titel verwenden"
 
-#: paperless_mail/models.py:90
+#: paperless_mail/models.py:101
 msgid "Do not assign a correspondent"
 msgstr "Keinen Korrespondenten zuweisen"
 
-#: paperless_mail/models.py:92
+#: paperless_mail/models.py:103
 msgid "Use mail address"
 msgstr "E-Mail-Adresse benutzen"
 
-#: paperless_mail/models.py:94
+#: paperless_mail/models.py:105
 msgid "Use name (or mail address if not available)"
 msgstr "Absendername benutzen (oder E-Mail-Adressen, wenn nicht verfügbar)"
 
-#: paperless_mail/models.py:96
+#: paperless_mail/models.py:107
 msgid "Use correspondent selected below"
 msgstr "Nachfolgend ausgewählten Korrespondent verwenden"
 
-#: paperless_mail/models.py:104
+#: paperless_mail/models.py:115
 msgid "order"
 msgstr "Reihenfolge"
 
-#: paperless_mail/models.py:111
+#: paperless_mail/models.py:122
 msgid "account"
 msgstr "Konto"
 
-#: paperless_mail/models.py:115
+#: paperless_mail/models.py:126
 msgid "folder"
 msgstr "Ordner"
 
-#: paperless_mail/models.py:119
+#: paperless_mail/models.py:130
 msgid "filter from"
 msgstr "Absender filtern"
 
-#: paperless_mail/models.py:122
+#: paperless_mail/models.py:133
 msgid "filter subject"
 msgstr "Betreff filtern"
 
-#: paperless_mail/models.py:125
+#: paperless_mail/models.py:136
 msgid "filter body"
 msgstr "Nachrichteninhalt filtern"
 
-#: paperless_mail/models.py:129
+#: paperless_mail/models.py:140
+msgid "filter attachment filename"
+msgstr "Anhang-Dateiname filtern"
+
+#: paperless_mail/models.py:142
+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:148
 msgid "maximum age"
 msgstr "Maximales Alter"
 
-#: paperless_mail/models.py:131
+#: paperless_mail/models.py:150
 msgid "Specified in days."
 msgstr "Angegeben in Tagen."
 
-#: paperless_mail/models.py:134
+#: paperless_mail/models.py:153
+msgid "attachment type"
+msgstr "Dateianhangs-Typ"
+
+#: paperless_mail/models.py:156
+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:161
 msgid "action"
 msgstr "Aktion"
 
-#: paperless_mail/models.py:140
+#: paperless_mail/models.py:167
 msgid "action parameter"
 msgstr "Parameter für Aktion"
 
-#: paperless_mail/models.py:142
+#: paperless_mail/models.py:169
 msgid ""
 "Additional parameter for the action selected above, i.e., the target folder "
 "of the move to folder action."
@@ -546,22 +587,22 @@ 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:148
+#: paperless_mail/models.py:175
 msgid "assign title from"
 msgstr "Titel zuweisen von"
 
-#: paperless_mail/models.py:158
+#: paperless_mail/models.py:185
 msgid "assign this tag"
 msgstr "Dieses Tag zuweisen"
 
-#: paperless_mail/models.py:166
+#: paperless_mail/models.py:193
 msgid "assign this document type"
 msgstr "Diesen Dokumenttyp zuweisen"
 
-#: paperless_mail/models.py:170
+#: paperless_mail/models.py:197
 msgid "assign correspondent from"
 msgstr "Korrespondent zuweisen von"
 
-#: paperless_mail/models.py:180
+#: paperless_mail/models.py:207
 msgid "assign this correspondent"
 msgstr "Diesen Korrespondent zuweisen"

From cad2f77490d1e2007a82130c30527475076324e6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 6 Jan 2021 21:09:28 +0100
Subject: [PATCH 0683/1300] update dependencies

---
 Pipfile      | 2 +-
 Pipfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Pipfile b/Pipfile
index 965220b64..0c182d5b6 100644
--- a/Pipfile
+++ b/Pipfile
@@ -40,7 +40,7 @@ whitenoise = "~=5.2.0"
 watchdog = "*"
 whoosh="~=2.7.4"
 inotifyrecursive = "~=0.3.4"
-ocrmypdf = "~=11.3.4"
+ocrmypdf = "~=11.4.5"
 tqdm = "*"
 tika = "*"
 
diff --git a/Pipfile.lock b/Pipfile.lock
index 58a8edb6c..b36e5e496 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "ddc3215bed35e50b796a8a48da053f673e4a9a3be0ae35b4d63f4757c4693aab"
+            "sha256": "c35d84fd7f4f1c7d599039712362935e7c41a226b0ab3d83d8c1c2fb2ad0962a"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -380,11 +380,11 @@
         },
         "ocrmypdf": {
             "hashes": [
-                "sha256:91e7394172cedb3be801a229dbd3d308fb5ae80cbc3a77879fa7954beea407b1",
-                "sha256:e550b8e884150accab7ea41f4a576b5844594cb5cbd6ed514fbf1206720343ad"
+                "sha256:416a9c4321bfc844f250694b8c68ebb538f60609bbc8686bd9f84a13c5127d68",
+                "sha256:f45fc7e844e6026d6080a623a2936be120fc077d99aaa599df022acf35fb31e6"
             ],
             "index": "pypi",
-            "version": "==11.3.4"
+            "version": "==11.4.5"
         },
         "pathvalidate": {
             "hashes": [

From 96da61f4e4421c9a5eb96f5670f030fc55c0d7fd Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:48:03 +0100
Subject: [PATCH 0684/1300] Trying to use pyenv action step

---
 .github/workflows/docker-publish.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index f13b7399e..490a5edec 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,13 +10,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.6,3.7,3.8]
+        python: [3.6,3.7,3.8]
     steps:
       - uses: actions/checkout@v2
       - name: Install python version
         uses: gabrielfalcao/pyenv-action@v5
         with:
-          default: "${{ matrix.python-version }}"
+          default: "${{ matrix.python }}"
+          command: pip install -U pip  # upgrade pip after installing python
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From e761cc76faad59f5a3f8cb1134cc5d018f35d426 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:50:11 +0100
Subject: [PATCH 0685/1300] List python versions differently so the pyenv
 action might light it better

---
 .github/workflows/docker-publish.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 490a5edec..6507a6203 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,7 +10,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python: [3.6,3.7,3.8]
+        python: 
+          - 3.6
+          - 3.7
+          - 3.8
     steps:
       - uses: actions/checkout@v2
       - name: Install python version

From b7ff94900fcf9563a57259cccbd595492ac09493 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:52:40 +0100
Subject: [PATCH 0686/1300] Specify exact version

---
 .github/workflows/docker-publish.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 6507a6203..203133335 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -11,9 +11,9 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python: 
-          - 3.6
-          - 3.7
-          - 3.8
+          - 3.6.8
+          - 3.7.5
+          - 3.8.2
     steps:
       - uses: actions/checkout@v2
       - name: Install python version

From e783494022527f52d20a216d46b1d8a0a53fe5f6 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 6 Jan 2021 21:53:12 +0000
Subject: [PATCH 0687/1300] Translate /src-ui/messages.xlf in fr

translation completed for the source file '/src-ui/messages.xlf'
on the 'fr' language.
---
 src-ui/src/locale/messages.fr.xlf | 270 +++++++++++++++---------------
 1 file changed, 135 insertions(+), 135 deletions(-)

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
index 994db6c1d..5922fade2 100644
--- a/src-ui/src/locale/messages.fr.xlf
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -6,7 +6,7 @@
         <target>Documents</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
@@ -14,7 +14,7 @@
         <target>Vue &amp;quot;<x equiv-text="this.list.savedView.name" id="PH"/>&amp;quot; enregistrée avec succès.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
@@ -22,7 +22,7 @@
         <target>Vue &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; créée avec succès.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
@@ -91,10 +91,10 @@
       </trans-unit>
       <trans-unit datatype="html" id="439e7cc3c1ecefded167ed4d37f7d22dad6a9159">
         <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source>
-        <target>{VAR_PLURAL, plural, =1 {<x id="INTERPOLATION"/> document sélectionné sur 1} other {<x id="INTERPOLATION"/> document(s) sélectionné(s) sur <x id="INTERPOLATION_1"/>}}</target>
+        <target>{VAR_PLURAL, plural, =1 {<x id="INTERPOLATION"/> document sélectionné sur 1} other {<x id="INTERPOLATION"/> documents sélectionnés sur <x id="INTERPOLATION_1"/>}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9">
@@ -102,7 +102,15 @@
         <target>{VAR_PLURAL, plural, =1 {Un document} other {<x id="INTERPOLATION"/> documents}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb91083b44e3f77dd68de773ceab467ca3d57507">
+        <source>(filtered)</source>
+        <target>(filtré)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
@@ -110,7 +118,7 @@
         <target>NSA</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">100</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
@@ -118,7 +126,7 @@
         <target>Correspondant</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">101</context>
+          <context context-type="linenumber">113</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
@@ -126,7 +134,7 @@
         <target>Titre</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">102</context>
+          <context context-type="linenumber">119</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
@@ -134,7 +142,7 @@
         <target>Type de document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
@@ -142,7 +150,7 @@
         <target>Date de création</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="linenumber">131</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
@@ -150,7 +158,7 @@
         <target>Date d'ajout</target>
         <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">137</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9021887951960049161">
@@ -158,7 +166,7 @@
         <target>Confirmer la suppression</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
@@ -166,7 +174,7 @@
         <target>Voulez-vous vraiment supprimer le document &amp;quot;<x equiv-text="this.document.title" id="PH"/>&amp;quot; ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">162</context>
+          <context context-type="linenumber">187</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6691075929777935948">
@@ -174,7 +182,7 @@
         <target>Les fichiers liés à ce document seront supprimés définitivement. Cette action est irréversible.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">163</context>
+          <context context-type="linenumber">188</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="719892092227206532">
@@ -182,7 +190,15 @@
         <target>Supprimer le document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">165</context>
+          <context context-type="linenumber">190</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1844801255494293730">
+        <source>Error deleting document: <x equiv-text="JSON.stringify(error)" id="PH"/></source>
+        <target>Une erreur s'est produite lors de la suppression du document : <x equiv-text="JSON.stringify(error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">197</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -230,7 +246,7 @@
         <target>Contenu</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="f721a500a68c357e8f2a01e60510f6a01e4ba529">
@@ -238,7 +254,7 @@
         <target>Métadonnées</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">81</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7">
@@ -246,7 +262,7 @@
         <target>Abandonner</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="52c9a103b812f258bcddc3d90a6e3f46871d25fe">
@@ -254,7 +270,7 @@
         <target>Enregistrer</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">136</context>
+          <context context-type="linenumber">132</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3">
@@ -286,7 +302,7 @@
         <target>Numéro de série de l'archive</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="30eebc2dd656dbcb259d8d5286d244ee397d63bd">
@@ -294,15 +310,7 @@
         <target>Date de création</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">65</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
-        <source>Tags</source>
-        <target>Étiquettes</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720">
@@ -310,7 +318,7 @@
         <target>Modifié le</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269">
@@ -318,7 +326,7 @@
         <target>Date d'ajout</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3">
@@ -326,7 +334,7 @@
         <target>Nom de fichier du média</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">99</context>
+          <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8">
@@ -334,7 +342,7 @@
         <target>Somme de contrôle MD5 de l'original</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="e92ca184ea785769fb26138fc25ee9fa06fff6e5">
@@ -342,7 +350,7 @@
         <target>Taille de fichier de l'original</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">103</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd">
@@ -350,7 +358,7 @@
         <target>Type mime de l'original</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="edbf54e4117606b5dd87aaea3c14b21ebf398020">
@@ -358,7 +366,7 @@
         <target>Somme de contrôle MD5 de l'archive</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">115</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="e6bf12eadecbfd80016eca15fa78651c6ca90c64">
@@ -366,7 +374,7 @@
         <target>Taille de fichier de l'archive</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">119</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f">
@@ -374,7 +382,7 @@
         <target>Métadonnées du document original</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">121</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7174dcea4a3d0b743e7e4a78747e902230727f67">
@@ -382,7 +390,7 @@
         <target>Métadonnées du document archivé</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">122</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3fb9f1a31c3798173b2fea72638732c783b152fe">
@@ -390,7 +398,7 @@
         <target>Enregistrer &amp; suivant</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">135</context>
+          <context context-type="linenumber">131</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8765497970646365998">
@@ -422,7 +430,15 @@
         <target>Voulez-vous vraiment supprimer l'étiquette &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot; ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
+        <source>Tags</source>
+        <target>Étiquettes</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="70a67e04629f6d412db0a12d51820b480788d795">
@@ -494,7 +510,7 @@
         <target>Voulez-vous vraiment supprimer le type de document &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot; ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8">
@@ -633,6 +649,14 @@
           <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="8ee474504043fa89821d626e4f3413240fa91b53">
+        <source>Enable dark mode</source>
+        <target>Activer le mode sombre</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
         <source>Appears on</source>
         <target>Apparaît sur</target>
@@ -678,7 +702,7 @@
         <target>Voulez-vous vraiment supprimer le correspondant &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot; ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c3f3334de899327bf3ec8999236e10798ff76e72">
@@ -713,6 +737,14 @@
           <context context-type="linenumber">29</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
+        <source>Cancel</source>
+        <target>Annuler</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="6457471243969293847">
         <source>Create new correspondent</source>
         <target>Créer un nouveau correspondant</target>
@@ -729,14 +761,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="3025930461519142465">
-        <source>Could not save correspondent: <x equiv-text="error" id="PH"/></source>
-        <target>Impossible d'enregistrer le correspondant : <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="3d5caa52b0a51bfd2757215f7614183554d740f0">
         <source>Matching algorithm</source>
         <target>Algorithme de rapprochement</target>
@@ -753,14 +777,6 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="a1923dd970db4f74b4417b80b4a14e250fd116ff">
-        <source>Auto matching does not require you to fill in this field.</source>
-        <target>Le rapprochement automatique ne nécessite pas que vous remplissiez ce champ.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
         <source>Case insensitive</source>
         <target>Insensible à la casse</target>
@@ -769,22 +785,6 @@
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="85e19678590a8b3ac1dff9d69c7a7610d1742e5a">
-        <source>Auto matching ignores this option.</source>
-        <target>Le rapprochement automatique ne tient pas compte de cette option.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
-        <source>Cancel</source>
-        <target>Annuler</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="9153094873118985366">
         <source>Create new tag</source>
         <target>Créer une nouvelle étiquette</target>
@@ -801,14 +801,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="2861521377141790537">
-        <source>Could not save tag: <x equiv-text="error" id="PH"/></source>
-        <target>Impossible d'enregistrer l'étiquette : <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42">
         <source>Inbox tag</source>
         <target>Étiquette de boîte de réception</target>
@@ -841,14 +833,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5647767513381010218">
-        <source>Could not save document type: <x equiv-text="error" id="PH"/></source>
-        <target>Impossible d'enregistrer le type de document : <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="49c9ede51100b454f7841b24cd02355c6622bf44">
         <source>Search results</source>
         <target>Résultats de la recherche</target>
@@ -935,7 +919,7 @@
         <target>Administration</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">147</context>
+          <context context-type="linenumber">154</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
@@ -943,7 +927,7 @@
         <target>Divers</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">153</context>
+          <context context-type="linenumber">160</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
@@ -951,7 +935,7 @@
         <target>Documentation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
@@ -959,7 +943,7 @@
         <target>GitHub</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">167</context>
+          <context context-type="linenumber">174</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
@@ -1066,9 +1050,9 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="2f33515a935c36763660e8420940b8a7e11fb1f4">
-        <source>Clear all filters</source>
-        <target>Réinitialiser tous les filtres</target>
+      <trans-unit datatype="html" id="2d9d55f1b70142ff4597ba32179d16888fd9c6b2">
+        <source>Reset filters</source>
+        <target>Réinitialiser les filtres</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
           <context context-type="linenumber">47</context>
@@ -1195,12 +1179,20 @@
           <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="7985804062689412812">
+        <source>Error executing bulk operation: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Une erreur s'est produite lors de l'exécution de l'opération de masse : <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">73</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
         <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
         <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot; et &amp;quot;<x equiv-text="items[1].name" id="PH_1"/>&amp;quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">114</context>
         </context-group>
         <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
       </trans-unit>
@@ -1209,7 +1201,7 @@
         <target>&amp;quot;<x equiv-text="i.name" id="PH"/>&amp;quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="760986369763309193">
@@ -1217,7 +1209,7 @@
         <target>, </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">116</context>
         </context-group>
         <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
       </trans-unit>
@@ -1226,7 +1218,7 @@
         <target><x equiv-text="list" id="PH"/> et &amp;quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&amp;quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">117</context>
         </context-group>
         <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
       </trans-unit>
@@ -1235,7 +1227,7 @@
         <target>Confirmer l'affectation des étiquettes</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">115</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6619516195038467207">
@@ -1243,7 +1235,7 @@
         <target>Cette action affectera l'étiquette &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">118</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1894412783609570695">
@@ -1251,7 +1243,7 @@
         <target>Cette action affectera les étiquettes <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">131</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7181166515756808573">
@@ -1259,7 +1251,7 @@
         <target>Cette action supprimera l'étiquette &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; de(s) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">123</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3819792277998068944">
@@ -1267,7 +1259,7 @@
         <target>Cette action supprimera les étiquettes <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> de(s) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2739066218579571288">
@@ -1275,7 +1267,7 @@
         <target>Cette action affectera les étiquettes <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> et supprimera les étiquettes <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> de(s) <x equiv-text="this.list.selected.size" id="PH_2"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">127</context>
+          <context context-type="linenumber">138</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2996713129519325161">
@@ -1283,7 +1275,7 @@
         <target>Confirmer l'affectation du correspondant</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">158</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6900893559485781849">
@@ -1291,7 +1283,7 @@
         <target>Cette action affectera le correspondant &amp;quot;<x equiv-text="correspondent.name" id="PH"/>&amp;quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/>document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">159</context>
+          <context context-type="linenumber">160</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1257522660364398440">
@@ -1299,7 +1291,7 @@
         <target>Cette action supprimera le correspondant de(s) <x equiv-text="this.list.selected.size" id="PH"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5393409374423140648">
@@ -1307,7 +1299,7 @@
         <target>Confirmer l'affectation du type de document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">190</context>
+          <context context-type="linenumber">181</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="332180123895325027">
@@ -1315,7 +1307,7 @@
         <target>Cette action affectera le type de document &amp;quot;<x equiv-text="documentType.name" id="PH"/>&amp;quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">192</context>
+          <context context-type="linenumber">183</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2236642492594872779">
@@ -1323,7 +1315,7 @@
         <target>Cette action supprimera le type de document de(s) <x equiv-text="this.list.selected.size" id="PH"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">194</context>
+          <context context-type="linenumber">185</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="749430623564850405">
@@ -1331,7 +1323,7 @@
         <target>Confirmer la suppression</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">219</context>
+          <context context-type="linenumber">200</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4303174930844518780">
@@ -1339,7 +1331,7 @@
         <target>Cette action supprimera définitivement <x equiv-text="this.list.selected.size" id="PH"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">220</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5641451190833696892">
@@ -1347,7 +1339,7 @@
         <target>Cette action est irréversible.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">221</context>
+          <context context-type="linenumber">202</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6734339521247847366">
@@ -1355,7 +1347,7 @@
         <target>Supprimer le(s) document(s)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">223</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
@@ -1598,17 +1590,17 @@
           <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="2691296884221415710">
-        <source>Correspondent</source>
-        <target>Correspondant</target>
+      <trans-unit datatype="html" id="7517688192215738656">
+        <source>ASN</source>
+        <target>NSA</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5066119607229701477">
-        <source>Document type</source>
-        <target>Type de document</target>
+      <trans-unit datatype="html" id="2691296884221415710">
+        <source>Correspondent</source>
+        <target>Correspondant</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
           <context context-type="linenumber">17</context>
@@ -1622,9 +1614,9 @@
           <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="7517688192215738656">
-        <source>ASN</source>
-        <target>NSA</target>
+      <trans-unit datatype="html" id="5066119607229701477">
+        <source>Document type</source>
+        <target>Type de document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
           <context context-type="linenumber">19</context>
@@ -1763,7 +1755,7 @@
         <target>Créer un nouvel élément</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5324147361912094446">
@@ -1771,7 +1763,7 @@
         <target>Éditer l'élément</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">47</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1699589597032579396">
@@ -1779,7 +1771,7 @@
         <target>Impossible d'enregistrer l'élément : <x equiv-text="error" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">51</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="810888510148304696">
@@ -1787,7 +1779,7 @@
         <target>Automatique</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5044611416737085530">
@@ -1795,7 +1787,7 @@
         <target>Voulez-vous vraiment supprimer cet élément ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8371896857609524947">
@@ -1803,7 +1795,7 @@
         <target>Les documents associés ne seront pas supprimés.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7022070615528435141">
@@ -1811,7 +1803,15 @@
         <target>Supprimer</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5467489005440577210">
+        <source>Error while deleting element: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Une erreur s'est produite lors de la suppression de l'élément : <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">93</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5851669019930456395">

From 5b4a3e4288792a250ab8b809352a901d4d2eb34e Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:53:32 +0100
Subject: [PATCH 0688/1300] Remove comment

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 203133335..b0dc46ba5 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -20,7 +20,7 @@ jobs:
         uses: gabrielfalcao/pyenv-action@v5
         with:
           default: "${{ matrix.python }}"
-          command: pip install -U pip  # upgrade pip after installing python
+          command: pip install -U pip
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 6f3cdbc165fcbf00fdca7fbfde4fd3a37ac94e69 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:54:11 +0100
Subject: [PATCH 0689/1300] Quote command

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index b0dc46ba5..558ebea69 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -20,7 +20,7 @@ jobs:
         uses: gabrielfalcao/pyenv-action@v5
         with:
           default: "${{ matrix.python }}"
-          command: pip install -U pip
+          command: "pip install -U pip"
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From c7c167a058f29210b2a155daa7dcd47532c9dd2e Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:55:41 +0100
Subject: [PATCH 0690/1300] Update to a possibly working version of
 pyenv-action

According to https://github.com/gabrielfalcao/pyenv-action/issues/136 this
version should work
---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 558ebea69..6b43b8710 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install python version
-        uses: gabrielfalcao/pyenv-action@v5
+        uses: gabrielfalcao/pyenv-action@v7
         with:
           default: "${{ matrix.python }}"
           command: "pip install -U pip"

From 44da3fd19553af4c68a4ec910bb2d5ee73e681f5 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:57:34 +0100
Subject: [PATCH 0691/1300] Fix yaml: indentation was wrong

---
 .github/workflows/docker-publish.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 6b43b8710..1ec70f146 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -15,12 +15,12 @@ jobs:
           - 3.7.5
           - 3.8.2
     steps:
-      - uses: actions/checkout@v2
-      - name: Install python version
-        uses: gabrielfalcao/pyenv-action@v7
-        with:
-          default: "${{ matrix.python }}"
-          command: "pip install -U pip"
+    - uses: actions/checkout@v2
+    - name: Install python version
+      uses: gabrielfalcao/pyenv-action@v7
+      with:
+        default: "${{ matrix.python }}"
+        command: "pip install -U pip"
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 19fddc8da8b14d6ba076b8a9b13a72aaca8fcc89 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:04:46 +0000
Subject: [PATCH 0692/1300] Apply translations in fr

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'fr' language.
---
 src/locale/fr/LC_MESSAGES/django.po | 115 +++++++++++++++++++---------
 1 file changed, 78 insertions(+), 37 deletions(-)

diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po
index 295b9fd86..8d41866ba 100644
--- a/src/locale/fr/LC_MESSAGES/django.po
+++ b/src/locale/fr/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Jonas Winkler <dev@jpwinkler.de>, 2020
+# Jonas Winkler, 2020
 # Philmo67, 2021
 # 
 #, fuzzy
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-02 00:26+0000\n"
+"POT-Creation-Date: 2021-01-06 19:50+0000\n"
 "PO-Revision-Date: 2020-12-30 19:27+0000\n"
 "Last-Translator: Philmo67, 2021\n"
 "Language-Team: French (https://www.transifex.com/paperless/teams/115905/fr/)\n"
@@ -51,7 +51,7 @@ msgid "Automatic"
 msgstr "Automatique"
 
 #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
-#: paperless_mail/models.py:100
+#: paperless_mail/models.py:111
 msgid "name"
 msgstr "nom"
 
@@ -348,34 +348,42 @@ msgstr "règle de filtrage"
 msgid "filter rules"
 msgstr "règles de filtrage"
 
-#: paperless/settings.py:254
+#: paperless/settings.py:268
 msgid "English"
 msgstr "Anglais"
 
-#: paperless/settings.py:255
+#: paperless/settings.py:269
 msgid "German"
 msgstr "Allemand"
 
+#: paperless/settings.py:270
+msgid "Dutch"
+msgstr "Néerlandais"
+
+#: paperless/settings.py:271
+msgid "French"
+msgstr "Français"
+
 #: paperless/urls.py:108
 msgid "Paperless-ng administration"
 msgstr "Administration de Paperless-ng"
 
-#: paperless_mail/admin.py:24
+#: paperless_mail/admin.py:25
 msgid "Filter"
 msgstr "Filtrage"
 
-#: paperless_mail/admin.py:26
+#: paperless_mail/admin.py:27
 msgid ""
 "Paperless will only process mails that match ALL of the filters given below."
 msgstr ""
 "Paperless-ng ne traitera que les courriers qui correspondent à TOUS les "
 "filtres ci-dessous."
 
-#: paperless_mail/admin.py:34
+#: paperless_mail/admin.py:37
 msgid "Actions"
 msgstr "Actions"
 
-#: paperless_mail/admin.py:36
+#: 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"
@@ -385,11 +393,11 @@ msgstr ""
 "documents ont été traités depuis des courriels. Les courriels sans pièces "
 "jointes demeurent totalement inchangés."
 
-#: paperless_mail/admin.py:43
+#: paperless_mail/admin.py:46
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: paperless_mail/admin.py:45
+#: 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 "
@@ -460,87 +468,120 @@ msgstr "règle de courriel"
 msgid "mail rules"
 msgstr "règles de courriel"
 
-#: paperless_mail/models.py:69
+#: paperless_mail/models.py:67
+msgid "Only process attachments."
+msgstr "Ne traiter que les pièces jointes."
+
+#: paperless_mail/models.py:70
+msgid "Process all files, including 'inline' attachments."
+msgstr "Traiter tous les fichiers, y compris les pièces jointes \"en ligne\"."
+
+#: paperless_mail/models.py:80
 msgid "Mark as read, don't process read mails"
 msgstr "Marquer comme lu, ne pas traiter les courriels lus"
 
-#: paperless_mail/models.py:70
+#: paperless_mail/models.py:81
 msgid "Flag the mail, don't process flagged mails"
 msgstr "Marquer le courriel, ne pas traiter les courriels marqués"
 
-#: paperless_mail/models.py:71
+#: paperless_mail/models.py:82
 msgid "Move to specified folder"
 msgstr "Déplacer vers le dossier spécifié"
 
-#: paperless_mail/models.py:72
+#: paperless_mail/models.py:83
 msgid "Delete"
 msgstr "Supprimer"
 
-#: paperless_mail/models.py:79
+#: paperless_mail/models.py:90
 msgid "Use subject as title"
 msgstr "Utiliser le sujet en tant que titre"
 
-#: paperless_mail/models.py:80
+#: paperless_mail/models.py:91
 msgid "Use attachment filename as title"
 msgstr "Utiliser le nom de la pièce jointe en tant que titre"
 
-#: paperless_mail/models.py:90
+#: paperless_mail/models.py:101
 msgid "Do not assign a correspondent"
 msgstr "Ne pas affecter de correspondant"
 
-#: paperless_mail/models.py:92
+#: paperless_mail/models.py:103
 msgid "Use mail address"
 msgstr "Utiliser l'adresse électronique"
 
-#: paperless_mail/models.py:94
+#: paperless_mail/models.py:105
 msgid "Use name (or mail address if not available)"
 msgstr "Utiliser le nom (ou l'adresse électronique s'il n'est pas disponible)"
 
-#: paperless_mail/models.py:96
+#: paperless_mail/models.py:107
 msgid "Use correspondent selected below"
 msgstr "Utiliser le correspondant sélectionné ci-dessous"
 
-#: paperless_mail/models.py:104
+#: paperless_mail/models.py:115
 msgid "order"
 msgstr "ordre"
 
-#: paperless_mail/models.py:111
+#: paperless_mail/models.py:122
 msgid "account"
 msgstr "compte"
 
-#: paperless_mail/models.py:115
+#: paperless_mail/models.py:126
 msgid "folder"
 msgstr "répertoire"
 
-#: paperless_mail/models.py:119
+#: paperless_mail/models.py:130
 msgid "filter from"
 msgstr "filtrer l'expéditeur"
 
-#: paperless_mail/models.py:122
+#: paperless_mail/models.py:133
 msgid "filter subject"
 msgstr "filtrer le sujet"
 
-#: paperless_mail/models.py:125
+#: paperless_mail/models.py:136
 msgid "filter body"
 msgstr "filtrer le corps du message"
 
-#: paperless_mail/models.py:129
+#: paperless_mail/models.py:140
+msgid "filter attachment filename"
+msgstr "filtrer le nom de fichier de la pièce jointe"
+
+#: paperless_mail/models.py:142
+msgid ""
+"Only consume documents which entirely match this filename if specified. "
+"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
+msgstr ""
+"Ne traiter que les documents correspondant intégralement à ce nom de fichier"
+" s'il est spécifié. Les jokers tels que *.pdf ou *facture* sont autorisés. "
+"La casse n'est pas prise en compte."
+
+#: paperless_mail/models.py:148
 msgid "maximum age"
 msgstr "âge maximum"
 
-#: paperless_mail/models.py:131
+#: paperless_mail/models.py:150
 msgid "Specified in days."
 msgstr "En jours."
 
-#: paperless_mail/models.py:134
+#: paperless_mail/models.py:153
+msgid "attachment type"
+msgstr "type de pièce jointe"
+
+#: paperless_mail/models.py:156
+msgid ""
+"Inline attachments include embedded images, so it's best to combine this "
+"option with a filename filter."
+msgstr ""
+"Les pièces jointes en ligne comprennent les images intégrées, il est donc "
+"préférable de combiner cette option avec un filtre de nom de fichier."
+
+#: paperless_mail/models.py:161
 msgid "action"
 msgstr "action"
 
-#: paperless_mail/models.py:140
+#: paperless_mail/models.py:167
 msgid "action parameter"
 msgstr "paramètre d'action"
 
-#: paperless_mail/models.py:142
+#: paperless_mail/models.py:169
 msgid ""
 "Additional parameter for the action selected above, i.e., the target folder "
 "of the move to folder action."
@@ -548,22 +589,22 @@ msgstr ""
 "Paramètre supplémentaire pour l'action sélectionnée ci-dessus, par exemple "
 "le dossier cible de l'action de déplacement vers un dossier."
 
-#: paperless_mail/models.py:148
+#: paperless_mail/models.py:175
 msgid "assign title from"
 msgstr "affecter le titre depuis"
 
-#: paperless_mail/models.py:158
+#: paperless_mail/models.py:185
 msgid "assign this tag"
 msgstr "affecter cette étiquette"
 
-#: paperless_mail/models.py:166
+#: paperless_mail/models.py:193
 msgid "assign this document type"
 msgstr "affecter ce type de document"
 
-#: paperless_mail/models.py:170
+#: paperless_mail/models.py:197
 msgid "assign correspondent from"
 msgstr "affecter le correspondant depuis"
 
-#: paperless_mail/models.py:180
+#: paperless_mail/models.py:207
 msgid "assign this correspondent"
 msgstr "affecter ce correspondant"

From 9257cdac8f330197a46f6a31644f4ea630bf85dd Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 23:06:40 +0100
Subject: [PATCH 0693/1300] Remove debugging line and specify release versions

---
 .github/workflows/docker-publish.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 1ec70f146..5e9ed8632 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -11,9 +11,9 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python: 
-          - 3.6.8
-          - 3.7.5
-          - 3.8.2
+          - 3.6
+          - 3.7
+          - 3.8
     steps:
     - uses: actions/checkout@v2
     - name: Install python version
@@ -25,7 +25,6 @@ jobs:
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        echo "Selected python version from matrix is: ${MATRIX_PYTHON_VERSION}"
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
         pip install --upgrade pipenv

From 257ebb88f058486af13eb70fc637f878c6f87dda Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 23:10:06 +0100
Subject: [PATCH 0694/1300] Looks like we need to specify the exact version

---
 .github/workflows/docker-publish.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 5e9ed8632..042d64f24 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -11,9 +11,9 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python: 
-          - 3.6
-          - 3.7
-          - 3.8
+          - 3.6.8
+          - 3.7.9
+          - 3.8.7
     steps:
     - uses: actions/checkout@v2
     - name: Install python version

From d7b3e7bd69f6744cd23e43f194b56301b2a68820 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 23:11:54 +0100
Subject: [PATCH 0695/1300] Use 3.8.6

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 042d64f24..8a199abcd 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -13,7 +13,7 @@ jobs:
         python: 
           - 3.6.8
           - 3.7.9
-          - 3.8.7
+          - 3.8.6
     steps:
     - uses: actions/checkout@v2
     - name: Install python version

From 9b3bc6213297a9365e5e129c3fbe3fe1d631d431 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 7 Jan 2021 00:08:34 +0100
Subject: [PATCH 0696/1300] fix broken webmanifest

---
 src/documents/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/documents/views.py b/src/documents/views.py
index 8af29ce05..ab4486821 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -79,7 +79,7 @@ class IndexView(TemplateView):
         context['runtime_js'] = f"frontend/{self.get_language()}/runtime.js"
         context['polyfills_js'] = f"frontend/{self.get_language()}/polyfills.js"  # NOQA: E501
         context['main_js'] = f"frontend/{self.get_language()}/main.js"
-        context['manifest'] = f"frontend/{self.get_language()}/manifest.webmanifest"  # NOQA: E501
+        context['webmanifest'] = f"frontend/{self.get_language()}/manifest.webmanifest"  # NOQA: E501
         return context
 
 

From a02ddeb7222fd822c7db139d6dc9d9eae2b439e6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 7 Jan 2021 00:08:42 +0100
Subject: [PATCH 0697/1300] fix release script

---
 scripts/make-release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/make-release.sh b/scripts/make-release.sh
index 63a6b465e..9ce218a7e 100755
--- a/scripts/make-release.sh
+++ b/scripts/make-release.sh
@@ -81,7 +81,7 @@ cp "$PAPERLESS_ROOT/paperless.conf.example" "$PAPERLESS_DIST_APP/paperless.conf"
 
 # copy python source, templates and static files.
 cd "$PAPERLESS_ROOT"
-find src -wholename '*/locale/*' -o -wholename '*/templates/*' -o -wholename '*/static/*' -o -name '*.py' | cpio -pdm "$PAPERLESS_DIST_APP"
+find src -name '*.po' -o -wholename '*/templates/*' -o -wholename '*/static/*' -o -name '*.py' | cpio -pdm "$PAPERLESS_DIST_APP"
 
 # build the front end.
 

From fe00dffb70a2798bda7706568f8c27ebddaf521f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 7 Jan 2021 00:10:14 +0100
Subject: [PATCH 0698/1300] version push

---
 docker/hub/docker-compose.postgres.yml      | 2 +-
 docker/hub/docker-compose.sqlite.yml        | 2 +-
 docker/hub/docker-compose.tika.yml          | 2 +-
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index 0779cea22..d7673d891 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.11
+    image: jonaswinkler/paperless-ng:0.9.12
     restart: always
     depends_on:
       - db
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index 3eed96cc3..054eb52d3 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.11
+    image: jonaswinkler/paperless-ng:0.9.12
     restart: always
     depends_on:
       - broker
diff --git a/docker/hub/docker-compose.tika.yml b/docker/hub/docker-compose.tika.yml
index af8f575a0..47c477bef 100644
--- a/docker/hub/docker-compose.tika.yml
+++ b/docker/hub/docker-compose.tika.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.9
+    image: jonaswinkler/paperless-ng:0.9.12
     restart: always
     depends_on:
       - broker
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 1ac69bc39..07a84e660 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,5 +2,5 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "0.9.11"
+  version: "0.9.12"
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index e1ba14cb4..b9f980934 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (0, 9, 11)
+__version__ = (0, 9, 12)

From e92046a26546706e89061b6168c113de177fda24 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 7 Jan 2021 00:21:47 +0100
Subject: [PATCH 0699/1300] bugfix

---
 .../src/app/components/common/input/number/number.component.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/common/input/number/number.component.ts b/src-ui/src/app/components/common/input/number/number.component.ts
index cdc52344d..2d28a7801 100644
--- a/src-ui/src/app/components/common/input/number/number.component.ts
+++ b/src-ui/src/app/components/common/input/number/number.component.ts
@@ -29,7 +29,7 @@ export class NumberComponent extends AbstractInputComponent<number> {
         if (results.count > 0) {
           this.value = results.results[0].archive_serial_number + 1
         } else {
-          this.value + 1
+          this.value = 1
         }
         this.onChange(this.value)
       }

From 7f0f48ddace6f24c359694c51a16e71d2cdfae9f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 7 Jan 2021 01:01:01 +0100
Subject: [PATCH 0700/1300] bugfixes

---
 .../app/components/common/edit-dialog/edit-dialog.component.ts  | 1 -
 .../src/app/components/document-list/document-list.component.ts | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
index ff4660ca3..46f486167 100644
--- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
@@ -86,7 +86,6 @@ export abstract class EditDialogComponent<T extends ObjectWithId> implements OnI
     serverResponse.subscribe(result => {
       this.activeModal.close()
       this.success.emit(result)
-      this.networkActive = false
     }, error => {
       this.error = error.error
       this.networkActive = false
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 9b88c13b4..fda99eb8d 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -84,9 +84,9 @@ export class DocumentListComponent implements OnInit {
   }
 
   loadViewConfig(view: PaperlessSavedView) {
-    this.filterRulesModified = false
     this.list.load(view)
     this.list.reload()
+    this.rulesChanged()
   }
 
   saveViewConfig() {

From cc9f9b6e8b00d84b77c23d7584061d3f5b1a0e25 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:32:43 +0100
Subject: [PATCH 0701/1300] Docker build step depends on tests

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 8a199abcd..649fba14d 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -36,7 +36,7 @@ jobs:
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest
-
+    needs: tests
     steps:
       - uses: actions/checkout@v2
 

From 98bc51a3ec914060c57b990cb15149957eb63d7f Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:42:25 +0100
Subject: [PATCH 0702/1300] Adding documentation and frontend steps from travis
 build

---
 .github/workflows/docker-publish.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 649fba14d..50fdbfd31 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -33,6 +33,33 @@ jobs:
         pipenv run pytest --cov
         pipenv run pycodestyle
         pipenv run coveralls
+    documentation:
+      steps:
+      - uses: actions/checkout@v2
+      - name: dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+          pip install --upgrade pipenv
+          pipenv install --system --dev
+      - name: make
+        run: |
+          cd docs/
+          make html
+    frontend:
+      steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '15'
+      - name: dependencies
+        run: |
+          cd src-ui/
+          npm install -g @angular/cli
+          npm install
+      - name: build
+        run: |
+          ng build --prod
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest

From 10995788d1e545e04deb31ffb9140cba36f6d9c9 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:43:45 +0100
Subject: [PATCH 0703/1300] Fix identation

---
 .github/workflows/docker-publish.yml | 54 ++++++++++++++--------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 50fdbfd31..74e5c0ac7 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -33,33 +33,33 @@ jobs:
         pipenv run pytest --cov
         pipenv run pycodestyle
         pipenv run coveralls
-    documentation:
-      steps:
-      - uses: actions/checkout@v2
-      - name: dependencies
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-          pip install --upgrade pipenv
-          pipenv install --system --dev
-      - name: make
-        run: |
-          cd docs/
-          make html
-    frontend:
-      steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '15'
-      - name: dependencies
-        run: |
-          cd src-ui/
-          npm install -g @angular/cli
-          npm install
-      - name: build
-        run: |
-          ng build --prod
+  documentation:
+    steps:
+    - uses: actions/checkout@v2
+    - name: dependencies
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+        pip install --upgrade pipenv
+        pipenv install --system --dev
+    - name: make
+      run: |
+        cd docs/
+        make html
+  frontend:
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '15'
+    - name: dependencies
+      run: |
+        cd src-ui/
+        npm install -g @angular/cli
+        npm install
+    - name: build
+      run: |
+        ng build --prod
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest

From 9ffd9027faa2be8f08485f12ed8598380cd2152c Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:44:36 +0100
Subject: [PATCH 0704/1300] Add missing runs-on

---
 .github/workflows/docker-publish.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 74e5c0ac7..76a7f18e2 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -34,6 +34,7 @@ jobs:
         pipenv run pycodestyle
         pipenv run coveralls
   documentation:
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: dependencies
@@ -47,6 +48,7 @@ jobs:
         cd docs/
         make html
   frontend:
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2

From 6101f42ae38758357e1291ecc752a475b2d76c8c Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:45:17 +0100
Subject: [PATCH 0705/1300] ADd documentation and frontend to dependency for
 docker build

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 76a7f18e2..f2467cbf9 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -65,7 +65,7 @@ jobs:
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest
-    needs: tests
+    needs: [tests, documentation, frontend]
     steps:
       - uses: actions/checkout@v2
 

From c06f6145a180ace15a649e13b99a5e1e837a0334 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:47:42 +0100
Subject: [PATCH 0706/1300] ALso install python before using pip in the
 documentation job

---
 .github/workflows/docker-publish.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index f2467cbf9..6c3bf87f9 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -37,6 +37,11 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
+    - name: Install python version
+      uses: gabrielfalcao/pyenv-action@v7
+      with:
+        default: "3.6.8"
+        command: "pip install -U pip"
     - name: dependencies
       run: |
         sudo apt-get update -qq

From 08299fb808df27e1b2e39586e2142a2157fe8cb0 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:48:32 +0100
Subject: [PATCH 0707/1300] Simplify node build

---
 .github/workflows/docker-publish.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 6c3bf87f9..ab93fd8e7 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -59,13 +59,11 @@ jobs:
     - uses: actions/setup-node@v2
       with:
         node-version: '15'
-    - name: dependencies
+    - name: build
       run: |
         cd src-ui/
         npm install -g @angular/cli
         npm install
-    - name: build
-      run: |
         ng build --prod
   # Build and push image to docker hub.
   buildx:

From 248e4e5eb90ed465a0ca3febaed6bbdd3d2115dd Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:57:12 +0100
Subject: [PATCH 0708/1300] Try installing sphinx simply with apt

---
 .github/workflows/docker-publish.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index ab93fd8e7..3d62a9f18 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -45,9 +45,7 @@ jobs:
     - name: dependencies
       run: |
         sudo apt-get update -qq
-        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-        pip install --upgrade pipenv
-        pipenv install --system --dev
+        sudo apt-get install -qq python3-sphinx
     - name: make
       run: |
         cd docs/

From 460d202eb0b33450f67b460ccdd6cebf8969cb72 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 08:37:25 +0100
Subject: [PATCH 0709/1300] Use pip to install sphinx

Not sure why pipenv install doesn't do the trick .. let's try this way first
---
 .github/workflows/docker-publish.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 3d62a9f18..54281492e 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -44,8 +44,7 @@ jobs:
         command: "pip install -U pip"
     - name: dependencies
       run: |
-        sudo apt-get update -qq
-        sudo apt-get install -qq python3-sphinx
+        pip install 'sphinx~=3.3' sphinx_rtd_theme
     - name: make
       run: |
         cd docs/

From 1238d8b994887b2abfea7016ca82bf43071c4937 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 08:44:05 +0100
Subject: [PATCH 0710/1300] Add pip cache

Try to be a good citizen and use caches instead of hitting the repos all the time
---
 .github/workflows/docker-publish.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 54281492e..bce52b2e0 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -21,6 +21,15 @@ jobs:
       with:
         default: "${{ matrix.python }}"
         command: "pip install -U pip"
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+    - name: Persistent Github pip cache
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key: ${{ runner.os }}-pip${{ matrix.python }}
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 40da245d8d5a64e5bf55be2822167f7b03432cec Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 08:50:04 +0100
Subject: [PATCH 0711/1300] Try to insall sphinx from pipfile

---
 .github/workflows/docker-publish.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index bce52b2e0..479f52a2c 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -53,7 +53,8 @@ jobs:
         command: "pip install -U pip"
     - name: dependencies
       run: |
-        pip install 'sphinx~=3.3' sphinx_rtd_theme
+        pip install --upgrade pipenv
+        pipenv install --system --dev --ignore-pipfile
     - name: make
       run: |
         cd docs/

From 1b61765df84719817ec6b4c77f35c46eced942e9 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 08:56:48 +0100
Subject: [PATCH 0712/1300] Install pip

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 479f52a2c..fcdf93c8f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -54,7 +54,7 @@ jobs:
     - name: dependencies
       run: |
         pip install --upgrade pipenv
-        pipenv install --system --dev --ignore-pipfile
+        pipenv install --system --dev
     - name: make
       run: |
         cd docs/

From 89476e44794f0bbacbe60247237a62afc6409ba9 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 09:02:29 +0100
Subject: [PATCH 0713/1300] Try to use pip cache and install dependnecies like
 in tests

---
 .github/workflows/docker-publish.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index fcdf93c8f..a3329b7ba 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -50,9 +50,20 @@ jobs:
       uses: gabrielfalcao/pyenv-action@v7
       with:
         default: "3.6.8"
-        command: "pip install -U pip"
+        command: "pip install -U pip"    
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+    - name: Persistent Github pip cache
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key: ${{ runner.os }}-pip3.6.8}
     - name: dependencies
       run: |
+        sudo apt-get update -qq
+        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
         pip install --upgrade pipenv
         pipenv install --system --dev
     - name: make

From 8a397034fd8a65c5f2f8833c7c3656d1b1a3c232 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Thu, 7 Jan 2021 09:04:51 +0000
Subject: [PATCH 0714/1300] Translate /src-ui/messages.xlf in nl_NL

translation completed for the source file '/src-ui/messages.xlf'
on the 'nl_NL' language.
---
 src-ui/src/locale/messages.nl_NL.xlf | 272 +++++++++++++--------------
 1 file changed, 136 insertions(+), 136 deletions(-)

diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf
index 6301f95e6..6bed1f039 100644
--- a/src-ui/src/locale/messages.nl_NL.xlf
+++ b/src-ui/src/locale/messages.nl_NL.xlf
@@ -6,7 +6,7 @@
         <target>Documenten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
@@ -14,7 +14,7 @@
         <target>View &amp;quot;<x equiv-text="this.list.savedView.name" id="PH"/>&amp;quot; met succes opgeslagen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
@@ -22,7 +22,7 @@
         <target>View &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; met succes gemaakt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
@@ -94,7 +94,7 @@
         <target>{VAR_PLURAL, plural, =1 {<x id="INTERPOLATION"/> van één document geselecteerd} other {<x id="INTERPOLATION"/> van <x id="INTERPOLATION_1"/> documenten geselecteerd}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9">
@@ -102,7 +102,15 @@
         <target>{VAR_PLURAL, plural, =1 {Eén document} other {<x id="INTERPOLATION"/> documenten}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb91083b44e3f77dd68de773ceab467ca3d57507">
+        <source>(filtered)</source>
+        <target>(gefilterd)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
@@ -110,7 +118,7 @@
         <target>ASN</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">100</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
@@ -118,7 +126,7 @@
         <target>Correspondent</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">101</context>
+          <context context-type="linenumber">113</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
@@ -126,7 +134,7 @@
         <target>Titel</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">102</context>
+          <context context-type="linenumber">119</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
@@ -134,7 +142,7 @@
         <target>Documenttype</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
@@ -142,7 +150,7 @@
         <target>Aangemaakt</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="linenumber">131</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
@@ -150,7 +158,7 @@
         <target>Toegevoegd</target>
         <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">137</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9021887951960049161">
@@ -158,7 +166,7 @@
         <target>Bevestig het verwijderen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
@@ -166,7 +174,7 @@
         <target>Wilt u het document echt verwijderen &amp;quot;<x equiv-text="this.document.title" id="PH"/>&amp;quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">162</context>
+          <context context-type="linenumber">187</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6691075929777935948">
@@ -174,7 +182,7 @@
         <target>De bestanden voor dit document worden definitief verwijderd. Deze bewerking kan niet ongedaan worden gemaakt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">163</context>
+          <context context-type="linenumber">188</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="719892092227206532">
@@ -182,7 +190,15 @@
         <target>Verwijder document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">165</context>
+          <context context-type="linenumber">190</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1844801255494293730">
+        <source>Error deleting document: <x equiv-text="JSON.stringify(error)" id="PH"/></source>
+        <target>Fout bij het verwijderen van het document: <x equiv-text="JSON.stringify(error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
+          <context context-type="linenumber">197</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -230,7 +246,7 @@
         <target>Inhoud</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="f721a500a68c357e8f2a01e60510f6a01e4ba529">
@@ -238,7 +254,7 @@
         <target>Metadata</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">81</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7">
@@ -246,7 +262,7 @@
         <target>Negeren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="52c9a103b812f258bcddc3d90a6e3f46871d25fe">
@@ -254,7 +270,7 @@
         <target>Opslaan</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">136</context>
+          <context context-type="linenumber">132</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3">
@@ -286,7 +302,7 @@
         <target>Archief serienummer</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="30eebc2dd656dbcb259d8d5286d244ee397d63bd">
@@ -294,15 +310,7 @@
         <target>Aanmaakdatum</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">65</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
-        <source>Tags</source>
-        <target>Tags</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720">
@@ -310,7 +318,7 @@
         <target>Wijzigingsdatum</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269">
@@ -318,7 +326,7 @@
         <target>Datum toegevoegd</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3">
@@ -326,7 +334,7 @@
         <target>Media bestandsnaam</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">99</context>
+          <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8">
@@ -334,7 +342,7 @@
         <target>Originele MD5 checksum</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="e92ca184ea785769fb26138fc25ee9fa06fff6e5">
@@ -342,7 +350,7 @@
         <target>Originele bestandsgrootte</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">103</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd">
@@ -350,7 +358,7 @@
         <target>Oorspronkelijke mime-type</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="edbf54e4117606b5dd87aaea3c14b21ebf398020">
@@ -358,7 +366,7 @@
         <target>Archief MD5 checksum</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">115</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="e6bf12eadecbfd80016eca15fa78651c6ca90c64">
@@ -366,7 +374,7 @@
         <target>Archief bestandsgrootte</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">119</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f">
@@ -374,7 +382,7 @@
         <target>Originele document metadata</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">121</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7174dcea4a3d0b743e7e4a78747e902230727f67">
@@ -382,7 +390,7 @@
         <target>Gearchiveerde document metadata</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">122</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3fb9f1a31c3798173b2fea72638732c783b152fe">
@@ -390,7 +398,7 @@
         <target>Opslaan &amp; volgende</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">135</context>
+          <context context-type="linenumber">131</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8765497970646365998">
@@ -422,7 +430,15 @@
         <target>Wil je de tag echt verwijderen &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
+        <source>Tags</source>
+        <target>Tags</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="70a67e04629f6d412db0a12d51820b480788d795">
@@ -494,7 +510,7 @@
         <target>Wilt u het documenttype echt verwijderen &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8">
@@ -633,6 +649,14 @@
           <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="8ee474504043fa89821d626e4f3413240fa91b53">
+        <source>Enable dark mode</source>
+        <target>Gebruik nachtmodus</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
         <source>Appears on</source>
         <target>Komt voor bij</target>
@@ -678,7 +702,7 @@
         <target>Bent u zeker dat u correspondent &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot; wilt verwijderen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c3f3334de899327bf3ec8999236e10798ff76e72">
@@ -713,6 +737,14 @@
           <context context-type="linenumber">29</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
+        <source>Cancel</source>
+        <target>Annuleren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="6457471243969293847">
         <source>Create new correspondent</source>
         <target>Nieuwe correspondent maken</target>
@@ -729,14 +761,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="3025930461519142465">
-        <source>Could not save correspondent: <x equiv-text="error" id="PH"/></source>
-        <target>Kon de correspondent niet opslaan: <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="3d5caa52b0a51bfd2757215f7614183554d740f0">
         <source>Matching algorithm</source>
         <target>Algoritme voor het bepalen van de overeenkomst</target>
@@ -753,14 +777,6 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="a1923dd970db4f74b4417b80b4a14e250fd116ff">
-        <source>Auto matching does not require you to fill in this field.</source>
-        <target>Dit veld hoeft niet ingevuld te worden indien automatisch overeenkomsten gezocht worden.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
         <source>Case insensitive</source>
         <target>Niet hoofdlettergevoelig</target>
@@ -769,22 +785,6 @@
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="85e19678590a8b3ac1dff9d69c7a7610d1742e5a">
-        <source>Auto matching ignores this option.</source>
-        <target>Deze optie wordt genegeerd bij het automatisch zoeken naar overeenkomsten.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
-        <source>Cancel</source>
-        <target>Annuleren</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="9153094873118985366">
         <source>Create new tag</source>
         <target>Nieuw etiket maken</target>
@@ -801,14 +801,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="2861521377141790537">
-        <source>Could not save tag: <x equiv-text="error" id="PH"/></source>
-        <target>Kon het etiket niet opslaan: <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42">
         <source>Inbox tag</source>
         <target>&quot;Postvak in&quot;-etiket</target>
@@ -841,14 +833,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5647767513381010218">
-        <source>Could not save document type: <x equiv-text="error" id="PH"/></source>
-        <target>Kon documenttype niet opslaan: <x equiv-text="error" id="PH"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="49c9ede51100b454f7841b24cd02355c6622bf44">
         <source>Search results</source>
         <target>Zoekresultaten</target>
@@ -935,7 +919,7 @@
         <target>Beheer</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">147</context>
+          <context context-type="linenumber">154</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
@@ -943,7 +927,7 @@
         <target>Andere</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">153</context>
+          <context context-type="linenumber">160</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
@@ -951,7 +935,7 @@
         <target>Handleiding</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
@@ -959,7 +943,7 @@
         <target>GitHub</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">167</context>
+          <context context-type="linenumber">174</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
@@ -1066,9 +1050,9 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="2f33515a935c36763660e8420940b8a7e11fb1f4">
-        <source>Clear all filters</source>
-        <target>Alle filters wegdoen</target>
+      <trans-unit datatype="html" id="2d9d55f1b70142ff4597ba32179d16888fd9c6b2">
+        <source>Reset filters</source>
+        <target>Filters terug zetten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
           <context context-type="linenumber">47</context>
@@ -1195,12 +1179,20 @@
           <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="7985804062689412812">
+        <source>Error executing bulk operation: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Fout bij het uitvoeren van een massabewerking: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">73</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
         <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
         <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot; en &amp;quot;<x equiv-text="items[1].name" id="PH_1"/>&amp;quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">114</context>
         </context-group>
         <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
       </trans-unit>
@@ -1209,7 +1201,7 @@
         <target>&amp;quot;<x equiv-text="i.name" id="PH"/>&amp;quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="760986369763309193">
@@ -1217,7 +1209,7 @@
         <target>, </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">116</context>
         </context-group>
         <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
       </trans-unit>
@@ -1226,7 +1218,7 @@
         <target><x equiv-text="list" id="PH"/> en &amp;quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&amp;quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">117</context>
         </context-group>
         <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
       </trans-unit>
@@ -1235,7 +1227,7 @@
         <target>Bevestig toewijzen van etiketten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">115</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6619516195038467207">
@@ -1243,7 +1235,7 @@
         <target>Het etiket &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">118</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1894412783609570695">
@@ -1251,7 +1243,7 @@
         <target>De etiketten <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> zullen aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">131</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7181166515756808573">
@@ -1259,7 +1251,7 @@
         <target>Het etiket &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; zal verwijderd worden van <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">123</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3819792277998068944">
@@ -1267,7 +1259,7 @@
         <target>De etiketten <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> zullen verwijderd worden van <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2739066218579571288">
@@ -1275,7 +1267,7 @@
         <target>De etiketten <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> zullen toegevoegd worden aan, en de etiketten <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> zullen verwijderd worden van <x equiv-text="this.list.selected.size" id="PH_2"/> geselecteerd(e) document(en).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">127</context>
+          <context context-type="linenumber">138</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2996713129519325161">
@@ -1283,7 +1275,7 @@
         <target>Bevestig toewijzen van correspondent</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">158</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6900893559485781849">
@@ -1291,7 +1283,7 @@
         <target>De correspondent &amp;quot;<x equiv-text="correspondent.name" id="PH"/>&amp;quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">159</context>
+          <context context-type="linenumber">160</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1257522660364398440">
@@ -1299,7 +1291,7 @@
         <target>De correspondent zal verwijderd worden van <x equiv-text="this.list.selected.size" id="PH"/> geselecteerd(e) document(en).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5393409374423140648">
@@ -1307,7 +1299,7 @@
         <target>Bevestig toewijzen van documenttype</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">190</context>
+          <context context-type="linenumber">181</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="332180123895325027">
@@ -1315,7 +1307,7 @@
         <target>Het documenttype &amp;quot;<x equiv-text="documentType.name" id="PH"/>&amp;quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">192</context>
+          <context context-type="linenumber">183</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2236642492594872779">
@@ -1323,7 +1315,7 @@
         <target>Het documenttype zal verwijderd worden van <x equiv-text="this.list.selected.size" id="PH"/> geselecteerd(e) document(en).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">194</context>
+          <context context-type="linenumber">185</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="749430623564850405">
@@ -1331,7 +1323,7 @@
         <target>Bevestig verwijderen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">219</context>
+          <context context-type="linenumber">200</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4303174930844518780">
@@ -1339,7 +1331,7 @@
         <target><x equiv-text="this.list.selected.size" id="PH"/> geselecteerd(e) document(en) zullen permanent worden verwijderd.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">220</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5641451190833696892">
@@ -1347,7 +1339,7 @@
         <target>Deze actie kan niet ongedaan worden gemaakt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">221</context>
+          <context context-type="linenumber">202</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6734339521247847366">
@@ -1355,7 +1347,7 @@
         <target>Verwijder document(en)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">223</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
@@ -1598,17 +1590,17 @@
           <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="2691296884221415710">
-        <source>Correspondent</source>
-        <target>Correspondent</target>
+      <trans-unit datatype="html" id="7517688192215738656">
+        <source>ASN</source>
+        <target>ASN</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5066119607229701477">
-        <source>Document type</source>
-        <target>Documenttype</target>
+      <trans-unit datatype="html" id="2691296884221415710">
+        <source>Correspondent</source>
+        <target>Correspondent</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
           <context context-type="linenumber">17</context>
@@ -1622,9 +1614,9 @@
           <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="7517688192215738656">
-        <source>ASN</source>
-        <target>ASN</target>
+      <trans-unit datatype="html" id="5066119607229701477">
+        <source>Document type</source>
+        <target>Documenttype</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
           <context context-type="linenumber">19</context>
@@ -1763,7 +1755,7 @@
         <target>Maak nieuw item</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5324147361912094446">
@@ -1771,7 +1763,7 @@
         <target>Item bewerken</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">47</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1699589597032579396">
@@ -1779,7 +1771,7 @@
         <target>Kon het element niet opslaan: <x equiv-text="error" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">51</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="810888510148304696">
@@ -1787,7 +1779,7 @@
         <target>Automatisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5044611416737085530">
@@ -1795,7 +1787,7 @@
         <target>Wil je dit element echt verwijderen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8371896857609524947">
@@ -1803,7 +1795,7 @@
         <target>Geassocieerde documenten zullen niet verwijderd worden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7022070615528435141">
@@ -1811,7 +1803,15 @@
         <target>Verwijderen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5467489005440577210">
+        <source>Error while deleting element: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Fout bij het verwijderen van een element: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">93</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5851669019930456395">
@@ -1880,7 +1880,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="1856513373880048959">
         <source>Fuzzy word</source>
-        <target>Vaag woord</target>
+        <target>Gelijkaardig woord</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">16</context>
@@ -1888,7 +1888,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="8419167206585286450">
         <source>Fuzzy: Document contains a word similar to this word</source>
-        <target>Vaag: Document bevat een woord dat lijkt op dit woord</target>
+        <target>Gelijkaardig: Document bevat een woord dat lijkt op dit woord</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">16</context>

From 75fc373b510c2f32ed92ca989c1ef542e7e931d7 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Thu, 7 Jan 2021 09:32:19 +0000
Subject: [PATCH 0715/1300] Apply translations in nl_NL

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'nl_NL' language.
---
 src/locale/nl_NL/LC_MESSAGES/django.po | 121 +++++++++++++++++--------
 1 file changed, 81 insertions(+), 40 deletions(-)

diff --git a/src/locale/nl_NL/LC_MESSAGES/django.po b/src/locale/nl_NL/LC_MESSAGES/django.po
index 9778d46bc..07c1eb577 100644
--- a/src/locale/nl_NL/LC_MESSAGES/django.po
+++ b/src/locale/nl_NL/LC_MESSAGES/django.po
@@ -4,17 +4,17 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Ben Zweekhorst <bzweekhorst@gmail.com>, 2021
-# J V <bugs.github@dwarfy.be>, 2021
+# Ben <bzweekhorst@gmail.com>, 2021
+# Jo Vandeginste <jo.vandeginste@gmail.com>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-02 00:26+0000\n"
+"POT-Creation-Date: 2021-01-06 19:50+0000\n"
 "PO-Revision-Date: 2020-12-30 19:27+0000\n"
-"Last-Translator: J V <bugs.github@dwarfy.be>, 2021\n"
+"Last-Translator: Jo Vandeginste <jo.vandeginste@gmail.com>, 2021\n"
 "Language-Team: Dutch (Netherlands) (https://www.transifex.com/paperless/teams/115905/nl_NL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,14 +44,14 @@ msgstr "Reguliere expressie"
 
 #: documents/models.py:36
 msgid "Fuzzy word"
-msgstr "Vaag woord"
+msgstr "Gelijkaardig woord"
 
 #: documents/models.py:37
 msgid "Automatic"
 msgstr "Automatisch"
 
 #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
-#: paperless_mail/models.py:100
+#: paperless_mail/models.py:111
 msgid "name"
 msgstr "naam"
 
@@ -347,33 +347,41 @@ msgstr "filterregel"
 msgid "filter rules"
 msgstr "filterregels"
 
-#: paperless/settings.py:254
+#: paperless/settings.py:268
 msgid "English"
 msgstr "Engels"
 
-#: paperless/settings.py:255
+#: paperless/settings.py:269
 msgid "German"
 msgstr "Duits"
 
+#: paperless/settings.py:270
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: paperless/settings.py:271
+msgid "French"
+msgstr "Frans"
+
 #: paperless/urls.py:108
 msgid "Paperless-ng administration"
 msgstr "Paperless-ng administratie"
 
-#: paperless_mail/admin.py:24
+#: paperless_mail/admin.py:25
 msgid "Filter"
 msgstr "Filter"
 
-#: paperless_mail/admin.py:26
+#: paperless_mail/admin.py:27
 msgid ""
 "Paperless will only process mails that match ALL of the filters given below."
 msgstr ""
 "Paperless verwerkt alleen e-mails die voldoen aan ALLE onderstaande filters."
 
-#: paperless_mail/admin.py:34
+#: paperless_mail/admin.py:37
 msgid "Actions"
 msgstr "Acties"
 
-#: paperless_mail/admin.py:36
+#: 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"
@@ -383,11 +391,11 @@ msgstr ""
 "wanneer documenten verwerkt werden uit de mail. Mails zonder bijlage blijven"
 " onaangeroerd."
 
-#: paperless_mail/admin.py:43
+#: paperless_mail/admin.py:46
 msgid "Metadata"
 msgstr "Metadata"
 
-#: paperless_mail/admin.py:45
+#: 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 "
@@ -457,87 +465,120 @@ msgstr "email-regel"
 msgid "mail rules"
 msgstr "email-regels"
 
-#: paperless_mail/models.py:69
+#: paperless_mail/models.py:67
+msgid "Only process attachments."
+msgstr "Alleen bijlagen verwerken"
+
+#: paperless_mail/models.py:70
+msgid "Process all files, including 'inline' attachments."
+msgstr "Verwerk alle bestanden, inclusief 'inline' bijlagen."
+
+#: paperless_mail/models.py:80
 msgid "Mark as read, don't process read mails"
 msgstr "Markeer als gelezen, verwerk geen gelezen mails"
 
-#: paperless_mail/models.py:70
+#: paperless_mail/models.py:81
 msgid "Flag the mail, don't process flagged mails"
 msgstr "Markeer de mail, verwerk geen mails met markering"
 
-#: paperless_mail/models.py:71
+#: paperless_mail/models.py:82
 msgid "Move to specified folder"
 msgstr "Verplaats naar gegeven map"
 
-#: paperless_mail/models.py:72
+#: paperless_mail/models.py:83
 msgid "Delete"
 msgstr "Verwijder"
 
-#: paperless_mail/models.py:79
+#: paperless_mail/models.py:90
 msgid "Use subject as title"
 msgstr "Gebruik onderwerp als titel"
 
-#: paperless_mail/models.py:80
+#: paperless_mail/models.py:91
 msgid "Use attachment filename as title"
 msgstr "Gebruik naam van bijlage als titel"
 
-#: paperless_mail/models.py:90
+#: paperless_mail/models.py:101
 msgid "Do not assign a correspondent"
 msgstr "Wijs geen correspondent toe"
 
-#: paperless_mail/models.py:92
+#: paperless_mail/models.py:103
 msgid "Use mail address"
 msgstr "Gebruik het email-adres"
 
-#: paperless_mail/models.py:94
+#: paperless_mail/models.py:105
 msgid "Use name (or mail address if not available)"
 msgstr "Gebruik de naam, en anders het email-adres"
 
-#: paperless_mail/models.py:96
+#: paperless_mail/models.py:107
 msgid "Use correspondent selected below"
 msgstr "Gebruik de hieronder aangeduide correspondent"
 
-#: paperless_mail/models.py:104
+#: paperless_mail/models.py:115
 msgid "order"
 msgstr "volgorde"
 
-#: paperless_mail/models.py:111
+#: paperless_mail/models.py:122
 msgid "account"
 msgstr "account"
 
-#: paperless_mail/models.py:115
+#: paperless_mail/models.py:126
 msgid "folder"
 msgstr "map"
 
-#: paperless_mail/models.py:119
+#: paperless_mail/models.py:130
 msgid "filter from"
 msgstr "filter afzender"
 
-#: paperless_mail/models.py:122
+#: paperless_mail/models.py:133
 msgid "filter subject"
 msgstr "filter onderwerp"
 
-#: paperless_mail/models.py:125
+#: paperless_mail/models.py:136
 msgid "filter body"
 msgstr "filter inhoud"
 
-#: paperless_mail/models.py:129
+#: paperless_mail/models.py:140
+msgid "filter attachment filename"
+msgstr "Filter bestandsnaam van bijlage"
+
+#: paperless_mail/models.py:142
+msgid ""
+"Only consume documents which entirely match this filename if specified. "
+"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
+msgstr ""
+"Alleen documenten verwerken die volledig overeenkomen, indien aangegeven. Je"
+" kunt jokertekens gebruiken, zoals *.pdf of *factuur*. Dit is niet "
+"hoofdlettergevoelig."
+
+#: paperless_mail/models.py:148
 msgid "maximum age"
 msgstr "Maximale leeftijd"
 
-#: paperless_mail/models.py:131
+#: paperless_mail/models.py:150
 msgid "Specified in days."
 msgstr "Aangegeven in dagen"
 
-#: paperless_mail/models.py:134
+#: paperless_mail/models.py:153
+msgid "attachment type"
+msgstr "Type bijlage"
+
+#: paperless_mail/models.py:156
+msgid ""
+"Inline attachments include embedded images, so it's best to combine this "
+"option with a filename filter."
+msgstr ""
+"\"Inline\" bijlagen bevatten vaak ook afbeeldingen. In dit geval valt het "
+"aan te raden om ook een filter voor de bestandsnaam op te geven."
+
+#: paperless_mail/models.py:161
 msgid "action"
 msgstr "actie"
 
-#: paperless_mail/models.py:140
+#: paperless_mail/models.py:167
 msgid "action parameter"
 msgstr "actie parameters"
 
-#: paperless_mail/models.py:142
+#: paperless_mail/models.py:169
 msgid ""
 "Additional parameter for the action selected above, i.e., the target folder "
 "of the move to folder action."
@@ -545,22 +586,22 @@ msgstr ""
 "Extra parameters voor de hierboven gekozen actie, met andere woorden: de "
 "bestemmingsmap voor de verplaats-actie."
 
-#: paperless_mail/models.py:148
+#: paperless_mail/models.py:175
 msgid "assign title from"
 msgstr "wijs titel toe van"
 
-#: paperless_mail/models.py:158
+#: paperless_mail/models.py:185
 msgid "assign this tag"
 msgstr "wijs dit etiket toe"
 
-#: paperless_mail/models.py:166
+#: paperless_mail/models.py:193
 msgid "assign this document type"
 msgstr "wijs dit documenttype toe"
 
-#: paperless_mail/models.py:170
+#: paperless_mail/models.py:197
 msgid "assign correspondent from"
 msgstr "wijs correspondent toe van"
 
-#: paperless_mail/models.py:180
+#: paperless_mail/models.py:207
 msgid "assign this correspondent"
 msgstr "wijs deze correspondent toe"

From 25444034abbdd89fe8c382e485bcc498d5369bed Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Thu, 7 Jan 2021 15:04:15 +0100
Subject: [PATCH 0716/1300] Update README.md

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5c5fa4a76..b3843d751 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,9 @@ For a complete list of changes from paperless, check out the [changelog](https:/
 
 - Make the front end nice (except mobile).
 - Fix whatever bugs I and you find.
+- Start using CI to build the app.
+- Simplify updates.
+- Make the documentation nice.
 
 ## Roadmap for versions beyond 1.0
 
@@ -64,12 +67,10 @@ These are things that I want to add to paperless eventually. They are sorted by
 - **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like:
   - Group and limit search results by correspondent, show “more from this” links in the results.
 - **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system.
-- **Localization.** I won't translate paperless into any other languages except English and German, however, I'll add the necessary means so that anyone can translate paperless into their favorite language.
 - **An interactive consumer** that shows its progress for documents it processes on the web page.
 	- With live updates and websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particularly happy about.
 	- Notifications when a document was added with buttons to open the new document right away.
 - **Arbitrary tag colors**. Allow the selection of any color with a color picker.
-- **More file types**. Possibly allow more file types to be processed by paperless, such as office .odt, .doc and .docx documents.
 
 Apart from that, paperless is pretty much feature complete.
 

From fc82121604fbec5aad1c7e04b27e49557523f922 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 7 Jan 2021 15:20:00 +0100
Subject: [PATCH 0717/1300] update tests, remove dead code

---
 src/documents/serialisers.py    |  7 -------
 src/documents/tests/test_api.py | 19 +++++++++++++++++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 66f5f883f..70a44d3fd 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -382,13 +382,6 @@ class PostDocumentSerializer(serializers.Serializer):
 
         return document.name, document_data
 
-    def validate_title(self, title):
-        if title:
-            return title
-        else:
-            # do not return empty strings.
-            return None
-
     def validate_correspondent(self, correspondent):
         if correspondent:
             return correspondent.id
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index dbe8f881c..5f81b83b6 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -114,8 +114,6 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         results = response.data['results']
         self.assertEqual(len(results[0]), 0)
 
-
-
     def test_document_actions(self):
 
         _, filename = tempfile.mkstemp(dir=self.dirs.originals_dir)
@@ -455,6 +453,23 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertIsNone(kwargs['override_document_type_id'])
         self.assertIsNone(kwargs['override_tag_ids'])
 
+    @mock.patch("documents.views.async_task")
+    def test_upload_empty_metadata(self, m):
+
+        with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f:
+            response = self.client.post("/api/documents/post_document/", {"document": f, "title": "", "correspondent": "", "document_type": ""})
+
+        self.assertEqual(response.status_code, 200)
+
+        m.assert_called_once()
+
+        args, kwargs = m.call_args
+        self.assertEqual(kwargs['override_filename'], "simple.pdf")
+        self.assertIsNone(kwargs['override_title'])
+        self.assertIsNone(kwargs['override_correspondent_id'])
+        self.assertIsNone(kwargs['override_document_type_id'])
+        self.assertIsNone(kwargs['override_tag_ids'])
+
     @mock.patch("documents.views.async_task")
     def test_upload_invalid_form(self, m):
 

From 0a469cfdd112b0aaae9a7576c688dffd8976142e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 7 Jan 2021 16:58:38 +0100
Subject: [PATCH 0718/1300] test case for localized index view

---
 src/documents/tests/test_views.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/documents/tests/test_views.py

diff --git a/src/documents/tests/test_views.py b/src/documents/tests/test_views.py
new file mode 100644
index 000000000..ccc41666a
--- /dev/null
+++ b/src/documents/tests/test_views.py
@@ -0,0 +1,30 @@
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.test import TestCase
+
+
+class TestViews(TestCase):
+
+    def setUp(self) -> None:
+        self.user = User.objects.create_user("testuser")
+
+    def test_login_redirect(self):
+        response = self.client.get('/')
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, "/accounts/login/?next=/")
+
+    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")]:
+            if language_given:
+                self.client.cookies.load({settings.LANGUAGE_COOKIE_NAME: language_given})
+            elif settings.LANGUAGE_COOKIE_NAME in self.client.cookies.keys():
+                self.client.cookies.pop(settings.LANGUAGE_COOKIE_NAME)
+
+            response = self.client.get('/', )
+            self.assertEqual(response.status_code, 200)
+            self.assertEqual(response.context_data['webmanifest'], f"frontend/{language_actual}/manifest.webmanifest")
+            self.assertEqual(response.context_data['styles_css'], f"frontend/{language_actual}/styles.css")
+            self.assertEqual(response.context_data['runtime_js'], f"frontend/{language_actual}/runtime.js")
+            self.assertEqual(response.context_data['polyfills_js'], f"frontend/{language_actual}/polyfills.js")
+            self.assertEqual(response.context_data['main_js'], f"frontend/{language_actual}/main.js")

From 1170827f3dfbb33a85ed34d581d5defe1a75eeea Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 7 Jan 2021 18:42:46 +0100
Subject: [PATCH 0719/1300] update docker ignore

---
 .dockerignore | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.dockerignore b/.dockerignore
index 065d2a7e6..a332c2ee7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
+**/__pycache__
 /src-ui/.vscode
 /src-ui/node_modules
 /src-ui/dist
@@ -10,3 +11,9 @@
 .pytest_cache
 /dist
 /scripts
+/resources
+**/tests
+**/*.spec.ts
+**/htmlcov
+/src/.pytest_cache
+.idea

From d3ab4d2f11ffc3d89eca4f14c76d92a0d465c7cd Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Thu, 7 Jan 2021 19:33:27 +0100
Subject: [PATCH 0720/1300] Update README.md

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index b3843d751..04cbdc41b 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,12 @@ Read the section about [migration](https://paperless-ng.readthedocs.io/en/latest
 
 The documentation for Paperless-ng is available on [ReadTheDocs](https://paperless-ng.readthedocs.io/).
 
+# Translation
+
+Paperless is currently available in English, German, Dutch and French. Translation is coordinated at transifex: https://www.transifex.com/paperless/paperless-ng
+
+If you want to see paperless in your own language, request that language at transifex and you can start translating after I approve the language.
+
 # Suggestions? Questions? Something not working?
 
 Please open an issue and start a discussion about it!

From 38f279fd2a6175dc1ac29c694e7c675ecbfadf70 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 7 Jan 2021 21:16:16 +0100
Subject: [PATCH 0721/1300] update installation instructions

---
 docker/hub/docker-compose.postgres.yml |   2 +-
 docker/hub/docker-compose.sqlite.yml   |   2 +-
 docker/hub/docker-compose.tika.yml     |   2 +-
 docs/administration.rst                |  44 ++------
 docs/setup.rst                         | 133 +++++++++++++------------
 docs/troubleshooting.rst               |   2 +-
 6 files changed, 81 insertions(+), 104 deletions(-)

diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index d7673d891..f821a6781 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.12
+    image: jonaswinkler/paperless-ng:latest
     restart: always
     depends_on:
       - db
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index 054eb52d3..cc26dc46c 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.12
+    image: jonaswinkler/paperless-ng:latest
     restart: always
     depends_on:
       - broker
diff --git a/docker/hub/docker-compose.tika.yml b/docker/hub/docker-compose.tika.yml
index 47c477bef..7ad7685d3 100644
--- a/docker/hub/docker-compose.tika.yml
+++ b/docker/hub/docker-compose.tika.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.12
+    image: jonaswinkler/paperless-ng:latest
     restart: always
     depends_on:
       - broker
diff --git a/docs/administration.rst b/docs/administration.rst
index 727d9a9d5..bc728943e 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -53,7 +53,7 @@ Restoring
 
 .. _administration-updating:
 
-Updating paperless
+Updating Paperless
 ##################
 
 If a new release of paperless-ng is available, upgrading depends on how you
@@ -69,50 +69,26 @@ First of all, ensure that paperless is stopped.
 
 After that, :ref:`make a backup <administration-backup>`.
 
-A.  If you used the dockerfiles archive, simply download the files of the new release,
-    adjust the settings in the files (i.e., the path to your consumption directory),
-    and replace your existing docker-compose files. Then start paperless as usual,
-    which will pull the new image, and update your database, if necessary:
+A.  If you pull the image from the docker hub, all you need to do is:
 
     .. code:: shell-session
 
-        $ cd /path/to/paperless
+        $ docker-compose pull
         $ docker-compose up
-
-    If you see everything working, you can start paperless-ng with "-d" to have it
-    run in the background.
-
-    .. hint::
-
-        The released docker-compose files specify exact versions to be pulled from the hub.
-        This is to ensure that if the docker-compose files should change at some point
-        (i.e., services updates/configured differently), you wont run into trouble due to
-        docker pulling the ``latest`` image and running it in an older environment.
+    
+    The docker-compose files refer to the ``latest`` version, which is always the latest
+    stable release.
         
-B.  If you built the image yourself, grab the new archive and replace your current
-    paperless folder with the new contents.
-
-    After that, make the necessary adjustments to the docker-compose.yml (i.e.,
-    adjust your consumption directory).
-
-    Build and start the new image with:
+B.  If you built the image yourself, do the following:
 
     .. code:: shell-session
 
-        $ cd /path/to/paperless
+        $ git pull
         $ docker-compose build
         $ docker-compose up
 
-    If you see everything working, you can start paperless-ng with "-d" to have it
-    run in the background.
-
-.. hint::
-
-    You can usually keep your ``docker-compose.env`` file, since this file will
-    never include mandatory configuration options. However, it is worth checking
-    out the new version of this file, since it might have new recommendations
-    on what to configure.
-
+If you see everything working, you can start paperless-ng with "-d" to have it
+run in the background.
 
 Updating paperless without docker
 =================================
diff --git a/docs/setup.rst b/docs/setup.rst
index ddd246b16..5a38c3241 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -3,35 +3,6 @@
 Setup
 *****
 
-Download
-########
-
-Go to the project page on GitHub and download the
-`latest release <https://github.com/jonaswinkler/paperless-ng/releases>`_.
-There are multiple options available.
-
-*   Download the dockerfiles archive if you want to pull paperless from
-    Docker Hub.
-
-*   Download the dist archive and extract it if you want to build the docker image
-    yourself or want to install paperless without docker.
-
-.. hint::
-
-    In contrast to paperless, the recommended way to get and update paperless-ng
-    is not to pull the entire git repository. Paperless-ng includes artifacts
-    that need to be compiled, and that's already done for you in the release.
-
-.. admonition:: Want to try out paperless-ng before migrating?
-
-    The release contains a file ``.env`` which sets the docker-compose project
-    name to "paperless", which is the same as before and instructs docker-compose
-    to reuse and upgrade your paperless volumes.
-
-    Just rename the project name in that file to anything else and docker-compose
-    will create fresh volumes for you!
-
-
 Overview of Paperless-ng
 ########################
 
@@ -110,22 +81,33 @@ Installation
 
 You can go multiple routes with setting up and running Paperless:
 
-* The `docker route`_
-* The `bare metal route`_
+* :ref:`Pull the image from Docker Hub <setup-docker_hub>`
+* :ref:`Build the Docker image yourself <setup-docker_build>`
+* :ref:`Install Paperless directly on your system (bare metal) <setup-bare_metal>`
 
-The `docker route`_ is quick & easy. This is the recommended route. This configures all the stuff
+The Docker routes are quick & easy. These are the recommended routes. This configures all the stuff
 from above automatically so that it just works and uses sensible defaults for all configuration options.
 
-The `bare metal route`_ is more complicated to setup but makes it easier
+The bare metal route is more complicated to setup but makes it easier
 should you want to contribute some code back. You need to configure and
 run the above mentioned components yourself.
 
-.. _setup-docker_route:
+.. _setup-docker_hub:
 
-Docker Route
-============
+Install Paperless from Docker Hub
+=================================
 
-1.  Install `Docker`_ and `docker-compose`_. [#compose]_
+1.  Go to the `project page <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/hub>`_
+    and download one of the ``docker-compose.*.yml`` files, depending on which database backend you
+    want to use. Download the ``docker-compose.env`` file and the ``.env`` file as well and store them
+    in the same directory.
+
+    .. hint::
+
+        For new installations, it is recommended to use PostgreSQL as the database
+        backend.
+
+2.  Install `Docker`_ and `docker-compose`_.
 
     .. caution::
 
@@ -142,15 +124,8 @@ Docker Route
         .. _Docker installation guide: https://docs.docker.com/engine/installation/
         .. _docker-compose installation guide: https://docs.docker.com/compose/install/
 
-2.  Copy either ``docker-compose.sqlite.yml`` or ``docker-compose.postgres.yml`` to
-    ``docker-compose.yml``, depending on which database backend you want to use.
 
-    .. hint::
-
-        For new installations, it is recommended to use PostgreSQL as the database
-        backend.
-
-2.  Modify ``docker-compose.yml`` to your preferences. You may want to change the path
+3.  Modify ``docker-compose.yml`` to your preferences. You may want to change the path
     to the consumption directory in this file. Find the line that specifies where
     to mount the consumption directory:
 
@@ -167,7 +142,7 @@ Docker Route
     Don't change the part after the colon or paperless wont find your documents.
 
 
-3.  Modify ``docker-compose.env``, following the comments in the file. The
+4.  Modify ``docker-compose.env``, following the comments in the file. The
     most important change is to set ``USERMAP_UID`` and ``USERMAP_GID``
     to the uid and gid of your user on the host system. This ensures that
     both the docker container and you on the host machine have write access
@@ -177,7 +152,7 @@ Docker Route
 
     .. note::
 
-        You can use any settings from the file ``paperless.conf`` in this file.
+        You can use any settings from the file ``paperless.conf.example`` in this file.
         Have a look at :ref:`configuration` to see whats available.
     
     .. caution::
@@ -188,11 +163,10 @@ Docker Route
         with the default configuration. You will need to use ``PAPERLESS_CONSUMER_POLLING``,
         which will disable inotify. See :ref:`here <configuration-polling>`.
 
-4.  Run ``docker-compose up -d``. This will create and start the necessary
-    containers. This will also build the image of paperless if you grabbed the
-    source archive.
+5.  Run ``docker-compose up -d``. This will create and start the necessary
+    containers.
 
-5.  To be able to login, you will need a super user. To create it, execute the
+6.  To be able to login, you will need a super user. To create it, execute the
     following command:
 
     .. code-block:: shell-session
@@ -202,7 +176,7 @@ Docker Route
     This will prompt you to set a username, an optional e-mail address and
     finally a password.
 
-6.  The default ``docker-compose.yml`` exports the webserver on your local port
+7.  The default ``docker-compose.yml`` exports the webserver on your local port
     8000. If you haven't adapted this, you should now be able to visit your
     Paperless instance at ``http://127.0.0.1:8000``. You can login with the
     user and password you just created.
@@ -210,11 +184,33 @@ Docker Route
 .. _Docker: https://www.docker.com/
 .. _docker-compose: https://docs.docker.com/compose/install/
 
-.. [#compose] You of course don't have to use docker-compose, but it
-   simplifies deployment immensely. If you know your way around Docker, feel
-   free to tinker around without using compose!
+.. _setup-docker_build:
 
-.. _`setup-bare_metal`:
+Build the docker image yourself
+===============================
+
+1.  Clone the entire repository of paperless:
+
+    .. code:: shell-session
+
+        git clone https://github.com/jonaswinkler/paperless-ng
+    
+    The master branch always reflects the latest stable version.
+
+2.  Copy one of the ``docker-compose.*.yml`` to ``docker-compose.yml``,
+    depending on which database backend you want to use. Copy
+    ``docker-compose.env.example`` to ``docker-compose.env``.
+
+3.  Follow steps 2 to 7 of :ref:`setup-docker_hub`. When asked to run
+    ``docker-compose up -d`` to start the containers, do
+    
+    .. code:: shell-session
+
+        $ docker-compose build
+    
+    before that to build the image.
+
+.. _setup-bare_metal:
 
 Bare Metal Route
 ================
@@ -229,6 +225,7 @@ writing. Windows is not and will never be supported.
     *   ``python3-pip``, optionally ``pipenv`` for package installation
     *   ``python3-dev``
 
+    *   ``gettext`` for localization
     *   ``fonts-liberation`` for generating thumbnails for plain text files
     *   ``imagemagick`` >= 6 for PDF conversion
     *   ``optipng`` for optimizing thumbnails
@@ -258,8 +255,9 @@ writing. Windows is not and will never be supported.
 3.  Optional. Install ``postgresql`` and configure a database, user and password for paperless. If you do not wish
     to use PostgreSQL, SQLite is avialable as well.
 
-4.  Get the release archive. If you pull the git repo as it is, you also have to compile the front end by yourself.
-    Extract the frontend to a place from where you wish to execute it, such as ``/opt/paperless``.
+4.  Get the release archive from `<https://github.com/jonaswinkler/paperless-ng/releases>`_.
+    If you clone the git repo as it is, you also have to compile the front end by yourself.
+    Extract the archive to a place from where you wish to execute it, such as ``/opt/paperless``.
 
 5.  Configure paperless. See :ref:`configuration` for details. Edit the included ``paperless.conf`` and adjust the
     settings to your needs. Required settings for getting paperless running are:
@@ -372,6 +370,11 @@ writing. Windows is not and will never be supported.
     .. code::
 
         <policy domain="coder" rights="read|write" pattern="PDF" />
+    
+13. Optional: Install the `jbig2enc <https://ocrmypdf.readthedocs.io/en/latest/jbig2.html>`_
+    encoder. This will reduce the size of generated PDF documents. You'll most likely need
+    to compile this by yourself, because this software has been patented until around 2017 and
+    binary packages are not available for most distributions.
 
 Migration to paperless-ng
 #########################
@@ -406,13 +409,14 @@ Migration to paperless-ng is then performed in a few simple steps:
     paperless.
 
 3.  Download the latest release of paperless-ng. You can either go with the
-    docker-compose files or use the archive to build the image yourself.
+    docker-compose files from `here <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/hub>`_
+    or clone the repository to build the image yourself.
     You can either replace your current paperless folder or put paperless-ng
     in a different location.
 
     .. caution::
 
-        The release include a ``.env`` file. This will set the
+        Paperless includes a ``.env`` file. This will set the
         project name for docker compose to ``paperless`` so that paperless-ng will
         automatically reuse your existing paperless volumes. When you start it, it
         will migrate your existing data. After that, your old paperless installation
@@ -422,9 +426,8 @@ Migration to paperless-ng is then performed in a few simple steps:
     If you want to switch to PostgreSQL, do that after you migrated your existing
     SQLite database.
 
-5.  Adjust ``docker-compose.yml`` and
-    ``docker-compose.env`` to your needs.
-    See `docker route`_ for details on which edits are advised.
+5.  Adjust ``docker-compose.yml`` and ``docker-compose.env`` to your needs.
+    See :ref:`setup-docker_hub` for details on which edits are advised.
 
 6.  Since ``docker-compose`` would just use the the old paperless image, we need to
     manually build a new image:
@@ -452,7 +455,7 @@ Migration to paperless-ng is then performed in a few simple steps:
     This will run paperless in the background and automatically start it on system boot.
 
 9.  Paperless installed a permanent redirect to ``admin/`` in your browser. This
-    redirect is still in place and prevents access to the new UI. Clear
+    redirect is still in place and prevents access to the new UI. Clear your
     browsing cache in order to fix this.
 
 10.  Optionally, follow the instructions below to migrate your existing data to PostgreSQL.
@@ -604,6 +607,4 @@ For details, refer to :ref:`configuration`.
     The actual matching of the algorithm is fast and works on Raspberry Pi as 
     well as on any other device.
 
-
-
 .. _redis: https://redis.io/
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index 8786657db..b8343710f 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -75,6 +75,6 @@ You might encounter errors such as:
 
 This happens when paperless does not have permission to delete files inside the consumption directory.
 Ensure that ``USERMAP_UID`` and ``USERMAP_GID`` are set to the user id and group id you use on the host operating system, if these are
-different from ``1000``. See :ref:`setup-docker_route`.
+different from ``1000``. See :ref:`setup-docker_hub`.
 
 Also ensure that you are able to read and write to the consumption directory on the host.

From b463428a408b789b04a8143a541ce434c9e1ea6f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 8 Jan 2021 02:15:42 +0100
Subject: [PATCH 0722/1300] tika documentation

---
 docs/configuration.rst | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index ae4a8b7c8..d122216a1 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -294,9 +294,6 @@ converting "Office" documents (such as ".doc", ".xlsx" and ".odt"). If you
 wish to use this, you must provide a Tika server and a Gotenberg server,
 configure their endpoints, and enable the feature.
 
-If you run paperless on docker, you can add those services to the docker-compose
-file (see the examples provided).
-
 PAPERLESS_TIKA_ENABLED=<bool>
     Enable (or disable) the Tika parser.
 
@@ -312,6 +309,40 @@ PAPERLESS_TIKA_GOTENBERG_ENDPOINT=<url>
 
     Defaults to "http://localhost:3000".
 
+If you run paperless on docker, you can add those services to the docker-compose
+file (see the provided ``docker-compose.tika.yml`` file for reference). The changes
+requires are as follows:
+
+.. code:: yaml
+
+    services:
+        # ...
+
+        webserver:
+            # ...
+
+            environment:
+                # ...
+
+                PAPERLESS_TIKA_ENABLED: 1
+                PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
+                PAPERLESS_TIKA_ENDPOINT: http://tika:9998
+        
+        # ...
+
+        gotenberg:
+            image: thecodingmachine/gotenberg
+            restart: unless-stopped
+            environment:
+                DISABLE_GOOGLE_CHROME: 1
+
+        tika:
+            image: apache/tika
+            restart: unless-stopped
+
+Add the configuration variables to the environment of the webserver (alternatively
+put the configuration in the ``docker-compose.env`` file) and add the additional
+services below the webserver service. Watch out for indentation.
 
 Software tweaks
 ###############

From c980a52244e71baa62d65b4cb8f16afc72144a45 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 7 Jan 2021 19:23:59 -0800
Subject: [PATCH 0723/1300] Fix transition for Safari

---
 src-ui/src/app/components/app-frame/app-frame.component.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index 6809875eb..e4b21add7 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -113,7 +113,7 @@
     background-color: rgba(0, 0, 0, 0.15);
     padding-left: 1.8rem;
     border-color: rgba(255, 255, 255, 0.2);
-    transition: flex 0.3s ease;
+    transition: all .3s ease, padding-left 0s ease, background-color 0s ease; // Safari requires all
     max-width: 600px;
     min-width: 300px; // 1/2 max
 

From 42064df3e091a559738f2915a1ae5344fc0f860b Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 8 Jan 2021 11:23:17 +0100
Subject: [PATCH 0724/1300] Testing excluding docker builds if not specific ref
 is selected

---
 .github/workflows/docker-publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a3329b7ba..14a4eb042 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -87,6 +87,7 @@ jobs:
   buildx:
     runs-on: ubuntu-latest
     needs: [tests, documentation, frontend]
+    if: github.ref == 'refs/heads/github-action-test'
     steps:
       - uses: actions/checkout@v2
 

From 968725f09feb9bc1482c7f7115355e524bba1577 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 8 Jan 2021 11:33:08 +0100
Subject: [PATCH 0725/1300] Separate github action into separete workflow files

---
 .../{docker-publish.yml => docker.yml}        | 78 -------------------
 .github/workflows/documentation.yml           | 32 ++++++++
 .github/workflows/frontend.yml                | 16 ++++
 .github/workflows/test.yml                    | 43 ++++++++++
 4 files changed, 91 insertions(+), 78 deletions(-)
 rename .github/workflows/{docker-publish.yml => docker.yml} (50%)
 create mode 100644 .github/workflows/documentation.yml
 create mode 100644 .github/workflows/frontend.yml
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker.yml
similarity index 50%
rename from .github/workflows/docker-publish.yml
rename to .github/workflows/docker.yml
index 14a4eb042..338ae85a9 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker.yml
@@ -5,84 +5,6 @@ on:
     branches: travis-multiarch-builds
 
 jobs:
-  tests:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-20.04]
-        python: 
-          - 3.6.8
-          - 3.7.9
-          - 3.8.6
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install python version
-      uses: gabrielfalcao/pyenv-action@v7
-      with:
-        default: "${{ matrix.python }}"
-        command: "pip install -U pip"
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-    - name: Persistent Github pip cache
-      uses: actions/cache@v2
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip${{ matrix.python }}
-    - name: Tests
-      env: 
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-        pip install --upgrade pipenv
-        pipenv install --system --dev
-        cd src/
-        pipenv run pytest --cov
-        pipenv run pycodestyle
-        pipenv run coveralls
-  documentation:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install python version
-      uses: gabrielfalcao/pyenv-action@v7
-      with:
-        default: "3.6.8"
-        command: "pip install -U pip"    
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-    - name: Persistent Github pip cache
-      uses: actions/cache@v2
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip3.6.8}
-    - name: dependencies
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-        pip install --upgrade pipenv
-        pipenv install --system --dev
-    - name: make
-      run: |
-        cd docs/
-        make html
-  frontend:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: '15'
-    - name: build
-      run: |
-        cd src-ui/
-        npm install -g @angular/cli
-        npm install
-        ng build --prod
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
new file mode 100644
index 000000000..2e2e84e84
--- /dev/null
+++ b/.github/workflows/documentation.yml
@@ -0,0 +1,32 @@
+name: backend-tests
+
+# always run documentation workflow to ensure the documentation can still be built
+on: push
+
+# possibly add a publish job for automatic read-the-docs publishing
+jobs:
+  documentation:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install python version
+      uses: gabrielfalcao/pyenv-action@v7
+      with:
+        default: "3.6.8"
+        command: "pip install -U pip"    
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+    - name: Persistent Github pip cache
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key: ${{ runner.os }}-pip3.6.8}
+    - name: dependencies
+      run: |
+        pip install 'sphinx~=3.3' sphinx_rtd_theme
+    - name: make
+      run: |
+        cd docs/
+        make html
\ No newline at end of file
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
new file mode 100644
index 000000000..64df45127
--- /dev/null
+++ b/.github/workflows/frontend.yml
@@ -0,0 +1,16 @@
+
+
+jobs:
+  frontend:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '15'
+    - name: build
+      run: |
+        cd src-ui/
+        npm install -g @angular/cli
+        npm install
+        ng build --prod
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000..930f368e7
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,43 @@
+name: backend-tests
+
+# always run tests workflow
+on: push
+
+jobs:
+  tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+        python: 
+          - 3.6.8
+          - 3.7.9
+          - 3.8.6
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install python version
+      uses: gabrielfalcao/pyenv-action@v7
+      with:
+        default: "${{ matrix.python }}"
+        command: "pip install -U pip"
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+    - name: Persistent Github pip cache
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key: ${{ runner.os }}-pip${{ matrix.python }}
+    - name: Tests
+      env: 
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+        pip install --upgrade pipenv
+        pipenv install --system --dev
+        cd src/
+        pipenv run pytest --cov
+        pipenv run pycodestyle
+        pipenv run coveralls

From 29f73b2dbbe317bfaee34ff8b2e738ee50bf9805 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 8 Jan 2021 11:34:04 +0100
Subject: [PATCH 0726/1300] Give the frontend workflow a name

---
 .github/workflows/frontend.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 64df45127..ad44fb717 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -1,4 +1,7 @@
+name: frontend
 
+# always run frontend workflow
+on: push
 
 jobs:
   frontend:

From fad6e7284af285188db58e90b8c0cd1e997aad62 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 8 Jan 2021 13:27:57 +0100
Subject: [PATCH 0727/1300] fixes #290

---
 src/paperless/settings.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 8c91938aa..d0e32b4a0 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -90,7 +90,6 @@ INSTALLED_APPS = [
     "documents.apps.DocumentsConfig",
     "paperless_tesseract.apps.PaperlessTesseractConfig",
     "paperless_text.apps.PaperlessTextConfig",
-    "paperless_tika.apps.PaperlessTikaConfig",
     "paperless_mail.apps.PaperlessMailConfig",
 
     "django.contrib.admin",
@@ -461,6 +460,9 @@ PAPERLESS_TIKA_GOTENBERG_ENDPOINT = os.getenv(
     "PAPERLESS_TIKA_GOTENBERG_ENDPOINT", "http://localhost:3000"
 )
 
+if PAPERLESS_TIKA_ENABLED:
+    INSTALLED_APPS.append("paperless_tika.apps.PaperlessTikaConfig")
+
 # List dates that should be ignored when trying to parse date from document text
 IGNORE_DATES = set()
 for s in os.getenv("PAPERLESS_IGNORE_DATES", "").split(","):

From 34a06435cfd7972ebadb5ad49721b2a832d9e079 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 8 Jan 2021 13:39:12 +0100
Subject: [PATCH 0728/1300] changelog and version

---
 docker/hub/docker-compose.postgres.yml      | 2 +-
 docker/hub/docker-compose.sqlite.yml        | 2 +-
 docker/hub/docker-compose.tika.yml          | 2 +-
 docs/changelog.rst                          | 6 ++++++
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index d7673d891..dc32a5d84 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.12
+    image: jonaswinkler/paperless-ng:0.9.13
     restart: always
     depends_on:
       - db
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index 054eb52d3..ffb8a0560 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.12
+    image: jonaswinkler/paperless-ng:0.9.13
     restart: always
     depends_on:
       - broker
diff --git a/docker/hub/docker-compose.tika.yml b/docker/hub/docker-compose.tika.yml
index 47c477bef..a303ba206 100644
--- a/docker/hub/docker-compose.tika.yml
+++ b/docker/hub/docker-compose.tika.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.12
+    image: jonaswinkler/paperless-ng:0.9.13
     restart: always
     depends_on:
       - broker
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 94619896f..69b3090ee 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,12 @@
 Changelog
 *********
 
+paperless-ng 0.9.13
+###################
+
+* Fixed an issue with Paperless not starting due to the new Tika integration when ``USERMAP_UID`` and ``USERMAP_GID`` was used
+  in the ``docker-compose.env`` file.
+
 paperless-ng 0.9.12
 ###################
 
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 07a84e660..de212d2d5 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,5 +2,5 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "0.9.12"
+  version: "0.9.13"
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index b9f980934..f5815078f 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (0, 9, 12)
+__version__ = (0, 9, 13)

From a4ee4e9b173a028b8e0835612210492d8d58058d Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 8 Jan 2021 09:33:45 -0800
Subject: [PATCH 0729/1300] Prevent dashboard overflow on mobile

---
 .../widgets/saved-view-widget/saved-view-widget.component.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss
index 40d1c836b..4e275dc81 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss
@@ -1,7 +1,8 @@
 table {
   overflow-wrap: anywhere;
+  table-layout: fixed;
 }
 
 th:first-child {
-  min-width: 5rem;
+  width: 25%;
 }

From cde937a9ebd102ccbacbb0744d53d4747cbc8fed Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 8 Jan 2021 09:37:25 -0800
Subject: [PATCH 0730/1300] Fix dark theme highlighting of ng-select dropdowns
 on keyboard navigation

---
 src-ui/src/theme_dark.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index e65d4564e..a58745b21 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -297,7 +297,8 @@ $border-color-dark-mode: #47494f;
     }
   }
 
-  .ng-dropdown-panel .ng-dropdown-panel-items .ng-option:hover {
+  .ng-dropdown-panel .ng-dropdown-panel-items .ng-option:hover,
+  .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-marked {
     background-color: $bg-light-dark-mode;
   }
 

From 52640f08d2c9026cb55f05e869cd5ca0839de053 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 8 Jan 2021 20:37:25 +0100
Subject: [PATCH 0731/1300] github action improved tagging

---
 .github/workflows/docker.yml        | 24 +++++++++++++-----------
 .github/workflows/documentation.yml |  1 +
 .github/workflows/frontend.yml      |  2 +-
 .github/workflows/test.yml          |  4 ++--
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 338ae85a9..715474a85 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,32 +1,34 @@
-name: Docker
+name: docker
 
 on:
   push:
-    branches: travis-multiarch-builds
+    branches:
+    - master
+    - dev
+    tags:
+    - 'ng-*'
 
 jobs:
-  # Build and push image to docker hub.
+  # build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest
-    needs: [tests, documentation, frontend]
-    if: github.ref == 'refs/heads/github-action-test'
     steps:
       - uses: actions/checkout@v2
-
       - name: Prepare
         id: prepare
+        env:
+          DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
         run: |
-          DOCKER_IMAGE=moztr/paperless-ng
           DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64/v8
           VERSION=edge
           if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/v}
+            VERSION=${GITHUB_REF#refs/tags/}
           fi
-          if [ "${{ github.event_name }}" = "schedule" ]; then
-            VERSION=nightly
+          if [[ $GITHUB_REF == refs/heads/* ]]; then
+            VERSION=${GITHUB_REF#refs/heads/}
           fi
           TAGS="--tag ${DOCKER_IMAGE}:${VERSION}"
-          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+          if [[ $VERSION == "master" ]]; then
             TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest"
           fi
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 2e2e84e84..12bd3577d 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -24,6 +24,7 @@ jobs:
         path: ${{ steps.pip-cache.outputs.dir }}
         key: ${{ runner.os }}-pip3.6.8}
     - name: dependencies
+      # instead of directly installing the dependency in the workflow file, can this be done using the pipfile instead?
       run: |
         pip install 'sphinx~=3.3' sphinx_rtd_theme
     - name: make
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index ad44fb717..66a9a9b0c 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -1,6 +1,6 @@
 name: frontend
 
-# always run frontend workflow
+# always run frontend workflow to see if it builds and tests run fine
 on: push
 
 jobs:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 930f368e7..1a235f763 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,8 +8,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        python: 
+        os: ubuntu-20.04]
+        python: # pyenv-action requires the exact version
           - 3.6.8
           - 3.7.9
           - 3.8.6

From f4f9200fba9d30e2c3039f1c7fb81d4f903abe95 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 8 Jan 2021 20:39:20 +0100
Subject: [PATCH 0732/1300] Fix typo in yaml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1a235f763..ec601d57e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ubuntu-20.04]
+        os: [ubuntu-20.04]
         python: # pyenv-action requires the exact version
           - 3.6.8
           - 3.7.9

From a2b5fb8374ed2c3df1b9f2c11ba6455dc6ec6f30 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 8 Jan 2021 20:42:17 +0100
Subject: [PATCH 0733/1300] Fix name of documentation workflow

---
 .github/workflows/documentation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 12bd3577d..67047d6cd 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -1,4 +1,4 @@
-name: backend-tests
+name: documentation
 
 # always run documentation workflow to ensure the documentation can still be built
 on: push

From 6cf20a93d0fc4829baa17a5e90ab5a858877422f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 8 Jan 2021 11:55:50 -0800
Subject: [PATCH 0734/1300] Set explicit svg height, hide on mobile

---
 src-ui/src/app/components/dashboard/dashboard.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 50bd44a4e..47751fe8b 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -1,5 +1,5 @@
 <app-page-header title="Dashboard" [subTitle]="subtitle" i18n-title>
-  <svg class="logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.64" height="100%" width="auto">
+  <svg class="logo d-none d-md-block" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.64" height="5rem" width="auto">
     <path class="leaf" d="M730.71,0C616.3,266.24,66.21,299.25,242.24,728.31c2.2,5.5-40.71,63.81-69.31,112.22-6.6-24.21-14.3-50.61-13.2-52.81C302.75,618.29,57.41,522.58,44.21,384-17.4,494-39.4,686.5,146.53,797.62c1.1,0,9.9,41.81,14.3,62.71-4.4,8.8-8.8,17.6-11,24.2-4.4,11,28.6,9.91,28.6,12.11,3.3-1.1,81.41-138.63,83.61-139.73C704.31,655.7,782.42,257.44,730.71,0ZM105.82,544.58C145.43,580.89,211.44,692,155.33,756.91,168.53,727.21,172.93,660.1,105.82,544.58ZM269.74,670C200.43,506.08,404,325.65,505.18,280.54,298.35,465.37,263.14,602.89,269.74,670Z" transform="translate(0)" style="fill:#17541f"/>
     <path class="text" style="fill:#000" d="M1169.27,231.44q.7,17.06.71,38.73t-.71,38a112,112,0,0,1-6.76,38A100.16,100.16,0,0,1,1142.25,380a93.87,93.87,0,0,1-33.76,23.46q-20.25,8.54-46.56,8.53h-36.25V597.5q0,9.94,2.85,14.57c1.89,3.08,3.79,4.86,5.68,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.56-.71,7.1-5.33t3.56-14.57V166q0-10.66-3.56-15.28t-7.1-6q-2.85-1.42-8.53,0V127.66h104.48q26.31,0,46.56,8.53a93.75,93.75,0,0,1,33.76,23.46,101,101,0,0,1,20.26,33.4A111.05,111.05,0,0,1,1169.27,231.44ZM1118.8,215.8q0-18.48-6-32t-14.22-21.32a74.68,74.68,0,0,0-17.06-12.44q-8.88-4.62-15.28-4.62h-40.52V392.79h40.52q6.39,0,15.28-3.56t17.06-12.44a86,86,0,0,0,14.22-21.67q6-12.8,6-32Zm337.63,389.52a27.35,27.35,0,0,1-2.85,11.72,40.58,40.58,0,0,1-8.17,11.38,54.8,54.8,0,0,1-13.5,9.59,40.07,40.07,0,0,1-18.84,4.27,60,60,0,0,1-30.57-7.82q-13.5-7.82-18.48-20.61a56.12,56.12,0,0,1-6.39-16.35q-9.24,19.18-28.08,32a72.42,72.42,0,0,1-41.58,12.8q-28.44,0-49.76-20.61-12.07-10.67-19.9-27.73t-9.24-39.09q-.71-2.13-.71-8.53v-.71a124.43,124.43,0,0,1,4.26-25.23,113.22,113.22,0,0,1,11-26.3,149.46,149.46,0,0,1,17.77-24.88,128.6,128.6,0,0,1,22.39-20.26,17.39,17.39,0,0,0,4.62-3.2,28.53,28.53,0,0,1,5.33-3.91l2.13-1.06,2.14-1.07q12.8-7.81,22.39-14.22t17.41-12.08a97.25,97.25,0,0,0,8.53-6.4c2.84-2.37,5.93-4.73,9.24-7.1a79.43,79.43,0,0,0,12.09-10,36.51,36.51,0,0,0,8.53-13.5q4.26-7.11,4.26-17.06a67.74,67.74,0,0,0-2.13-17.77,49.09,49.09,0,0,0-14.57-27q-11.73-11.37-26-14.93a38.26,38.26,0,0,0-12.08-2.13q-19.9,0-34.12,7.11-9.24,4.26-13.51,9.59t-4.62,10a10.73,10.73,0,0,0,1.78,7.46,12.91,12.91,0,0,0,5.69,4.26,6,6,0,0,0,1.78.71,6.28,6.28,0,0,1,1.77.72,32.21,32.21,0,0,1,15.28,12.43,34,34,0,0,1,6,19.55,32.78,32.78,0,0,1-32.7,32.7,33.53,33.53,0,0,1-24.17-9.6,30.94,30.94,0,0,1-10-23.1,106.83,106.83,0,0,1,3.2-25.23,84.65,84.65,0,0,1,9.6-23.81q13.5-19.91,32.34-28.79a96.24,96.24,0,0,1,41.58-8.89,93.82,93.82,0,0,1,33.76,6.4,96.18,96.18,0,0,1,29.86,18.13,103.38,103.38,0,0,1,22,28.07q8.88,16.35,8.88,37.68v209q0,12.79.36,16.7t.36,5.34h0q0,9.24,5.68,14.92a18.45,18.45,0,0,0,13.51,5.69q9.24,0,14.92-5.33a20.62,20.62,0,0,0,6.4-13.86Zm-111.6-17.77a52.58,52.58,0,0,0,6.76-21.33q1.07-11.37,1.06-21.32V413.4a63.92,63.92,0,0,1-6,5.33,74,74,0,0,0-6.75,6q-20.62,14.93-35.19,27.37a164.06,164.06,0,0,0-24.52,25.59,113,113,0,0,0-15.64,28.07,121,121,0,0,0-7.11,34.12v10.67q.72,27,14.58,42.29t39.44,15.28a38.56,38.56,0,0,0,20.62-5.69q9.24-6.39,12.79-14.92Zm244.52-304.23q40.51.72,64.68,24.53t24.17,75.7V542.77q0,51.88-24.17,75.34T1589.35,643h-2.13a80.27,80.27,0,0,1-22-2.84h-.71a.63.63,0,0,1-.71-.71,91.74,91.74,0,0,1-28.43-15.64l-6.76-6.76-5.33-7.46v118q0,10,2.85,14.58c1.89,3.08,3.79,5.09,5.68,6a10.54,10.54,0,0,0,9.24,0V766h-86V748.19q5.68,2.13,8.53,0,3.56-1.43,6.75-6t3.2-14.58V326.68q0-9.94-3.2-14.57t-6.75-6q-2.85-1.43-8.53,0V289h68.23v27.72a68.68,68.68,0,0,1,12.09-14.21,75.62,75.62,0,0,1,28.43-15.64.63.63,0,0,1,.71-.71h.71a90.55,90.55,0,0,1,22-2.85Zm35.54,84.59v-.71q-.72-36.26-8.89-51.18t-26.65-16.35a63.12,63.12,0,0,0-24.17,3.2,48,48,0,0,0-19.9,13.15q-8.54,9.24-14.22,24.88t-7.82,37V548.45q2.13,22,7.82,37.32t14.22,24.17a53.23,53.23,0,0,0,19.9,13.15,58.92,58.92,0,0,0,24.17,3.55q18.48-1.42,26.65-16.35t8.89-51.18V367.91Zm179.83-84.59a105.36,105.36,0,0,1,33.41,5.69,86.38,86.38,0,0,1,30.56,17.77,88.06,88.06,0,0,1,21.68,30.57q8.18,18.48,8.18,44.06v90.28H1757.1V544.9q0,44.07,15.28,62.9t38,18.13a113.94,113.94,0,0,0,26.65-4.62,54.83,54.83,0,0,0,22.75-13.15q9.59-9.24,16-26.3t6.4-44.78h16.35V547a153.56,153.56,0,0,1-4.27,36.61A72,72,0,0,1,1852,634.1q-16.71,7.47-40.87,8.18a102.25,102.25,0,0,1-34.83-6.4,96,96,0,0,1-32-19.19,108.91,108.91,0,0,1-23.45-30.21q-9.24-17.41-9.25-39.45v-16.7s-.11-9.12-.35-27.37-.36-29.5-.36-33.76-.11-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56A90.72,90.72,0,0,1,1771,289.37a98.55,98.55,0,0,1,33.76-6.05Zm46.2,169.89V397.05q0-27-3.55-45.13t-9.6-29.15q-6-11-14.57-15.28a42.36,42.36,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.72,73.92v56.16Zm279.35-113.73a42.31,42.31,0,0,0,.71,5.68,17.92,17.92,0,0,1,0,7.11q-.72,14.93-10.31,24.52a33,33,0,0,1-46.91-.35,33.52,33.52,0,0,1-9.6-24.17q0-17.76,13.51-27a8.33,8.33,0,0,0,1.77-1.06l1.07-1.07a16.22,16.22,0,0,0,6.4-10.31q1.41-6.75-8.53-11.73a26.26,26.26,0,0,0-12.8-3.55q-21.32-1.43-37.67,12.8t-22,49.75V597.5q0,9.94,2.84,14.57t5.69,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.55-.71,7.11-5.33t3.55-14.57V326.68q0-9.94-3.55-14.57t-7.11-6q-2.85-1.43-8.53,0V288.3h68.24v29.14q5-7.81,9.95-14.57a48.44,48.44,0,0,1,11.72-11.37,59.79,59.79,0,0,1,15.64-7.46q8.89-2.85,22.39-2.85,20.61,0,38.39,14.93t26.3,43.36Zm95.95,258q0,9.94,3.2,14.57c2.13,3.08,4.15,4.86,6,5.33q3.55,2.13,9.24,0v18.48h-86V617.4q5.68,2.13,10,0,2.13-.71,5.69-5.33t3.55-14.57V166.75q0-10.65-3.55-15.28a28.82,28.82,0,0,0-5.69-6q-4.26-2.13-10,0V128.37h67.52V597.5Zm154.25-314.18a105.25,105.25,0,0,1,33.4,5.69,86.33,86.33,0,0,1,30.57,17.77,88.19,88.19,0,0,1,21.68,30.57q8.18,18.48,8.17,44.06v90.28H2332.84V544.9q0,44.07,15.29,62.9t38,18.13a113.93,113.93,0,0,0,26.66-4.62,54.79,54.79,0,0,0,22.74-13.15q9.6-9.24,16-26.3t6.39-44.78h16.35V547a153.56,153.56,0,0,1-4.26,36.61,72,72,0,0,1-42.29,50.46q-16.71,7.47-40.88,8.18a102.24,102.24,0,0,1-34.82-6.4,96,96,0,0,1-32-19.19,108.94,108.94,0,0,1-23.46-30.21q-9.24-17.41-9.24-39.45v-16.7s-.12-9.12-.35-27.37-.36-29.5-.36-33.76-.12-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56a90.78,90.78,0,0,1,29.85-17.77,98.6,98.6,0,0,1,33.77-6.05Zm46.2,169.89V397.05q0-27-3.56-45.13t-9.59-29.15q-6-11-14.57-15.28a42.39,42.39,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.73,73.92v56.16Zm213.24,178.41c-.48.47-.83.71-1.07.71s-.59.23-1.06.71l-.71.71c-1,.47-2,1-3.2,1.42s-2.25,1-3.2,1.42q-14.93,6.4-34.83,6.4a48.79,48.79,0,0,1-22-5.33q-10.65-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.5V550.59h17.06q-1.43,22.74,5,39.09,4.27,14.22,16.71,26.65t37.31,12.44q16.35,0,27-5.68,18.48-9.24,25.24-22A45.92,45.92,0,0,0,2657,574.4q-1.42-13.86-10.31-27.37A126,126,0,0,0,2625,522.15q-8.52-6.39-17.77-13.5t-18.48-14.93q-24.87-19.91-39.45-35.89T2526.89,428a98.76,98.76,0,0,1-10.66-26.3,119.09,119.09,0,0,1-2.84-26.65,106,106,0,0,1,1.06-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,63,63,0,0,1,14.21-20.26A73.7,73.7,0,0,1,2561,288.3q13.5-5.69,32.7-5.69a53.27,53.27,0,0,1,21.32,4.62q10.66,4.62,19.19,8.53t13.51,3.56q5-.36,5-11h13.51v88.14h-18.48q.7-21.33-5-38.38a67,67,0,0,0-17.41-27Q2612.89,299,2588.73,299q-19.18,0-31.27,8.53-6.4,5-11,14.57a55.84,55.84,0,0,0-5.33,21,66.08,66.08,0,0,0,3.55,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.5,26.5,0,0,0,5.33,3.56,23,23,0,0,1,3.56,2.84l2.84,2.84q7.82,6.41,16,12.8t16.71,12.79a449.06,449.06,0,0,1,33.05,30.92,276.13,276.13,0,0,1,22,25.94,104.57,104.57,0,0,1,13.15,22.75,69,69,0,0,1,5,20.61q7.11,32.7-2.49,55.09t-24.52,35.19h-.71a1.26,1.26,0,0,1-1.43,1.42,11,11,0,0,1-2.84,2.13l-4.26,2.84-4.27,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.12,3.12,0,0,1-1.42.36Zm211.11,0c-.48.47-.83.71-1.07.71s-.59.23-1.07.71l-.71.71c-.94.47-2,1-3.2,1.42s-2.25,1-3.19,1.42Q2826.84,643,2807,643a48.76,48.76,0,0,1-22-5.33q-10.66-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.51V550.59h17.06q-1.41,22.74,5,39.09,4.26,14.22,16.7,26.65t37.32,12.44q16.35,0,27-5.68,18.48-9.24,25.23-22a45.93,45.93,0,0,0,5.34-26.65q-1.42-13.86-10.31-27.37a126,126,0,0,0-21.68-24.88q-8.53-6.39-17.77-13.5t-18.48-14.93q-24.89-19.91-39.45-35.89T2738,428a98.76,98.76,0,0,1-10.66-26.3,119.08,119.08,0,0,1-2.85-26.65,105.9,105.9,0,0,1,1.07-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,62.83,62.83,0,0,1,14.21-20.26,73.58,73.58,0,0,1,22.75-14.57q13.5-5.69,32.69-5.69a53.28,53.28,0,0,1,21.33,4.62q10.67,4.62,19.19,8.53t13.5,3.56q5-.36,5-11h13.51v88.14h-18.49q.72-21.33-5-38.38a67,67,0,0,0-17.42-27Q2824,299,2799.84,299q-19.2,0-31.28,8.53-6.39,5-11,14.57a56,56,0,0,0-5.34,21,66.3,66.3,0,0,0,3.56,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.22,26.22,0,0,0,5.33,3.56,22.83,22.83,0,0,1,3.55,2.84l2.85,2.84q7.82,6.41,16,12.8t16.7,12.79a445,445,0,0,1,33.05,30.92,274.85,274.85,0,0,1,22,25.94,105,105,0,0,1,13.15,22.75,68.69,68.69,0,0,1,5,20.61q7.11,32.7-2.48,55.09t-24.53,35.19h-.71a1.26,1.26,0,0,1-1.42,1.42,11.2,11.2,0,0,1-2.84,2.13l-4.27,2.84-4.26,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.15,3.15,0,0,1-1.42.36Z" transform="translate(0)"/>
   </svg>

From ffed65533b2ff8b904181fc8ba2748755a253823 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Fri, 8 Jan 2021 20:59:40 +0100
Subject: [PATCH 0735/1300] Revert "Fix logo size issues in certain browsers"

---
 src-ui/src/app/components/dashboard/dashboard.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 47751fe8b..50bd44a4e 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -1,5 +1,5 @@
 <app-page-header title="Dashboard" [subTitle]="subtitle" i18n-title>
-  <svg class="logo d-none d-md-block" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.64" height="5rem" width="auto">
+  <svg class="logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.64" height="100%" width="auto">
     <path class="leaf" d="M730.71,0C616.3,266.24,66.21,299.25,242.24,728.31c2.2,5.5-40.71,63.81-69.31,112.22-6.6-24.21-14.3-50.61-13.2-52.81C302.75,618.29,57.41,522.58,44.21,384-17.4,494-39.4,686.5,146.53,797.62c1.1,0,9.9,41.81,14.3,62.71-4.4,8.8-8.8,17.6-11,24.2-4.4,11,28.6,9.91,28.6,12.11,3.3-1.1,81.41-138.63,83.61-139.73C704.31,655.7,782.42,257.44,730.71,0ZM105.82,544.58C145.43,580.89,211.44,692,155.33,756.91,168.53,727.21,172.93,660.1,105.82,544.58ZM269.74,670C200.43,506.08,404,325.65,505.18,280.54,298.35,465.37,263.14,602.89,269.74,670Z" transform="translate(0)" style="fill:#17541f"/>
     <path class="text" style="fill:#000" d="M1169.27,231.44q.7,17.06.71,38.73t-.71,38a112,112,0,0,1-6.76,38A100.16,100.16,0,0,1,1142.25,380a93.87,93.87,0,0,1-33.76,23.46q-20.25,8.54-46.56,8.53h-36.25V597.5q0,9.94,2.85,14.57c1.89,3.08,3.79,4.86,5.68,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.56-.71,7.1-5.33t3.56-14.57V166q0-10.66-3.56-15.28t-7.1-6q-2.85-1.42-8.53,0V127.66h104.48q26.31,0,46.56,8.53a93.75,93.75,0,0,1,33.76,23.46,101,101,0,0,1,20.26,33.4A111.05,111.05,0,0,1,1169.27,231.44ZM1118.8,215.8q0-18.48-6-32t-14.22-21.32a74.68,74.68,0,0,0-17.06-12.44q-8.88-4.62-15.28-4.62h-40.52V392.79h40.52q6.39,0,15.28-3.56t17.06-12.44a86,86,0,0,0,14.22-21.67q6-12.8,6-32Zm337.63,389.52a27.35,27.35,0,0,1-2.85,11.72,40.58,40.58,0,0,1-8.17,11.38,54.8,54.8,0,0,1-13.5,9.59,40.07,40.07,0,0,1-18.84,4.27,60,60,0,0,1-30.57-7.82q-13.5-7.82-18.48-20.61a56.12,56.12,0,0,1-6.39-16.35q-9.24,19.18-28.08,32a72.42,72.42,0,0,1-41.58,12.8q-28.44,0-49.76-20.61-12.07-10.67-19.9-27.73t-9.24-39.09q-.71-2.13-.71-8.53v-.71a124.43,124.43,0,0,1,4.26-25.23,113.22,113.22,0,0,1,11-26.3,149.46,149.46,0,0,1,17.77-24.88,128.6,128.6,0,0,1,22.39-20.26,17.39,17.39,0,0,0,4.62-3.2,28.53,28.53,0,0,1,5.33-3.91l2.13-1.06,2.14-1.07q12.8-7.81,22.39-14.22t17.41-12.08a97.25,97.25,0,0,0,8.53-6.4c2.84-2.37,5.93-4.73,9.24-7.1a79.43,79.43,0,0,0,12.09-10,36.51,36.51,0,0,0,8.53-13.5q4.26-7.11,4.26-17.06a67.74,67.74,0,0,0-2.13-17.77,49.09,49.09,0,0,0-14.57-27q-11.73-11.37-26-14.93a38.26,38.26,0,0,0-12.08-2.13q-19.9,0-34.12,7.11-9.24,4.26-13.51,9.59t-4.62,10a10.73,10.73,0,0,0,1.78,7.46,12.91,12.91,0,0,0,5.69,4.26,6,6,0,0,0,1.78.71,6.28,6.28,0,0,1,1.77.72,32.21,32.21,0,0,1,15.28,12.43,34,34,0,0,1,6,19.55,32.78,32.78,0,0,1-32.7,32.7,33.53,33.53,0,0,1-24.17-9.6,30.94,30.94,0,0,1-10-23.1,106.83,106.83,0,0,1,3.2-25.23,84.65,84.65,0,0,1,9.6-23.81q13.5-19.91,32.34-28.79a96.24,96.24,0,0,1,41.58-8.89,93.82,93.82,0,0,1,33.76,6.4,96.18,96.18,0,0,1,29.86,18.13,103.38,103.38,0,0,1,22,28.07q8.88,16.35,8.88,37.68v209q0,12.79.36,16.7t.36,5.34h0q0,9.24,5.68,14.92a18.45,18.45,0,0,0,13.51,5.69q9.24,0,14.92-5.33a20.62,20.62,0,0,0,6.4-13.86Zm-111.6-17.77a52.58,52.58,0,0,0,6.76-21.33q1.07-11.37,1.06-21.32V413.4a63.92,63.92,0,0,1-6,5.33,74,74,0,0,0-6.75,6q-20.62,14.93-35.19,27.37a164.06,164.06,0,0,0-24.52,25.59,113,113,0,0,0-15.64,28.07,121,121,0,0,0-7.11,34.12v10.67q.72,27,14.58,42.29t39.44,15.28a38.56,38.56,0,0,0,20.62-5.69q9.24-6.39,12.79-14.92Zm244.52-304.23q40.51.72,64.68,24.53t24.17,75.7V542.77q0,51.88-24.17,75.34T1589.35,643h-2.13a80.27,80.27,0,0,1-22-2.84h-.71a.63.63,0,0,1-.71-.71,91.74,91.74,0,0,1-28.43-15.64l-6.76-6.76-5.33-7.46v118q0,10,2.85,14.58c1.89,3.08,3.79,5.09,5.68,6a10.54,10.54,0,0,0,9.24,0V766h-86V748.19q5.68,2.13,8.53,0,3.56-1.43,6.75-6t3.2-14.58V326.68q0-9.94-3.2-14.57t-6.75-6q-2.85-1.43-8.53,0V289h68.23v27.72a68.68,68.68,0,0,1,12.09-14.21,75.62,75.62,0,0,1,28.43-15.64.63.63,0,0,1,.71-.71h.71a90.55,90.55,0,0,1,22-2.85Zm35.54,84.59v-.71q-.72-36.26-8.89-51.18t-26.65-16.35a63.12,63.12,0,0,0-24.17,3.2,48,48,0,0,0-19.9,13.15q-8.54,9.24-14.22,24.88t-7.82,37V548.45q2.13,22,7.82,37.32t14.22,24.17a53.23,53.23,0,0,0,19.9,13.15,58.92,58.92,0,0,0,24.17,3.55q18.48-1.42,26.65-16.35t8.89-51.18V367.91Zm179.83-84.59a105.36,105.36,0,0,1,33.41,5.69,86.38,86.38,0,0,1,30.56,17.77,88.06,88.06,0,0,1,21.68,30.57q8.18,18.48,8.18,44.06v90.28H1757.1V544.9q0,44.07,15.28,62.9t38,18.13a113.94,113.94,0,0,0,26.65-4.62,54.83,54.83,0,0,0,22.75-13.15q9.59-9.24,16-26.3t6.4-44.78h16.35V547a153.56,153.56,0,0,1-4.27,36.61A72,72,0,0,1,1852,634.1q-16.71,7.47-40.87,8.18a102.25,102.25,0,0,1-34.83-6.4,96,96,0,0,1-32-19.19,108.91,108.91,0,0,1-23.45-30.21q-9.24-17.41-9.25-39.45v-16.7s-.11-9.12-.35-27.37-.36-29.5-.36-33.76-.11-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56A90.72,90.72,0,0,1,1771,289.37a98.55,98.55,0,0,1,33.76-6.05Zm46.2,169.89V397.05q0-27-3.55-45.13t-9.6-29.15q-6-11-14.57-15.28a42.36,42.36,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.72,73.92v56.16Zm279.35-113.73a42.31,42.31,0,0,0,.71,5.68,17.92,17.92,0,0,1,0,7.11q-.72,14.93-10.31,24.52a33,33,0,0,1-46.91-.35,33.52,33.52,0,0,1-9.6-24.17q0-17.76,13.51-27a8.33,8.33,0,0,0,1.77-1.06l1.07-1.07a16.22,16.22,0,0,0,6.4-10.31q1.41-6.75-8.53-11.73a26.26,26.26,0,0,0-12.8-3.55q-21.32-1.43-37.67,12.8t-22,49.75V597.5q0,9.94,2.84,14.57t5.69,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.55-.71,7.11-5.33t3.55-14.57V326.68q0-9.94-3.55-14.57t-7.11-6q-2.85-1.43-8.53,0V288.3h68.24v29.14q5-7.81,9.95-14.57a48.44,48.44,0,0,1,11.72-11.37,59.79,59.79,0,0,1,15.64-7.46q8.89-2.85,22.39-2.85,20.61,0,38.39,14.93t26.3,43.36Zm95.95,258q0,9.94,3.2,14.57c2.13,3.08,4.15,4.86,6,5.33q3.55,2.13,9.24,0v18.48h-86V617.4q5.68,2.13,10,0,2.13-.71,5.69-5.33t3.55-14.57V166.75q0-10.65-3.55-15.28a28.82,28.82,0,0,0-5.69-6q-4.26-2.13-10,0V128.37h67.52V597.5Zm154.25-314.18a105.25,105.25,0,0,1,33.4,5.69,86.33,86.33,0,0,1,30.57,17.77,88.19,88.19,0,0,1,21.68,30.57q8.18,18.48,8.17,44.06v90.28H2332.84V544.9q0,44.07,15.29,62.9t38,18.13a113.93,113.93,0,0,0,26.66-4.62,54.79,54.79,0,0,0,22.74-13.15q9.6-9.24,16-26.3t6.39-44.78h16.35V547a153.56,153.56,0,0,1-4.26,36.61,72,72,0,0,1-42.29,50.46q-16.71,7.47-40.88,8.18a102.24,102.24,0,0,1-34.82-6.4,96,96,0,0,1-32-19.19,108.94,108.94,0,0,1-23.46-30.21q-9.24-17.41-9.24-39.45v-16.7s-.12-9.12-.35-27.37-.36-29.5-.36-33.76-.12-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56a90.78,90.78,0,0,1,29.85-17.77,98.6,98.6,0,0,1,33.77-6.05Zm46.2,169.89V397.05q0-27-3.56-45.13t-9.59-29.15q-6-11-14.57-15.28a42.39,42.39,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.73,73.92v56.16Zm213.24,178.41c-.48.47-.83.71-1.07.71s-.59.23-1.06.71l-.71.71c-1,.47-2,1-3.2,1.42s-2.25,1-3.2,1.42q-14.93,6.4-34.83,6.4a48.79,48.79,0,0,1-22-5.33q-10.65-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.5V550.59h17.06q-1.43,22.74,5,39.09,4.27,14.22,16.71,26.65t37.31,12.44q16.35,0,27-5.68,18.48-9.24,25.24-22A45.92,45.92,0,0,0,2657,574.4q-1.42-13.86-10.31-27.37A126,126,0,0,0,2625,522.15q-8.52-6.39-17.77-13.5t-18.48-14.93q-24.87-19.91-39.45-35.89T2526.89,428a98.76,98.76,0,0,1-10.66-26.3,119.09,119.09,0,0,1-2.84-26.65,106,106,0,0,1,1.06-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,63,63,0,0,1,14.21-20.26A73.7,73.7,0,0,1,2561,288.3q13.5-5.69,32.7-5.69a53.27,53.27,0,0,1,21.32,4.62q10.66,4.62,19.19,8.53t13.51,3.56q5-.36,5-11h13.51v88.14h-18.48q.7-21.33-5-38.38a67,67,0,0,0-17.41-27Q2612.89,299,2588.73,299q-19.18,0-31.27,8.53-6.4,5-11,14.57a55.84,55.84,0,0,0-5.33,21,66.08,66.08,0,0,0,3.55,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.5,26.5,0,0,0,5.33,3.56,23,23,0,0,1,3.56,2.84l2.84,2.84q7.82,6.41,16,12.8t16.71,12.79a449.06,449.06,0,0,1,33.05,30.92,276.13,276.13,0,0,1,22,25.94,104.57,104.57,0,0,1,13.15,22.75,69,69,0,0,1,5,20.61q7.11,32.7-2.49,55.09t-24.52,35.19h-.71a1.26,1.26,0,0,1-1.43,1.42,11,11,0,0,1-2.84,2.13l-4.26,2.84-4.27,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.12,3.12,0,0,1-1.42.36Zm211.11,0c-.48.47-.83.71-1.07.71s-.59.23-1.07.71l-.71.71c-.94.47-2,1-3.2,1.42s-2.25,1-3.19,1.42Q2826.84,643,2807,643a48.76,48.76,0,0,1-22-5.33q-10.66-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.51V550.59h17.06q-1.41,22.74,5,39.09,4.26,14.22,16.7,26.65t37.32,12.44q16.35,0,27-5.68,18.48-9.24,25.23-22a45.93,45.93,0,0,0,5.34-26.65q-1.42-13.86-10.31-27.37a126,126,0,0,0-21.68-24.88q-8.53-6.39-17.77-13.5t-18.48-14.93q-24.89-19.91-39.45-35.89T2738,428a98.76,98.76,0,0,1-10.66-26.3,119.08,119.08,0,0,1-2.85-26.65,105.9,105.9,0,0,1,1.07-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,62.83,62.83,0,0,1,14.21-20.26,73.58,73.58,0,0,1,22.75-14.57q13.5-5.69,32.69-5.69a53.28,53.28,0,0,1,21.33,4.62q10.67,4.62,19.19,8.53t13.5,3.56q5-.36,5-11h13.51v88.14h-18.49q.72-21.33-5-38.38a67,67,0,0,0-17.42-27Q2824,299,2799.84,299q-19.2,0-31.28,8.53-6.39,5-11,14.57a56,56,0,0,0-5.34,21,66.3,66.3,0,0,0,3.56,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.22,26.22,0,0,0,5.33,3.56,22.83,22.83,0,0,1,3.55,2.84l2.85,2.84q7.82,6.41,16,12.8t16.7,12.79a445,445,0,0,1,33.05,30.92,274.85,274.85,0,0,1,22,25.94,105,105,0,0,1,13.15,22.75,68.69,68.69,0,0,1,5,20.61q7.11,32.7-2.48,55.09t-24.53,35.19h-.71a1.26,1.26,0,0,1-1.42,1.42,11.2,11.2,0,0,1-2.84,2.13l-4.27,2.84-4.26,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.15,3.15,0,0,1-1.42.36Z" transform="translate(0)"/>
   </svg>

From 81dee38e4a6c62810fed4136ac1f38cc60525179 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 01:54:51 +0100
Subject: [PATCH 0736/1300] fixes #300

---
 docker/local/Dockerfile                                | 1 +
 src/documents/management/commands/document_consumer.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index a5ce5ac0f..56f3dc295 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -24,6 +24,7 @@ RUN apt-get update \
 		libqpdf-dev \
 		libxml2 \
 		libxslt1-dev \
+		mime-support \
 		optipng \
 		pngquant \
 		qpdf \
diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index 8ac60aa6d..d0c045db2 100644
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -46,7 +46,7 @@ def _consume(filepath):
         return
 
     if not is_file_ext_supported(os.path.splitext(filepath)[1]):
-        logger.debug(
+        logger.warning(
             f"Not consuming file {filepath}: Unknown file extension.")
         return
 

From b29627c92b7a7defce064e5282c893d52aac4daa Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 8 Jan 2021 22:09:15 -0800
Subject: [PATCH 0737/1300] Fix dark mode button display on large cards in
 certain browsers

---
 .../document-card-large/document-card-large.component.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index d2f5ebba2..9502a4825 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -43,13 +43,13 @@
                 <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;<ng-container i18n>Edit</ng-container>
             </a>
-            <a type="button" class="btn btn-sm btn-outline-secondary" [href]="getPreviewUrl()">
+            <a class="btn btn-sm btn-outline-secondary" [href]="getPreviewUrl()">
               <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-search" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd" d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"/>
                 <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
               </svg>&nbsp;<ng-container i18n>View</ng-container>
             </a>
-            <a type="button" class="btn btn-sm btn-outline-secondary" [href]="getDownloadUrl()">
+            <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"/>

From ad241f12a3d3f681c8488bcdebe9d66062c6bf3a Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 9 Jan 2021 08:06:55 +0100
Subject: [PATCH 0738/1300] Run tests, documentation and frontend build also on
 pull_request

---
 .github/workflows/documentation.yml | 2 +-
 .github/workflows/frontend.yml      | 2 +-
 .github/workflows/test.yml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 67047d6cd..00835d240 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -1,7 +1,7 @@
 name: documentation
 
 # always run documentation workflow to ensure the documentation can still be built
-on: push
+on: [push, pull_request]
 
 # possibly add a publish job for automatic read-the-docs publishing
 jobs:
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 66a9a9b0c..4cb36d3a4 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -1,7 +1,7 @@
 name: frontend
 
 # always run frontend workflow to see if it builds and tests run fine
-on: push
+on: [push, pull_request]
 
 jobs:
   frontend:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ec601d57e..9766c4b5b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,7 @@
 name: backend-tests
 
 # always run tests workflow
-on: push
+on: [push, pull_request]
 
 jobs:
   tests:

From 9cd6235947e3b8a0483ef0dd6b611efcff206f17 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sat, 9 Jan 2021 10:46:38 +0100
Subject: [PATCH 0739/1300] Disable ansible-galaxy import

Repository structure not compatible (galaxy expects the role to be at
the root of the repository, not in a subfolder).
---
 .github/workflows/ansible.yml | 50 ++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index 67383ecf8..aacc4b44e 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -31,27 +31,29 @@ jobs:
           cd ansible
           molecule test
         working-directory: "${{ github.repository }}"
-  # https://galaxy.ansible.com/docs/contributing/importing.html
-  release:
-    runs-on: ubuntu-latest
-    needs:
-      - test
-    # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
-    if: contains(github.ref, 'refs/tags/')
-    steps:
-      - name: Check out the codebase
-        uses: actions/checkout@v2
-        with:
-          path: "${{ github.repository }}"
-      - name: Set up Python
-        uses: actions/setup-python@v2
-      - name: Install dependencies
-        run: |
-          python3 -m pip install --upgrade ansible-base
-          ansible --version
-          python --version
-      - name: Trigger a new import on Galaxy
-        run: |
-          cd ansible
-          ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
-        working-directory: "${{ github.repository }}"
+  # # https://galaxy.ansible.com/docs/contributing/importing.html
+  # release:
+  #   runs-on: ubuntu-latest
+  #   needs:
+  #     - test
+  #   # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
+  #   if: contains(github.ref, 'refs/tags/')
+  #   steps:
+  #     - name: Check out the codebase
+  #       uses: actions/checkout@v2
+  #       with:
+  #         path: "${{ github.repository }}"
+  #     - name: Set up Python
+  #       uses: actions/setup-python@v2
+  #     - name: Install dependencies
+  #       run: |
+  #         python3 -m pip install --upgrade ansible-base
+  #         ansible --version
+  #         python --version
+  #     - name: Trigger a new import on Galaxy
+  #     # TODO Check if source if pulled from cwd or imported from github
+  #     # https://github.com/ansible/ansible/blob/devel/lib/ansible/cli/galaxy.py
+  #       run: |
+  #         cd ansible
+  #         ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
+  #       working-directory: "${{ github.repository }}"

From 88dcd889fae0b3d7fed7a6fcd65e1389ae9619b1 Mon Sep 17 00:00:00 2001
From: Fabian Koller <C0nsultant@users.noreply.github.com>
Date: Sat, 9 Jan 2021 11:27:35 +0100
Subject: [PATCH 0740/1300] Add gettext to  Bare Metal Route dependencies

In theory, this package is optional since not everybody wants to compile translations.
Without other changes to step 5. (i.e. making it explicit that `python3 manage.py compilemessages` is not mandatory), not installing `gettext` results in an error when blindly copy-pasting the steps.
---
 docs/setup.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/setup.rst b/docs/setup.rst
index ddd246b16..e88524b08 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -229,6 +229,7 @@ writing. Windows is not and will never be supported.
     *   ``python3-pip``, optionally ``pipenv`` for package installation
     *   ``python3-dev``
 
+    *   ``gettext`` for compiling interface translations
     *   ``fonts-liberation`` for generating thumbnails for plain text files
     *   ``imagemagick`` >= 6 for PDF conversion
     *   ``optipng`` for optimizing thumbnails

From 69f1931f4fdba71c7157d38d8dd84544487d725d Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sat, 9 Jan 2021 11:52:39 +0100
Subject: [PATCH 0741/1300] Update to 0.9.13

---
 ansible/defaults/main.yml |  7 +++--
 ansible/tasks/main.yml    | 60 ++++++++++++++++++++++++++-------------
 2 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml
index da38ca300..d54bb855f 100644
--- a/ansible/defaults/main.yml
+++ b/ansible/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-paperlessng_version: 0.9.11
+paperlessng_version: 0.9.13
 paperlessng_directory: /opt/paperless-ng
 paperlessng_consumption_dir: "{{ paperlessng_directory }}/consumption"
 paperlessng_data_dir: "{{ paperlessng_directory }}/data"
@@ -13,10 +13,13 @@ paperlessng_ocr_languages:
 paperlessng_time_zone: Europe/Berlin
 # see https://ocrmypdf.readthedocs.io/en/latest/api.html#ocrmypdf.ocr
 paperlessng_ocrmypdf_args:
-  #- "deskew": true
+  #- "deskew": true  # https://github.com/jonaswinkler/paperless-ng/issues/231
   - "optimize": 1
 paperlessng_use_jbig2enc: true
 paperlessng_big2enc_lossy: false
+paperlessng_tika_enabled: false
+paperlessng_tika_endpoint: http://localhost:9998
+paperlessng_tika_gotenberg_endpoint: http://localhost:3000
 
 paperlessng_superuser_name: paperlessng
 paperlessng_superuser_email: paperlessng@example.com
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index 604b29203..c4ee8c875 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -11,6 +11,8 @@
       # paperless-ng
       - python3-dev
       - python3-pip
+      - gettext
+      - fonts-liberation
       - imagemagick
       - unpaper
       - ghostscript
@@ -166,51 +168,65 @@
 - name: configure paperless-ng
   lineinfile:
     path: "{{ paperlessng_directory }}/paperless.conf.template"
-    regexp: "{{ item.regexp }}"
+    regexp: "^#?{{ item.regexp }}="
     line: "{{ item.line }}"
   with_items:
-    - regexp: "^#?PAPERLESS_REDIS="
+    - regexp: PAPERLESS_REDIS
       line: "PAPERLESS_REDIS=redis://{{ paperlessng_redis_host }}:{{ paperlessng_redis_port }}"
-    - regexp: "^#?PAPERLESS_CONSUMPTION_DIR="
+    - regexp: PAPERLESS_CONSUMPTION_DIR
       line: "PAPERLESS_CONSUMPTION_DIR={{ paperlessng_consumption_dir }}"
-    - regexp: "^#?PAPERLESS_DATA_DIR="
+    - regexp: PAPERLESS_DATA_DIR
       line: "PAPERLESS_DATA_DIR={{ paperlessng_data_dir }}"
-    - regexp: "^#?PAPERLESS_MEDIA_ROOT="
+    - regexp: PAPERLESS_MEDIA_ROOT
       line: "PAPERLESS_MEDIA_ROOT={{ paperlessng_media_root }}"
-    - regexp: "^#?PAPERLESS_STATICDIR="
+    - regexp: PAPERLESS_STATICDIR
       line: "PAPERLESS_STATICDIR={{ paperlessng_static_dir }}"
-    - regexp: "^#?PAPERLESS_FILENAME_FORMAT="
+    - regexp: PAPERLESS_FILENAME_FORMAT
       line: "PAPERLESS_FILENAME_FORMAT={{ paperlessng_filename_format }}"
-    - regexp: "^#?PAPERLESS_OCR_LANGUAGE="
+    - regexp: PAPERLESS_OCR_LANGUAGE
       line: "PAPERLESS_OCR_LANGUAGE={{ paperlessng_ocr_languages | join('+') }}"
-    - regexp: "^#PAPERLESS_OCR_USER_ARGS="
+    - regexp: PAPERLESS_OCR_USER_ARGS
       line: "PAPERLESS_OCR_USER_ARGS={{ paperlessng_ocrmypdf_args | combine({'jbig2_lossy': true} if paperlessng_big2enc_lossy else {}) | to_json }}"
-    - regexp: "^#?PAPERLESS_TIME_ZONE="
+    - regexp: PAPERLESS_TIME_ZONE
       line: "PAPERLESS_TIME_ZONE={{ paperlessng_time_zone }}"
+    - regexp: PAPERLESS_TIKA_ENABLED
+      line: "PAPERLESS_TIKA_ENABLED={{ paperlessng_tika_enabled }}"
   no_log: yes
 
+- name: configure paperless-ng [tika]
+  lineinfile:
+    path: "{{ paperlessng_directory }}/paperless.conf.template"
+    regexp: "^#?{{ item.regexp }}="
+    line: "'{{ item.line }}' if paperlessng_tika_enabled else '#{{ item.line }}'"
+  with_items:
+    - regexp: PAPERLESS_TIKA_ENDPOINT
+      line: "PAPERLESS_TIKA_ENDPOINT={{ paperlessng_tika_endpoint }}"
+    - regexp: PAPERLESS_TIKA_GOTENBERG_ENDPOINT
+      line: "PAPERLESS_TIKA_GOTENBERG_ENDPOINT={{ paperlessng_tika_endpoint }}"
+
 - name: configure paperless-ng database [sqlite]
   lineinfile:
     path: "{{ paperlessng_directory }}/paperless.conf.template"
-    regexp: "^#?PAPERLESS_DBHOST="
-    state: absent
+    regexp: "^#?PAPERLESS_DBHOST=(.*)$"
+    line: '#PAPERLESS_DBHOST=\1'
+    backrefs: yes
   when: paperlessng_db_type == 'sqlite'
 
 - name: configure paperless-ng database [postgresql]
   lineinfile:
     path: "{{ paperlessng_directory }}/paperless.conf.template"
-    regexp: "{{ item.regexp }}"
+    regexp: "^#?{{ item.regexp }}="
     line: "{{ item.line }}"
   with_items:
-    - regexp: "^#?PAPERLESS_DBHOST="
+    - regexp: PAPERLESS_DBHOST
       line: "PAPERLESS_DBHOST={{ paperlessng_db_host }}"
-    - regexp: "^#?PAPERLESS_DBPORT="
+    - regexp: PAPERLESS_DBPORT
       line: "PAPERLESS_DBPORT={{ paperlessng_db_port }}"
-    - regexp: "^#?PAPERLESS_DBNAME="
+    - regexp: PAPERLESS_DBNAME
       line: "PAPERLESS_DBNAME={{ paperlessng_db_name }}"
-    - regexp: "^#?PAPERLESS_DBUSER="
+    - regexp: PAPERLESS_DBUSER
       line: "PAPERLESS_DBUSER={{ paperlessng_db_user }}"
-    - regexp: "^#?PAPERLESS_DBPASS="
+    - regexp: PAPERLESS_DBPASS
       line: "PAPERLESS_DBPASS={{ paperlessng_db_pass }}"
   when: paperlessng_db_type == 'postgresql'
   no_log: yes
@@ -248,7 +264,7 @@
   command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py collectstatic --no-input"
   when: paperlessng_current_version.stdout != paperlessng_version | string
   register: static_files
-  changed_when: "'188 unmodified' not in static_files.stdout"
+  changed_when: static_files.stdout is not match("0 static files copied .*")
 
 - name: create database schema
   become: yes
@@ -258,6 +274,12 @@
   register: database_schema
   changed_when: '"No migrations to apply." not in database_schema.stdout'
 
+- name: compile translations
+  become: yes
+  become_user: "{{ paperlessng_system_user }}"
+  command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py compilemessages"
+  when: paperlessng_current_version.stdout != paperlessng_version | string
+
 - name: configure paperless superuser
   become: yes
   become_user: "{{ paperlessng_system_user }}"

From b1ae8d1332eb9fd0bc321ae7ae0096a3db7076eb Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 15:11:58 +0100
Subject: [PATCH 0742/1300] enable docker builds on this branch

---
 .github/workflows/docker.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 715474a85..b6f75df24 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,6 +5,7 @@ on:
     branches:
     - master
     - dev
+    - travis-multiarch-builds
     tags:
     - 'ng-*'
 
@@ -18,8 +19,9 @@ jobs:
         id: prepare
         env:
           DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
+        # ,linux/arm/v7,linux/arm64/v8
         run: |
-          DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64/v8
+          DOCKER_PLATFORMS=linux/amd64
           VERSION=edge
           if [[ $GITHUB_REF == refs/tags/* ]]; then
             VERSION=${GITHUB_REF#refs/tags/}

From 327f00e3129402daca505005998981fbf0dc28d1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 17:54:56 +0100
Subject: [PATCH 0743/1300] now with cache?

---
 .github/workflows/docker.yml | 87 ++++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b6f75df24..185856157 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -14,51 +14,80 @@ jobs:
   buildx:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Prepare
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up Docker Buildx
+        uses: crazy-max/ghaction-docker-buildx@v3.1.0
+      -
+        name: Cache Docker layers
+        uses: actions/cache@v2
+        id: cache
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+      -
+        name: Prepare
         id: prepare
         env:
           DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
         # ,linux/arm/v7,linux/arm64/v8
         run: |
           DOCKER_PLATFORMS=linux/amd64
-          VERSION=edge
+          DOCKER_VERSION=edge
           if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/}
+            DOCKER_VERSION=${GITHUB_REF#refs/tags/}
           fi
           if [[ $GITHUB_REF == refs/heads/* ]]; then
-            VERSION=${GITHUB_REF#refs/heads/}
+            DOCKER_VERSION=${GITHUB_REF#refs/heads/}
           fi
-          TAGS="--tag ${DOCKER_IMAGE}:${VERSION}"
-          if [[ $VERSION == "master" ]]; then
-            TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest"
+          DOCKER_TAG="${DOCKER_IMAGE}:${DOCKER_VERSION}"
+          if [[ $DOCKER_VERSION == "master" ]]; then
+            DOCKER_TAG="${DOCKER_IMAGE}:latest"
           fi
-          echo ::set-output name=docker_image::${DOCKER_IMAGE}
-          echo ::set-output name=version::${VERSION}
-          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
-            --build-arg VERSION=${VERSION} \
+          echo ::set-output name=version::${DOCKER_VERSION}
+          echo ::set-output name=platforms::${DOCKER_PLATFORMS}
+          echo ::set-output name=tag::${DOCKER_TAG}
+      -
+        name: Docker buildx (build)
+        run: |
+          docker buildx build \
+            --cache-from "type=local,src=/tmp/.buildx-cache" \
+            --cache-to "type=local,dest=/tmp/.buildx-cache" \
+            --platform ${{steps.prepare.outputs.platforms}} \
+            --output "type=image,push=false" \
             --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
             --build-arg VCS_REF=${GITHUB_SHA::8} \
-            ${TAGS} --file ./Dockerfile .
-      - name: install buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v3.1.0
-      - name: Docker Login
-        if: success() && github.event_name != 'pull_request'
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+            --platform ${{steps.prepare.outputs.platforms}} \
+            --tag ${{steps.prepare.outputs.tag}} ./
+
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      -
+        name: Docker Buildx (push)
         run: |
-          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
-      - name: Docker Buildx (push)
-        if: success() && github.event_name != 'pull_request'
-        run: |
-          docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
+          docker buildx build \
+            --cache-from "type=local,src=/tmp/.buildx-cache" \
+            --platform ${{steps.prepare.outputs.platforms}} \
+            --output "type=image,push=true" \
+            --tag ${{steps.prepare.outputs.tag}} ./
+
       - name: Docker Check Manifest
-        if: always() && github.event_name != 'pull_request'
         run: |
-          docker run --rm mplatform/mquery ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}
+          docker run --rm mplatform/mquery ${{steps.prepare.outputs.tag}}
+      -
+        name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{steps.prepare.outputs.tag}}
+
       - name: Clear
-        if: always() && github.event_name != 'pull_request'
         run: |
           rm -f ${HOME}/.docker/config.json

From b48c290e9c52b633c2de6c489a73b2780dce02b6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 18:02:36 +0100
Subject: [PATCH 0744/1300] arm

---
 .github/workflows/docker.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 185856157..f858cd57e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -34,9 +34,8 @@ jobs:
         id: prepare
         env:
           DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
-        # ,linux/arm/v7,linux/arm64/v8
         run: |
-          DOCKER_PLATFORMS=linux/amd64
+          DOCKER_PLATFORMS=linux/amd64,linux/arm/v7
           DOCKER_VERSION=edge
           if [[ $GITHUB_REF == refs/tags/* ]]; then
             DOCKER_VERSION=${GITHUB_REF#refs/tags/}

From 001cd83ef801f6f4cee40d78375ab9d7ae22167c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 18:25:56 +0100
Subject: [PATCH 0745/1300] new buildx setup action

---
 .github/workflows/docker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f858cd57e..0af841f24 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v2
       -
         name: Set up Docker Buildx
-        uses: crazy-max/ghaction-docker-buildx@v3.1.0
+        uses: docker/setup-buildx-action@v1
       -
         name: Cache Docker layers
         uses: actions/cache@v2
@@ -35,7 +35,7 @@ jobs:
         env:
           DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
         run: |
-          DOCKER_PLATFORMS=linux/amd64,linux/arm/v7
+          DOCKER_PLATFORMS=linux/amd64
           DOCKER_VERSION=edge
           if [[ $GITHUB_REF == refs/tags/* ]]; then
             DOCKER_VERSION=${GITHUB_REF#refs/tags/}

From 5822273c8d4defb8a54f8fe2fb5be4ec22b9253b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 18:33:58 +0100
Subject: [PATCH 0746/1300] duplicate platform specification

---
 .github/workflows/docker.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0af841f24..8cf13cc37 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -56,7 +56,6 @@ jobs:
           docker buildx build \
             --cache-from "type=local,src=/tmp/.buildx-cache" \
             --cache-to "type=local,dest=/tmp/.buildx-cache" \
-            --platform ${{steps.prepare.outputs.platforms}} \
             --output "type=image,push=false" \
             --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
             --build-arg VCS_REF=${GITHUB_SHA::8} \

From 7c7065921216e31d5d41e36a35545b3668edae89 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 18:49:21 +0100
Subject: [PATCH 0747/1300] disable some steps

---
 .github/workflows/docker.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8cf13cc37..eafb80592 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -71,6 +71,8 @@ jobs:
 
       -
         name: Docker Buildx (push)
+
+        if: false
         run: |
           docker buildx build \
             --cache-from "type=local,src=/tmp/.buildx-cache" \
@@ -79,10 +81,12 @@ jobs:
             --tag ${{steps.prepare.outputs.tag}} ./
 
       - name: Docker Check Manifest
+        if: false
         run: |
           docker run --rm mplatform/mquery ${{steps.prepare.outputs.tag}}
       -
         name: Inspect image
+        if: false
         run: |
           docker buildx imagetools inspect ${{steps.prepare.outputs.tag}}
 

From 9c2e55407f9762192c75fcd29ea254d83040a766 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sat, 9 Jan 2021 19:02:07 +0100
Subject: [PATCH 0748/1300] Update docker.yml

---
 .github/workflows/docker.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index eafb80592..9083af82f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -71,8 +71,6 @@ jobs:
 
       -
         name: Docker Buildx (push)
-
-        if: false
         run: |
           docker buildx build \
             --cache-from "type=local,src=/tmp/.buildx-cache" \

From d6ad41ab3a3506e107118c28061e13b0e1db57a7 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sat, 9 Jan 2021 19:06:00 +0100
Subject: [PATCH 0749/1300] Update docker.yml

---
 .github/workflows/docker.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9083af82f..d0c5a97b0 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -68,7 +68,6 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-
       -
         name: Docker Buildx (push)
         run: |
@@ -77,17 +76,11 @@ jobs:
             --platform ${{steps.prepare.outputs.platforms}} \
             --output "type=image,push=true" \
             --tag ${{steps.prepare.outputs.tag}} ./
-
-      - name: Docker Check Manifest
-        if: false
+      - 
+        name: Docker Check Manifest
         run: |
           docker run --rm mplatform/mquery ${{steps.prepare.outputs.tag}}
       -
         name: Inspect image
-        if: false
         run: |
           docker buildx imagetools inspect ${{steps.prepare.outputs.tag}}
-
-      - name: Clear
-        run: |
-          rm -f ${HOME}/.docker/config.json

From ebc5f1a01d243cb0d185e9d8fe363ba930f2c756 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sat, 9 Jan 2021 19:10:09 +0100
Subject: [PATCH 0750/1300] Update docker.yml

---
 .github/workflows/docker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d0c5a97b0..56a6d1b39 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -43,9 +43,9 @@ jobs:
           if [[ $GITHUB_REF == refs/heads/* ]]; then
             DOCKER_VERSION=${GITHUB_REF#refs/heads/}
           fi
-          DOCKER_TAG="${DOCKER_IMAGE}:${DOCKER_VERSION}"
+          DOCKER_TAG="jonaswinkler/paperless-ng-test:${DOCKER_VERSION}"
           if [[ $DOCKER_VERSION == "master" ]]; then
-            DOCKER_TAG="${DOCKER_IMAGE}:latest"
+            DOCKER_TAG="jonaswinkler/paperless-ng-test:latest"
           fi
           echo ::set-output name=version::${DOCKER_VERSION}
           echo ::set-output name=platforms::${DOCKER_PLATFORMS}

From d7095f7ee1c2d40e0a8bb2c03236c878de02f4f7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 19:31:41 +0100
Subject: [PATCH 0751/1300] tags?

---
 .github/workflows/docker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 56a6d1b39..585ec61e4 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -60,7 +60,7 @@ jobs:
             --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
             --build-arg VCS_REF=${GITHUB_SHA::8} \
             --platform ${{steps.prepare.outputs.platforms}} \
-            --tag ${{steps.prepare.outputs.tag}} ./
+            --tag jonaswinkler/paperless-ng:edge ./
 
       -
         name: Login to DockerHub
@@ -75,8 +75,8 @@ jobs:
             --cache-from "type=local,src=/tmp/.buildx-cache" \
             --platform ${{steps.prepare.outputs.platforms}} \
             --output "type=image,push=true" \
-            --tag ${{steps.prepare.outputs.tag}} ./
-      - 
+            --tag jonaswinkler/paperless-ng:edge ./
+      -
         name: Docker Check Manifest
         run: |
           docker run --rm mplatform/mquery ${{steps.prepare.outputs.tag}}

From 4363d4c9ed5d3451f41510b9cf5b77ee3d8f5c8d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 19:50:11 +0100
Subject: [PATCH 0752/1300] simplify some things

---
 .github/workflows/docker.yml | 61 +++++++++---------------------------
 1 file changed, 15 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 585ec61e4..cda034085 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -9,6 +9,10 @@ on:
     tags:
     - 'ng-*'
 
+
+#            --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
+#            --build-arg VCS_REF=${GITHUB_SHA::8} \
+
 jobs:
   # build and push image to docker hub.
   buildx:
@@ -23,45 +27,11 @@ jobs:
       -
         name: Cache Docker layers
         uses: actions/cache@v2
-        id: cache
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
-      -
-        name: Prepare
-        id: prepare
-        env:
-          DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
-        run: |
-          DOCKER_PLATFORMS=linux/amd64
-          DOCKER_VERSION=edge
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            DOCKER_VERSION=${GITHUB_REF#refs/tags/}
-          fi
-          if [[ $GITHUB_REF == refs/heads/* ]]; then
-            DOCKER_VERSION=${GITHUB_REF#refs/heads/}
-          fi
-          DOCKER_TAG="jonaswinkler/paperless-ng-test:${DOCKER_VERSION}"
-          if [[ $DOCKER_VERSION == "master" ]]; then
-            DOCKER_TAG="jonaswinkler/paperless-ng-test:latest"
-          fi
-          echo ::set-output name=version::${DOCKER_VERSION}
-          echo ::set-output name=platforms::${DOCKER_PLATFORMS}
-          echo ::set-output name=tag::${DOCKER_TAG}
-      -
-        name: Docker buildx (build)
-        run: |
-          docker buildx build \
-            --cache-from "type=local,src=/tmp/.buildx-cache" \
-            --cache-to "type=local,dest=/tmp/.buildx-cache" \
-            --output "type=image,push=false" \
-            --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
-            --build-arg VCS_REF=${GITHUB_SHA::8} \
-            --platform ${{steps.prepare.outputs.platforms}} \
-            --tag jonaswinkler/paperless-ng:edge ./
-
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
@@ -69,18 +39,17 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       -
-        name: Docker Buildx (push)
-        run: |
-          docker buildx build \
-            --cache-from "type=local,src=/tmp/.buildx-cache" \
-            --platform ${{steps.prepare.outputs.platforms}} \
-            --output "type=image,push=true" \
-            --tag jonaswinkler/paperless-ng:edge ./
-      -
-        name: Docker Check Manifest
-        run: |
-          docker run --rm mplatform/mquery ${{steps.prepare.outputs.tag}}
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: jonaswinkler/paperless-ng:edge
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
       -
         name: Inspect image
         run: |
-          docker buildx imagetools inspect ${{steps.prepare.outputs.tag}}
+          docker buildx imagetools inspect jonaswinkler/paperless-ng:edge

From c0915a3deeb84aa5505dcdf18c157485ed605179 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 20:06:53 +0100
Subject: [PATCH 0753/1300] add arm

---
 .github/workflows/docker.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index cda034085..1fe772e7b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -24,6 +24,9 @@ jobs:
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
       -
         name: Cache Docker layers
         uses: actions/cache@v2
@@ -44,7 +47,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm/v7
           push: true
           tags: jonaswinkler/paperless-ng:edge
           cache-from: type=local,src=/tmp/.buildx-cache

From 0051d9f76eb472c79ea914a5d2f59330721b21da Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 20:29:29 +0100
Subject: [PATCH 0754/1300] undo removing a required library

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5e6b2690e..0ccfcd84e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,7 +63,7 @@ RUN apt-get update \
   && pipenv install --system --deploy --ignore-pipfile \
   && pipenv --clear \
   && pip3 uninstall -y pipenv \
-	&& apt-get -y purge build-essential libqpdf-dev libxslt1-dev \
+	&& apt-get -y purge build-essential libqpdf-dev \
 	&& apt-get -y autoremove --purge \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& mkdir /var/log/supervisord /var/run/supervisord

From 517e03772401d769c5a978aa45f0b126c103b625 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 20:51:46 +0100
Subject: [PATCH 0755/1300] always update cache

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1fe772e7b..be271a3b7 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -29,7 +29,7 @@ jobs:
         uses: docker/setup-qemu-action@v1
       -
         name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: pat-s/always-upload-cache@v2
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

From d2ec38d5fd1875bf03bd7d8615a219df48f049b2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 21:21:50 +0100
Subject: [PATCH 0756/1300] use correct version

---
 .github/workflows/docker.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index be271a3b7..4afc1027f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -18,6 +18,18 @@ jobs:
   buildx:
     runs-on: ubuntu-latest
     steps:
+      -
+        name: Prepare
+        id: prepare
+        run: |
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/ng-* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/ng-}
+          fi
+          if [[ $GITHUB_REF == refs/heads/* ]]; then
+            VERSION=${GITHUB_REF#refs/heads/}
+          fi
+          echo ::set-output name=version::${VERSION}
       -
         name: Checkout
         uses: actions/checkout@v2
@@ -49,10 +61,10 @@ jobs:
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm/v7
           push: true
-          tags: jonaswinkler/paperless-ng:edge
+          tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
       -
         name: Inspect image
         run: |
-          docker buildx imagetools inspect jonaswinkler/paperless-ng:edge
+          docker buildx imagetools inspect jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}

From 2c4bbf8a005521e13e85d118141dea21a86bbd00 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 21:23:04 +0100
Subject: [PATCH 0757/1300] use correct version of cache action

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4afc1027f..e7b426a07 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -41,7 +41,7 @@ jobs:
         uses: docker/setup-qemu-action@v1
       -
         name: Cache Docker layers
-        uses: pat-s/always-upload-cache@v2
+        uses: pat-s/always-upload-cache@v2.1.3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

From a4bff61e5b714dfe2be93bea3ef2f4f04f161901 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 21:49:43 +0100
Subject: [PATCH 0758/1300] move everything into a single file so that the
 docker image build can depend on the tests being successful

---
 .github/workflows/ci.yml            | 140 ++++++++++++++++++++++++++++
 .github/workflows/docker.yml        |  70 --------------
 .github/workflows/documentation.yml |  33 -------
 .github/workflows/frontend.yml      |  19 ----
 .github/workflows/test.yml          |  43 ---------
 5 files changed, 140 insertions(+), 165 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .github/workflows/docker.yml
 delete mode 100644 .github/workflows/documentation.yml
 delete mode 100644 .github/workflows/frontend.yml
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..3ccfedd43
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,140 @@
+name: docker
+
+on: [push, pull_request]
+
+jobs:
+  documentation:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install python version
+        uses: gabrielfalcao/pyenv-action@v7
+        with:
+          default: "3.6.8"
+          command: "pip install -U pip"
+      - name: Get pip cache dir
+        id: pip-cache
+        run: |
+          echo "::set-output name=dir::$(pip cache dir)"
+      - name: Persistent Github pip cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key: ${{ runner.os }}-pip3.6.8}
+      - name: dependencies
+        # instead of directly installing the dependency in the workflow file, can this be done using the pipfile instead?
+        run: |
+          pip install 'sphinx~=3.3' sphinx_rtd_theme
+      - name: make
+        run: |
+          cd docs/
+          make html
+
+  tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-20.04 ]
+        python: # pyenv-action requires the exact version
+          - 3.6.8
+          - 3.7.9
+          - 3.8.6
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install python version
+        uses: gabrielfalcao/pyenv-action@v7
+        with:
+          default: "${{ matrix.python }}"
+          command: "pip install -U pip"
+      - name: Get pip cache dir
+        id: pip-cache
+        run: |
+          echo "::set-output name=dir::$(pip cache dir)"
+      - name: Persistent Github pip cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key: ${{ runner.os }}-pip${{ matrix.python }}
+      - name: Tests
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+          pip install --upgrade pipenv
+          pipenv install --system --dev
+          cd src/
+          pipenv run pytest --cov
+          pipenv run pycodestyle
+          pipenv run coveralls
+
+  frontend:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '15'
+    - name: build
+      run: |
+        cd src-ui/
+        npm install -g @angular/cli
+        npm install
+        ng build --prod
+
+  # build and push image to docker hub.
+  build-docker-image:
+    if: github.event_name == push && (github.ref == refs/heads/master || github.ref == refs/heads/dev || github.ref == refs/tags/ng-*)
+    runs-on: ubuntu-latest
+    needs: tests
+    steps:
+      -
+        name: Prepare
+        id: prepare
+        run: |
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/ng-* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/ng-}
+          fi
+          if [[ $GITHUB_REF == refs/heads/* ]]; then
+            VERSION=${GITHUB_REF#refs/heads/}
+          fi
+          echo ::set-output name=version::${VERSION}
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Cache Docker layers
+        uses: pat-s/always-upload-cache@v2.1.3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm/v7
+          push: true
+          tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+      -
+        name: Inspect image
+        run: |
+          docker buildx imagetools inspect jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
deleted file mode 100644
index e7b426a07..000000000
--- a/.github/workflows/docker.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-name: docker
-
-on:
-  push:
-    branches:
-    - master
-    - dev
-    - travis-multiarch-builds
-    tags:
-    - 'ng-*'
-
-
-#            --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
-#            --build-arg VCS_REF=${GITHUB_SHA::8} \
-
-jobs:
-  # build and push image to docker hub.
-  buildx:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Prepare
-        id: prepare
-        run: |
-          VERSION=edge
-          if [[ $GITHUB_REF == refs/tags/ng-* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/ng-}
-          fi
-          if [[ $GITHUB_REF == refs/heads/* ]]; then
-            VERSION=${GITHUB_REF#refs/heads/}
-          fi
-          echo ::set-output name=version::${VERSION}
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Cache Docker layers
-        uses: pat-s/always-upload-cache@v2.1.3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v7
-          push: true
-          tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-      -
-        name: Inspect image
-        run: |
-          docker buildx imagetools inspect jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
deleted file mode 100644
index 00835d240..000000000
--- a/.github/workflows/documentation.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: documentation
-
-# always run documentation workflow to ensure the documentation can still be built
-on: [push, pull_request]
-
-# possibly add a publish job for automatic read-the-docs publishing
-jobs:
-  documentation:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install python version
-      uses: gabrielfalcao/pyenv-action@v7
-      with:
-        default: "3.6.8"
-        command: "pip install -U pip"    
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-    - name: Persistent Github pip cache
-      uses: actions/cache@v2
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip3.6.8}
-    - name: dependencies
-      # instead of directly installing the dependency in the workflow file, can this be done using the pipfile instead?
-      run: |
-        pip install 'sphinx~=3.3' sphinx_rtd_theme
-    - name: make
-      run: |
-        cd docs/
-        make html
\ No newline at end of file
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
deleted file mode 100644
index 4cb36d3a4..000000000
--- a/.github/workflows/frontend.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: frontend
-
-# always run frontend workflow to see if it builds and tests run fine
-on: [push, pull_request]
-
-jobs:
-  frontend:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: '15'
-    - name: build
-      run: |
-        cd src-ui/
-        npm install -g @angular/cli
-        npm install
-        ng build --prod
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 9766c4b5b..000000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: backend-tests
-
-# always run tests workflow
-on: [push, pull_request]
-
-jobs:
-  tests:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-20.04]
-        python: # pyenv-action requires the exact version
-          - 3.6.8
-          - 3.7.9
-          - 3.8.6
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install python version
-      uses: gabrielfalcao/pyenv-action@v7
-      with:
-        default: "${{ matrix.python }}"
-        command: "pip install -U pip"
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-    - name: Persistent Github pip cache
-      uses: actions/cache@v2
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip${{ matrix.python }}
-    - name: Tests
-      env: 
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-        pip install --upgrade pipenv
-        pipenv install --system --dev
-        cd src/
-        pipenv run pytest --cov
-        pipenv run pycodestyle
-        pipenv run coveralls

From fb5d35e43eb261a32f14ce76198fd672b849201a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 21:50:53 +0100
Subject: [PATCH 0759/1300] fix condition

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ccfedd43..492c977bf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
 
   # build and push image to docker hub.
   build-docker-image:
-    if: github.event_name == push && (github.ref == refs/heads/master || github.ref == refs/heads/dev || github.ref == refs/tags/ng-*)
+    if: github.event_name == "push" && (github.ref == "refs/heads/master" || github.ref == "refs/heads/dev" || github.ref == "refs/tags/ng-*")
     runs-on: ubuntu-latest
     needs: tests
     steps:

From 28c3f8d61482678b56bfd512ea264d237ac2ef5b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 21:53:13 +0100
Subject: [PATCH 0760/1300] fix condition

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 492c977bf..b841dee8d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
 
   # build and push image to docker hub.
   build-docker-image:
-    if: github.event_name == "push" && (github.ref == "refs/heads/master" || github.ref == "refs/heads/dev" || github.ref == "refs/tags/ng-*")
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
     runs-on: ubuntu-latest
     needs: tests
     steps:

From 692a5081c7b572164554d54e2566886d1bf2f215 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 21:55:03 +0100
Subject: [PATCH 0761/1300] rename workflow

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b841dee8d..dcef91911 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: docker
+name: ci
 
 on: [push, pull_request]
 

From 47339c84b353f6e9be98a9b0715e8d9798f1fcc8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 22:03:38 +0100
Subject: [PATCH 0762/1300] test include this branch

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dcef91911..3fe9a6ad3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
 
   # build and push image to docker hub.
   build-docker-image:
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-multiarch-builds' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
     runs-on: ubuntu-latest
     needs: tests
     steps:

From 6fa0d00b8ff5a0c029c025123c6ed832cfeebfec Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 22:33:07 +0100
Subject: [PATCH 0763/1300] try separate build / push

---
 .github/workflows/ci.yml | 45 +++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3fe9a6ad3..78dd931d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,9 +84,7 @@ jobs:
 
   # build and push image to docker hub.
   build-docker-image:
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-multiarch-builds' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
     runs-on: ubuntu-latest
-    needs: tests
     steps:
       -
         name: Prepare
@@ -118,19 +116,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      -
-        name: Build and push
+        name: Build image
         uses: docker/build-push-action@v2
         with:
-          context: .
-          file: ./Dockerfile
           platforms: linux/amd64,linux/arm/v7
-          push: true
           tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -138,3 +127,35 @@ jobs:
         name: Inspect image
         run: |
           docker buildx imagetools inspect jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
+
+  push-docker-image:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-multiarch-builds' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
+    needs: [tests, build-docker-image]
+
+    steps:
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Cache Docker layers
+        uses: pat-s/always-upload-cache@v2.1.3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      -
+        name: Push image
+        uses: docker/build-push-action@v2
+        with:
+          platforms: linux/amd64,linux/arm/v7
+          tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          push: true

From 141315cf427ae21fb6bc9e1479bda1c74bd8ba1c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 22:38:05 +0100
Subject: [PATCH 0764/1300] Revert "try separate build / push"

This reverts commit 6fa0d00b
---
 .github/workflows/ci.yml | 45 +++++++++++-----------------------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 78dd931d0..3fe9a6ad3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,7 +84,9 @@ jobs:
 
   # build and push image to docker hub.
   build-docker-image:
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-multiarch-builds' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
     runs-on: ubuntu-latest
+    needs: tests
     steps:
       -
         name: Prepare
@@ -116,10 +118,19 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       -
-        name: Build image
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      -
+        name: Build and push
         uses: docker/build-push-action@v2
         with:
+          context: .
+          file: ./Dockerfile
           platforms: linux/amd64,linux/arm/v7
+          push: true
           tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -127,35 +138,3 @@ jobs:
         name: Inspect image
         run: |
           docker buildx imagetools inspect jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
-
-  push-docker-image:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-multiarch-builds' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
-    needs: [tests, build-docker-image]
-
-    steps:
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Cache Docker layers
-        uses: pat-s/always-upload-cache@v2.1.3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      -
-        name: Push image
-        uses: docker/build-push-action@v2
-        with:
-          platforms: linux/amd64,linux/arm/v7
-          tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          push: true

From 262e8ee9996674e32bb3c8b8dfafaaac8adfe29e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 9 Jan 2021 22:53:45 +0100
Subject: [PATCH 0765/1300] add arm64

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3fe9a6ad3..78e1eec42 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -129,7 +129,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v7
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: true
           tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
           cache-from: type=local,src=/tmp/.buildx-cache

From ecc40d022dce904e5f58e04c76cd499751aa980a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 00:09:10 +0100
Subject: [PATCH 0766/1300] test updated Pipfile

---
 Pipfile      |  3 ---
 Pipfile.lock | 15 +++++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Pipfile b/Pipfile
index 0c182d5b6..1a9b43950 100644
--- a/Pipfile
+++ b/Pipfile
@@ -8,9 +8,6 @@ url = "https://www.piwheels.org/simple"
 verify_ssl = true
 name = "piwheels"
 
-[requires]
-python_version = "3.6"
-
 [packages]
 dateparser = "~=0.7.6"
 django = "~=3.1.3"
diff --git a/Pipfile.lock b/Pipfile.lock
index b36e5e496..58cf35894 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,12 +1,10 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "c35d84fd7f4f1c7d599039712362935e7c41a226b0ab3d83d8c1c2fb2ad0962a"
+            "sha256": "241c8d042e9b607bbeb7d501b3fc1b57376e3cc8c2b2fe117ec60e425dfd79c7"
         },
         "pipfile-spec": 6,
-        "requires": {
-            "python_version": "3.6"
-        },
+        "requires": {},
         "sources": [
             {
                 "name": "pypi",
@@ -1375,6 +1373,15 @@
             "index": "pypi",
             "version": "==3.20.1"
         },
+        "typing-extensions": {
+            "hashes": [
+                "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
+                "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
+                "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==3.7.4.3"
+        },
         "urllib3": {
             "hashes": [
                 "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08",

From e606ae5097b2a5ad4bd81f0758f7821804d6cce3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 00:28:33 +0100
Subject: [PATCH 0767/1300] try new python setup action

---
 .github/workflows/ci.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 78e1eec42..7af141cd2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,17 +35,13 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04 ]
-        python: # pyenv-action requires the exact version
-          - 3.6.8
-          - 3.7.9
-          - 3.8.6
+        python-version: ['3.6', '3.7', '3.8']
     steps:
       - uses: actions/checkout@v2
-      - name: Install python version
-        uses: gabrielfalcao/pyenv-action@v7
+      - name: Set up Python
+        uses: actions/setup-python@v2
         with:
-          default: "${{ matrix.python }}"
-          command: "pip install -U pip"
+          default: "${{ matrix.python-version }}"
       - name: Get pip cache dir
         id: pip-cache
         run: |

From bf634eee6646103ebe174510b59e8d6746532711 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 00:32:47 +0100
Subject: [PATCH 0768/1300] fix python action

---
 .github/workflows/ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7af141cd2..a9bbda8ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,17 +31,16 @@ jobs:
           make html
 
   tests:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        os: [ ubuntu-20.04 ]
         python-version: ['3.6', '3.7', '3.8']
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          default: "${{ matrix.python-version }}"
+          python-version: "${{ matrix.python-version }}"
       - name: Get pip cache dir
         id: pip-cache
         run: |

From 06ee41226dbf3176d33555381dc131a99d593233 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 00:41:11 +0100
Subject: [PATCH 0769/1300] no need to run commands in pipenv when using
 --system

---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a9bbda8ad..9d398e6d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,11 +57,11 @@ jobs:
           sudo apt-get update -qq
           sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
           pip install --upgrade pipenv
-          pipenv install --system --dev
+          pipenv install --system --dev --ignore-pipfile
           cd src/
-          pipenv run pytest --cov
-          pipenv run pycodestyle
-          pipenv run coveralls
+          pytest
+          pycodestyle
+          coveralls
 
   frontend:
     runs-on: ubuntu-20.04

From c9ce69c1c1ea67575b6e3c8b26a8738a8e4f0142 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 00:50:06 +0100
Subject: [PATCH 0770/1300] documentation action

---
 Dockerfile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0ccfcd84e..ea3136bb3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 AS jbig2
+FROM ubuntu:20.04 AS jbig2enc
 
 WORKDIR /usr/src/jbig2enc
 
@@ -19,7 +19,7 @@ RUN npm install
 COPY src-ui .
 RUN node_modules/.bin/ng build --prod --output-hashing none --sourceMap=false
 
-FROM python:3.7-slim
+FROM ubuntu:20.04
 
 WORKDIR /usr/src/paperless/
 
@@ -27,7 +27,7 @@ COPY Pipfile* ./
 
 #Dependencies
 RUN apt-get update \
-  && apt-get -y --no-install-recommends install \
+  && DEBIAN_FRONTEND="noninteractive" apt-get -y --no-install-recommends install \
 		build-essential \
 		curl \
 		file \
@@ -48,6 +48,9 @@ RUN apt-get update \
 		mime-support \
 		optipng \
 		pngquant \
+		python3 \
+		python3-pip \
+		python3-dev \
 		qpdf \
 		sudo \
 		tesseract-ocr \
@@ -59,11 +62,12 @@ RUN apt-get update \
 		tzdata \
 		unpaper \
 		zlib1g \
-	&& pip3 install --upgrade supervisor pipenv \
+
+	&& pip3 install --upgrade supervisor pipenv setuptools \
   && pipenv install --system --deploy --ignore-pipfile \
   && pipenv --clear \
   && pip3 uninstall -y pipenv \
-	&& apt-get -y purge build-essential libqpdf-dev \
+	&& apt-get -y purge build-essential libqpdf-dev python3-dev python3-pip \
 	&& apt-get -y autoremove --purge \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& mkdir /var/log/supervisord /var/run/supervisord
@@ -75,10 +79,10 @@ COPY docker/gunicorn.conf.py ./
 COPY docker/supervisord.conf /etc/supervisord.conf
 COPY docker/docker-entrypoint.sh /sbin/docker-entrypoint.sh
 
-# copy jbic
-COPY --from=jbig2 /usr/src/jbig2enc/src/.libs/libjbig2enc* /usr/local/lib/
-COPY --from=jbig2 /usr/src/jbig2enc/src/jbig2 /usr/local/bin/
-COPY --from=jbig2 /usr/src/jbig2enc/src/*.h /usr/local/include/
+# copy jbig2enc
+COPY --from=jbig2enc /usr/src/jbig2enc/src/.libs/libjbig2enc* /usr/local/lib/
+COPY --from=jbig2enc /usr/src/jbig2enc/src/jbig2 /usr/local/bin/
+COPY --from=jbig2enc /usr/src/jbig2enc/src/*.h /usr/local/include/
 
 
 # copy app

From aa1fb63714c9cd472a1b6f7dd57634e6e38f7f24 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 00:53:30 +0100
Subject: [PATCH 0771/1300] documentation action

---
 .github/workflows/ci.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d398e6d7..98c61efb4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,11 +7,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: Install python version
-        uses: gabrielfalcao/pyenv-action@v7
+      - name: Set up Python
+        uses: actions/setup-python@v2
         with:
-          default: "3.6.8"
-          command: "pip install -U pip"
+          python-version: 3.8
       - name: Get pip cache dir
         id: pip-cache
         run: |
@@ -21,11 +20,9 @@ jobs:
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip3.6.8}
-      - name: dependencies
-        # instead of directly installing the dependency in the workflow file, can this be done using the pipfile instead?
-        run: |
-          pip install 'sphinx~=3.3' sphinx_rtd_theme
-      - name: make
+      - name: Install dependencies
+        run: pipenv install --system --dev --ignore-pipfile
+      - name: Make documentation
         run: |
           cd docs/
           make html

From 6a355b8dff6a6fbf358e4ab54fd7fe6d2db42269 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 00:54:48 +0100
Subject: [PATCH 0772/1300] install pipenv

---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 98c61efb4..54ff75670 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,9 @@ jobs:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip3.6.8}
       - name: Install dependencies
-        run: pipenv install --system --dev --ignore-pipfile
+        run: |
+          pip install --upgrade pipenv
+          pipenv install --system --dev --ignore-pipfile
       - name: Make documentation
         run: |
           cd docs/

From 4bb0da397a52eb89e5dda8438909accbc6ede0ba Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 00:58:14 +0100
Subject: [PATCH 0773/1300] dependencies

---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54ff75670..98e5ecf8a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,6 +22,8 @@ jobs:
           key: ${{ runner.os }}-pip3.6.8}
       - name: Install dependencies
         run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev
           pip install --upgrade pipenv
           pipenv install --system --dev --ignore-pipfile
       - name: Make documentation
@@ -54,7 +56,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+          sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
           pip install --upgrade pipenv
           pipenv install --system --dev --ignore-pipfile
           cd src/

From 6c7281ae889976c1b33b87231c4bbeda36d88796 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 01:35:56 +0100
Subject: [PATCH 0774/1300] add sslmode configuration option fixes #298

---
 docs/configuration.rst    | 6 ++++++
 paperless.conf.example    | 1 +
 src/paperless/settings.py | 1 +
 3 files changed, 8 insertions(+)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index d122216a1..4828c4fa5 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -53,6 +53,12 @@ PAPERLESS_DBPASS=<password>
 
     Defaults to "paperless".
 
+PAPERLESS_DBSSLMODE=<mode>
+    SSL mode to use when connecting to PostgreSQL.
+
+    See `the official documentation about sslmode <https://www.postgresql.org/docs/current/libpq-ssl.html>`_.
+
+    Default is ``prefer``.
 
 Paths and folders
 #################
diff --git a/paperless.conf.example b/paperless.conf.example
index 50d79c720..7e6185765 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -13,6 +13,7 @@
 #PAPERLESS_DBNAME=paperless
 #PAPERLESS_DBUSER=paperless
 #PAPERLESS_DBPASS=paperless
+#PAPERLESS_DBSSLMODE=prefer
 
 # Paths and folders
 
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index d0e32b4a0..f2f1a45b1 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -253,6 +253,7 @@ if os.getenv("PAPERLESS_DBHOST"):
         "NAME": os.getenv("PAPERLESS_DBNAME", "paperless"),
         "USER": os.getenv("PAPERLESS_DBUSER", "paperless"),
         "PASSWORD": os.getenv("PAPERLESS_DBPASS", "paperless"),
+        'OPTIONS': {'sslmode': os.getenv("PAPERLESS_DBSSLMODE", "prefer")},
     }
     if os.getenv("PAPERLESS_DBPORT"):
         DATABASES["default"]["PORT"] = os.getenv("PAPERLESS_DBPORT")

From 2c065da98758e01bdc926d3ce61aa9c400a118e1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 01:59:47 +0100
Subject: [PATCH 0775/1300] fixes #292

---
 .../app/components/common/input/select/select.component.html  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/common/input/select/select.component.html b/src-ui/src/app/components/common/input/select/select.component.html
index 780dc5686..aa500d0d1 100644
--- a/src-ui/src/app/components/common/input/select/select.component.html
+++ b/src-ui/src/app/components/common/input/select/select.component.html
@@ -6,9 +6,11 @@
       [style.color]="textColor"
       [style.background]="backgroundColor"
       [clearable]="allowNull"
+      [items]="items"
+      bindLabel="name"
+      bindValue="id"
       (change)="onChange(value)"
       (blur)="onTouched()">
-      <ng-option *ngFor="let i of items" [value]="i.id">{{i.name}}</ng-option>
     </ng-select>
 
     <div *ngIf="showPlusButton()" class="input-group-append">

From fbfdd95958d272278af80a433fa5d57911c45fdc Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 9 Jan 2021 19:52:31 -0800
Subject: [PATCH 0776/1300] Fix large card layout on mobile

---
 .../document-card-large.component.html           | 16 +++++++++-------
 .../document-card-large.component.scss           |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index 9502a4825..6f2742a8d 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -31,36 +31,38 @@
         </p>
 
 
-        <div class="d-flex align-items-center">
+        <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">
               <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;<ng-container i18n>More like this</ng-container>
+              </svg>&nbsp;<span class="d-block d-md-inline" i18n>More like this</span>
             </a>
             <a routerLink="/documents/{{document.id}}" class="btn btn-sm btn-outline-secondary">
               <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>&nbsp;<ng-container i18n>Edit</ng-container>
+              </svg>&nbsp;<span class="d-block d-md-inline" i18n>Edit</span>
             </a>
             <a class="btn btn-sm btn-outline-secondary" [href]="getPreviewUrl()">
               <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-search" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd" d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"/>
                 <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
-              </svg>&nbsp;<ng-container i18n>View</ng-container>
+              </svg>&nbsp;<span class="d-block d-md-inline" i18n>View</span>
             </a>
             <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;<ng-container i18n>Download</ng-container>
+              </svg>&nbsp;<span class="d-block d-md-inline" i18n>Download</span>
             </a>
 
           </div>
 
-          <small *ngIf="searchScore" class="text-muted ml-auto" i18n>Score:</small>
+          <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 *ngIf="searchScore" [type]="searchScoreClass" [value]="searchScore" class="search-score-bar mx-2" [max]="1"></ngb-progressbar>
+            <ngb-progressbar [type]="searchScoreClass" [value]="searchScore" class="search-score-bar mx-2" [max]="1"></ngb-progressbar>
+          </div>
 
           <small class="text-muted" [class.ml-auto]="!searchScore" i18n>Created: {{document.created | date}}</small>
         </div>
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
index 0b1604d90..300caca59 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
@@ -15,7 +15,7 @@
 .search-score-bar {
   width: 100px;
   height: 5px;
-  margin-top: 2px;
+  margin-top: 1px;
 }
 
 .document-card-check {

From 49053b6ad2a7f7e39c5788d5ed7dbdb8ce6a61b5 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 9 Jan 2021 19:53:18 -0800
Subject: [PATCH 0777/1300] Prevent long title overflow on mobile

---
 .../document-card-large/document-card-large.component.scss    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
index 300caca59..a549b6f53 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
@@ -12,6 +12,10 @@
   mix-blend-mode: multiply;
 }
 
+.card-title {
+  word-break: break-word;
+}
+
 .search-score-bar {
   width: 100px;
   height: 5px;

From a1a415a5d16b532ccb67486fe3a8ca704d70be22 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 11:26:14 +0100
Subject: [PATCH 0778/1300] fix up pipfile for arm/v7

---
 .github/workflows/ci.yml | 2 +-
 Dockerfile               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 98e5ecf8a..aa4ee9b74 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,7 +107,7 @@ jobs:
         uses: docker/setup-qemu-action@v1
       -
         name: Cache Docker layers
-        uses: pat-s/always-upload-cache@v2.1.3
+        uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
diff --git a/Dockerfile b/Dockerfile
index ea3136bb3..4bd9b5e06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,6 +38,7 @@ RUN apt-get update \
 		icc-profiles-free \
 		imagemagick \
 		libatlas-base-dev \
+		libffi-dev \
 		liblept5 \
 		libmagic-dev \
 		libpoppler-cpp-dev \

From 74db555f78b31b34f8ae482781f8e786f2d6e934 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 11:39:30 +0100
Subject: [PATCH 0779/1300] fix cryphtography for armv7

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 4bd9b5e06..16c52caa9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,6 +44,7 @@ RUN apt-get update \
 		libpoppler-cpp-dev \
 		libpq-dev \
 		libqpdf-dev \
+		libssl-dev \
 		libxml2 \
 		libxslt1-dev \
 		mime-support \

From 8cde2cd4b2ca36b88a590def992aaded210e12b9 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 10 Jan 2021 11:19:00 +0000
Subject: [PATCH 0780/1300] Apply translations in nl_NL

translated for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'nl_NL' language.
---
 src/locale/nl_NL/LC_MESSAGES/django.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/locale/nl_NL/LC_MESSAGES/django.po b/src/locale/nl_NL/LC_MESSAGES/django.po
index 07c1eb577..de24dbf59 100644
--- a/src/locale/nl_NL/LC_MESSAGES/django.po
+++ b/src/locale/nl_NL/LC_MESSAGES/django.po
@@ -93,11 +93,11 @@ msgstr ""
 
 #: documents/models.py:114
 msgid "tag"
-msgstr "tag"
+msgstr "etiket"
 
 #: documents/models.py:115 documents/models.py:171
 msgid "tags"
-msgstr "tags"
+msgstr "etiketten"
 
 #: documents/models.py:121 documents/models.py:153
 msgid "document type"
@@ -285,11 +285,11 @@ msgstr "zit in \"Postvak in\""
 
 #: documents/models.py:380
 msgid "has tag"
-msgstr "heeft tag"
+msgstr "heeft etiket"
 
 #: documents/models.py:381
 msgid "has any tag"
-msgstr "heeft elke tag"
+msgstr "heeft één van de etiketten"
 
 #: documents/models.py:382
 msgid "created before"
@@ -329,7 +329,7 @@ msgstr "gewijzigd na"
 
 #: documents/models.py:391
 msgid "does not have tag"
-msgstr "heeft geen tag"
+msgstr "heeft geen etiket"
 
 #: documents/models.py:402
 msgid "rule type"

From 5bad23d7be5d90513f3281f859df8f346ff4d90b Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 10 Jan 2021 11:19:10 +0000
Subject: [PATCH 0781/1300] Apply translations in de

translated for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'de' language.
---
 src/locale/de/LC_MESSAGES/django.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po
index dde278835..f16582ec3 100644
--- a/src/locale/de/LC_MESSAGES/django.po
+++ b/src/locale/de/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Jonas Winkler <dev@jpwinkler.de>, 2021
+# Jonas Winkler, 2021
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-06 19:50+0000\n"
 "PO-Revision-Date: 2020-12-30 19:27+0000\n"
-"Last-Translator: Jonas Winkler <dev@jpwinkler.de>, 2021\n"
+"Last-Translator: Jonas Winkler, 2021\n"
 "Language-Team: German (https://www.transifex.com/paperless/teams/115905/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -561,7 +561,7 @@ msgstr "Angegeben in Tagen."
 
 #: paperless_mail/models.py:153
 msgid "attachment type"
-msgstr "Dateianhangs-Typ"
+msgstr "Dateianhangstyp"
 
 #: paperless_mail/models.py:156
 msgid ""

From 9908580409ac75503a0f1b61fe71e9ed7dfa9346 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 10 Jan 2021 11:19:16 +0000
Subject: [PATCH 0782/1300] Translate /src-ui/messages.xlf in nl_NL

translated for the source file '/src-ui/messages.xlf'
on the 'nl_NL' language.
---
 src-ui/src/locale/messages.nl_NL.xlf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf
index 6bed1f039..4ae7459da 100644
--- a/src-ui/src/locale/messages.nl_NL.xlf
+++ b/src-ui/src/locale/messages.nl_NL.xlf
@@ -427,7 +427,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="93754014749412887">
         <source>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Wil je de tag echt verwijderen &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <target>Wil je het etiket echt verwijderen &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
           <context context-type="linenumber">30</context>
@@ -435,7 +435,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
         <source>Tags</source>
-        <target>Tags</target>
+        <target>Etiketten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
           <context context-type="linenumber">1</context>
@@ -1808,7 +1808,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="5467489005440577210">
         <source>Error while deleting element: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
-        <target>Fout bij het verwijderen van een element: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <target>Fout bij het verwijderen van het element: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
           <context context-type="linenumber">93</context>

From 3511c86abd128394b2929c2f6c954381f0a7dfef Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 10 Jan 2021 11:19:21 +0000
Subject: [PATCH 0783/1300] Translate /src-ui/messages.xlf in fr

translated for the source file '/src-ui/messages.xlf'
on the 'fr' language.
---
 src-ui/src/locale/messages.fr.xlf | 44 +++++++++++++++----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
index 5922fade2..84c8295af 100644
--- a/src-ui/src/locale/messages.fr.xlf
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -11,7 +11,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
         <source>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; saved successfully.</source>
-        <target>Vue &amp;quot;<x equiv-text="this.list.savedView.name" id="PH"/>&amp;quot; enregistrée avec succès.</target>
+        <target>Vue &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; enregistrée avec succès.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
           <context context-type="linenumber">94</context>
@@ -19,7 +19,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
         <source>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; created successfully.</source>
-        <target>Vue &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; créée avec succès.</target>
+        <target>Vue &quot;<x equiv-text="savedView.name" id="PH"/>&quot; créée avec succès.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
           <context context-type="linenumber">115</context>
@@ -83,7 +83,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="72e7d343f9165602cce1ca7faffbc565fd31ef92">
         <source>Save &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
-        <target>Enregistrer &amp;quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&amp;quot;</target>
+        <target>Enregistrer &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">71</context>
@@ -171,7 +171,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
         <source>Do you really want to delete document &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</source>
-        <target>Voulez-vous vraiment supprimer le document &amp;quot;<x equiv-text="this.document.title" id="PH"/>&amp;quot; ?</target>
+        <target>Voulez-vous vraiment supprimer le document &quot;<x equiv-text="this.document.title" id="PH"/>&quot; ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
           <context context-type="linenumber">187</context>
@@ -427,7 +427,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="93754014749412887">
         <source>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Voulez-vous vraiment supprimer l'étiquette &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot; ?</target>
+        <target>Voulez-vous vraiment supprimer l'étiquette &quot;<x equiv-text="object.name" id="PH"/>&quot; ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
           <context context-type="linenumber">30</context>
@@ -507,7 +507,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="4990731724078522539">
         <source>Do you really want to delete the document type &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Voulez-vous vraiment supprimer le type de document &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot; ?</target>
+        <target>Voulez-vous vraiment supprimer le type de document &quot;<x equiv-text="object.name" id="PH"/>&quot; ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
           <context context-type="linenumber">26</context>
@@ -539,7 +539,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="5610279464668232148">
         <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
-        <target>Vue &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; supprimée.</target>
+        <target>Vue &quot;<x equiv-text="savedView.name" id="PH"/>&quot; supprimée.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
           <context context-type="linenumber">54</context>
@@ -587,7 +587,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
         <source>Appearance</source>
-        <target>Apparition</target>
+        <target>Affichage</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">13</context>
@@ -699,7 +699,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7427874343955308724">
         <source>Do you really want to delete the correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Voulez-vous vraiment supprimer le correspondant &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot; ?</target>
+        <target>Voulez-vous vraiment supprimer le correspondant &quot;<x equiv-text="object.name" id="PH"/>&quot; ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
           <context context-type="linenumber">26</context>
@@ -867,7 +867,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="afa760e48c97d64d19c1455d18b7834a2256e23f">
         <source>Did you mean &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</source>
-        <target>Vouliez-vous dire &amp;quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&amp;quot; ?</target>
+        <target>Vouliez-vous dire &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot; ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/search/search.component.html</context>
           <context context-type="linenumber">13</context>
@@ -1189,7 +1189,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
         <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
-        <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot; et &amp;quot;<x equiv-text="items[1].name" id="PH_1"/>&amp;quot;</target>
+        <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; et &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">114</context>
@@ -1198,7 +1198,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7894972847287473517">
         <source>&quot;<x equiv-text="i.name" id="PH"/>&quot;</source>
-        <target>&amp;quot;<x equiv-text="i.name" id="PH"/>&amp;quot;</target>
+        <target>&quot;<x equiv-text="i.name" id="PH"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">116</context>
@@ -1215,7 +1215,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="1822679894391095557">
         <source><x equiv-text="list" id="PH"/> and &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</source>
-        <target><x equiv-text="list" id="PH"/> et &amp;quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&amp;quot;</target>
+        <target><x equiv-text="list" id="PH"/> et &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">117</context>
@@ -1232,7 +1232,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="6619516195038467207">
         <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Cette action affectera l'étiquette &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
+        <target>Cette action affectera l'étiquette &quot;<x equiv-text="tag.name" id="PH"/>&quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">129</context>
@@ -1248,7 +1248,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7181166515756808573">
         <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Cette action supprimera l'étiquette &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; de(s) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
+        <target>Cette action supprimera l'étiquette &quot;<x equiv-text="tag.name" id="PH"/>&quot; de(s) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">134</context>
@@ -1280,7 +1280,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="6900893559485781849">
         <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Cette action affectera le correspondant &amp;quot;<x equiv-text="correspondent.name" id="PH"/>&amp;quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/>document(s) sélectionné(s).</target>
+        <target>Cette action affectera le correspondant &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/>document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">160</context>
@@ -1304,7 +1304,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="332180123895325027">
         <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Cette action affectera le type de document &amp;quot;<x equiv-text="documentType.name" id="PH"/>&amp;quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
+        <target>Cette action affectera le type de document &quot;<x equiv-text="documentType.name" id="PH"/>&quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">183</context>
@@ -1824,7 +1824,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7517655726614958140">
         <source>Any: Document contains any of these words (space separated)</source>
-        <target>Un des mots : le document contient l'un de ces mots (séparés par des espaces)</target>
+        <target>Un des mots : contient l'un de ces mots (séparés par des espaces)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">12</context>
@@ -1840,7 +1840,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="111914402588955480">
         <source>All: Document contains all of these words (space separated)</source>
-        <target>Tous les mots : le document contient tous ces mots (séparés par des espaces)</target>
+        <target>Tous les mots : contient tous ces mots (séparés par des espaces)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">13</context>
@@ -1856,7 +1856,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7109184332944610787">
         <source>Exact: Document contains this string</source>
-        <target>Concordance exacte : le document contient cette chaîne de caractères</target>
+        <target>Concordance exacte : contient cette chaîne de caractères</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">14</context>
@@ -1872,7 +1872,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7548151332424148033">
         <source>Regular expression: Document matches this regular expression</source>
-        <target>Expression régulière : le document correspond à cette expression régulière</target>
+        <target>Expression régulière : correspond à cette expression régulière</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">15</context>
@@ -1888,7 +1888,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="8419167206585286450">
         <source>Fuzzy: Document contains a word similar to this word</source>
-        <target>Mot approximatif : le document contient un mot similaire à ce mot</target>
+        <target>Mot approximatif : contient un mot similaire à ce mot</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">16</context>

From def85a3d37cafc1df75d5d4e90597eace8f6b1cb Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 15:51:40 +0100
Subject: [PATCH 0784/1300] maybe use requirements instead?

---
 .github/workflows/ci.yml | 2 +-
 Dockerfile               | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aa4ee9b74..523f74e61 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -125,7 +125,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/arm/v7 # linux/amd64,linux/arm/v7,linux/arm64
           push: true
           tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
           cache-from: type=local,src=/tmp/.buildx-cache
diff --git a/Dockerfile b/Dockerfile
index 16c52caa9..d124ddc09 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,8 +65,9 @@ RUN apt-get update \
 		unpaper \
 		zlib1g \
 
-	&& pip3 install --upgrade supervisor pipenv setuptools \
-  && pipenv install --system --deploy --ignore-pipfile \
+  && pip3 install --upgrade supervisor pipenv setuptools \
+  && pipenv lock -r > requirements.txt \
+  && pip3 install -r requirements.txt \
   && pipenv --clear \
   && pip3 uninstall -y pipenv \
 	&& apt-get -y purge build-essential libqpdf-dev python3-dev python3-pip \

From 22fc16f4a3fc3a5811e201b1fad16dc22fad20c5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 17:18:35 +0100
Subject: [PATCH 0785/1300] revert to python:3.7-slim base image since
 ubuntu:20.04 is clearly not working for arm

---
 Dockerfile       | 21 ++++----------
 requirements.txt | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 15 deletions(-)
 create mode 100644 requirements.txt

diff --git a/Dockerfile b/Dockerfile
index d124ddc09..ee19e0cc0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,15 +19,15 @@ RUN npm install
 COPY src-ui .
 RUN node_modules/.bin/ng build --prod --output-hashing none --sourceMap=false
 
-FROM ubuntu:20.04
+FROM python:3.7-slim
 
 WORKDIR /usr/src/paperless/
 
-COPY Pipfile* ./
+COPY requirements.txt ./
 
 #Dependencies
 RUN apt-get update \
-  && DEBIAN_FRONTEND="noninteractive" apt-get -y --no-install-recommends install \
+  && apt-get -y --no-install-recommends install \
 		build-essential \
 		curl \
 		file \
@@ -38,21 +38,16 @@ RUN apt-get update \
 		icc-profiles-free \
 		imagemagick \
 		libatlas-base-dev \
-		libffi-dev \
 		liblept5 \
 		libmagic-dev \
 		libpoppler-cpp-dev \
 		libpq-dev \
 		libqpdf-dev \
-		libssl-dev \
 		libxml2 \
 		libxslt1-dev \
 		mime-support \
 		optipng \
 		pngquant \
-		python3 \
-		python3-pip \
-		python3-dev \
 		qpdf \
 		sudo \
 		tesseract-ocr \
@@ -64,13 +59,9 @@ RUN apt-get update \
 		tzdata \
 		unpaper \
 		zlib1g \
-
-  && pip3 install --upgrade supervisor pipenv setuptools \
-  && pipenv lock -r > requirements.txt \
-  && pip3 install -r requirements.txt \
-  && pipenv --clear \
-  && pip3 uninstall -y pipenv \
-	&& apt-get -y purge build-essential libqpdf-dev python3-dev python3-pip \
+	&& pip3 install --upgrade supervisor \
+  && python3 -m pip install -r requirements.txt \
+	&& apt-get -y purge build-essential libqpdf-dev \
 	&& apt-get -y autoremove --purge \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& mkdir /var/log/supervisord /var/run/supervisord
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000000000..9932d146b
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,74 @@
+#
+# These requirements were autogenerated by pipenv
+# To regenerate from the project's Pipfile, run:
+#
+#    pipenv lock --requirements
+#
+
+-i https://pypi.python.org/simple
+--extra-index-url https://www.piwheels.org/simple
+arrow==0.17.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+asgiref==3.3.1; python_version >= '3.5'
+blessed==1.17.12
+certifi==2020.12.5
+cffi==1.14.4
+chardet==4.0.0; python_version >= '3.1'
+coloredlogs==15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+cryptography==3.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+dateparser==0.7.6
+django-cors-headers==3.6.0
+django-extensions==3.1.0
+django-filter==2.4.0
+django-picklefield==3.0.1; python_version >= '3'
+django-q==1.3.4
+django==3.1.5
+djangorestframework==3.12.2
+filelock==3.0.12
+fuzzywuzzy==0.18.0
+gunicorn==20.0.4
+humanfriendly==9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+idna==2.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+imap-tools==0.34.0
+img2pdf==0.4.0
+importlib-metadata==3.3.0; python_version < '3.8'
+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.0; 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'
+numpy==1.19.5; python_version >= '3.6'
+ocrmypdf==11.4.5
+pathvalidate==2.3.2
+pdfminer.six==20201018; python_version >= '3.4'
+pdftotext==2.1.5
+pikepdf==2.2.5
+pillow==8.1.0
+pluggy==0.13.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+psycopg2-binary==2.8.6
+pycparser==2.20; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+python-dateutil==2.8.1
+python-dotenv==0.15.0
+python-gnupg==0.4.6
+python-levenshtein==0.12.0
+python-magic==0.4.18
+pytz==2020.5
+redis==3.5.3
+regex==2020.11.13
+reportlab==3.5.59
+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.23.2
+scipy==1.5.4; python_version >= '3.6'
+six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+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.55.1
+typing-extensions==3.7.4.3; python_version < '3.8'
+tzlocal==2.1
+urllib3==1.26.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
+watchdog==1.0.2
+wcwidth==0.2.5
+whitenoise==5.2.0
+whoosh==2.7.4
+zipp==3.4.0; python_version >= '3.6'

From f6da60815407e4865a22eedcfdab67a595345c85 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 17:19:00 +0100
Subject: [PATCH 0786/1300] disable tests until this is working

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 523f74e61..cf2c8b137 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,7 @@ jobs:
   build-docker-image:
     if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-multiarch-builds' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
     runs-on: ubuntu-latest
-    needs: tests
+    # needs: tests
     steps:
       -
         name: Prepare

From 1fe322bbac0633509a7a689d958175d83f8fc68a Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 10 Jan 2021 08:36:20 -0800
Subject: [PATCH 0787/1300] Fix log colors in dark mode

---
 .../src/app/components/manage/logs/logs.component.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/manage/logs/logs.component.html b/src-ui/src/app/components/manage/logs/logs.component.html
index 8c2cbae34..d21cea60d 100644
--- a/src-ui/src/app/components/manage/logs/logs.component.html
+++ b/src-ui/src/app/components/manage/logs/logs.component.html
@@ -5,8 +5,8 @@
       <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#funnel" />
       </svg>&nbsp;<ng-container i18n>Filter</ng-container>
-      
-      
+
+
     </button>
     <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
       <button *ngFor="let f of getLevels()" ngbDropdownItem (click)="setLevel(f.id)"
@@ -16,12 +16,12 @@
 
 </app-page-header>
 
-<div class="bg-dark p-3 mb-3" infiniteScroll (scrolled)="onScroll()">
+<div class="bg-dark p-3 mb-3 text-light text-monospace" infiniteScroll (scrolled)="onScroll()">
   <p
-    class="text-light text-monospace m-0 p-0 log-entry-{{log.level}}"
+    class="m-0 p-0 log-entry-{{log.level}}"
     *ngFor="let log of logs">
       {{log.created | date:'short'}}
       {{getLevelText(log.level)}}
       {{log.message}}
   </p>
-</div>
\ No newline at end of file
+</div>

From 8430aa75da3f2db91ee8aebd52533447b806d537 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 17:46:43 +0100
Subject: [PATCH 0788/1300] enable the other architectures

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf2c8b137..e2918d276 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -125,7 +125,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/arm/v7 # linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: true
           tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
           cache-from: type=local,src=/tmp/.buildx-cache

From 4cf0ce1b06542a1d98366f2924a2e4bb60ac21ac Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 19:26:38 +0100
Subject: [PATCH 0789/1300] version push

---
 docker/hub/docker-compose.postgres.yml      | 2 +-
 docker/hub/docker-compose.sqlite.yml        | 2 +-
 docker/hub/docker-compose.tika.yml          | 2 +-
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index dc32a5d84..215199d1f 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.13
+    image: jonaswinkler/paperless-ng:0.9.14
     restart: always
     depends_on:
       - db
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index ffb8a0560..c1904f81a 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.13
+    image: jonaswinkler/paperless-ng:0.9.14
     restart: always
     depends_on:
       - broker
diff --git a/docker/hub/docker-compose.tika.yml b/docker/hub/docker-compose.tika.yml
index a303ba206..b78ca95dc 100644
--- a/docker/hub/docker-compose.tika.yml
+++ b/docker/hub/docker-compose.tika.yml
@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.13
+    image: jonaswinkler/paperless-ng:0.9.14
     restart: always
     depends_on:
       - broker
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index de212d2d5..c5ef431cd 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,5 +2,5 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "0.9.13"
+  version: "0.9.14"
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index f5815078f..ac1d6312c 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (0, 9, 13)
+__version__ = (0, 9, 14)

From 1e185d15026f285e403525822120170170a922a4 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 19:59:05 +0100
Subject: [PATCH 0790/1300] don't build front end with docker

---
 .github/workflows/ci.yml | 18 ++++++++++++------
 Dockerfile               | 39 ++++++++++++++++-----------------------
 compile-frontend.sh      |  7 +++++++
 src-ui/angular.json      |  1 +
 4 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100755 compile-frontend.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e2918d276..f0df7e608 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -72,17 +72,18 @@ jobs:
       with:
         node-version: '15'
     - name: build
-      run: |
-        cd src-ui/
-        npm install -g @angular/cli
-        npm install
-        ng build --prod
+      run: ./build-frontend.sh
+    - uses: actions/upload-artifact@v2
+      with:
+        name: frontend-compiled
+        path: src/documents/static/frontend/
 
   # build and push image to docker hub.
   build-docker-image:
     if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-multiarch-builds' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
     runs-on: ubuntu-latest
     # needs: tests
+    needs: frontend
     steps:
       -
         name: Prepare
@@ -99,6 +100,11 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v2
+      -
+        uses: actions/download-artifact@v2
+        with:
+          name: frontend-compiled
+          path: src/documents/static/frontend/
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
@@ -125,7 +131,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64 # ,linux/arm/v7,linux/arm64
           push: true
           tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
           cache-from: type=local,src=/tmp/.buildx-cache
diff --git a/Dockerfile b/Dockerfile
index ee19e0cc0..4a52568ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,27 +8,15 @@ RUN git clone https://github.com/agl/jbig2enc .
 RUN ./autogen.sh
 RUN ./configure && make
 
-
-FROM node:15 AS frontend
-
-WORKDIR /usr/src/paperless/src-ui/
-
-COPY src-ui/package* ./
-RUN npm install
-
-COPY src-ui .
-RUN node_modules/.bin/ng build --prod --output-hashing none --sourceMap=false
-
 FROM python:3.7-slim
 
 WORKDIR /usr/src/paperless/
 
 COPY requirements.txt ./
 
-#Dependencies
+# Binary dependencies
 RUN apt-get update \
   && apt-get -y --no-install-recommends install \
-		build-essential \
 		curl \
 		file \
 		fonts-liberation \
@@ -37,13 +25,6 @@ RUN apt-get update \
 		gnupg \
 		icc-profiles-free \
 		imagemagick \
-		libatlas-base-dev \
-		liblept5 \
-		libmagic-dev \
-		libpoppler-cpp-dev \
-		libpq-dev \
-		libqpdf-dev \
-		libxml2 \
 		libxslt1-dev \
 		mime-support \
 		optipng \
@@ -59,8 +40,21 @@ RUN apt-get update \
 		tzdata \
 		unpaper \
 		zlib1g \
-	&& pip3 install --upgrade supervisor \
-  && python3 -m pip install -r requirements.txt \
+		&& rm -rf /var/lib/apt/lists/*
+
+# Python dependencies
+RUN apt-get update \
+  && apt-get -y --no-install-recommends install \
+		build-essential \
+		libatlas-base-dev \
+		liblept5 \
+		libmagic-dev \
+		libpoppler-cpp-dev \
+		libpq-dev \
+		libqpdf-dev \
+		libxml2 \
+	&& python3 -m pip install --upgrade --no-cache-dir supervisor \
+  && python3 -m pip install --no-cache-dir -r requirements.txt \
 	&& apt-get -y purge build-essential libqpdf-dev \
 	&& apt-get -y autoremove --purge \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -81,7 +75,6 @@ COPY --from=jbig2enc /usr/src/jbig2enc/src/*.h /usr/local/include/
 
 # copy app
 COPY src/ ./src/
-COPY --from=frontend /usr/src/paperless/src-ui/dist/paperless-ui/ /usr/src/paperless/src/documents/static/frontend/
 
 # add users, setup scripts
 RUN addgroup --gid 1000 paperless \
diff --git a/compile-frontend.sh b/compile-frontend.sh
new file mode 100755
index 000000000..98b88d033
--- /dev/null
+++ b/compile-frontend.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+
+cd src-ui
+npm install
+./node_modules/.bin/ng build --prod
diff --git a/src-ui/angular.json b/src-ui/angular.json
index 414cd4f64..829a482af 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -58,6 +58,7 @@
 									"with": "src/environments/environment.prod.ts"
 								}
 							],
+							"outputPath": "../src/documents/static/frontend/",
 							"optimization": true,
 							"outputHashing": "none",
 							"sourceMap": false,

From ff3bdd7f5abad3f998e0deab4b5b8558bb083a66 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 20:00:11 +0100
Subject: [PATCH 0791/1300] fix script name

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f0df7e608..ce5117256 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -72,7 +72,7 @@ jobs:
       with:
         node-version: '15'
     - name: build
-      run: ./build-frontend.sh
+      run: ./compile-frontend.sh
     - uses: actions/upload-artifact@v2
       with:
         name: frontend-compiled

From 6a3e4f0857177e8ba9f4af24fbf9fafbcf67473d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 21:03:50 +0100
Subject: [PATCH 0792/1300] add release archive action

---
 .github/workflows/ci.yml | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce5117256..eea3b0ba0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,6 +30,10 @@ jobs:
         run: |
           cd docs/
           make html
+      - uses: actions/upload-artifact@v2
+        with:
+          name: documentation
+          path: docs/_build/html/
 
   tests:
     runs-on: ubuntu-20.04
@@ -78,6 +82,39 @@ jobs:
         name: frontend-compiled
         path: src/documents/static/frontend/
 
+  release:
+    needs: [frontend, documentation] # tests
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      -
+        uses: actions/download-artifact@v2
+        with:
+          name: frontend-compiled
+          path: src/documents/static/frontend/
+      -
+        uses: actions/download-artifact@v2
+        with:
+          name: documentation
+          path: src/documents/static/frontend/
+      -
+        run: |
+          mkdir dist
+          mkdir dist/paperless-ng
+          mkdir dist/paperless-ng/docker
+          mkdir dist/paperless-ng/scripts
+          cp .dockerignore .env docker-compose.* Dockerfile paperless.conf.example Pipfile Pipfile.lock LICENSE README.md requirements.txt dist/paperless-ng/
+          cp docker/* dist/paperless-ng/docker/
+          cp scripts/* dist/paperless-ng/scripts/
+          cp src/ dist/paperless-ng/src -R
+          cd dist
+          tar -cJf paperless-ng.tar.xz paperless-ng/
+      - uses: actions/upload-artifact@v2
+        with:
+          name: release
+          path: dist/paperless-ng/paperless-ng.tar.xz
+
+
   # build and push image to docker hub.
   build-docker-image:
     if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-multiarch-builds' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')

From 2e2e69f07c7bc95e7904f61dfc6719062933e6f6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 21:17:01 +0100
Subject: [PATCH 0793/1300] more release archive

---
 .github/workflows/ci.yml | 42 ++++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eea3b0ba0..2d0f98c3b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,7 +86,19 @@ jobs:
     needs: [frontend, documentation] # tests
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      -
+        uses: actions/checkout@v2
+      -
+        name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      -
+        name: Install dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev gettext
+          pip3 install -r requirements.txt
       -
         uses: actions/download-artifact@v2
         with:
@@ -96,20 +108,34 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: documentation
-          path: src/documents/static/frontend/
+          path: docs/_build/html/
       -
+        name: Move files
         run: |
           mkdir dist
           mkdir dist/paperless-ng
           mkdir dist/paperless-ng/docker
           mkdir dist/paperless-ng/scripts
           cp .dockerignore .env docker-compose.* Dockerfile paperless.conf.example Pipfile Pipfile.lock LICENSE README.md requirements.txt dist/paperless-ng/
-          cp docker/* dist/paperless-ng/docker/
-          cp scripts/* dist/paperless-ng/scripts/
-          cp src/ dist/paperless-ng/src -R
-          cd dist
-          tar -cJf paperless-ng.tar.xz paperless-ng/
-      - uses: actions/upload-artifact@v2
+          cp docker/*.* dist/paperless-ng/docker/
+          cp scripts/*.service scripts/*.sh dist/paperless-ng/scripts/
+          cp src/ dist/paperless-ng/src -r
+          cp docs/_build/html/ dist/paperless-ng/docs -r
+      -
+        name: Compile messages
+        run: |
+          cd dist/paperless-ng/src
+          python3 manage.py compilemessages
+      -
+        name: Collect static files
+        run: |
+          cd dist/paperless-ng/src
+          python3 manage.py collectstatic --no-input
+      -
+        name: Make release package
+        run: tar -cJf paperless-ng.tar.xz paperless-ng/
+      -
+        uses: actions/upload-artifact@v2
         with:
           name: release
           path: dist/paperless-ng/paperless-ng.tar.xz

From e1f52d706f43a06c66da5c2fbd807d3fa1de39e8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 21:20:55 +0100
Subject: [PATCH 0794/1300] fix wrong directory

---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2d0f98c3b..5acae09f2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -133,7 +133,9 @@ jobs:
           python3 manage.py collectstatic --no-input
       -
         name: Make release package
-        run: tar -cJf paperless-ng.tar.xz paperless-ng/
+        run: |
+          cd dist
+          tar -cJf paperless-ng.tar.xz paperless-ng/
       -
         uses: actions/upload-artifact@v2
         with:

From 527b7bee3fffdd026b9f679e2fd72f9be31f28b9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 21:27:41 +0100
Subject: [PATCH 0795/1300] forgot a dependency

---
 .github/workflows/ci.yml | 2 +-
 Dockerfile               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5acae09f2..e965d50c6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -97,7 +97,7 @@ jobs:
         name: Install dependencies
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev gettext
+          sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev gettext liblept5
           pip3 install -r requirements.txt
       -
         uses: actions/download-artifact@v2
diff --git a/Dockerfile b/Dockerfile
index 4a52568ea..7e921fcda 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,7 @@ RUN apt-get update \
 		gnupg \
 		icc-profiles-free \
 		imagemagick \
+		liblept5 \
 		libxslt1-dev \
 		mime-support \
 		optipng \
@@ -47,7 +48,6 @@ RUN apt-get update \
   && apt-get -y --no-install-recommends install \
 		build-essential \
 		libatlas-base-dev \
-		liblept5 \
 		libmagic-dev \
 		libpoppler-cpp-dev \
 		libpq-dev \

From 64d6e6eded98f33c01cdcf6d2e15c7c83f49ccd5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 21:35:43 +0100
Subject: [PATCH 0796/1300] wrong path to release

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e965d50c6..84949dec0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -140,7 +140,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: release
-          path: dist/paperless-ng/paperless-ng.tar.xz
+          path: dist/paperless-ng.tar.xz
 
 
   # build and push image to docker hub.

From f24640dec2cd133c5fce504e52ef6f772d6f25e1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 21:53:18 +0100
Subject: [PATCH 0797/1300] some small fixes

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 84949dec0..4379f8abb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,7 +83,7 @@ jobs:
         path: src/documents/static/frontend/
 
   release:
-    needs: [frontend, documentation] # tests
+    needs: [frontend, documentation, tests]
     runs-on: ubuntu-20.04
     steps:
       -
@@ -135,6 +135,7 @@ jobs:
         name: Make release package
         run: |
           cd dist
+          find . -name __pycache__ | xargs rm -r
           tar -cJf paperless-ng.tar.xz paperless-ng/
       -
         uses: actions/upload-artifact@v2
@@ -147,8 +148,7 @@ jobs:
   build-docker-image:
     if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-multiarch-builds' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
     runs-on: ubuntu-latest
-    # needs: tests
-    needs: frontend
+    needs: [frontend, tests]
     steps:
       -
         name: Prepare

From a9d6e7f402cb71e94514e69d9645893db076b63c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 22:22:23 +0100
Subject: [PATCH 0798/1300] add a publish release step

---
 .github/workflows/ci.yml | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4379f8abb..c26c0672f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,7 @@ jobs:
         name: frontend-compiled
         path: src/documents/static/frontend/
 
-  release:
+  build-release:
     needs: [frontend, documentation, tests]
     runs-on: ubuntu-20.04
     steps:
@@ -143,6 +143,38 @@ jobs:
           name: release
           path: dist/paperless-ng.tar.xz
 
+  publish-release:
+    runs-on: ubuntu-latest
+    needs: build-release
+    steps:
+      -
+        name: Download Release Artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: release
+          path: paperless-ng.tar.xz
+      -
+        name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Paperless-ng ${{ github.ref }}
+          draft: true
+          prerelease: true
+      -
+        name: Upload Release Archive
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          asset_path: ./paperless-ng.tar.xz
+          asset_name: paperless-ng-${{ github.ref }}.tar.xz
+          asset_content_type: application/x-xz
 
   # build and push image to docker hub.
   build-docker-image:

From ee31249d651a30118822eb356e757a5549872984 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 22:28:46 +0100
Subject: [PATCH 0799/1300] reorganized the Dockerfile

---
 Dockerfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7e921fcda..789a15641 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,28 +17,31 @@ COPY requirements.txt ./
 # Binary dependencies
 RUN apt-get update \
   && apt-get -y --no-install-recommends install \
+  	# Basic dependencies
 		curl \
 		file \
 		fonts-liberation \
 		gettext \
-		ghostscript \
 		gnupg \
-		icc-profiles-free \
 		imagemagick \
-		liblept5 \
 		libxslt1-dev \
 		mime-support \
 		optipng \
+		sudo \
+		tzdata \
+  	# OCRmyPDF dependencies
+		ghostscript \
+		icc-profiles-free \
+		liblept5 \
+		libxml2 \
 		pngquant \
 		qpdf \
-		sudo \
 		tesseract-ocr \
 		tesseract-ocr-eng \
 		tesseract-ocr-deu \
 		tesseract-ocr-fra \
 		tesseract-ocr-ita \
 		tesseract-ocr-spa \
-		tzdata \
 		unpaper \
 		zlib1g \
 		&& rm -rf /var/lib/apt/lists/*
@@ -52,7 +55,6 @@ RUN apt-get update \
 		libpoppler-cpp-dev \
 		libpq-dev \
 		libqpdf-dev \
-		libxml2 \
 	&& python3 -m pip install --upgrade --no-cache-dir supervisor \
   && python3 -m pip install --no-cache-dir -r requirements.txt \
 	&& apt-get -y purge build-essential libqpdf-dev \

From 7ebc1351fe417ff2c6fff4f7f962427632e3335b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 22:40:13 +0100
Subject: [PATCH 0800/1300] updated documentation #316

---
 docs/configuration.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 4828c4fa5..ac2efd390 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -423,6 +423,9 @@ PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS=<bool>
     E.g. <CONSUMPTION_DIR>/foo/bar/file.pdf will add the tags "foo" and "bar" to
     the consumed file. Paperless will create any tags that don't exist yet.
 
+    This is useful for sorting documents with certain tags such as ``car`` or
+    ``todo`` prior to consumption. These folders won't be deleted.
+
     PAPERLESS_CONSUMER_RECURSIVE must be enabled for this to work.
 
     Defaults to false.

From e96809a08e6d1fe57551d1aac0065b3f060fe9b8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 22:47:24 +0100
Subject: [PATCH 0801/1300] translation for login/logout pages #212

---
 src/documents/templates/index.html            |   3 +-
 .../templates/registration/logged_out.html    |   7 +-
 .../templates/registration/login.html         |  19 ++--
 src/locale/en-us/LC_MESSAGES/django.po        | 106 ++++++++++++------
 4 files changed, 90 insertions(+), 45 deletions(-)

diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html
index 21112b643..285e48d3f 100644
--- a/src/documents/templates/index.html
+++ b/src/documents/templates/index.html
@@ -1,6 +1,7 @@
 <!doctype html>
 
 {% load static %}
+{% load i18n %}
 
 <html lang="en">
 <head>
@@ -16,7 +17,7 @@
 	<link rel="stylesheet" href="{% static styles_css %}">
 </head>
 <body>
-  <app-root>Loading...</app-root>
+  <app-root>{% translate "Paperless-ng is loading..." %}</app-root>
 	<script src="{% static runtime_js %}" defer></script>
 	<script src="{% static polyfills_js %}" defer></script>
 	<script src="{% static main_js %}" defer></script>
diff --git a/src/documents/templates/registration/logged_out.html b/src/documents/templates/registration/logged_out.html
index 1448b641e..bf21b95f8 100644
--- a/src/documents/templates/registration/logged_out.html
+++ b/src/documents/templates/registration/logged_out.html
@@ -1,6 +1,7 @@
 <!doctype html>
 
 {% load static %}
+{% load i18n %}
 
 <html lang="en">
   <head>
@@ -9,7 +10,7 @@
     <meta name="description" content="">
     <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
     <meta name="generator" content="Jekyll v4.1.1">
-    <title>Paperless Sign In</title>
+    <title>{% translate "Paperless-ng signed out" %}</title>
 
     <!-- Bootstrap core CSS -->
 		<link href="{% static 'bootstrap.min.css' %}" rel="stylesheet">
@@ -37,8 +38,8 @@
   <body class="text-center">
     <div class="form-signin">
 			<img class="mb-4" src="{% static 'frontend/en-US/assets/logo.svg' %}" alt="" width="300">
-			<p>You have been successfully logged out. Bye!</p>
-			<a href="/">Sign in again</a>
+			<p>{% translate "You have been successfully logged out. Bye!" %}</p>
+			<a href="/">{% translate "Sign in again" %}</a>
 		</div>
 	</body>
 </html>
diff --git a/src/documents/templates/registration/login.html b/src/documents/templates/registration/login.html
index 7f1fc79dd..ba46d3adf 100644
--- a/src/documents/templates/registration/login.html
+++ b/src/documents/templates/registration/login.html
@@ -1,6 +1,7 @@
 <!doctype html>
 
 {% load static %}
+{% load i18n %}
 
 <html lang="en">
   <head>
@@ -9,7 +10,7 @@
     <meta name="description" content="">
     <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
     <meta name="generator" content="Jekyll v4.1.1">
-    <title>Paperless Sign In</title>
+    <title>{% translate "Paperless-ng sign in" %}</title>
 
     <!-- Bootstrap core CSS -->
 		<link href="{% static 'bootstrap.min.css' %}" rel="stylesheet">
@@ -38,17 +39,19 @@
     <form class="form-signin" method="post">
 			{% csrf_token %}
 			<img class="mb-4" src="{% static 'frontend/en-US/assets/logo.svg' %}" alt="" width="300">
-			<p>Please sign in.</p>
+			<p>{% translate "Please sign in." %}</p>
 			{% if form.errors %}
 				<div class="alert alert-danger" role="alert">
-					Your username and password didn't match. Please try again.
+					{% translate "Your username and password didn't match. Please try again." %}
 				</div>
 			{% endif %}
-			<label for="inputUsername" class="sr-only">Username</label>
-			<input type="text" name="username" id="inputUsername" class="form-control" placeholder="Username" required autofocus>
-			<label for="inputPassword" class="sr-only">Password</label>
-			<input type="password" name="password" id="inputPassword" class="form-control" placeholder="Password" required>
-			<button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
+			{% translate "Username" as i18n_username %}
+			{% translate "Password" as i18n_password %}
+			<label for="inputUsername" class="sr-only">{{ i18n_username }}</label>
+			<input type="text" name="username" id="inputUsername" class="form-control" placeholder="{{ i18n_username }}" required autofocus>
+			<label for="inputPassword" class="sr-only">{{ i18n_password }}</label>
+			<input type="password" name="password" id="inputPassword" class="form-control" placeholder="{{ i18n_password }}" required>
+			<button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Sign in" %}</button>
 		</form>
 	</body>
 </html>
diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en-us/LC_MESSAGES/django.po
index b3e448058..414caba52 100644
--- a/src/locale/en-us/LC_MESSAGES/django.po
+++ b/src/locale/en-us/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-06 19:50+0000\n"
+"POT-Creation-Date: 2021-01-10 21:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,7 +46,7 @@ msgid "Automatic"
 msgstr ""
 
 #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
-#: paperless_mail/models.py:111
+#: paperless_mail/models.py:109
 msgid "name"
 msgstr ""
 
@@ -338,6 +338,46 @@ msgstr ""
 msgid "filter rules"
 msgstr ""
 
+#: documents/templates/index.html:20
+msgid "Paperless-ng is loading..."
+msgstr ""
+
+#: documents/templates/registration/logged_out.html:13
+msgid "Paperless-ng signed out"
+msgstr ""
+
+#: documents/templates/registration/logged_out.html:41
+msgid "You have been successfully logged out. Bye!"
+msgstr ""
+
+#: documents/templates/registration/logged_out.html:42
+msgid "Sign in again"
+msgstr ""
+
+#: documents/templates/registration/login.html:13
+msgid "Paperless-ng sign in"
+msgstr ""
+
+#: documents/templates/registration/login.html:42
+msgid "Please sign in."
+msgstr ""
+
+#: documents/templates/registration/login.html:45
+msgid "Your username and password didn't match. Please try again."
+msgstr ""
+
+#: documents/templates/registration/login.html:48
+msgid "Username"
+msgstr ""
+
+#: documents/templates/registration/login.html:49
+msgid "Password"
+msgstr ""
+
+#: documents/templates/registration/login.html:54
+msgid "Sign in"
+msgstr ""
+
 #: paperless/settings.py:268
 msgid "English"
 msgstr ""
@@ -451,132 +491,132 @@ msgstr ""
 msgid "Only process attachments."
 msgstr ""
 
-#: paperless_mail/models.py:70
+#: paperless_mail/models.py:68
 msgid "Process all files, including 'inline' attachments."
 msgstr ""
 
-#: paperless_mail/models.py:80
+#: paperless_mail/models.py:78
 msgid "Mark as read, don't process read mails"
 msgstr ""
 
-#: paperless_mail/models.py:81
+#: paperless_mail/models.py:79
 msgid "Flag the mail, don't process flagged mails"
 msgstr ""
 
-#: paperless_mail/models.py:82
+#: paperless_mail/models.py:80
 msgid "Move to specified folder"
 msgstr ""
 
-#: paperless_mail/models.py:83
+#: paperless_mail/models.py:81
 msgid "Delete"
 msgstr ""
 
-#: paperless_mail/models.py:90
+#: paperless_mail/models.py:88
 msgid "Use subject as title"
 msgstr ""
 
-#: paperless_mail/models.py:91
+#: paperless_mail/models.py:89
 msgid "Use attachment filename as title"
 msgstr ""
 
-#: paperless_mail/models.py:101
+#: paperless_mail/models.py:99
 msgid "Do not assign a correspondent"
 msgstr ""
 
-#: paperless_mail/models.py:103
+#: paperless_mail/models.py:101
 msgid "Use mail address"
 msgstr ""
 
-#: paperless_mail/models.py:105
+#: paperless_mail/models.py:103
 msgid "Use name (or mail address if not available)"
 msgstr ""
 
-#: paperless_mail/models.py:107
+#: paperless_mail/models.py:105
 msgid "Use correspondent selected below"
 msgstr ""
 
-#: paperless_mail/models.py:115
+#: paperless_mail/models.py:113
 msgid "order"
 msgstr ""
 
-#: paperless_mail/models.py:122
+#: paperless_mail/models.py:120
 msgid "account"
 msgstr ""
 
-#: paperless_mail/models.py:126
+#: paperless_mail/models.py:124
 msgid "folder"
 msgstr ""
 
-#: paperless_mail/models.py:130
+#: paperless_mail/models.py:128
 msgid "filter from"
 msgstr ""
 
-#: paperless_mail/models.py:133
+#: paperless_mail/models.py:131
 msgid "filter subject"
 msgstr ""
 
-#: paperless_mail/models.py:136
+#: paperless_mail/models.py:134
 msgid "filter body"
 msgstr ""
 
-#: paperless_mail/models.py:140
+#: paperless_mail/models.py:138
 msgid "filter attachment filename"
 msgstr ""
 
-#: paperless_mail/models.py:142
+#: 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 ""
 
-#: paperless_mail/models.py:148
+#: paperless_mail/models.py:146
 msgid "maximum age"
 msgstr ""
 
-#: paperless_mail/models.py:150
+#: paperless_mail/models.py:148
 msgid "Specified in days."
 msgstr ""
 
-#: paperless_mail/models.py:153
+#: paperless_mail/models.py:151
 msgid "attachment type"
 msgstr ""
 
-#: paperless_mail/models.py:156
+#: paperless_mail/models.py:154
 msgid ""
 "Inline attachments include embedded images, so it's best to combine this "
 "option with a filename filter."
 msgstr ""
 
-#: paperless_mail/models.py:161
+#: paperless_mail/models.py:159
 msgid "action"
 msgstr ""
 
-#: paperless_mail/models.py:167
+#: paperless_mail/models.py:165
 msgid "action parameter"
 msgstr ""
 
-#: paperless_mail/models.py:169
+#: 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 ""
 
-#: paperless_mail/models.py:175
+#: paperless_mail/models.py:173
 msgid "assign title from"
 msgstr ""
 
-#: paperless_mail/models.py:185
+#: paperless_mail/models.py:183
 msgid "assign this tag"
 msgstr ""
 
-#: paperless_mail/models.py:193
+#: paperless_mail/models.py:191
 msgid "assign this document type"
 msgstr ""
 
-#: paperless_mail/models.py:197
+#: paperless_mail/models.py:195
 msgid "assign correspondent from"
 msgstr ""
 
-#: paperless_mail/models.py:207
+#: paperless_mail/models.py:205
 msgid "assign this correspondent"
 msgstr ""

From df95fad9be73b1449a731db223fe4f8f79d40158 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 22:56:10 +0100
Subject: [PATCH 0802/1300] update release name

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c26c0672f..b5eb9f318 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,8 +160,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Paperless-ng ${{ github.ref }}
+          tag_name: ${{ github.ref#refs/heads/ }}
+          release_name: Paperless-ng ${{ github.ref#refs/heads/ }}
           draft: true
           prerelease: true
       -
@@ -173,7 +173,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
           asset_path: ./paperless-ng.tar.xz
-          asset_name: paperless-ng-${{ github.ref }}.tar.xz
+          asset_name: paperless-ng-${{ github.ref#refs/heads/ }}.tar.xz
           asset_content_type: application/x-xz
 
   # build and push image to docker hub.

From 8927e0185bedb2bab9126dc1f323ac96eeb7fea9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 22:57:56 +0100
Subject: [PATCH 0803/1300] maybe this is better?

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b5eb9f318..8bcd5de92 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,8 +160,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ github.ref#refs/heads/ }}
-          release_name: Paperless-ng ${{ github.ref#refs/heads/ }}
+          tag_name: ${GITHUB_REF#refs/heads/}
+          release_name: Paperless-ng ${GITHUB_REF#refs/heads/}
           draft: true
           prerelease: true
       -
@@ -173,7 +173,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
           asset_path: ./paperless-ng.tar.xz
-          asset_name: paperless-ng-${{ github.ref#refs/heads/ }}.tar.xz
+          asset_name: paperless-ng-${GITHUB_REF#refs/heads/}.tar.xz
           asset_content_type: application/x-xz
 
   # build and push image to docker hub.

From bce79189e556fa7fc4b80adb92ed66c7152aa31d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 23:09:09 +0100
Subject: [PATCH 0804/1300] maybe this is better?

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8bcd5de92..41bf07776 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,8 +160,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${GITHUB_REF#refs/heads/}
-          release_name: Paperless-ng ${GITHUB_REF#refs/heads/}
+          tag_name: ${{ GITHUB_REF#refs/heads/ }}
+          release_name: Paperless-ng ${{ GITHUB_REF#refs/heads/ }}
           draft: true
           prerelease: true
       -
@@ -173,7 +173,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
           asset_path: ./paperless-ng.tar.xz
-          asset_name: paperless-ng-${GITHUB_REF#refs/heads/}.tar.xz
+          asset_name: paperless-ng-${{ GITHUB_REF#refs/heads/ }}.tar.xz
           asset_content_type: application/x-xz
 
   # build and push image to docker hub.

From 0adb8cea91fef7e368a1cffefad59c0ea2ca6100 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 23:17:53 +0100
Subject: [PATCH 0805/1300] I have no idea what I am doing

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 41bf07776..8f33d5fb4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,8 +160,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ GITHUB_REF#refs/heads/ }}
-          release_name: Paperless-ng ${{ GITHUB_REF#refs/heads/ }}
+          tag_name: $GITHUB_REF#refs/heads/
+          release_name: Paperless-ng $GITHUB_REF#refs/heads/
           draft: true
           prerelease: true
       -
@@ -173,7 +173,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
           asset_path: ./paperless-ng.tar.xz
-          asset_name: paperless-ng-${{ GITHUB_REF#refs/heads/ }}.tar.xz
+          asset_name: paperless-ng-$GITHUB_REF#refs/heads/.tar.xz
           asset_content_type: application/x-xz
 
   # build and push image to docker hub.

From b5cd713e1675601432dbab4ae835e35c3600e94c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 23:43:59 +0100
Subject: [PATCH 0806/1300] maybe this

---
 .github/workflows/ci.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8f33d5fb4..a4523b6f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -153,6 +153,11 @@ jobs:
         with:
           name: release
           path: paperless-ng.tar.xz
+      -
+        id: get_branch_name
+        run: |
+          branch_name=$(echo ${{ GITHUB_REF }} | cut -d/ -f3)
+          echo "::set-output name=branch_name::$branch_name"
       -
         name: Create Release
         id: create_release
@@ -160,8 +165,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: $GITHUB_REF#refs/heads/
-          release_name: Paperless-ng $GITHUB_REF#refs/heads/
+          tag_name: ${{ steps.get_branch_name.outputs.branch_name }}
+          release_name: Paperless-ng ${{ steps.get_branch_name.outputs.branch_name }}
           draft: true
           prerelease: true
       -
@@ -173,7 +178,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
           asset_path: ./paperless-ng.tar.xz
-          asset_name: paperless-ng-$GITHUB_REF#refs/heads/.tar.xz
+          asset_name: paperless-ng-${{ steps.get_branch_name.outputs.branch_name }}.tar.xz
           asset_content_type: application/x-xz
 
   # build and push image to docker hub.

From ebcdcc6a1ef79761ec2faded14e31931ea13fe8d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 23:46:19 +0100
Subject: [PATCH 0807/1300] github.ref instead of GITHUB_REF

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a4523b6f9..d66078023 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -156,7 +156,7 @@ jobs:
       -
         id: get_branch_name
         run: |
-          branch_name=$(echo ${{ GITHUB_REF }} | cut -d/ -f3)
+          branch_name=$(echo ${{ github.ref }} | cut -d/ -f3)
           echo "::set-output name=branch_name::$branch_name"
       -
         name: Create Release

From f701479d77b17fef3f7ada6d2334ad9566131c13 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 10 Jan 2021 23:57:20 +0100
Subject: [PATCH 0808/1300] fix upload-release-asset path

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d66078023..7a1dcbe7e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -152,7 +152,7 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: release
-          path: paperless-ng.tar.xz
+          path: ./
       -
         id: get_branch_name
         run: |

From 6ce0945aebd22ca6eb6a8d9663a934b46b434fc5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 11 Jan 2021 00:08:56 +0100
Subject: [PATCH 0809/1300] enable multiarch builds, release only with ng- tags

---
 .github/workflows/ci.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7a1dcbe7e..2ac2fc38f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -146,6 +146,7 @@ jobs:
   publish-release:
     runs-on: ubuntu-latest
     needs: build-release
+    if: contains(github.ref, 'refs/tags/ng-')
     steps:
       -
         name: Download Release Artifact
@@ -156,7 +157,7 @@ jobs:
       -
         id: get_branch_name
         run: |
-          branch_name=$(echo ${{ github.ref }} | cut -d/ -f3)
+          branch_name=$(echo ${{ github.ref }} | cut -d- -f2)
           echo "::set-output name=branch_name::$branch_name"
       -
         name: Create Release
@@ -167,8 +168,10 @@ jobs:
         with:
           tag_name: ${{ steps.get_branch_name.outputs.branch_name }}
           release_name: Paperless-ng ${{ steps.get_branch_name.outputs.branch_name }}
-          draft: true
+          draft: false
           prerelease: true
+          body: |
+            TODO: Insert changelog here (it's also in the documentation)
       -
         name: Upload Release Archive
         id: upload-release-asset
@@ -233,7 +236,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64 # ,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: true
           tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
           cache-from: type=local,src=/tmp/.buildx-cache

From bfcfcde71a59ceeacea30cf8fe34ae21a08d71c0 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 10 Jan 2021 23:51:27 +0000
Subject: [PATCH 0810/1300] Apply translations in nl_NL

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'nl_NL' language.
---
 src/locale/nl_NL/LC_MESSAGES/django.po | 106 +++++++++++++++++--------
 1 file changed, 73 insertions(+), 33 deletions(-)

diff --git a/src/locale/nl_NL/LC_MESSAGES/django.po b/src/locale/nl_NL/LC_MESSAGES/django.po
index de24dbf59..36293e7b8 100644
--- a/src/locale/nl_NL/LC_MESSAGES/django.po
+++ b/src/locale/nl_NL/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-06 19:50+0000\n"
+"POT-Creation-Date: 2021-01-10 21:41+0000\n"
 "PO-Revision-Date: 2020-12-30 19:27+0000\n"
 "Last-Translator: Jo Vandeginste <jo.vandeginste@gmail.com>, 2021\n"
 "Language-Team: Dutch (Netherlands) (https://www.transifex.com/paperless/teams/115905/nl_NL/)\n"
@@ -51,7 +51,7 @@ msgid "Automatic"
 msgstr "Automatisch"
 
 #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
-#: paperless_mail/models.py:111
+#: paperless_mail/models.py:109
 msgid "name"
 msgstr "naam"
 
@@ -347,6 +347,46 @@ msgstr "filterregel"
 msgid "filter rules"
 msgstr "filterregels"
 
+#: documents/templates/index.html:20
+msgid "Paperless-ng is loading..."
+msgstr "Paperless-ng is aan het laden..."
+
+#: documents/templates/registration/logged_out.html:13
+msgid "Paperless-ng signed out"
+msgstr "Paperless-ng - afmelden"
+
+#: documents/templates/registration/logged_out.html:41
+msgid "You have been successfully logged out. Bye!"
+msgstr "Je bent nu afgemeld. Tot later!"
+
+#: documents/templates/registration/logged_out.html:42
+msgid "Sign in again"
+msgstr "Meld je opnieuw aan"
+
+#: documents/templates/registration/login.html:13
+msgid "Paperless-ng sign in"
+msgstr "Paperless-ng - aanmelden"
+
+#: documents/templates/registration/login.html:42
+msgid "Please sign in."
+msgstr "Gelieve aan te melden."
+
+#: documents/templates/registration/login.html:45
+msgid "Your username and password didn't match. Please try again."
+msgstr "Je gebruikersnaam en wachtwoord komen niet overeen. Probeer opnieuw."
+
+#: documents/templates/registration/login.html:48
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: documents/templates/registration/login.html:49
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: documents/templates/registration/login.html:54
+msgid "Sign in"
+msgstr "Aanmelden"
+
 #: paperless/settings.py:268
 msgid "English"
 msgstr "Engels"
@@ -469,79 +509,79 @@ msgstr "email-regels"
 msgid "Only process attachments."
 msgstr "Alleen bijlagen verwerken"
 
-#: paperless_mail/models.py:70
+#: paperless_mail/models.py:68
 msgid "Process all files, including 'inline' attachments."
 msgstr "Verwerk alle bestanden, inclusief 'inline' bijlagen."
 
-#: paperless_mail/models.py:80
+#: paperless_mail/models.py:78
 msgid "Mark as read, don't process read mails"
 msgstr "Markeer als gelezen, verwerk geen gelezen mails"
 
-#: paperless_mail/models.py:81
+#: paperless_mail/models.py:79
 msgid "Flag the mail, don't process flagged mails"
 msgstr "Markeer de mail, verwerk geen mails met markering"
 
-#: paperless_mail/models.py:82
+#: paperless_mail/models.py:80
 msgid "Move to specified folder"
 msgstr "Verplaats naar gegeven map"
 
-#: paperless_mail/models.py:83
+#: paperless_mail/models.py:81
 msgid "Delete"
 msgstr "Verwijder"
 
-#: paperless_mail/models.py:90
+#: paperless_mail/models.py:88
 msgid "Use subject as title"
 msgstr "Gebruik onderwerp als titel"
 
-#: paperless_mail/models.py:91
+#: paperless_mail/models.py:89
 msgid "Use attachment filename as title"
 msgstr "Gebruik naam van bijlage als titel"
 
-#: paperless_mail/models.py:101
+#: paperless_mail/models.py:99
 msgid "Do not assign a correspondent"
 msgstr "Wijs geen correspondent toe"
 
-#: paperless_mail/models.py:103
+#: paperless_mail/models.py:101
 msgid "Use mail address"
 msgstr "Gebruik het email-adres"
 
-#: paperless_mail/models.py:105
+#: paperless_mail/models.py:103
 msgid "Use name (or mail address if not available)"
 msgstr "Gebruik de naam, en anders het email-adres"
 
-#: paperless_mail/models.py:107
+#: paperless_mail/models.py:105
 msgid "Use correspondent selected below"
 msgstr "Gebruik de hieronder aangeduide correspondent"
 
-#: paperless_mail/models.py:115
+#: paperless_mail/models.py:113
 msgid "order"
 msgstr "volgorde"
 
-#: paperless_mail/models.py:122
+#: paperless_mail/models.py:120
 msgid "account"
 msgstr "account"
 
-#: paperless_mail/models.py:126
+#: paperless_mail/models.py:124
 msgid "folder"
 msgstr "map"
 
-#: paperless_mail/models.py:130
+#: paperless_mail/models.py:128
 msgid "filter from"
 msgstr "filter afzender"
 
-#: paperless_mail/models.py:133
+#: paperless_mail/models.py:131
 msgid "filter subject"
 msgstr "filter onderwerp"
 
-#: paperless_mail/models.py:136
+#: paperless_mail/models.py:134
 msgid "filter body"
 msgstr "filter inhoud"
 
-#: paperless_mail/models.py:140
+#: paperless_mail/models.py:138
 msgid "filter attachment filename"
 msgstr "Filter bestandsnaam van bijlage"
 
-#: paperless_mail/models.py:142
+#: 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."
@@ -550,19 +590,19 @@ msgstr ""
 " kunt jokertekens gebruiken, zoals *.pdf of *factuur*. Dit is niet "
 "hoofdlettergevoelig."
 
-#: paperless_mail/models.py:148
+#: paperless_mail/models.py:146
 msgid "maximum age"
 msgstr "Maximale leeftijd"
 
-#: paperless_mail/models.py:150
+#: paperless_mail/models.py:148
 msgid "Specified in days."
 msgstr "Aangegeven in dagen"
 
-#: paperless_mail/models.py:153
+#: paperless_mail/models.py:151
 msgid "attachment type"
 msgstr "Type bijlage"
 
-#: paperless_mail/models.py:156
+#: paperless_mail/models.py:154
 msgid ""
 "Inline attachments include embedded images, so it's best to combine this "
 "option with a filename filter."
@@ -570,15 +610,15 @@ msgstr ""
 "\"Inline\" bijlagen bevatten vaak ook afbeeldingen. In dit geval valt het "
 "aan te raden om ook een filter voor de bestandsnaam op te geven."
 
-#: paperless_mail/models.py:161
+#: paperless_mail/models.py:159
 msgid "action"
 msgstr "actie"
 
-#: paperless_mail/models.py:167
+#: paperless_mail/models.py:165
 msgid "action parameter"
 msgstr "actie parameters"
 
-#: paperless_mail/models.py:169
+#: paperless_mail/models.py:167
 msgid ""
 "Additional parameter for the action selected above, i.e., the target folder "
 "of the move to folder action."
@@ -586,22 +626,22 @@ msgstr ""
 "Extra parameters voor de hierboven gekozen actie, met andere woorden: de "
 "bestemmingsmap voor de verplaats-actie."
 
-#: paperless_mail/models.py:175
+#: paperless_mail/models.py:173
 msgid "assign title from"
 msgstr "wijs titel toe van"
 
-#: paperless_mail/models.py:185
+#: paperless_mail/models.py:183
 msgid "assign this tag"
 msgstr "wijs dit etiket toe"
 
-#: paperless_mail/models.py:193
+#: paperless_mail/models.py:191
 msgid "assign this document type"
 msgstr "wijs dit documenttype toe"
 
-#: paperless_mail/models.py:197
+#: paperless_mail/models.py:195
 msgid "assign correspondent from"
 msgstr "wijs correspondent toe van"
 
-#: paperless_mail/models.py:207
+#: paperless_mail/models.py:205
 msgid "assign this correspondent"
 msgstr "wijs deze correspondent toe"

From 584307dc54d04f77484a87421259682c4232bffe Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Mon, 11 Jan 2021 09:12:58 +0000
Subject: [PATCH 0811/1300] Apply translations in fr

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'fr' language.
---
 src/locale/fr/LC_MESSAGES/django.po | 114 +++++++++++++++++++---------
 1 file changed, 78 insertions(+), 36 deletions(-)

diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po
index 8d41866ba..7ab8aa45f 100644
--- a/src/locale/fr/LC_MESSAGES/django.po
+++ b/src/locale/fr/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-06 19:50+0000\n"
+"POT-Creation-Date: 2021-01-10 21:41+0000\n"
 "PO-Revision-Date: 2020-12-30 19:27+0000\n"
 "Last-Translator: Philmo67, 2021\n"
 "Language-Team: French (https://www.transifex.com/paperless/teams/115905/fr/)\n"
@@ -51,7 +51,7 @@ msgid "Automatic"
 msgstr "Automatique"
 
 #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
-#: paperless_mail/models.py:111
+#: paperless_mail/models.py:109
 msgid "name"
 msgstr "nom"
 
@@ -348,6 +348,48 @@ msgstr "règle de filtrage"
 msgid "filter rules"
 msgstr "règles de filtrage"
 
+#: documents/templates/index.html:20
+msgid "Paperless-ng is loading..."
+msgstr "Paperless-ng est en cours de chargement..."
+
+#: documents/templates/registration/logged_out.html:13
+msgid "Paperless-ng signed out"
+msgstr "Déconnecté de Paperless-ng"
+
+#: documents/templates/registration/logged_out.html:41
+msgid "You have been successfully logged out. Bye!"
+msgstr "Vous avez été déconnecté avec succès. Au revoir !"
+
+#: documents/templates/registration/logged_out.html:42
+msgid "Sign in again"
+msgstr "Se reconnecter"
+
+#: documents/templates/registration/login.html:13
+msgid "Paperless-ng sign in"
+msgstr "Connexion à Paperless-ng"
+
+#: documents/templates/registration/login.html:42
+msgid "Please sign in."
+msgstr "Veuillez vous connecter."
+
+#: documents/templates/registration/login.html:45
+msgid "Your username and password didn't match. Please try again."
+msgstr ""
+"Votre nom d'utilisateur et votre mot de passe ne correspondent pas. Veuillez"
+" réessayer."
+
+#: documents/templates/registration/login.html:48
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: documents/templates/registration/login.html:49
+msgid "Password"
+msgstr "Mot de passe"
+
+#: documents/templates/registration/login.html:54
+msgid "Sign in"
+msgstr "S'identifier"
+
 #: paperless/settings.py:268
 msgid "English"
 msgstr "Anglais"
@@ -404,9 +446,9 @@ msgid ""
 "process all matching rules that you have defined."
 msgstr ""
 "Affecter automatiquement des métadonnées aux documents traités à partir de "
-"cette règle. Si vous n'affectez pas d'étiquettes, de types ou de "
-"correspondants ici, Paperless-ng traitera quand même toutes les règles de "
-"rapprochement que vous avez définies."
+"cette règle. Si vous n'affectez pas d'étiquette, de type ou de correspondant"
+" ici, Paperless-ng appliquera toutes les autres règles de rapprochement que "
+"vous avez définies."
 
 #: paperless_mail/apps.py:9
 msgid "Paperless mail"
@@ -472,79 +514,79 @@ msgstr "règles de courriel"
 msgid "Only process attachments."
 msgstr "Ne traiter que les pièces jointes."
 
-#: paperless_mail/models.py:70
+#: paperless_mail/models.py:68
 msgid "Process all files, including 'inline' attachments."
 msgstr "Traiter tous les fichiers, y compris les pièces jointes \"en ligne\"."
 
-#: paperless_mail/models.py:80
+#: paperless_mail/models.py:78
 msgid "Mark as read, don't process read mails"
 msgstr "Marquer comme lu, ne pas traiter les courriels lus"
 
-#: paperless_mail/models.py:81
+#: paperless_mail/models.py:79
 msgid "Flag the mail, don't process flagged mails"
 msgstr "Marquer le courriel, ne pas traiter les courriels marqués"
 
-#: paperless_mail/models.py:82
+#: paperless_mail/models.py:80
 msgid "Move to specified folder"
 msgstr "Déplacer vers le dossier spécifié"
 
-#: paperless_mail/models.py:83
+#: paperless_mail/models.py:81
 msgid "Delete"
 msgstr "Supprimer"
 
-#: paperless_mail/models.py:90
+#: paperless_mail/models.py:88
 msgid "Use subject as title"
 msgstr "Utiliser le sujet en tant que titre"
 
-#: paperless_mail/models.py:91
+#: paperless_mail/models.py:89
 msgid "Use attachment filename as title"
 msgstr "Utiliser le nom de la pièce jointe en tant que titre"
 
-#: paperless_mail/models.py:101
+#: paperless_mail/models.py:99
 msgid "Do not assign a correspondent"
 msgstr "Ne pas affecter de correspondant"
 
-#: paperless_mail/models.py:103
+#: paperless_mail/models.py:101
 msgid "Use mail address"
 msgstr "Utiliser l'adresse électronique"
 
-#: paperless_mail/models.py:105
+#: paperless_mail/models.py:103
 msgid "Use name (or mail address if not available)"
 msgstr "Utiliser le nom (ou l'adresse électronique s'il n'est pas disponible)"
 
-#: paperless_mail/models.py:107
+#: paperless_mail/models.py:105
 msgid "Use correspondent selected below"
 msgstr "Utiliser le correspondant sélectionné ci-dessous"
 
-#: paperless_mail/models.py:115
+#: paperless_mail/models.py:113
 msgid "order"
 msgstr "ordre"
 
-#: paperless_mail/models.py:122
+#: paperless_mail/models.py:120
 msgid "account"
 msgstr "compte"
 
-#: paperless_mail/models.py:126
+#: paperless_mail/models.py:124
 msgid "folder"
 msgstr "répertoire"
 
-#: paperless_mail/models.py:130
+#: paperless_mail/models.py:128
 msgid "filter from"
 msgstr "filtrer l'expéditeur"
 
-#: paperless_mail/models.py:133
+#: paperless_mail/models.py:131
 msgid "filter subject"
 msgstr "filtrer le sujet"
 
-#: paperless_mail/models.py:136
+#: paperless_mail/models.py:134
 msgid "filter body"
 msgstr "filtrer le corps du message"
 
-#: paperless_mail/models.py:140
+#: paperless_mail/models.py:138
 msgid "filter attachment filename"
 msgstr "filtrer le nom de fichier de la pièce jointe"
 
-#: paperless_mail/models.py:142
+#: 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."
@@ -553,19 +595,19 @@ msgstr ""
 " s'il est spécifié. Les jokers tels que *.pdf ou *facture* sont autorisés. "
 "La casse n'est pas prise en compte."
 
-#: paperless_mail/models.py:148
+#: paperless_mail/models.py:146
 msgid "maximum age"
 msgstr "âge maximum"
 
-#: paperless_mail/models.py:150
+#: paperless_mail/models.py:148
 msgid "Specified in days."
 msgstr "En jours."
 
-#: paperless_mail/models.py:153
+#: paperless_mail/models.py:151
 msgid "attachment type"
 msgstr "type de pièce jointe"
 
-#: paperless_mail/models.py:156
+#: paperless_mail/models.py:154
 msgid ""
 "Inline attachments include embedded images, so it's best to combine this "
 "option with a filename filter."
@@ -573,15 +615,15 @@ msgstr ""
 "Les pièces jointes en ligne comprennent les images intégrées, il est donc "
 "préférable de combiner cette option avec un filtre de nom de fichier."
 
-#: paperless_mail/models.py:161
+#: paperless_mail/models.py:159
 msgid "action"
 msgstr "action"
 
-#: paperless_mail/models.py:167
+#: paperless_mail/models.py:165
 msgid "action parameter"
 msgstr "paramètre d'action"
 
-#: paperless_mail/models.py:169
+#: paperless_mail/models.py:167
 msgid ""
 "Additional parameter for the action selected above, i.e., the target folder "
 "of the move to folder action."
@@ -589,22 +631,22 @@ msgstr ""
 "Paramètre supplémentaire pour l'action sélectionnée ci-dessus, par exemple "
 "le dossier cible de l'action de déplacement vers un dossier."
 
-#: paperless_mail/models.py:175
+#: paperless_mail/models.py:173
 msgid "assign title from"
 msgstr "affecter le titre depuis"
 
-#: paperless_mail/models.py:185
+#: paperless_mail/models.py:183
 msgid "assign this tag"
 msgstr "affecter cette étiquette"
 
-#: paperless_mail/models.py:193
+#: paperless_mail/models.py:191
 msgid "assign this document type"
 msgstr "affecter ce type de document"
 
-#: paperless_mail/models.py:197
+#: paperless_mail/models.py:195
 msgid "assign correspondent from"
 msgstr "affecter le correspondant depuis"
 
-#: paperless_mail/models.py:207
+#: paperless_mail/models.py:205
 msgid "assign this correspondent"
 msgstr "affecter ce correspondant"

From 8f946074095817022df0d12e1673faed12c241a5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 11 Jan 2021 13:19:29 +0100
Subject: [PATCH 0812/1300] a couple fixes to the ci script

---
 .github/workflows/ci.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2ac2fc38f..004a66fca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip3.6.8}
+          key: ${{ runner.os }}-pip3.8}
       - name: Install dependencies
         run: |
           sudo apt-get update -qq
@@ -75,9 +75,10 @@ jobs:
     - uses: actions/setup-node@v2
       with:
         node-version: '15'
-    - name: build
+    - name: Build frontend
       run: ./compile-frontend.sh
-    - uses: actions/upload-artifact@v2
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
       with:
         name: frontend-compiled
         path: src/documents/static/frontend/
@@ -100,11 +101,13 @@ jobs:
           sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev gettext liblept5
           pip3 install -r requirements.txt
       -
+        name: Download frontend artifact
         uses: actions/download-artifact@v2
         with:
           name: frontend-compiled
           path: src/documents/static/frontend/
       -
+        name: Download documentation artifact
         uses: actions/download-artifact@v2
         with:
           name: documentation
@@ -138,6 +141,7 @@ jobs:
           find . -name __pycache__ | xargs rm -r
           tar -cJf paperless-ng.tar.xz paperless-ng/
       -
+        name: Upload release artifact
         uses: actions/upload-artifact@v2
         with:
           name: release
@@ -149,18 +153,18 @@ jobs:
     if: contains(github.ref, 'refs/tags/ng-')
     steps:
       -
-        name: Download Release Artifact
+        name: Download release artifact
         uses: actions/download-artifact@v2
         with:
           name: release
           path: ./
       -
+        name: Get branch name
         id: get_branch_name
         run: |
-          branch_name=$(echo ${{ github.ref }} | cut -d- -f2)
-          echo "::set-output name=branch_name::$branch_name"
+          echo ::set-output name=branch_name::${GITHUB_REF#refs/tags/ng-}
       -
-        name: Create Release
+        name: Create release
         id: create_release
         uses: actions/create-release@v1
         env:
@@ -173,7 +177,7 @@ jobs:
           body: |
             TODO: Insert changelog here (it's also in the documentation)
       -
-        name: Upload Release Archive
+        name: Upload release archive
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
@@ -206,6 +210,7 @@ jobs:
         name: Checkout
         uses: actions/checkout@v2
       -
+        name: Download frontend artifact
         uses: actions/download-artifact@v2
         with:
           name: frontend-compiled

From de38f46a533722ab97b61d06b3a0bfd72acf706b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 11 Jan 2021 15:38:45 +0100
Subject: [PATCH 0813/1300] fixes #307

---
 .../filterable-dropdown.component.html                |  2 +-
 .../filterable-dropdown.component.ts                  |  7 ++++++-
 .../filter-editor/filter-editor.component.html        |  3 +++
 .../filter-editor/filter-editor.component.ts          | 11 +++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index a0e833c98..b09491683 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -20,7 +20,7 @@
         </div>
       </div>
       <div *ngIf="selectionModel.items" class="items">
-        <ng-container *ngFor="let item of (editing ? selectionModel.itemsSorted : selectionModel.items) | filter: filterText">
+        <ng-container *ngFor="let item of selectionModel.itemsSorted | filter: filterText">
           <app-toggleable-dropdown-button *ngIf="allowSelectNone || item.id" [item]="item" [state]="selectionModel.get(item.id)" (toggle)="selectionModel.toggle(item.id)"></app-toggleable-dropdown-button>
         </ng-container>
       </div>
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
index b51923c27..3481b1227 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -19,8 +19,13 @@ export class FilterableDropdownSelectionModel {
   items: MatchingModel[] = []
 
   get itemsSorted(): MatchingModel[] {
+    // TODO: this is getting called very often
     return this.items.sort((a,b) => {
-      if (this.getNonTemporary(a.id) == ToggleableItemState.NotSelected && this.getNonTemporary(b.id) != ToggleableItemState.NotSelected) {
+      if (a.id == null && b.id != null) {
+        return -1
+      } else if (a.id != null && b.id == null) {
+        return 1
+      } else if (this.getNonTemporary(a.id) == ToggleableItemState.NotSelected && this.getNonTemporary(b.id) != ToggleableItemState.NotSelected) {
         return 1
       } else if (this.getNonTemporary(a.id) != ToggleableItemState.NotSelected && this.getNonTemporary(b.id) == ToggleableItemState.NotSelected) {
         return -1
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index 02a51238d..415f9d459 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -14,17 +14,20 @@
           [(selectionModel)]="tagSelectionModel"
           (selectionModelChange)="updateRules()"
           [multiple]="true"
+          (open)="onTagsDropdownOpen()"
           [allowSelectNone]="true"></app-filterable-dropdown>
         <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" i18n-title
           filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
           [items]="correspondents"
           [(selectionModel)]="correspondentSelectionModel"
           (selectionModelChange)="updateRules()"
+          (open)="onCorrespondentDropdownOpen()"
           [allowSelectNone]="true"></app-filterable-dropdown>
         <app-filterable-dropdown class="mr-2 mr-md-3" title="Document type" icon="file-earmark-fill" i18n-title
           filterPlaceholder="Filter document types" i18n-filterPlaceholder
           [items]="documentTypes"
           [(selectionModel)]="documentTypeSelectionModel"
+          (open)="onDocumentTypeDropdownOpen()"
           (selectionModelChange)="updateRules()"
           [allowSelectNone]="true"></app-filterable-dropdown>
         <app-date-dropdown class="mr-2 mr-md-3"
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index febb9dd84..a9111bc9f 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -210,4 +210,15 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     this.documentTypeSelectionModel.toggle(documentTypeId)
   }
 
+  onTagsDropdownOpen() {
+    this.tagSelectionModel.apply()
+  }
+
+  onCorrespondentDropdownOpen() {
+    this.correspondentSelectionModel.apply()
+  }
+
+  onDocumentTypeDropdownOpen() {
+    this.documentTypeSelectionModel.apply()
+  }
 }

From 5217acc471a4c24db3c4d233f8b5e083883f0619 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Mon, 11 Jan 2021 14:59:29 +0000
Subject: [PATCH 0814/1300] Apply translations in de

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'de' language.
---
 src/locale/de/LC_MESSAGES/django.po | 110 +++++++++++++++++++---------
 1 file changed, 76 insertions(+), 34 deletions(-)

diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po
index f16582ec3..c9257e0f1 100644
--- a/src/locale/de/LC_MESSAGES/django.po
+++ b/src/locale/de/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-06 19:50+0000\n"
+"POT-Creation-Date: 2021-01-10 21:41+0000\n"
 "PO-Revision-Date: 2020-12-30 19:27+0000\n"
 "Last-Translator: Jonas Winkler, 2021\n"
 "Language-Team: German (https://www.transifex.com/paperless/teams/115905/de/)\n"
@@ -50,7 +50,7 @@ msgid "Automatic"
 msgstr "Automatisch"
 
 #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
-#: paperless_mail/models.py:111
+#: paperless_mail/models.py:109
 msgid "name"
 msgstr "Name"
 
@@ -346,6 +346,48 @@ msgstr "Filterregel"
 msgid "filter rules"
 msgstr "Filterregeln"
 
+#: documents/templates/index.html:20
+msgid "Paperless-ng is loading..."
+msgstr "Paperless-ng wird geladen..."
+
+#: documents/templates/registration/logged_out.html:13
+msgid "Paperless-ng signed out"
+msgstr "Paperless-ng abgemeldet"
+
+#: documents/templates/registration/logged_out.html:41
+msgid "You have been successfully logged out. Bye!"
+msgstr "Sie wurden erfolgreich abgemeldet. Auf Wiedersehen!"
+
+#: documents/templates/registration/logged_out.html:42
+msgid "Sign in again"
+msgstr "Erneut anmelden"
+
+#: documents/templates/registration/login.html:13
+msgid "Paperless-ng sign in"
+msgstr "Paperless-ng Anmeldung"
+
+#: documents/templates/registration/login.html:42
+msgid "Please sign in."
+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."
+
+#: documents/templates/registration/login.html:48
+msgid "Username"
+msgstr "Benutzername"
+
+#: documents/templates/registration/login.html:49
+msgid "Password"
+msgstr "Passwort"
+
+#: documents/templates/registration/login.html:54
+msgid "Sign in"
+msgstr "Anmelden"
+
 #: paperless/settings.py:268
 msgid "English"
 msgstr "Englisch"
@@ -456,7 +498,7 @@ msgstr "Benutzername"
 
 #: paperless_mail/models.py:50
 msgid "password"
-msgstr "Password"
+msgstr "Passwort"
 
 #: paperless_mail/models.py:60
 msgid "mail rule"
@@ -470,79 +512,79 @@ msgstr "E-Mail-Regeln"
 msgid "Only process attachments."
 msgstr "Nur Anhänge verarbeiten."
 
-#: paperless_mail/models.py:70
+#: paperless_mail/models.py:68
 msgid "Process all files, including 'inline' attachments."
 msgstr "Alle Dateien verarbeiten, auch 'inline'-Anhänge."
 
-#: paperless_mail/models.py:80
+#: paperless_mail/models.py:78
 msgid "Mark as read, don't process read mails"
 msgstr "Als gelesen markieren, gelesene E-Mails nicht verarbeiten"
 
-#: paperless_mail/models.py:81
+#: paperless_mail/models.py:79
 msgid "Flag the mail, don't process flagged mails"
 msgstr "Als wichtig markieren, markierte E-Mails nicht verarbeiten"
 
-#: paperless_mail/models.py:82
+#: paperless_mail/models.py:80
 msgid "Move to specified folder"
 msgstr "In angegebenen Ordner verschieben"
 
-#: paperless_mail/models.py:83
+#: paperless_mail/models.py:81
 msgid "Delete"
 msgstr "Löschen"
 
-#: paperless_mail/models.py:90
+#: paperless_mail/models.py:88
 msgid "Use subject as title"
 msgstr "Betreff als Titel verwenden"
 
-#: paperless_mail/models.py:91
+#: paperless_mail/models.py:89
 msgid "Use attachment filename as title"
 msgstr "Dateiname des Anhangs als Titel verwenden"
 
-#: paperless_mail/models.py:101
+#: paperless_mail/models.py:99
 msgid "Do not assign a correspondent"
 msgstr "Keinen Korrespondenten zuweisen"
 
-#: paperless_mail/models.py:103
+#: paperless_mail/models.py:101
 msgid "Use mail address"
 msgstr "E-Mail-Adresse benutzen"
 
-#: paperless_mail/models.py:105
+#: paperless_mail/models.py:103
 msgid "Use name (or mail address if not available)"
 msgstr "Absendername benutzen (oder E-Mail-Adressen, wenn nicht verfügbar)"
 
-#: paperless_mail/models.py:107
+#: paperless_mail/models.py:105
 msgid "Use correspondent selected below"
 msgstr "Nachfolgend ausgewählten Korrespondent verwenden"
 
-#: paperless_mail/models.py:115
+#: paperless_mail/models.py:113
 msgid "order"
 msgstr "Reihenfolge"
 
-#: paperless_mail/models.py:122
+#: paperless_mail/models.py:120
 msgid "account"
 msgstr "Konto"
 
-#: paperless_mail/models.py:126
+#: paperless_mail/models.py:124
 msgid "folder"
 msgstr "Ordner"
 
-#: paperless_mail/models.py:130
+#: paperless_mail/models.py:128
 msgid "filter from"
 msgstr "Absender filtern"
 
-#: paperless_mail/models.py:133
+#: paperless_mail/models.py:131
 msgid "filter subject"
 msgstr "Betreff filtern"
 
-#: paperless_mail/models.py:136
+#: paperless_mail/models.py:134
 msgid "filter body"
 msgstr "Nachrichteninhalt filtern"
 
-#: paperless_mail/models.py:140
+#: paperless_mail/models.py:138
 msgid "filter attachment filename"
 msgstr "Anhang-Dateiname filtern"
 
-#: paperless_mail/models.py:142
+#: 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."
@@ -551,19 +593,19 @@ msgstr ""
 "entsprechen. Platzhalter wie *.pdf oder *rechnung* sind erlaubt. Groß- und "
 "Kleinschreibung ist irrelevant."
 
-#: paperless_mail/models.py:148
+#: paperless_mail/models.py:146
 msgid "maximum age"
 msgstr "Maximales Alter"
 
-#: paperless_mail/models.py:150
+#: paperless_mail/models.py:148
 msgid "Specified in days."
 msgstr "Angegeben in Tagen."
 
-#: paperless_mail/models.py:153
+#: paperless_mail/models.py:151
 msgid "attachment type"
 msgstr "Dateianhangstyp"
 
-#: paperless_mail/models.py:156
+#: paperless_mail/models.py:154
 msgid ""
 "Inline attachments include embedded images, so it's best to combine this "
 "option with a filename filter."
@@ -571,15 +613,15 @@ msgstr ""
 "'Inline'-Anhänge schließen eingebettete Bilder mit ein, daher sollte diese "
 "Einstellung mit einem Dateinamenfilter kombiniert werden."
 
-#: paperless_mail/models.py:161
+#: paperless_mail/models.py:159
 msgid "action"
 msgstr "Aktion"
 
-#: paperless_mail/models.py:167
+#: paperless_mail/models.py:165
 msgid "action parameter"
 msgstr "Parameter für Aktion"
 
-#: paperless_mail/models.py:169
+#: paperless_mail/models.py:167
 msgid ""
 "Additional parameter for the action selected above, i.e., the target folder "
 "of the move to folder action."
@@ -587,22 +629,22 @@ 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:175
+#: paperless_mail/models.py:173
 msgid "assign title from"
 msgstr "Titel zuweisen von"
 
-#: paperless_mail/models.py:185
+#: paperless_mail/models.py:183
 msgid "assign this tag"
 msgstr "Dieses Tag zuweisen"
 
-#: paperless_mail/models.py:193
+#: paperless_mail/models.py:191
 msgid "assign this document type"
 msgstr "Diesen Dokumenttyp zuweisen"
 
-#: paperless_mail/models.py:197
+#: paperless_mail/models.py:195
 msgid "assign correspondent from"
 msgstr "Korrespondent zuweisen von"
 
-#: paperless_mail/models.py:207
+#: paperless_mail/models.py:205
 msgid "assign this correspondent"
 msgstr "Diesen Korrespondent zuweisen"

From d8eabd66ea4f24d5a55c9d9529056009c2d7cb40 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 11 Jan 2021 16:05:29 +0100
Subject: [PATCH 0815/1300] lost some changes in a merge

---
 src-ui/src/app/components/dashboard/dashboard.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 50bd44a4e..47751fe8b 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -1,5 +1,5 @@
 <app-page-header title="Dashboard" [subTitle]="subtitle" i18n-title>
-  <svg class="logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.64" height="100%" width="auto">
+  <svg class="logo d-none d-md-block" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.64" height="5rem" width="auto">
     <path class="leaf" d="M730.71,0C616.3,266.24,66.21,299.25,242.24,728.31c2.2,5.5-40.71,63.81-69.31,112.22-6.6-24.21-14.3-50.61-13.2-52.81C302.75,618.29,57.41,522.58,44.21,384-17.4,494-39.4,686.5,146.53,797.62c1.1,0,9.9,41.81,14.3,62.71-4.4,8.8-8.8,17.6-11,24.2-4.4,11,28.6,9.91,28.6,12.11,3.3-1.1,81.41-138.63,83.61-139.73C704.31,655.7,782.42,257.44,730.71,0ZM105.82,544.58C145.43,580.89,211.44,692,155.33,756.91,168.53,727.21,172.93,660.1,105.82,544.58ZM269.74,670C200.43,506.08,404,325.65,505.18,280.54,298.35,465.37,263.14,602.89,269.74,670Z" transform="translate(0)" style="fill:#17541f"/>
     <path class="text" style="fill:#000" d="M1169.27,231.44q.7,17.06.71,38.73t-.71,38a112,112,0,0,1-6.76,38A100.16,100.16,0,0,1,1142.25,380a93.87,93.87,0,0,1-33.76,23.46q-20.25,8.54-46.56,8.53h-36.25V597.5q0,9.94,2.85,14.57c1.89,3.08,3.79,4.86,5.68,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.56-.71,7.1-5.33t3.56-14.57V166q0-10.66-3.56-15.28t-7.1-6q-2.85-1.42-8.53,0V127.66h104.48q26.31,0,46.56,8.53a93.75,93.75,0,0,1,33.76,23.46,101,101,0,0,1,20.26,33.4A111.05,111.05,0,0,1,1169.27,231.44ZM1118.8,215.8q0-18.48-6-32t-14.22-21.32a74.68,74.68,0,0,0-17.06-12.44q-8.88-4.62-15.28-4.62h-40.52V392.79h40.52q6.39,0,15.28-3.56t17.06-12.44a86,86,0,0,0,14.22-21.67q6-12.8,6-32Zm337.63,389.52a27.35,27.35,0,0,1-2.85,11.72,40.58,40.58,0,0,1-8.17,11.38,54.8,54.8,0,0,1-13.5,9.59,40.07,40.07,0,0,1-18.84,4.27,60,60,0,0,1-30.57-7.82q-13.5-7.82-18.48-20.61a56.12,56.12,0,0,1-6.39-16.35q-9.24,19.18-28.08,32a72.42,72.42,0,0,1-41.58,12.8q-28.44,0-49.76-20.61-12.07-10.67-19.9-27.73t-9.24-39.09q-.71-2.13-.71-8.53v-.71a124.43,124.43,0,0,1,4.26-25.23,113.22,113.22,0,0,1,11-26.3,149.46,149.46,0,0,1,17.77-24.88,128.6,128.6,0,0,1,22.39-20.26,17.39,17.39,0,0,0,4.62-3.2,28.53,28.53,0,0,1,5.33-3.91l2.13-1.06,2.14-1.07q12.8-7.81,22.39-14.22t17.41-12.08a97.25,97.25,0,0,0,8.53-6.4c2.84-2.37,5.93-4.73,9.24-7.1a79.43,79.43,0,0,0,12.09-10,36.51,36.51,0,0,0,8.53-13.5q4.26-7.11,4.26-17.06a67.74,67.74,0,0,0-2.13-17.77,49.09,49.09,0,0,0-14.57-27q-11.73-11.37-26-14.93a38.26,38.26,0,0,0-12.08-2.13q-19.9,0-34.12,7.11-9.24,4.26-13.51,9.59t-4.62,10a10.73,10.73,0,0,0,1.78,7.46,12.91,12.91,0,0,0,5.69,4.26,6,6,0,0,0,1.78.71,6.28,6.28,0,0,1,1.77.72,32.21,32.21,0,0,1,15.28,12.43,34,34,0,0,1,6,19.55,32.78,32.78,0,0,1-32.7,32.7,33.53,33.53,0,0,1-24.17-9.6,30.94,30.94,0,0,1-10-23.1,106.83,106.83,0,0,1,3.2-25.23,84.65,84.65,0,0,1,9.6-23.81q13.5-19.91,32.34-28.79a96.24,96.24,0,0,1,41.58-8.89,93.82,93.82,0,0,1,33.76,6.4,96.18,96.18,0,0,1,29.86,18.13,103.38,103.38,0,0,1,22,28.07q8.88,16.35,8.88,37.68v209q0,12.79.36,16.7t.36,5.34h0q0,9.24,5.68,14.92a18.45,18.45,0,0,0,13.51,5.69q9.24,0,14.92-5.33a20.62,20.62,0,0,0,6.4-13.86Zm-111.6-17.77a52.58,52.58,0,0,0,6.76-21.33q1.07-11.37,1.06-21.32V413.4a63.92,63.92,0,0,1-6,5.33,74,74,0,0,0-6.75,6q-20.62,14.93-35.19,27.37a164.06,164.06,0,0,0-24.52,25.59,113,113,0,0,0-15.64,28.07,121,121,0,0,0-7.11,34.12v10.67q.72,27,14.58,42.29t39.44,15.28a38.56,38.56,0,0,0,20.62-5.69q9.24-6.39,12.79-14.92Zm244.52-304.23q40.51.72,64.68,24.53t24.17,75.7V542.77q0,51.88-24.17,75.34T1589.35,643h-2.13a80.27,80.27,0,0,1-22-2.84h-.71a.63.63,0,0,1-.71-.71,91.74,91.74,0,0,1-28.43-15.64l-6.76-6.76-5.33-7.46v118q0,10,2.85,14.58c1.89,3.08,3.79,5.09,5.68,6a10.54,10.54,0,0,0,9.24,0V766h-86V748.19q5.68,2.13,8.53,0,3.56-1.43,6.75-6t3.2-14.58V326.68q0-9.94-3.2-14.57t-6.75-6q-2.85-1.43-8.53,0V289h68.23v27.72a68.68,68.68,0,0,1,12.09-14.21,75.62,75.62,0,0,1,28.43-15.64.63.63,0,0,1,.71-.71h.71a90.55,90.55,0,0,1,22-2.85Zm35.54,84.59v-.71q-.72-36.26-8.89-51.18t-26.65-16.35a63.12,63.12,0,0,0-24.17,3.2,48,48,0,0,0-19.9,13.15q-8.54,9.24-14.22,24.88t-7.82,37V548.45q2.13,22,7.82,37.32t14.22,24.17a53.23,53.23,0,0,0,19.9,13.15,58.92,58.92,0,0,0,24.17,3.55q18.48-1.42,26.65-16.35t8.89-51.18V367.91Zm179.83-84.59a105.36,105.36,0,0,1,33.41,5.69,86.38,86.38,0,0,1,30.56,17.77,88.06,88.06,0,0,1,21.68,30.57q8.18,18.48,8.18,44.06v90.28H1757.1V544.9q0,44.07,15.28,62.9t38,18.13a113.94,113.94,0,0,0,26.65-4.62,54.83,54.83,0,0,0,22.75-13.15q9.59-9.24,16-26.3t6.4-44.78h16.35V547a153.56,153.56,0,0,1-4.27,36.61A72,72,0,0,1,1852,634.1q-16.71,7.47-40.87,8.18a102.25,102.25,0,0,1-34.83-6.4,96,96,0,0,1-32-19.19,108.91,108.91,0,0,1-23.45-30.21q-9.24-17.41-9.25-39.45v-16.7s-.11-9.12-.35-27.37-.36-29.5-.36-33.76-.11-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56A90.72,90.72,0,0,1,1771,289.37a98.55,98.55,0,0,1,33.76-6.05Zm46.2,169.89V397.05q0-27-3.55-45.13t-9.6-29.15q-6-11-14.57-15.28a42.36,42.36,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.72,73.92v56.16Zm279.35-113.73a42.31,42.31,0,0,0,.71,5.68,17.92,17.92,0,0,1,0,7.11q-.72,14.93-10.31,24.52a33,33,0,0,1-46.91-.35,33.52,33.52,0,0,1-9.6-24.17q0-17.76,13.51-27a8.33,8.33,0,0,0,1.77-1.06l1.07-1.07a16.22,16.22,0,0,0,6.4-10.31q1.41-6.75-8.53-11.73a26.26,26.26,0,0,0-12.8-3.55q-21.32-1.43-37.67,12.8t-22,49.75V597.5q0,9.94,2.84,14.57t5.69,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.55-.71,7.11-5.33t3.55-14.57V326.68q0-9.94-3.55-14.57t-7.11-6q-2.85-1.43-8.53,0V288.3h68.24v29.14q5-7.81,9.95-14.57a48.44,48.44,0,0,1,11.72-11.37,59.79,59.79,0,0,1,15.64-7.46q8.89-2.85,22.39-2.85,20.61,0,38.39,14.93t26.3,43.36Zm95.95,258q0,9.94,3.2,14.57c2.13,3.08,4.15,4.86,6,5.33q3.55,2.13,9.24,0v18.48h-86V617.4q5.68,2.13,10,0,2.13-.71,5.69-5.33t3.55-14.57V166.75q0-10.65-3.55-15.28a28.82,28.82,0,0,0-5.69-6q-4.26-2.13-10,0V128.37h67.52V597.5Zm154.25-314.18a105.25,105.25,0,0,1,33.4,5.69,86.33,86.33,0,0,1,30.57,17.77,88.19,88.19,0,0,1,21.68,30.57q8.18,18.48,8.17,44.06v90.28H2332.84V544.9q0,44.07,15.29,62.9t38,18.13a113.93,113.93,0,0,0,26.66-4.62,54.79,54.79,0,0,0,22.74-13.15q9.6-9.24,16-26.3t6.39-44.78h16.35V547a153.56,153.56,0,0,1-4.26,36.61,72,72,0,0,1-42.29,50.46q-16.71,7.47-40.88,8.18a102.24,102.24,0,0,1-34.82-6.4,96,96,0,0,1-32-19.19,108.94,108.94,0,0,1-23.46-30.21q-9.24-17.41-9.24-39.45v-16.7s-.12-9.12-.35-27.37-.36-29.5-.36-33.76-.12-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56a90.78,90.78,0,0,1,29.85-17.77,98.6,98.6,0,0,1,33.77-6.05Zm46.2,169.89V397.05q0-27-3.56-45.13t-9.59-29.15q-6-11-14.57-15.28a42.39,42.39,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.73,73.92v56.16Zm213.24,178.41c-.48.47-.83.71-1.07.71s-.59.23-1.06.71l-.71.71c-1,.47-2,1-3.2,1.42s-2.25,1-3.2,1.42q-14.93,6.4-34.83,6.4a48.79,48.79,0,0,1-22-5.33q-10.65-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.5V550.59h17.06q-1.43,22.74,5,39.09,4.27,14.22,16.71,26.65t37.31,12.44q16.35,0,27-5.68,18.48-9.24,25.24-22A45.92,45.92,0,0,0,2657,574.4q-1.42-13.86-10.31-27.37A126,126,0,0,0,2625,522.15q-8.52-6.39-17.77-13.5t-18.48-14.93q-24.87-19.91-39.45-35.89T2526.89,428a98.76,98.76,0,0,1-10.66-26.3,119.09,119.09,0,0,1-2.84-26.65,106,106,0,0,1,1.06-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,63,63,0,0,1,14.21-20.26A73.7,73.7,0,0,1,2561,288.3q13.5-5.69,32.7-5.69a53.27,53.27,0,0,1,21.32,4.62q10.66,4.62,19.19,8.53t13.51,3.56q5-.36,5-11h13.51v88.14h-18.48q.7-21.33-5-38.38a67,67,0,0,0-17.41-27Q2612.89,299,2588.73,299q-19.18,0-31.27,8.53-6.4,5-11,14.57a55.84,55.84,0,0,0-5.33,21,66.08,66.08,0,0,0,3.55,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.5,26.5,0,0,0,5.33,3.56,23,23,0,0,1,3.56,2.84l2.84,2.84q7.82,6.41,16,12.8t16.71,12.79a449.06,449.06,0,0,1,33.05,30.92,276.13,276.13,0,0,1,22,25.94,104.57,104.57,0,0,1,13.15,22.75,69,69,0,0,1,5,20.61q7.11,32.7-2.49,55.09t-24.52,35.19h-.71a1.26,1.26,0,0,1-1.43,1.42,11,11,0,0,1-2.84,2.13l-4.26,2.84-4.27,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.12,3.12,0,0,1-1.42.36Zm211.11,0c-.48.47-.83.71-1.07.71s-.59.23-1.07.71l-.71.71c-.94.47-2,1-3.2,1.42s-2.25,1-3.19,1.42Q2826.84,643,2807,643a48.76,48.76,0,0,1-22-5.33q-10.66-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.51V550.59h17.06q-1.41,22.74,5,39.09,4.26,14.22,16.7,26.65t37.32,12.44q16.35,0,27-5.68,18.48-9.24,25.23-22a45.93,45.93,0,0,0,5.34-26.65q-1.42-13.86-10.31-27.37a126,126,0,0,0-21.68-24.88q-8.53-6.39-17.77-13.5t-18.48-14.93q-24.89-19.91-39.45-35.89T2738,428a98.76,98.76,0,0,1-10.66-26.3,119.08,119.08,0,0,1-2.85-26.65,105.9,105.9,0,0,1,1.07-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,62.83,62.83,0,0,1,14.21-20.26,73.58,73.58,0,0,1,22.75-14.57q13.5-5.69,32.69-5.69a53.28,53.28,0,0,1,21.33,4.62q10.67,4.62,19.19,8.53t13.5,3.56q5-.36,5-11h13.51v88.14h-18.49q.72-21.33-5-38.38a67,67,0,0,0-17.42-27Q2824,299,2799.84,299q-19.2,0-31.28,8.53-6.39,5-11,14.57a56,56,0,0,0-5.34,21,66.3,66.3,0,0,0,3.56,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.22,26.22,0,0,0,5.33,3.56,22.83,22.83,0,0,1,3.55,2.84l2.85,2.84q7.82,6.41,16,12.8t16.7,12.79a445,445,0,0,1,33.05,30.92,274.85,274.85,0,0,1,22,25.94,105,105,0,0,1,13.15,22.75,68.69,68.69,0,0,1,5,20.61q7.11,32.7-2.48,55.09t-24.53,35.19h-.71a1.26,1.26,0,0,1-1.42,1.42,11.2,11.2,0,0,1-2.84,2.13l-4.27,2.84-4.26,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.15,3.15,0,0,1-1.42.36Z" transform="translate(0)"/>
   </svg>

From 7fef27e6de1acfd28f5f08f0bfc53ad1985cbd36 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 11 Jan 2021 16:16:39 +0100
Subject: [PATCH 0816/1300] fixes #305

---
 src/paperless_mail/mail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
index e848af28a..e1916c1dd 100644
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@ -199,7 +199,7 @@ class MailAccountHandler(LoggingMixin):
 
         try:
             messages = M.fetch(criteria=AND(**criterias),
-                               mark_seen=False)
+                               mark_seen=False, charset='UTF-8')
         except Exception:
             raise MailError(
                 f"Rule {rule}: Error while fetching folder {rule.folder}")

From 4503be110aaa08e1d7972e1cf0ed70f93152359d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 11 Jan 2021 17:13:56 +0100
Subject: [PATCH 0817/1300] try building this with updated dependencies

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 789a15641..b5d2e5b13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,8 @@ WORKDIR /usr/src/paperless/
 COPY requirements.txt ./
 
 # 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 \

From b73ff095e66ee78e0e96f8ecdd51bde64d9b6bb1 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 11 Jan 2021 11:45:23 -0800
Subject: [PATCH 0818/1300] Distribute filter editor buttons equally to full
 width on mobile

---
 .../filter-editor/filter-editor.component.html         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index 415f9d459..a8c8740ca 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -7,8 +7,8 @@
   </div>
   <div class="w-100 d-xl-none"></div>
     <div class="col col-xl-auto mb-2 mb-xl-0">
-      <div class="d-flex">
-        <app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill" i18n-title
+      <div class="d-flex  justify-content-between">
+        <app-filterable-dropdown class="mr-md-3" title="Tags" icon="tag-fill" i18n-title
           filterPlaceholder="Filter tags" i18n-filterPlaceholder
           [items]="tags"
           [(selectionModel)]="tagSelectionModel"
@@ -16,21 +16,21 @@
           [multiple]="true"
           (open)="onTagsDropdownOpen()"
           [allowSelectNone]="true"></app-filterable-dropdown>
-        <app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill" i18n-title
+        <app-filterable-dropdown class="mr-md-3" title="Correspondent" icon="person-fill" i18n-title
           filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
           [items]="correspondents"
           [(selectionModel)]="correspondentSelectionModel"
           (selectionModelChange)="updateRules()"
           (open)="onCorrespondentDropdownOpen()"
           [allowSelectNone]="true"></app-filterable-dropdown>
-        <app-filterable-dropdown class="mr-2 mr-md-3" title="Document type" icon="file-earmark-fill" i18n-title
+        <app-filterable-dropdown class="mr-md-3" title="Document type" icon="file-earmark-fill" i18n-title
           filterPlaceholder="Filter document types" i18n-filterPlaceholder
           [items]="documentTypes"
           [(selectionModel)]="documentTypeSelectionModel"
           (open)="onDocumentTypeDropdownOpen()"
           (selectionModelChange)="updateRules()"
           [allowSelectNone]="true"></app-filterable-dropdown>
-        <app-date-dropdown class="mr-2 mr-md-3"
+        <app-date-dropdown class="mr-md-3"
           title="Created" i18n-title
           (datesSet)="updateRules()"
           [(dateBefore)]="dateCreatedBefore"

From ae5dd62105277db8e67f611fd371a483860deedb Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 11 Jan 2021 11:46:07 -0800
Subject: [PATCH 0819/1300] Hide button text in favor of icons on mobile like
 filter editor does

---
 .../app/components/document-list/document-list.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 8ba77a815..186c6a229 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -1,10 +1,10 @@
 <app-page-header [title]="getTitle()">
 
-  <div ngbDropdown class="d-inline-block mr-2">
+  <div ngbDropdown class="mr-2">
     <button class="btn btn-sm btn-outline-primary" id="dropdownSelect" ngbDropdownToggle>
       <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#text-indent-left" />
-      </svg>&nbsp;<ng-container i18n>Select</ng-container>
+      </svg>&nbsp;<span class="d-none d-md-inline" i18n>Select</span>
 
     </button>
     <div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow">

From 0f4a7f0a04b5213d82d9351cb2c1a61704b1b1ad Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 11 Jan 2021 11:46:40 -0800
Subject: [PATCH 0820/1300] Combine sort & sort order fields to better
 accomodate mobile, button bar full width

---
 .../page-header/page-header.component.html    |  4 +-
 .../document-list.component.html              | 41 +++++++++++--------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src-ui/src/app/components/common/page-header/page-header.component.html b/src-ui/src/app/components/common/page-header/page-header.component.html
index fccce9b98..1174ee044 100644
--- a/src-ui/src/app/components/common/page-header/page-header.component.html
+++ b/src-ui/src/app/components/common/page-header/page-header.component.html
@@ -1,9 +1,9 @@
-<div class="row pt-3 pb-1 mb-3 border-bottom align-items-center" >
+<div class="row pt-3 pb-3 pb-md-1 mb-3 border-bottom align-items-center">
   <div class="col-md text-truncate">
     <p class="h2 text-truncate" style="line-height: 1.4">{{title}}</p>
     <p *ngIf="subTitle" class="h5 text-truncate" style="line-height: 1.4">{{subTitle}}</p>
   </div>
-  <div class="btn-toolbar col-auto">
+  <div class="btn-toolbar col col-md-auto">
     <ng-content></ng-content>
   </div>
 </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 186c6a229..5f64d1e55 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -36,31 +36,36 @@
     </label>
   </div>
 
-  <div class="btn-group btn-group-toggle ml-2" ngbRadioGroup [(ngModel)]="list.sortReverse">
-    <div ngbDropdown class="btn-group">
+  <div class="btn-group ml-2 flex-fill">
+    <div ngbDropdown class="btn-group flex-fill">
       <button class="btn btn-outline-primary btn-sm" id="dropdownBasic1" ngbDropdownToggle i18n>Sort by</button>
       <div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="shadow">
-        <button *ngFor="let f of getSortFields()" ngbDropdownItem (click)="list.sortField = f.field"
-          [class.active]="list.sortField == f.field">{{f.name}}</button>
+        <div class="w-100 d-flex btn-group-toggle pb-2 mb-1 border-bottom" ngbRadioGroup [(ngModel)]="list.sortReverse">
+          <label ngbButtonLabel class="btn-outline-primary btn-sm mx-2 flex-fill">
+            <input ngbButton type="radio" class="btn btn-sm" [value]="false">
+            <svg class="toolbaricon" fill="currentColor">
+              <use xlink:href="assets/bootstrap-icons.svg#sort-alpha-down" />
+            </svg>
+          </label>
+          <label ngbButtonLabel class="btn-outline-primary btn-sm mr-2 flex-fill">
+            <input ngbButton type="radio" class="btn btn-sm" [value]="true">
+            <svg class="toolbaricon" fill="currentColor">
+              <use xlink:href="assets/bootstrap-icons.svg#sort-alpha-up-alt" />
+            </svg>
+          </label>
+        </div>
+        <div>
+          <button *ngFor="let f of getSortFields()" ngbDropdownItem (click)="list.sortField = f.field"
+            [class.active]="list.sortField == f.field">{{f.name}}
+          </button>
+        </div>
       </div>
     </div>
-    <label ngbButtonLabel class="btn-outline-primary btn-sm">
-      <input ngbButton type="radio" class="btn btn-sm" [value]="false">
-      <svg class="toolbaricon" fill="currentColor">
-        <use xlink:href="assets/bootstrap-icons.svg#sort-alpha-down" />
-      </svg>
-    </label>
-    <label ngbButtonLabel class="btn-outline-primary btn-sm">
-      <input ngbButton type="radio" class="btn btn-sm" [value]="true">
-      <svg class="toolbaricon" fill="currentColor">
-        <use xlink:href="assets/bootstrap-icons.svg#sort-alpha-up-alt" />
-      </svg>
-    </label>
   </div>
 
-  <div class="btn-group ml-2">
+  <div class="btn-group ml-2 flex-fill">
 
-    <div class="btn-group" ngbDropdown role="group">
+    <div class="btn-group flex-fill" ngbDropdown role="group">
       <button class="btn btn-sm btn-outline-primary dropdown-toggle" ngbDropdownToggle i18n>Views</button>
       <div class="dropdown-menu shadow" ngbDropdownMenu>
         <ng-container *ngIf="!list.savedViewId">

From cfd263da909f930be61bff274b1461cb7a9b4604 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 11 Jan 2021 11:49:27 -0800
Subject: [PATCH 0821/1300] Hide page count on mobile since document is out of
 view anyway

---
 .../components/document-detail/document-detail.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index cb5ae98fc..d3d736aa2 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -1,5 +1,5 @@
 <app-page-header [(title)]="title">
-    <div class="input-group input-group-sm mr-5" *ngIf="getContentType() == 'application/pdf'">
+    <div class="input-group input-group-sm mr-5 d-none d-md-flex" *ngIf="getContentType() == 'application/pdf'">
       <div class="input-group-prepend">
         <div class="input-group-text" i18n>Page</div>
       </div>
@@ -9,7 +9,7 @@
       </div>
     </div>
 
-    <button type="button" class="btn btn-sm btn-outline-danger mr-2" (click)="delete()">
+    <button type="button" class="btn btn-sm btn-outline-danger mr-2 ml-auto" (click)="delete()">
         <svg class="buttonicon" fill="currentColor">
             <use xlink:href="assets/bootstrap-icons.svg#trash" />
         </svg>&nbsp;<span class="d-none d-lg-inline" i18n>Delete</span>

From 18a128b9178165de9a245d1788b0b6bafbd6b43c Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 11 Jan 2021 12:22:35 -0800
Subject: [PATCH 0822/1300] On second thought lets make filter editor buttons
 fill

---
 .../date-dropdown/date-dropdown.component.html       |  4 ++--
 .../filterable-dropdown.component.html               |  4 ++--
 .../filter-editor/filter-editor.component.html       | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
index e4f17c4e6..57bef0480 100644
--- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
+++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
@@ -1,5 +1,5 @@
-  <div class="btn-group" ngbDropdown role="group">
-  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="dateBefore || dateAfter ? 'btn-primary' : 'btn-outline-primary'">
+  <div class="btn-group w-100" ngbDropdown role="group">
+  <button class="btn btn-sm flex-fill" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="dateBefore || dateAfter ? 'btn-primary' : 'btn-outline-primary'">
     {{title}}
   </button>
   <div class="dropdown-menu date-dropdown shadow pt-0" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index b09491683..ac8dc1d70 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -1,5 +1,5 @@
-<div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown">
-  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'">
+<div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown">
+  <button class="btn btn-sm flex-fill" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'">
     <div class="d-none d-md-inline">{{title}}</div>
     <div class="d-inline-block d-md-none">
       <svg class="toolbaricon" fill="currentColor">
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index a8c8740ca..82e73dafd 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -7,8 +7,8 @@
   </div>
   <div class="w-100 d-xl-none"></div>
     <div class="col col-xl-auto mb-2 mb-xl-0">
-      <div class="d-flex  justify-content-between">
-        <app-filterable-dropdown class="mr-md-3" title="Tags" icon="tag-fill" i18n-title
+      <div class="d-flex justify-content-between">
+        <app-filterable-dropdown class="mr-2 flex-fill" title="Tags" icon="tag-fill" i18n-title
           filterPlaceholder="Filter tags" i18n-filterPlaceholder
           [items]="tags"
           [(selectionModel)]="tagSelectionModel"
@@ -16,26 +16,26 @@
           [multiple]="true"
           (open)="onTagsDropdownOpen()"
           [allowSelectNone]="true"></app-filterable-dropdown>
-        <app-filterable-dropdown class="mr-md-3" title="Correspondent" icon="person-fill" i18n-title
+        <app-filterable-dropdown class="mr-2 flex-fill" title="Correspondent" icon="person-fill" i18n-title
           filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
           [items]="correspondents"
           [(selectionModel)]="correspondentSelectionModel"
           (selectionModelChange)="updateRules()"
           (open)="onCorrespondentDropdownOpen()"
           [allowSelectNone]="true"></app-filterable-dropdown>
-        <app-filterable-dropdown class="mr-md-3" title="Document type" icon="file-earmark-fill" i18n-title
+        <app-filterable-dropdown class="mr-2 flex-fill" title="Document type" icon="file-earmark-fill" i18n-title
           filterPlaceholder="Filter document types" i18n-filterPlaceholder
           [items]="documentTypes"
           [(selectionModel)]="documentTypeSelectionModel"
           (open)="onDocumentTypeDropdownOpen()"
           (selectionModelChange)="updateRules()"
           [allowSelectNone]="true"></app-filterable-dropdown>
-        <app-date-dropdown class="mr-md-3"
+        <app-date-dropdown class="mr-2 flex-fill"
           title="Created" i18n-title
           (datesSet)="updateRules()"
           [(dateBefore)]="dateCreatedBefore"
           [(dateAfter)]="dateCreatedAfter"></app-date-dropdown>
-        <app-date-dropdown
+        <app-date-dropdown class="flex-fill"
           [(dateBefore)]="dateAddedBefore"
           [(dateAfter)]="dateAddedAfter"
           title="Added" i18n-title

From 64a966c9a59e399a028ee39a239f300081088906 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 11 Jan 2021 12:52:42 -0800
Subject: [PATCH 0823/1300] Fill document list buttons, show select icon
 because its not obvious, make some menus right

---
 .../document-list.component.html              | 75 +++++++++----------
 .../document-list.component.scss              |  5 ++
 2 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 5f64d1e55..612238215 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -1,11 +1,10 @@
 <app-page-header [title]="getTitle()">
 
-  <div ngbDropdown class="mr-2">
-    <button class="btn btn-sm btn-outline-primary" id="dropdownSelect" ngbDropdownToggle>
+  <div ngbDropdown class="mr-2 flex-fill d-flex">
+    <button class="btn btn-sm btn-outline-primary flex-fill" id="dropdownSelect" ngbDropdownToggle>
       <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#text-indent-left" />
-      </svg>&nbsp;<span class="d-none d-md-inline" i18n>Select</span>
-
+      </svg>&nbsp;<ng-container i18n>Select</ng-container>
     </button>
     <div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow">
       <button ngbDropdownItem (click)="list.selectNone()" i18n>Select none</button>
@@ -14,7 +13,7 @@
     </div>
   </div>
 
-  <div class="btn-group btn-group-toggle" ngbRadioGroup [(ngModel)]="displayMode"
+  <div class="btn-group btn-group-toggle flex-fill" ngbRadioGroup [(ngModel)]="displayMode"
     (ngModelChange)="saveDisplayMode()">
     <label ngbButtonLabel class="btn-outline-primary btn-sm">
       <input ngbButton type="radio" class="btn btn-sm" value="details">
@@ -36,48 +35,42 @@
     </label>
   </div>
 
-  <div class="btn-group ml-2 flex-fill">
-    <div ngbDropdown class="btn-group flex-fill">
-      <button class="btn btn-outline-primary btn-sm" id="dropdownBasic1" ngbDropdownToggle i18n>Sort by</button>
-      <div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="shadow">
-        <div class="w-100 d-flex btn-group-toggle pb-2 mb-1 border-bottom" ngbRadioGroup [(ngModel)]="list.sortReverse">
-          <label ngbButtonLabel class="btn-outline-primary btn-sm mx-2 flex-fill">
-            <input ngbButton type="radio" class="btn btn-sm" [value]="false">
-            <svg class="toolbaricon" fill="currentColor">
-              <use xlink:href="assets/bootstrap-icons.svg#sort-alpha-down" />
-            </svg>
-          </label>
-          <label ngbButtonLabel class="btn-outline-primary btn-sm mr-2 flex-fill">
-            <input ngbButton type="radio" class="btn btn-sm" [value]="true">
-            <svg class="toolbaricon" fill="currentColor">
-              <use xlink:href="assets/bootstrap-icons.svg#sort-alpha-up-alt" />
-            </svg>
-          </label>
-        </div>
-        <div>
-          <button *ngFor="let f of getSortFields()" ngbDropdownItem (click)="list.sortField = f.field"
-            [class.active]="list.sortField == f.field">{{f.name}}
-          </button>
-        </div>
+  <div ngbDropdown class="btn-group ml-2 flex-fill">
+    <button class="btn btn-outline-primary btn-sm" id="dropdownBasic1" ngbDropdownToggle i18n>Sort</button>
+    <div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="shadow dropdown-menu-right">
+      <div class="w-100 d-flex btn-group-toggle pb-2 mb-1 border-bottom" ngbRadioGroup [(ngModel)]="list.sortReverse">
+        <label ngbButtonLabel class="btn-outline-primary btn-sm mx-2 flex-fill">
+          <input ngbButton type="radio" class="btn btn-sm" [value]="false">
+          <svg class="toolbaricon" fill="currentColor">
+            <use xlink:href="assets/bootstrap-icons.svg#sort-alpha-down" />
+          </svg>
+        </label>
+        <label ngbButtonLabel class="btn-outline-primary btn-sm mr-2 flex-fill">
+          <input ngbButton type="radio" class="btn btn-sm" [value]="true">
+          <svg class="toolbaricon" fill="currentColor">
+            <use xlink:href="assets/bootstrap-icons.svg#sort-alpha-up-alt" />
+          </svg>
+        </label>
+      </div>
+      <div>
+        <button *ngFor="let f of getSortFields()" ngbDropdownItem (click)="list.sortField = f.field"
+          [class.active]="list.sortField == f.field">{{f.name}}
+        </button>
       </div>
     </div>
   </div>
 
-  <div class="btn-group ml-2 flex-fill">
+  <div class="btn-group ml-2 flex-fill" ngbDropdown role="group">
+    <button class="btn btn-sm btn-outline-primary dropdown-toggle flex-fill" ngbDropdownToggle i18n>Views</button>
+    <div class="dropdown-menu shadow dropdown-menu-right" ngbDropdownMenu>
+      <ng-container *ngIf="!list.savedViewId">
+        <button ngbDropdownItem *ngFor="let view of savedViewService.allViews" (click)="loadViewConfig(view)">{{view.name}}</button>
+        <div class="dropdown-divider" *ngIf="savedViewService.allViews.length > 0"></div>
+      </ng-container>
 
-    <div class="btn-group flex-fill" ngbDropdown role="group">
-      <button class="btn btn-sm btn-outline-primary dropdown-toggle" ngbDropdownToggle i18n>Views</button>
-      <div class="dropdown-menu shadow" ngbDropdownMenu>
-        <ng-container *ngIf="!list.savedViewId">
-          <button ngbDropdownItem *ngFor="let view of savedViewService.allViews" (click)="loadViewConfig(view)">{{view.name}}</button>
-          <div class="dropdown-divider" *ngIf="savedViewService.allViews.length > 0"></div>
-        </ng-container>
-
-        <button ngbDropdownItem (click)="saveViewConfig()" *ngIf="list.savedViewId" i18n>Save "{{list.savedViewTitle}}"</button>
-        <button ngbDropdownItem (click)="saveViewConfigAs()" i18n>Save as...</button>
-      </div>
+      <button ngbDropdownItem (click)="saveViewConfig()" *ngIf="list.savedViewId" i18n>Save "{{list.savedViewTitle}}"</button>
+      <button ngbDropdownItem (click)="saveViewConfigAs()" i18n>Save as...</button>
     </div>
-
   </div>
 
 </app-page-header>
diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss
index d7c08abec..f90a94be4 100644
--- a/src-ui/src/app/components/document-list/document-list.component.scss
+++ b/src-ui/src/app/components/document-list/document-list.component.scss
@@ -25,3 +25,8 @@ $paperless-card-breakpoints: (
     }
   }
 }
+
+.dropdown-menu-right {
+  right: 0 !important;
+  left: auto !important;
+}

From 3fbf24a1c26584877487e630a5369cf025c4e279 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 11 Jan 2021 21:55:06 +0100
Subject: [PATCH 0824/1300] don't use dependencies from testing

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b5d2e5b13..789a15641 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,8 +15,7 @@ WORKDIR /usr/src/paperless/
 COPY requirements.txt ./
 
 # Binary dependencies
-RUN echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list \
-  && apt-get update \
+RUN apt-get update \
   && apt-get -y --no-install-recommends install \
   	# Basic dependencies
 		curl \

From 0e03c48bebcde79a54aad89d9b3e55412cf5a40a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 11 Jan 2021 21:56:50 +0100
Subject: [PATCH 0825/1300] pin pillow dependency

---
 Pipfile      | 3 ++-
 Pipfile.lock | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Pipfile b/Pipfile
index 1a9b43950..5c1c136b5 100644
--- a/Pipfile
+++ b/Pipfile
@@ -23,7 +23,8 @@ imap-tools = "*"
 langdetect = "*"
 pdftotext = "*"
 pathvalidate = "*"
-pillow = "*"
+# pinned to 8.1.0, since aarch64 wheels might not be available beyond that
+pillow = "==8.1.0"
 pikepdf = "*"
 python-gnupg = "*"
 python-dotenv = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 58cf35894..c3aa4a4f5 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "241c8d042e9b607bbeb7d501b3fc1b57376e3cc8c2b2fe117ec60e425dfd79c7"
+            "sha256": "27c8973d55150371bd18406cc90e61ad4a7ec4b9353007045d611a87120a2703"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -437,6 +437,7 @@
         "pillow": {
             "hashes": [
                 "sha256:165c88bc9d8dba670110c689e3cc5c71dbe4bfb984ffa7cbebf1fac9554071d6",
+                "sha256:1d208e670abfeb41b6143537a681299ef86e92d2a3dac299d3cd6830d5c7bded",
                 "sha256:22d070ca2e60c99929ef274cfced04294d2368193e935c5d6febfd8b601bf865",
                 "sha256:2353834b2c49b95e1313fb34edf18fca4d57446675d05298bb694bca4b194174",
                 "sha256:39725acf2d2e9c17356e6835dccebe7a697db55f25a09207e38b835d5e1bc032",
@@ -462,9 +463,12 @@
                 "sha256:ca20739e303254287138234485579b28cb0d524401f83d5129b5ff9d606cb0a8",
                 "sha256:cb192176b477d49b0a327b2a5a4979552b7a58cd42037034316b8018ac3ebb59",
                 "sha256:cdbbe7dff4a677fb555a54f9bc0450f2a21a93c5ba2b44e09e54fcb72d2bd13d",
+                "sha256:cf6e33d92b1526190a1de904df21663c46a456758c0424e4f947ae9aa6088bf7",
                 "sha256:d355502dce85ade85a2511b40b4c61a128902f246504f7de29bbeec1ae27933a",
+                "sha256:d673c4990acd016229a5c1c4ee8a9e6d8f481b27ade5fc3d95938697fa443ce0",
                 "sha256:dc577f4cfdda354db3ae37a572428a90ffdbe4e51eda7849bf442fb803f09c9b",
-                "sha256:dd9eef866c70d2cbbea1ae58134eaffda0d4bfea403025f4db6859724b18ab3d"
+                "sha256:dd9eef866c70d2cbbea1ae58134eaffda0d4bfea403025f4db6859724b18ab3d",
+                "sha256:f50e7a98b0453f39000619d845be8b06e611e56ee6e8186f7f60c3b1e2f0feae"
             ],
             "index": "pypi",
             "version": "==8.1.0"

From 8702a739b0baf42f7eb728958531964802f2bf1d Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 11 Jan 2021 12:58:59 -0800
Subject: [PATCH 0826/1300] Change dark mode dropdown menu color for visibility

---
 src-ui/src/theme_dark.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index a58745b21..93483bca8 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -84,7 +84,7 @@ $border-color-dark-mode: #47494f;
   }
 
   .dropdown-menu {
-    background-color: $bg-dark-mode;
+    background-color: $bg-light-dark-mode;
 
     .dropdown-divider {
       border-color: $border-color-dark-mode;

From 9dd8b7cd88ce36ae4da94a14049f8247bca0bc8f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 11 Jan 2021 22:11:01 +0100
Subject: [PATCH 0827/1300] fix test case

---
 src/paperless_mail/tests/test_mail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py
index 77db096c4..0104f5023 100644
--- a/src/paperless_mail/tests/test_mail.py
+++ b/src/paperless_mail/tests/test_mail.py
@@ -41,7 +41,7 @@ class BogusMailBox(ContextManager):
 
     folder = BogusFolderManager()
 
-    def fetch(self, criteria, mark_seen):
+    def fetch(self, criteria, mark_seen, charset=""):
         msg = self.messages
 
         criteria = str(criteria).strip('()').split(" ")

From 040e652e6a050c3fa2cee16b1b83a478599e442b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 11 Jan 2021 23:07:47 +0100
Subject: [PATCH 0828/1300] remove obsolete steps from the documentation

---
 docs/administration.rst | 18 ++++--------------
 docs/setup.rst          |  7 -------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/docs/administration.rst b/docs/administration.rst
index bc728943e..c3d1d07a6 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -110,27 +110,17 @@ After grabbing the new release and unpacking the contents, do the following:
 
     This creates a new virtual environment (or uses your existing environment)
     and installs all dependencies into it.
-
-3.  Collect static files.
-
-    .. code:: shell-session
-
-        $ cd src
-        $ pipenv run python3 manage.py collectstatic --clear
     
-4.  Migrate the database.
+3.  Migrate the database.
 
     .. code:: shell-session
 
         $ cd src
         $ pipenv run python3 manage.py migrate
     
-5.  Update translation files.
-
-    .. code:: shell-session
-
-        $ cd src
-        $ pipenv run python3 manage.py compilemessages
+    This might not actually do anything. Not every new paperless version comes with new
+    database migrations.
+    
         
 Management utilities
 ####################
diff --git a/docs/setup.rst b/docs/setup.rst
index ed7f84885..48569a04c 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -225,7 +225,6 @@ writing. Windows is not and will never be supported.
     *   ``python3-pip``, optionally ``pipenv`` for package installation
     *   ``python3-dev``
 
-    *   ``gettext`` for compiling interface translations
     *   ``fonts-liberation`` for generating thumbnails for plain text files
     *   ``imagemagick`` >= 6 for PDF conversion
     *   ``optipng`` for optimizing thumbnails
@@ -293,15 +292,9 @@ writing. Windows is not and will never be supported.
 
     .. code:: bash
 
-        # This collects static files from paperless and django.
-        python3 manage.py collectstatic --clear --no-input
-
         # This creates the database schema.
         python3 manage.py migrate
 
-        # This creates the translation files for paperless.
-        python3 manage.py compilemessages
-
         # This creates your first paperless user
         python3 manage.py createsuperuser
 

From 6131a40c31d6f10db70dc6d2d62b37ed31012d68 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 11 Jan 2021 14:53:16 -0800
Subject: [PATCH 0829/1300] Fix right menus getting cut off

---
 .../common/date-dropdown/date-dropdown.component.html       | 2 +-
 .../filterable-dropdown/filterable-dropdown.component.html  | 2 +-
 .../filter-editor/filter-editor.component.html              | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
index 57bef0480..b70a04103 100644
--- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
+++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
@@ -1,5 +1,5 @@
   <div class="btn-group w-100" ngbDropdown role="group">
-  <button class="btn btn-sm flex-fill" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="dateBefore || dateAfter ? 'btn-primary' : 'btn-outline-primary'">
+  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="dateBefore || dateAfter ? 'btn-primary' : 'btn-outline-primary'">
     {{title}}
   </button>
   <div class="dropdown-menu date-dropdown shadow pt-0" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index ac8dc1d70..debbbe5b0 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -1,5 +1,5 @@
 <div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown">
-  <button class="btn btn-sm flex-fill" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'">
+  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'">
     <div class="d-none d-md-inline">{{title}}</div>
     <div class="d-inline-block d-md-none">
       <svg class="toolbaricon" fill="currentColor">
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index 82e73dafd..b2ed5242b 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -7,7 +7,7 @@
   </div>
   <div class="w-100 d-xl-none"></div>
     <div class="col col-xl-auto mb-2 mb-xl-0">
-      <div class="d-flex justify-content-between">
+      <div class="d-flex">
         <app-filterable-dropdown class="mr-2 flex-fill" title="Tags" icon="tag-fill" i18n-title
           filterPlaceholder="Filter tags" i18n-filterPlaceholder
           [items]="tags"
@@ -30,12 +30,12 @@
           (open)="onDocumentTypeDropdownOpen()"
           (selectionModelChange)="updateRules()"
           [allowSelectNone]="true"></app-filterable-dropdown>
-        <app-date-dropdown class="mr-2 flex-fill"
+        <app-date-dropdown class="mr-2"
           title="Created" i18n-title
           (datesSet)="updateRules()"
           [(dateBefore)]="dateCreatedBefore"
           [(dateAfter)]="dateCreatedAfter"></app-date-dropdown>
-        <app-date-dropdown class="flex-fill"
+        <app-date-dropdown
           [(dateBefore)]="dateAddedBefore"
           [(dateAfter)]="dateAddedAfter"
           title="Added" i18n-title

From 56f566e13ad2e128a7a29f34c7c311b0e4625f06 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 11 Jan 2021 14:54:48 -0800
Subject: [PATCH 0830/1300] select icon hidden on larger screens

---
 .../app/components/document-list/document-list.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 612238215..9cba30ff5 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -2,7 +2,7 @@
 
   <div ngbDropdown class="mr-2 flex-fill d-flex">
     <button class="btn btn-sm btn-outline-primary flex-fill" id="dropdownSelect" ngbDropdownToggle>
-      <svg class="toolbaricon" fill="currentColor">
+      <svg class="toolbaricon d-md-none" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#text-indent-left" />
       </svg>&nbsp;<ng-container i18n>Select</ng-container>
     </button>

From 27517c15ca56c00263390d12c91391d12a9c32c7 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 11 Jan 2021 15:01:40 -0800
Subject: [PATCH 0831/1300] Make bulk editor a little more compact

---
 .../document-list/bulk-editor/bulk-editor.component.html  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index b9912ec1d..053126445 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -6,8 +6,7 @@
       </svg>&nbsp;<ng-container i18n>Cancel</ng-container>
     </button>
   </div>
-  <div class="w-100 d-xl-none"></div>
-  <div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
+  <div class="col-auto mb-2 mb-xl-0 ml-auto ml-md-0" role="group" aria-label="Select">
     <label class="mr-2 mb-0" i18n>Select:</label>
     <div class="btn-group">
       <button class="btn btn-sm btn-outline-primary" (click)="list.selectPage()">
@@ -56,9 +55,8 @@
       </app-filterable-dropdown>
     </div>
   </div>
-  <div class="w-100 d-xl-none"></div>
-  <div class="col mb-2 mb-xl-0 d-flex">
-    <button type="button" class="btn btn-sm btn-outline-danger ml-0 ml-lg-auto" (click)="applyDelete()">
+  <div class="col-auto ml-auto mb-2 mb-xl-0 d-flex">
+    <button type="button" class="btn btn-sm btn-outline-danger" (click)="applyDelete()">
       <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#trash" />
       </svg>&nbsp;<ng-container i18n>Delete</ng-container>

From 681b769a71f577333540fc2485274dc21d749ae3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 00:09:10 +0100
Subject: [PATCH 0832/1300] copy files into place

---
 .gitignore                    |  4 ++--
 docker/hub/.env               |  1 +
 docker/hub/docker-compose.env | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 docker/hub/.env
 create mode 100644 docker/hub/docker-compose.env

diff --git a/.gitignore b/.gitignore
index e58fb12e7..b427d5c5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,8 +65,8 @@ target/
 .virtualenv
 virtualenv
 /venv
-docker-compose.env
-docker-compose.yml
+/docker-compose.env
+/docker-compose.yml
 
 # Used for development
 scripts/import-for-development
diff --git a/docker/hub/.env b/docker/hub/.env
new file mode 100644
index 000000000..511a1386d
--- /dev/null
+++ b/docker/hub/.env
@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME=paperless
\ No newline at end of file
diff --git a/docker/hub/docker-compose.env b/docker/hub/docker-compose.env
new file mode 100644
index 000000000..4271bce6e
--- /dev/null
+++ b/docker/hub/docker-compose.env
@@ -0,0 +1,34 @@
+# The UID and GID of the user used to run paperless in the container. Set this
+# to your UID and GID on the host so that you have write access to the
+# consumption directory.
+#USERMAP_UID=1000
+#USERMAP_GID=1000
+
+# Additional languages to install for text recognition, separated by a
+# whitespace. Note that this is
+# different from PAPERLESS_OCR_LANGUAGE (default=eng), which defines the
+# default language used when guessing the language from the OCR output.
+# The container installs English, German, Italian, Spanish and French by
+# default.
+# See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster
+# for available languages.
+#PAPERLESS_OCR_LANGUAGES=tur ces
+
+###############################################################################
+# Paperless-specific settings                                                 #
+###############################################################################
+
+# All settings defined in the paperless.conf.example can be used here. The
+# Docker setup does not use the configuration file.
+# A few commonly adjusted settings are provided below.
+
+# Adjust this key if you plan to make paperless available publicly. It should
+# be a very long sequence of random characters. You don't need to remember it.
+#PAPERLESS_SECRET_KEY=change-me
+
+# Use this variable to set a timezone for the Paperless Docker containers. If not specified, defaults to UTC.
+#PAPERLESS_TIME_ZONE=America/Los_Angeles
+
+# The default language to use for OCR. Set this to the language most of your
+# documents are written in.
+#PAPERLESS_OCR_LANGUAGE=eng

From 221cf1218481d51eed427e6f2792b5f65b2c96a0 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 00:21:05 +0100
Subject: [PATCH 0833/1300] only restart docker unless stopped

---
 docker/hub/docker-compose.postgres.yml | 6 +++---
 docker/hub/docker-compose.sqlite.yml   | 4 ++--
 docker/hub/docker-compose.tika.yml     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index f821a6781..863c99c32 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/docker-compose.postgres.yml
@@ -2,11 +2,11 @@ version: "3.4"
 services:
   broker:
     image: redis:6.0
-    restart: always
+    restart: unless-stopped
 
   db:
     image: postgres:13
-    restart: always
+    restart: unless-stopped
     volumes:
       - pgdata:/var/lib/postgresql/data
     environment:
@@ -16,7 +16,7 @@ services:
 
   webserver:
     image: jonaswinkler/paperless-ng:latest
-    restart: always
+    restart: unless-stopped
     depends_on:
       - db
       - broker
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index cc26dc46c..2ab0cbb9c 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -2,11 +2,11 @@ version: "3.4"
 services:
   broker:
     image: redis:6.0
-    restart: always
+    restart: unless-stopped
 
   webserver:
     image: jonaswinkler/paperless-ng:latest
-    restart: always
+    restart: unless-stopped
     depends_on:
       - broker
     ports:
diff --git a/docker/hub/docker-compose.tika.yml b/docker/hub/docker-compose.tika.yml
index 7ad7685d3..f9e44472a 100644
--- a/docker/hub/docker-compose.tika.yml
+++ b/docker/hub/docker-compose.tika.yml
@@ -2,11 +2,11 @@ version: "3.4"
 services:
   broker:
     image: redis:6.0
-    restart: always
+    restart: unless-stopped
 
   webserver:
     image: jonaswinkler/paperless-ng:latest
-    restart: always
+    restart: unless-stopped
     depends_on:
       - broker
     ports:

From 50ba88231f3b3d1ed3794b91191733ed54383438 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 00:29:05 +0100
Subject: [PATCH 0834/1300] documentation

---
 docs/administration.rst |  5 ++---
 docs/setup.rst          | 17 +++++++----------
 docs/usage_overview.rst |  2 +-
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/docs/administration.rst b/docs/administration.rst
index c3d1d07a6..80f57d849 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -48,9 +48,6 @@ Options available to bare-metal and non-docker installations:
 Restoring
 =========
 
-
-
-
 .. _administration-updating:
 
 Updating Paperless
@@ -84,9 +81,11 @@ B.  If you built the image yourself, do the following:
     .. code:: shell-session
 
         $ git pull
+        $ ./compile-frontend.sh
         $ docker-compose build
         $ docker-compose up
 
+Running `docker-compose up` will also apply any new database migrations.
 If you see everything working, you can start paperless-ng with "-d" to have it
 run in the background.
 
diff --git a/docs/setup.rst b/docs/setup.rst
index 48569a04c..1e46608ae 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -97,9 +97,10 @@ run the above mentioned components yourself.
 Install Paperless from Docker Hub
 =================================
 
-1.  Go to the `project page <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/hub>`_
+1.  Go to the `/docker/hub directory on the project page <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/hub>`_
     and download one of the ``docker-compose.*.yml`` files, depending on which database backend you
-    want to use. Download the ``docker-compose.env`` file and the ``.env`` file as well and store them
+    want to use. Rename this file to `docker-compose.yml`.
+    Download the ``docker-compose.env`` file and the ``.env`` file as well and store them
     in the same directory.
 
     .. hint::
@@ -124,7 +125,6 @@ Install Paperless from Docker Hub
         .. _Docker installation guide: https://docs.docker.com/engine/installation/
         .. _docker-compose installation guide: https://docs.docker.com/compose/install/
 
-
 3.  Modify ``docker-compose.yml`` to your preferences. You may want to change the path
     to the consumption directory in this file. Find the line that specifies where
     to mount the consumption directory:
@@ -201,7 +201,9 @@ Build the docker image yourself
     depending on which database backend you want to use. Copy
     ``docker-compose.env.example`` to ``docker-compose.env``.
 
-3.  Follow steps 2 to 7 of :ref:`setup-docker_hub`. When asked to run
+3.  Run the `compile-frontend.sh` script. This requires `node` and `npm`.
+
+4.  Follow steps 2 to 7 of :ref:`setup-docker_hub`. When asked to run
     ``docker-compose up -d`` to start the containers, do
 
     .. code:: shell-session
@@ -422,12 +424,7 @@ Migration to paperless-ng is then performed in a few simple steps:
 5.  Adjust ``docker-compose.yml`` and ``docker-compose.env`` to your needs.
     See :ref:`setup-docker_hub` for details on which edits are advised.
 
-6.  Since ``docker-compose`` would just use the the old paperless image, we need to
-    manually build a new image:
-
-    .. code:: shell-session
-
-        $ docker-compose build
+6.  :ref:`Update paperless. <administration-updating>`
 
 7.  In order to find your existing documents with the new search feature, you need
     to invoke a one-time operation that will create the search index:
diff --git a/docs/usage_overview.rst b/docs/usage_overview.rst
index 7a4fd7740..6c34b2823 100644
--- a/docs/usage_overview.rst
+++ b/docs/usage_overview.rst
@@ -118,7 +118,7 @@ to share any documents with paperless. This can be combined with any of the mobi
 scanning apps out there, such as Office Lens.
 
 Furthermore, there is the  `Paperless App <https://github.com/bauerj/paperless_app>`_ as well,
-which no only has document upload, but also document editing and browsing.
+which not only has document upload, but also document browsing and download features.
 
 .. _usage-email:
 

From 5d1dddfac82091c4a1c7db31b5f2a02509e41865 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 00:40:49 +0100
Subject: [PATCH 0835/1300] unless-stopped in local dockerfiles

---
 docker-compose.postgres.yml | 6 +++---
 docker-compose.sqlite.yml   | 4 ++--
 docker-compose.tika.yml     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml
index 59ae28939..53fea9e28 100644
--- a/docker-compose.postgres.yml
+++ b/docker-compose.postgres.yml
@@ -2,11 +2,11 @@ version: "3.4"
 services:
   broker:
     image: redis:6.0
-    restart: always
+    restart: unless-stopped
 
   db:
     image: postgres:13
-    restart: always
+    restart: unless-stopped
     volumes:
       - pgdata:/var/lib/postgresql/data
     environment:
@@ -16,7 +16,7 @@ services:
 
   webserver:
     build: .
-    restart: always
+    restart: unless-stopped
     depends_on:
       - db
       - broker
diff --git a/docker-compose.sqlite.yml b/docker-compose.sqlite.yml
index 2d21fa3f1..87aa100a6 100644
--- a/docker-compose.sqlite.yml
+++ b/docker-compose.sqlite.yml
@@ -2,11 +2,11 @@ version: "3.4"
 services:
   broker:
     image: redis:6.0
-    restart: always
+    restart: unless-stopped
 
   webserver:
     build: .
-    restart: always
+    restart: unless-stopped
     depends_on:
       - broker
     ports:
diff --git a/docker-compose.tika.yml b/docker-compose.tika.yml
index 889713908..d7b7e0da9 100644
--- a/docker-compose.tika.yml
+++ b/docker-compose.tika.yml
@@ -2,11 +2,11 @@ version: "3.4"
 services:
   broker:
     image: redis:6.0
-    restart: always
+    restart: unless-stopped
 
   webserver:
     build: .
-    restart: always
+    restart: unless-stopped
     depends_on:
       - broker
     ports:

From 83dd5f51cd12976b33d368bcb3cefba07f7c3c09 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 11 Jan 2021 16:15:55 -0800
Subject: [PATCH 0836/1300] Move 'Filter by:' inline with title field, icon
 stuff

---
 .../filterable-dropdown.component.html                 | 10 ++++------
 .../document-list/document-list.component.html         |  2 +-
 .../filter-editor/filter-editor.component.html         |  6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
index debbbe5b0..fc74eb4e9 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
@@ -1,11 +1,9 @@
 <div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown">
   <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'">
-    <div class="d-none d-md-inline">{{title}}</div>
-    <div class="d-inline-block d-md-none">
-      <svg class="toolbaricon" fill="currentColor">
-        <use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
-      </svg>
-    </div>
+    <svg class="toolbaricon" fill="currentColor">
+      <use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
+    </svg>
+    <div class="d-none d-sm-inline">&nbsp;{{title}}</div>
     <ng-container *ngIf="!editing && selectionModel.selectionSize() > 0">
       <div class="badge bg-secondary text-light rounded-pill badge-corner">
         {{selectionModel.selectionSize()}}
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 9cba30ff5..612238215 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -2,7 +2,7 @@
 
   <div ngbDropdown class="mr-2 flex-fill d-flex">
     <button class="btn btn-sm btn-outline-primary flex-fill" id="dropdownSelect" ngbDropdownToggle>
-      <svg class="toolbaricon d-md-none" fill="currentColor">
+      <svg class="toolbaricon" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#text-indent-left" />
       </svg>&nbsp;<ng-container i18n>Select</ng-container>
     </button>
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index b2ed5242b..033596f53 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -1,8 +1,8 @@
 <div class="row">
    <div class="col mb-2 mb-xl-0">
-     <div class="form-inline d-flex">
-         <label class="text-muted mr-2" i18n>Filter by:</label>
-         <input class="form-control form-control-sm flex-grow-1" type="text" [(ngModel)]="titleFilter" placeholder="Title" i18n-placeholder>
+     <div class="form-inline d-flex align-items-center">
+         <label class="text-muted mr-2 mb-0" i18n>Filter by:</label>
+         <input class="form-control form-control-sm flex-fill w-auto" type="text" [(ngModel)]="titleFilter" placeholder="Title" i18n-placeholder>
      </div>
   </div>
   <div class="w-100 d-xl-none"></div>

From ab4af350dd5296b6908fc88c9880b39f9beb4498 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 12:25:50 +0100
Subject: [PATCH 0837/1300] changelog

---
 docs/changelog.rst | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 69b3090ee..25cc6957a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,43 @@
 Changelog
 *********
 
+paperless-ng 0.9.14
+###################
+
+Starting with this version, releases are getting built automatically. This release also comes with changes on how to install and
+update paperless.
+
+* Paperless now uses GitHub Actions to make releases and build docker images.
+
+  * Docker images are available for amd64, armhf, and aarch64.
+  * When you pull an image from Docker Hub, Docker will automatically select the correct image for you.
+
+* Changes to docker installations and updates
+
+  * The ``-dockerfiles.tar.xz`` release archive is gone. Instead, simply grab the dockerfiles from ``/docker/hub`` in the repository
+    if you wish to install paperless by pulling from the hub.
+  * The docker compose files in ``/docker/hub`` were changed to always use the ``latest`` version automatically. In order to do further
+    updated, simply do a ``docker-compose pull``. The documentation has been updated.
+  * The docker compose files were changed to restart paperless on system boot only if it was running before shutdown.
+
+* Changes to bare metal installations
+
+  * The release archive is built exactly like before. However, the release now comes with already compiled translation messages and
+    collected static files. Therefore, the update steps ``compilemessages`` and ``collectstatic`` are now obsolete.
+
+* Other changes and fixes
+
+  * A new configuration option ``PAPERLESS_IGNORE_DATES`` was added by `jayme-github`_. This can be used to instruct paperless to ignore
+    certain dates (such as your date of birth) when guessing the date from the document content. This was actually introduced in 0.9.12,
+    I just forgot to mention it in the changelog.
+  * A couple changes to the dark mode and fixes to lots of layout issues.
+  * The filter drop downs now display selected entries on top of all other entries.
+  * An issue with the tika parser not picking up files from the consumption directory was fixed.
+  * The PostgreSQL client now supports setting an explicit ``sslmode`` to force encryption of the connection to PostgreSQL.
+  * An issue with the drop downs for correspondents, tags and types not properly supporting filtering with special characters was fixes.
+  * The docker images now come with ``jbig2enc``, which is a lossless image encoder for PDF documents and decreases the size of certain
+    PDF/A documents.
+
 paperless-ng 0.9.13
 ###################
 

From 890f6f35b57496a2ef31844c7c0a140304186fa4 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 12:27:58 +0100
Subject: [PATCH 0838/1300] fixes #330

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 004a66fca..74840163c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -119,7 +119,8 @@ jobs:
           mkdir dist/paperless-ng
           mkdir dist/paperless-ng/docker
           mkdir dist/paperless-ng/scripts
-          cp .dockerignore .env docker-compose.* Dockerfile paperless.conf.example Pipfile Pipfile.lock LICENSE README.md requirements.txt dist/paperless-ng/
+          cp .dockerignore .env docker-compose.* Dockerfile Pipfile Pipfile.lock LICENSE README.md requirements.txt dist/paperless-ng/
+          cp paperless.conf.example dist/paperless-ng/paperless.conf
           cp docker/*.* dist/paperless-ng/docker/
           cp scripts/*.service scripts/*.sh dist/paperless-ng/scripts/
           cp src/ dist/paperless-ng/src -r

From 623893b528f3cd688627b59eabf67f45d439f05d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 13:05:49 +0100
Subject: [PATCH 0839/1300] fixes #331

---
 src/documents/models.py                    |  6 +++++-
 src/documents/tests/test_document_model.py | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/documents/models.py b/src/documents/models.py
index 3f0e331d0..928b8aa4d 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -12,6 +12,7 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils import timezone
+from django.utils.timezone import is_aware
 
 from django.utils.translation import gettext_lazy as _
 
@@ -233,7 +234,10 @@ class Document(models.Model):
         verbose_name_plural = _("documents")
 
     def __str__(self):
-        created = datetime.date.isoformat(self.created)
+        if is_aware(self.created):
+            created = timezone.localdate(self.created).isoformat()
+        else:
+            created = datetime.date.isoformat(self.created)
         if self.correspondent and self.title:
             return f"{created} {self.correspondent} {self.title}"
         else:
diff --git a/src/documents/tests/test_document_model.py b/src/documents/tests/test_document_model.py
index 74bd9a2a7..87261ecd9 100644
--- a/src/documents/tests/test_document_model.py
+++ b/src/documents/tests/test_document_model.py
@@ -1,10 +1,10 @@
 import shutil
 import tempfile
-from datetime import datetime
 from pathlib import Path
 from unittest import mock
 
 from django.test import TestCase, override_settings
+from django.utils import timezone
 
 from ..models import Document, Correspondent
 
@@ -47,20 +47,20 @@ class TestDocument(TestCase):
 
     def test_file_name(self):
 
-        doc = Document(mime_type="application/pdf", title="test", created=datetime(2020, 12, 25))
+        doc = Document(mime_type="application/pdf", title="test", created=timezone.datetime(2020, 12, 25))
         self.assertEqual(doc.get_public_filename(), "2020-12-25 test.pdf")
 
     def test_file_name_jpg(self):
 
-        doc = Document(mime_type="image/jpeg", title="test", created=datetime(2020, 12, 25))
+        doc = Document(mime_type="image/jpeg", title="test", created=timezone.datetime(2020, 12, 25))
         self.assertEqual(doc.get_public_filename(), "2020-12-25 test.jpg")
 
     def test_file_name_unknown(self):
 
-        doc = Document(mime_type="application/zip", title="test", created=datetime(2020, 12, 25))
+        doc = Document(mime_type="application/zip", title="test", created=timezone.datetime(2020, 12, 25))
         self.assertEqual(doc.get_public_filename(), "2020-12-25 test.zip")
 
     def test_file_name_invalid_type(self):
 
-        doc = Document(mime_type="image/jpegasd", title="test", created=datetime(2020, 12, 25))
+        doc = Document(mime_type="image/jpegasd", title="test", created=timezone.datetime(2020, 12, 25))
         self.assertEqual(doc.get_public_filename(), "2020-12-25 test")

From 376f991db5cef779d0c8eb8da5804ec54c96dcbe Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 13:06:21 +0100
Subject: [PATCH 0840/1300] remove travis branch condition

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74840163c..ec2cdbe71 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -191,7 +191,7 @@ jobs:
 
   # build and push image to docker hub.
   build-docker-image:
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-multiarch-builds' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
     runs-on: ubuntu-latest
     needs: [frontend, tests]
     steps:

From 1a89ad95e05a31ce4b87a02007dad84b4739b0d5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 13:08:30 +0100
Subject: [PATCH 0841/1300] changelog

---
 docs/changelog.rst | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 25cc6957a..67e000e8e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -29,19 +29,23 @@ update paperless.
   * The release archive is built exactly like before. However, the release now comes with already compiled translation messages and
     collected static files. Therefore, the update steps ``compilemessages`` and ``collectstatic`` are now obsolete.
 
-* Other changes and fixes
+* Other changes
 
   * A new configuration option ``PAPERLESS_IGNORE_DATES`` was added by `jayme-github`_. This can be used to instruct paperless to ignore
     certain dates (such as your date of birth) when guessing the date from the document content. This was actually introduced in 0.9.12,
     I just forgot to mention it in the changelog.
-  * A couple changes to the dark mode and fixes to lots of layout issues.
   * The filter drop downs now display selected entries on top of all other entries.
-  * An issue with the tika parser not picking up files from the consumption directory was fixed.
   * The PostgreSQL client now supports setting an explicit ``sslmode`` to force encryption of the connection to PostgreSQL.
-  * An issue with the drop downs for correspondents, tags and types not properly supporting filtering with special characters was fixes.
   * The docker images now come with ``jbig2enc``, which is a lossless image encoder for PDF documents and decreases the size of certain
     PDF/A documents.
 
+* Fixes
+
+  * An issue with the tika parser not picking up files from the consumption directory was fixed.
+  * A couple changes to the dark mode and fixes to lots of layout issues.
+  * An issue with the drop downs for correspondents, tags and types not properly supporting filtering with special characters was fixes.
+  * Fixed an issue with filenames of downloaded files: Dates where off by one day due to timezone issues.
+
 paperless-ng 0.9.13
 ###################
 

From 7f88c7d70c1bd2ac386847a1906d2c12e519091c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 13:51:29 +0100
Subject: [PATCH 0842/1300] update docker-compose.env

---
 docker-compose.example.env    | 2 +-
 docker/hub/docker-compose.env | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.example.env b/docker-compose.example.env
index 4271bce6e..e9e8ecb06 100644
--- a/docker-compose.example.env
+++ b/docker-compose.example.env
@@ -7,7 +7,7 @@
 # Additional languages to install for text recognition, separated by a
 # whitespace. Note that this is
 # different from PAPERLESS_OCR_LANGUAGE (default=eng), which defines the
-# default language used when guessing the language from the OCR output.
+# language used for OCR.
 # The container installs English, German, Italian, Spanish and French by
 # default.
 # See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster
diff --git a/docker/hub/docker-compose.env b/docker/hub/docker-compose.env
index 4271bce6e..e9e8ecb06 100644
--- a/docker/hub/docker-compose.env
+++ b/docker/hub/docker-compose.env
@@ -7,7 +7,7 @@
 # Additional languages to install for text recognition, separated by a
 # whitespace. Note that this is
 # different from PAPERLESS_OCR_LANGUAGE (default=eng), which defines the
-# default language used when guessing the language from the OCR output.
+# language used for OCR.
 # The container installs English, German, Italian, Spanish and French by
 # default.
 # See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster

From 64b176103eb6a40d1f57b0fc772db10b9eb9f0a1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 13:51:44 +0100
Subject: [PATCH 0843/1300] fixes #201

---
 Dockerfile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 789a15641..1d12e7785 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,6 +62,14 @@ RUN apt-get update \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& mkdir /var/log/supervisord /var/run/supervisord
 
+# This pulls in updated dependencies from bullseye to fix some issues with file type detection.
+# remove this once bullseye releases.
+RUN 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 \
+  && rm -rf /var/lib/apt/lists/* \
+  && rm /etc/apt/sources.list.d/bullseye.list
+
 # copy scripts
 # this fixes issues with imagemagick and PDF
 COPY docker/imagemagick-policy.xml /etc/ImageMagick-6/policy.xml

From 387135ffa5c32c63c188da55c3faa8506c3156c8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 14:01:15 +0100
Subject: [PATCH 0844/1300] update dockerfile

---
 Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1d12e7785..ae89f78a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,12 +46,19 @@ RUN apt-get update \
 		zlib1g \
 		&& rm -rf /var/lib/apt/lists/*
 
+# This pulls in updated dependencies from bullseye to fix some issues with file type detection.
+# TODO: Remove this once bullseye releases.
+RUN 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
+
 # Python dependencies
 RUN apt-get update \
   && apt-get -y --no-install-recommends install \
 		build-essential \
 		libatlas-base-dev \
-		libmagic-dev \
 		libpoppler-cpp-dev \
 		libpq-dev \
 		libqpdf-dev \
@@ -62,13 +69,6 @@ RUN apt-get update \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& mkdir /var/log/supervisord /var/run/supervisord
 
-# This pulls in updated dependencies from bullseye to fix some issues with file type detection.
-# remove this once bullseye releases.
-RUN 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 \
-  && rm -rf /var/lib/apt/lists/* \
-  && rm /etc/apt/sources.list.d/bullseye.list
 
 # copy scripts
 # this fixes issues with imagemagick and PDF

From 4e6c7b01b612565ba8e994a76b9ec330f8587e89 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Tue, 12 Jan 2021 14:29:32 +0100
Subject: [PATCH 0845/1300] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 04cbdc41b..6b7ac3776 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ These features will probably never make it into paperless, since paperless is me
 
 # Getting started
 
-The recommended way to deploy paperless is docker-compose. Don't clone the repository, grab the latest release to get started instead. The dockerfiles archive contains just the docker files which will pull the image from docker hub. The source archive contains everything you need to build the docker image yourself (i.e. if you want to run on Raspberry Pi).
+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.
 

From d45993c905ae8bb8c8002fb85411c35d258754f7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 17:00:53 +0100
Subject: [PATCH 0846/1300] remove unused code

---
 src-ui/src/app/data/filter-rule-type.ts | 39 ++++++++++++-------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts
index 577e304d2..4669b548e 100644
--- a/src-ui/src/app/data/filter-rule-type.ts
+++ b/src-ui/src/app/data/filter-rule-type.ts
@@ -22,37 +22,36 @@ export const FILTER_ASN_ISNULL = 18
 
 export const FILTER_RULE_TYPES: FilterRuleType[] = [
 
-  {id: FILTER_TITLE, name: "Title contains", filtervar: "title__icontains", datatype: "string", multi: false, default: ""},
-  {id: FILTER_CONTENT, name: "Content contains", filtervar: "content__icontains", datatype: "string", multi: false, default: ""},
+  {id: FILTER_TITLE, filtervar: "title__icontains", datatype: "string", multi: false, default: ""},
+  {id: FILTER_CONTENT, filtervar: "content__icontains", datatype: "string", multi: false, default: ""},
 
-  {id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false},
+  {id: FILTER_ASN, filtervar: "archive_serial_number", datatype: "number", multi: false},
 
-  {id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", isnull_filtervar: "correspondent__isnull", datatype: "correspondent", multi: false},
-  {id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", isnull_filtervar: "document_type__isnull", datatype: "document_type", multi: false},
+  {id: FILTER_CORRESPONDENT, filtervar: "correspondent__id", isnull_filtervar: "correspondent__isnull", datatype: "correspondent", multi: false},
+  {id: FILTER_DOCUMENT_TYPE, filtervar: "document_type__id", isnull_filtervar: "document_type__isnull", datatype: "document_type", multi: false},
 
-  {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},
-  {id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true},
-  {id: FILTER_DOES_NOT_HAVE_TAG, name: "Does not have tag", filtervar: "tags__id__none", datatype: "tag", multi: true},
-  {id: FILTER_HAS_ANY_TAG, name: "Has any tag", filtervar: "is_tagged", datatype: "boolean", multi: false, default: true},
+  {id: FILTER_IS_IN_INBOX, filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},
+  {id: FILTER_HAS_TAG, filtervar: "tags__id__all", datatype: "tag", multi: true},
+  {id: FILTER_DOES_NOT_HAVE_TAG, filtervar: "tags__id__none", datatype: "tag", multi: true},
+  {id: FILTER_HAS_ANY_TAG, filtervar: "is_tagged", datatype: "boolean", multi: false, default: true},
 
-  {id: FILTER_CREATED_BEFORE, name: "Created before", filtervar: "created__date__lt", datatype: "date", multi: false},
-  {id: FILTER_CREATED_AFTER, name: "Created after", filtervar: "created__date__gt", datatype: "date", multi: false},
+  {id: FILTER_CREATED_BEFORE, filtervar: "created__date__lt", datatype: "date", multi: false},
+  {id: FILTER_CREATED_AFTER, filtervar: "created__date__gt", datatype: "date", multi: false},
 
-  {id: FILTER_CREATED_YEAR, name: "Year created is", filtervar: "created__year", datatype: "number", multi: false},
-  {id: FILTER_CREATED_MONTH, name: "Month created is", filtervar: "created__month", datatype: "number", multi: false},
-  {id: FILTER_CREATED_DAY, name: "Day created is", filtervar: "created__day", datatype: "number", multi: false},
+  {id: FILTER_CREATED_YEAR, filtervar: "created__year", datatype: "number", multi: false},
+  {id: FILTER_CREATED_MONTH, filtervar: "created__month", datatype: "number", multi: false},
+  {id: FILTER_CREATED_DAY, filtervar: "created__day", datatype: "number", multi: false},
 
-  {id: FILTER_ADDED_BEFORE, name: "Added before", filtervar: "added__date__lt", datatype: "date", multi: false},
-  {id: FILTER_ADDED_AFTER, name: "Added after", filtervar: "added__date__gt", datatype: "date", multi: false},
+  {id: FILTER_ADDED_BEFORE, filtervar: "added__date__lt", datatype: "date", multi: false},
+  {id: FILTER_ADDED_AFTER, filtervar: "added__date__gt", datatype: "date", multi: false},
 
-  {id: FILTER_MODIFIED_BEFORE, name: "Modified before", filtervar: "modified__date__lt", datatype: "date", multi: false},
-  {id: FILTER_MODIFIED_AFTER, name: "Modified after", filtervar: "modified__date__gt", datatype: "date", multi: false},
-  {id: FILTER_ASN_ISNULL, name: "ASN is null", filtervar: "archive_serial_number__isnull", datatype: "boolean", multi: false}
+  {id: FILTER_MODIFIED_BEFORE, filtervar: "modified__date__lt", datatype: "date", multi: false},
+  {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}
 ]
 
 export interface FilterRuleType {
   id: number
-  name: string
   filtervar: string
   isnull_filtervar?: string
   datatype: string //number, string, boolean, date

From 0384de9a3c4d06a12faf0e41c29c3f754bdff004 Mon Sep 17 00:00:00 2001
From: Hannah Swain <hannah@automattic.com>
Date: Tue, 3 Nov 2020 12:25:48 +0100
Subject: [PATCH 0847/1300] Update scanners list to include mobile options

(cherry picked from commit cb30fb56db445ad196eaf0dbd5ba661605f58930)
---
 docs/scanners.rst | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docs/scanners.rst b/docs/scanners.rst
index 5551fe55d..75fed6de3 100644
--- a/docs/scanners.rst
+++ b/docs/scanners.rst
@@ -10,6 +10,9 @@ scanner you use, but sometimes finding a scanner that will write to an FTP,
 NFS, or SMB server can be difficult.  This page is here to help you find one
 that works right for you based on recommendations from other Paperless users.
 
+Physical scanners
+-----------------
+
 +---------+----------------+-----+-----+-----+----------------+
 | Brand   | Model          | Supports        | Recommended By |
 +---------+----------------+-----+-----+-----+----------------+
@@ -45,3 +48,21 @@ that works right for you based on recommendations from other Paperless users.
 .. _REOLDEV: https://github.com/REOLDEV
 .. _Skylinar: https://github.com/Skylinar
 .. _jonaswinkler: https://github.com/jonaswinkler
+
+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 |                |
++===================+================+=====+=====+=====+=======+========+================+
+| `Genius Scan`_    | Android        | yes | no  | yes | yes   | yes    | `hannahswain`_ |
++-------------------+----------------+-----+-----+-----+-------+--------+----------------+
+
+
+.. _Genius Scan: https://play.google.com/store/apps/details?id=com.thegrizzlylabs.geniusscan.free
+
+.. _hannahswain: https://github.com/hannahswain

From 215911567989edfa0a2d4770beaa5d4b8e3cad60 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 18:02:29 +0100
Subject: [PATCH 0848/1300] scanners

---
 docs/scanners.rst       | 8 ++++++--
 docs/usage_overview.rst | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/scanners.rst b/docs/scanners.rst
index 75fed6de3..ad7566c71 100644
--- a/docs/scanners.rst
+++ b/docs/scanners.rst
@@ -11,7 +11,7 @@ NFS, or SMB server can be difficult.  This page is here to help you find one
 that works right for you based on recommendations from other Paperless users.
 
 Physical scanners
------------------
+=================
 
 +---------+----------------+-----+-----+-----+----------------+
 | Brand   | Model          | Supports        | Recommended By |
@@ -50,7 +50,7 @@ Physical scanners
 .. _jonaswinkler: https://github.com/jonaswinkler
 
 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.
 
@@ -59,10 +59,14 @@ You can use your phone to "scan" documents. The regular camera app will work, bu
 +-------------------+----------------+-----+-----+-----+-------+--------+----------------+
 |                   |                | FTP | NFS | SMB | Email | WebDav |                |
 +===================+================+=====+=====+=====+=======+========+================+
+| `Office Lens`_    | Android        | ?   | ?   | ?   | ?     | ?      | `jonaswinkler`_|
++-------------------+----------------+-----+-----+-----+-------+--------+----------------+
 | `Genius Scan`_    | Android        | yes | no  | yes | yes   | yes    | `hannahswain`_ |
 +-------------------+----------------+-----+-----+-----+-------+--------+----------------+
 
+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.
 
+.. _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
 
 .. _hannahswain: https://github.com/hannahswain
diff --git a/docs/usage_overview.rst b/docs/usage_overview.rst
index 6c34b2823..2c7093b99 100644
--- a/docs/usage_overview.rst
+++ b/docs/usage_overview.rst
@@ -110,6 +110,8 @@ The dashboard has a file drop field to upload documents to paperless. Simply dra
 onto this field or select a file with the file dialog. Multiple files are supported.
 
 
+.. _usage-mobile_upload:
+
 Mobile upload
 =============
 

From 75ae37d90f3d4aae31e0d1e9a4594aadb50bd81e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 19:48:59 +0100
Subject: [PATCH 0849/1300] update dependencies (sklearn 0.24 has aarch64
 wheels!)

---
 Pipfile          |   8 ++--
 Pipfile.lock     | 107 +++++++++++++++++++++++++----------------------
 requirements.txt |   6 +--
 3 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/Pipfile b/Pipfile
index 5c1c136b5..15da2503a 100644
--- a/Pipfile
+++ b/Pipfile
@@ -23,9 +23,9 @@ imap-tools = "*"
 langdetect = "*"
 pdftotext = "*"
 pathvalidate = "*"
-# pinned to 8.1.0, since aarch64 wheels might not be available beyond that
+# 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 = "*"
+pikepdf = "~=2.2.5"
 python-gnupg = "*"
 python-dotenv = "*"
 python-dateutil = "*"
@@ -33,7 +33,7 @@ python-Levenshtein = "*"
 python-magic = "*"
 psycopg2-binary = "*"
 redis = "*"
-scikit-learn="~=0.23.2"
+scikit-learn="~=0.24.0"
 whitenoise = "~=5.2.0"
 watchdog = "*"
 whoosh="~=2.7.4"
@@ -52,6 +52,6 @@ pytest-django = "*"
 pytest-env = "*"
 pytest-sugar = "*"
 pytest-xdist = "*"
-sphinx = "~=3.3"
+sphinx = "~=3.4.2"
 sphinx_rtd_theme = "*"
 tox = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index c3aa4a4f5..dab52dbbd 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "27c8973d55150371bd18406cc90e61ad4a7ec4b9353007045d611a87120a2703"
+            "sha256": "3c85a487240f18b3feb44f8899395696cb79630f320f0df9ef5ee37b914c89f2"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -251,11 +251,11 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:5c5a2720817414a6c41f0a49993908068243ae02c1635a228126519b509c8aed",
-                "sha256:bf792d480abbd5eda85794e4afb09dd538393f7d6e6ffef6e9f03d2014cf9450"
+                "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771",
+                "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d"
             ],
             "markers": "python_version < '3.8'",
-            "version": "==3.3.0"
+            "version": "==3.4.0"
         },
         "inotify-simple": {
             "hashes": [
@@ -695,26 +695,35 @@
         },
         "scikit-learn": {
             "hashes": [
-                "sha256:090bbf144fd5823c1f2efa3e1a9bf180295b24294ca8f478e75b40ed54f8036e",
-                "sha256:0a127cc70990d4c15b1019680bfedc7fec6c23d14d3719fdf9b64b22d37cdeca",
-                "sha256:0d39748e7c9669ba648acf40fb3ce96b8a07b240db6888563a7cb76e05e0d9cc",
-                "sha256:1b8a391de95f6285a2f9adffb7db0892718950954b7149a70c783dc848f104ea",
-                "sha256:20766f515e6cd6f954554387dfae705d93c7b544ec0e6c6a5d8e006f6f7ef480",
-                "sha256:2aa95c2f17d2f80534156215c87bee72b6aa314a7f8b8fe92a2d71f47280570d",
-                "sha256:5ce7a8021c9defc2b75620571b350acc4a7d9763c25b7593621ef50f3bd019a2",
-                "sha256:6c28a1d00aae7c3c9568f61aafeaad813f0f01c729bee4fd9479e2132b215c1d",
-                "sha256:7671bbeddd7f4f9a6968f3b5442dac5f22bf1ba06709ef888cc9132ad354a9ab",
-                "sha256:914ac2b45a058d3f1338d7736200f7f3b094857758895f8667be8a81ff443b5b",
-                "sha256:98508723f44c61896a4e15894b2016762a55555fbf09365a0bb1870ecbd442de",
-                "sha256:a64817b050efd50f9abcfd311870073e500ae11b299683a519fbb52d85e08d25",
-                "sha256:cb3e76380312e1f86abd20340ab1d5b3cc46a26f6593d3c33c9ea3e4c7134028",
-                "sha256:d0dcaa54263307075cb93d0bee3ceb02821093b1b3d25f66021987d305d01dce",
-                "sha256:d9a1ce5f099f29c7c33181cc4386660e0ba891b21a60dc036bf369e3a3ee3aec",
-                "sha256:da8e7c302003dd765d92a5616678e591f347460ac7b53e53d667be7dfe6d1b10",
-                "sha256:daf276c465c38ef736a79bd79fc80a249f746bcbcae50c40945428f7ece074f8"
+                "sha256:076369634ee72b5a5941440661e2f306ff4ac30903802dc52031c7e9199ac640",
+                "sha256:18f7131e62265bf2691ed1d0303c640313894ccfe4278427478c6b2f45094b53",
+                "sha256:26f66b3726b54dfb76ea51c5d9c2431ed17ebc066cb4527662b9e851a3e7ba61",
+                "sha256:2951f87d35e72f007701c6e028aa230f6df6212a3194677c0c950486066a454d",
+                "sha256:2a5348585aa793bc8cc5a72f8e9067c9380834b0aadbd55f924843b071f13282",
+                "sha256:3eeff086f7329521d27249a082ea3c48c085cedb110db5f65968ab55c3ba2e09",
+                "sha256:4395e91b3548005f4a645018435b5a94f8cce232b5b70753020e606c6a750656",
+                "sha256:44e452ea8491225c5783d49577aad0f36202dfd52aec7f82c0fdfe5fbd5f7400",
+                "sha256:490436b44b3a1957cb625e871764b0aa330b34cc416aea4abc6c38ca63d0d682",
+                "sha256:5e6e3c042cea83f2e20a45e563b8eabc1f8f72446251fe23ebefdf111a173a33",
+                "sha256:66f27bf21202a850bcd7b6303916e4907f6e22ec59a14974ede4955aed5c7ed0",
+                "sha256:743b6edd98c98991be46c08e6b21df3861d5ae915f91d59f988384d93f7263e7",
+                "sha256:758619e49cd7c17282e6cc60d5cc73c02c072b47c9a10010bb3bb47e0d976e50",
+                "sha256:7f654befc5ad413690cc58f3f34a3e906caf825195ce0fda00a8e9565e1403e6",
+                "sha256:800aaf63f8838c00e85db2267dd226f89858594843fd03932a9eda95746d2c40",
+                "sha256:80ca024154b84b6ac4cfc86930ba13fdc348a209753bf2c16129db6f9eb8a80b",
+                "sha256:890d7d588f65acb0c4f6c083347c9076916bda5e6bd8400f06244b1afc1009af",
+                "sha256:905d8934d1e27a686698864a5863ff2c0e13a2ae1adb78a8a848aacc8a49927d",
+                "sha256:a83fcd9d59c42a2f66b307e3b0b0f08aa8e6e45be33da055697ea499f0e4f7c2",
+                "sha256:afeb06dc69847927634e58579b9cdc72e1390b79497336b2324b1b173f33bd47",
+                "sha256:b0d13fd56d26cf3de0314a4fd48037108c638fe126d813f5c1222bb0f08b6a76",
+                "sha256:c08b27cb78ee8d2dc781a7affed09859441f5b624f9f92da59ac0791c8774dfc",
+                "sha256:c912247e42114f389858ae05d63f4359d4e667ea72aaabee191aee9ad3f9774a",
+                "sha256:d7fe05fcb44eadd6d6c874c768f085f5de1239db3a3b7be4d3d23d12e4120589",
+                "sha256:d819d625832fb2969911a243e009cfa135cb8ef1e150866e417d6e9d75290087",
+                "sha256:e534f5f3796db6781c87e9835dcd51b7854c8c5a379c9210b93605965c1941fd"
             ],
             "index": "pypi",
-            "version": "==0.23.2"
+            "version": "==0.24.0"
         },
         "scipy": {
             "hashes": [
@@ -789,11 +798,11 @@
         },
         "tqdm": {
             "hashes": [
-                "sha256:556c55b081bd9aa746d34125d024b73f0e2a0e62d5927ff0e400e20ee0a03b9a",
-                "sha256:b8b46036fd00176d0870307123ef06bb851096964fa7fc578d789f90ce82c3e4"
+                "sha256:4621f6823bab46a9cc33d48105753ccbea671b68bab2c50a9f0be23d4065cb5a",
+                "sha256:fe3d08dd00a526850568d542ff9de9bbc2a09a791da3c334f3213d8d0bbbca65"
             ],
             "index": "pypi",
-            "version": "==4.55.1"
+            "version": "==4.56.0"
         },
         "typing-extensions": {
             "hashes": [
@@ -988,11 +997,11 @@
         },
         "coveralls": {
             "hashes": [
-                "sha256:2301a19500b06649d2ec4f2858f9c69638d7699a4c63027c5d53daba666147cc",
-                "sha256:b990ba1f7bc4288e63340be0433698c1efe8217f78c689d254c2540af3d38617"
+                "sha256:5399c0565ab822a70a477f7031f6c88a9dd196b3de2877b3facb43b51bd13434",
+                "sha256:f8384968c57dee4b7133ae701ecdad88e85e30597d496dcba0d7fbb470dca41f"
             ],
             "index": "pypi",
-            "version": "==2.2.0"
+            "version": "==3.0.0"
         },
         "distlib": {
             "hashes": [
@@ -1034,11 +1043,11 @@
         },
         "faker": {
             "hashes": [
-                "sha256:7b0c4bb678be21a68640007f254259c73d18f7996a3448267716423360519732",
-                "sha256:7e98483fc273ec5cfe1c9efa9b99adaa2de4c6b610fbc62d3767088e4974b0ce"
+                "sha256:47ac7d62d5bad8c16422a91f121430ab7656d40ca8fea9c84bcdbdf92e739b03",
+                "sha256:6bc44606d44f711e1d89ad9a5b42394cc6f7eedaffc765ddb5b2d22084c15733"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==5.3.0"
+            "version": "==5.5.0"
         },
         "filelock": {
             "hashes": [
@@ -1067,19 +1076,19 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:5c5a2720817414a6c41f0a49993908068243ae02c1635a228126519b509c8aed",
-                "sha256:bf792d480abbd5eda85794e4afb09dd538393f7d6e6ffef6e9f03d2014cf9450"
+                "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771",
+                "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d"
             ],
             "markers": "python_version < '3.8'",
-            "version": "==3.3.0"
+            "version": "==3.4.0"
         },
         "importlib-resources": {
             "hashes": [
-                "sha256:0a948d0c8c3f9344de62997e3f73444dbba233b1eaf24352933c2d264b9e4182",
-                "sha256:6b45007a479c4ec21165ae3ffbe37faf35404e2041fac6ae1da684f38530ca73"
+                "sha256:4743f090ed8946e713745ec0e660249ef9fb0b9843eacc5b5ff931d2fd5aa67f",
+                "sha256:ea17df80a0ff04b5dbd3d96dbeab1842acfd1c6c902eaeb8c8858abf2720161e"
             ],
             "markers": "python_version < '3.7'",
-            "version": "==4.1.1"
+            "version": "==5.0.0"
         },
         "iniconfig": {
             "hashes": [
@@ -1174,11 +1183,11 @@
         },
         "pygments": {
             "hashes": [
-                "sha256:ccf3acacf3782cbed4a989426012f1c535c9a90d3a7fc3f16d231b9372d2b716",
-                "sha256:f275b6c0909e5dafd2d6269a656aa90fa58ebf4a74f8fcf9053195d226b24a08"
+                "sha256:bc9591213a8f0e0ca1a5e68a479b4887fdc3e75d0774e5c71c31920c427de435",
+                "sha256:df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==2.7.3"
+            "version": "==2.7.4"
         },
         "pyparsing": {
             "hashes": [
@@ -1285,11 +1294,11 @@
         },
         "sphinx": {
             "hashes": [
-                "sha256:77dec5ac77ca46eee54f59cf477780f4fb23327b3339ef39c8471abb829c1285",
-                "sha256:b8aa4eb5502c53d3b5ca13a07abeedacd887f7770c198952fd5b9530d973e767"
+                "sha256:41cad293f954f7d37f803d97eb184158cfd90f51195131e94875bc07cd08b93c",
+                "sha256:c314c857e7cd47c856d2c5adff514ac2e6495f8b8e0f886a8a37e9305dfea0d8"
             ],
             "index": "pypi",
-            "version": "==3.4.2"
+            "version": "==3.4.3"
         },
         "sphinx-rtd-theme": {
             "hashes": [
@@ -1371,11 +1380,11 @@
         },
         "tox": {
             "hashes": [
-                "sha256:42ce19ce5dc2f6d6b1fdc5666c476e1f1e2897359b47e0aa3a5b774f335d57c2",
-                "sha256:4321052bfe28f9d85082341ca8e233e3ea901fdd14dab8a5d3fbd810269fbaf6"
+                "sha256:5efda30ad73e662c3844ac51ce1381bf28f61063773e06996aa8b6277133a7c0",
+                "sha256:8cccede64802e78aa6c69f81051b25f0706639d1cbbb34d9366ce00c70ee054f"
             ],
             "index": "pypi",
-            "version": "==3.20.1"
+            "version": "==3.21.0"
         },
         "typing-extensions": {
             "hashes": [
@@ -1396,11 +1405,11 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:54b05fc737ea9c9ee9f8340f579e5da5b09fb64fd010ab5757eb90268616907c",
-                "sha256:b7a8ec323ee02fb2312f098b6b4c9de99559b462775bc8fe3627a73706603c1b"
+                "sha256:205a7577275dd0d9223c730dd498e21a8910600085c3dee97412b041fc4b853b",
+                "sha256:7992b8de87e544a4ab55afc2240bf8388c4e3b5765d03784dad384bfdf9097ee"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.2.2"
+            "version": "==20.3.0"
         },
         "zipp": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index 9932d146b..3b7a158c1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,7 +30,7 @@ humanfriendly==9.1; python_version >= '2.7' and python_version not in '3.0, 3.1,
 idna==2.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 imap-tools==0.34.0
 img2pdf==0.4.0
-importlib-metadata==3.3.0; python_version < '3.8'
+importlib-metadata==3.4.0; python_version < '3.8'
 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.0; python_version >= '3.6'
@@ -56,14 +56,14 @@ redis==3.5.3
 regex==2020.11.13
 reportlab==3.5.59
 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.23.2
+scikit-learn==0.24.0
 scipy==1.5.4; python_version >= '3.6'
 six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 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.55.1
+tqdm==4.56.0
 typing-extensions==3.7.4.3; python_version < '3.8'
 tzlocal==2.1
 urllib3==1.26.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'

From d4225a459e8ed441b2ffd5ca99e540600c493eec Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 20:05:26 +0100
Subject: [PATCH 0850/1300] fix CI for new coveralls version

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ec2cdbe71..16cf3b64e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,6 +58,7 @@ jobs:
       - name: Tests
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # https://github.com/coveralls-clients/coveralls-python/issues/251
         run: |
           sudo apt-get update -qq
           sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
@@ -66,7 +67,7 @@ jobs:
           cd src/
           pytest
           pycodestyle
-          coveralls
+          coveralls --service=github
 
   frontend:
     runs-on: ubuntu-20.04

From f1c981338ccca7ce3b16be041667329f2c91090c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 20:23:50 +0100
Subject: [PATCH 0851/1300] reorganize test CI, only upload coveralls once

---
 .github/workflows/ci.yml | 73 +++++++++++++++++++++++++++++-----------
 1 file changed, 53 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16cf3b64e..439840645 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,31 +6,40 @@ jobs:
   documentation:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up Python
         uses: actions/setup-python@v2
         with:
           python-version: 3.8
-      - name: Get pip cache dir
+      -
+        name: Get pip cache dir
         id: pip-cache
         run: |
           echo "::set-output name=dir::$(pip cache dir)"
-      - name: Persistent Github pip cache
+      -
+        name: Persistent Github pip cache
         uses: actions/cache@v2
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip3.8}
-      - name: Install dependencies
+      -
+        name: Install dependencies
         run: |
           sudo apt-get update -qq
           sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev
           pip install --upgrade pipenv
           pipenv install --system --dev --ignore-pipfile
-      - name: Make documentation
+      -
+        name: Make documentation
         run: |
           cd docs/
           make html
-      - uses: actions/upload-artifact@v2
+      -
+        name: Upload artifact
+        uses: actions/upload-artifact@v2
         with:
           name: documentation
           path: docs/_build/html/
@@ -41,44 +50,67 @@ jobs:
       matrix:
         python-version: ['3.6', '3.7', '3.8']
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up Python
         uses: actions/setup-python@v2
         with:
           python-version: "${{ matrix.python-version }}"
-      - name: Get pip cache dir
+      -
+        name: Get pip cache dir
         id: pip-cache
         run: |
           echo "::set-output name=dir::$(pip cache dir)"
-      - name: Persistent Github pip cache
+      -
+        name: Persistent Github pip cache
         uses: actions/cache@v2
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip${{ matrix.python }}
-      - name: Tests
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        # https://github.com/coveralls-clients/coveralls-python/issues/251
+          key: ${{ runner.os }}-pip${{ matrix.python-version }}
+      -
+        name: Prepare tests
         run: |
           sudo apt-get update -qq
           sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
           pip install --upgrade pipenv
           pipenv install --system --dev --ignore-pipfile
+      -
+        name: Tests
+        run: |
           cd src/
           pytest
+      -
+        name: Codestyle
+        run: |
+          cd src/
           pycodestyle
+      -
+        name: Publish coverage results
+        if: matrix.python-version == '3.8'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # https://github.com/coveralls-clients/coveralls-python/issues/251
+        run: |
+          cd src/
           coveralls --service=github
 
   frontend:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
+    -
+      name: Checkout
+      uses: actions/checkout@v2
+    -
+      uses: actions/setup-node@v2
       with:
         node-version: '15'
-    - name: Build frontend
+    -
+      name: Build frontend
       run: ./compile-frontend.sh
-    - name: Upload artifact
+    -
+      name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: frontend-compiled
@@ -89,6 +121,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       -
+        name: Checkout
         uses: actions/checkout@v2
       -
         name: Set up Python

From 80aa8474578c062013d2775700f818bc3354227d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 20:25:58 +0100
Subject: [PATCH 0852/1300] always execute all tests even if tests for one
 python version fail

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 439840645..6fd89b3c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,6 +49,7 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.6', '3.7', '3.8']
+      fail-fast: false
     steps:
       -
         name: Checkout

From c7c98c623de1ae809d9c63890a1bd9361651bbc1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 12 Jan 2021 21:26:39 +0100
Subject: [PATCH 0853/1300] try building without libatlas

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ae89f78a9..8eb6ac494 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,7 +58,6 @@ RUN echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.lis
 RUN apt-get update \
   && apt-get -y --no-install-recommends install \
 		build-essential \
-		libatlas-base-dev \
 		libpoppler-cpp-dev \
 		libpq-dev \
 		libqpdf-dev \

From 91e650350343f142383b5adda54cb4834440b6f0 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Tue, 12 Jan 2021 22:12:07 +0100
Subject: [PATCH 0854/1300] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 04cbdc41b..a7ad0a8ad 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/jonaswinkler/paperless-ng.svg?branch=master)](https://travis-ci.com/jonaswinkler/paperless-ng)
+![ci](https://github.com/jonaswinkler/paperless-ng/workflows/ci/badge.svg)
 [![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)

From 59f955e08b6c2e2679350638140514a1b1c2861e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 13 Jan 2021 00:02:20 +0100
Subject: [PATCH 0855/1300] adjusted the default configuration so that at least
 one cpu core remains free (except on single core machines) #332

---
 docs/configuration.rst               | 22 ++++++++++++++++--
 src/documents/tests/test_settings.py | 34 ++++++++++++++++++++++++++++
 src/paperless/settings.py            | 13 +++++++----
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 src/documents/tests/test_settings.py

diff --git a/docs/configuration.rst b/docs/configuration.rst
index ac2efd390..9d14fba71 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -376,8 +376,26 @@ PAPERLESS_THREADS_PER_WORKER=<num>
         use a higher thread per worker count.
 
     The default is a balance between the two, according to your CPU core count,
-    with a slight favor towards threads per worker, and using as much cores as
-    possible.
+    with a slight favor towards threads per worker, and leaving at least one core
+    free for other tasks:
+
+    +----------------+---------+---------+
+    | CPU core count | Workers | Threads |
+    +----------------+---------+---------+
+    |              1 |       1 |       1 |
+    +----------------+---------+---------+
+    |              2 |       1 |       1 |
+    +----------------+---------+---------+
+    |              4 |       1 |       3 |
+    +----------------+---------+---------+
+    |              6 |       2 |       2 |
+    +----------------+---------+---------+
+    |              8 |       2 |       3 |
+    +----------------+---------+---------+
+    |             12 |       3 |       3 |
+    +----------------+---------+---------+
+    |             16 |       3 |       5 |
+    +----------------+---------+---------+
 
     If you only specify PAPERLESS_TASK_WORKERS, paperless will adjust
     PAPERLESS_THREADS_PER_WORKER automatically.
diff --git a/src/documents/tests/test_settings.py b/src/documents/tests/test_settings.py
new file mode 100644
index 000000000..21f29b4d9
--- /dev/null
+++ b/src/documents/tests/test_settings.py
@@ -0,0 +1,34 @@
+import logging
+from unittest import mock
+
+from django.test import TestCase
+
+from paperless.settings import default_task_workers, default_threads_per_worker
+
+
+class TestSettings(TestCase):
+
+    @mock.patch("paperless.settings.multiprocessing.cpu_count")
+    def test_single_core(self, cpu_count):
+        cpu_count.return_value = 1
+
+        default_workers = default_task_workers()
+
+        default_threads = default_threads_per_worker(default_workers)
+
+        self.assertEqual(default_workers, 1)
+        self.assertEqual(default_threads, 1)
+
+    def test_workers_threads(self):
+        for i in range(2, 64):
+            with mock.patch("paperless.settings.multiprocessing.cpu_count") as cpu_count:
+                cpu_count.return_value = i
+
+                default_workers = default_task_workers()
+
+                default_threads = default_threads_per_worker(default_workers)
+
+                self.assertTrue(default_workers >= 1)
+                self.assertTrue(default_threads >= 1)
+
+                self.assertTrue(default_workers * default_threads < i, f"{i}")
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index f2f1a45b1..7e2c0c40a 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -345,10 +345,13 @@ LOGGING = {
 # Favors threads per worker on smaller systems and never exceeds cpu_count()
 # in total.
 
+
 def default_task_workers():
+    # always leave one core open
+    available_cores = max(multiprocessing.cpu_count() - 1, 1)
     try:
         return max(
-            math.floor(math.sqrt(multiprocessing.cpu_count())),
+            math.floor(math.sqrt(available_cores)),
             1
         )
     except NotImplementedError:
@@ -365,17 +368,19 @@ Q_CLUSTER = {
 }
 
 
-def default_threads_per_worker():
+def default_threads_per_worker(task_workers):
+    # always leave one core open
+    available_cores = max(multiprocessing.cpu_count() - 1, 1)
     try:
         return max(
-            math.floor(multiprocessing.cpu_count() / TASK_WORKERS),
+            math.floor(available_cores / task_workers),
             1
         )
     except NotImplementedError:
         return 1
 
 
-THREADS_PER_WORKER = os.getenv("PAPERLESS_THREADS_PER_WORKER", default_threads_per_worker())
+THREADS_PER_WORKER = os.getenv("PAPERLESS_THREADS_PER_WORKER", default_threads_per_worker(TASK_WORKERS))
 
 ###############################################################################
 # Paperless Specific Settings                                                 #

From 40842689fdb9e4b5adfb0076f9777ccd573a844a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 13 Jan 2021 13:34:52 +0100
Subject: [PATCH 0856/1300] Better deal with non-existing documents when
 searching

---
 .../app/components/search/search.component.html  | 14 ++++++++------
 src-ui/src/app/services/rest/search.service.ts   |  6 +++++-
 src/documents/views.py                           | 16 +++++++++++++---
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src-ui/src/app/components/search/search.component.html b/src-ui/src/app/components/search/search.component.html
index 547c8a475..ae0ec8e3e 100644
--- a/src-ui/src/app/components/search/search.component.html
+++ b/src-ui/src/app/components/search/search.component.html
@@ -16,11 +16,13 @@
 
 <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>
-    <app-document-card-large *ngFor="let result of results"
-        [document]="result.document"
-        [details]="result.highlights"
-        [searchScore]="result.score / maxScore"
-        [moreLikeThis]="true">
+    <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>
 
-</app-document-card-large>
 </div>
diff --git a/src-ui/src/app/services/rest/search.service.ts b/src-ui/src/app/services/rest/search.service.ts
index 3799f3dc7..e750100fa 100644
--- a/src-ui/src/app/services/rest/search.service.ts
+++ b/src-ui/src/app/services/rest/search.service.ts
@@ -28,7 +28,11 @@ export class SearchService {
     }
     return this.http.get<SearchResult>(`${environment.apiBaseUrl}search/`, {params: httpParams}).pipe(
       map(result => {
-        result.results.forEach(hit => this.documentService.addObservablesToDocument(hit.document))
+        result.results.forEach(hit => {
+          if (hit.document) {
+            this.documentService.addObservablesToDocument(hit.document)
+          }
+        })
         return result
       })
     )
diff --git a/src/documents/views.py b/src/documents/views.py
index ab4486821..eb9078f75 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -1,3 +1,4 @@
+import logging
 import os
 import tempfile
 from datetime import datetime
@@ -458,12 +459,21 @@ class SearchView(APIView):
         self.ix = index.open_index()
 
     def add_infos_to_hit(self, r):
-        doc = Document.objects.get(id=r['id'])
+        try:
+            doc = Document.objects.get(id=r['id'])
+        except Document.DoesNotExist:
+            logging.getLogger(__name__).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),
+                'highlights': r.highlights("content", text=doc.content) if doc else None,  # NOQA: E501
                 'score': r.score,
                 'rank': r.rank,
-                'document': DocumentSerializer(doc).data,
+                'document': DocumentSerializer(doc).data if doc else None,
                 'title': r['title']
                 }
 

From e4f2016678b20beeab5205fcf080b23b129eab82 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 13 Jan 2021 13:35:05 +0100
Subject: [PATCH 0857/1300] DEBUG logging

---
 src/paperless/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 7e2c0c40a..fdc6df9f3 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -308,7 +308,7 @@ LOGGING = {
             "class": "documents.loggers.PaperlessHandler",
         },
         "console": {
-            "level": "INFO",
+            "level": "DEBUG" if DEBUG else "INFO",
             "class": "logging.StreamHandler",
             "formatter": "verbose",
         }

From ceb9426fd45f75763025d429bbbc28b83db1b318 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 13 Jan 2021 16:21:54 +0100
Subject: [PATCH 0858/1300] changelog

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 67e000e8e..03b7a674d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -45,6 +45,8 @@ update paperless.
   * A couple changes to the dark mode and fixes to lots of layout issues.
   * An issue with the drop downs for correspondents, tags and types not properly supporting filtering with special characters was fixes.
   * Fixed an issue with filenames of downloaded files: Dates where off by one day due to timezone issues.
+  * Searching will continue to work even when the index returns non-existing documents. This resulted in "Document does not exist" errors
+    before. Instead, a warning is logged, indicating the issue.
 
 paperless-ng 0.9.13
 ###################

From d093c004fb072edb808a7d28c6f1d5d24ae04165 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 13 Jan 2021 17:17:23 +0100
Subject: [PATCH 0859/1300] fixes #161

---
 src/documents/matching.py              | 83 ++++++++++++++++++++------
 src/documents/signals/handlers.py      |  6 +-
 src/documents/tests/test_matchables.py | 18 +++++-
 3 files changed, 83 insertions(+), 24 deletions(-)

diff --git a/src/documents/matching.py b/src/documents/matching.py
index 212698ad3..fa9ce6af3 100644
--- a/src/documents/matching.py
+++ b/src/documents/matching.py
@@ -1,3 +1,4 @@
+import logging
 import re
 
 from fuzzywuzzy import fuzz
@@ -5,49 +6,59 @@ from fuzzywuzzy import fuzz
 from documents.models import MatchingModel, Correspondent, DocumentType, Tag
 
 
-def match_correspondents(document_content, classifier):
+logger = logging.getLogger(__name__)
+
+
+def log_reason(matching_model, document, reason):
+    class_name = type(matching_model).__name__
+    logger.debug(
+        f"Assigning {class_name} {matching_model.name} to document "
+        f"{document} because {reason}")
+
+
+def match_correspondents(document, classifier):
     if classifier:
-        pred_id = classifier.predict_correspondent(document_content)
+        pred_id = classifier.predict_correspondent(document.content)
     else:
         pred_id = None
 
     correspondents = Correspondent.objects.all()
 
     return list(filter(
-        lambda o: matches(o, document_content) or o.pk == pred_id,
+        lambda o: matches(o, document) or o.pk == pred_id,
         correspondents))
 
 
-def match_document_types(document_content, classifier):
+def match_document_types(document, classifier):
     if classifier:
-        pred_id = classifier.predict_document_type(document_content)
+        pred_id = classifier.predict_document_type(document.content)
     else:
         pred_id = None
 
     document_types = DocumentType.objects.all()
 
     return list(filter(
-        lambda o: matches(o, document_content) or o.pk == pred_id,
+        lambda o: matches(o, document) or o.pk == pred_id,
         document_types))
 
 
-def match_tags(document_content, classifier):
+def match_tags(document, classifier):
     if classifier:
-        predicted_tag_ids = classifier.predict_tags(document_content)
+        predicted_tag_ids = classifier.predict_tags(document.content)
     else:
         predicted_tag_ids = []
 
     tags = Tag.objects.all()
 
     return list(filter(
-        lambda o: matches(o, document_content) or o.pk in predicted_tag_ids,
+        lambda o: matches(o, document) or o.pk in predicted_tag_ids,
         tags))
 
 
-def matches(matching_model, document_content):
+def matches(matching_model, document):
     search_kwargs = {}
 
-    document_content = document_content.lower()
+    document_content = document.content.lower()
 
     # Check that match is not empty
     if matching_model.match.strip() == "":
@@ -62,26 +73,54 @@ def matches(matching_model, document_content):
                 rf"\b{word}\b", document_content, **search_kwargs)
             if not search_result:
                 return False
+        log_reason(
+            matching_model, document,
+            f"it contains all of these words: {matching_model.match}"
+        )
         return True
 
     elif matching_model.matching_algorithm == MatchingModel.MATCH_ANY:
         for word in _split_match(matching_model):
             if re.search(rf"\b{word}\b", document_content, **search_kwargs):
+                log_reason(
+                    matching_model, document,
+                    f"it contains this word: {word}"
+                )
                 return True
         return False
 
     elif matching_model.matching_algorithm == MatchingModel.MATCH_LITERAL:
-        return bool(re.search(
+        result = bool(re.search(
             rf"\b{matching_model.match}\b",
             document_content,
             **search_kwargs
         ))
+        if result:
+            log_reason(
+                matching_model, document,
+                f"it contains this string: \"{matching_model.match}\""
+            )
+        return result
 
     elif matching_model.matching_algorithm == MatchingModel.MATCH_REGEX:
-        return bool(re.search(
-            re.compile(matching_model.match, **search_kwargs),
-            document_content
-        ))
+        try:
+            match = re.search(
+                re.compile(matching_model.match, **search_kwargs),
+                document_content
+            )
+        except re.error:
+            logger.error(
+                f"Error while processing regular expression "
+                f"{matching_model.match}"
+            )
+            return False
+        if match:
+            log_reason(
+                matching_model, document,
+                f"the string {match.group()} matches the regular expression "
+                f"{matching_model.match}"
+            )
+        return bool(match)
 
     elif matching_model.matching_algorithm == MatchingModel.MATCH_FUZZY:
         match = re.sub(r'[^\w\s]', '', matching_model.match)
@@ -89,8 +128,16 @@ def matches(matching_model, document_content):
         if matching_model.is_insensitive:
             match = match.lower()
             text = text.lower()
-
-        return fuzz.partial_ratio(match, text) >= 90
+        if fuzz.partial_ratio(match, text) >= 90:
+            # TODO: make this better
+            log_reason(
+                matching_model, document,
+                f"parts of the document content somehow match the string "
+                f"{matching_model.match}"
+            )
+            return True
+        else:
+            return False
 
     elif matching_model.matching_algorithm == MatchingModel.MATCH_AUTO:
         # this is done elsewhere.
diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index be101b3af..76c1e76ed 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -38,7 +38,7 @@ def set_correspondent(sender,
     if document.correspondent and not replace:
         return
 
-    potential_correspondents = matching.match_correspondents(document.content,
+    potential_correspondents = matching.match_correspondents(document,
                                                              classifier)
 
     potential_count = len(potential_correspondents)
@@ -81,7 +81,7 @@ def set_document_type(sender,
     if document.document_type and not replace:
         return
 
-    potential_document_type = matching.match_document_types(document.content,
+    potential_document_type = matching.match_document_types(document,
                                                             classifier)
 
     potential_count = len(potential_document_type)
@@ -130,7 +130,7 @@ def set_tags(sender,
 
     current_tags = set(document.tags.all())
 
-    matched_tags = matching.match_tags(document.content, classifier)
+    matched_tags = matching.match_tags(document, classifier)
 
     relevant_tags = set(matched_tags) - current_tags
 
diff --git a/src/documents/tests/test_matchables.py b/src/documents/tests/test_matchables.py
index 4e4a3e7dc..da0fa66ea 100644
--- a/src/documents/tests/test_matchables.py
+++ b/src/documents/tests/test_matchables.py
@@ -21,13 +21,15 @@ class TestMatching(TestCase):
                 matching_algorithm=getattr(klass, algorithm)
             )
             for string in true:
+                doc = Document(content=string)
                 self.assertTrue(
-                    matching.matches(instance, string),
+                    matching.matches(instance, doc),
                     '"%s" should match "%s" but it does not' % (text, string)
                 )
             for string in false:
+                doc = Document(content=string)
                 self.assertFalse(
-                    matching.matches(instance, string),
+                    matching.matches(instance, doc),
                     '"%s" should not match "%s" but it does' % (text, string)
                 )
 
@@ -169,7 +171,7 @@ class TestMatching(TestCase):
     def test_match_regex(self):
 
         self._test_matching(
-            r"alpha\w+gamma",
+            "alpha\w+gamma",
             "MATCH_REGEX",
             (
                 "I have alpha_and_gamma in me",
@@ -187,6 +189,16 @@ class TestMatching(TestCase):
             )
         )
 
+    def test_tach_invalid_regex(self):
+        self._test_matching(
+            "[[",
+            "MATCH_REGEX",
+            [],
+            [
+                "Don't match this"
+            ]
+        )
+
     def test_match_fuzzy(self):
 
         self._test_matching(

From 24e34e95cda0e90b58a6146afde03779328e684a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 13 Jan 2021 17:33:32 +0100
Subject: [PATCH 0860/1300] changelog

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 03b7a674d..edeedde05 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -38,6 +38,7 @@ update paperless.
   * The PostgreSQL client now supports setting an explicit ``sslmode`` to force encryption of the connection to PostgreSQL.
   * The docker images now come with ``jbig2enc``, which is a lossless image encoder for PDF documents and decreases the size of certain
     PDF/A documents.
+  * When using any of the manual matching algorithms, paperless now logs messages when and why these matching algorithms matched.
 
 * Fixes
 
@@ -47,6 +48,7 @@ update paperless.
   * Fixed an issue with filenames of downloaded files: Dates where off by one day due to timezone issues.
   * Searching will continue to work even when the index returns non-existing documents. This resulted in "Document does not exist" errors
     before. Instead, a warning is logged, indicating the issue.
+  * An issue with the consumer crashing when invalid regular expression were used was fixed.
 
 paperless-ng 0.9.13
 ###################

From 654c7fd2acf895b69babccde679e6139f54f5015 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 13 Jan 2021 19:56:23 +0100
Subject: [PATCH 0861/1300] release: updated body

---
 .github/workflows/ci.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6fd89b3c7..024c0f051 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -195,10 +195,10 @@ jobs:
           name: release
           path: ./
       -
-        name: Get branch name
-        id: get_branch_name
+        name: Get version
+        id: get_version
         run: |
-          echo ::set-output name=branch_name::${GITHUB_REF#refs/tags/ng-}
+          echo ::set-output name=version::${GITHUB_REF#refs/tags/ng-}
       -
         name: Create release
         id: create_release
@@ -206,12 +206,12 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ steps.get_branch_name.outputs.branch_name }}
-          release_name: Paperless-ng ${{ steps.get_branch_name.outputs.branch_name }}
+          tag_name: ${{ steps.get_version.outputs.version }}
+          release_name: Paperless-ng ${{ steps.get_version.outputs.version }}
           draft: false
           prerelease: true
           body: |
-            TODO: Insert changelog here (it's also in the documentation)
+            For a complete list of changes, see the changelog at https://paperless-ng.readthedocs.io/en/latest/changelog.html.
       -
         name: Upload release archive
         id: upload-release-asset
@@ -221,7 +221,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
           asset_path: ./paperless-ng.tar.xz
-          asset_name: paperless-ng-${{ steps.get_branch_name.outputs.branch_name }}.tar.xz
+          asset_name: paperless-ng-${{ steps.get_version.outputs.version }}.tar.xz
           asset_content_type: application/x-xz
 
   # build and push image to docker hub.

From deb9698ff67917489adcc3e35544f77b0fa116dd Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 13 Jan 2021 19:58:09 +0100
Subject: [PATCH 0862/1300] added some messages to the docker startup script

---
 docker/docker-entrypoint.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 13a0ba035..8e1a21757 100644
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -62,6 +62,7 @@ migrations() {
 		# simultaneously. This also ensures that the db is ready when the command
 		# of the current container starts.
 		flock 200
+		echo "Apply database migrations..."
 		sudo -HEu paperless python3 manage.py migrate
 	)  200>/usr/src/paperless/data/migration_lock
 
@@ -85,6 +86,8 @@ initialize() {
 }
 
 install_languages() {
+	echo "Installing languages..."
+
 	local langs="$1"
 	read -ra langs <<<"$langs"
 
@@ -119,6 +122,8 @@ install_languages() {
     done
 }
 
+echo "Paperless-ng docker container starting..."
+
 # Install additional languages if specified
 if [[ ! -z "$PAPERLESS_OCR_LANGUAGES"  ]]; then
 		install_languages "$PAPERLESS_OCR_LANGUAGES"
@@ -127,8 +132,10 @@ fi
 initialize
 
 if [[ "$1" != "/"* ]]; then
+	echo Executing management command "$@"
 	exec sudo -HEu paperless python3 manage.py "$@"
 else
+	echo Executing "$@"
 	exec "$@"
 fi
 

From 96dc7583bfefc10cbd822447299d4b117c3b3d94 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 13 Jan 2021 19:58:32 +0100
Subject: [PATCH 0863/1300] add missing dependency back into the Dockerfile.

---
 Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 8eb6ac494..291036f55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,12 +20,17 @@ RUN apt-get update \
   	# Basic dependencies
 		curl \
 		file \
+		# fonts for text file thumbnail generation
 		fonts-liberation \
+		# for making translations further down
 		gettext \
 		gnupg \
 		imagemagick \
+		# for Numpy
+		libatlas-base-dev \
 		libxslt1-dev \
 		mime-support \
+		# thumbnail size reduction
 		optipng \
 		sudo \
 		tzdata \

From bc4017d54a49fdf216e9a3a35161420742da0943 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 13 Jan 2021 20:09:37 +0100
Subject: [PATCH 0864/1300] inconsistent shadows

---
 .../manage/correspondent-list/correspondent-list.component.html | 2 +-
 .../manage/document-type-list/document-type-list.component.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
index c04a0bcfe..08704190e 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
@@ -6,7 +6,7 @@
   <ngb-pagination [pageSize]="25" [collectionSize]="collectionSize" [(page)]="page" (pageChange)="reloadData()" aria-label="Default pagination"></ngb-pagination>
 </div>
 
-<table class="table table-striped border shadow">
+<table class="table table-striped border shadow-sm">
     <thead>
     <tr>
       <th scope="col" sortable="name" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Name</th>
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
index 0282ae863..dd6e86592 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
@@ -7,7 +7,7 @@
   aria-label="Default pagination"></ngb-pagination>
 </div>
 
-<table class="table table-striped border shadow">
+<table class="table table-striped border shadow-sm">
   <thead>
     <tr>
       <th scope="col" sortable="name" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Name</th>

From 0628d10076eac982e79c3687dbf6bb1496d32d22 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 00:47:54 +0100
Subject: [PATCH 0865/1300] background color for dark mode logs

---
 src-ui/src/theme_dark.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index 93483bca8..9a698143d 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -348,6 +348,10 @@ $border-color-dark-mode: #47494f;
     background-color: darken($danger-dark-mode, 20%);
     border-color: darken($danger-dark-mode, 20%);
   }
+
+  .bg-dark {
+    background-color: $bg-light-dark-mode !important;
+  }
 }
 
 body.color-scheme-dark {

From 2f42eab21716437a9493bd449d41c9616b948ee7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 01:56:10 +0100
Subject: [PATCH 0866/1300] move compose files

---
 docker-compose.tika.yml => docker-compose.sqlite-tika.yml       | 2 ++
 .../{docker-compose.tika.yml => docker-compose.sqlite-tika.yml} | 2 ++
 2 files changed, 4 insertions(+)
 rename docker-compose.tika.yml => docker-compose.sqlite-tika.yml (96%)
 rename docker/hub/{docker-compose.tika.yml => docker-compose.sqlite-tika.yml} (96%)

diff --git a/docker-compose.tika.yml b/docker-compose.sqlite-tika.yml
similarity index 96%
rename from docker-compose.tika.yml
rename to docker-compose.sqlite-tika.yml
index d7b7e0da9..5fbd6f224 100644
--- a/docker-compose.tika.yml
+++ b/docker-compose.sqlite-tika.yml
@@ -9,6 +9,8 @@ services:
     restart: unless-stopped
     depends_on:
       - broker
+      - gotenberg
+      - tika
     ports:
       - 8000:8000
     healthcheck:
diff --git a/docker/hub/docker-compose.tika.yml b/docker/hub/docker-compose.sqlite-tika.yml
similarity index 96%
rename from docker/hub/docker-compose.tika.yml
rename to docker/hub/docker-compose.sqlite-tika.yml
index f9e44472a..5928438fb 100644
--- a/docker/hub/docker-compose.tika.yml
+++ b/docker/hub/docker-compose.sqlite-tika.yml
@@ -9,6 +9,8 @@ services:
     restart: unless-stopped
     depends_on:
       - broker
+      - gotenberg
+      - tika
     ports:
       - 8000:8000
     healthcheck:

From 2824fcb4979f83abf7bb8b8ea6a723a024c0250a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 02:08:26 +0100
Subject: [PATCH 0867/1300] changelog

---
 docs/changelog.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index edeedde05..78262cd98 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -24,7 +24,7 @@ update paperless.
     updated, simply do a ``docker-compose pull``. The documentation has been updated.
   * The docker compose files were changed to restart paperless on system boot only if it was running before shutdown.
 
-* Changes to bare metal installations
+* Changes to bare metal installations and updates
 
   * The release archive is built exactly like before. However, the release now comes with already compiled translation messages and
     collected static files. Therefore, the update steps ``compilemessages`` and ``collectstatic`` are now obsolete.
@@ -38,13 +38,14 @@ update paperless.
   * The PostgreSQL client now supports setting an explicit ``sslmode`` to force encryption of the connection to PostgreSQL.
   * The docker images now come with ``jbig2enc``, which is a lossless image encoder for PDF documents and decreases the size of certain
     PDF/A documents.
-  * When using any of the manual matching algorithms, paperless now logs messages when and why these matching algorithms matched.
+  * When using any of the manual matching algorithms, paperless now logs messages about when and why these matching algorithms matched.
+  * The default settings for parallelization in paperless were adjusted to always leave one CPU core free.
 
 * Fixes
 
   * An issue with the tika parser not picking up files from the consumption directory was fixed.
-  * A couple changes to the dark mode and fixes to lots of layout issues.
-  * An issue with the drop downs for correspondents, tags and types not properly supporting filtering with special characters was fixes.
+  * A couple changes to the dark mode and fixes to several other layout issues.
+  * An issue with the drop downs for correspondents, tags and types not properly supporting filtering with special characters was fixed.
   * Fixed an issue with filenames of downloaded files: Dates where off by one day due to timezone issues.
   * Searching will continue to work even when the index returns non-existing documents. This resulted in "Document does not exist" errors
     before. Instead, a warning is logged, indicating the issue.

From f5be2ac4bb2579a8e7203df39aa35f4bba804da3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 02:09:06 +0100
Subject: [PATCH 0868/1300] a couple changes to the documentation

---
 docs/extending.rst | 16 +++++-----------
 docs/faq.rst       |  8 ++++----
 docs/setup.rst     |  7 ++++++-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/docs/extending.rst b/docs/extending.rst
index 28da1f56b..b2ddf3d85 100644
--- a/docs/extending.rst
+++ b/docs/extending.rst
@@ -25,8 +25,9 @@ This section describes the steps you need to take to start development on paperl
 
     *   Python 3.6.
     *   All dependencies listed in the :ref:`Bare metal route <setup-bare_metal>`
-    *   redis. You can either install redis or use the included scritps/start-redis.sh
-        to use docker to fire up a redis instance.
+    *   redis. You can either install redis or use the included scritps/start-services.sh
+        to use docker to fire up a redis instance (and some other services such as tika,
+        gotenberg and a postgresql server).
 
 Back end development
 ====================
@@ -38,7 +39,7 @@ Install the python dependencies by performing ``pipenv install --dev`` in the sr
 This will also create a virtual environment, which you can enter with ``pipenv shell`` or
 execute one-shot commands in with ``pipenv run``.
 
-In ``src/paperless.conf``, enable debug mode.
+Copy ``paperless.conf.example`` to ``paperless.conf`` and enable debug mode.
 
 Configure the IDE to use the src/ folder as the base source folder. Configure the following
 launch configurations in your IDE:
@@ -102,18 +103,11 @@ In order to build the front end and serve it as part of django, execute
 
 .. code:: shell-session
 
-    $ ng build --prod --output-path ../src/documents/static/frontend/
+    $ ng build --prod
 
 This will build the front end and put it in a location from which the Django server will serve
 it as static content. This way, you can verify that authentication is working.
 
-Making a release
-================
-
-Execute the ``make-release.sh <ver>`` script.
-
-This will test and assemble everything and also build and tag a docker image.
-
 
 Extending Paperless
 ===================
diff --git a/docs/faq.rst b/docs/faq.rst
index d9efddd0f..e41f9aace 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -52,6 +52,8 @@ out of that folder to use them elsewhere. Here are a couple notes about that.
 *   PDF documents, PNG images, JPEG images, TIFF images and GIF images are processed with OCR and converted into PDF documents.
 *   Plain text documents are supported as well and are added verbatim
     to paperless.
+*   With the optional Tika integration enabled (see :ref:`Configuration <configuration-tika>`), Paperless also supports various
+    Office documents (.docx, .doc, odt, .ppt, .pptx, .odp, .xls, .xlsx, .ods).
 
 Paperless determines the type of a file by inspecting its content. The
 file extensions do not matter.
@@ -73,10 +75,8 @@ in your browser and paperless has to do much less work to serve the data.
 
 **Q:** *How do I install paperless-ng on Raspberry Pi?*
 
-**A:** There is no docker image for ARM available. If you know how to build
-that automatically, I'm all ears. For now, you have to grab the latest release
-archive from the project page and build the image yourself. The release comes
-with the front end already compiled, so you don't have to do this on the Pi.
+**A:** Docker images are available for arm and arm64 hardware, so just follow
+the docker-compose instructions, or go the bare metal route.
 
 **Q:** *How do I run this on unRaid?*
 
diff --git a/docs/setup.rst b/docs/setup.rst
index 1e46608ae..90df55969 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -232,8 +232,9 @@ writing. Windows is not and will never be supported.
     *   ``optipng`` for optimizing thumbnails
     *   ``gnupg`` for handling encrypted documents
     *   ``libpoppler-cpp-dev`` for PDF to text conversion
-    *   ``libmagic-dev`` for mime type detection
     *   ``libpq-dev`` for PostgreSQL
+    *   ``libmagic-dev`` for mime type detection
+    *   ``mime-support`` for mime type detection
 
     These dependencies are required for OCRmyPDF, which is used for text recognition.
 
@@ -248,6 +249,10 @@ writing. Windows is not and will never be supported.
     *   ``tesseract-ocr`` >= 4.0.0 for OCR
     *   ``tesseract-ocr`` language packs (``tesseract-ocr-eng``, ``tesseract-ocr-deu``, etc)
 
+    On Raspberry Pi, these libraries are required as well:
+
+    *   ``libatlas-base-dev``
+
     You will also need ``build-essential``, ``python3-setuptools`` and ``python3-wheel``
     for installing some of the python dependencies.
 

From 769356733ad05a047d465b626ed81a0893a57cea Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 12:59:39 +0100
Subject: [PATCH 0869/1300] update docker compose files and documentation #339

---
 docker-compose.example.env                    | 34 -------
 docker-compose.postgres.yml                   | 44 ---------
 docker-compose.sqlite-tika.yml                | 45 ----------
 docker-compose.sqlite.yml                     | 31 -------
 docker/{hub => compose}/.env                  |  0
 docker/{hub => compose}/docker-compose.env    |  0
 .../compose/docker-compose.postgres-tika.yml  | 90 +++++++++++++++++++
 docker/compose/docker-compose.postgres.yml    | 72 +++++++++++++++
 docker/compose/docker-compose.sqlite-tika.yml | 78 ++++++++++++++++
 docker/compose/docker-compose.sqlite.yml      | 56 ++++++++++++
 docker/hub/docker-compose.postgres.yml        | 44 ---------
 docker/hub/docker-compose.sqlite-tika.yml     | 45 ----------
 docker/hub/docker-compose.sqlite.yml          | 31 -------
 docs/administration.rst                       |  9 +-
 docs/changelog.rst                            |  7 +-
 docs/setup.rst                                | 32 +++++--
 16 files changed, 330 insertions(+), 288 deletions(-)
 delete mode 100644 docker-compose.example.env
 delete mode 100644 docker-compose.postgres.yml
 delete mode 100644 docker-compose.sqlite-tika.yml
 delete mode 100644 docker-compose.sqlite.yml
 rename docker/{hub => compose}/.env (100%)
 rename docker/{hub => compose}/docker-compose.env (100%)
 create mode 100644 docker/compose/docker-compose.postgres-tika.yml
 create mode 100644 docker/compose/docker-compose.postgres.yml
 create mode 100644 docker/compose/docker-compose.sqlite-tika.yml
 create mode 100644 docker/compose/docker-compose.sqlite.yml
 delete mode 100644 docker/hub/docker-compose.postgres.yml
 delete mode 100644 docker/hub/docker-compose.sqlite-tika.yml
 delete mode 100644 docker/hub/docker-compose.sqlite.yml

diff --git a/docker-compose.example.env b/docker-compose.example.env
deleted file mode 100644
index e9e8ecb06..000000000
--- a/docker-compose.example.env
+++ /dev/null
@@ -1,34 +0,0 @@
-# The UID and GID of the user used to run paperless in the container. Set this
-# to your UID and GID on the host so that you have write access to the
-# consumption directory.
-#USERMAP_UID=1000
-#USERMAP_GID=1000
-
-# Additional languages to install for text recognition, separated by a
-# whitespace. Note that this is
-# different from PAPERLESS_OCR_LANGUAGE (default=eng), which defines the
-# language used for OCR.
-# The container installs English, German, Italian, Spanish and French by
-# default.
-# See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster
-# for available languages.
-#PAPERLESS_OCR_LANGUAGES=tur ces
-
-###############################################################################
-# Paperless-specific settings                                                 #
-###############################################################################
-
-# All settings defined in the paperless.conf.example can be used here. The
-# Docker setup does not use the configuration file.
-# A few commonly adjusted settings are provided below.
-
-# Adjust this key if you plan to make paperless available publicly. It should
-# be a very long sequence of random characters. You don't need to remember it.
-#PAPERLESS_SECRET_KEY=change-me
-
-# Use this variable to set a timezone for the Paperless Docker containers. If not specified, defaults to UTC.
-#PAPERLESS_TIME_ZONE=America/Los_Angeles
-
-# The default language to use for OCR. Set this to the language most of your
-# documents are written in.
-#PAPERLESS_OCR_LANGUAGE=eng
diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml
deleted file mode 100644
index 53fea9e28..000000000
--- a/docker-compose.postgres.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-version: "3.4"
-services:
-  broker:
-    image: redis:6.0
-    restart: unless-stopped
-
-  db:
-    image: postgres:13
-    restart: unless-stopped
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    environment:
-      POSTGRES_DB: paperless
-      POSTGRES_USER: paperless
-      POSTGRES_PASSWORD: paperless
-
-  webserver:
-    build: .
-    restart: unless-stopped
-    depends_on:
-      - db
-      - broker
-    ports:
-      - 8000:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-      - ./export:/usr/src/paperless/export
-      - ./consume:/usr/src/paperless/consume
-    env_file: docker-compose.env
-    environment:
-      PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_DBHOST: db
-
-
-volumes:
-  data:
-  media:
-  pgdata:
diff --git a/docker-compose.sqlite-tika.yml b/docker-compose.sqlite-tika.yml
deleted file mode 100644
index 5fbd6f224..000000000
--- a/docker-compose.sqlite-tika.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-version: "3.4"
-services:
-  broker:
-    image: redis:6.0
-    restart: unless-stopped
-
-  webserver:
-    build: .
-    restart: unless-stopped
-    depends_on:
-      - broker
-      - gotenberg
-      - tika
-    ports:
-      - 8000:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-      - ./export:/usr/src/paperless/export
-      - ./consume:/usr/src/paperless/consume
-    env_file: docker-compose.env
-    environment:
-      PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_TIKA_ENABLED: 1
-      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
-      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
-
-  gotenberg:
-    image: thecodingmachine/gotenberg
-    restart: unless-stopped
-    environment:
-      DISABLE_GOOGLE_CHROME: 1
-
-  tika:
-    image: apache/tika
-    restart: unless-stopped
-
-volumes:
-  data:
-  media:
diff --git a/docker-compose.sqlite.yml b/docker-compose.sqlite.yml
deleted file mode 100644
index 87aa100a6..000000000
--- a/docker-compose.sqlite.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-version: "3.4"
-services:
-  broker:
-    image: redis:6.0
-    restart: unless-stopped
-
-  webserver:
-    build: .
-    restart: unless-stopped
-    depends_on:
-      - broker
-    ports:
-      - 8000:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-      - ./export:/usr/src/paperless/export
-      - ./consume:/usr/src/paperless/consume
-    env_file: docker-compose.env
-    environment:
-      PAPERLESS_REDIS: redis://broker:6379
-
-
-volumes:
-  data:
-  media:
diff --git a/docker/hub/.env b/docker/compose/.env
similarity index 100%
rename from docker/hub/.env
rename to docker/compose/.env
diff --git a/docker/hub/docker-compose.env b/docker/compose/docker-compose.env
similarity index 100%
rename from docker/hub/docker-compose.env
rename to docker/compose/docker-compose.env
diff --git a/docker/compose/docker-compose.postgres-tika.yml b/docker/compose/docker-compose.postgres-tika.yml
new file mode 100644
index 000000000..93fff4afc
--- /dev/null
+++ b/docker/compose/docker-compose.postgres-tika.yml
@@ -0,0 +1,90 @@
+# docker-compose file for running paperless from the Docker Hub.
+# This file contains everything paperless needs to run.
+# Paperless supports amd64, arm and arm64 hardware.
+#
+# All compose files of paperless configure paperless in the following way:
+#
+# - Paperless is (re)started on system boot, if it was running before shutdown.
+# - Docker volumes for storing data are managed by Docker.
+# - Folders for importing and exporting files are created in the same directory
+#   as this file and mounted to the correct folders inside the container.
+# - Paperless listens on port 8000.
+#
+# In addition to that, this docker-compose file adds the following optional
+# configurations:
+#
+# - Instead of SQLite (default), PostgreSQL is used as the database server.
+# - Apache Tika and Gotenberg servers are started with paperless and paperless
+#   is configured to use these services. These provide support for consuming
+#   Office documents (Word, Excel, Power Point and their LibreOffice counter-
+#   parts.
+#
+# To install and update paperless with this file, do the following:
+#
+# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
+#   and '.env' into a folder.
+# - Run 'docker-compose pull'.
+# - Run 'docker-compose run --rm webserver createsuperuser' to create a user.
+# - Run 'docker-compose up -d'.
+#
+# For more extensive installation and update instructions, refer to the
+# documentation.
+
+version: "3.4"
+services:
+  broker:
+    image: redis:6.0
+    restart: unless-stopped
+
+  db:
+    image: postgres:13
+    restart: unless-stopped
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: paperless
+      POSTGRES_USER: paperless
+      POSTGRES_PASSWORD: paperless
+
+  webserver:
+    image: jonaswinkler/paperless-ng:latest
+    restart: unless-stopped
+    depends_on:
+      - db
+      - broker
+      - gotenberg
+      - tika
+    ports:
+      - 8000:8000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - data:/usr/src/paperless/data
+      - media:/usr/src/paperless/media
+      - ./export:/usr/src/paperless/export
+      - ./consume:/usr/src/paperless/consume
+    env_file: docker-compose.env
+    environment:
+      PAPERLESS_REDIS: redis://broker:6379
+      PAPERLESS_DBHOST: db
+      PAPERLESS_TIKA_ENABLED: 1
+      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
+      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
+
+  gotenberg:
+    image: thecodingmachine/gotenberg
+    restart: unless-stopped
+    environment:
+      DISABLE_GOOGLE_CHROME: 1
+
+  tika:
+    image: apache/tika
+    restart: unless-stopped
+
+volumes:
+  data:
+  media:
+  pgdata:
diff --git a/docker/compose/docker-compose.postgres.yml b/docker/compose/docker-compose.postgres.yml
new file mode 100644
index 000000000..da33b4c25
--- /dev/null
+++ b/docker/compose/docker-compose.postgres.yml
@@ -0,0 +1,72 @@
+# docker-compose file for running paperless from the Docker Hub.
+# This file contains everything paperless needs to run.
+# Paperless supports amd64, arm and arm64 hardware.
+#
+# All compose files of paperless configure paperless in the following way:
+#
+# - Paperless is (re)started on system boot, if it was running before shutdown.
+# - Docker volumes for storing data are managed by Docker.
+# - Folders for importing and exporting files are created in the same directory
+#   as this file and mounted to the correct folders inside the container.
+# - Paperless listens on port 8000.
+#
+# In addition to that, this docker-compose file adds the following optional
+# configurations:
+#
+# - Instead of SQLite (default), PostgreSQL is used as the database server.
+#
+# To install and update paperless with this file, do the following:
+#
+# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
+#   and '.env' into a folder.
+# - Run 'docker-compose pull'.
+# - Run 'docker-compose run --rm webserver createsuperuser' to create a user.
+# - Run 'docker-compose up -d'.
+#
+# For more extensive installation and update instructions, refer to the
+# documentation.
+
+version: "3.4"
+services:
+  broker:
+    image: redis:6.0
+    restart: unless-stopped
+
+  db:
+    image: postgres:13
+    restart: unless-stopped
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: paperless
+      POSTGRES_USER: paperless
+      POSTGRES_PASSWORD: paperless
+
+  webserver:
+    image: jonaswinkler/paperless-ng:latest
+    restart: unless-stopped
+    depends_on:
+      - db
+      - broker
+    ports:
+      - 8000:8000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - data:/usr/src/paperless/data
+      - media:/usr/src/paperless/media
+      - ./export:/usr/src/paperless/export
+      - ./consume:/usr/src/paperless/consume
+    env_file: docker-compose.env
+    environment:
+      PAPERLESS_REDIS: redis://broker:6379
+      PAPERLESS_DBHOST: db
+
+
+volumes:
+  data:
+  media:
+  pgdata:
diff --git a/docker/compose/docker-compose.sqlite-tika.yml b/docker/compose/docker-compose.sqlite-tika.yml
new file mode 100644
index 000000000..5dfff0830
--- /dev/null
+++ b/docker/compose/docker-compose.sqlite-tika.yml
@@ -0,0 +1,78 @@
+# docker-compose file for running paperless from the Docker Hub.
+# This file contains everything paperless needs to run.
+# Paperless supports amd64, arm and arm64 hardware.
+#
+# All compose files of paperless configure paperless in the following way:
+#
+# - Paperless is (re)started on system boot, if it was running before shutdown.
+# - Docker volumes for storing data are managed by Docker.
+# - Folders for importing and exporting files are created in the same directory
+#   as this file and mounted to the correct folders inside the container.
+# - Paperless listens on port 8000.
+#
+# SQLite is used as the database. The SQLite file is stored in the data volume.
+#
+# In addition to that, this docker-compose file adds the following optional
+# configurations:
+#
+# - Apache Tika and Gotenberg servers are started with paperless and paperless
+#   is configured to use these services. These provide support for consuming
+#   Office documents (Word, Excel, Power Point and their LibreOffice counter-
+#   parts.
+#
+# To install and update paperless with this file, do the following:
+#
+# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
+#   and '.env' into a folder.
+# - Run 'docker-compose pull'.
+# - Run 'docker-compose run --rm webserver createsuperuser' to create a user.
+# - Run 'docker-compose up -d'.
+#
+# For more extensive installation and update instructions, refer to the
+# documentation.
+
+version: "3.4"
+services:
+  broker:
+    image: redis:6.0
+    restart: unless-stopped
+
+  webserver:
+    image: jonaswinkler/paperless-ng:latest
+    restart: unless-stopped
+    depends_on:
+      - broker
+      - gotenberg
+      - tika
+    ports:
+      - 8000:8000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - data:/usr/src/paperless/data
+      - media:/usr/src/paperless/media
+      - ./export:/usr/src/paperless/export
+      - ./consume:/usr/src/paperless/consume
+    env_file: docker-compose.env
+    environment:
+      PAPERLESS_REDIS: redis://broker:6379
+      PAPERLESS_TIKA_ENABLED: 1
+      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
+      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
+
+  gotenberg:
+    image: thecodingmachine/gotenberg
+    restart: unless-stopped
+    environment:
+      DISABLE_GOOGLE_CHROME: 1
+
+  tika:
+    image: apache/tika
+    restart: unless-stopped
+
+volumes:
+  data:
+  media:
diff --git a/docker/compose/docker-compose.sqlite.yml b/docker/compose/docker-compose.sqlite.yml
new file mode 100644
index 000000000..f49e1d1e9
--- /dev/null
+++ b/docker/compose/docker-compose.sqlite.yml
@@ -0,0 +1,56 @@
+# docker-compose file for running paperless from the Docker Hub.
+# This file contains everything paperless needs to run.
+# Paperless supports amd64, arm and arm64 hardware.
+#
+# All compose files of paperless configure paperless in the following way:
+#
+# - Paperless is (re)started on system boot, if it was running before shutdown.
+# - Docker volumes for storing data are managed by Docker.
+# - Folders for importing and exporting files are created in the same directory
+#   as this file and mounted to the correct folders inside the container.
+# - Paperless listens on port 8000.
+#
+# SQLite is used as the database. The SQLite file is stored in the data volume.
+#
+# To install and update paperless with this file, do the following:
+#
+# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
+#   and '.env' into a folder.
+# - Run 'docker-compose pull'.
+# - Run 'docker-compose run --rm webserver createsuperuser' to create a user.
+# - Run 'docker-compose up -d'.
+#
+# For more extensive installation and update instructions, refer to the
+# documentation.
+
+version: "3.4"
+services:
+  broker:
+    image: redis:6.0
+    restart: unless-stopped
+
+  webserver:
+    image: jonaswinkler/paperless-ng:latest
+    restart: unless-stopped
+    depends_on:
+      - broker
+    ports:
+      - 8000:8000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - data:/usr/src/paperless/data
+      - media:/usr/src/paperless/media
+      - ./export:/usr/src/paperless/export
+      - ./consume:/usr/src/paperless/consume
+    env_file: docker-compose.env
+    environment:
+      PAPERLESS_REDIS: redis://broker:6379
+
+
+volumes:
+  data:
+  media:
diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
deleted file mode 100644
index 863c99c32..000000000
--- a/docker/hub/docker-compose.postgres.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-version: "3.4"
-services:
-  broker:
-    image: redis:6.0
-    restart: unless-stopped
-
-  db:
-    image: postgres:13
-    restart: unless-stopped
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    environment:
-      POSTGRES_DB: paperless
-      POSTGRES_USER: paperless
-      POSTGRES_PASSWORD: paperless
-
-  webserver:
-    image: jonaswinkler/paperless-ng:latest
-    restart: unless-stopped
-    depends_on:
-      - db
-      - broker
-    ports:
-      - 8000:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-      - ./export:/usr/src/paperless/export
-      - ./consume:/usr/src/paperless/consume
-    env_file: docker-compose.env
-    environment:
-      PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_DBHOST: db
-
-
-volumes:
-  data:
-  media:
-  pgdata:
diff --git a/docker/hub/docker-compose.sqlite-tika.yml b/docker/hub/docker-compose.sqlite-tika.yml
deleted file mode 100644
index 5928438fb..000000000
--- a/docker/hub/docker-compose.sqlite-tika.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-version: "3.4"
-services:
-  broker:
-    image: redis:6.0
-    restart: unless-stopped
-
-  webserver:
-    image: jonaswinkler/paperless-ng:latest
-    restart: unless-stopped
-    depends_on:
-      - broker
-      - gotenberg
-      - tika
-    ports:
-      - 8000:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-      - ./export:/usr/src/paperless/export
-      - ./consume:/usr/src/paperless/consume
-    env_file: docker-compose.env
-    environment:
-      PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_TIKA_ENABLED: 1
-      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
-      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
-
-  gotenberg:
-    image: thecodingmachine/gotenberg
-    restart: unless-stopped
-    environment:
-      DISABLE_GOOGLE_CHROME: 1
-
-  tika:
-    image: apache/tika
-    restart: unless-stopped
-
-volumes:
-  data:
-  media:
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
deleted file mode 100644
index 2ab0cbb9c..000000000
--- a/docker/hub/docker-compose.sqlite.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-version: "3.4"
-services:
-  broker:
-    image: redis:6.0
-    restart: unless-stopped
-
-  webserver:
-    image: jonaswinkler/paperless-ng:latest
-    restart: unless-stopped
-    depends_on:
-      - broker
-    ports:
-      - 8000:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-      - ./export:/usr/src/paperless/export
-      - ./consume:/usr/src/paperless/consume
-    env_file: docker-compose.env
-    environment:
-      PAPERLESS_REDIS: redis://broker:6379
-
-
-volumes:
-  data:
-  media:
diff --git a/docs/administration.rst b/docs/administration.rst
index 80f57d849..32741300a 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -54,7 +54,7 @@ Updating Paperless
 ##################
 
 If a new release of paperless-ng is available, upgrading depends on how you
-installed paperless-ng in the first place. The releases are available at
+installed paperless-ng in the first place. The releases are available at the
 `release page <https://github.com/jonaswinkler/paperless-ng/releases>`_.
 
 First of all, ensure that paperless is stopped.
@@ -86,8 +86,8 @@ B.  If you built the image yourself, do the following:
         $ docker-compose up
 
 Running `docker-compose up` will also apply any new database migrations.
-If you see everything working, you can start paperless-ng with "-d" to have it
-run in the background.
+If you see everything working, press CTRL+C once to gracefully stop paperless.
+Then you can start paperless-ng with ``-d`` to have it run in the background.
 
 Updating paperless without docker
 =================================
@@ -109,6 +109,9 @@ After grabbing the new release and unpacking the contents, do the following:
 
     This creates a new virtual environment (or uses your existing environment)
     and installs all dependencies into it.
+
+    You can also use the included ``requirements.txt`` file instead and create the virtual
+    environment yourself. This file includes exactly the same dependencies.
     
 3.  Migrate the database.
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 78262cd98..29c899d40 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -18,11 +18,12 @@ update paperless.
 
 * Changes to docker installations and updates
 
-  * The ``-dockerfiles.tar.xz`` release archive is gone. Instead, simply grab the dockerfiles from ``/docker/hub`` in the repository
+  * The ``-dockerfiles.tar.xz`` release archive is gone. Instead, simply grab the docker files from ``/docker/compose`` in the repository
     if you wish to install paperless by pulling from the hub.
-  * The docker compose files in ``/docker/hub`` were changed to always use the ``latest`` version automatically. In order to do further
-    updated, simply do a ``docker-compose pull``. The documentation has been updated.
+  * The docker compose files in ``/docker/compose`` were changed to always use the ``latest`` version automatically. In order to do further
+    updates, simply do a ``docker-compose pull``. The documentation has been updated.
   * The docker compose files were changed to restart paperless on system boot only if it was running before shutdown.
+  * Documentation of the docker-compose files about what they do.
 
 * Changes to bare metal installations and updates
 
diff --git a/docs/setup.rst b/docs/setup.rst
index 90df55969..6eb597014 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -97,9 +97,10 @@ run the above mentioned components yourself.
 Install Paperless from Docker Hub
 =================================
 
-1.  Go to the `/docker/hub directory on the project page <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/hub>`_
+1.  Go to the `/docker/compose directory on the project page <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`_
     and download one of the ``docker-compose.*.yml`` files, depending on which database backend you
     want to use. Rename this file to `docker-compose.yml`.
+    If you want to enable optional support for Office documents, download a file with ``-tika`` in its name.
     Download the ``docker-compose.env`` file and the ``.env`` file as well and store them
     in the same directory.
 
@@ -197,13 +198,27 @@ Build the docker image yourself
 
     The master branch always reflects the latest stable version.
 
-2.  Copy one of the ``docker-compose.*.yml`` to ``docker-compose.yml``,
+2.  Copy one of the ``docker/compose/docker-compose.*.yml`` to ``docker-compose.yml`` in the root folder,
     depending on which database backend you want to use. Copy
-    ``docker-compose.env.example`` to ``docker-compose.env``.
+    ``docker-compose.env`` into the project root as well.
 
-3.  Run the `compile-frontend.sh` script. This requires `node` and `npm`.
+3.  In the ``docker-compose.yml`` file, find the line that instructs docker-compose to pull the paperless image from Docker Hub:
 
-4.  Follow steps 2 to 7 of :ref:`setup-docker_hub`. When asked to run
+    .. code:: yaml
+
+        webserver:
+            image: jonaswinkler/paperless-ng:latest
+    
+    and replace it with a line that instructs docker-compose to build the image from the current working directory instead:
+
+    .. code:: yaml
+
+        webserver:
+            build: .
+
+4.  Run the ``compile-frontend.sh`` script. This requires ``node`` and ``npm >= v15``.
+
+5.  Follow steps 2 to 7 of :ref:`setup-docker_hub`. When asked to run
     ``docker-compose up -d`` to start the containers, do
 
     .. code:: shell-session
@@ -252,6 +267,7 @@ writing. Windows is not and will never be supported.
     On Raspberry Pi, these libraries are required as well:
 
     *   ``libatlas-base-dev``
+    *   ``libxslt1-dev``
 
     You will also need ``build-essential``, ``python3-setuptools`` and ``python3-wheel``
     for installing some of the python dependencies.
@@ -409,8 +425,8 @@ Migration to paperless-ng is then performed in a few simple steps:
     paperless.
 
 3.  Download the latest release of paperless-ng. You can either go with the
-    docker-compose files from `here <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/hub>`_
-    or clone the repository to build the image yourself.
+    docker-compose files from `here <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`_
+    or clone the repository to build the image yourself (see :ref:`above <setup-docker_build>`).
     You can either replace your current paperless folder or put paperless-ng
     in a different location.
 
@@ -422,7 +438,7 @@ Migration to paperless-ng is then performed in a few simple steps:
         will migrate your existing data. After that, your old paperless installation
         will be incompatible with the migrated volumes.
 
-4.  Copy the ``docker-compose.sqlite.yml`` file to ``docker-compose.yml``.
+4.  Download the ``docker-compose.sqlite.yml`` file to ``docker-compose.yml``.
     If you want to switch to PostgreSQL, do that after you migrated your existing
     SQLite database.
 

From a008dff368e9615db2df6c06d4ff45bfc324c812 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 13:35:21 +0100
Subject: [PATCH 0870/1300] configuration option for type of PDF viewer fixes
 #337

---
 src-ui/messages.xlf                           | 159 ++++++++++--------
 src-ui/src/app/app.module.ts                  |   4 +-
 .../document-detail.component.html            |  13 +-
 .../document-detail.component.scss            |   5 +-
 .../document-detail.component.ts              |   8 +-
 .../manage/settings/settings.component.html   |  18 +-
 .../manage/settings/settings.component.ts     |  10 +-
 src-ui/src/app/pipes/safe.pipe.spec.ts        |   8 +
 src-ui/src/app/pipes/safe.pipe.ts             |  19 +++
 src-ui/src/app/services/settings.service.ts   |   6 +-
 src/paperless/settings.py                     |   6 +
 11 files changed, 165 insertions(+), 91 deletions(-)
 create mode 100644 src-ui/src/app/pipes/safe.pipe.spec.ts
 create mode 100644 src-ui/src/app/pipes/safe.pipe.ts

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 9cc39b30a..9b6324a76 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -34,28 +34,28 @@
         <source>Select none</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9" datatype="html">
         <source>Select page</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">12</context>
+          <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
       <trans-unit id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74" datatype="html">
         <source>Select all</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="ec97f67072a83aaa972536b18d83179f6e4bbec9" datatype="html">
-        <source>Sort by</source>
+      <trans-unit id="5d43539fc358c3a548b9d487be821db73e2702ff" datatype="html">
+        <source>Sort</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit id="b7641aed03492978b4ec6843b1e53f30464294d9" datatype="html">
@@ -83,98 +83,98 @@
         <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9" datatype="html">
         <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bb91083b44e3f77dd68de773ceab467ca3d57507" datatype="html">
         <source>(filtered)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ca0b795795658155d44ddca02e95f1feeeb4a88f" datatype="html">
         <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">107</context>
+          <context context-type="linenumber">105</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">113</context>
+          <context context-type="linenumber">111</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">119</context>
+          <context context-type="linenumber">117</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">125</context>
+          <context context-type="linenumber">123</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">131</context>
+          <context context-type="linenumber">129</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">137</context>
+          <context context-type="linenumber">135</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">186</context>
+          <context context-type="linenumber">192</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">187</context>
+          <context context-type="linenumber">193</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">188</context>
+          <context context-type="linenumber">194</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">190</context>
+          <context context-type="linenumber">196</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">197</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7" datatype="html">
@@ -475,21 +475,21 @@
         <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/>&quot; deleted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5647210819299459618" datatype="html">
         <source>Settings saved successfully.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">68</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8488620293789898901" datatype="html">
         <source>Error while storing settings on server: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">80</context>
         </context-group>
       </trans-unit>
       <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
@@ -510,7 +510,7 @@
         <source>Saved views</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">64</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13" datatype="html">
@@ -527,81 +527,102 @@
           <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="c4435e56bf0289e78fedc462f1d21fb30b9de55d" datatype="html">
+        <source>Document editor</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4903e521c9bfd11ce88e7a5575106ef638912e0d" datatype="html">
+        <source>Use PDF viewer provided by the browser</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d7db07023e53f8396d18d375c2b78c25fc81c197" datatype="html">
+        <source>This is usually faster for displaying large PDF documents, but it might not work on some browsers.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff" datatype="html">
         <source>Dark mode</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit>
       <trans-unit id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637" datatype="html">
         <source>Use system settings</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">36</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="3863a86cd9e69a61d143d3daf51df44203df4a82" datatype="html">
-        <source>Bulk editing</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">44</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586" datatype="html">
-        <source>Show confirmation dialogs</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a" datatype="html">
-        <source>Deleting documents will always ask for confirmation.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="8cfddc13e04f5545ac63f419ef363505d6f78c2e" datatype="html">
-        <source>Apply on close</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">47</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8ee474504043fa89821d626e4f3413240fa91b53" datatype="html">
         <source>Enable dark mode</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">39</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3863a86cd9e69a61d143d3daf51df44203df4a82" datatype="html">
+        <source>Bulk editing</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586" datatype="html">
+        <source>Show confirmation dialogs</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a" datatype="html">
+        <source>Deleting documents will always ask for confirmation.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8cfddc13e04f5545ac63f419ef363505d6f78c2e" datatype="html">
+        <source>Apply on close</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">57</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8cb90334f5dfd7fc67205085f59381e2a334ccfc" datatype="html">
         <source>Appears on</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5" datatype="html">
         <source>Show on dashboard</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">79</context>
         </context-group>
       </trans-unit>
       <trans-unit id="541bfc5b123b3f8867fd681eaceefb663a811973" datatype="html">
         <source>Show in sidebar</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit id="abba764a7a595d04dc8c3b26e04b3780d4fdb540" datatype="html">
         <source>No saved views defined.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">93</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ef60a738a565f498b858e903e42bc5ffc3cc1299" datatype="html">
@@ -910,28 +931,28 @@
         <source>Filter correspondents</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit id="0ad509732aaf702b7ea8c771c7809fa84bc85908" datatype="html">
         <source>Filter document types</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2d9d55f1b70142ff4597ba32179d16888fd9c6b2" datatype="html">
         <source>Reset filters</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">47</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7593728289020204896" datatype="html">
         <source>Not assigned</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">166</context>
         </context-group>
         <note priority="1" from="description">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
       </trans-unit>
@@ -939,7 +960,7 @@
         <source>Apply</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4873149362496451858" datatype="html">
@@ -1002,7 +1023,7 @@
         <source>Created: <x id="INTERPOLATION" equiv-text="{{document.created | date}}"/></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">65</context>
+          <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8" datatype="html">
@@ -1023,7 +1044,7 @@
         <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">61</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2840db547019ce8c76b2cdbe3a1653c5b68b06af" datatype="html">
@@ -1187,21 +1208,21 @@
         <source>Select:</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit id="dfc3c34e182ea73c5d784ff7c8135f087992dac1" datatype="html">
         <source>All</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit id="907df6a2b68daecc3c399cf40a764b358bd9fd84" datatype="html">
         <source>Edit:</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
       <trans-unit id="27d158b47717ff9305d19866960418c603f19d55" datatype="html">
diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 8cd28b6fc..30411c980 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -58,6 +58,7 @@ import { MetadataCollapseComponent } from './components/document-detail/metadata
 import { SelectDialogComponent } from './components/common/select-dialog/select-dialog.component';
 import { NgSelectModule } from '@ng-select/ng-select';
 import { NumberComponent } from './components/common/input/number/number.component';
+import { SafePipe } from './pipes/safe.pipe';
 
 @NgModule({
   declarations: [
@@ -106,7 +107,8 @@ import { NumberComponent } from './components/common/input/number/number.compone
     DocumentTitlePipe,
     MetadataCollapseComponent,
     SelectDialogComponent,
-    NumberComponent
+    NumberComponent,
+    SafePipe
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index d3d736aa2..7d5e93fbe 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -1,5 +1,5 @@
 <app-page-header [(title)]="title">
-    <div class="input-group input-group-sm mr-5 d-none d-md-flex" *ngIf="getContentType() == 'application/pdf'">
+    <div class="input-group input-group-sm mr-5 d-none d-md-flex" *ngIf="getContentType() == 'application/pdf' && !useNativePdfViewer">
       <div class="input-group-prepend">
         <div class="input-group-text" i18n>Page</div>
       </div>
@@ -134,8 +134,13 @@
     </div>
 
     <div class="col-md-6 col-xl-8 mb-3">
-      <div class="pdf-viewer-container" *ngIf="getContentType() == 'application/pdf'">
-        <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="previewCurrentPage" [render-text-mode]="2" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer>
-      </div>
+        <ng-container *ngIf="getContentType() == 'application/pdf'">
+            <div class="preview-sticky pdf-viewer-container" *ngIf="!useNativePdfViewer ; else nativePdfViewer">
+                <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="previewCurrentPage" [render-text-mode]="2" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer>
+            </div>
+            <ng-template #nativePdfViewer>
+                <object [data]="previewUrl | safe" type="application/pdf" class="preview-sticky" width="100%"></object>
+            </ng-template>
+        </ng-container>     
     </div>
 </div>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.scss b/src-ui/src/app/components/document-detail/document-detail.component.scss
index 998653bab..346c9f4b0 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.scss
+++ b/src-ui/src/app/components/document-detail/document-detail.component.scss
@@ -1,6 +1,9 @@
-.pdf-viewer-container {
+.preview-sticky {
   height: calc(100vh - 160px);
   top: 70px;
   position: sticky;
+}
+
+.pdf-viewer-container {
   background-color: gray;
 }
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 4216b1854..aa2308eac 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -18,6 +18,7 @@ import { DocumentTypeEditDialogComponent } from '../manage/document-type-list/do
 import { PDFDocumentProxy } from 'ng2-pdf-viewer';
 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';
 
 @Component({
   selector: 'app-document-detail',
@@ -70,7 +71,12 @@ export class DocumentDetailComponent implements OnInit {
     private openDocumentService: OpenDocumentsService,
     private documentListViewService: DocumentListViewService,
     private documentTitlePipe: DocumentTitlePipe,
-    private toastService: ToastService) { }
+    private toastService: ToastService,
+    private settings: SettingsService) { }
+
+  get useNativePdfViewer(): boolean {
+    return this.settings.get(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER)
+  }
 
   getContentType() {
     return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 90ef0e6ec..cc4de9bf0 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -28,16 +28,24 @@
           </div>
         </div>
 
+        <div class="form-row form-group">
+          <div class="col-md-3 col-form-label">
+            <span i18n>Document editor</span>
+          </div>
+          <div class="col">
+
+            <app-input-check i18n-title title="Use PDF viewer provided by the browser" i18n-hint hint="This is usually faster for displaying large PDF documents, but it might not work on some browsers." formControlName="useNativePdfViewer"></app-input-check>
+
+          </div>
+        </div>
+
         <div class="form-row form-group">
           <div class="col-md-3 col-form-label">
             <span i18n>Dark mode</span>
           </div>
           <div class="col">
-            <app-input-check i18n-title title="Use system settings" formControlName="darkModeUseSystem" (change)="toggleDarkModeSetting()"></app-input-check>
-            <div class="custom-control custom-switch" *ngIf="!settingsForm.value.darkModeUseSystem">
-              <input type="checkbox" class="custom-control-input" id="darkModeEnabled" formControlName="darkModeEnabled" [checked]="settingsForm.value.darkModeEnabled">
-              <label class="custom-control-label" for="darkModeEnabled" i18n>Enable dark mode</label>
-            </div>
+            <app-input-check i18n-title title="Use system settings" formControlName="darkModeUseSystem"></app-input-check>
+            <app-input-check [hidden]="settingsForm.value.darkModeUseSystem" i18n-title title="Enable dark mode" formControlName="darkModeEnabled"></app-input-check>
           </div>
         </div>
 
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 559ffe00f..0e364e6c5 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -21,6 +21,7 @@ export class SettingsComponent implements OnInit {
     'documentListItemPerPage': new FormControl(this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)),
     'darkModeUseSystem': new FormControl(this.settings.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM)),
     'darkModeEnabled': new FormControl(this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED)),
+    'useNativePdfViewer': new FormControl(this.settings.get(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER)),
     'savedViews': this.savedViewGroup
   })
 
@@ -55,20 +56,13 @@ export class SettingsComponent implements OnInit {
     })
   }
 
-  toggleDarkModeSetting() {
-    if (this.settingsForm.value.darkModeUseSystem) {
-      (this.settingsForm.controls.darkModeEnabled as FormControl).disable()
-    } else {
-      (this.settingsForm.controls.darkModeEnabled as FormControl).enable()
-    }
-  }
-
   private saveLocalSettings() {
     this.settings.set(SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, this.settingsForm.value.bulkEditApplyOnClose)
     this.settings.set(SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS, this.settingsForm.value.bulkEditConfirmationDialogs)
     this.settings.set(SETTINGS_KEYS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
     this.settings.set(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, this.settingsForm.value.darkModeUseSystem)
     this.settings.set(SETTINGS_KEYS.DARK_MODE_ENABLED, (this.settingsForm.value.darkModeEnabled == true).toString())
+    this.settings.set(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, this.settingsForm.value.useNativePdfViewer)
     this.documentListViewService.updatePageSize()
     this.settings.updateDarkModeSettings()
     this.toastService.showInfo($localize`Settings saved successfully.`)
diff --git a/src-ui/src/app/pipes/safe.pipe.spec.ts b/src-ui/src/app/pipes/safe.pipe.spec.ts
new file mode 100644
index 000000000..49ee0ad14
--- /dev/null
+++ b/src-ui/src/app/pipes/safe.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { SafePipe } from './safe.pipe';
+
+describe('SafePipe', () => {
+  it('create an instance', () => {
+    const pipe = new SafePipe();
+    expect(pipe).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/pipes/safe.pipe.ts b/src-ui/src/app/pipes/safe.pipe.ts
new file mode 100644
index 000000000..6614964a9
--- /dev/null
+++ b/src-ui/src/app/pipes/safe.pipe.ts
@@ -0,0 +1,19 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { DomSanitizer } from '@angular/platform-browser';
+
+@Pipe({
+  name: 'safe'
+})
+export class SafePipe implements PipeTransform {
+
+  constructor(private sanitizer: DomSanitizer) { }
+
+  transform(url) {
+    if (url == null) {
+      return this.sanitizer.bypassSecurityTrustResourceUrl("")
+    } else {
+      return this.sanitizer.bypassSecurityTrustResourceUrl(url);
+    }
+  }
+
+} 
\ No newline at end of file
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index a8f85972d..eb533e118 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -12,7 +12,8 @@ export const SETTINGS_KEYS = {
   BULK_EDIT_APPLY_ON_CLOSE: 'general-settings:bulk-edit:apply-on-close',
   DOCUMENT_LIST_SIZE: 'general-settings:documentListSize',
   DARK_MODE_USE_SYSTEM: 'general-settings:dark-mode:use-system',
-  DARK_MODE_ENABLED: 'general-settings:dark-mode:enabled'
+  DARK_MODE_ENABLED: 'general-settings:dark-mode:enabled',
+  USE_NATIVE_PDF_VIEWER: 'general-settings:document-details:native-pdf-viewer'
 }
 
 const SETTINGS: PaperlessSettings[] = [
@@ -20,7 +21,8 @@ const SETTINGS: PaperlessSettings[] = [
   {key: SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, type: "boolean", default: false},
   {key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, type: "number", default: 50},
   {key: SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, type: "boolean", default: true},
-  {key: SETTINGS_KEYS.DARK_MODE_ENABLED, type: "boolean", default: false}
+  {key: SETTINGS_KEYS.DARK_MODE_ENABLED, type: "boolean", default: false},
+  {key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, type: "boolean", default: false}
 ]
 
 @Injectable({
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index fdc6df9f3..894ecb60b 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -179,6 +179,12 @@ if ENABLE_HTTP_REMOTE_USER:
         'rest_framework.authentication.RemoteUserAuthentication'
     )
 
+# X-Frame options for embedded PDF display:
+if DEBUG:
+    X_FRAME_OPTIONS = 'ANY'
+else:
+    X_FRAME_OPTIONS = 'SAMEORIGIN'
+
 # We allow CORS from localhost:8080
 CORS_ALLOWED_ORIGINS = tuple(os.getenv("PAPERLESS_CORS_ALLOWED_HOSTS", "http://localhost:8000").split(","))
 

From cd12c1b300b52cfccff46de28bcbc327fe4762e8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 13:36:45 +0100
Subject: [PATCH 0871/1300] dependencies

---
 src-ui/package-lock.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json
index 175dffad2..c3827f80c 100644
--- a/src-ui/package-lock.json
+++ b/src-ui/package-lock.json
@@ -6498,7 +6498,8 @@
     },
     "ini": {
       "version": "1.3.5",
-      "resolved": "",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
       "dev": true
     },
     "inquirer": {

From 24c20e38ff6c7503e09f5c032f15fd6f45686f8b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 14:04:09 +0100
Subject: [PATCH 0872/1300] changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 29c899d40..498c53301 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -41,6 +41,7 @@ update paperless.
     PDF/A documents.
   * When using any of the manual matching algorithms, paperless now logs messages about when and why these matching algorithms matched.
   * The default settings for parallelization in paperless were adjusted to always leave one CPU core free.
+  * Added an option to the frontend to choose which method to use for displaying PDF documents.
 
 * Fixes
 

From a2342d98d3d475fd0abf50a50585a9a56e0e2d4b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 14:08:48 +0100
Subject: [PATCH 0873/1300] fix release CI

---
 .github/workflows/ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 024c0f051..309b4688c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -152,11 +152,10 @@ jobs:
         run: |
           mkdir dist
           mkdir dist/paperless-ng
-          mkdir dist/paperless-ng/docker
           mkdir dist/paperless-ng/scripts
-          cp .dockerignore .env docker-compose.* Dockerfile Pipfile Pipfile.lock LICENSE README.md requirements.txt dist/paperless-ng/
+          cp .dockerignore .env Dockerfile Pipfile Pipfile.lock LICENSE README.md requirements.txt dist/paperless-ng/
           cp paperless.conf.example dist/paperless-ng/paperless.conf
-          cp docker/*.* dist/paperless-ng/docker/
+          cp docker/ dist/paperless-ng/docker -r
           cp scripts/*.service scripts/*.sh dist/paperless-ng/scripts/
           cp src/ dist/paperless-ng/src -r
           cp docs/_build/html/ dist/paperless-ng/docs -r

From c0692f03a347d3e1e6b2666c6fa804f73ea58e3c Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Thu, 14 Jan 2021 13:33:42 +0000
Subject: [PATCH 0874/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 170 +++++++++++++++++-------------
 1 file changed, 97 insertions(+), 73 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index 449b7493c..077f7c92e 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -38,7 +38,7 @@
         <target>Nichts auswählen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9">
@@ -46,7 +46,7 @@
         <target>Seite auswählen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">12</context>
+          <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74">
@@ -54,15 +54,15 @@
         <target>Alles auswählen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="ec97f67072a83aaa972536b18d83179f6e4bbec9">
-        <source>Sort by</source>
+      <trans-unit datatype="html" id="5d43539fc358c3a548b9d487be821db73e2702ff">
+        <source>Sort</source>
         <target>Sortieren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="b7641aed03492978b4ec6843b1e53f30464294d9">
@@ -94,7 +94,7 @@
         <target>{VAR_PLURAL, plural, =1 { <x id="INTERPOLATION"/> von 1 Dokumente ausgewählt} other {<x id="INTERPOLATION"/> von <x id="INTERPOLATION_1"/> Dokumente ausgewählt}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9">
@@ -102,7 +102,7 @@
         <target>{VAR_PLURAL, plural, =1 {Ein Dokument} other {<x id="INTERPOLATION"/> Dokumente}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bb91083b44e3f77dd68de773ceab467ca3d57507">
@@ -110,7 +110,7 @@
         <target>(gefiltert)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
@@ -118,7 +118,7 @@
         <target>ASN</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">105</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
@@ -126,7 +126,7 @@
         <target>Korrespondent</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">113</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
@@ -134,7 +134,7 @@
         <target>Titel</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">119</context>
+          <context context-type="linenumber">117</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
@@ -142,7 +142,7 @@
         <target>Dokumenttyp</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
@@ -150,7 +150,7 @@
         <target>Erstellt</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">131</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
@@ -158,7 +158,7 @@
         <target>Hinzugefügt</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">137</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9021887951960049161">
@@ -166,7 +166,7 @@
         <target>Löschen bestätigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">186</context>
+          <context context-type="linenumber">192</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
@@ -174,7 +174,7 @@
         <target>Möchten Sie das Dokument &quot;<x equiv-text="this.document.title" id="PH"/>&quot; wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">187</context>
+          <context context-type="linenumber">193</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6691075929777935948">
@@ -182,7 +182,7 @@
         <target>Die Dateien dieses Dokuments werden permanent gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">188</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="719892092227206532">
@@ -190,7 +190,7 @@
         <target>Dokument löschen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">190</context>
+          <context context-type="linenumber">196</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1844801255494293730">
@@ -198,7 +198,7 @@
         <target>Fehler beim Löschen des Dokuments: <x equiv-text="JSON.stringify(error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">197</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -542,7 +542,7 @@
         <target>Gespeicherte Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; gelöscht.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -550,7 +550,7 @@
         <target>Einstellungen erfolgreich gespeichert.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">68</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -558,7 +558,7 @@
         <target>Fehler beim Speichern der Einstellungen auf dem Server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">80</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -582,7 +582,7 @@
         <target>Gespeicherte Ansichten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">64</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
@@ -601,12 +601,36 @@
           <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="c4435e56bf0289e78fedc462f1d21fb30b9de55d">
+        <source>Document editor</source>
+        <target>Dokumenteditor</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4903e521c9bfd11ce88e7a5575106ef638912e0d">
+        <source>Use PDF viewer provided by the browser</source>
+        <target>Benutze PDF-Betrachter des Web Browsers</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d7db07023e53f8396d18d375c2b78c25fc81c197">
+        <source>This is usually faster for displaying large PDF documents, but it might not work on some browsers.</source>
+        <target>Der integrierte PDF-Betrachter des Web-Browsers ist in der Regel schneller bei der Anzeige besonders großer Dokumente, funktioniert aber nicht in allen Browsern.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
         <source>Dark mode</source>
         <target>Dunkler Modus</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
@@ -614,39 +638,7 @@
         <target>Benutze Systemeinstellungen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">36</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
-        <source>Bulk editing</source>
-        <target>Massenbearbeitung</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">44</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
-        <source>Show confirmation dialogs</source>
-        <target>Bestätigungsdialoge anzeigen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
-        <source>Deleting documents will always ask for confirmation.</source>
-        <target>Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
-        <source>Apply on close</source>
-        <target>Anwenden beim Schließen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">47</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8ee474504043fa89821d626e4f3413240fa91b53">
@@ -654,7 +646,39 @@
         <target>Dunklen Modus aktivieren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">39</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
+        <source>Bulk editing</source>
+        <target>Massenbearbeitung</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
+        <source>Show confirmation dialogs</source>
+        <target>Bestätigungsdialoge anzeigen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
+        <source>Deleting documents will always ask for confirmation.</source>
+        <target>Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
+        <source>Apply on close</source>
+        <target>Anwenden beim Schließen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">57</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -662,7 +686,7 @@
         <target>Erscheint auf</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -670,7 +694,7 @@
         <target>Auf Startseite zeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">79</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -678,7 +702,7 @@
         <target>In Seitenleiste zeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -686,7 +710,7 @@
         <target>Keine gespeicherten Ansichten vorhanden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">93</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -1039,7 +1063,7 @@
         <target>Korrespondenten filtern</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="0ad509732aaf702b7ea8c771c7809fa84bc85908">
@@ -1047,7 +1071,7 @@
         <target>Dokumenttypen filtern</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2d9d55f1b70142ff4597ba32179d16888fd9c6b2">
@@ -1055,7 +1079,7 @@
         <target>Filter zurücksetzen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">47</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7593728289020204896">
@@ -1063,7 +1087,7 @@
         <target>Nicht zugewiesen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">166</context>
         </context-group>
         <note from="description" priority="1">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
       </trans-unit>
@@ -1072,7 +1096,7 @@
         <target>Anwenden</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4873149362496451858">
@@ -1144,7 +1168,7 @@
         <target>Erstellt: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></target>
         <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">65</context>
+          <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8">
@@ -1168,7 +1192,7 @@
         <target>Relevanz:</target>
         <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">61</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2840db547019ce8c76b2cdbe3a1653c5b68b06af">
@@ -1355,7 +1379,7 @@
         <target>Auswählen:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="dfc3c34e182ea73c5d784ff7c8135f087992dac1">
@@ -1363,7 +1387,7 @@
         <target>Alle</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="907df6a2b68daecc3c399cf40a764b358bd9fd84">
@@ -1371,7 +1395,7 @@
         <target>Bearbeiten:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">

From 556e4f7430ced3d97b83369c47f7dd49c8ede516 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 14:38:08 +0100
Subject: [PATCH 0875/1300] update readme

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index a223ff9a1..12277ad65 100644
--- a/README.md
+++ b/README.md
@@ -56,8 +56,6 @@ For a complete list of changes from paperless, check out the [changelog](https:/
 
 - Make the front end nice (except mobile).
 - Fix whatever bugs I and you find.
-- Start using CI to build the app.
-- Simplify updates.
 - Make the documentation nice.
 
 ## Roadmap for versions beyond 1.0

From a4187b2b70aa84cec1a3c161a0d6d8e6c1002359 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 14:54:04 +0100
Subject: [PATCH 0876/1300] fix a test case

---
 src/documents/tests/test_admin.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/documents/tests/test_admin.py b/src/documents/tests/test_admin.py
index b280c43ea..6915f595d 100644
--- a/src/documents/tests/test_admin.py
+++ b/src/documents/tests/test_admin.py
@@ -5,12 +5,14 @@ from django.test import TestCase
 from django.utils import timezone
 
 from documents.admin import DocumentAdmin
-from documents.models import Document, Tag
+from documents.models import Document
+from documents.tests.utils import DirectoriesMixin
 
 
-class TestDocumentAdmin(TestCase):
+class TestDocumentAdmin(DirectoriesMixin, TestCase):
 
     def setUp(self) -> None:
+        super(TestDocumentAdmin, self).setUp()
         self.doc_admin = DocumentAdmin(model=Document, admin_site=AdminSite())
 
     @mock.patch("documents.admin.index.add_or_update_document")

From 6dae900d74e739a23b65d172827318311b20e4a7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 16:09:44 +0100
Subject: [PATCH 0877/1300] I hope this works!

---
 .readthedocs.yml      | 16 ++++++++++++++++
 docs/requirements.txt |  0
 2 files changed, 16 insertions(+)
 create mode 100644 .readthedocs.yml
 create mode 100644 docs/requirements.txt

diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 000000000..05a8e0c62
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,16 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  version: 3.7
+  install:
+    - requirements: docs/requirements.txt
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 000000000..e69de29bb

From 014859185c968565fd9413aa0edbda35551b0dab Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 17:24:36 +0100
Subject: [PATCH 0878/1300] fix up CI/CD: build docker image on tags, correct
 docker image version, correct release tag

---
 .github/workflows/ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 309b4688c..43fc3efa1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -205,7 +205,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ steps.get_version.outputs.version }}
+          tag_name: ng-${{ steps.get_version.outputs.version }}
           release_name: Paperless-ng ${{ steps.get_version.outputs.version }}
           draft: false
           prerelease: true
@@ -225,7 +225,7 @@ jobs:
 
   # build and push image to docker hub.
   build-docker-image:
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/tags/ng-*')
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/ng-'))
     runs-on: ubuntu-latest
     needs: [frontend, tests]
     steps:
@@ -236,8 +236,9 @@ jobs:
           VERSION=edge
           if [[ $GITHUB_REF == refs/tags/ng-* ]]; then
             VERSION=${GITHUB_REF#refs/tags/ng-}
-          fi
-          if [[ $GITHUB_REF == refs/heads/* ]]; then
+          elif [[ $GITHUB_REF == refs/heads/master ]]; then
+            VERSION=latest
+          elif [[ $GITHUB_REF == refs/heads/* ]]; then
             VERSION=${GITHUB_REF#refs/heads/}
           fi
           echo ::set-output name=version::${VERSION}

From 7cc3c739942f8eaa6f6200f8588f2384a5afc523 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 14 Jan 2021 10:56:30 -0800
Subject: [PATCH 0879/1300] Convert selection functions on cards to toggling,
 let service handle setting selected

Also because we need to capture mouseevents
---
 .../document-card-large.component.html                   | 4 ++--
 .../document-card-large/document-card-large.component.ts | 9 ++-------
 .../document-card-small.component.html                   | 4 ++--
 .../document-card-small/document-card-small.component.ts | 9 ++-------
 .../document-list/document-list.component.html           | 6 +++---
 .../components/document-list/document-list.component.ts  | 4 ++++
 src-ui/src/app/services/document-list-view.service.ts    | 3 +++
 7 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index 6f2742a8d..b4783ff24 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -1,11 +1,11 @@
 <div class="card mb-3 shadow-sm" [class.card-selected]="selected" [class.document-card]="selectable">
   <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">
-      <img [src]="getThumbUrl()" class="card-img doc-img border-right rounded-left" (click)="setSelected(selectable ? !selected : false)">
+      <img [src]="getThumbUrl()" class="card-img doc-img border-right rounded-left" (click)="toggleSelected.emit($event)">
 
       <div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
         <div class="custom-control custom-checkbox">
-          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="setSelected($event.target.checked)">
+          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (click)="toggleSelected.emit($event)">
           <label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
         </div>
       </div>
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
index e3bd4b7f7..f8bb9f518 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
@@ -15,16 +15,11 @@ export class DocumentCardLargeComponent implements OnInit {
   @Input()
   selected = false
 
-  setSelected(value: boolean) {
-    this.selected = value
-    this.selectedChange.emit(value)
-  }
-
   @Output()
-  selectedChange = new EventEmitter<boolean>()
+  toggleSelected = new EventEmitter()
 
   get selectable() {
-    return this.selectedChange.observers.length > 0
+    return this.toggleSelected.observers.length > 0
   }
 
   @Input()
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index c951bf281..192696a47 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,11 +1,11 @@
 <div class="col p-2 h-100">
   <div class="card h-100 shadow-sm document-card" [class.card-selected]="selected">
     <div class="border-bottom doc-img-container" [class.doc-img-background-selected]="selected">
-      <img class="card-img doc-img rounded-top" [src]="getThumbUrl()" (click)="setSelected(!selected)">
+      <img class="card-img doc-img rounded-top" [src]="getThumbUrl()" (click)="toggleSelected.emit($event)">
 
       <div class="border-right border-bottom bg-light p-1 rounded document-card-check">
         <div class="custom-control custom-checkbox">
-          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="setSelected($event.target.checked)">
+          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (click)="toggleSelected.emit($event)">
           <label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
         </div>
       </div>
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
index ed69c5c50..5db0e30c0 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
@@ -14,14 +14,9 @@ export class DocumentCardSmallComponent implements OnInit {
 
   @Input()
   selected = false
-
-  setSelected(value: boolean) {
-    this.selected = value
-    this.selectedChange.emit(value)
-  }
-
+  
   @Output()
-  selectedChange = new EventEmitter<boolean>()
+  toggleSelected = new EventEmitter()
 
   @Input()
   document: PaperlessDocument
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 612238215..86aacc031 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -90,7 +90,7 @@
 </div>
 
 <div *ngIf="displayMode == 'largeCards'">
-  <app-document-card-large [selected]="list.isSelected(d)" (selectedChange)="list.setSelected(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 [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>
 
@@ -138,7 +138,7 @@
     <tr *ngFor="let d of list.documents; trackBy: trackByDocumentId" [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)" (change)="list.setSelected(d, $event.target.checked)">
+          <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>
@@ -170,5 +170,5 @@
 </table>
 
 <div class="m-n2 row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'">
-  <app-document-card-small [selected]="list.isSelected(d)" (selectedChange)="list.setSelected(d, $event)"  [document]="d" *ngFor="let d of list.documents; trackBy: trackByDocumentId" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
+  <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>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index fda99eb8d..1243e6e8a 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -160,6 +160,10 @@ export class DocumentListComponent implements OnInit {
     this.filterRulesModified = modified
   }
 
+  toggleSelected(document: PaperlessDocument, event: Event): void {
+    this.list.toggleSelected(document)
+  }
+
   clickTag(tagID: number) {
     this.list.selectNone()
     setTimeout(() => {
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 1bbcca38e..a852eda55 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -255,6 +255,9 @@ export class DocumentListViewService {
     } else if (!value) {
       this.selected.delete(d.id)
     }
+  toggleSelected(d: PaperlessDocument): void {
+    if (this.selected.has(d.id)) this.selected.delete(d.id)
+    else this.selected.add(d.id)
   }
 
   constructor(private documentService: DocumentService, private settings: SettingsService, private router: Router) {

From db23a5cf3797497ffdf12d2624853b65e381b301 Mon Sep 17 00:00:00 2001
From: Fabian Koller <C0nsultant@users.noreply.github.com>
Date: Thu, 14 Jan 2021 20:21:34 +0100
Subject: [PATCH 0880/1300]  Fix ENV var name for user args in documentation

Follow-up to #214
---
 docs/configuration.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 9d14fba71..5edc003f6 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -267,7 +267,7 @@ PAPERLESS_OCR_IMAGE_DPI=<num>
     present in an image.
 
 
-PAPERLESS_OCR_USER_ARG=<json>
+PAPERLESS_OCR_USER_ARGS=<json>
     OCRmyPDF offers many more options. Use this parameter to specify any
     additional arguments you wish to pass to OCRmyPDF. Since Paperless uses
     the API of OCRmyPDF, you have to specify these in a format that can be

From 4fa1779ef3fb8b70c4d0d7c7e04984bef75bdd74 Mon Sep 17 00:00:00 2001
From: Fabian Koller <C0nsultant@users.noreply.github.com>
Date: Thu, 14 Jan 2021 21:14:46 +0100
Subject: [PATCH 0881/1300] Only provide legal cors allowed hosts in example

Addresses that do not carry a scheme cause errors on database migration.


SystemCheckError: System check identified some issues:

ERRORS:
?: (corsheaders.E013) Origin 'example.com' in CORS_ALLOWED_ORIGINS is missing scheme or netloc
    HINT: Add a scheme (e.g. https://) or netloc (e.g. example.com).
---
 paperless.conf.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paperless.conf.example b/paperless.conf.example
index 7e6185765..652a741b0 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -27,7 +27,7 @@
 
 #PAPERLESS_SECRET_KEY=change-me
 #PAPERLESS_ALLOWED_HOSTS=example.com,www.example.com
-#PAPERLESS_CORS_ALLOWED_HOSTS=localhost:8080,example.com,localhost:8000
+#PAPERLESS_CORS_ALLOWED_HOSTS=http://example.com,http://localhost:8000
 #PAPERLESS_FORCE_SCRIPT_NAME=
 #PAPERLESS_STATIC_URL=/static/
 #PAPERLESS_AUTO_LOGIN_USERNAME=

From c8b0674b93752ac73eeac47b50be6a91464f6505 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Thu, 14 Jan 2021 20:32:32 +0100
Subject: [PATCH 0882/1300] Update to 0.9.14

---
 ansible/defaults/main.yml | 71 +++++++++++++++++++++--------
 ansible/tasks/main.yml    | 95 +++++++++++++++++++++++++--------------
 2 files changed, 115 insertions(+), 51 deletions(-)

diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml
index d54bb855f..83047307d 100644
--- a/ansible/defaults/main.yml
+++ b/ansible/defaults/main.yml
@@ -1,5 +1,19 @@
 ---
-paperlessng_version: 0.9.13
+paperlessng_version: 0.9.14
+
+# Required services
+paperlessng_redis_host: localhost
+paperlessng_redis_port: 6379
+paperlessng_db_type: sqlite # or postgresql
+# Below entries only apply for paperlessng_db_type=='postgresql'
+paperlessng_db_host: localhost
+paperlessng_db_port: 5432
+paperlessng_db_name: paperlessng
+paperlessng_db_user: paperlessng
+paperlessng_db_pass: paperlessng
+paperlessng_db_sslmode: prefer
+
+# Paths and folders
 paperlessng_directory: /opt/paperless-ng
 paperlessng_consumption_dir: "{{ paperlessng_directory }}/consumption"
 paperlessng_data_dir: "{{ paperlessng_directory }}/data"
@@ -8,36 +22,57 @@ paperlessng_static_dir: "{{ paperlessng_directory }}/static"
 paperlessng_filename_format:
 paperlessng_virtualenv: "{{ paperlessng_directory }}/.venv"
 
+# Hosting & Security
+paperless_secret_key: PLEASECHANGETHISFORTHELOVEOFGOD
+paperless_allowed_hosts: "*"
+paperless_cors_allowed_hosts: http://localhost:8000
+paperless_force_script_name:
+paperless_static_url: /static/
+paperless_auto_login_username:
+paperless_cookie_prefix: ""
+paperless_enable_http_remote_user: False
+
+# OCR settings
 paperlessng_ocr_languages:
   - eng
-paperlessng_time_zone: Europe/Berlin
+paperlessng_ocr_mode: skip
+paperlessng_ocr_output_type: pdfa
+paperlessng_ocr_pages: 0
+paperlessng_ocr_image_dpi:
 # see https://ocrmypdf.readthedocs.io/en/latest/api.html#ocrmypdf.ocr
-paperlessng_ocrmypdf_args:
-  #- "deskew": true  # https://github.com/jonaswinkler/paperless-ng/issues/231
+paperlessng_ocr_user_args:
+  #- "deskew": True  # https://github.com/jonaswinkler/paperless-ng/issues/231
   - "optimize": 1
-paperlessng_use_jbig2enc: true
-paperlessng_big2enc_lossy: false
-paperlessng_tika_enabled: false
+paperlessng_use_jbig2enc: True
+paperlessng_big2enc_lossy: False
+
+# Tika settings
+paperlessng_tika_enabled: False
 paperlessng_tika_endpoint: http://localhost:9998
 paperlessng_tika_gotenberg_endpoint: http://localhost:3000
 
+# Software tweaks
+paperlessng_time_zone: Europe/Berlin
+paperlessng_consumer_polling: 0
+paperlessng_consumer_delete_duplicates: False
+paperlessng_consumer_recursive: False
+paperlessng_consumer_subdirs_as_tags: False
+paperlessng_optimize_thumbnails: True
+paperlessng_post_consume_script:
+paperlessng_filename_date_order:
+paperlessng_filename_parse_transforms:
+paperlessng_thumbnail_font_name: /usr/share/fonts/liberation/LiberationSerif-Regular.ttf
+paperlessng_ignore_dates: ""
+
+# Superuser settings
 paperlessng_superuser_name: paperlessng
 paperlessng_superuser_email: paperlessng@example.com
 paperlessng_superuser_password: paperlessng
 
+# System user settings
 paperlessng_system_user: paperlessng
 paperlessng_system_group: paperlessng
 
+# Webserver settings
 paperlessng_listen_address: 127.0.0.1
 paperlessng_listen_port: 8000
-
-paperlessng_redis_host: localhost
-paperlessng_redis_port: 6379
-
-paperlessng_db_type: sqlite # or postgresql
-# Below entries only apply for paperlessng_db_type=='postgresql'
-paperlessng_db_host: localhost
-paperlessng_db_port: 5432
-paperlessng_db_name: paperlessng
-paperlessng_db_user: paperlessng
-paperlessng_db_pass: paperlessng
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index c4ee8c875..beeee827c 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -9,26 +9,26 @@
     update_cache: yes
     pkg:
       # paperless-ng
-      - python3-dev
       - python3-pip
-      - gettext
+      - python3-dev
       - fonts-liberation
       - imagemagick
-      - unpaper
-      - ghostscript
       - optipng
-      - tesseract-ocr
       - gnupg
       - libpoppler-cpp-dev
-      - libmagic-dev
       - libpq-dev
+      - libmagic-dev
+      - mime-support
       # OCRmyPDF
+      - unpaper
+      - ghostscript
       - icc-profiles-free
       - qpdf
       - liblept5
       - libxml2
       - pngquant
       - zlib1g
+      - tesseract-ocr
       # dev
       - sudo
       - build-essential
@@ -154,7 +154,7 @@
     group: "{{ paperlessng_system_group }}"
     mode: "750"
   with_items:
-    - "{{ paperlessng_directory }}"  # ansible `copy:` does not set correct permissions on `dest:` for recursive copies
+    - "{{ paperlessng_directory }}"
     - "{{ paperlessng_consumption_dir }}"
     - "{{ paperlessng_data_dir }}"
     - "{{ paperlessng_media_root }}"
@@ -171,8 +171,10 @@
     regexp: "^#?{{ item.regexp }}="
     line: "{{ item.line }}"
   with_items:
+    # Required services
     - regexp: PAPERLESS_REDIS
       line: "PAPERLESS_REDIS=redis://{{ paperlessng_redis_host }}:{{ paperlessng_redis_port }}"
+    # Paths and folders
     - regexp: PAPERLESS_CONSUMPTION_DIR
       line: "PAPERLESS_CONSUMPTION_DIR={{ paperlessng_consumption_dir }}"
     - regexp: PAPERLESS_DATA_DIR
@@ -183,26 +185,65 @@
       line: "PAPERLESS_STATICDIR={{ paperlessng_static_dir }}"
     - regexp: PAPERLESS_FILENAME_FORMAT
       line: "PAPERLESS_FILENAME_FORMAT={{ paperlessng_filename_format }}"
+    # Hosting & Security
+    - regexp: PAPERLESS_SECRET_KEY
+      line: "PAPERLESS_SECRET_KEY={{ paperless_secret_key }}"
+    - regexp: PAPERLESS_ALLOWED_HOSTS
+      line: "PAPERLESS_ALLOWED_HOSTS={{ paperless_allowed_hosts }}"
+    - regexp: PAPERLESS_CORS_ALLOWED_HOSTS
+      line: "PAPERLESS_CORS_ALLOWED_HOSTS={{ paperless_cors_allowed_hosts }}"
+    - regexp: PAPERLESS_FORCE_SCRIPT_NAME
+      line: "PAPERLESS_FORCE_SCRIPT_NAME={{ paperless_force_script_name }}"
+    - regexp: PAPERLESS_STATIC_URL
+      line: "PAPERLESS_STATIC_URL={{ paperless_static_url }}"
+    - regexp: PAPERLESS_AUTO_LOGIN_USERNAME
+      line: "PAPERLESS_AUTO_LOGIN_USERNAME={{ paperless_auto_login_username }}"
+    - regexp: PAPERLESS_COOKIE_PREFIX
+      line: "PAPERLESS_COOKIE_PREFIX={{ paperless_cookie_prefix }}"
+    - regexp: PAPERLESS_ENABLE_HTTP_REMOTE_USER
+      line: "PAPERLESS_ENABLE_HTTP_REMOTE_USER={{ paperless_enable_http_remote_user }}"
+    # OCR settings
     - regexp: PAPERLESS_OCR_LANGUAGE
       line: "PAPERLESS_OCR_LANGUAGE={{ paperlessng_ocr_languages | join('+') }}"
+    - regexp: PAPERLESS_OCR_MODE
+      line: "PAPERLESS_OCR_MODE={{ paperlessng_ocr_mode }}"
+    - regexp: PAPERLESS_OCR_OUTPUT_TYPE
+      line: "PAPERLESS_OCR_OUTPUT_TYPE={{ paperlessng_ocr_output_type }}"
+    - regexp: PAPERLESS_OCR_PAGES
+      line: "PAPERLESS_OCR_PAGES={{ paperlessng_ocr_pages }}"
+    - regexp: PAPERLESS_OCR_IMAGE_DPI
+      line: "PAPERLESS_OCR_IMAGE_DPI={{ paperlessng_ocr_image_dpi }}"
     - regexp: PAPERLESS_OCR_USER_ARGS
-      line: "PAPERLESS_OCR_USER_ARGS={{ paperlessng_ocrmypdf_args | combine({'jbig2_lossy': true} if paperlessng_big2enc_lossy else {}) | to_json }}"
-    - regexp: PAPERLESS_TIME_ZONE
-      line: "PAPERLESS_TIME_ZONE={{ paperlessng_time_zone }}"
+      line: "PAPERLESS_OCR_USER_ARGS={{ paperlessng_ocr_user_args | combine({'jbig2_lossy': true} if paperlessng_big2enc_lossy else {}) | to_json }}"
+    # Tika settings
     - regexp: PAPERLESS_TIKA_ENABLED
       line: "PAPERLESS_TIKA_ENABLED={{ paperlessng_tika_enabled }}"
-  no_log: yes
-
-- name: configure paperless-ng [tika]
-  lineinfile:
-    path: "{{ paperlessng_directory }}/paperless.conf.template"
-    regexp: "^#?{{ item.regexp }}="
-    line: "'{{ item.line }}' if paperlessng_tika_enabled else '#{{ item.line }}'"
-  with_items:
     - regexp: PAPERLESS_TIKA_ENDPOINT
       line: "PAPERLESS_TIKA_ENDPOINT={{ paperlessng_tika_endpoint }}"
     - regexp: PAPERLESS_TIKA_GOTENBERG_ENDPOINT
       line: "PAPERLESS_TIKA_GOTENBERG_ENDPOINT={{ paperlessng_tika_endpoint }}"
+    # Software tweaks
+    - regexp: PAPERLESS_TIME_ZONE
+      line: "PAPERLESS_TIME_ZONE={{ paperlessng_time_zone }}"
+    - regexp: PAPERLESS_CONSUMER_POLLING
+      line: "PAPERLESS_CONSUMER_POLLING={{ paperlessng_consumer_polling }}"
+    - regexp: PAPERLESS_CONSUMER_DELETE_DUPLICATES
+      line: "PAPERLESS_CONSUMER_DELETE_DUPLICATES={{ paperlessng_consumer_delete_duplicates }}"
+    - regexp: PAPERLESS_CONSUMER_RECURSIVE
+      line: "PAPERLESS_CONSUMER_RECURSIVE={{ paperlessng_consumer_recursive }}"
+    - regexp: PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS
+      line: "PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS={{ paperlessng_consumer_subdirs_as_tags }}"
+    - regexp: PAPERLESS_OPTIMIZE_THUMBNAILS
+      line: "PAPERLESS_OPTIMIZE_THUMBNAILS={{ paperlessng_optimize_thumbnails }}"
+    - regexp: PAPERLESS_POST_CONSUME_SCRIPT
+      line: "PAPERLESS_POST_CONSUME_SCRIPT={{ paperlessng_post_consume_script }}"
+    - regexp: PAPERLESS_FILENAME_DATE_ORDER
+      line: "PAPERLESS_FILENAME_DATE_ORDER={{ paperlessng_filename_date_order }}"
+    - regexp: PAPERLESS_THUMBNAIL_FONT_NAME
+      line: "PAPERLESS_THUMBNAIL_FONT_NAME={{ paperlessng_thumbnail_font_name }}"
+    - regexp: PAPERLESS_IGNORE_DATES
+      line: "PAPERLESS_IGNORE_DATES={{ paperlessng_ignore_dates }}"
+  no_log: yes
 
 - name: configure paperless-ng database [sqlite]
   lineinfile:
@@ -228,6 +269,8 @@
       line: "PAPERLESS_DBUSER={{ paperlessng_db_user }}"
     - regexp: PAPERLESS_DBPASS
       line: "PAPERLESS_DBPASS={{ paperlessng_db_pass }}"
+    - regexp: PAPERLESS_DBSSLMODE
+      line: "PAPERLESS_DBSSLMODE={{ paperlessng_db_sslmode }}"
   when: paperlessng_db_type == 'postgresql'
   no_log: yes
 
@@ -258,15 +301,7 @@
     extra_args: --upgrade
   when: paperlessng_current_version.stdout != paperlessng_version | string
 
-- name: collect static files
-  become: yes
-  become_user: "{{ paperlessng_system_user }}"
-  command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py collectstatic --no-input"
-  when: paperlessng_current_version.stdout != paperlessng_version | string
-  register: static_files
-  changed_when: static_files.stdout is not match("0 static files copied .*")
-
-- name: create database schema
+- name: migrate database schema
   become: yes
   become_user: "{{ paperlessng_system_user }}"
   command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py migrate"
@@ -274,12 +309,6 @@
   register: database_schema
   changed_when: '"No migrations to apply." not in database_schema.stdout'
 
-- name: compile translations
-  become: yes
-  become_user: "{{ paperlessng_system_user }}"
-  command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py compilemessages"
-  when: paperlessng_current_version.stdout != paperlessng_version | string
-
 - name: configure paperless superuser
   become: yes
   become_user: "{{ paperlessng_system_user }}"

From cb94e15ba7cd9333b8f0b75eb91ad53fab350a74 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Thu, 14 Jan 2021 21:18:45 +0100
Subject: [PATCH 0883/1300] Update ansible README.md

---
 ansible/README.md | 108 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 92 insertions(+), 16 deletions(-)

diff --git a/ansible/README.md b/ansible/README.md
index 225dd44b9..6cd9e9f9b 100644
--- a/ansible/README.md
+++ b/ansible/README.md
@@ -1,38 +1,114 @@
-Role Name
-=========
+Ansible Role: paperless-ng
+==========================
 
-A brief description of the role goes here.
+Installs and configures paperless-ng EDMS on Debian/Ubuntu systems.
 
 Requirements
 ------------
 
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+No special system requirements. Ansible 2.7 or newer is required.
+
+Note that this role requires root access, so either run it in a playbook with a global `become: yes`, or invoke the role in your playbook like:
+
+    - hosts: all
+      roles:
+        - role: ansible
+          become: yes
 
 Role Variables
 --------------
 
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+Most configuration variables from paperless-ng itself are available and accept their respective arguments.
+Every `PAPERLESS_*` configuration varaible is lowercased and instead prefixed with `paperlessng_*` in `defaults/main.yml`.
+
+For a full listing including explainations and allowed values, see the current [documentation](https://paperless-ng.readthedocs.io/en/ng-0.9.14/configuration.html).
+
+Additional variables available in this role are listed below, along with default values:
+
+    paperlessng_version: 0.9.14
+
+The [release](https://github.com/jonaswinkler/paperless-ng/releases) archive version of paperless-ng to install.
+
+    paperlessng_redis_host: localhost
+    paperlessng_redis_port: 6379
+
+Seperate configuration values that combine into `PAPERLESS_REDIS`.
+
+    paperlessng_db_type: sqlite
+
+Database to use. Default is file-based SQLite.
+
+    paperlessng_db_host: localhost
+    paperlessng_db_port: 5432
+    paperlessng_db_name: paperlessng
+    paperlessng_db_user: paperlessng
+    paperlessng_db_pass: paperlessng
+    paperlessng_db_sslmode: prefer
+
+Database configuration (only applicable if `paperlessng_db_type == 'postgresql'`).
+
+    paperlessng_directory: /opt/paperless-ng
+
+Root directory paperless-ng is installed into.
+
+    paperlessng_virtualenv: "{{ paperlessng_directory }}/.venv"
+
+Directory used for the virtual environment for paperless-ng.
+
+    paperlessng_ocr_languages:
+      - eng
+
+List of OCR languages to install and configure (`apt search tesseract-ocr-*`).
+
+    paperlessng_use_jbig2enc: True
+
+Whether to install and use [jbig2enc](https://github.com/agl/jbig2enc) for OCRmyPDF.
+
+    paperlessng_big2enc_lossy: False
+
+Whether to use jbig2enc's lossy compression mode.
+
+    paperlessng_superuser_name: paperlessng
+    paperlessng_superuser_email: paperlessng@example.com
+    paperlessng_superuser_password: paperlessng
+
+Credentials of the initial superuser in paperless-ng.
+
+    paperlessng_system_user: paperlessng
+    paperlessng_system_group: paperlessng
+
+System user and group to run the paperless-ng services as (will be created if required).
+
+    paperlessng_listen_address: 127.0.0.1
+    paperlessng_listen_port: 8000
+
+Address and port for the paperless-ng service to listen on.
 
 Dependencies
 ------------
 
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+No ansible dependencies.
 
 Example Playbook
 ----------------
+`playbook.yml`:
 
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
-    - hosts: servers
+    - hosts: all
+      become: yes
+      vars_files:
+        - vars/main.yml
       roles:
-         - { role: username.rolename, x: 42 }
+        - ansible
 
-License
--------
+`vars/main.yml`:
 
-BSD
+    paperlessng_media_root: /mnt/media/smbshare
 
-Author Information
-------------------
+    paperlessng_db_type: postgresql
+    paperlessng_db_pass: PLEASEPROVIDEASTRONGPASSWORDHERE
 
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).
+    paperless_secret_key: AGAINPLEASECHANGETHISNOW
+
+    paperlessng_ocr_languages:
+      - eng
+      - deu

From 7562bdb218b01eada4f0347cf1edcee6bde6e4cb Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 14 Jan 2021 22:51:27 +0100
Subject: [PATCH 0884/1300] update the CI/CD scripts to not build and push
 docker images from master, update 'latest' version together with tagged
 releases.

---
 .github/workflows/ci.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43fc3efa1..4fadf260e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -225,7 +225,7 @@ jobs:
 
   # build and push image to docker hub.
   build-docker-image:
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/ng-'))
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/ng-'))
     runs-on: ubuntu-latest
     needs: [frontend, tests]
     steps:
@@ -233,15 +233,18 @@ jobs:
         name: Prepare
         id: prepare
         run: |
-          VERSION=edge
+          IMAGE_NAME=jonaswinkler/paperless-ng
           if [[ $GITHUB_REF == refs/tags/ng-* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/ng-}
-          elif [[ $GITHUB_REF == refs/heads/master ]]; then
-            VERSION=latest
+            TAGS=${IMAGE_NAME}:${GITHUB_REF#refs/tags/ng-},${IMAGE_NAME}:latest
+            INSPECT_TAG=${IMAGE_NAME}:latest
           elif [[ $GITHUB_REF == refs/heads/* ]]; then
-            VERSION=${GITHUB_REF#refs/heads/}
+            TAGS=${IMAGE_NAME}:${GITHUB_REF#refs/heads/}
+            INSPECT_TAG=${TAGS}
+          else
+            exit 1
           fi
-          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=inspect_tag::${INSPECT_TAG}
       -
         name: Checkout
         uses: actions/checkout@v2
@@ -279,10 +282,10 @@ jobs:
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: true
-          tags: jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
+          tags: ${{ steps.prepare.outputs.tags }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
       -
         name: Inspect image
         run: |
-          docker buildx imagetools inspect jonaswinkler/paperless-ng:${{ steps.prepare.outputs.version }}
+          docker buildx imagetools inspect ${{ steps.prepare.outputs.inspect_tag }}

From e6961d52875e14cf1231e32016f95ba8789af18b Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Thu, 14 Jan 2021 14:10:23 -0800
Subject: [PATCH 0885/1300] Allow range selection with shift

---
 .../document-list/document-list.component.ts  |  4 +--
 .../services/document-list-view.service.ts    | 29 ++++++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 1243e6e8a..a3ec2d664 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -160,8 +160,8 @@ export class DocumentListComponent implements OnInit {
     this.filterRulesModified = modified
   }
 
-  toggleSelected(document: PaperlessDocument, event: Event): void {
-    this.list.toggleSelected(document)
+  toggleSelected(document: PaperlessDocument, event: MouseEvent): void {
+    this.list.toggleSelected(document, event.shiftKey)
   }
 
   clickTag(tagID: number) {
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index a852eda55..407c81572 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -27,6 +27,7 @@ export class DocumentListViewService {
   currentPage = 1
   currentPageSize: number = this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)
   collectionSize: number
+  lastSelectedDocumentIndex: number
 
   /**
    * This is the current config for the document list. The service will always remember the last settings used for the document list.
@@ -108,6 +109,7 @@ export class DocumentListViewService {
           if (onFinish) {
             onFinish()
           }
+          this.lastSelectedDocumentIndex = null
           this.isReloading = false
         },
         error => {
@@ -218,6 +220,7 @@ export class DocumentListViewService {
 
   selectNone() {
     this.selected.clear()
+    this.lastSelectedDocumentIndex = null
   }
 
   reduceSelectionToFilter() {
@@ -249,15 +252,25 @@ export class DocumentListViewService {
     return this.selected.has(d.id)
   }
 
-  setSelected(d: PaperlessDocument, value: boolean) {
-    if (value) {
-      this.selected.add(d.id)
-    } else if (!value) {
-      this.selected.delete(d.id)
-    }
-  toggleSelected(d: PaperlessDocument): void {
-    if (this.selected.has(d.id)) this.selected.delete(d.id)
+  toggleSelected(d: PaperlessDocument, includeRange: boolean): void {
+    if (this.selected.has(d.id) && !includeRange) this.selected.delete(d.id)
     else this.selected.add(d.id)
+
+    if (includeRange && this.lastSelectedDocumentIndex !== null) {
+      const toIndex = this.documentIndexInCurrentView(d.id)
+      console.log('select from', this.lastSelectedDocumentIndex, 'to', toIndex);
+      this.documents.slice(Math.min(this.lastSelectedDocumentIndex, toIndex), Math.max(this.lastSelectedDocumentIndex, toIndex)).forEach(d => {
+        this.selected.add(d.id)
+      })
+    }
+
+    if (!includeRange || (includeRange && this.lastSelectedDocumentIndex == null)) {
+      this.lastSelectedDocumentIndex = this.documentIndexInCurrentView(d.id)
+    }
+  }
+
+  documentIndexInCurrentView(documentID: number): number {
+    return this.documents.map(d => d.id).indexOf(documentID)
   }
 
   constructor(private documentService: DocumentService, private settings: SettingsService, private router: Router) {

From 4b42c97d0a1318ab349bc32545ec3bf16eb86fda Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 15 Jan 2021 01:10:01 -0800
Subject: [PATCH 0886/1300] Allow select anywhere in tr or card

---
 .../document-card-large.component.html               | 10 +++++-----
 .../document-card-small.component.html               | 12 ++++++------
 .../document-list/document-list.component.html       |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index b4783ff24..c2ea9980b 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -1,11 +1,11 @@
-<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" (click)="this.toggleSelected.emit($event)">
   <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">
-      <img [src]="getThumbUrl()" class="card-img doc-img border-right rounded-left" (click)="toggleSelected.emit($event)">
+      <img [src]="getThumbUrl()" class="card-img doc-img border-right rounded-left">
 
       <div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
         <div class="custom-control custom-checkbox">
-          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (click)="toggleSelected.emit($event)">
+          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (click)="this.toggleSelected.emit($event)">
           <label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
         </div>
       </div>
@@ -17,11 +17,11 @@
         <div class="d-flex justify-content-between align-items-center">
           <h5 class="card-title">
             <ng-container *ngIf="document.correspondent">
-              <a *ngIf="clickCorrespondent.observers.length ; else nolink" [routerLink]="" title="Filter by correspondent" i18n-title (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>
+              <a *ngIf="clickCorrespondent.observers.length ; else nolink" [routerLink]="" title="Filter by correspondent" i18n-title (click)="clickCorrespondent.emit(document.correspondent);$event.stopPropagation()" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>
               <ng-template #nolink>{{(document.correspondent$ | async)?.name}}</ng-template>:
             </ng-container>
             {{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)" [clickable]="clickTag.observers.length"></app-tag>
+            <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>
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 192696a47..4f11b2a98 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,18 +1,18 @@
 <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" (click)="this.toggleSelected.emit($event)">
     <div class="border-bottom doc-img-container" [class.doc-img-background-selected]="selected">
-      <img class="card-img doc-img rounded-top" [src]="getThumbUrl()" (click)="toggleSelected.emit($event)">
+      <img class="card-img doc-img rounded-top" [src]="getThumbUrl()">
 
       <div class="border-right border-bottom bg-light p-1 rounded document-card-check">
         <div class="custom-control custom-checkbox">
-          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (click)="toggleSelected.emit($event)">
+          <input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (click)="this.toggleSelected.emit($event)">
           <label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
         </div>
       </div>
 
       <div style="top: 0; right: 0; font-size: large" class="text-right position-absolute mr-1">
         <div *ngFor="let t of getTagsLimited$() | async">
-          <app-tag [tag]="t" (click)="clickTag.emit(t.id)" [clickable]="true" linkTitle="Filter by tag" i18n-linkTitle></app-tag>
+          <app-tag [tag]="t" (click)="clickTag.emit(t.id);$event.stopPropagation()" [clickable]="true" linkTitle="Filter by tag" i18n-linkTitle></app-tag>
         </div>
         <div *ngIf="moreTags">
           <span class="badge badge-secondary">+ {{moreTags}}</span>
@@ -23,7 +23,7 @@
     <div class="card-body p-2">
       <p class="card-text">
         <ng-container *ngIf="document.correspondent">
-          <a [routerLink]="" title="Filter by correspondent" i18n-title (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>:
+          <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>
       </p>
@@ -43,7 +43,7 @@
               <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
             </svg>
           </a>
-          <a [href]="getDownloadUrl()" class="btn btn-sm btn-outline-secondary" title="Download" i18n-title>
+          <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"/>
               <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"/>
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 86aacc031..18f39bfb5 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -135,7 +135,7 @@
       i18n>Added</th>
   </thead>
   <tbody>
-    <tr *ngFor="let d of list.documents; trackBy: trackByDocumentId" [ngClass]="list.isSelected(d) ? 'table-row-selected' : ''">
+    <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)">
@@ -147,7 +147,7 @@
       </td>
       <td class="d-none d-md-table-cell">
         <ng-container *ngIf="d.correspondent">
-          <a [routerLink]="" (click)="clickCorrespondent(d.correspondent)" title="Filter by correspondent">{{(d.correspondent$ | async)?.name}}</a>
+          <a [routerLink]="" (click)="clickCorrespondent(d.correspondent);$event.stopPropagation()" title="Filter by correspondent">{{(d.correspondent$ | async)?.name}}</a>
         </ng-container>
       </td>
       <td>
@@ -156,7 +156,7 @@
       </td>
       <td class="d-none d-xl-table-cell">
         <ng-container *ngIf="d.document_type">
-          <a [routerLink]="" (click)="clickDocumentType(d.document_type)" title="Filter by document type">{{(d.document_type$ | async)?.name}}</a>
+          <a [routerLink]="" (click)="clickDocumentType(d.document_type);$event.stopPropagation()" title="Filter by document type">{{(d.document_type$ | async)?.name}}</a>
         </ng-container>
       </td>
       <td>

From 8d433ac0deb4a882e07296bf8844a3fd0019acdd Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Fri, 15 Jan 2021 10:10:36 +0100
Subject: [PATCH 0887/1300] Update setup docs with ansible instructions

---
 docs/setup.rst | 123 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 122 insertions(+), 1 deletion(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index 6eb597014..a3a0bd1e8 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -83,7 +83,8 @@ You can go multiple routes with setting up and running Paperless:
 
 * :ref:`Pull the image from Docker Hub <setup-docker_hub>`
 * :ref:`Build the Docker image yourself <setup-docker_build>`
-* :ref:`Install Paperless directly on your system (bare metal) <setup-bare_metal>`
+* :ref:`Install Paperless directly on your system manually (bare metal) <setup-bare_metal>`
+* :ref:`Use ansible to install Paperless on your system automatically (bare metal) <setup-ansible>`
 
 The Docker routes are quick & easy. These are the recommended routes. This configures all the stuff
 from above automatically so that it just works and uses sensible defaults for all configuration options.
@@ -92,6 +93,11 @@ The bare metal route is more complicated to setup but makes it easier
 should you want to contribute some code back. You need to configure and
 run the above mentioned components yourself.
 
+The ansible route cobines benefits from both options:
+the setup process is fully automated, reproducible and idempotent,
+it includes the same sensible defaults,
+and it simultaneously provides the flexibility of a bare metal installation.
+
 .. _setup-docker_hub:
 
 Install Paperless from Docker Hub
@@ -392,6 +398,121 @@ writing. Windows is not and will never be supported.
     to compile this by yourself, because this software has been patented until around 2017 and
     binary packages are not available for most distributions.
 
+.. _setup-ansible:
+
+Install Paperless using ansible
+===============================
+    .. note::
+
+        This role currently only supports Debian 10 Buster and Ubuntu 20.04 Focal or later as target hosts.
+
+1.  Install ansible 2.7+ on the management node. 
+    This may be the target host paperless-ng is being installed on or any remote host which can access the target host.
+    For further details, check the ansible `inventory <https://docs.ansible.com/ansible/latest/user_guide/intro_inventory.html>`_ documentation.
+
+    On Debian and Ubuntu, the official repositories should provide a suitable version:
+
+    .. code:: bash
+
+        apt install ansible
+        ansible --version
+
+    Alternatively, you can install the most recent ansible release using PyPI:
+
+    .. code:: bash
+
+        python3 -m pip install ansible
+        ansible --version
+
+    Make sure your taget hosts are accessible:
+
+    .. code:: sh
+
+        ansible -m ping YourAnsibleTargetHostGoesHere
+
+2.  Clone the repository of paperless-ng:
+
+    .. code:: sh
+
+        git clone https://github.com/jonaswinkler/paperless-ng
+
+    Checkout the latest release tag:
+
+    .. code:: sh
+
+        cd paperless-ng
+        git checkout ng-0.9.14
+
+3.  Create an ansible ``playbook.yml`` in the paperless-ng root directory:
+
+    .. code:: yaml
+
+        - hosts: YourAnsibleTargetHostGoesHere
+          become: yes
+          vars_files:
+            - ansible/vars.yml
+          roles:
+            - ansible
+
+    Optional: If you also want to use PostgreSQL on the target system, install and add (for example) the `geerlingguy.postgresql <https://github.com/geerlingguy/ansible-role-postgresql>`_ role:
+
+    .. code:: sh
+
+        ansible-galaxy install geerlingguy.postgresql
+
+    .. code:: yaml
+
+        - hosts: YourAnsibleTargetHostGoesHere
+          become: yes
+          vars_files:
+            - ansible/vars.yml
+          roles:
+            - geerlingguy.postgresql
+            - ansible
+
+    Optional: If you also want to use a reverse proxy on the target system, install and add (for example) the `geerlingguy.nginx <https://github.com/geerlingguy/ansible-role-nginx>`_ role:
+
+    .. code:: sh
+
+        ansible-galaxy install geerlingguy.nginx
+
+    .. code:: yaml
+
+        - hosts: YourAnsibleTargetHostGoesHere
+          become: yes
+          vars_files:
+            - ansible/vars.yml
+          roles:
+            - geerlingguy.postgresql
+            - ansible
+            - geerlingguy.nginx
+
+4.  Create ``ansible/vars.yml`` to configure your ansible deployment:
+
+    .. code:: yaml
+
+        paperless_secret_key: PleaseGenerateAStrongKeyForThis
+
+        paperlessng_superuser_name: YourUserName
+        paperlessng_superuser_email: name@domain.tld
+        paperlessng_superuser_password: YourDesiredPasswordUsedForFirstLogin
+
+        paperlessng_ocr_languages:
+            - eng
+            - deu
+
+    For all of the available options, please check ``ansible/README.md`` and :ref:`configuration`.
+
+    Optional configurations for the above-mentioned PostgreSQL and nginx roles would also go here.
+
+5. Run the ansible playbook from the management node:
+
+    .. code:: sh
+
+        ansible-playbook playbook.yml
+
+    When this step completes successfully, paperless-ng will be available on the target host at ``http://127.0.0.1:8000`` (or the address you configured).
+
 Migration to paperless-ng
 #########################
 

From 6d786f89878f3d683778d71ce1a2e3582273f0b0 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 15 Jan 2021 01:11:06 -0800
Subject: [PATCH 0888/1300] remove log statement

---
 src-ui/src/app/services/document-list-view.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 407c81572..13c362918 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -258,7 +258,6 @@ export class DocumentListViewService {
 
     if (includeRange && this.lastSelectedDocumentIndex !== null) {
       const toIndex = this.documentIndexInCurrentView(d.id)
-      console.log('select from', this.lastSelectedDocumentIndex, 'to', toIndex);
       this.documents.slice(Math.min(this.lastSelectedDocumentIndex, toIndex), Math.max(this.lastSelectedDocumentIndex, toIndex)).forEach(d => {
         this.selected.add(d.id)
       })

From f94da1cf2730cb520770de650ae9c21eed6f5556 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 15 Jan 2021 01:54:33 -0800
Subject: [PATCH 0889/1300] Allow reversing selection range

---
 .../services/document-list-view.service.ts    | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 13c362918..bcfb5468f 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -28,6 +28,7 @@ export class DocumentListViewService {
   currentPageSize: number = this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)
   collectionSize: number
   lastSelectedDocumentIndex: number
+  lastSelectedDocumentToIndex: number
 
   /**
    * This is the current config for the document list. The service will always remember the last settings used for the document list.
@@ -109,7 +110,7 @@ export class DocumentListViewService {
           if (onFinish) {
             onFinish()
           }
-          this.lastSelectedDocumentIndex = null
+          this.lastSelectedDocumentIndex = this.lastSelectedDocumentToIndex = null
           this.isReloading = false
         },
         error => {
@@ -220,7 +221,7 @@ export class DocumentListViewService {
 
   selectNone() {
     this.selected.clear()
-    this.lastSelectedDocumentIndex = null
+    this.lastSelectedDocumentIndex = this.lastSelectedDocumentToIndex = null
   }
 
   reduceSelectionToFilter() {
@@ -253,17 +254,30 @@ export class DocumentListViewService {
   }
 
   toggleSelected(d: PaperlessDocument, includeRange: boolean): void {
-    if (this.selected.has(d.id) && !includeRange) this.selected.delete(d.id)
-    else this.selected.add(d.id)
+    if (!includeRange) {
+      // regular i.e. no shift key toggle
+      if (this.selected.has(d.id)) this.selected.delete(d.id)
+      else this.selected.add(d.id)
+    } else if (includeRange && this.lastSelectedDocumentIndex !== null) {
+      const documentToIndex = this.documentIndexInCurrentView(d.id)
+      const fromIndex = Math.min(this.lastSelectedDocumentIndex, documentToIndex)
+      const toIndex = Math.max(this.lastSelectedDocumentIndex, documentToIndex)
 
-    if (includeRange && this.lastSelectedDocumentIndex !== null) {
-      const toIndex = this.documentIndexInCurrentView(d.id)
-      this.documents.slice(Math.min(this.lastSelectedDocumentIndex, toIndex), Math.max(this.lastSelectedDocumentIndex, toIndex)).forEach(d => {
+      if ((this.lastSelectedDocumentToIndex > this.lastSelectedDocumentIndex && documentToIndex < this.lastSelectedDocumentIndex) ||
+          (this.lastSelectedDocumentToIndex < this.lastSelectedDocumentIndex && documentToIndex > this.lastSelectedDocumentIndex)) {
+          // invert last selected
+          this.documents.slice(Math.min(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex), Math.max(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex) + 1).forEach(d => {
+            this.selected.delete(d.id)
+          })
+      }
+
+      this.documents.slice(fromIndex, toIndex + 1).forEach(d => {
         this.selected.add(d.id)
       })
+      this.lastSelectedDocumentToIndex = documentToIndex
     }
 
-    if (!includeRange || (includeRange && this.lastSelectedDocumentIndex == null)) {
+    if (!includeRange || (includeRange && this.lastSelectedDocumentIndex == null)) { // e.g. shift key but first click
       this.lastSelectedDocumentIndex = this.documentIndexInCurrentView(d.id)
     }
   }

From 48220ceeb8cdba13c81f86f3556163a44c4c3642 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 15 Jan 2021 01:59:29 -0800
Subject: [PATCH 0890/1300] Refactor selection functions to two separate ones
 for clarity

---
 .../document-list/document-list.component.ts  |  3 ++-
 .../services/document-list-view.service.ts    | 20 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index a3ec2d664..509c0a735 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -161,7 +161,8 @@ export class DocumentListComponent implements OnInit {
   }
 
   toggleSelected(document: PaperlessDocument, event: MouseEvent): void {
-    this.list.toggleSelected(document, event.shiftKey)
+    if (!event.shiftKey) this.list.toggleSelected(document)
+    else this.list.selectRangeTo(document)
   }
 
   clickTag(tagID: number) {
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index bcfb5468f..d2b9d75c2 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -253,19 +253,21 @@ export class DocumentListViewService {
     return this.selected.has(d.id)
   }
 
-  toggleSelected(d: PaperlessDocument, includeRange: boolean): void {
-    if (!includeRange) {
-      // regular i.e. no shift key toggle
-      if (this.selected.has(d.id)) this.selected.delete(d.id)
-      else this.selected.add(d.id)
-    } else if (includeRange && this.lastSelectedDocumentIndex !== null) {
+  toggleSelected(d: PaperlessDocument): void {
+    if (this.selected.has(d.id)) this.selected.delete(d.id)
+    else this.selected.add(d.id)
+    this.lastSelectedDocumentIndex = this.documentIndexInCurrentView(d.id)
+  }
+
+  selectRangeTo(d: PaperlessDocument) {
+    if (this.lastSelectedDocumentIndex !== null) {
       const documentToIndex = this.documentIndexInCurrentView(d.id)
       const fromIndex = Math.min(this.lastSelectedDocumentIndex, documentToIndex)
       const toIndex = Math.max(this.lastSelectedDocumentIndex, documentToIndex)
 
       if ((this.lastSelectedDocumentToIndex > this.lastSelectedDocumentIndex && documentToIndex < this.lastSelectedDocumentIndex) ||
           (this.lastSelectedDocumentToIndex < this.lastSelectedDocumentIndex && documentToIndex > this.lastSelectedDocumentIndex)) {
-          // invert last selected
+          // new click is "opposite side" of anchor so we invert the old selection
           this.documents.slice(Math.min(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex), Math.max(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex) + 1).forEach(d => {
             this.selected.delete(d.id)
           })
@@ -275,9 +277,7 @@ export class DocumentListViewService {
         this.selected.add(d.id)
       })
       this.lastSelectedDocumentToIndex = documentToIndex
-    }
-
-    if (!includeRange || (includeRange && this.lastSelectedDocumentIndex == null)) { // e.g. shift key but first click
+    } else { // e.g. shift key but was first click
       this.lastSelectedDocumentIndex = this.documentIndexInCurrentView(d.id)
     }
   }

From 86376c8c5f112ce7f014f4988e3a332c7a02f993 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 15 Jan 2021 02:09:13 -0800
Subject: [PATCH 0891/1300] Fix repeat range selections were clashing

---
 .../app/services/document-list-view.service.ts   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index d2b9d75c2..1ebf86d12 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -257,6 +257,7 @@ export class DocumentListViewService {
     if (this.selected.has(d.id)) this.selected.delete(d.id)
     else this.selected.add(d.id)
     this.lastSelectedDocumentIndex = this.documentIndexInCurrentView(d.id)
+    this.lastSelectedDocumentToIndex = null
   }
 
   selectRangeTo(d: PaperlessDocument) {
@@ -265,12 +266,15 @@ export class DocumentListViewService {
       const fromIndex = Math.min(this.lastSelectedDocumentIndex, documentToIndex)
       const toIndex = Math.max(this.lastSelectedDocumentIndex, documentToIndex)
 
-      if ((this.lastSelectedDocumentToIndex > this.lastSelectedDocumentIndex && documentToIndex < this.lastSelectedDocumentIndex) ||
-          (this.lastSelectedDocumentToIndex < this.lastSelectedDocumentIndex && documentToIndex > this.lastSelectedDocumentIndex)) {
-          // new click is "opposite side" of anchor so we invert the old selection
-          this.documents.slice(Math.min(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex), Math.max(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex) + 1).forEach(d => {
-            this.selected.delete(d.id)
-          })
+      if (this.lastSelectedDocumentToIndex !== null &&
+          ((this.lastSelectedDocumentToIndex > this.lastSelectedDocumentIndex && documentToIndex < this.lastSelectedDocumentIndex) ||
+          (this.lastSelectedDocumentToIndex < this.lastSelectedDocumentIndex && documentToIndex > this.lastSelectedDocumentIndex))) {
+        console.log('invert');
+
+        // new click is "opposite side" of anchor so we invert the old selection
+        this.documents.slice(Math.min(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex), Math.max(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex) + 1).forEach(d => {
+          this.selected.delete(d.id)
+        })
       }
 
       this.documents.slice(fromIndex, toIndex + 1).forEach(d => {

From 8d606b9f34ab13e38b3188e831c84c880c53fba7 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 15 Jan 2021 02:13:21 -0800
Subject: [PATCH 0892/1300] Handle shift-clicking orignal item

---
 src-ui/src/app/services/document-list-view.service.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 1ebf86d12..c7ddbd44e 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -267,9 +267,8 @@ export class DocumentListViewService {
       const toIndex = Math.max(this.lastSelectedDocumentIndex, documentToIndex)
 
       if (this.lastSelectedDocumentToIndex !== null &&
-          ((this.lastSelectedDocumentToIndex > this.lastSelectedDocumentIndex && documentToIndex < this.lastSelectedDocumentIndex) ||
-          (this.lastSelectedDocumentToIndex < this.lastSelectedDocumentIndex && documentToIndex > this.lastSelectedDocumentIndex))) {
-        console.log('invert');
+          ((this.lastSelectedDocumentToIndex > this.lastSelectedDocumentIndex && documentToIndex <= this.lastSelectedDocumentIndex) ||
+          (this.lastSelectedDocumentToIndex < this.lastSelectedDocumentIndex && documentToIndex >= this.lastSelectedDocumentIndex))) {
 
         // new click is "opposite side" of anchor so we invert the old selection
         this.documents.slice(Math.min(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex), Math.max(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex) + 1).forEach(d => {
@@ -282,7 +281,7 @@ export class DocumentListViewService {
       })
       this.lastSelectedDocumentToIndex = documentToIndex
     } else { // e.g. shift key but was first click
-      this.lastSelectedDocumentIndex = this.documentIndexInCurrentView(d.id)
+      this.toggleSelected(d)
     }
   }
 

From 01cd4c7546dd645eda6b3090109a264580fcdde1 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 15 Jan 2021 02:15:26 -0800
Subject: [PATCH 0893/1300] Refactor variable names for clarity

---
 .../services/document-list-view.service.ts    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index c7ddbd44e..35b6296cc 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -27,8 +27,8 @@ export class DocumentListViewService {
   currentPage = 1
   currentPageSize: number = this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)
   collectionSize: number
-  lastSelectedDocumentIndex: number
-  lastSelectedDocumentToIndex: number
+  rangeSelectionAnchorIndex: number
+  lastRangeSelectionToIndex: number
 
   /**
    * This is the current config for the document list. The service will always remember the last settings used for the document list.
@@ -110,7 +110,7 @@ export class DocumentListViewService {
           if (onFinish) {
             onFinish()
           }
-          this.lastSelectedDocumentIndex = this.lastSelectedDocumentToIndex = null
+          this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null
           this.isReloading = false
         },
         error => {
@@ -221,7 +221,7 @@ export class DocumentListViewService {
 
   selectNone() {
     this.selected.clear()
-    this.lastSelectedDocumentIndex = this.lastSelectedDocumentToIndex = null
+    this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null
   }
 
   reduceSelectionToFilter() {
@@ -256,22 +256,22 @@ export class DocumentListViewService {
   toggleSelected(d: PaperlessDocument): void {
     if (this.selected.has(d.id)) this.selected.delete(d.id)
     else this.selected.add(d.id)
-    this.lastSelectedDocumentIndex = this.documentIndexInCurrentView(d.id)
-    this.lastSelectedDocumentToIndex = null
+    this.rangeSelectionAnchorIndex = this.documentIndexInCurrentView(d.id)
+    this.lastRangeSelectionToIndex = null
   }
 
   selectRangeTo(d: PaperlessDocument) {
-    if (this.lastSelectedDocumentIndex !== null) {
+    if (this.rangeSelectionAnchorIndex !== null) {
       const documentToIndex = this.documentIndexInCurrentView(d.id)
-      const fromIndex = Math.min(this.lastSelectedDocumentIndex, documentToIndex)
-      const toIndex = Math.max(this.lastSelectedDocumentIndex, documentToIndex)
+      const fromIndex = Math.min(this.rangeSelectionAnchorIndex, documentToIndex)
+      const toIndex = Math.max(this.rangeSelectionAnchorIndex, documentToIndex)
 
-      if (this.lastSelectedDocumentToIndex !== null &&
-          ((this.lastSelectedDocumentToIndex > this.lastSelectedDocumentIndex && documentToIndex <= this.lastSelectedDocumentIndex) ||
-          (this.lastSelectedDocumentToIndex < this.lastSelectedDocumentIndex && documentToIndex >= this.lastSelectedDocumentIndex))) {
+      if (this.lastRangeSelectionToIndex !== null &&
+          ((this.lastRangeSelectionToIndex > this.rangeSelectionAnchorIndex && documentToIndex <= this.rangeSelectionAnchorIndex) ||
+          (this.lastRangeSelectionToIndex < this.rangeSelectionAnchorIndex && documentToIndex >= this.rangeSelectionAnchorIndex))) {
 
         // new click is "opposite side" of anchor so we invert the old selection
-        this.documents.slice(Math.min(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex), Math.max(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex) + 1).forEach(d => {
+        this.documents.slice(Math.min(this.rangeSelectionAnchorIndex, this.lastRangeSelectionToIndex), Math.max(this.rangeSelectionAnchorIndex, this.lastRangeSelectionToIndex) + 1).forEach(d => {
           this.selected.delete(d.id)
         })
       }
@@ -279,7 +279,7 @@ export class DocumentListViewService {
       this.documents.slice(fromIndex, toIndex + 1).forEach(d => {
         this.selected.add(d.id)
       })
-      this.lastSelectedDocumentToIndex = documentToIndex
+      this.lastRangeSelectionToIndex = documentToIndex
     } else { // e.g. shift key but was first click
       this.toggleSelected(d)
     }

From 59008ea765cbe8c69425a2add311a8a68f78b9a0 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 15 Jan 2021 02:22:10 -0800
Subject: [PATCH 0894/1300] remove new line =/

---
 src-ui/src/app/services/document-list-view.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 35b6296cc..1fc5e09c5 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -269,7 +269,6 @@ export class DocumentListViewService {
       if (this.lastRangeSelectionToIndex !== null &&
           ((this.lastRangeSelectionToIndex > this.rangeSelectionAnchorIndex && documentToIndex <= this.rangeSelectionAnchorIndex) ||
           (this.lastRangeSelectionToIndex < this.rangeSelectionAnchorIndex && documentToIndex >= this.rangeSelectionAnchorIndex))) {
-
         // new click is "opposite side" of anchor so we invert the old selection
         this.documents.slice(Math.min(this.rangeSelectionAnchorIndex, this.lastRangeSelectionToIndex), Math.max(this.rangeSelectionAnchorIndex, this.lastRangeSelectionToIndex) + 1).forEach(d => {
           this.selected.delete(d.id)

From 09262666634e92193ff84626cd79d7f1f59d57dc Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 15 Jan 2021 12:50:34 +0100
Subject: [PATCH 0895/1300] add a language switcher fixes #352

---
 src-ui/messages.xlf                           | 87 +++++++++++++++----
 .../manage/settings/settings.component.html   | 15 ++++
 .../manage/settings/settings.component.ts     |  8 +-
 src-ui/src/app/services/settings.service.ts   | 36 +++++++-
 4 files changed, 125 insertions(+), 21 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 9b6324a76..a1f0e8b88 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -475,21 +475,21 @@
         <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/>&quot; deleted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">55</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5647210819299459618" datatype="html">
         <source>Settings saved successfully.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">70</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8488620293789898901" datatype="html">
         <source>Error while storing settings on server: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">80</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
@@ -510,7 +510,7 @@
         <source>Saved views</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">64</context>
+          <context context-type="linenumber">79</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13" datatype="html">
@@ -520,109 +520,123 @@
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="75f8908d266f7cc9b9e68e0be906fd080a223606" datatype="html">
+        <source>Display language</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1284a077dc18a2d1ff1b744f16f1797eea28ae37" datatype="html">
+        <source>You need to reload the page after applying a new language.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="2045151788cbdda7512752e408da59a6b54a8ef0" datatype="html">
         <source>Items per page</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">32</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c4435e56bf0289e78fedc462f1d21fb30b9de55d" datatype="html">
         <source>Document editor</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">48</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4903e521c9bfd11ce88e7a5575106ef638912e0d" datatype="html">
         <source>Use PDF viewer provided by the browser</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">37</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d7db07023e53f8396d18d375c2b78c25fc81c197" datatype="html">
         <source>This is usually faster for displaying large PDF documents, but it might not work on some browsers.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">37</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff" datatype="html">
         <source>Dark mode</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">44</context>
+          <context context-type="linenumber">59</context>
         </context-group>
       </trans-unit>
       <trans-unit id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637" datatype="html">
         <source>Use system settings</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">47</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8ee474504043fa89821d626e4f3413240fa91b53" datatype="html">
         <source>Enable dark mode</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
+          <context context-type="linenumber">63</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3863a86cd9e69a61d143d3daf51df44203df4a82" datatype="html">
         <source>Bulk editing</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586" datatype="html">
         <source>Show confirmation dialogs</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
       <trans-unit id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a" datatype="html">
         <source>Deleting documents will always ask for confirmation.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8cfddc13e04f5545ac63f419ef363505d6f78c2e" datatype="html">
         <source>Apply on close</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">57</context>
+          <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8cb90334f5dfd7fc67205085f59381e2a334ccfc" datatype="html">
         <source>Appears on</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5" datatype="html">
         <source>Show on dashboard</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit id="541bfc5b123b3f8867fd681eaceefb663a811973" datatype="html">
         <source>Show in sidebar</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="abba764a7a595d04dc8c3b26e04b3780d4fdb540" datatype="html">
         <source>No saved views defined.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">93</context>
+          <context context-type="linenumber">108</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ef60a738a565f498b858e903e42bc5ffc3cc1299" datatype="html">
@@ -1400,6 +1414,41 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="6839066544204061364" datatype="html">
+        <source>Use system language</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5866254605255506989" datatype="html">
+        <source>English</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1858110241312746425" datatype="html">
+        <source>German</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">66</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3071065188816255493" datatype="html">
+        <source>Dutch</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7633754075223722162" datatype="html">
+        <source>French</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">68</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="1519954996184640001" datatype="html">
         <source>Error</source>
         <context-group purpose="location">
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index cc4de9bf0..e7fac646f 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -12,6 +12,21 @@
 
         <h4 i18n>Appearance</h4>
 
+        <div class="form-row form-group">
+          <div class="col-md-3 col-form-label">
+            <span i18n>Display language</span>
+          </div>
+          <div class="col">
+
+            <select class="form-control" formControlName="displayLanguage">
+              <option *ngFor="let lang of languages" [ngValue]="lang.code">{{lang.name}}</option>
+            </select>
+
+            <small class="form-text text-muted" i18n>You need to reload the page after applying a new language.</small>
+
+          </div>
+        </div>
+
         <div class="form-row form-group">
           <div class="col-md-3 col-form-label">
             <span i18n>Items per page</span>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 0e364e6c5..f0d83a15f 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -22,7 +22,8 @@ export class SettingsComponent implements OnInit {
     'darkModeUseSystem': new FormControl(this.settings.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM)),
     'darkModeEnabled': new FormControl(this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED)),
     'useNativePdfViewer': new FormControl(this.settings.get(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER)),
-    'savedViews': this.savedViewGroup
+    'savedViews': this.savedViewGroup,
+    'displayLanguage': new FormControl(this.settings.getLanguage())
   })
 
   savedViews: PaperlessSavedView[]
@@ -63,11 +64,16 @@ export class SettingsComponent implements OnInit {
     this.settings.set(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, this.settingsForm.value.darkModeUseSystem)
     this.settings.set(SETTINGS_KEYS.DARK_MODE_ENABLED, (this.settingsForm.value.darkModeEnabled == true).toString())
     this.settings.set(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, this.settingsForm.value.useNativePdfViewer)
+    this.settings.setLanguage(this.settingsForm.value.displayLanguage)
     this.documentListViewService.updatePageSize()
     this.settings.updateDarkModeSettings()
     this.toastService.showInfo($localize`Settings saved successfully.`)
   }
 
+  get languages() {
+    return this.settings.getLanguageOptions()
+  }
+
   saveSettings() {
     let x = []
     for (let id in this.savedViewGroup.value) {
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index eb533e118..50adcf5a7 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -1,5 +1,7 @@
 import { DOCUMENT } from '@angular/common';
 import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core';
+import { Meta } from '@angular/platform-browser';
+import { CookieService } from 'ngx-cookie-service';
 
 export interface PaperlessSettings {
   key: string
@@ -34,7 +36,9 @@ export class SettingsService {
 
   constructor(
     private rendererFactory: RendererFactory2,
-    @Inject(DOCUMENT) private document
+    @Inject(DOCUMENT) private document,
+    private cookieService: CookieService,
+    private meta: Meta
   ) {
     this.renderer = rendererFactory.createRenderer(null, null);
 
@@ -55,6 +59,36 @@ export class SettingsService {
 
   }
 
+  getLanguageOptions() {
+    return [
+      {code: "", name: $localize`Use system language`},
+      {code: "en-us", name: `${$localize`English`} (English)`},
+      {code: "de", name: `${$localize`German`} (German)`},
+      {code: "nl", name: `${$localize`Dutch`} (Dutch)`},
+      {code: "fr", name: `${$localize`French`} (French)`}
+    ]
+  }
+
+  private getLanguageCookieName() {
+    let prefix = ""
+    if (this.meta.getTag('name=cookie_prefix')) {
+      prefix = this.meta.getTag('name=cookie_prefix').content
+    }
+    return `${prefix || ''}django_language`
+  }
+
+  getLanguage(): string {
+    return this.cookieService.get(this.getLanguageCookieName())
+  }
+
+  setLanguage(language: string) {
+    if (language) {
+      this.cookieService.set(this.getLanguageCookieName(), language)
+    } else {
+      this.cookieService.delete(this.getLanguageCookieName())
+    }
+  }
+
   get(key: string): any {
     let setting = SETTINGS.find(s => s.key == key)
 

From cc06d528cb4c360f33882425e0fd17ae842f58d1 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Fri, 15 Jan 2021 11:52:06 +0000
Subject: [PATCH 0896/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 94 ++++++++++++++++++++++++-------
 1 file changed, 75 insertions(+), 19 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index 077f7c92e..030cfb28c 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -542,7 +542,7 @@
         <target>Gespeicherte Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; gelöscht.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">55</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -550,7 +550,7 @@
         <target>Einstellungen erfolgreich gespeichert.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">70</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -558,7 +558,7 @@
         <target>Fehler beim Speichern der Einstellungen auf dem Server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">80</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -582,7 +582,7 @@
         <target>Gespeicherte Ansichten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">64</context>
+          <context context-type="linenumber">79</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
@@ -593,12 +593,28 @@
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="75f8908d266f7cc9b9e68e0be906fd080a223606">
+        <source>Display language</source>
+        <target>Anzeigesprache</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1284a077dc18a2d1ff1b744f16f1797eea28ae37">
+        <source>You need to reload the page after applying a new language.</source>
+        <target>Nachdem Sie eine neue Sprache ausgewählt haben, müssen Sie die Seite neu laden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
         <source>Items per page</source>
         <target>Dokumente pro Seite</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">32</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c4435e56bf0289e78fedc462f1d21fb30b9de55d">
@@ -606,7 +622,7 @@
         <target>Dokumenteditor</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">48</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4903e521c9bfd11ce88e7a5575106ef638912e0d">
@@ -614,7 +630,7 @@
         <target>Benutze PDF-Betrachter des Web Browsers</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">37</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="d7db07023e53f8396d18d375c2b78c25fc81c197">
@@ -622,7 +638,7 @@
         <target>Der integrierte PDF-Betrachter des Web-Browsers ist in der Regel schneller bei der Anzeige besonders großer Dokumente, funktioniert aber nicht in allen Browsern.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">37</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
@@ -630,7 +646,7 @@
         <target>Dunkler Modus</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">44</context>
+          <context context-type="linenumber">59</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
@@ -638,7 +654,7 @@
         <target>Benutze Systemeinstellungen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">47</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8ee474504043fa89821d626e4f3413240fa91b53">
@@ -646,7 +662,7 @@
         <target>Dunklen Modus aktivieren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
+          <context context-type="linenumber">63</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
@@ -654,7 +670,7 @@
         <target>Massenbearbeitung</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
@@ -662,7 +678,7 @@
         <target>Bestätigungsdialoge anzeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
@@ -670,7 +686,7 @@
         <target>Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
@@ -678,7 +694,7 @@
         <target>Anwenden beim Schließen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">57</context>
+          <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -686,7 +702,7 @@
         <target>Erscheint auf</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -694,7 +710,7 @@
         <target>Auf Startseite zeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -702,7 +718,7 @@
         <target>In Seitenleiste zeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -710,7 +726,7 @@
         <target>Keine gespeicherten Ansichten vorhanden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">93</context>
+          <context context-type="linenumber">108</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -1598,6 +1614,46 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="6839066544204061364">
+        <source>Use system language</source>
+        <target>Benutze Systemsprache</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5866254605255506989">
+        <source>English</source>
+        <target>Englisch</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1858110241312746425">
+        <source>German</source>
+        <target>Deutsch</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">66</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3071065188816255493">
+        <source>Dutch</source>
+        <target>Niederländisch</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7633754075223722162">
+        <source>French</source>
+        <target>Französisch</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">68</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="1519954996184640001">
         <source>Error</source>
         <target>Fehler</target>

From a3a9949ebc887b08a688c0a6e03103f19a6fcf3a Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Fri, 15 Jan 2021 12:42:26 +0000
Subject: [PATCH 0897/1300] Translate /src-ui/messages.xlf in fr

translation completed for the source file '/src-ui/messages.xlf'
on the 'fr' language.
---
 src-ui/src/locale/messages.fr.xlf | 228 ++++++++++++++++++++----------
 1 file changed, 154 insertions(+), 74 deletions(-)

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
index 84c8295af..06ca713a4 100644
--- a/src-ui/src/locale/messages.fr.xlf
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -38,7 +38,7 @@
         <target>Sélectionner aucun</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9">
@@ -46,7 +46,7 @@
         <target>Sélectionner la page</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">12</context>
+          <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74">
@@ -54,15 +54,15 @@
         <target>Sélectionner tout</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="ec97f67072a83aaa972536b18d83179f6e4bbec9">
-        <source>Sort by</source>
-        <target>Trier par</target>
+      <trans-unit datatype="html" id="5d43539fc358c3a548b9d487be821db73e2702ff">
+        <source>Sort</source>
+        <target>Trier</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="b7641aed03492978b4ec6843b1e53f30464294d9">
@@ -94,7 +94,7 @@
         <target>{VAR_PLURAL, plural, =1 {<x id="INTERPOLATION"/> document sélectionné sur 1} other {<x id="INTERPOLATION"/> documents sélectionnés sur <x id="INTERPOLATION_1"/>}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9">
@@ -102,7 +102,7 @@
         <target>{VAR_PLURAL, plural, =1 {Un document} other {<x id="INTERPOLATION"/> documents}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bb91083b44e3f77dd68de773ceab467ca3d57507">
@@ -110,7 +110,7 @@
         <target>(filtré)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
@@ -118,7 +118,7 @@
         <target>NSA</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">105</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
@@ -126,7 +126,7 @@
         <target>Correspondant</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">113</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
@@ -134,7 +134,7 @@
         <target>Titre</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">119</context>
+          <context context-type="linenumber">117</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
@@ -142,7 +142,7 @@
         <target>Type de document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
@@ -150,7 +150,7 @@
         <target>Date de création</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">131</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
@@ -158,7 +158,7 @@
         <target>Date d'ajout</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">137</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9021887951960049161">
@@ -166,7 +166,7 @@
         <target>Confirmer la suppression</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">186</context>
+          <context context-type="linenumber">192</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
@@ -174,7 +174,7 @@
         <target>Voulez-vous vraiment supprimer le document &quot;<x equiv-text="this.document.title" id="PH"/>&quot; ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">187</context>
+          <context context-type="linenumber">193</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6691075929777935948">
@@ -182,7 +182,7 @@
         <target>Les fichiers liés à ce document seront supprimés définitivement. Cette action est irréversible.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">188</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="719892092227206532">
@@ -190,7 +190,7 @@
         <target>Supprimer le document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">190</context>
+          <context context-type="linenumber">196</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1844801255494293730">
@@ -198,7 +198,7 @@
         <target>Une erreur s'est produite lors de la suppression du document : <x equiv-text="JSON.stringify(error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">197</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -542,7 +542,7 @@
         <target>Vue &quot;<x equiv-text="savedView.name" id="PH"/>&quot; supprimée.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -550,7 +550,7 @@
         <target>Paramètres enregistrés avec succès.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">70</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -582,7 +582,7 @@
         <target>Vues enregistrées</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">79</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
@@ -593,12 +593,52 @@
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="75f8908d266f7cc9b9e68e0be906fd080a223606">
+        <source>Display language</source>
+        <target>Langue d'affichage</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1284a077dc18a2d1ff1b744f16f1797eea28ae37">
+        <source>You need to reload the page after applying a new language.</source>
+        <target>Vous devez recharger la page après avoir sélectionné une nouvelle langue.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
         <source>Items per page</source>
         <target>Éléments par page</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c4435e56bf0289e78fedc462f1d21fb30b9de55d">
+        <source>Document editor</source>
+        <target>Éditeur de documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4903e521c9bfd11ce88e7a5575106ef638912e0d">
+        <source>Use PDF viewer provided by the browser</source>
+        <target>Utiliser la visionneuse PDF fournie par le navigateur</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d7db07023e53f8396d18d375c2b78c25fc81c197">
+        <source>This is usually faster for displaying large PDF documents, but it might not work on some browsers.</source>
+        <target>Cette option est généralement plus rapide pour l'affichage de grands documents PDF, mais elle peut ne pas fonctionner sur certains navigateurs.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
@@ -606,7 +646,7 @@
         <target>Mode sombre</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">59</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
@@ -614,39 +654,7 @@
         <target>Utiliser les paramètres du système</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">36</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
-        <source>Bulk editing</source>
-        <target>Edition en masse</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">44</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
-        <source>Show confirmation dialogs</source>
-        <target>Afficher les messages de confirmation</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
-        <source>Deleting documents will always ask for confirmation.</source>
-        <target>La suppression de documents requiert toujours une confirmation.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
-        <source>Apply on close</source>
-        <target>Appliquer lors de la fermeture</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8ee474504043fa89821d626e4f3413240fa91b53">
@@ -654,7 +662,39 @@
         <target>Activer le mode sombre</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">39</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
+        <source>Bulk editing</source>
+        <target>Edition en masse</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
+        <source>Show confirmation dialogs</source>
+        <target>Afficher les messages de confirmation</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
+        <source>Deleting documents will always ask for confirmation.</source>
+        <target>La suppression de documents requiert toujours une confirmation.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
+        <source>Apply on close</source>
+        <target>Appliquer lors de la fermeture</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -662,7 +702,7 @@
         <target>Apparaît sur</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -670,7 +710,7 @@
         <target>Montrer sur le tableau de bord</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -678,7 +718,7 @@
         <target>Montrer dans la barre latérale</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -686,7 +726,7 @@
         <target>Aucune vue sauvegardée n'est définie.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">108</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -1039,7 +1079,7 @@
         <target>Filtrer les correspondants</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="0ad509732aaf702b7ea8c771c7809fa84bc85908">
@@ -1047,7 +1087,7 @@
         <target>Filtrer les types de documents</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2d9d55f1b70142ff4597ba32179d16888fd9c6b2">
@@ -1055,7 +1095,7 @@
         <target>Réinitialiser les filtres</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">47</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7593728289020204896">
@@ -1063,7 +1103,7 @@
         <target>Non affecté</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">166</context>
         </context-group>
         <note from="description" priority="1">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
       </trans-unit>
@@ -1072,7 +1112,7 @@
         <target>Appliquer</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4873149362496451858">
@@ -1144,7 +1184,7 @@
         <target>Créé le : <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></target>
         <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">65</context>
+          <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8">
@@ -1168,7 +1208,7 @@
         <target>Score :</target>
         <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">61</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2840db547019ce8c76b2cdbe3a1653c5b68b06af">
@@ -1355,7 +1395,7 @@
         <target>Sélectionner :</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="dfc3c34e182ea73c5d784ff7c8135f087992dac1">
@@ -1363,7 +1403,7 @@
         <target>Tout</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="907df6a2b68daecc3c399cf40a764b358bd9fd84">
@@ -1371,7 +1411,7 @@
         <target>Éditer :</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">
@@ -1574,6 +1614,46 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="6839066544204061364">
+        <source>Use system language</source>
+        <target>Utiliser la langue du système</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5866254605255506989">
+        <source>English</source>
+        <target>Anglais</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1858110241312746425">
+        <source>German</source>
+        <target>Allemand</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">66</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3071065188816255493">
+        <source>Dutch</source>
+        <target>Néerlandais</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7633754075223722162">
+        <source>French</source>
+        <target>Français</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">68</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="1519954996184640001">
         <source>Error</source>
         <target>Erreur</target>

From ef924e896b8b7740d166b4d0d27525a74e93b664 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 15 Jan 2021 07:57:01 -0800
Subject: [PATCH 0898/1300] Fix reverting old selection in all cases by always
 doing it

---
 src-ui/src/app/services/document-list-view.service.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 1fc5e09c5..4eb0c276c 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -266,10 +266,8 @@ export class DocumentListViewService {
       const fromIndex = Math.min(this.rangeSelectionAnchorIndex, documentToIndex)
       const toIndex = Math.max(this.rangeSelectionAnchorIndex, documentToIndex)
 
-      if (this.lastRangeSelectionToIndex !== null &&
-          ((this.lastRangeSelectionToIndex > this.rangeSelectionAnchorIndex && documentToIndex <= this.rangeSelectionAnchorIndex) ||
-          (this.lastRangeSelectionToIndex < this.rangeSelectionAnchorIndex && documentToIndex >= this.rangeSelectionAnchorIndex))) {
-        // new click is "opposite side" of anchor so we invert the old selection
+      if (this.lastRangeSelectionToIndex !== null) {
+        // revert the old selection
         this.documents.slice(Math.min(this.rangeSelectionAnchorIndex, this.lastRangeSelectionToIndex), Math.max(this.rangeSelectionAnchorIndex, this.lastRangeSelectionToIndex) + 1).forEach(d => {
           this.selected.delete(d.id)
         })

From c31b6e63f5a3708bfc784f5217f3387feff48265 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 15 Jan 2021 16:13:22 -0800
Subject: [PATCH 0899/1300] Prevent text selection on table rows

---
 .../app/components/document-list/document-list.component.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss
index f90a94be4..28f765e29 100644
--- a/src-ui/src/app/components/document-list/document-list.component.scss
+++ b/src-ui/src/app/components/document-list/document-list.component.scss
@@ -1,5 +1,9 @@
 @import "/src/theme";
 
+tr {
+  user-select: none;
+}
+
 .table-row-selected {
   background-color: $primaryFaded;
 }

From 98f3e99e2e11a62dc04a115f80ea7a071a0f99f2 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 16 Jan 2021 14:09:23 -0800
Subject: [PATCH 0900/1300] Prevent close button 'stealing' focus from modal
 input fields

---
 .../common/edit-dialog/edit-dialog.component.ts           | 7 +++++++
 .../save-view-config-dialog.component.html                | 2 +-
 .../save-view-config-dialog.component.ts                  | 8 +++++++-
 .../correspondent-edit-dialog.component.html              | 3 +--
 .../document-type-edit-dialog.component.html              | 2 +-
 .../tag-edit-dialog/tag-edit-dialog.component.html        | 2 +-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
index 46f486167..135b5a137 100644
--- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
@@ -27,6 +27,8 @@ export abstract class EditDialogComponent<T extends ObjectWithId> implements OnI
 
   networkActive = false
 
+  closeEnabled = false
+
   error = null
 
   abstract getForm(): FormGroup
@@ -37,6 +39,11 @@ export abstract class EditDialogComponent<T extends ObjectWithId> implements OnI
     if (this.object != null) {
       this.objectForm.patchValue(this.object)
     }
+
+    // we wait to enable the close button so it doesnt pull browser focus since its the first clickable element in the DOM
+    setTimeout(() => {
+      this.closeEnabled = true
+    });
   }
 
   getCreateTitle() {
diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
index f2063df7e..7f1d39859 100644
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="saveViewConfigForm" (ngSubmit)="save()">
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title" i18n>Save current view</h4>
-    <button type="button" class="close" aria-label="Close" (click)="cancel()">
+    <button type="button" [disabled]="!closeEnabled" class="close" aria-label="Close" (click)="cancel()">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
index e930ffaed..57de978aa 100644
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
@@ -20,6 +20,8 @@ export class SaveViewConfigDialogComponent implements OnInit {
   @Input()
   buttonsEnabled = true
 
+  closeEnabled = false
+
   _defaultName = ""
 
   get defaultName() {
@@ -31,7 +33,7 @@ export class SaveViewConfigDialogComponent implements OnInit {
     this._defaultName = value
     this.saveViewConfigForm.patchValue({name: value})
   }
-  
+
   saveViewConfigForm = new FormGroup({
     name: new FormControl(''),
     showInSideBar: new FormControl(false),
@@ -39,6 +41,10 @@ export class SaveViewConfigDialogComponent implements OnInit {
   })
 
   ngOnInit(): void {
+    // wait to enable close button so it doesnt steal focus form input
+    setTimeout(() => {
+      this.closeEnabled = true
+    });
   }
 
   save() {
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
index 3544aeed0..bbc2c8453 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
@@ -1,12 +1,11 @@
 <form [formGroup]="objectForm" (ngSubmit)="save()">
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
-    <button type="button" class="close" aria-label="Close" (click)="cancel()">
+    <button type="button" [disabled]="!closeEnabled" class="close" aria-label="Close" (click)="cancel()">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
   <div class="modal-body">
-
     <app-input-text i18n-title title="Name" formControlName="name" [error]="error?.name"></app-input-text>
     <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
     <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match"></app-input-text>
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
index 8c3e848f5..ed9f4f5af 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="objectForm" (ngSubmit)="save()">
     <div class="modal-header">
       <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
-      <button type="button" class="close" aria-label="Close" (click)="cancel()">
+      <button type="button" [disabled]="!closeEnabled" class="close" aria-label="Close" (click)="cancel()">
         <span aria-hidden="true">&times;</span>
       </button>
     </div>
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
index 57f3b19fd..fd4c3b7f0 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
@@ -1,7 +1,7 @@
   <form [formGroup]="objectForm" (ngSubmit)="save()">
     <div class="modal-header">
       <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
-      <button type="button" class="close" aria-label="Close" (click)="cancel()">
+      <button type="button" [disabled]="!closeEnabled" class="close" aria-label="Close" (click)="cancel()">
         <span aria-hidden="true">&times;</span>
       </button>
     </div>

From 2c9825193b33a27f2fe1503f3df72750ae6162f7 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 16 Jan 2021 14:14:05 -0800
Subject: [PATCH 0901/1300] Comment typo

---
 .../app/components/common/edit-dialog/edit-dialog.component.ts  | 2 +-
 .../save-view-config-dialog.component.ts                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
index 135b5a137..3faf18dbb 100644
--- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
@@ -40,7 +40,7 @@ export abstract class EditDialogComponent<T extends ObjectWithId> implements OnI
       this.objectForm.patchValue(this.object)
     }
 
-    // we wait to enable the close button so it doesnt pull browser focus since its the first clickable element in the DOM
+    // wait to enable close button so it doesnt steal focus from input since its the first clickable element in the DOM
     setTimeout(() => {
       this.closeEnabled = true
     });
diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
index 57de978aa..4f70941dd 100644
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
@@ -41,7 +41,7 @@ export class SaveViewConfigDialogComponent implements OnInit {
   })
 
   ngOnInit(): void {
-    // wait to enable close button so it doesnt steal focus form input
+    // wait to enable close button so it doesnt steal focus from input since its the first clickable element in the DOM
     setTimeout(() => {
       this.closeEnabled = true
     });

From 864e421cd36ed20c520e2e7a9d5f8180dc560cf7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 17 Jan 2021 00:15:45 +0100
Subject: [PATCH 0902/1300] add configuration option for changing date display
 in paperless #325

---
 src-ui/src/app/app.module.ts                  | 14 ++++++-
 .../saved-view-widget.component.html          |  2 +-
 .../saved-view-widget.component.ts            |  4 +-
 .../document-detail.component.html            |  4 +-
 .../document-card-large.component.html        |  2 +-
 .../document-card-small.component.html        |  2 +-
 .../document-list.component.html              |  4 +-
 .../correspondent-list.component.html         |  2 +-
 .../manage/logs/logs.component.html           |  2 +-
 .../manage/settings/settings.component.html   | 37 ++++++++++++++++++-
 .../manage/settings/settings.component.ts     | 20 ++++++++--
 src-ui/src/app/pipes/custom-date.pipe.spec.ts |  8 ++++
 src-ui/src/app/pipes/custom-date.pipe.ts      | 19 ++++++++++
 src-ui/src/app/services/settings.service.ts   | 25 +++++++++----
 14 files changed, 119 insertions(+), 26 deletions(-)
 create mode 100644 src-ui/src/app/pipes/custom-date.pipe.spec.ts
 create mode 100644 src-ui/src/app/pipes/custom-date.pipe.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 30411c980..49e937c0b 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -13,7 +13,7 @@ import { DocumentTypeListComponent } from './components/manage/document-type-lis
 import { LogsComponent } from './components/manage/logs/logs.component';
 import { SettingsComponent } from './components/manage/settings/settings.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { DatePipe } from '@angular/common';
+import { DatePipe, registerLocaleData } from '@angular/common';
 import { NotFoundComponent } from './components/not-found/not-found.component';
 import { CorrespondentListComponent } from './components/manage/correspondent-list/correspondent-list.component';
 import { ConfirmDialogComponent } from './components/common/confirm-dialog/confirm-dialog.component';
@@ -59,6 +59,15 @@ import { SelectDialogComponent } from './components/common/select-dialog/select-
 import { NgSelectModule } from '@ng-select/ng-select';
 import { NumberComponent } from './components/common/input/number/number.component';
 import { SafePipe } from './pipes/safe.pipe';
+import { CustomDatePipe } from './pipes/custom-date.pipe';
+
+import localeFr from '@angular/common/locales/fr';
+import localeNl from '@angular/common/locales/nl';
+import localeDe from '@angular/common/locales/de';
+
+registerLocaleData(localeFr)
+registerLocaleData(localeNl)
+registerLocaleData(localeDe)
 
 @NgModule({
   declarations: [
@@ -108,7 +117,8 @@ import { SafePipe } from './pipes/safe.pipe';
     MetadataCollapseComponent,
     SelectDialogComponent,
     NumberComponent,
-    SafePipe
+    SafePipe,
+    CustomDatePipe
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
index 1bf06b60f..d907c59d6 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
@@ -12,7 +12,7 @@
     </thead>
     <tbody>
       <tr *ngFor="let doc of documents" routerLink="/documents/{{doc.id}}">
-        <td>{{doc.created | date}}</td>
+        <td>{{doc.created | customDate}}</td>
         <td>{{doc.title | documentTitle}}<app-tag [tag]="t" *ngFor="let t of doc.tags$ | async" class="ml-1"></app-tag>
       </tr>
     </tbody>
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
index f200d8db9..7405c2848 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
@@ -16,7 +16,7 @@ export class SavedViewWidgetComponent implements OnInit {
     private documentService: DocumentService,
     private router: Router,
     private list: DocumentListViewService) { }
-  
+
   @Input()
   savedView: PaperlessSavedView
 
@@ -34,7 +34,7 @@ export class SavedViewWidgetComponent implements OnInit {
     } else {
       this.list.load(this.savedView)
       this.router.navigate(["documents"])
-      }
+    }
   }
 
 }
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 7d5e93fbe..253d5b167 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -85,11 +85,11 @@
                             <tbody>
                                 <tr>
                                     <td i18n>Date modified</td>
-                                    <td>{{document.modified | date:'medium'}}</td>
+                                    <td>{{document.modified | customDate}}</td>
                                 </tr>
                                 <tr>
                                     <td i18n>Date added</td>
-                                    <td>{{document.added | date:'medium'}}</td>
+                                    <td>{{document.added | customDate}}</td>
                                 </tr>
                                 <tr>
                                     <td i18n>Media filename</td>
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index c2ea9980b..85964f528 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -64,7 +64,7 @@
             <ngb-progressbar [type]="searchScoreClass" [value]="searchScore" class="search-score-bar mx-2" [max]="1"></ngb-progressbar>
           </div>
 
-          <small class="text-muted" [class.ml-auto]="!searchScore" i18n>Created: {{document.created | date}}</small>
+          <small class="text-muted" [class.ml-auto]="!searchScore" i18n>Created: {{document.created | customDate}}</small>
         </div>
 
       </div>
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 4f11b2a98..a0d0299a5 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -50,7 +50,7 @@
             </svg>
           </a>
         </div>
-        <small class="text-muted pl-1">{{document.created | date}}</small>
+        <small class="text-muted pl-1">{{document.created | customDate:'shortDate'}}</small>
       </div>
 
     </div>
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 18f39bfb5..a29e146bf 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -160,10 +160,10 @@
         </ng-container>
       </td>
       <td>
-        {{d.created | date}}
+        {{d.created | customDate}}
       </td>
       <td class="d-none d-xl-table-cell">
-        {{d.added | date}}
+        {{d.added | customDate}}
       </td>
     </tr>
   </tbody>
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
index 08704190e..ffe260d73 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
@@ -21,7 +21,7 @@
       <td scope="row">{{ correspondent.name }}</td>
       <td scope="row">{{ getMatching(correspondent) }}</td>
       <td scope="row">{{ correspondent.document_count }}</td>
-      <td scope="row">{{ correspondent.last_correspondence | date }}</td>
+      <td scope="row">{{ correspondent.last_correspondence | customDate }}</td>
         <td scope="row">
           <div class="btn-group">
             <button class="btn btn-sm btn-outline-secondary" (click)="filterDocuments(correspondent)">
diff --git a/src-ui/src/app/components/manage/logs/logs.component.html b/src-ui/src/app/components/manage/logs/logs.component.html
index d21cea60d..be14faf1d 100644
--- a/src-ui/src/app/components/manage/logs/logs.component.html
+++ b/src-ui/src/app/components/manage/logs/logs.component.html
@@ -20,7 +20,7 @@
   <p
     class="m-0 p-0 log-entry-{{log.level}}"
     *ngFor="let log of logs">
-      {{log.created | date:'short'}}
+      {{log.created | customDate:'short'}}
       {{getLevelText(log.level)}}
       {{log.message}}
   </p>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index e7fac646f..d5acfb149 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -19,7 +19,7 @@
           <div class="col">
 
             <select class="form-control" formControlName="displayLanguage">
-              <option *ngFor="let lang of languages" [ngValue]="lang.code">{{lang.name}}</option>
+              <option *ngFor="let lang of displayLanguageOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code"> ({{lang.englishName}})</span></option>
             </select>
 
             <small class="form-text text-muted" i18n>You need to reload the page after applying a new language.</small>
@@ -27,6 +27,41 @@
           </div>
         </div>
 
+        <div class="form-row form-group">
+          <div class="col-md-3 col-form-label">
+            <span i18n>Date display</span>
+          </div>
+          <div class="col">
+
+            <select class="form-control" formControlName="dateLocale">
+              <option *ngFor="let lang of dateLocaleOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code"> ({{today | date:'shortDate':null:lang.code}})</span></option>
+            </select>
+
+          </div>
+        </div>
+
+        <div class="form-row form-group">
+          <div class="col-md-3 col-form-label">
+            <span i18n>Date format</span>
+          </div>
+          <div class="col">
+
+            <div class="custom-control custom-radio">
+              <input type="radio" id="dateFormatShort" name="dateFormat" class="custom-control-input" formControlName="dateFormat" value="shortDate">
+              <label class="custom-control-label" for="dateFormatShort" i18n>Short: {{today | customDate:'shortDate'}}</label>
+            </div>
+            <div class="custom-control custom-radio">
+              <input type="radio" id="dateFormatMedium" name="dateFormat" class="custom-control-input" formControlName="dateFormat" value="mediumDate">
+              <label class="custom-control-label" for="dateFormatMedium" i18n>Medium: {{today | customDate:'mediumDate'}}</label>
+            </div>
+            <div class="custom-control custom-radio">
+              <input type="radio" id="dateFormatLong" name="dateFormat" class="custom-control-input" formControlName="dateFormat" value="longDate">
+              <label class="custom-control-label" for="dateFormatLong" i18n>Long: {{today | customDate:'longDate'}}</label>
+            </div>
+
+          </div>
+        </div>
+
         <div class="form-row form-group">
           <div class="col-md-3 col-form-label">
             <span i18n>Items per page</span>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index f0d83a15f..8c1517800 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -3,7 +3,7 @@ import { FormControl, FormGroup } from '@angular/forms';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
-import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service';
+import { LanguageOption, SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service';
 import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
@@ -23,7 +23,9 @@ export class SettingsComponent implements OnInit {
     'darkModeEnabled': new FormControl(this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED)),
     'useNativePdfViewer': new FormControl(this.settings.get(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER)),
     'savedViews': this.savedViewGroup,
-    'displayLanguage': new FormControl(this.settings.getLanguage())
+    'displayLanguage': new FormControl(this.settings.getLanguage()),
+    'dateLocale': new FormControl(this.settings.get(SETTINGS_KEYS.DATE_LOCALE)),
+    'dateFormat': new FormControl(this.settings.get(SETTINGS_KEYS.DATE_FORMAT)),
   })
 
   savedViews: PaperlessSavedView[]
@@ -64,14 +66,24 @@ export class SettingsComponent implements OnInit {
     this.settings.set(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, this.settingsForm.value.darkModeUseSystem)
     this.settings.set(SETTINGS_KEYS.DARK_MODE_ENABLED, (this.settingsForm.value.darkModeEnabled == true).toString())
     this.settings.set(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, this.settingsForm.value.useNativePdfViewer)
+    this.settings.set(SETTINGS_KEYS.DATE_LOCALE, this.settingsForm.value.dateLocale)
+    this.settings.set(SETTINGS_KEYS.DATE_FORMAT, this.settingsForm.value.dateFormat)
     this.settings.setLanguage(this.settingsForm.value.displayLanguage)
     this.documentListViewService.updatePageSize()
     this.settings.updateDarkModeSettings()
     this.toastService.showInfo($localize`Settings saved successfully.`)
   }
 
-  get languages() {
-    return this.settings.getLanguageOptions()
+  get displayLanguageOptions(): LanguageOption[] {
+    return [{code: "", name: $localize`Use system language`}].concat(this.settings.getLanguageOptions())
+  }
+
+  get dateLocaleOptions(): LanguageOption[] {
+    return [{code: "", name: $localize`Use same as display language`}].concat(this.settings.getLanguageOptions())
+  }
+
+  get today() {
+    return new Date()
   }
 
   saveSettings() {
diff --git a/src-ui/src/app/pipes/custom-date.pipe.spec.ts b/src-ui/src/app/pipes/custom-date.pipe.spec.ts
new file mode 100644
index 000000000..822966baf
--- /dev/null
+++ b/src-ui/src/app/pipes/custom-date.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { CustomDatePipe } from './custom-date.pipe';
+
+describe('CustomDatePipe', () => {
+  it('create an instance', () => {
+    const pipe = new CustomDatePipe();
+    expect(pipe).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/pipes/custom-date.pipe.ts b/src-ui/src/app/pipes/custom-date.pipe.ts
new file mode 100644
index 000000000..19989fbdd
--- /dev/null
+++ b/src-ui/src/app/pipes/custom-date.pipe.ts
@@ -0,0 +1,19 @@
+import { DatePipe } from '@angular/common';
+import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core';
+import { SettingsService, SETTINGS_KEYS } from '../services/settings.service';
+
+@Pipe({
+  name: 'customDate'
+})
+export class CustomDatePipe extends DatePipe implements PipeTransform {
+
+  constructor(@Inject(LOCALE_ID) locale: string, private settings: SettingsService) {
+    super(settings.get(SETTINGS_KEYS.DATE_LOCALE) || locale)
+
+  }
+
+  transform(value: any, format?: string, timezone?: string, locale?: string): string | null {
+    return super.transform(value, format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT), timezone, locale)
+  }
+
+}
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index 50adcf5a7..04918d835 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -9,13 +9,21 @@ export interface PaperlessSettings {
   default: any
 }
 
+export interface LanguageOption {
+  code: string,
+  name: string,
+  englishName?: string
+}
+
 export const SETTINGS_KEYS = {
   BULK_EDIT_CONFIRMATION_DIALOGS: 'general-settings:bulk-edit:confirmation-dialogs',
   BULK_EDIT_APPLY_ON_CLOSE: 'general-settings:bulk-edit:apply-on-close',
   DOCUMENT_LIST_SIZE: 'general-settings:documentListSize',
   DARK_MODE_USE_SYSTEM: 'general-settings:dark-mode:use-system',
   DARK_MODE_ENABLED: 'general-settings:dark-mode:enabled',
-  USE_NATIVE_PDF_VIEWER: 'general-settings:document-details:native-pdf-viewer'
+  USE_NATIVE_PDF_VIEWER: 'general-settings:document-details:native-pdf-viewer',
+  DATE_LOCALE: 'general-settings:date-display:date-locale',
+  DATE_FORMAT: 'general-settings:date-display:date-format'
 }
 
 const SETTINGS: PaperlessSettings[] = [
@@ -24,7 +32,9 @@ const SETTINGS: PaperlessSettings[] = [
   {key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, type: "number", default: 50},
   {key: SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, type: "boolean", default: true},
   {key: SETTINGS_KEYS.DARK_MODE_ENABLED, type: "boolean", default: false},
-  {key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, type: "boolean", default: false}
+  {key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, type: "boolean", default: false},
+  {key: SETTINGS_KEYS.DATE_LOCALE, type: "string", default: "de"},
+  {key: SETTINGS_KEYS.DATE_FORMAT, type: "string", default: "mediumDate"}
 ]
 
 @Injectable({
@@ -59,13 +69,12 @@ export class SettingsService {
 
   }
 
-  getLanguageOptions() {
+  getLanguageOptions(): LanguageOption[] {
     return [
-      {code: "", name: $localize`Use system language`},
-      {code: "en-us", name: `${$localize`English`} (English)`},
-      {code: "de", name: `${$localize`German`} (German)`},
-      {code: "nl", name: `${$localize`Dutch`} (Dutch)`},
-      {code: "fr", name: `${$localize`French`} (French)`}
+      {code: "en-us", name: $localize`English`, englishName: "English"},
+      {code: "de", name: $localize`German`, englishName: "German"},
+      {code: "nl", name: $localize`Dutch`, englishName: "Dutch"},
+      {code: "fr", name: $localize`French`, englishName: "French"}
     ]
   }
 

From d5eff386dbfc5a976b58df5fe96f9eec05cba125 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 17 Jan 2021 00:25:40 +0100
Subject: [PATCH 0903/1300] update translation messages

---
 src-ui/messages.xlf                           | 106 ++++++++++++------
 .../manage/settings/settings.component.ts     |   2 +-
 2 files changed, 75 insertions(+), 33 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index a1f0e8b88..a98c076ec 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -475,21 +475,35 @@
         <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/>&quot; deleted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5647210819299459618" datatype="html">
         <source>Settings saved successfully.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">74</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6839066544204061364" datatype="html">
+        <source>Use system language</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">78</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7729897675462249787" datatype="html">
+        <source>Use date format of display language</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8488620293789898901" datatype="html">
         <source>Error while storing settings on server: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
@@ -510,7 +524,7 @@
         <source>Saved views</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13" datatype="html">
@@ -534,109 +548,144 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="0cd55822928764cc82a62ee3e6f3adbc1c630479" datatype="html">
+        <source>Date display</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7df4de0d0704a06a302d853e31f2580eba98f127" datatype="html">
+        <source>Date format</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0f0c311d9a4e0cf399cc0ebbe233cacb4bdfca1f" datatype="html">
+        <source>Short: <x id="INTERPOLATION" equiv-text="{{today | customDate:&apos;shortDate&apos;}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="579f2c7581cfe52e7e5db4985d036db18f640606" datatype="html">
+        <source>Medium: <x id="INTERPOLATION" equiv-text="{{today | customDate:&apos;mediumDate&apos;}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4eb0123bd8786494de05ba50cc4a0bfc2655c5df" datatype="html">
+        <source>Long: <x id="INTERPOLATION" equiv-text="{{today | customDate:&apos;longDate&apos;}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="2045151788cbdda7512752e408da59a6b54a8ef0" datatype="html">
         <source>Items per page</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">32</context>
+          <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c4435e56bf0289e78fedc462f1d21fb30b9de55d" datatype="html">
         <source>Document editor</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4903e521c9bfd11ce88e7a5575106ef638912e0d" datatype="html">
         <source>Use PDF viewer provided by the browser</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d7db07023e53f8396d18d375c2b78c25fc81c197" datatype="html">
         <source>This is usually faster for displaying large PDF documents, but it might not work on some browsers.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff" datatype="html">
         <source>Dark mode</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">59</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637" datatype="html">
         <source>Use system settings</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8ee474504043fa89821d626e4f3413240fa91b53" datatype="html">
         <source>Enable dark mode</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3863a86cd9e69a61d143d3daf51df44203df4a82" datatype="html">
         <source>Bulk editing</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">67</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586" datatype="html">
         <source>Show confirmation dialogs</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a" datatype="html">
         <source>Deleting documents will always ask for confirmation.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8cfddc13e04f5545ac63f419ef363505d6f78c2e" datatype="html">
         <source>Apply on close</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">72</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8cb90334f5dfd7fc67205085f59381e2a334ccfc" datatype="html">
         <source>Appears on</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5" datatype="html">
         <source>Show on dashboard</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit id="541bfc5b123b3f8867fd681eaceefb663a811973" datatype="html">
         <source>Show in sidebar</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">98</context>
+          <context context-type="linenumber">133</context>
         </context-group>
       </trans-unit>
       <trans-unit id="abba764a7a595d04dc8c3b26e04b3780d4fdb540" datatype="html">
         <source>No saved views defined.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">108</context>
+          <context context-type="linenumber">143</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ef60a738a565f498b858e903e42bc5ffc3cc1299" datatype="html">
@@ -1033,8 +1082,8 @@
           <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e" datatype="html">
-        <source>Created: <x id="INTERPOLATION" equiv-text="{{document.created | date}}"/></source>
+      <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>
@@ -1414,39 +1463,32 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="6839066544204061364" datatype="html">
-        <source>Use system language</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">64</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="5866254605255506989" datatype="html">
         <source>English</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">74</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1858110241312746425" datatype="html">
         <source>German</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3071065188816255493" datatype="html">
         <source>Dutch</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">67</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7633754075223722162" datatype="html">
         <source>French</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">77</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1519954996184640001" datatype="html">
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 8c1517800..d10297f95 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -79,7 +79,7 @@ export class SettingsComponent implements OnInit {
   }
 
   get dateLocaleOptions(): LanguageOption[] {
-    return [{code: "", name: $localize`Use same as display language`}].concat(this.settings.getLanguageOptions())
+    return [{code: "", name: $localize`Use date format of display language`}].concat(this.settings.getLanguageOptions())
   }
 
   get today() {

From fc5def157d6c47331d22ed9b45a238b195f69c89 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sat, 16 Jan 2021 23:28:01 +0000
Subject: [PATCH 0904/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 116 +++++++++++++++++++++---------
 1 file changed, 82 insertions(+), 34 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index 030cfb28c..a5b28274f 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -542,7 +542,7 @@
         <target>Gespeicherte Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; gelöscht.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -550,7 +550,23 @@
         <target>Einstellungen erfolgreich gespeichert.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">74</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6839066544204061364">
+        <source>Use system language</source>
+        <target>Benutze Systemsprache</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">78</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7729897675462249787">
+        <source>Use date format of display language</source>
+        <target>Benutze Datumsformat der Anzeigesprache</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -558,7 +574,7 @@
         <target>Fehler beim Speichern der Einstellungen auf dem Server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -582,7 +598,7 @@
         <target>Gespeicherte Ansichten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
@@ -609,12 +625,52 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="0cd55822928764cc82a62ee3e6f3adbc1c630479">
+        <source>Date display</source>
+        <target>Datumsanzeige</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7df4de0d0704a06a302d853e31f2580eba98f127">
+        <source>Date format</source>
+        <target>Datumsformat</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0f0c311d9a4e0cf399cc0ebbe233cacb4bdfca1f">
+        <source>Short: <x equiv-text="{{today | customDate:'shortDate'}}" id="INTERPOLATION"/></source>
+        <target>Kurz: <x equiv-text="{{today | customDate:'shortDate'}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="579f2c7581cfe52e7e5db4985d036db18f640606">
+        <source>Medium: <x equiv-text="{{today | customDate:'mediumDate'}}" id="INTERPOLATION"/></source>
+        <target>Mittel: <x equiv-text="{{today | customDate:'mediumDate'}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4eb0123bd8786494de05ba50cc4a0bfc2655c5df">
+        <source>Long: <x equiv-text="{{today | customDate:'longDate'}}" id="INTERPOLATION"/></source>
+        <target>Lang: <x equiv-text="{{today | customDate:'longDate'}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
         <source>Items per page</source>
         <target>Dokumente pro Seite</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">32</context>
+          <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c4435e56bf0289e78fedc462f1d21fb30b9de55d">
@@ -622,7 +678,7 @@
         <target>Dokumenteditor</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4903e521c9bfd11ce88e7a5575106ef638912e0d">
@@ -630,7 +686,7 @@
         <target>Benutze PDF-Betrachter des Web Browsers</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="d7db07023e53f8396d18d375c2b78c25fc81c197">
@@ -638,7 +694,7 @@
         <target>Der integrierte PDF-Betrachter des Web-Browsers ist in der Regel schneller bei der Anzeige besonders großer Dokumente, funktioniert aber nicht in allen Browsern.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
@@ -646,7 +702,7 @@
         <target>Dunkler Modus</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">59</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
@@ -654,7 +710,7 @@
         <target>Benutze Systemeinstellungen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8ee474504043fa89821d626e4f3413240fa91b53">
@@ -662,7 +718,7 @@
         <target>Dunklen Modus aktivieren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
@@ -670,7 +726,7 @@
         <target>Massenbearbeitung</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">67</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
@@ -678,7 +734,7 @@
         <target>Bestätigungsdialoge anzeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
@@ -686,7 +742,7 @@
         <target>Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
@@ -694,7 +750,7 @@
         <target>Anwenden beim Schließen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">72</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -702,7 +758,7 @@
         <target>Erscheint auf</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -710,7 +766,7 @@
         <target>Auf Startseite zeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -718,7 +774,7 @@
         <target>In Seitenleiste zeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">98</context>
+          <context context-type="linenumber">133</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -726,7 +782,7 @@
         <target>Keine gespeicherten Ansichten vorhanden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">108</context>
+          <context context-type="linenumber">143</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -1179,9 +1235,9 @@
           <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e">
-        <source>Created: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></source>
-        <target>Erstellt: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="849b42384616374df49bd8b3711ec159cb10b845">
+        <source>Created: <x equiv-text="{{document.created | customDate}}" id="INTERPOLATION"/></source>
+        <target>Erstellt: <x equiv-text="{{document.created | customDate}}" id="INTERPOLATION"/></target>
         <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>
@@ -1614,20 +1670,12 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="6839066544204061364">
-        <source>Use system language</source>
-        <target>Benutze Systemsprache</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">64</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="5866254605255506989">
         <source>English</source>
         <target>Englisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">74</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
@@ -1635,7 +1683,7 @@
         <target>Deutsch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1643,7 +1691,7 @@
         <target>Niederländisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">67</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1651,7 +1699,7 @@
         <target>Französisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">77</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1519954996184640001">

From f919ec0d57ede446e95143cfc137b1b1702457d3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 17 Jan 2021 00:52:54 +0100
Subject: [PATCH 0905/1300] version bump

---
 .github/workflows/ci.yml                    |  2 +-
 docs/changelog.rst                          | 25 ++++++++++++++++-----
 src-ui/src/environments/environment.prod.ts |  2 +-
 src/paperless/version.py                    |  2 +-
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4fadf260e..425243163 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -208,7 +208,7 @@ jobs:
           tag_name: ng-${{ steps.get_version.outputs.version }}
           release_name: Paperless-ng ${{ steps.get_version.outputs.version }}
           draft: false
-          prerelease: true
+          prerelease: false
           body: |
             For a complete list of changes, see the changelog at https://paperless-ng.readthedocs.io/en/latest/changelog.html.
       -
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 498c53301..f5bf41b25 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,19 @@
 Changelog
 *********
 
+
+paperless-ng 1.0.0
+##################
+
+Nothing special about this release, but since there are relatively few bug reports coming in, I think that this is reasonably stable.
+
+* Changes and additions
+
+  * Added a language selector to the settings.
+  * Added date format options to the settings.
+  * Range selection with shift clicking is now possible in the document list.
+
+
 paperless-ng 0.9.14
 ###################
 
@@ -116,7 +129,7 @@ paperless-ng 0.9.10
   * There are some configuration options in the settings to alter the behavior.
 
 * Other changes and additions
-  
+
   * Thanks to `zjean`_, paperless now publishes a webmanifest, which is useful for adding the application to home screens on mobile devices.
   * The Paperless-ng logo now navigates to the dashboard.
   * Filter for documents that don't have any correspondents, types or tags assigned.
@@ -136,7 +149,7 @@ paperless-ng 0.9.10
   The bulk delete operations did not update the search index. Therefore, documents that you deleted remained in the index and
   caused the search to return messages about missing documents when searching. Further bulk operations will properly update
   the index.
-  
+
   However, this change is not retroactive: If you used the delete method of the bulk editor, you need to reindex your search index
   by :ref:`running the management command document_index with the argument reindex <administration-index>`.
 
@@ -191,12 +204,12 @@ paperless-ng 0.9.7
 
   * Thanks to the hard work of `Michael Shamoon`_, paperless now comes with a much more streamlined UI for
     filtering documents.
-  
+
   * `Michael Shamoon`_ replaced the document preview with another component. This should fix compatibility with Safari browsers.
 
   * Added buttons to the management pages to quickly show all documents with one specific tag, correspondent, or title.
-  
-  * Paperless now stores your saved views on the server and associates them with your user account. 
+
+  * Paperless now stores your saved views on the server and associates them with your user account.
     This means that you can access your views on multiple devices and have separate views for different users.
     You will have to recreate your views.
 
@@ -214,7 +227,7 @@ paperless-ng 0.9.7
     This option enables you to be logged in into multiple instances by specifying different cookie names for each instance.
 
 * Fixes
-  
+
   * Sometimes paperless would assign dates in the future to newly consumed documents.
   * The filename format fields ``{created_month}`` and ``{created_day}`` now use a leading zero for single digit values.
   * The filename format field ``{tags}`` can no longer be used without arguments.
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index c5ef431cd..fbd65d573 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,5 +2,5 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "0.9.14"
+  version: "1.0.0"
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index ac1d6312c..8dcd08521 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (0, 9, 14)
+__version__ = (1, 0, 0)

From 31b74515b6fd8057d12ad5c9131973314a6ec102 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 16 Jan 2021 20:49:12 -0800
Subject: [PATCH 0906/1300] Allow "live" changing of date format

---
 .../app/components/manage/settings/settings.component.html  | 6 +++---
 .../app/components/manage/settings/settings.component.ts    | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index d5acfb149..9b35b5b3f 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -48,15 +48,15 @@
 
             <div class="custom-control custom-radio">
               <input type="radio" id="dateFormatShort" name="dateFormat" class="custom-control-input" formControlName="dateFormat" value="shortDate">
-              <label class="custom-control-label" for="dateFormatShort" i18n>Short: {{today | customDate:'shortDate'}}</label>
+              <label class="custom-control-label" for="dateFormatShort" i18n>Short: {{today | customDate:'shortDate':null:comptuedDateLocale}}</label>
             </div>
             <div class="custom-control custom-radio">
               <input type="radio" id="dateFormatMedium" name="dateFormat" class="custom-control-input" formControlName="dateFormat" value="mediumDate">
-              <label class="custom-control-label" for="dateFormatMedium" i18n>Medium: {{today | customDate:'mediumDate'}}</label>
+              <label class="custom-control-label" for="dateFormatMedium" i18n>Medium: {{today | customDate:'mediumDate':null:comptuedDateLocale}}</label>
             </div>
             <div class="custom-control custom-radio">
               <input type="radio" id="dateFormatLong" name="dateFormat" class="custom-control-input" formControlName="dateFormat" value="longDate">
-              <label class="custom-control-label" for="dateFormatLong" i18n>Long: {{today | customDate:'longDate'}}</label>
+              <label class="custom-control-label" for="dateFormatLong" i18n>Long: {{today | customDate:'longDate':null:comptuedDateLocale}}</label>
             </div>
 
           </div>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index d10297f95..9a315c245 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -30,6 +30,10 @@ export class SettingsComponent implements OnInit {
 
   savedViews: PaperlessSavedView[]
 
+  get comptuedDateLocale(): string {
+    return this.settingsForm.value.dateLocale || this.settingsForm.value.displayLanguage
+  }
+
   constructor(
     public savedViewService: SavedViewService,
     private documentListViewService: DocumentListViewService,

From 741ccfa280be57e622c8a8253419229cda5d246f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 16 Jan 2021 21:39:13 -0800
Subject: [PATCH 0907/1300] Fix svg attribute error

Unrelated to the rest of this branch but not worth a separate PR
---
 src-ui/src/app/components/dashboard/dashboard.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 47751fe8b..c10b8ea04 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -1,5 +1,5 @@
 <app-page-header title="Dashboard" [subTitle]="subtitle" i18n-title>
-  <svg class="logo d-none d-md-block" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.64" height="5rem" width="auto">
+  <svg class="logo d-none d-md-block" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.64" height="5rem">
     <path class="leaf" d="M730.71,0C616.3,266.24,66.21,299.25,242.24,728.31c2.2,5.5-40.71,63.81-69.31,112.22-6.6-24.21-14.3-50.61-13.2-52.81C302.75,618.29,57.41,522.58,44.21,384-17.4,494-39.4,686.5,146.53,797.62c1.1,0,9.9,41.81,14.3,62.71-4.4,8.8-8.8,17.6-11,24.2-4.4,11,28.6,9.91,28.6,12.11,3.3-1.1,81.41-138.63,83.61-139.73C704.31,655.7,782.42,257.44,730.71,0ZM105.82,544.58C145.43,580.89,211.44,692,155.33,756.91,168.53,727.21,172.93,660.1,105.82,544.58ZM269.74,670C200.43,506.08,404,325.65,505.18,280.54,298.35,465.37,263.14,602.89,269.74,670Z" transform="translate(0)" style="fill:#17541f"/>
     <path class="text" style="fill:#000" d="M1169.27,231.44q.7,17.06.71,38.73t-.71,38a112,112,0,0,1-6.76,38A100.16,100.16,0,0,1,1142.25,380a93.87,93.87,0,0,1-33.76,23.46q-20.25,8.54-46.56,8.53h-36.25V597.5q0,9.94,2.85,14.57c1.89,3.08,3.79,4.86,5.68,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.56-.71,7.1-5.33t3.56-14.57V166q0-10.66-3.56-15.28t-7.1-6q-2.85-1.42-8.53,0V127.66h104.48q26.31,0,46.56,8.53a93.75,93.75,0,0,1,33.76,23.46,101,101,0,0,1,20.26,33.4A111.05,111.05,0,0,1,1169.27,231.44ZM1118.8,215.8q0-18.48-6-32t-14.22-21.32a74.68,74.68,0,0,0-17.06-12.44q-8.88-4.62-15.28-4.62h-40.52V392.79h40.52q6.39,0,15.28-3.56t17.06-12.44a86,86,0,0,0,14.22-21.67q6-12.8,6-32Zm337.63,389.52a27.35,27.35,0,0,1-2.85,11.72,40.58,40.58,0,0,1-8.17,11.38,54.8,54.8,0,0,1-13.5,9.59,40.07,40.07,0,0,1-18.84,4.27,60,60,0,0,1-30.57-7.82q-13.5-7.82-18.48-20.61a56.12,56.12,0,0,1-6.39-16.35q-9.24,19.18-28.08,32a72.42,72.42,0,0,1-41.58,12.8q-28.44,0-49.76-20.61-12.07-10.67-19.9-27.73t-9.24-39.09q-.71-2.13-.71-8.53v-.71a124.43,124.43,0,0,1,4.26-25.23,113.22,113.22,0,0,1,11-26.3,149.46,149.46,0,0,1,17.77-24.88,128.6,128.6,0,0,1,22.39-20.26,17.39,17.39,0,0,0,4.62-3.2,28.53,28.53,0,0,1,5.33-3.91l2.13-1.06,2.14-1.07q12.8-7.81,22.39-14.22t17.41-12.08a97.25,97.25,0,0,0,8.53-6.4c2.84-2.37,5.93-4.73,9.24-7.1a79.43,79.43,0,0,0,12.09-10,36.51,36.51,0,0,0,8.53-13.5q4.26-7.11,4.26-17.06a67.74,67.74,0,0,0-2.13-17.77,49.09,49.09,0,0,0-14.57-27q-11.73-11.37-26-14.93a38.26,38.26,0,0,0-12.08-2.13q-19.9,0-34.12,7.11-9.24,4.26-13.51,9.59t-4.62,10a10.73,10.73,0,0,0,1.78,7.46,12.91,12.91,0,0,0,5.69,4.26,6,6,0,0,0,1.78.71,6.28,6.28,0,0,1,1.77.72,32.21,32.21,0,0,1,15.28,12.43,34,34,0,0,1,6,19.55,32.78,32.78,0,0,1-32.7,32.7,33.53,33.53,0,0,1-24.17-9.6,30.94,30.94,0,0,1-10-23.1,106.83,106.83,0,0,1,3.2-25.23,84.65,84.65,0,0,1,9.6-23.81q13.5-19.91,32.34-28.79a96.24,96.24,0,0,1,41.58-8.89,93.82,93.82,0,0,1,33.76,6.4,96.18,96.18,0,0,1,29.86,18.13,103.38,103.38,0,0,1,22,28.07q8.88,16.35,8.88,37.68v209q0,12.79.36,16.7t.36,5.34h0q0,9.24,5.68,14.92a18.45,18.45,0,0,0,13.51,5.69q9.24,0,14.92-5.33a20.62,20.62,0,0,0,6.4-13.86Zm-111.6-17.77a52.58,52.58,0,0,0,6.76-21.33q1.07-11.37,1.06-21.32V413.4a63.92,63.92,0,0,1-6,5.33,74,74,0,0,0-6.75,6q-20.62,14.93-35.19,27.37a164.06,164.06,0,0,0-24.52,25.59,113,113,0,0,0-15.64,28.07,121,121,0,0,0-7.11,34.12v10.67q.72,27,14.58,42.29t39.44,15.28a38.56,38.56,0,0,0,20.62-5.69q9.24-6.39,12.79-14.92Zm244.52-304.23q40.51.72,64.68,24.53t24.17,75.7V542.77q0,51.88-24.17,75.34T1589.35,643h-2.13a80.27,80.27,0,0,1-22-2.84h-.71a.63.63,0,0,1-.71-.71,91.74,91.74,0,0,1-28.43-15.64l-6.76-6.76-5.33-7.46v118q0,10,2.85,14.58c1.89,3.08,3.79,5.09,5.68,6a10.54,10.54,0,0,0,9.24,0V766h-86V748.19q5.68,2.13,8.53,0,3.56-1.43,6.75-6t3.2-14.58V326.68q0-9.94-3.2-14.57t-6.75-6q-2.85-1.43-8.53,0V289h68.23v27.72a68.68,68.68,0,0,1,12.09-14.21,75.62,75.62,0,0,1,28.43-15.64.63.63,0,0,1,.71-.71h.71a90.55,90.55,0,0,1,22-2.85Zm35.54,84.59v-.71q-.72-36.26-8.89-51.18t-26.65-16.35a63.12,63.12,0,0,0-24.17,3.2,48,48,0,0,0-19.9,13.15q-8.54,9.24-14.22,24.88t-7.82,37V548.45q2.13,22,7.82,37.32t14.22,24.17a53.23,53.23,0,0,0,19.9,13.15,58.92,58.92,0,0,0,24.17,3.55q18.48-1.42,26.65-16.35t8.89-51.18V367.91Zm179.83-84.59a105.36,105.36,0,0,1,33.41,5.69,86.38,86.38,0,0,1,30.56,17.77,88.06,88.06,0,0,1,21.68,30.57q8.18,18.48,8.18,44.06v90.28H1757.1V544.9q0,44.07,15.28,62.9t38,18.13a113.94,113.94,0,0,0,26.65-4.62,54.83,54.83,0,0,0,22.75-13.15q9.59-9.24,16-26.3t6.4-44.78h16.35V547a153.56,153.56,0,0,1-4.27,36.61A72,72,0,0,1,1852,634.1q-16.71,7.47-40.87,8.18a102.25,102.25,0,0,1-34.83-6.4,96,96,0,0,1-32-19.19,108.91,108.91,0,0,1-23.45-30.21q-9.24-17.41-9.25-39.45v-16.7s-.11-9.12-.35-27.37-.36-29.5-.36-33.76-.11-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56A90.72,90.72,0,0,1,1771,289.37a98.55,98.55,0,0,1,33.76-6.05Zm46.2,169.89V397.05q0-27-3.55-45.13t-9.6-29.15q-6-11-14.57-15.28a42.36,42.36,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.72,73.92v56.16Zm279.35-113.73a42.31,42.31,0,0,0,.71,5.68,17.92,17.92,0,0,1,0,7.11q-.72,14.93-10.31,24.52a33,33,0,0,1-46.91-.35,33.52,33.52,0,0,1-9.6-24.17q0-17.76,13.51-27a8.33,8.33,0,0,0,1.77-1.06l1.07-1.07a16.22,16.22,0,0,0,6.4-10.31q1.41-6.75-8.53-11.73a26.26,26.26,0,0,0-12.8-3.55q-21.32-1.43-37.67,12.8t-22,49.75V597.5q0,9.94,2.84,14.57t5.69,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.55-.71,7.11-5.33t3.55-14.57V326.68q0-9.94-3.55-14.57t-7.11-6q-2.85-1.43-8.53,0V288.3h68.24v29.14q5-7.81,9.95-14.57a48.44,48.44,0,0,1,11.72-11.37,59.79,59.79,0,0,1,15.64-7.46q8.89-2.85,22.39-2.85,20.61,0,38.39,14.93t26.3,43.36Zm95.95,258q0,9.94,3.2,14.57c2.13,3.08,4.15,4.86,6,5.33q3.55,2.13,9.24,0v18.48h-86V617.4q5.68,2.13,10,0,2.13-.71,5.69-5.33t3.55-14.57V166.75q0-10.65-3.55-15.28a28.82,28.82,0,0,0-5.69-6q-4.26-2.13-10,0V128.37h67.52V597.5Zm154.25-314.18a105.25,105.25,0,0,1,33.4,5.69,86.33,86.33,0,0,1,30.57,17.77,88.19,88.19,0,0,1,21.68,30.57q8.18,18.48,8.17,44.06v90.28H2332.84V544.9q0,44.07,15.29,62.9t38,18.13a113.93,113.93,0,0,0,26.66-4.62,54.79,54.79,0,0,0,22.74-13.15q9.6-9.24,16-26.3t6.39-44.78h16.35V547a153.56,153.56,0,0,1-4.26,36.61,72,72,0,0,1-42.29,50.46q-16.71,7.47-40.88,8.18a102.24,102.24,0,0,1-34.82-6.4,96,96,0,0,1-32-19.19,108.94,108.94,0,0,1-23.46-30.21q-9.24-17.41-9.24-39.45v-16.7s-.12-9.12-.35-27.37-.36-29.5-.36-33.76-.12-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56a90.78,90.78,0,0,1,29.85-17.77,98.6,98.6,0,0,1,33.77-6.05Zm46.2,169.89V397.05q0-27-3.56-45.13t-9.59-29.15q-6-11-14.57-15.28a42.39,42.39,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.73,73.92v56.16Zm213.24,178.41c-.48.47-.83.71-1.07.71s-.59.23-1.06.71l-.71.71c-1,.47-2,1-3.2,1.42s-2.25,1-3.2,1.42q-14.93,6.4-34.83,6.4a48.79,48.79,0,0,1-22-5.33q-10.65-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.5V550.59h17.06q-1.43,22.74,5,39.09,4.27,14.22,16.71,26.65t37.31,12.44q16.35,0,27-5.68,18.48-9.24,25.24-22A45.92,45.92,0,0,0,2657,574.4q-1.42-13.86-10.31-27.37A126,126,0,0,0,2625,522.15q-8.52-6.39-17.77-13.5t-18.48-14.93q-24.87-19.91-39.45-35.89T2526.89,428a98.76,98.76,0,0,1-10.66-26.3,119.09,119.09,0,0,1-2.84-26.65,106,106,0,0,1,1.06-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,63,63,0,0,1,14.21-20.26A73.7,73.7,0,0,1,2561,288.3q13.5-5.69,32.7-5.69a53.27,53.27,0,0,1,21.32,4.62q10.66,4.62,19.19,8.53t13.51,3.56q5-.36,5-11h13.51v88.14h-18.48q.7-21.33-5-38.38a67,67,0,0,0-17.41-27Q2612.89,299,2588.73,299q-19.18,0-31.27,8.53-6.4,5-11,14.57a55.84,55.84,0,0,0-5.33,21,66.08,66.08,0,0,0,3.55,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.5,26.5,0,0,0,5.33,3.56,23,23,0,0,1,3.56,2.84l2.84,2.84q7.82,6.41,16,12.8t16.71,12.79a449.06,449.06,0,0,1,33.05,30.92,276.13,276.13,0,0,1,22,25.94,104.57,104.57,0,0,1,13.15,22.75,69,69,0,0,1,5,20.61q7.11,32.7-2.49,55.09t-24.52,35.19h-.71a1.26,1.26,0,0,1-1.43,1.42,11,11,0,0,1-2.84,2.13l-4.26,2.84-4.27,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.12,3.12,0,0,1-1.42.36Zm211.11,0c-.48.47-.83.71-1.07.71s-.59.23-1.07.71l-.71.71c-.94.47-2,1-3.2,1.42s-2.25,1-3.19,1.42Q2826.84,643,2807,643a48.76,48.76,0,0,1-22-5.33q-10.66-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.51V550.59h17.06q-1.41,22.74,5,39.09,4.26,14.22,16.7,26.65t37.32,12.44q16.35,0,27-5.68,18.48-9.24,25.23-22a45.93,45.93,0,0,0,5.34-26.65q-1.42-13.86-10.31-27.37a126,126,0,0,0-21.68-24.88q-8.53-6.39-17.77-13.5t-18.48-14.93q-24.89-19.91-39.45-35.89T2738,428a98.76,98.76,0,0,1-10.66-26.3,119.08,119.08,0,0,1-2.85-26.65,105.9,105.9,0,0,1,1.07-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,62.83,62.83,0,0,1,14.21-20.26,73.58,73.58,0,0,1,22.75-14.57q13.5-5.69,32.69-5.69a53.28,53.28,0,0,1,21.33,4.62q10.67,4.62,19.19,8.53t13.5,3.56q5-.36,5-11h13.51v88.14h-18.49q.72-21.33-5-38.38a67,67,0,0,0-17.42-27Q2824,299,2799.84,299q-19.2,0-31.28,8.53-6.39,5-11,14.57a56,56,0,0,0-5.34,21,66.3,66.3,0,0,0,3.56,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.22,26.22,0,0,0,5.33,3.56,22.83,22.83,0,0,1,3.55,2.84l2.85,2.84q7.82,6.41,16,12.8t16.7,12.79a445,445,0,0,1,33.05,30.92,274.85,274.85,0,0,1,22,25.94,105,105,0,0,1,13.15,22.75,68.69,68.69,0,0,1,5,20.61q7.11,32.7-2.48,55.09t-24.53,35.19h-.71a1.26,1.26,0,0,1-1.42,1.42,11.2,11.2,0,0,1-2.84,2.13l-4.27,2.84-4.26,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.15,3.15,0,0,1-1.42.36Z" transform="translate(0)"/>
   </svg>

From 016c16840424f2cb49c1938b93cc14b3a6a2cfc0 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 17 Jan 2021 09:04:39 +0000
Subject: [PATCH 0908/1300] Translate /src-ui/messages.xlf in nl_NL

translation completed for the source file '/src-ui/messages.xlf'
on the 'nl_NL' language.
---
 src-ui/src/locale/messages.nl_NL.xlf | 314 +++++++++++++++++++--------
 1 file changed, 221 insertions(+), 93 deletions(-)

diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf
index 4ae7459da..c77a77bea 100644
--- a/src-ui/src/locale/messages.nl_NL.xlf
+++ b/src-ui/src/locale/messages.nl_NL.xlf
@@ -11,7 +11,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
         <source>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; saved successfully.</source>
-        <target>View &amp;quot;<x equiv-text="this.list.savedView.name" id="PH"/>&amp;quot; met succes opgeslagen.</target>
+        <target>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; met succes opgeslagen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
           <context context-type="linenumber">94</context>
@@ -19,7 +19,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
         <source>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; created successfully.</source>
-        <target>View &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; met succes gemaakt.</target>
+        <target>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; met succes gemaakt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
           <context context-type="linenumber">115</context>
@@ -38,7 +38,7 @@
         <target>Niets selecteren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9">
@@ -46,7 +46,7 @@
         <target>Selecteer pagina</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">12</context>
+          <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74">
@@ -54,15 +54,15 @@
         <target>Alles selecteren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="ec97f67072a83aaa972536b18d83179f6e4bbec9">
-        <source>Sort by</source>
-        <target>Sorteer op</target>
+      <trans-unit datatype="html" id="5d43539fc358c3a548b9d487be821db73e2702ff">
+        <source>Sort</source>
+        <target>Sorteren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="b7641aed03492978b4ec6843b1e53f30464294d9">
@@ -83,7 +83,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="72e7d343f9165602cce1ca7faffbc565fd31ef92">
         <source>Save &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
-        <target>Opslaan &amp;quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&amp;quot;</target>
+        <target>Opslaan &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">71</context>
@@ -94,7 +94,7 @@
         <target>{VAR_PLURAL, plural, =1 {<x id="INTERPOLATION"/> van één document geselecteerd} other {<x id="INTERPOLATION"/> van <x id="INTERPOLATION_1"/> documenten geselecteerd}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9">
@@ -102,7 +102,7 @@
         <target>{VAR_PLURAL, plural, =1 {Eén document} other {<x id="INTERPOLATION"/> documenten}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bb91083b44e3f77dd68de773ceab467ca3d57507">
@@ -110,7 +110,7 @@
         <target>(gefilterd)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
@@ -118,7 +118,7 @@
         <target>ASN</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">105</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
@@ -126,7 +126,7 @@
         <target>Correspondent</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">113</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
@@ -134,7 +134,7 @@
         <target>Titel</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">119</context>
+          <context context-type="linenumber">117</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
@@ -142,7 +142,7 @@
         <target>Documenttype</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
@@ -150,7 +150,7 @@
         <target>Aangemaakt</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">131</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
@@ -158,7 +158,7 @@
         <target>Toegevoegd</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">137</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9021887951960049161">
@@ -166,15 +166,15 @@
         <target>Bevestig het verwijderen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">186</context>
+          <context context-type="linenumber">192</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
         <source>Do you really want to delete document &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</source>
-        <target>Wilt u het document echt verwijderen &amp;quot;<x equiv-text="this.document.title" id="PH"/>&amp;quot;?</target>
+        <target>Wilt u het document echt verwijderen &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">187</context>
+          <context context-type="linenumber">193</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6691075929777935948">
@@ -182,7 +182,7 @@
         <target>De bestanden voor dit document worden definitief verwijderd. Deze bewerking kan niet ongedaan worden gemaakt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">188</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="719892092227206532">
@@ -190,7 +190,7 @@
         <target>Verwijder document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">190</context>
+          <context context-type="linenumber">196</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1844801255494293730">
@@ -198,7 +198,7 @@
         <target>Fout bij het verwijderen van het document: <x equiv-text="JSON.stringify(error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">197</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -427,7 +427,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="93754014749412887">
         <source>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Wil je het etiket echt verwijderen &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <target>Wil je het etiket echt verwijderen &quot;<x equiv-text="object.name" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
           <context context-type="linenumber">30</context>
@@ -507,7 +507,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="4990731724078522539">
         <source>Do you really want to delete the document type &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Wilt u het documenttype echt verwijderen &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <target>Wilt u het documenttype echt verwijderen &quot;<x equiv-text="object.name" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
           <context context-type="linenumber">26</context>
@@ -539,10 +539,10 @@
       </trans-unit>
       <trans-unit datatype="html" id="5610279464668232148">
         <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
-        <target>Opgeslagen view &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; verwijderd.</target>
+        <target>Opgeslagen view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; verwijderd.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -553,12 +553,28 @@
           <context context-type="linenumber">74</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="6839066544204061364">
+        <source>Use system language</source>
+        <target>Gebruik de systeemtaal</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">78</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7729897675462249787">
+        <source>Use date format of display language</source>
+        <target>Datumopmaak van weergavetaal gebruiken</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">82</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
         <source>Error while storing settings on server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
         <target>Fout bij het opslaan van de instellingen: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -582,7 +598,7 @@
         <target>Opgeslagen views</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
@@ -593,12 +609,92 @@
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="75f8908d266f7cc9b9e68e0be906fd080a223606">
+        <source>Display language</source>
+        <target>Taal</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1284a077dc18a2d1ff1b744f16f1797eea28ae37">
+        <source>You need to reload the page after applying a new language.</source>
+        <target>De pagina moet herladen worden nadat een andere taal werd gekozen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0cd55822928764cc82a62ee3e6f3adbc1c630479">
+        <source>Date display</source>
+        <target>Datumweergave</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7df4de0d0704a06a302d853e31f2580eba98f127">
+        <source>Date format</source>
+        <target>Datumopmaak</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0f0c311d9a4e0cf399cc0ebbe233cacb4bdfca1f">
+        <source>Short: <x equiv-text="{{today | customDate:'shortDate'}}" id="INTERPOLATION"/></source>
+        <target>Kort: <x equiv-text="{{today | customDate:'shortDate'}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="579f2c7581cfe52e7e5db4985d036db18f640606">
+        <source>Medium: <x equiv-text="{{today | customDate:'mediumDate'}}" id="INTERPOLATION"/></source>
+        <target>Medium: <x equiv-text="{{today | customDate:'mediumDate'}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4eb0123bd8786494de05ba50cc4a0bfc2655c5df">
+        <source>Long: <x equiv-text="{{today | customDate:'longDate'}}" id="INTERPOLATION"/></source>
+        <target>Lang: <x equiv-text="{{today | customDate:'longDate'}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
         <source>Items per page</source>
         <target>Resultaten per pagina</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c4435e56bf0289e78fedc462f1d21fb30b9de55d">
+        <source>Document editor</source>
+        <target>Documentbewerker</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4903e521c9bfd11ce88e7a5575106ef638912e0d">
+        <source>Use PDF viewer provided by the browser</source>
+        <target>Gebruik de PDF lezer ingebouwd in uw browser</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d7db07023e53f8396d18d375c2b78c25fc81c197">
+        <source>This is usually faster for displaying large PDF documents, but it might not work on some browsers.</source>
+        <target>Dit is gewoonlijk sneller om grote PDF's te tonen, maar werkt niet bij elke browser.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
@@ -606,7 +702,7 @@
         <target>Nachtmodus</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
@@ -614,39 +710,7 @@
         <target>Gebruik systeeminstellingen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">36</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
-        <source>Bulk editing</source>
-        <target>Massabewerking</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">44</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
-        <source>Show confirmation dialogs</source>
-        <target>Toon dialoogvenster ter bevestiging</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
-        <source>Deleting documents will always ask for confirmation.</source>
-        <target>Er zal altijd om bevestiging gevraagd worden voor het verwijderen van documenten.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
-        <source>Apply on close</source>
-        <target>Toepassen bij het sluiten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8ee474504043fa89821d626e4f3413240fa91b53">
@@ -654,7 +718,39 @@
         <target>Gebruik nachtmodus</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">39</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
+        <source>Bulk editing</source>
+        <target>Massabewerking</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">102</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
+        <source>Show confirmation dialogs</source>
+        <target>Toon dialoogvenster ter bevestiging</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
+        <source>Deleting documents will always ask for confirmation.</source>
+        <target>Er zal altijd om bevestiging gevraagd worden voor het verwijderen van documenten.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
+        <source>Apply on close</source>
+        <target>Toepassen bij het sluiten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -662,7 +758,7 @@
         <target>Komt voor bij</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -670,7 +766,7 @@
         <target>Toon op het dashboard</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -678,7 +774,7 @@
         <target>Toon in de zijbalk</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">133</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -686,7 +782,7 @@
         <target>Geen opgeslagen views gedefinieerd.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">143</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -699,7 +795,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7427874343955308724">
         <source>Do you really want to delete the correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Bent u zeker dat u correspondent &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot; wilt verwijderen?</target>
+        <target>Bent u zeker dat u correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot; wilt verwijderen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
           <context context-type="linenumber">26</context>
@@ -867,7 +963,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="afa760e48c97d64d19c1455d18b7834a2256e23f">
         <source>Did you mean &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</source>
-        <target>Bedoelde u &amp;quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&amp;quot;?</target>
+        <target>Bedoelde u &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/search/search.component.html</context>
           <context context-type="linenumber">13</context>
@@ -1039,7 +1135,7 @@
         <target>Correspondenten filteren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="0ad509732aaf702b7ea8c771c7809fa84bc85908">
@@ -1047,7 +1143,7 @@
         <target>Documenttypes filteren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2d9d55f1b70142ff4597ba32179d16888fd9c6b2">
@@ -1055,7 +1151,7 @@
         <target>Filters terug zetten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">47</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7593728289020204896">
@@ -1063,7 +1159,7 @@
         <target>Niet toegekend</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">166</context>
         </context-group>
         <note from="description" priority="1">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
       </trans-unit>
@@ -1072,7 +1168,7 @@
         <target>Toepassen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4873149362496451858">
@@ -1139,12 +1235,12 @@
           <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e">
-        <source>Created: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></source>
-        <target>Aangemaakt op: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="849b42384616374df49bd8b3711ec159cb10b845">
+        <source>Created: <x equiv-text="{{document.created | customDate}}" id="INTERPOLATION"/></source>
+        <target>Aangemaakt op: <x equiv-text="{{document.created | customDate}}" id="INTERPOLATION"/></target>
         <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">65</context>
+          <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8">
@@ -1168,7 +1264,7 @@
         <target>Score:</target>
         <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">61</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2840db547019ce8c76b2cdbe3a1653c5b68b06af">
@@ -1189,7 +1285,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
         <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
-        <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot; en &amp;quot;<x equiv-text="items[1].name" id="PH_1"/>&amp;quot;</target>
+        <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; en &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">114</context>
@@ -1198,7 +1294,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7894972847287473517">
         <source>&quot;<x equiv-text="i.name" id="PH"/>&quot;</source>
-        <target>&amp;quot;<x equiv-text="i.name" id="PH"/>&amp;quot;</target>
+        <target>&quot;<x equiv-text="i.name" id="PH"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">116</context>
@@ -1215,7 +1311,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="1822679894391095557">
         <source><x equiv-text="list" id="PH"/> and &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</source>
-        <target><x equiv-text="list" id="PH"/> en &amp;quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&amp;quot;</target>
+        <target><x equiv-text="list" id="PH"/> en &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">117</context>
@@ -1232,7 +1328,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="6619516195038467207">
         <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Het etiket &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
+        <target>Het etiket &quot;<x equiv-text="tag.name" id="PH"/>&quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">129</context>
@@ -1248,7 +1344,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7181166515756808573">
         <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Het etiket &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; zal verwijderd worden van <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en).</target>
+        <target>Het etiket &quot;<x equiv-text="tag.name" id="PH"/>&quot; zal verwijderd worden van <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">134</context>
@@ -1280,7 +1376,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="6900893559485781849">
         <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>De correspondent &amp;quot;<x equiv-text="correspondent.name" id="PH"/>&amp;quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
+        <target>De correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">160</context>
@@ -1304,7 +1400,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="332180123895325027">
         <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Het documenttype &amp;quot;<x equiv-text="documentType.name" id="PH"/>&amp;quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
+        <target>Het documenttype &quot;<x equiv-text="documentType.name" id="PH"/>&quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">183</context>
@@ -1355,7 +1451,7 @@
         <target>Selecteer:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="dfc3c34e182ea73c5d784ff7c8135f087992dac1">
@@ -1363,7 +1459,7 @@
         <target>Alles</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="907df6a2b68daecc3c399cf40a764b358bd9fd84">
@@ -1371,7 +1467,7 @@
         <target>Bewerk:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">
@@ -1574,6 +1670,38 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="5866254605255506989">
+        <source>English</source>
+        <target>Engels</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">74</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1858110241312746425">
+        <source>German</source>
+        <target>Duits</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3071065188816255493">
+        <source>Dutch</source>
+        <target>Nederlands</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7633754075223722162">
+        <source>French</source>
+        <target>Frans</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">77</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="1519954996184640001">
         <source>Error</source>
         <target>Fout</target>

From 08199f09b65dfb0abebbf79dab18dca927ea77a3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 17 Jan 2021 12:14:19 +0100
Subject: [PATCH 0909/1300] fixes for #374

---
 .../app/components/manage/settings/settings.component.html  | 6 +++---
 .../app/components/manage/settings/settings.component.ts    | 2 +-
 src-ui/src/app/services/settings.service.ts                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 9b35b5b3f..13ffb4517 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -48,15 +48,15 @@
 
             <div class="custom-control custom-radio">
               <input type="radio" id="dateFormatShort" name="dateFormat" class="custom-control-input" formControlName="dateFormat" value="shortDate">
-              <label class="custom-control-label" for="dateFormatShort" i18n>Short: {{today | customDate:'shortDate':null:comptuedDateLocale}}</label>
+              <label class="custom-control-label" for="dateFormatShort" i18n>Short: {{today | customDate:'shortDate':null:computedDateLocale}}</label>
             </div>
             <div class="custom-control custom-radio">
               <input type="radio" id="dateFormatMedium" name="dateFormat" class="custom-control-input" formControlName="dateFormat" value="mediumDate">
-              <label class="custom-control-label" for="dateFormatMedium" i18n>Medium: {{today | customDate:'mediumDate':null:comptuedDateLocale}}</label>
+              <label class="custom-control-label" for="dateFormatMedium" i18n>Medium: {{today | customDate:'mediumDate':null:computedDateLocale}}</label>
             </div>
             <div class="custom-control custom-radio">
               <input type="radio" id="dateFormatLong" name="dateFormat" class="custom-control-input" formControlName="dateFormat" value="longDate">
-              <label class="custom-control-label" for="dateFormatLong" i18n>Long: {{today | customDate:'longDate':null:comptuedDateLocale}}</label>
+              <label class="custom-control-label" for="dateFormatLong" i18n>Long: {{today | customDate:'longDate':null:computedDateLocale}}</label>
             </div>
 
           </div>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 9a315c245..3c4de59b6 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -30,7 +30,7 @@ export class SettingsComponent implements OnInit {
 
   savedViews: PaperlessSavedView[]
 
-  get comptuedDateLocale(): string {
+  get computedDateLocale(): string {
     return this.settingsForm.value.dateLocale || this.settingsForm.value.displayLanguage
   }
 
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index 04918d835..d2a190c1f 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -33,7 +33,7 @@ const SETTINGS: PaperlessSettings[] = [
   {key: SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, type: "boolean", default: true},
   {key: SETTINGS_KEYS.DARK_MODE_ENABLED, type: "boolean", default: false},
   {key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, type: "boolean", default: false},
-  {key: SETTINGS_KEYS.DATE_LOCALE, type: "string", default: "de"},
+  {key: SETTINGS_KEYS.DATE_LOCALE, type: "string", default: ""},
   {key: SETTINGS_KEYS.DATE_FORMAT, type: "string", default: "mediumDate"}
 ]
 

From a68b858733327313408e898c8e307df2826ebf41 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 18 Jan 2021 01:15:39 +0100
Subject: [PATCH 0910/1300] new exporter that updates the export in place,
 fixes #376 #343 #166

---
 .../management/commands/document_exporter.py  | 156 ++++++++++++++----
 .../management/commands/document_importer.py  |   6 +-
 .../samples/documents/originals/0000002.pdf   | Bin 0 -> 25743 bytes
 .../samples/documents/originals/0000003.pdf   | Bin 0 -> 12022 bytes
 .../samples/documents/thumbnails/0000002.png  | Bin 0 -> 7913 bytes
 .../samples/documents/thumbnails/0000003.png  | Bin 0 -> 7913 bytes
 .../tests/test_management_exporter.py         | 152 +++++++++++++----
 7 files changed, 242 insertions(+), 72 deletions(-)
 create mode 100644 src/documents/tests/samples/documents/originals/0000002.pdf
 create mode 100644 src/documents/tests/samples/documents/originals/0000003.pdf
 create mode 100644 src/documents/tests/samples/documents/thumbnails/0000002.png
 create mode 100644 src/documents/tests/samples/documents/thumbnails/0000003.png

diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py
index a7a17f124..e2313e86a 100644
--- a/src/documents/management/commands/document_exporter.py
+++ b/src/documents/management/commands/document_exporter.py
@@ -1,15 +1,21 @@
+import hashlib
 import json
 import os
 import shutil
 import time
 
+import tqdm
+from django.conf import settings
 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.settings import EXPORTER_FILE_NAME, EXPORTER_THUMBNAIL_NAME, \
     EXPORTER_ARCHIVE_NAME
 from paperless.db import GnuPG
+from ...file_handling import generate_filename, delete_empty_directories
 from ...mixins import Renderable
 
 
@@ -24,13 +30,36 @@ class Command(Renderable, BaseCommand):
     def add_arguments(self, parser):
         parser.add_argument("target")
 
+        parser.add_argument(
+            "--compare-checksums",
+            default=False,
+            action="store_true",
+            help="Compare file checksums when determining whether to export "
+                 "a file or not. If not specified, file size and time "
+                 "modified is used instead."
+        )
+
+        parser.add_argument(
+            "--use-filename-format",
+            default=False,
+            action="store_true",
+            help="Use PAPERLESS_FILENAME_FORMAT for storing files in the "
+                 "export directory, if configured."
+        )
+
     def __init__(self, *args, **kwargs):
         BaseCommand.__init__(self, *args, **kwargs)
         self.target = None
+        self.files_in_export_dir = []
+        self.exported_files = []
+        self.compare_checksums = False
+        self.use_filename_format = False
 
     def handle(self, *args, **options):
 
         self.target = options["target"]
+        self.compare_checksums = options['compare_checksums']
+        self.use_filename_format = options['use_filename_format']
 
         if not os.path.exists(self.target):
             raise CommandError("That path doesn't exist")
@@ -38,52 +67,75 @@ class Command(Renderable, BaseCommand):
         if not os.access(self.target, os.W_OK):
             raise CommandError("That path doesn't appear to be writable")
 
-        if os.listdir(self.target):
-            raise CommandError("That directory is not empty.")
-
-        self.dump()
+        with FileLock(settings.MEDIA_LOCK):
+            self.dump()
 
     def dump(self):
+        # 1. Take a snapshot of what files exist in the current export folder
+        for root, dirs, files in os.walk(self.target):
+            self.files_in_export_dir.extend(
+                map(lambda f: os.path.abspath(os.path.join(root, f)), files)
+            )
 
-        documents = Document.objects.all()
-        document_map = {d.pk: d for d in documents}
-        manifest = json.loads(serializers.serialize("json", documents))
+        # 2. Create manifest, containing all correspondents, types, tags and
+        # documents
+        with transaction.atomic():
+            manifest = json.loads(
+                serializers.serialize("json", Correspondent.objects.all()))
 
-        for index, document_dict in enumerate(manifest):
+            manifest += json.loads(serializers.serialize(
+                "json", Tag.objects.all()))
 
-            # Force output to unencrypted as that will be the current state.
-            # The importer will make the decision to encrypt or not.
-            manifest[index]["fields"]["storage_type"] = Document.STORAGE_TYPE_UNENCRYPTED  # NOQA: E501
+            manifest += json.loads(serializers.serialize(
+                "json", DocumentType.objects.all()))
+
+            documents = Document.objects.order_by("id")
+            document_map = {d.pk: d for d in documents}
+            document_manifest = json.loads(
+                serializers.serialize("json", documents))
+            manifest += document_manifest
+
+        # 3. Export files from each document
+        for index, document_dict in tqdm.tqdm(enumerate(document_manifest),
+                                              total=len(document_manifest)):
+            # 3.1. store files unencrypted
+            document_dict["fields"]["storage_type"] = Document.STORAGE_TYPE_UNENCRYPTED  # NOQA: E501
 
             document = document_map[document_dict["pk"]]
 
-            print(f"Exporting: {document}")
-
+            # 3.2. generate a unique filename
             filename_counter = 0
             while True:
-                original_name = document.get_public_filename(
-                    counter=filename_counter)
-                original_target = os.path.join(self.target, original_name)
+                if self.use_filename_format:
+                    base_name = generate_filename(
+                        document, counter=filename_counter)
+                else:
+                    base_name = document.get_public_filename(
+                        counter=filename_counter)
 
-                if not os.path.exists(original_target):
+                if base_name not in self.exported_files:
+                    self.exported_files.append(base_name)
                     break
                 else:
                     filename_counter += 1
 
-            thumbnail_name = original_name + "-thumbnail.png"
-            thumbnail_target = os.path.join(self.target, thumbnail_name)
-
+            # 3.3. write filenames into manifest
+            original_name = base_name
+            original_target = os.path.join(self.target, original_name)
             document_dict[EXPORTER_FILE_NAME] = original_name
+
+            thumbnail_name = base_name + "-thumbnail.png"
+            thumbnail_target = os.path.join(self.target, thumbnail_name)
             document_dict[EXPORTER_THUMBNAIL_NAME] = thumbnail_name
 
             if os.path.exists(document.archive_path):
-                archive_name = document.get_public_filename(
-                    archive=True, counter=filename_counter, suffix="_archive")
+                archive_name = base_name + "-archive.pdf"
                 archive_target = os.path.join(self.target, archive_name)
                 document_dict[EXPORTER_ARCHIVE_NAME] = archive_name
             else:
                 archive_target = None
 
+            # 3.4. write files to target folder
             t = int(time.mktime(document.created.timetuple()))
             if document.storage_type == Document.STORAGE_TYPE_GPG:
 
@@ -100,21 +152,57 @@ class Command(Renderable, BaseCommand):
                         f.write(GnuPG.decrypted(document.archive_path))
                         os.utime(archive_target, times=(t, t))
             else:
+                self.check_and_copy(document.source_path,
+                                    document.checksum,
+                                    original_target)
 
-                shutil.copy(document.source_path, original_target)
-                shutil.copy(document.thumbnail_path, thumbnail_target)
+                self.check_and_copy(document.thumbnail_path,
+                                    None,
+                                    thumbnail_target)
 
                 if archive_target:
-                    shutil.copy(document.archive_path, archive_target)
+                    self.check_and_copy(document.archive_path,
+                                        document.archive_checksum,
+                                        archive_target)
 
-        manifest += json.loads(
-            serializers.serialize("json", Correspondent.objects.all()))
+        # 4. write manifest to target forlder
+        manifest_path = os.path.abspath(
+            os.path.join(self.target, "manifest.json"))
 
-        manifest += json.loads(serializers.serialize(
-            "json", Tag.objects.all()))
-
-        manifest += json.loads(serializers.serialize(
-            "json", DocumentType.objects.all()))
-
-        with open(os.path.join(self.target, "manifest.json"), "w") as f:
+        with open(manifest_path, "w") as f:
             json.dump(manifest, f, indent=2)
+
+        if manifest_path in self.files_in_export_dir:
+            self.files_in_export_dir.remove(manifest_path)
+
+        # 5. Remove files which we did not explicitly export in this run
+        for f in self.files_in_export_dir:
+            os.remove(f)
+
+            delete_empty_directories(os.path.abspath(os.path.dirname(f)),
+                                     os.path.abspath(self.target))
+
+    def check_and_copy(self, source, source_checksum, target):
+        if os.path.abspath(target) in self.files_in_export_dir:
+            self.files_in_export_dir.remove(os.path.abspath(target))
+
+        perform_copy = False
+
+        if os.path.exists(target):
+            source_stat = os.stat(source)
+            target_stat = os.stat(target)
+            if self.compare_checksums and source_checksum:
+                with open(target, "rb") as f:
+                    target_checksum = hashlib.md5(f.read()).hexdigest()
+                perform_copy = target_checksum != source_checksum
+            elif source_stat.st_mtime != target_stat.st_mtime:
+                perform_copy = True
+            elif source_stat.st_size != target_stat.st_size:
+                perform_copy = True
+        else:
+            # Copy if it does not exist
+            perform_copy = True
+
+        if perform_copy:
+            os.makedirs(os.path.dirname(target), exist_ok=True)
+            shutil.copy2(source, target)
diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py
index 6df14a82c..a2e19e3cc 100644
--- a/src/documents/management/commands/document_importer.py
+++ b/src/documents/management/commands/document_importer.py
@@ -148,10 +148,10 @@ class Command(Renderable, BaseCommand):
 
                 create_source_path_directory(document.source_path)
 
-                shutil.copy(document_path, document.source_path)
-                shutil.copy(thumbnail_path, document.thumbnail_path)
+                shutil.copy2(document_path, document.source_path)
+                shutil.copy2(thumbnail_path, document.thumbnail_path)
                 if archive_path:
                     create_source_path_directory(document.archive_path)
-                    shutil.copy(archive_path, document.archive_path)
+                    shutil.copy2(archive_path, document.archive_path)
 
             document.save()
diff --git a/src/documents/tests/samples/documents/originals/0000002.pdf b/src/documents/tests/samples/documents/originals/0000002.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5e75266ca7e534ae87533e612c662a32320eb0c6
GIT binary patch
literal 25743
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
X>-NCsBk^^j7*@$eJpQ;YO&{?uxqV8^

literal 0
HcmV?d00001

diff --git a/src/documents/tests/samples/documents/originals/0000003.pdf b/src/documents/tests/samples/documents/originals/0000003.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..afbeef5c8fc783d55b40d5a642a6d523413472d5
GIT binary patch
literal 12022
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
Iq^$({f5Aoqy#N3J

literal 0
HcmV?d00001

diff --git a/src/documents/tests/samples/documents/thumbnails/0000002.png b/src/documents/tests/samples/documents/thumbnails/0000002.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3a76840103812c371dd78f2e8bc704ea3eec1ba
GIT binary patch
literal 7913
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
Ruvbl>s;I6|ENAlKe*j2SP+b53

literal 0
HcmV?d00001

diff --git a/src/documents/tests/samples/documents/thumbnails/0000003.png b/src/documents/tests/samples/documents/thumbnails/0000003.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3a76840103812c371dd78f2e8bc704ea3eec1ba
GIT binary patch
literal 7913
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
Ruvbl>s;I6|ENAlKe*j2SP+b53

literal 0
HcmV?d00001

diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index d6ab7eadd..d6e7ad6e0 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -3,6 +3,8 @@ import json
 import os
 import shutil
 import tempfile
+from pathlib import Path
+from unittest import mock
 
 from django.core.management import call_command
 from django.test import TestCase, override_settings
@@ -15,49 +17,60 @@ from documents.tests.utils import DirectoriesMixin, paperless_environment
 
 class TestExportImport(DirectoriesMixin, TestCase):
 
-    @override_settings(
-        PASSPHRASE="test"
-    )
-    def test_exporter(self):
+    def setUp(self) -> None:
+        self.target = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.target)
+
+        self.d1 = Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow1", filename="0000001.pdf", mime_type="application/pdf")
+        self.d2 = Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow2", filename="0000002.pdf", mime_type="application/pdf")
+        self.d3 = Document.objects.create(content="Content", checksum="d38d7ed02e988e072caf924e0f3fcb76", title="wow2", filename="0000003.pdf", mime_type="application/pdf")
+        self.t1 = Tag.objects.create(name="t")
+        self.dt1 = DocumentType.objects.create(name="dt")
+        self.c1 = Correspondent.objects.create(name="c")
+
+        self.d1.tags.add(self.t1)
+        self.d1.correspondent = self.c1
+        self.d1.document_type = self.dt1
+        self.d1.save()
+        super(TestExportImport, self).setUp()
+
+    def _do_export(self, use_filename_format=False, compare_checksums=False):
+        args = ['document_exporter', self.target]
+        if use_filename_format:
+            args += ["--use-filename-format"]
+        if compare_checksums:
+            args += ["--compare-checksums"]
+
+        call_command(*args)
+
+        with open(os.path.join(self.target, "manifest.json")) as f:
+            manifest = json.load(f)
+
+        return manifest
+
+    def test_exporter(self, use_filename_format=False):
         shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
         shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents"))
 
-        file = os.path.join(self.dirs.originals_dir, "0000001.pdf")
+        manifest = self._do_export(use_filename_format=use_filename_format)
 
-        d1 = Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow", filename="0000001.pdf", mime_type="application/pdf")
-        d2 = Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
-        t1 = Tag.objects.create(name="t")
-        dt1 = DocumentType.objects.create(name="dt")
-        c1 = Correspondent.objects.create(name="c")
+        self.assertEqual(len(manifest), 6)
+        self.assertEqual(len(list(filter(lambda e: e['model'] == 'documents.document', manifest))), 3)
 
-        d1.tags.add(t1)
-        d1.correspondents = c1
-        d1.document_type = dt1
-        d1.save()
-        d2.save()
-
-        target = tempfile.mkdtemp()
-        self.addCleanup(shutil.rmtree, target)
-
-        call_command('document_exporter', target)
-
-        with open(os.path.join(target, "manifest.json")) as f:
-            manifest = json.load(f)
-
-        self.assertEqual(len(manifest), 5)
+        self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
 
         for element in manifest:
             if element['model'] == 'documents.document':
-                fname = os.path.join(target, element[document_exporter.EXPORTER_FILE_NAME])
+                fname = os.path.join(self.target, element[document_exporter.EXPORTER_FILE_NAME])
                 self.assertTrue(os.path.exists(fname))
-                self.assertTrue(os.path.exists(os.path.join(target, element[document_exporter.EXPORTER_THUMBNAIL_NAME])))
+                self.assertTrue(os.path.exists(os.path.join(self.target, element[document_exporter.EXPORTER_THUMBNAIL_NAME])))
 
                 with open(fname, "rb") as f:
                     checksum = hashlib.md5(f.read()).hexdigest()
                 self.assertEqual(checksum, element['fields']['checksum'])
 
                 if document_exporter.EXPORTER_ARCHIVE_NAME in element:
-                    fname = os.path.join(target, element[document_exporter.EXPORTER_ARCHIVE_NAME])
+                    fname = os.path.join(self.target, element[document_exporter.EXPORTER_ARCHIVE_NAME])
                     self.assertTrue(os.path.exists(fname))
 
                     with open(fname, "rb") as f:
@@ -65,24 +78,93 @@ class TestExportImport(DirectoriesMixin, TestCase):
                     self.assertEqual(checksum, element['fields']['archive_checksum'])
 
         with paperless_environment() as dirs:
-            self.assertEqual(Document.objects.count(), 2)
+            self.assertEqual(Document.objects.count(), 3)
             Document.objects.all().delete()
             Correspondent.objects.all().delete()
             DocumentType.objects.all().delete()
             Tag.objects.all().delete()
             self.assertEqual(Document.objects.count(), 0)
 
-            call_command('document_importer', target)
-            self.assertEqual(Document.objects.count(), 2)
+            call_command('document_importer', self.target)
+            self.assertEqual(Document.objects.count(), 3)
+            self.assertEqual(Tag.objects.count(), 1)
+            self.assertEqual(Correspondent.objects.count(), 1)
+            self.assertEqual(DocumentType.objects.count(), 1)
+            self.assertEqual(Document.objects.get(id=self.d1.id).title, "wow1")
+            self.assertEqual(Document.objects.get(id=self.d2.id).title, "wow2")
+            self.assertEqual(Document.objects.get(id=self.d3.id).title, "wow2")
             messages = check_sanity()
             # everything is alright after the test
             self.assertEqual(len(messages), 0, str([str(m) for m in messages]))
 
-    @override_settings(
-        PAPERLESS_FILENAME_FORMAT="{title}"
-    )
     def test_exporter_with_filename_format(self):
-        self.test_exporter()
+        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents"))
+
+        with override_settings(PAPERLESS_FILENAME_FORMAT="{created_year}/{correspondent}/{title}"):
+            self.test_exporter(use_filename_format=True)
+
+    def test_update_export_changed_time(self):
+        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents"))
+
+        self._do_export()
+        self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
+
+        with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m:
+            self._do_export()
+            m.assert_not_called()
+
+        self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
+
+        Path(self.d1.source_path).touch()
+
+        with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m:
+            self._do_export()
+            self.assertEqual(m.call_count, 1)
+
+        self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
+
+    def test_update_export_changed_checksum(self):
+        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents"))
+
+        self._do_export()
+
+        self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
+
+        with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m:
+            self._do_export()
+            m.assert_not_called()
+
+        self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
+
+        self.d2.checksum = "asdfasdgf3"
+        self.d2.save()
+
+        with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m:
+            self._do_export(compare_checksums=True)
+            self.assertEqual(m.call_count, 1)
+
+        self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
+
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}/{correspondent}")
+    def test_update_export_changed_location(self):
+        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents"))
+
+        m = self._do_export(use_filename_format=True)
+        self.assertTrue(os.path.isfile(os.path.join(self.target, "wow1", "c.pdf")))
+
+        self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
+
+        self.d1.title = "new_title"
+        self.d1.save()
+        self._do_export(use_filename_format=True)
+        self.assertFalse(os.path.isfile(os.path.join(self.target, "wow1", "c.pdf")))
+        self.assertFalse(os.path.isdir(os.path.join(self.target, "wow1")))
+        self.assertTrue(os.path.isfile(os.path.join(self.target, "new_title", "c.pdf")))
+        self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
 
     def test_export_missing_files(self):
 

From 0927f9d477d9120c2776b6f214b01ee110f8e19c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 18 Jan 2021 14:16:32 +0100
Subject: [PATCH 0911/1300] some bug fixes and tests

---
 src/documents/file_handling.py                  |   4 ++--
 .../management/commands/document_exporter.py    |   6 +++++-
 .../samples/documents/originals/0000002.pdf.gpg | Bin 18961 -> 0 bytes
 .../samples/documents/originals/0000004.pdf.gpg | Bin 0 -> 17779 bytes
 .../{0000002.png.gpg => 0000004.png.gpg}        | Bin
 src/documents/tests/test_management_exporter.py |  16 ++++++++++++----
 6 files changed, 19 insertions(+), 7 deletions(-)
 delete mode 100644 src/documents/tests/samples/documents/originals/0000002.pdf.gpg
 create mode 100644 src/documents/tests/samples/documents/originals/0000004.pdf.gpg
 rename src/documents/tests/samples/documents/thumbnails/{0000002.png.gpg => 0000004.png.gpg} (100%)

diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index a5274a5f4..dd798e8ab 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -91,7 +91,7 @@ def generate_unique_filename(doc, root):
             return new_filename
 
 
-def generate_filename(doc, counter=0):
+def generate_filename(doc, counter=0, append_gpg=True):
     path = ""
 
     try:
@@ -151,7 +151,7 @@ def generate_filename(doc, counter=0):
         filename = f"{doc.pk:07}{counter_str}{doc.file_type}"
 
     # Append .gpg for encrypted files
-    if doc.storage_type == doc.STORAGE_TYPE_GPG:
+    if append_gpg and doc.storage_type == doc.STORAGE_TYPE_GPG:
         filename += ".gpg"
 
     return filename
diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py
index e2313e86a..250ae1adf 100644
--- a/src/documents/management/commands/document_exporter.py
+++ b/src/documents/management/commands/document_exporter.py
@@ -108,7 +108,8 @@ class Command(Renderable, BaseCommand):
             while True:
                 if self.use_filename_format:
                     base_name = generate_filename(
-                        document, counter=filename_counter)
+                        document, counter=filename_counter,
+                        append_gpg=False)
                 else:
                     base_name = document.get_public_filename(
                         counter=filename_counter)
@@ -139,15 +140,18 @@ class Command(Renderable, BaseCommand):
             t = int(time.mktime(document.created.timetuple()))
             if document.storage_type == Document.STORAGE_TYPE_GPG:
 
+                os.makedirs(os.path.dirname(original_target), exist_ok=True)
                 with open(original_target, "wb") as f:
                     f.write(GnuPG.decrypted(document.source_file))
                     os.utime(original_target, times=(t, t))
 
+                os.makedirs(os.path.dirname(thumbnail_target), exist_ok=True)
                 with open(thumbnail_target, "wb") as f:
                     f.write(GnuPG.decrypted(document.thumbnail_file))
                     os.utime(thumbnail_target, times=(t, t))
 
                 if archive_target:
+                    os.makedirs(os.path.dirname(archive_target), exist_ok=True)
                     with open(archive_target, "wb") as f:
                         f.write(GnuPG.decrypted(document.archive_path))
                         os.utime(archive_target, times=(t, t))
diff --git a/src/documents/tests/samples/documents/originals/0000002.pdf.gpg b/src/documents/tests/samples/documents/originals/0000002.pdf.gpg
deleted file mode 100644
index 0322a8039f0a1e401142c7fb9d5dc08c60ad105c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18961
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

diff --git a/src/documents/tests/samples/documents/originals/0000004.pdf.gpg b/src/documents/tests/samples/documents/originals/0000004.pdf.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..754efcbf6f05484d5aa2e33a7023813b5e592d74
GIT binary patch
literal 17779
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
K)LVU4SZMNPYqQP(

literal 0
HcmV?d00001

diff --git a/src/documents/tests/samples/documents/thumbnails/0000002.png.gpg b/src/documents/tests/samples/documents/thumbnails/0000004.png.gpg
similarity index 100%
rename from src/documents/tests/samples/documents/thumbnails/0000002.png.gpg
rename to src/documents/tests/samples/documents/thumbnails/0000004.png.gpg
diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index d6e7ad6e0..e3fef6b78 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -24,6 +24,8 @@ class TestExportImport(DirectoriesMixin, TestCase):
         self.d1 = Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow1", filename="0000001.pdf", mime_type="application/pdf")
         self.d2 = Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow2", filename="0000002.pdf", mime_type="application/pdf")
         self.d3 = Document.objects.create(content="Content", checksum="d38d7ed02e988e072caf924e0f3fcb76", title="wow2", filename="0000003.pdf", mime_type="application/pdf")
+        self.d4 = Document.objects.create(content="Content", checksum="82186aaa94f0b98697d704b90fd1c072", title="wow_dec", filename="0000004.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
+
         self.t1 = Tag.objects.create(name="t")
         self.dt1 = DocumentType.objects.create(name="dt")
         self.c1 = Correspondent.objects.create(name="c")
@@ -34,6 +36,9 @@ class TestExportImport(DirectoriesMixin, TestCase):
         self.d1.save()
         super(TestExportImport, self).setUp()
 
+    @override_settings(
+        PASSPHRASE="test"
+    )
     def _do_export(self, use_filename_format=False, compare_checksums=False):
         args = ['document_exporter', self.target]
         if use_filename_format:
@@ -54,8 +59,8 @@ class TestExportImport(DirectoriesMixin, TestCase):
 
         manifest = self._do_export(use_filename_format=use_filename_format)
 
-        self.assertEqual(len(manifest), 6)
-        self.assertEqual(len(list(filter(lambda e: e['model'] == 'documents.document', manifest))), 3)
+        self.assertEqual(len(manifest), 7)
+        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")))
 
@@ -69,6 +74,8 @@ class TestExportImport(DirectoriesMixin, TestCase):
                     checksum = hashlib.md5(f.read()).hexdigest()
                 self.assertEqual(checksum, element['fields']['checksum'])
 
+                self.assertEqual(element['fields']['storage_type'], Document.STORAGE_TYPE_UNENCRYPTED)
+
                 if document_exporter.EXPORTER_ARCHIVE_NAME in element:
                     fname = os.path.join(self.target, element[document_exporter.EXPORTER_ARCHIVE_NAME])
                     self.assertTrue(os.path.exists(fname))
@@ -78,7 +85,7 @@ class TestExportImport(DirectoriesMixin, TestCase):
                     self.assertEqual(checksum, element['fields']['archive_checksum'])
 
         with paperless_environment() as dirs:
-            self.assertEqual(Document.objects.count(), 3)
+            self.assertEqual(Document.objects.count(), 4)
             Document.objects.all().delete()
             Correspondent.objects.all().delete()
             DocumentType.objects.all().delete()
@@ -86,13 +93,14 @@ class TestExportImport(DirectoriesMixin, TestCase):
             self.assertEqual(Document.objects.count(), 0)
 
             call_command('document_importer', self.target)
-            self.assertEqual(Document.objects.count(), 3)
+            self.assertEqual(Document.objects.count(), 4)
             self.assertEqual(Tag.objects.count(), 1)
             self.assertEqual(Correspondent.objects.count(), 1)
             self.assertEqual(DocumentType.objects.count(), 1)
             self.assertEqual(Document.objects.get(id=self.d1.id).title, "wow1")
             self.assertEqual(Document.objects.get(id=self.d2.id).title, "wow2")
             self.assertEqual(Document.objects.get(id=self.d3.id).title, "wow2")
+            self.assertEqual(Document.objects.get(id=self.d4.id).title, "wow_dec")
             messages = check_sanity()
             # everything is alright after the test
             self.assertEqual(len(messages), 0, str([str(m) for m in messages]))

From a71a9910840a0c15666c15c313087269b17bbc20 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 18 Jan 2021 14:20:45 +0100
Subject: [PATCH 0912/1300] fix some test cases due to renamed test files

---
 src/documents/tests/test_management.py | 10 +++++-----
 src/documents/tests/test_migrations.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py
index 58aaf9342..a71baa8ba 100644
--- a/src/documents/tests/test_management.py
+++ b/src/documents/tests/test_management.py
@@ -70,18 +70,18 @@ class TestDecryptDocuments(TestCase):
             PASSPHRASE="test"
         ).enable()
 
-        doc = Document.objects.create(checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg",  mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
+        doc = Document.objects.create(checksum="82186aaa94f0b98697d704b90fd1c072", title="wow", filename="0000004.pdf.gpg",  mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
 
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf.gpg"), os.path.join(originals_dir, "0000002.pdf.gpg"))
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", f"0000002.png.gpg"), os.path.join(thumb_dir, f"{doc.id:07}.png.gpg"))
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000004.pdf.gpg"), os.path.join(originals_dir, "0000004.pdf.gpg"))
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", f"0000004.png.gpg"), os.path.join(thumb_dir, f"{doc.id:07}.png.gpg"))
 
         call_command('decrypt_documents')
 
         doc.refresh_from_db()
 
         self.assertEqual(doc.storage_type, Document.STORAGE_TYPE_UNENCRYPTED)
-        self.assertEqual(doc.filename, "0000002.pdf")
-        self.assertTrue(os.path.isfile(os.path.join(originals_dir, "0000002.pdf")))
+        self.assertEqual(doc.filename, "0000004.pdf")
+        self.assertTrue(os.path.isfile(os.path.join(originals_dir, "0000004.pdf")))
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(os.path.isfile(os.path.join(thumb_dir, f"{doc.id:07}.png")))
         self.assertTrue(os.path.isfile(doc.thumbnail_path))
diff --git a/src/documents/tests/test_migrations.py b/src/documents/tests/test_migrations.py
index 33ba41444..ee7180c63 100644
--- a/src/documents/tests/test_migrations.py
+++ b/src/documents/tests/test_migrations.py
@@ -98,7 +98,7 @@ class TestMigrateMimeType(DirectoriesMixin, TestMigrations):
 
         doc2 = Document.objects.create(checksum="B", file_type="pdf", storage_type=STORAGE_TYPE_GPG)
         self.doc2_id = doc2.id
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf.gpg"), source_path_before(doc2))
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000004.pdf.gpg"), source_path_before(doc2))
 
     def testMimeTypesMigrated(self):
         Document = self.apps.get_model('documents', 'Document')

From 6c972bd08a40d6fc05042df5a60316a6800f9204 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 18 Jan 2021 14:47:19 +0100
Subject: [PATCH 0913/1300] more tests

---
 .../tests/test_management_exporter.py         | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index e3fef6b78..f859649ed 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -12,6 +12,7 @@ from django.test import TestCase, override_settings
 from documents.management.commands import document_exporter
 from documents.models import Document, Tag, DocumentType, Correspondent
 from documents.sanity_checker import check_sanity
+from documents.settings import EXPORTER_FILE_NAME
 from documents.tests.utils import DirectoriesMixin, paperless_environment
 
 
@@ -36,6 +37,13 @@ class TestExportImport(DirectoriesMixin, TestCase):
         self.d1.save()
         super(TestExportImport, self).setUp()
 
+    def _get_document_from_manifest(self, manifest, id):
+        f = list(filter(lambda d: d['model'] == "documents.document" and d['pk'] == id, manifest))
+        if len(f) == 1:
+            return f[0]
+        else:
+            raise ValueError(f"document with id {id} does not exist in manifest")
+
     @override_settings(
         PASSPHRASE="test"
     )
@@ -119,11 +127,14 @@ class TestExportImport(DirectoriesMixin, TestCase):
         self._do_export()
         self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
 
+        st_mtime_1 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime
+
         with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m:
             self._do_export()
             m.assert_not_called()
 
         self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
+        st_mtime_2 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime
 
         Path(self.d1.source_path).touch()
 
@@ -131,8 +142,12 @@ class TestExportImport(DirectoriesMixin, TestCase):
             self._do_export()
             self.assertEqual(m.call_count, 1)
 
+        st_mtime_3 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime
         self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
 
+        self.assertNotEqual(st_mtime_1, st_mtime_2)
+        self.assertNotEqual(st_mtime_2, st_mtime_3)
+
     def test_update_export_changed_checksum(self):
         shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
         shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents"))
@@ -156,6 +171,23 @@ class TestExportImport(DirectoriesMixin, TestCase):
 
         self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
 
+    def test_update_export_deleted_document(self):
+        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents"))
+
+        manifest = self._do_export()
+
+        self.assertTrue(len(manifest), 7)
+        doc_from_manifest = self._get_document_from_manifest(manifest, self.d3.id)
+        self.assertTrue(os.path.isfile(os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME])))
+        self.d3.delete()
+
+        manifest2 = self._do_export()
+        self.assertRaises(ValueError, self._get_document_from_manifest, manifest, self.d3.id)
+        self.assertFalse(os.path.isfile(os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME])))
+
+        self.assertTrue(len(manifest), 6)
+
     @override_settings(PAPERLESS_FILENAME_FORMAT="{title}/{correspondent}")
     def test_update_export_changed_location(self):
         shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))

From 72616def4f23f3bff67c52b03329025471fff01e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 18 Jan 2021 15:18:03 +0100
Subject: [PATCH 0914/1300] locking for the document archiver

---
 src/documents/management/commands/document_archiver.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index 7b9a123d9..01bd819c5 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -11,6 +11,7 @@ from django import db
 from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db import transaction
+from filelock import FileLock
 from whoosh.writing import AsyncWriter
 
 from documents.models import Document
@@ -47,8 +48,10 @@ def handle_document(document_id):
                     archive_checksum=checksum,
                     content=parser.get_text()
                 )
-                create_source_path_directory(document.archive_path)
-                shutil.move(parser.get_archive_path(), document.archive_path)
+                with FileLock(settings.MEDIA_LOCK):
+                    create_source_path_directory(document.archive_path)
+                    shutil.move(parser.get_archive_path(),
+                                document.archive_path)
 
         with AsyncWriter(index.open_index()) as writer:
             index.update_document(writer, document)

From b9725437d935e2d7286e7295d41483faf2e26f1b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 18 Jan 2021 15:33:05 +0100
Subject: [PATCH 0915/1300] delete option for exporter, short options, tests

---
 .../management/commands/document_exporter.py  | 31 +++++++++++++------
 .../tests/test_management_exporter.py         | 13 ++++++--
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py
index 250ae1adf..37fcf2024 100644
--- a/src/documents/management/commands/document_exporter.py
+++ b/src/documents/management/commands/document_exporter.py
@@ -31,7 +31,7 @@ class Command(Renderable, BaseCommand):
         parser.add_argument("target")
 
         parser.add_argument(
-            "--compare-checksums",
+            "-c", "--compare-checksums",
             default=False,
             action="store_true",
             help="Compare file checksums when determining whether to export "
@@ -40,13 +40,22 @@ class Command(Renderable, BaseCommand):
         )
 
         parser.add_argument(
-            "--use-filename-format",
+            "-f", "--use-filename-format",
             default=False,
             action="store_true",
             help="Use PAPERLESS_FILENAME_FORMAT for storing files in the "
                  "export directory, if configured."
         )
 
+        parser.add_argument(
+            "-d", "--delete",
+            default=False,
+            action="store_true",
+            help="After exporting, delete files in the export directory that "
+                 "do not belong to the current export, such as files from "
+                 "deleted documents."
+        )
+
     def __init__(self, *args, **kwargs):
         BaseCommand.__init__(self, *args, **kwargs)
         self.target = None
@@ -54,12 +63,14 @@ class Command(Renderable, BaseCommand):
         self.exported_files = []
         self.compare_checksums = False
         self.use_filename_format = False
+        self.delete = False
 
     def handle(self, *args, **options):
 
         self.target = options["target"]
         self.compare_checksums = options['compare_checksums']
         self.use_filename_format = options['use_filename_format']
+        self.delete = options['delete']
 
         if not os.path.exists(self.target):
             raise CommandError("That path doesn't exist")
@@ -176,15 +187,17 @@ class Command(Renderable, BaseCommand):
         with open(manifest_path, "w") as f:
             json.dump(manifest, f, indent=2)
 
-        if manifest_path in self.files_in_export_dir:
-            self.files_in_export_dir.remove(manifest_path)
+        if self.delete:
+            # 5. Remove files which we did not explicitly export in this run
 
-        # 5. Remove files which we did not explicitly export in this run
-        for f in self.files_in_export_dir:
-            os.remove(f)
+            if manifest_path in self.files_in_export_dir:
+                self.files_in_export_dir.remove(manifest_path)
 
-            delete_empty_directories(os.path.abspath(os.path.dirname(f)),
-                                     os.path.abspath(self.target))
+            for f in self.files_in_export_dir:
+                os.remove(f)
+
+                delete_empty_directories(os.path.abspath(os.path.dirname(f)),
+                                         os.path.abspath(self.target))
 
     def check_and_copy(self, source, source_checksum, target):
         if os.path.abspath(target) in self.files_in_export_dir:
diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index f859649ed..212b87ec1 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -47,12 +47,14 @@ class TestExportImport(DirectoriesMixin, TestCase):
     @override_settings(
         PASSPHRASE="test"
     )
-    def _do_export(self, use_filename_format=False, compare_checksums=False):
+    def _do_export(self, use_filename_format=False, compare_checksums=False, delete=False):
         args = ['document_exporter', self.target]
         if use_filename_format:
             args += ["--use-filename-format"]
         if compare_checksums:
             args += ["--compare-checksums"]
+        if delete:
+            args += ["--delete"]
 
         call_command(*args)
 
@@ -182,8 +184,11 @@ class TestExportImport(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME])))
         self.d3.delete()
 
-        manifest2 = self._do_export()
+        manifest = self._do_export()
         self.assertRaises(ValueError, self._get_document_from_manifest, manifest, self.d3.id)
+        self.assertTrue(os.path.isfile(os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME])))
+
+        manifest = self._do_export(delete=True)
         self.assertFalse(os.path.isfile(os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME])))
 
         self.assertTrue(len(manifest), 6)
@@ -200,11 +205,13 @@ class TestExportImport(DirectoriesMixin, TestCase):
 
         self.d1.title = "new_title"
         self.d1.save()
-        self._do_export(use_filename_format=True)
+        self._do_export(use_filename_format=True, delete=True)
         self.assertFalse(os.path.isfile(os.path.join(self.target, "wow1", "c.pdf")))
         self.assertFalse(os.path.isdir(os.path.join(self.target, "wow1")))
         self.assertTrue(os.path.isfile(os.path.join(self.target, "new_title", "c.pdf")))
         self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
+        self.assertTrue(os.path.isfile(os.path.join(self.target, "wow2", "none.pdf")))
+        self.assertTrue(os.path.isfile(os.path.join(self.target, "wow2", "none_01.pdf")))
 
     def test_export_missing_files(self):
 

From 385076cf2898511f68f745582e83a393fc2f447d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 18 Jan 2021 15:43:48 +0100
Subject: [PATCH 0916/1300] documentation and changelog

---
 docs/administration.rst | 27 ++++++++++++++++++++++++++-
 docs/changelog.rst      | 11 ++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/docs/administration.rst b/docs/administration.rst
index 32741300a..52598245c 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -20,6 +20,8 @@ Options available to any installation of paperless:
     metadata to a specific folder. You may import your documents into a
     fresh instance of paperless again or store your documents in another
     DMS with this export.
+*   The document exporter is also able to update an already existing export.
+    Therefore, incremental backups with ``rsync`` are entirely possible.
 
 Options available to docker installations:
 
@@ -157,8 +159,13 @@ backup or migration to another DMS.
 
 .. code::
 
-    document_exporter target
+    document_exporter target [-c] [-f] [-d]
 
+    optional arguments:
+    -c, --compare-checksums
+    -f, --use-filename-format
+    -d, --delete
+    
 ``target`` is a folder to which the data gets written. This includes documents,
 thumbnails and a ``manifest.json`` file. The manifest contains all metadata from
 the database (correspondents, tags, etc).
@@ -167,6 +174,24 @@ When you use the provided docker compose script, specify ``../export`` as the
 target. This path inside the container is automatically mounted on your host on
 the folder ``export``.
 
+If the target directory already exists and contains files, paperless will assume
+that the contents of the export directory are a previous export and will attempt
+to update the previous export. Paperless will only export changed and added files.
+Paperless determines whether a file has changed by inspecting the file attributes
+"date/time modified" and "size". If that does not work out for you, specify
+``--compare-checksums`` and paperless will attempt to compare file checksums instead.
+This is slower.
+
+Paperless will not remove any existing files in the export directory. If you want
+paperless to also remove files that do not belong to the current export such as files
+from deleted documents, specify ``--delete``. Be careful when pointing paperless to
+a directory that already contains other files.
+
+The filenames generated by this command follow the format
+``[date created] [correspondent] [title].[extension]``.
+If you want paperless to use ``PAPERLESS_FILENAME_FORMAT`` for exported filenames
+instead, specify ``--use-filename-format``.
+
 
 .. _utilities-importer:
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index f5bf41b25..43836dea9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,13 +11,22 @@ paperless-ng 1.0.0
 
 Nothing special about this release, but since there are relatively few bug reports coming in, I think that this is reasonably stable.
 
-* Changes and additions
+* Document export
+
+  * The document exporter has been rewritten to support updating an already existing export in place.
+  * The document exporter supports naming exported files according to ``PAPERLESS_FILENAME_FORMAT``.
+  * The document exporter locks the media directory and the database during execution to ensure that
+    the resulting export is consistent.
+  * See the :ref:`updated documentation <utilities-exporter>` for more details.
+
+* Other changes and additions
 
   * Added a language selector to the settings.
   * Added date format options to the settings.
   * Range selection with shift clicking is now possible in the document list.
 
 
+
 paperless-ng 0.9.14
 ###################
 

From 4fda8f334815175912d9ddd97f6621791f6089c3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 18 Jan 2021 22:23:19 +0100
Subject: [PATCH 0917/1300] changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 43836dea9..721e9520e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,6 +14,7 @@ Nothing special about this release, but since there are relatively few bug repor
 * Document export
 
   * The document exporter has been rewritten to support updating an already existing export in place.
+    This enables incremental backups with ``rsync``.
   * The document exporter supports naming exported files according to ``PAPERLESS_FILENAME_FORMAT``.
   * The document exporter locks the media directory and the database during execution to ensure that
     the resulting export is consistent.

From e1e11de2b546f87a6ed035feed07f868b29abcb7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 18 Jan 2021 22:23:53 +0100
Subject: [PATCH 0918/1300] mail tests

---
 src/paperless_mail/tests/test_mail.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py
index 0104f5023..bec0ff4b4 100644
--- a/src/paperless_mail/tests/test_mail.py
+++ b/src/paperless_mail/tests/test_mail.py
@@ -1,3 +1,4 @@
+import os
 import uuid
 from collections import namedtuple
 from typing import ContextManager
@@ -9,6 +10,7 @@ from django.test import TestCase
 from imap_tools import MailMessageFlags, MailboxFolderSelectError
 
 from documents.models import Correspondent
+from documents.tests.utils import DirectoriesMixin
 from paperless_mail import tasks
 from paperless_mail.mail import MailError, MailAccountHandler
 from paperless_mail.models import MailRule, MailAccount
@@ -130,7 +132,7 @@ def fake_magic_from_buffer(buffer, mime=False):
 
 
 @mock.patch('paperless_mail.mail.magic.from_buffer', fake_magic_from_buffer)
-class TestMail(TestCase):
+class TestMail(DirectoriesMixin, TestCase):
 
     def setUp(self):
         patcher = mock.patch('paperless_mail.mail.MailBox')
@@ -146,6 +148,7 @@ class TestMail(TestCase):
         self.reset_bogus_mailbox()
 
         self.mail_account_handler = MailAccountHandler()
+        super(TestMail, self).setUp()
 
     def reset_bogus_mailbox(self):
         self.bogus_mailbox.messages = []
@@ -220,9 +223,13 @@ class TestMail(TestCase):
         args1, kwargs1 = self.async_task.call_args_list[0]
         args2, kwargs2 = self.async_task.call_args_list[1]
 
+        self.assertTrue(os.path.isfile(kwargs1['path']), kwargs1['path'])
+
         self.assertEqual(kwargs1['override_title'], "file_0")
         self.assertEqual(kwargs1['override_filename'], "file_0.pdf")
 
+        self.assertTrue(os.path.isfile(kwargs2['path']), kwargs1['path'])
+
         self.assertEqual(kwargs2['override_title'], "file_1")
         self.assertEqual(kwargs2['override_filename'], "file_1.pdf")
 
@@ -253,6 +260,7 @@ class TestMail(TestCase):
         self.assertEqual(self.async_task.call_count, 1)
 
         args, kwargs = self.async_task.call_args
+        self.assertTrue(os.path.isfile(kwargs['path']), kwargs['path'])
         self.assertEqual(kwargs['override_filename'], "f1.pdf")
 
     def test_handle_disposition(self):

From bf2e98527cd53dfef146308f06ac01f1ac669dab Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 18 Jan 2021 22:30:06 +0100
Subject: [PATCH 0919/1300] updated messages

---
 src-ui/messages.xlf | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index a98c076ec..d71bdbc2e 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -475,35 +475,35 @@
         <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/>&quot; deleted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5647210819299459618" datatype="html">
         <source>Settings saved successfully.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">78</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6839066544204061364" datatype="html">
         <source>Use system language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7729897675462249787" datatype="html">
         <source>Use date format of display language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8488620293789898901" datatype="html">
         <source>Error while storing settings on server: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">98</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
@@ -562,22 +562,22 @@
           <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="0f0c311d9a4e0cf399cc0ebbe233cacb4bdfca1f" datatype="html">
-        <source>Short: <x id="INTERPOLATION" equiv-text="{{today | customDate:&apos;shortDate&apos;}}"/></source>
+      <trans-unit id="69852399a18b8ca4fca8c5bfddd3f00a6d137593" datatype="html">
+        <source>Short: <x id="INTERPOLATION" equiv-text="{{today | customDate:&apos;shortDate&apos;:null:computedDateLocale}}"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">51</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="579f2c7581cfe52e7e5db4985d036db18f640606" datatype="html">
-        <source>Medium: <x id="INTERPOLATION" equiv-text="{{today | customDate:&apos;mediumDate&apos;}}"/></source>
+      <trans-unit id="d01a59285e711252b98c4f193394e4b854615c78" datatype="html">
+        <source>Medium: <x id="INTERPOLATION" equiv-text="{{today | customDate:&apos;mediumDate&apos;:null:computedDateLocale}}"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4eb0123bd8786494de05ba50cc4a0bfc2655c5df" datatype="html">
-        <source>Long: <x id="INTERPOLATION" equiv-text="{{today | customDate:&apos;longDate&apos;}}"/></source>
+      <trans-unit id="00481629776699b1caebd12b3b1176e2e23740a8" datatype="html">
+        <source>Long: <x id="INTERPOLATION" equiv-text="{{today | customDate:&apos;longDate&apos;:null:computedDateLocale}}"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">59</context>
@@ -755,21 +755,21 @@
         <source>Matching algorithm</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit id="eab7fc7cf2d663e54de934b779fce4275a303f0f" datatype="html">
         <source>Matching pattern</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">12</context>
+          <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
       <trans-unit id="632e529f49cf3d367dfbd15bd055e9b53aef30fb" datatype="html">
         <source>Case insensitive</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9153094873118985366" datatype="html">
@@ -1649,21 +1649,21 @@
         <source>Create new item</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">43</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5324147361912094446" datatype="html">
         <source>Edit item</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">47</context>
+          <context context-type="linenumber">54</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1699589597032579396" datatype="html">
         <source>Could not save element: <x id="PH" equiv-text="error"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">51</context>
+          <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit>
       <trans-unit id="810888510148304696" datatype="html">

From bab53838ecb034ab5102b20d209306d151b61d80 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Mon, 18 Jan 2021 21:30:59 +0000
Subject: [PATCH 0920/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 42 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index a5b28274f..80cfefab9 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -542,7 +542,7 @@
         <target>Gespeicherte Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; gelöscht.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -550,7 +550,7 @@
         <target>Einstellungen erfolgreich gespeichert.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">78</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6839066544204061364">
@@ -558,7 +558,7 @@
         <target>Benutze Systemsprache</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7729897675462249787">
@@ -566,7 +566,7 @@
         <target>Benutze Datumsformat der Anzeigesprache</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -574,7 +574,7 @@
         <target>Fehler beim Speichern der Einstellungen auf dem Server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">98</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -641,25 +641,25 @@
           <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="0f0c311d9a4e0cf399cc0ebbe233cacb4bdfca1f">
-        <source>Short: <x equiv-text="{{today | customDate:'shortDate'}}" id="INTERPOLATION"/></source>
-        <target>Kurz: <x equiv-text="{{today | customDate:'shortDate'}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="69852399a18b8ca4fca8c5bfddd3f00a6d137593">
+        <source>Short: <x equiv-text="{{today | customDate:'shortDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Kurz: <x equiv-text="{{today | customDate:'shortDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">51</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="579f2c7581cfe52e7e5db4985d036db18f640606">
-        <source>Medium: <x equiv-text="{{today | customDate:'mediumDate'}}" id="INTERPOLATION"/></source>
-        <target>Mittel: <x equiv-text="{{today | customDate:'mediumDate'}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="d01a59285e711252b98c4f193394e4b854615c78">
+        <source>Medium: <x equiv-text="{{today | customDate:'mediumDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Mittel: <x equiv-text="{{today | customDate:'mediumDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="4eb0123bd8786494de05ba50cc4a0bfc2655c5df">
-        <source>Long: <x equiv-text="{{today | customDate:'longDate'}}" id="INTERPOLATION"/></source>
-        <target>Lang: <x equiv-text="{{today | customDate:'longDate'}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="00481629776699b1caebd12b3b1176e2e23740a8">
+        <source>Long: <x equiv-text="{{today | customDate:'longDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Lang: <x equiv-text="{{today | customDate:'longDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">59</context>
@@ -862,7 +862,7 @@
         <target>Zuweisungsalgorithmus</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="eab7fc7cf2d663e54de934b779fce4275a303f0f">
@@ -870,7 +870,7 @@
         <target>Zuweisungsmuster</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">12</context>
+          <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
@@ -878,7 +878,7 @@
         <target>Groß-/Kleinschreibung irrelevant</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9153094873118985366">
@@ -1883,7 +1883,7 @@
         <target>Neues Element erstellen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">43</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5324147361912094446">
@@ -1891,7 +1891,7 @@
         <target>Element bearbeiten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">47</context>
+          <context context-type="linenumber">54</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1699589597032579396">
@@ -1899,7 +1899,7 @@
         <target>Konnte Element nicht speichern: <x equiv-text="error" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">51</context>
+          <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="810888510148304696">
@@ -2016,7 +2016,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="8419167206585286450">
         <source>Fuzzy: Document contains a word similar to this word</source>
-        <target>Ungenau: Dokument enthält ein zum folgdendem Wort ähnliches Wort</target>
+        <target>Ungenau: Dokument enthält ein zum folgendem Wort ähnliches Wort</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">16</context>

From a8ec9f29cdb73a92ffd8e59e54a324cbee596177 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Mon, 18 Jan 2021 21:31:31 +0000
Subject: [PATCH 0921/1300] Translate /src-ui/messages.xlf in nl_NL

translation completed for the source file '/src-ui/messages.xlf'
on the 'nl_NL' language.
---
 src-ui/src/locale/messages.nl_NL.xlf | 40 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf
index c77a77bea..39545c0e2 100644
--- a/src-ui/src/locale/messages.nl_NL.xlf
+++ b/src-ui/src/locale/messages.nl_NL.xlf
@@ -542,7 +542,7 @@
         <target>Opgeslagen view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; verwijderd.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -550,7 +550,7 @@
         <target>Instellingen succesvol opgeslagen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">78</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6839066544204061364">
@@ -558,7 +558,7 @@
         <target>Gebruik de systeemtaal</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7729897675462249787">
@@ -566,7 +566,7 @@
         <target>Datumopmaak van weergavetaal gebruiken</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -574,7 +574,7 @@
         <target>Fout bij het opslaan van de instellingen: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">98</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -641,25 +641,25 @@
           <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="0f0c311d9a4e0cf399cc0ebbe233cacb4bdfca1f">
-        <source>Short: <x equiv-text="{{today | customDate:'shortDate'}}" id="INTERPOLATION"/></source>
-        <target>Kort: <x equiv-text="{{today | customDate:'shortDate'}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="69852399a18b8ca4fca8c5bfddd3f00a6d137593">
+        <source>Short: <x equiv-text="{{today | customDate:'shortDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Kort: <x equiv-text="{{today | customDate:'shortDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">51</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="579f2c7581cfe52e7e5db4985d036db18f640606">
-        <source>Medium: <x equiv-text="{{today | customDate:'mediumDate'}}" id="INTERPOLATION"/></source>
-        <target>Medium: <x equiv-text="{{today | customDate:'mediumDate'}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="d01a59285e711252b98c4f193394e4b854615c78">
+        <source>Medium: <x equiv-text="{{today | customDate:'mediumDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Medium: <x equiv-text="{{today | customDate:'mediumDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="4eb0123bd8786494de05ba50cc4a0bfc2655c5df">
-        <source>Long: <x equiv-text="{{today | customDate:'longDate'}}" id="INTERPOLATION"/></source>
-        <target>Lang: <x equiv-text="{{today | customDate:'longDate'}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="00481629776699b1caebd12b3b1176e2e23740a8">
+        <source>Long: <x equiv-text="{{today | customDate:'longDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Lang: <x equiv-text="{{today | customDate:'longDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">59</context>
@@ -862,7 +862,7 @@
         <target>Algoritme voor het bepalen van de overeenkomst</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="eab7fc7cf2d663e54de934b779fce4275a303f0f">
@@ -870,7 +870,7 @@
         <target>Patroon voor overeenkomst</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">12</context>
+          <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
@@ -878,7 +878,7 @@
         <target>Niet hoofdlettergevoelig</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9153094873118985366">
@@ -1883,7 +1883,7 @@
         <target>Maak nieuw item</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">43</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5324147361912094446">
@@ -1891,7 +1891,7 @@
         <target>Item bewerken</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">47</context>
+          <context context-type="linenumber">54</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1699589597032579396">
@@ -1899,7 +1899,7 @@
         <target>Kon het element niet opslaan: <x equiv-text="error" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">51</context>
+          <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="810888510148304696">

From 8e95310602f6b650c04143ea88c46211567e0266 Mon Sep 17 00:00:00 2001
From: Fabian Koller <C0nsultant@users.noreply.github.com>
Date: Thu, 14 Jan 2021 20:21:34 +0100
Subject: [PATCH 0922/1300]  Fix ENV var name for user args in documentation

Follow-up to #214
---
 docs/configuration.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 9d14fba71..5edc003f6 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -267,7 +267,7 @@ PAPERLESS_OCR_IMAGE_DPI=<num>
     present in an image.
 
 
-PAPERLESS_OCR_USER_ARG=<json>
+PAPERLESS_OCR_USER_ARGS=<json>
     OCRmyPDF offers many more options. Use this parameter to specify any
     additional arguments you wish to pass to OCRmyPDF. Since Paperless uses
     the API of OCRmyPDF, you have to specify these in a format that can be

From 19f73f5782edd8f8d98c70dd47142809e4b5861a Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sat, 16 Jan 2021 10:35:07 +0100
Subject: [PATCH 0923/1300] Make update ansible role paths explicit

---
 ansible/tasks/main.yml | 81 ++++++++++++++++++++----------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index beeee827c..fe139dcbf 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -105,46 +105,64 @@
   ignore_errors: yes
   register: paperlessng_current_version
 
+- name: register current state
+  set_fact:
+    fresh_installation: '{{ "No such file or directory" in paperlessng_current_version.stderr }}'
+    update_installation: '{{ "No such file or directory" not in paperlessng_current_version.stderr and paperlessng_current_version.stdout != paperlessng_version | string }}'
+    reconfigure_only: '{{ paperlessng_current_version.stdout == paperlessng_version | string }}'
+
 - name: backup current paperless-ng installation
   copy:
     src: "{{ paperlessng_directory }}"
     remote_src: yes
     dest: "{{ paperlessng_directory }}-{{ ansible_date_time.iso8601 }}/"
-  when: '"No such file or directory" not in paperlessng_current_version.stderr and paperlessng_current_version.stdout != paperlessng_version | string'
+  when: update_installation
+
+- name: remove current paperless sources
+  file:
+    path: "{{ paperlessng_directory }}/{{ item }}"
+    state: absent
+  with_items:
+    - docker
+    - docs
+    - scripts
+    - src
+    - static
+  when: update_installation
 
 - name: create temporary directory
   tempfile:
     state: directory
   register: tempdir
-  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+  when: not reconfigure_only
 
 - name: extract paperless-ng
   unarchive:
     src: "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-{{ paperlessng_version }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
     remote_src: yes
     dest: "{{ tempdir.path }}"
-  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+  when: not reconfigure_only
 
 - name: change owner and permissions of paperless-ng
   command:
     cmd: "{{ item }}"
     warn: false
   with_items:
-  - "chown -R {{ paperlessng_system_user }}:{{ paperlessng_system_group }} {{ tempdir.path }}"
-  - "find {{ tempdir.path }} -type d -exec chmod 0750 {} ;"
-  - "find {{ tempdir.path }} -type f -exec chmod 0640 {} ;"
-  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+    - "chown -R {{ paperlessng_system_user }}:{{ paperlessng_system_group }} {{ tempdir.path }}"
+    - "find {{ tempdir.path }} -type d -exec chmod 0750 {} ;"
+    - "find {{ tempdir.path }} -type f -exec chmod 0640 {} ;"
+  when: not reconfigure_only
 
 - name: move paperless-ng
   command:
     cmd: "cp -a {{ tempdir.path }}/paperless-ng/ {{ paperlessng_directory }}"
-  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+  when: not reconfigure_only
 
 - name: remove temporary directory
   file:
     path: "{{ tempdir.path }}"
     state: absent
-  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+  when: not reconfigure_only
 
 - name: create paperless-ng directories and set permissions
   file:
@@ -281,7 +299,7 @@
     dest: /etc/paperless.conf
     owner: root
     group: root
-    mode: '0644'
+    mode: "0644"
   register: configuration
 
 - name: create paperlessng venv
@@ -299,15 +317,15 @@
     requirements: "{{ paperlessng_directory }}/requirements.txt"
     executable: "{{ paperlessng_virtualenv }}/bin/pip3"
     extra_args: --upgrade
-  when: paperlessng_current_version.stdout != paperlessng_version | string
+  when: not reconfigure_only
 
 - name: migrate database schema
   become: yes
   become_user: "{{ paperlessng_system_user }}"
   command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py migrate"
-  when: paperlessng_current_version.stdout != paperlessng_version | string
   register: database_schema
   changed_when: '"No migrations to apply." not in database_schema.stdout'
+  when: not reconfigure_only
 
 - name: configure paperless superuser
   become: yes
@@ -336,7 +354,7 @@
       else:
           User.objects.create_superuser('{{ paperlessng_superuser_name }}', '{{ paperlessng_superuser_email }}', '{{ paperlessng_superuser_password }}')
           print('changed')
-  command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py shell -c \"{{ creation_script }}\""
+  command: '{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py shell -c "{{ creation_script }}"'
   register: superuser
   changed_when: superuser.stdout == 'changed'
   no_log: yes
@@ -349,7 +367,7 @@
     owner: "{{ paperlessng_system_user }}"
     group: "{{ paperlessng_system_group }}"
     mode: g-w,o-rwx
-  when: venv.changed or paperlessng_current_version.stdout != paperlessng_version | string
+  when: venv.changed or not not reconfigure_only
 
 - name: configure ghostscript for PDF
   lineinfile:
@@ -372,34 +390,13 @@
       ]
     - [
         # https://www.freedesktop.org/software/systemd/man/systemd.exec.html
-        {
-          option: "User",
-          value: "{{ paperlessng_system_user }}",
-        },
-        {
-          option: "Group",
-          value: "{{ paperlessng_system_group }}",
-        },
-        {
-          option: "WorkingDirectory",
-          value: "{{ paperlessng_directory }}/src",
-        },
-        {
-          option: "ProtectSystem",
-          value: "full",
-        },
-        {
-          option: "NoNewPrivileges",
-          value: "true",
-        },
-        {
-          option: "PrivateUsers",
-          value: "true",
-        },
-        {
-          option: "PrivateDevices",
-          value: "true",
-        }
+        { option: "User", value: "{{ paperlessng_system_user }}" },
+        { option: "Group", value: "{{ paperlessng_system_group }}" },
+        { option: "WorkingDirectory", value: "{{ paperlessng_directory }}/src", },
+        { option: "ProtectSystem", value: "full" },
+        { option: "NoNewPrivileges", value: "true" },
+        { option: "PrivateUsers", value: "true" },
+        { option: "PrivateDevices", value: "true" },
       ]
 
 - name: configure paperless-consumer service

From 8884a4dfdfd311c9ec44f3762b8dec9c16aa0998 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sat, 16 Jan 2021 11:52:36 +0100
Subject: [PATCH 0924/1300] molecule scenario to test upgrading from releases

Provide a separate scenario to install the last release, then update to
the current one.
Also includes improved deployment verification (check if uploading a
.txt through the API works).
---
 .github/workflows/ansible.yml                 |  9 ++-
 ansible/molecule/default/converge.yml         |  7 ---
 ansible/molecule/default/verify.yml           | 14 -----
 ansible/molecule/fresh/converge.yml           |  7 +++
 .../molecule/{default => fresh}/molecule.yml  |  0
 ansible/molecule/fresh/verify.yml             | 60 +++++++++++++++++++
 ansible/molecule/update/converge.yml          | 11 ++++
 ansible/molecule/update/molecule.yml          | 35 +++++++++++
 ansible/molecule/update/prepare.yml           | 10 ++++
 ansible/molecule/update/verify.yml            | 60 +++++++++++++++++++
 ansible/tasks/main.yml                        |  4 +-
 11 files changed, 192 insertions(+), 25 deletions(-)
 delete mode 100644 ansible/molecule/default/converge.yml
 delete mode 100644 ansible/molecule/default/verify.yml
 create mode 100644 ansible/molecule/fresh/converge.yml
 rename ansible/molecule/{default => fresh}/molecule.yml (100%)
 create mode 100644 ansible/molecule/fresh/verify.yml
 create mode 100644 ansible/molecule/update/converge.yml
 create mode 100644 ansible/molecule/update/molecule.yml
 create mode 100644 ansible/molecule/update/prepare.yml
 create mode 100644 ansible/molecule/update/verify.yml

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index aacc4b44e..646c7ff81 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -26,10 +26,15 @@ jobs:
           docker --version
           molecule --version
           python --version
-      - name: Test with molecule
+      - name: Test fresh installation with molecule
         run: |
           cd ansible
-          molecule test
+          molecule test -s fresh
+        working-directory: "${{ github.repository }}"
+      - name: Test release update with molecule
+        run: |
+          cd ansible
+          molecule test -s update
         working-directory: "${{ github.repository }}"
   # # https://galaxy.ansible.com/docs/contributing/importing.html
   # release:
diff --git a/ansible/molecule/default/converge.yml b/ansible/molecule/default/converge.yml
deleted file mode 100644
index 82067f417..000000000
--- a/ansible/molecule/default/converge.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Converge
-  hosts: all
-  tasks:
-    - name: "Include ansible"
-      include_role:
-        name: "ansible"
diff --git a/ansible/molecule/default/verify.yml b/ansible/molecule/default/verify.yml
deleted file mode 100644
index 4c3b86044..000000000
--- a/ansible/molecule/default/verify.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-# This is an example playbook to execute Ansible tests.
-
-- name: Verify
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: check if webserver is up
-    uri:
-      url: http://localhost:8000
-      status_code: [200, 302]
-      return_content: yes
-    register: landingpage
-    failed_when: "'Sign in</button>' not in landingpage.content"
diff --git a/ansible/molecule/fresh/converge.yml b/ansible/molecule/fresh/converge.yml
new file mode 100644
index 000000000..99e25677b
--- /dev/null
+++ b/ansible/molecule/fresh/converge.yml
@@ -0,0 +1,7 @@
+---
+- name: fresh installation
+  hosts: all
+  tasks:
+    - name: install paperless-ng with default parameters
+      include_role:
+        name: ansible
diff --git a/ansible/molecule/default/molecule.yml b/ansible/molecule/fresh/molecule.yml
similarity index 100%
rename from ansible/molecule/default/molecule.yml
rename to ansible/molecule/fresh/molecule.yml
diff --git a/ansible/molecule/fresh/verify.yml b/ansible/molecule/fresh/verify.yml
new file mode 100644
index 000000000..c353783ab
--- /dev/null
+++ b/ansible/molecule/fresh/verify.yml
@@ -0,0 +1,60 @@
+---
+- name: Verify
+  hosts: all
+  gather_facts: false
+
+  vars_files:
+    - ../../defaults/main.yml
+
+  tasks:
+    - name: check if webserver is up
+      uri:
+        url: http://localhost:8000
+        status_code: [200, 302]
+        return_content: yes
+      register: landingpage
+      failed_when: "'Sign in</button>' not in landingpage.content"
+
+    - name: check if document posting works
+      uri:
+        url: http://localhost:8000/api/documents/post_document/
+        method: POST
+        body_format: form-multipart
+        body:
+          document:
+            content: FOO
+            filename: document.txt
+            mime_type: text/plain
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: post_document
+      failed_when: "'OK' not in post_document.content"
+
+    - name: verify uploaded document has been accepted
+      uri:
+        url: http://localhost:8000/api/logs/
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: logs
+      failed_when: "'Consuming document.txt' not in logs.content"
+
+    # assumes txt consumption finished by now, might have to sleep a bit
+    - name: verify uploaded document has been consumed
+      uri:
+        url: http://localhost:8000/api/logs/
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: logs
+      failed_when: "'document consumption finished' not in logs.content"
+
+    - name: verify uploaded document is avaiable
+      uri:
+        url: http://localhost:8000/api/documents/1/
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: document
+      failed_when: "'Not found.' in document.content or 'FOO' not in document.content"
diff --git a/ansible/molecule/update/converge.yml b/ansible/molecule/update/converge.yml
new file mode 100644
index 000000000..b19a5981a
--- /dev/null
+++ b/ansible/molecule/update/converge.yml
@@ -0,0 +1,11 @@
+---
+- name: update previous release to newest release
+  hosts: all
+  tasks:
+    - name: set current version as installation target
+      set_fact:
+        paperlessng_version: 0.9.14
+
+    - name: update to newest paperless-ng release
+      include_role:
+        name: ansible
diff --git a/ansible/molecule/update/molecule.yml b/ansible/molecule/update/molecule.yml
new file mode 100644
index 000000000..27f37ba63
--- /dev/null
+++ b/ansible/molecule/update/molecule.yml
@@ -0,0 +1,35 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+platforms:
+  - name: ubuntu_focal
+    image: jrei/systemd-ubuntu:20.04
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    tmpfs:
+      - /tmp
+      - /run
+      - /run/lock
+    override_command: False
+  # ubuntu 18.04 bionic works except that
+  #   the default redis configuration expects IPv6 which is not enabled in docker by default
+  #   the default Python environment is configured for ASCII instead of UTF-8
+  # ubuntu 16.04 xenial only has Python 3.5 which is EOL and breaks multiple dependencies
+  - name: debian_buster
+    image: jrei/systemd-debian:10
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    tmpfs:
+      - /tmp
+      - /run
+      - /run/lock
+    override_command: False
+  # debian 9 stretch only has Python 3.5 which is EOL and breaks multiple dependencies
+provisioner:
+  name: ansible
+verifier:
+  name: ansible
diff --git a/ansible/molecule/update/prepare.yml b/ansible/molecule/update/prepare.yml
new file mode 100644
index 000000000..6f3734329
--- /dev/null
+++ b/ansible/molecule/update/prepare.yml
@@ -0,0 +1,10 @@
+- name: install previous release
+  hosts: all
+  tasks:
+    - name: set previous version as installation target
+      set_fact:
+        paperlessng_version: 0.9.13
+
+    - name: install previous paperless-ng release
+      include_role:
+        name: ansible
diff --git a/ansible/molecule/update/verify.yml b/ansible/molecule/update/verify.yml
new file mode 100644
index 000000000..c353783ab
--- /dev/null
+++ b/ansible/molecule/update/verify.yml
@@ -0,0 +1,60 @@
+---
+- name: Verify
+  hosts: all
+  gather_facts: false
+
+  vars_files:
+    - ../../defaults/main.yml
+
+  tasks:
+    - name: check if webserver is up
+      uri:
+        url: http://localhost:8000
+        status_code: [200, 302]
+        return_content: yes
+      register: landingpage
+      failed_when: "'Sign in</button>' not in landingpage.content"
+
+    - name: check if document posting works
+      uri:
+        url: http://localhost:8000/api/documents/post_document/
+        method: POST
+        body_format: form-multipart
+        body:
+          document:
+            content: FOO
+            filename: document.txt
+            mime_type: text/plain
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: post_document
+      failed_when: "'OK' not in post_document.content"
+
+    - name: verify uploaded document has been accepted
+      uri:
+        url: http://localhost:8000/api/logs/
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: logs
+      failed_when: "'Consuming document.txt' not in logs.content"
+
+    # assumes txt consumption finished by now, might have to sleep a bit
+    - name: verify uploaded document has been consumed
+      uri:
+        url: http://localhost:8000/api/logs/
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: logs
+      failed_when: "'document consumption finished' not in logs.content"
+
+    - name: verify uploaded document is avaiable
+      uri:
+        url: http://localhost:8000/api/documents/1/
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: document
+      failed_when: "'Not found.' in document.content or 'FOO' not in document.content"
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index fe139dcbf..a353a18ec 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -155,7 +155,7 @@
 
 - name: move paperless-ng
   command:
-    cmd: "cp -a {{ tempdir.path }}/paperless-ng/ {{ paperlessng_directory }}"
+    cmd: "cp -a {{ tempdir.path }}/paperless-ng/. {{ paperlessng_directory }}"
   when: not reconfigure_only
 
 - name: remove temporary directory
@@ -367,7 +367,7 @@
     owner: "{{ paperlessng_system_user }}"
     group: "{{ paperlessng_system_group }}"
     mode: g-w,o-rwx
-  when: venv.changed or not not reconfigure_only
+  when: venv.changed or not reconfigure_only
 
 - name: configure ghostscript for PDF
   lineinfile:

From 74a1b36005e6053445d903b4f8b02a20fd993dcd Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Mon, 18 Jan 2021 22:48:06 +0100
Subject: [PATCH 0925/1300] Update administration docs with ansible update

---
 docs/administration.rst | 57 +++++++++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/docs/administration.rst b/docs/administration.rst
index 32741300a..1690d49e2 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -53,6 +53,9 @@ Restoring
 Updating Paperless
 ##################
 
+Docker Route
+============
+
 If a new release of paperless-ng is available, upgrading depends on how you
 installed paperless-ng in the first place. The releases are available at the
 `release page <https://github.com/jonaswinkler/paperless-ng/releases>`_.
@@ -72,10 +75,10 @@ A.  If you pull the image from the docker hub, all you need to do is:
 
         $ docker-compose pull
         $ docker-compose up
-    
+
     The docker-compose files refer to the ``latest`` version, which is always the latest
     stable release.
-        
+
 B.  If you built the image yourself, do the following:
 
     .. code:: shell-session
@@ -89,13 +92,13 @@ Running `docker-compose up` will also apply any new database migrations.
 If you see everything working, press CTRL+C once to gracefully stop paperless.
 Then you can start paperless-ng with ``-d`` to have it run in the background.
 
-Updating paperless without docker
-=================================
+Bare Metal Route
+================
 
 After grabbing the new release and unpacking the contents, do the following:
 
 1.  Update dependencies. New paperless version may require additional
-    dependencies. The dependencies required are listed in the section about 
+    dependencies. The dependencies required are listed in the section about
     :ref:`bare metal installations <setup-bare_metal>`.
 
 2.  Update python requirements. If you use Pipenv, this is done with the following steps.
@@ -112,18 +115,50 @@ After grabbing the new release and unpacking the contents, do the following:
 
     You can also use the included ``requirements.txt`` file instead and create the virtual
     environment yourself. This file includes exactly the same dependencies.
-    
+
 3.  Migrate the database.
 
     .. code:: shell-session
 
         $ cd src
         $ pipenv run python3 manage.py migrate
-    
+
     This might not actually do anything. Not every new paperless version comes with new
     database migrations.
-    
-        
+
+Ansible Route
+=============
+
+Most of the update process is automated when using the ansible role.
+
+1.  Backup your defined role variables file outside the paperless source-tree:
+
+    .. code:: shell-session
+
+        $ cp ansible/vars.yml ~/vars.yml.old
+
+2.  Pull the release tag you want to update to:
+
+    .. code:: shell-session
+
+        $ git fetch --all
+        $ git checkout ng-0.9.14
+
+3.  Update the role variable definitions ``ansible/vars.yml`` (where appropriate).
+
+4.  Run the ansible playbook you created created during :ref:`installation <setup-ansible>` again:
+
+    .. note::
+
+        When ansible detects that an update run is in progress, it backs up the entire ``paperlessng_directory`` to ``paperlessng_directory-TIMESTAMP``.
+        Updates can be rolled back by simply moving the timestamped folder back to the original location.
+        If the update succeeds and you want to continue using the new release, please don't forget to delete the backup folder.
+
+    .. code:: shell-session
+
+        $ ansible-playbook playbook.yml
+
+
 Management utilities
 ####################
 
@@ -361,7 +396,7 @@ Documents can be stored in Paperless using GnuPG encryption.
     Furthermore, the entire text content of the documents is stored plain in the
     database, even if your documents are encrypted. Filenames are not encrypted as
     well.
-    
+
     Also, the web server provides transparent access to your encrypted documents.
 
     Consider running paperless on an encrypted filesystem instead, which will then
@@ -386,4 +421,4 @@ Basic usage to disable encryption of your document store:
     decrypt_documents [--passphrase SECR3TP4SSPHRA$E]
 
 
-.. _Pipenv: https://pipenv.pypa.io/en/latest/
\ No newline at end of file
+.. _Pipenv: https://pipenv.pypa.io/en/latest/

From 0af0dffeda646df4baea141c9af8d7d08ec37164 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Mon, 18 Jan 2021 23:28:17 +0000
Subject: [PATCH 0926/1300] Translate /src-ui/messages.xlf in fr

translation completed for the source file '/src-ui/messages.xlf'
on the 'fr' language.
---
 src-ui/src/locale/messages.fr.xlf | 138 ++++++++++++++++++++----------
 1 file changed, 93 insertions(+), 45 deletions(-)

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
index 06ca713a4..ee97f7ce0 100644
--- a/src-ui/src/locale/messages.fr.xlf
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -542,7 +542,7 @@
         <target>Vue &quot;<x equiv-text="savedView.name" id="PH"/>&quot; supprimée.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -550,7 +550,23 @@
         <target>Paramètres enregistrés avec succès.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">78</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6839066544204061364">
+        <source>Use system language</source>
+        <target>Utiliser la langue du système</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">82</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7729897675462249787">
+        <source>Use date format of display language</source>
+        <target>Utiliser le format de date de la langue d'affichage</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -558,7 +574,7 @@
         <target>Une erreur s'est produite lors de l'enregistrement des paramètres sur le serveur : <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -582,7 +598,7 @@
         <target>Vues enregistrées</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
@@ -609,20 +625,60 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
-        <source>Items per page</source>
-        <target>Éléments par page</target>
+      <trans-unit datatype="html" id="0cd55822928764cc82a62ee3e6f3adbc1c630479">
+        <source>Date display</source>
+        <target>Affichage de la date</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">32</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="c4435e56bf0289e78fedc462f1d21fb30b9de55d">
-        <source>Document editor</source>
-        <target>Éditeur de documents</target>
+      <trans-unit datatype="html" id="7df4de0d0704a06a302d853e31f2580eba98f127">
+        <source>Date format</source>
+        <target>Format de date</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">48</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="69852399a18b8ca4fca8c5bfddd3f00a6d137593">
+        <source>Short: <x equiv-text="{{today | customDate:'shortDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Court : <x equiv-text="{{today | customDate:'shortDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d01a59285e711252b98c4f193394e4b854615c78">
+        <source>Medium: <x equiv-text="{{today | customDate:'mediumDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Moyen : <x equiv-text="{{today | customDate:'mediumDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="00481629776699b1caebd12b3b1176e2e23740a8">
+        <source>Long: <x equiv-text="{{today | customDate:'longDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Long : <x equiv-text="{{today | customDate:'longDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
+        <source>Items per page</source>
+        <target>Éléments par page</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c4435e56bf0289e78fedc462f1d21fb30b9de55d">
+        <source>Document editor</source>
+        <target>Visionneuse de documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4903e521c9bfd11ce88e7a5575106ef638912e0d">
@@ -630,7 +686,7 @@
         <target>Utiliser la visionneuse PDF fournie par le navigateur</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="d7db07023e53f8396d18d375c2b78c25fc81c197">
@@ -638,7 +694,7 @@
         <target>Cette option est généralement plus rapide pour l'affichage de grands documents PDF, mais elle peut ne pas fonctionner sur certains navigateurs.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
@@ -646,7 +702,7 @@
         <target>Mode sombre</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">59</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
@@ -654,7 +710,7 @@
         <target>Utiliser les paramètres du système</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8ee474504043fa89821d626e4f3413240fa91b53">
@@ -662,7 +718,7 @@
         <target>Activer le mode sombre</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
@@ -670,7 +726,7 @@
         <target>Edition en masse</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">67</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
@@ -678,7 +734,7 @@
         <target>Afficher les messages de confirmation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
@@ -686,7 +742,7 @@
         <target>La suppression de documents requiert toujours une confirmation.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
@@ -694,7 +750,7 @@
         <target>Appliquer lors de la fermeture</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">72</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -702,7 +758,7 @@
         <target>Apparaît sur</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -710,7 +766,7 @@
         <target>Montrer sur le tableau de bord</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -718,7 +774,7 @@
         <target>Montrer dans la barre latérale</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">98</context>
+          <context context-type="linenumber">133</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -726,7 +782,7 @@
         <target>Aucune vue sauvegardée n'est définie.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">108</context>
+          <context context-type="linenumber">143</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -806,7 +862,7 @@
         <target>Algorithme de rapprochement</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="eab7fc7cf2d663e54de934b779fce4275a303f0f">
@@ -814,7 +870,7 @@
         <target>Modèle de rapprochement</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">12</context>
+          <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
@@ -822,7 +878,7 @@
         <target>Insensible à la casse</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9153094873118985366">
@@ -1179,9 +1235,9 @@
           <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="1b29a8153575e5ad26cc7dd8bd75c4f45f6bfe7e">
-        <source>Created: <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></source>
-        <target>Créé le : <x equiv-text="{{document.created | date}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="849b42384616374df49bd8b3711ec159cb10b845">
+        <source>Created: <x equiv-text="{{document.created | customDate}}" id="INTERPOLATION"/></source>
+        <target>Créé le : <x equiv-text="{{document.created | customDate}}" id="INTERPOLATION"/></target>
         <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>
@@ -1614,20 +1670,12 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="6839066544204061364">
-        <source>Use system language</source>
-        <target>Utiliser la langue du système</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">64</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="5866254605255506989">
         <source>English</source>
         <target>Anglais</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">74</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
@@ -1635,7 +1683,7 @@
         <target>Allemand</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1643,7 +1691,7 @@
         <target>Néerlandais</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">67</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1651,7 +1699,7 @@
         <target>Français</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">77</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1519954996184640001">
@@ -1835,7 +1883,7 @@
         <target>Créer un nouvel élément</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">43</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5324147361912094446">
@@ -1843,7 +1891,7 @@
         <target>Éditer l'élément</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">47</context>
+          <context context-type="linenumber">54</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1699589597032579396">
@@ -1851,7 +1899,7 @@
         <target>Impossible d'enregistrer l'élément : <x equiv-text="error" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
-          <context context-type="linenumber">51</context>
+          <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="810888510148304696">

From 0b949a14c07c65a44e4ae2c502863238f45cec94 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 19 Jan 2021 14:00:15 +0100
Subject: [PATCH 0927/1300] add filtering to management pages #356

---
 src-ui/messages.xlf                           | 40 +++++++++----------
 .../correspondent-list.component.html         | 11 ++++-
 .../document-type-list.component.html         | 12 ++++--
 .../generic-list/generic-list.component.ts    | 39 +++++++++++++++---
 .../manage/tag-list/tag-list.component.html   | 12 ++++--
 .../rest/abstract-name-filter-service.ts      | 14 +++++++
 .../services/rest/correspondent.service.ts    |  4 +-
 .../services/rest/document-type.service.ts    |  4 +-
 src-ui/src/app/services/rest/tag.service.ts   |  4 +-
 9 files changed, 101 insertions(+), 39 deletions(-)
 create mode 100644 src-ui/src/app/services/rest/abstract-name-filter-service.ts

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index d71bdbc2e..1e89a9408 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -394,53 +394,60 @@
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="ddb40946e790522301687ecddb9ce1cb8ad40dd1" datatype="html">
+        <source>Filter by:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="cff1428d10d59d14e45edec3c735a27b5482db59" datatype="html">
         <source>Name</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8fa4d523f7b91df4390120b85ed0406138273e1a" datatype="html">
         <source>Color</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d0c4488f742efeba0915e90e285a022da813deff" datatype="html">
         <source>Matching</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9bcf8d20d23c111eca1431abd2d2ce0de324499c" datatype="html">
         <source>Document count</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit id="030b4423b92167200e39519599f9b863b4f7c62c" datatype="html">
         <source>Actions</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9d51b3c90afda70700229d1b8a55371c13cb3bce" datatype="html">
         <source>Documents</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">32</context>
+          <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit id="28f86ffd419b869711aa13f5e5ff54be6d70731c" datatype="html">
         <source>Edit</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">37</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4990731724078522539" datatype="html">
@@ -713,7 +720,7 @@
         <source>Last correspondence</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1234709746630139322" datatype="html">
@@ -976,13 +983,6 @@
           <context context-type="linenumber">46</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="ddb40946e790522301687ecddb9ce1cb8ad40dd1" datatype="html">
-        <source>Filter by:</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="02d184c288f567825a1fcbf83bcd3099a10853d5" datatype="html">
         <source>Filter tags</source>
         <context-group purpose="location">
@@ -1670,35 +1670,35 @@
         <source>Automatic</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5044611416737085530" datatype="html">
         <source>Do you really want to delete this element?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8371896857609524947" datatype="html">
         <source>Associated documents will not be deleted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">104</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7022070615528435141" datatype="html">
         <source>Delete</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5467489005440577210" datatype="html">
         <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">93</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5851669019930456395" datatype="html">
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
index ffe260d73..4cbafb817 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html
@@ -2,8 +2,15 @@
   <button type="button" class="btn btn-sm btn-outline-primary" (click)="openCreateDialog()" i18n>Create</button>
 </app-page-header>
 
-<div class="row m-0 justify-content-end">
-  <ngb-pagination [pageSize]="25" [collectionSize]="collectionSize" [(page)]="page" (pageChange)="reloadData()" aria-label="Default pagination"></ngb-pagination>
+<div class="row">
+  <div class="col-md 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>
+      <input class="form-control form-control-sm flex-fill w-auto" type="text" [(ngModel)]="nameFilter" placeholder="Name" i18n-placeholder>
+    </div>
+  </div>
+
+  <ngb-pagination class="col-auto" [pageSize]="25" [collectionSize]="collectionSize" [(page)]="page" (pageChange)="reloadData()" aria-label="Default pagination"></ngb-pagination>
 </div>
 
 <table class="table table-striped border shadow-sm">
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
index dd6e86592..613cc4fd4 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html
@@ -2,9 +2,15 @@
   <button type="button" class="btn btn-sm btn-outline-primary" (click)="openCreateDialog()" i18n>Create</button>
 </app-page-header>
 
-<div class="row m-0 justify-content-end">
-  <ngb-pagination [pageSize]="25" [collectionSize]="collectionSize" [(page)]="page" (pageChange)="reloadData()"
-  aria-label="Default pagination"></ngb-pagination>
+<div class="row">
+  <div class="col-md 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>
+      <input class="form-control form-control-sm flex-fill w-auto" type="text" [(ngModel)]="nameFilter" placeholder="Name" i18n-placeholder>
+    </div>
+  </div>
+
+  <ngb-pagination class="col-auto" [pageSize]="25" [collectionSize]="collectionSize" [(page)]="page" (pageChange)="reloadData()" aria-label="Default pagination"></ngb-pagination>
 </div>
 
 <table class="table table-striped border shadow-sm">
diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
index e1d5226f3..7c5dbc8e3 100644
--- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
+++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts
@@ -1,17 +1,19 @@
-import { Directive, OnInit, QueryList, ViewChildren } from '@angular/core';
+import { Directive, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Subject, Subscription } from 'rxjs';
+import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import { MatchingModel, MATCHING_ALGORITHMS, MATCH_AUTO } from 'src/app/data/matching-model';
 import { ObjectWithId } from 'src/app/data/object-with-id';
 import { SortableDirective, SortEvent } from 'src/app/directives/sortable.directive';
-import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
+import { AbstractNameFilterService } from 'src/app/services/rest/abstract-name-filter-service';
 import { ToastService } from 'src/app/services/toast.service';
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component';
 
 @Directive()
-export abstract class GenericListComponent<T extends ObjectWithId> implements OnInit {
+export abstract class GenericListComponent<T extends ObjectWithId> implements OnInit, OnDestroy {
 
   constructor(
-    private service: AbstractPaperlessService<T>,
+    private service: AbstractNameFilterService<T>,
     private modalService: NgbModal,
     private editDialogComponent: any,
     private toastService: ToastService) {
@@ -28,6 +30,10 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
   public sortField: string
   public sortReverse: boolean
 
+  private nameFilterDebounce: Subject<string>
+  private subscription: Subscription
+  private _nameFilter: string
+
   getMatching(o: MatchingModel) {
     if (o.matching_algorithm == MATCH_AUTO) {
       return $localize`Automatic`
@@ -44,12 +50,27 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
     this.reloadData()
   }
 
+
   ngOnInit(): void {
     this.reloadData()
+
+    this.nameFilterDebounce = new Subject<string>()
+
+    this.subscription = this.nameFilterDebounce.pipe(
+      debounceTime(400),
+      distinctUntilChanged()
+    ).subscribe(title => {
+      this._nameFilter = title
+      this.reloadData()
+    })
+  }
+
+  ngOnDestroy() {
+    this.subscription.unsubscribe()
   }
 
   reloadData() {
-    this.service.list(this.page, null, this.sortField, this.sortReverse).subscribe(c => {
+    this.service.listFiltered(this.page, null, this.sortField, this.sortReverse, this._nameFilter).subscribe(c => {
       this.data = c.results
       this.collectionSize = c.count
     });
@@ -95,4 +116,12 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
     }
     )
   }
+
+  get nameFilter() {
+    return this._nameFilter
+  }
+
+  set nameFilter(nameFilter: string) {
+    this.nameFilterDebounce.next(nameFilter)
+  }
 }
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.html b/src-ui/src/app/components/manage/tag-list/tag-list.component.html
index 4af22b3cd..036beccbc 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.html
@@ -2,9 +2,15 @@
   <button type="button" class="btn btn-sm btn-outline-primary" (click)="openCreateDialog()" i18n>Create</button>
 </app-page-header>
 
-<div class="row m-0 justify-content-end">
-  <ngb-pagination [pageSize]="25" [collectionSize]="collectionSize" [(page)]="page" (pageChange)="reloadData()"
-    aria-label="Default pagination"></ngb-pagination>
+<div class="row">
+  <div class="col-md 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>
+      <input class="form-control form-control-sm flex-fill w-auto" type="text" [(ngModel)]="nameFilter" placeholder="Name" i18n-placeholder>
+    </div>
+  </div>
+
+  <ngb-pagination class="col-auto" [pageSize]="25" [collectionSize]="collectionSize" [(page)]="page" (pageChange)="reloadData()" aria-label="Default pagination"></ngb-pagination>
 </div>
 
 <table class="table table-striped border shadow-sm">
diff --git a/src-ui/src/app/services/rest/abstract-name-filter-service.ts b/src-ui/src/app/services/rest/abstract-name-filter-service.ts
new file mode 100644
index 000000000..d605fef49
--- /dev/null
+++ b/src-ui/src/app/services/rest/abstract-name-filter-service.ts
@@ -0,0 +1,14 @@
+import { ObjectWithId } from 'src/app/data/object-with-id'
+import { AbstractPaperlessService } from './abstract-paperless-service'
+
+export abstract class AbstractNameFilterService<T extends ObjectWithId> extends AbstractPaperlessService<T> {
+
+  listFiltered(page?: number, pageSize?: number, sortField?: string, sortReverse?: boolean, nameFilter?: string) {
+    let params = {}
+    if (nameFilter) {
+      params = {'name__icontains': nameFilter}
+    }
+    return this.list(page, pageSize, sortField, sortReverse, params)
+  }
+
+}
diff --git a/src-ui/src/app/services/rest/correspondent.service.ts b/src-ui/src/app/services/rest/correspondent.service.ts
index a609b7dd8..7eac24971 100644
--- a/src-ui/src/app/services/rest/correspondent.service.ts
+++ b/src-ui/src/app/services/rest/correspondent.service.ts
@@ -1,12 +1,12 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
-import { AbstractPaperlessService } from './abstract-paperless-service';
+import { AbstractNameFilterService } from './abstract-name-filter-service';
 
 @Injectable({
   providedIn: 'root'
 })
-export class CorrespondentService extends AbstractPaperlessService<PaperlessCorrespondent> {
+export class CorrespondentService extends AbstractNameFilterService<PaperlessCorrespondent> {
 
   constructor(http: HttpClient) {
     super(http, 'correspondents')
diff --git a/src-ui/src/app/services/rest/document-type.service.ts b/src-ui/src/app/services/rest/document-type.service.ts
index a3ba0d858..4f5b7d0ce 100644
--- a/src-ui/src/app/services/rest/document-type.service.ts
+++ b/src-ui/src/app/services/rest/document-type.service.ts
@@ -1,12 +1,12 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
-import { AbstractPaperlessService } from './abstract-paperless-service';
+import { AbstractNameFilterService } from './abstract-name-filter-service';
 
 @Injectable({
   providedIn: 'root'
 })
-export class DocumentTypeService extends AbstractPaperlessService<PaperlessDocumentType> {
+export class DocumentTypeService extends AbstractNameFilterService<PaperlessDocumentType> {
 
   constructor(http: HttpClient) {
     super(http, 'document_types')
diff --git a/src-ui/src/app/services/rest/tag.service.ts b/src-ui/src/app/services/rest/tag.service.ts
index b4151dbb9..7bc55b0c9 100644
--- a/src-ui/src/app/services/rest/tag.service.ts
+++ b/src-ui/src/app/services/rest/tag.service.ts
@@ -1,12 +1,12 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { PaperlessTag } from 'src/app/data/paperless-tag';
-import { AbstractPaperlessService } from './abstract-paperless-service';
+import { AbstractNameFilterService } from './abstract-name-filter-service';
 
 @Injectable({
   providedIn: 'root'
 })
-export class TagService extends AbstractPaperlessService<PaperlessTag> {
+export class TagService extends AbstractNameFilterService<PaperlessTag> {
 
   constructor(http: HttpClient) {
     super(http, 'tags')

From 5355f2b027e448b1e142ed8ed2dbb0ce010d3dd5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 19 Jan 2021 14:43:55 +0100
Subject: [PATCH 0928/1300] fixes #351

---
 .../management/commands/document_consumer.py  | 44 ++++++++++++++++---
 .../tests/test_management_consumer.py         | 27 +++++++++++-
 2 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index d0c045db2..595bd39cd 100644
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -5,7 +5,6 @@ from time import sleep
 
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
-from django.utils.text import slugify
 from django_q.tasks import async_task
 from watchdog.events import FileSystemEventHandler
 from watchdog.observers.polling import PollingObserver
@@ -71,6 +70,31 @@ def _consume(filepath):
             "Error while consuming document: {}".format(e))
 
 
+def _test_inotify(directory):
+    if not INotify:
+        return False
+
+    test_file = os.path.join(directory, "__inotify_test_file__")
+    inotify = INotify()
+    descriptor = None
+    try:
+        inotify_flags = flags.CLOSE_WRITE | flags.MOVED_TO
+        descriptor = inotify.add_watch(directory, inotify_flags)
+        Path(test_file).touch()
+        events = inotify.read(timeout=1000)
+        return len(events) == 1
+    except Exception as e:
+        logger.warning(
+            f"Error while checking inotify availability: {str(e)}")
+        return False
+    finally:
+        if descriptor:
+            inotify.rm_watch(descriptor)
+        inotify.close()
+        if os.path.isfile(test_file):
+            os.unlink(test_file)
+
+
 def _consume_wait_unmodified(file, num_tries=20, wait_time=1):
     mtime = -1
     current_try = 0
@@ -154,17 +178,25 @@ class Command(BaseCommand):
         if options["oneshot"]:
             return
 
-        if settings.CONSUMER_POLLING == 0 and INotify:
-            self.handle_inotify(directory, recursive)
+        if settings.CONSUMER_POLLING == 0:
+            if _test_inotify(directory):
+                self.handle_inotify(directory, recursive)
+            else:
+                logger.warning(
+                    f"Inotify notifications are not available on {directory}, "
+                    f"falling back to polling every 10 seconds")
+                self.handle_polling(
+                    directory, recursive, 10)
         else:
-            self.handle_polling(directory, recursive)
+            self.handle_polling(
+                directory, recursive, settings.CONSUMER_POLLING)
 
         logger.debug("Consumer exiting.")
 
-    def handle_polling(self, directory, recursive):
+    def handle_polling(self, directory, recursive, timeout):
         logging.getLogger(__name__).info(
             f"Polling directory for changes: {directory}")
-        self.observer = PollingObserver(timeout=settings.CONSUMER_POLLING)
+        self.observer = PollingObserver(timeout=timeout)
         self.observer.schedule(Handler(), directory, recursive=recursive)
         self.observer.start()
         try:
diff --git a/src/documents/tests/test_management_consumer.py b/src/documents/tests/test_management_consumer.py
index b6a61a167..0680e7f56 100644
--- a/src/documents/tests/test_management_consumer.py
+++ b/src/documents/tests/test_management_consumer.py
@@ -7,8 +7,9 @@ from unittest import mock
 
 from django.conf import settings
 from django.core.management import call_command, CommandError
-from django.test import override_settings, TransactionTestCase
+from django.test import override_settings, TransactionTestCase, TestCase
 
+from documents.management.commands.document_consumer import _test_inotify
 from documents.models import Tag
 from documents.consumer import ConsumerError
 from documents.management.commands import document_consumer
@@ -260,3 +261,27 @@ class TestConsumerTags(DirectoriesMixin, ConsumerMixin, TransactionTestCase):
     @override_settings(CONSUMER_POLLING=1)
     def test_consume_file_with_path_tags_polling(self):
         self.test_consume_file_with_path_tags()
+
+
+class TestInotify(DirectoriesMixin, TestCase):
+
+    def test_inotify(self):
+        self.assertTrue(_test_inotify(self.dirs.consumption_dir))
+
+    @mock.patch("documents.management.commands.document_consumer.Path.touch")
+    def test_inotify_error(self, m):
+        m.side_effect = OSError("Permission error")
+        self.assertFalse(_test_inotify(self.dirs.consumption_dir))
+
+    @mock.patch("documents.management.commands.document_consumer.Command.handle_polling")
+    @mock.patch("documents.management.commands.document_consumer.Command.handle_inotify")
+    @mock.patch("documents.management.commands.document_consumer._test_inotify")
+    def test_polling_fallback(self, test_inotify, handle_inotify, handle_polling):
+        test_inotify.return_value = False
+
+        cmd = document_consumer.Command()
+        cmd.handle(directory=settings.CONSUMPTION_DIR, oneshot=False)
+
+        test_inotify.assert_called_once()
+        handle_polling.assert_called_once()
+        handle_inotify.assert_not_called()

From 5e841531be10fee6ebb061c3088b51391d241e1e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 19 Jan 2021 16:14:28 +0100
Subject: [PATCH 0929/1300] more test

---
 src/documents/tests/test_management_exporter.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index 212b87ec1..986e458b9 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -74,6 +74,11 @@ class TestExportImport(DirectoriesMixin, TestCase):
 
         self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))
 
+        self.assertEqual(self._get_document_from_manifest(manifest, self.d1.id)['fields']['title'], "wow1")
+        self.assertEqual(self._get_document_from_manifest(manifest, self.d2.id)['fields']['title'], "wow2")
+        self.assertEqual(self._get_document_from_manifest(manifest, self.d3.id)['fields']['title'], "wow2")
+        self.assertEqual(self._get_document_from_manifest(manifest, self.d4.id)['fields']['title'], "wow_dec")
+
         for element in manifest:
             if element['model'] == 'documents.document':
                 fname = os.path.join(self.target, element[document_exporter.EXPORTER_FILE_NAME])

From 7834d369c67a2e1b4abbc74a9240db616a72bcd7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 19 Jan 2021 16:23:49 +0100
Subject: [PATCH 0930/1300] txt preview #338

---
 .../document-detail/document-detail.component.html          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 253d5b167..639b9e260 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -141,6 +141,10 @@
             <ng-template #nativePdfViewer>
                 <object [data]="previewUrl | safe" type="application/pdf" class="preview-sticky" width="100%"></object>
             </ng-template>
-        </ng-container>     
+        </ng-container>
+        <ng-container *ngIf="getContentType() == 'text/plain'">
+            <object [data]="previewUrl | safe" type="text/plain" class="preview-sticky" width="100%"></object>
+        </ng-container>
+          
     </div>
 </div>

From 02a066f8f3a0586c3ba26b11cb9c14d24af12711 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Tue, 19 Jan 2021 16:43:12 +0100
Subject: [PATCH 0931/1300] Update README.md

---
 README.md | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 12277ad65..89f55b2d9 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,6 @@
 
 Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, have a look at the changelog in the documentation.
 
-This project is still in development and some things may not work as expected.
-
 # How it Works
 
 Paperless does not control your scanner, it only helps you deal with what your scanner produces.
@@ -48,7 +46,7 @@ Here's what you get:
 	* Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless.
 * A task processor that processes documents in parallel and also tells you when something goes wrong. On modern multi core systems, consumption is blazing fast.
 
-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).
+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). However, some parts of the UI have changed since I took these.
 
 For a complete list of changes from paperless, check out the [changelog](https://paperless-ng.readthedocs.io/en/latest/changelog.html)
 
@@ -58,20 +56,6 @@ For a complete list of changes from paperless, check out the [changelog](https:/
 - Fix whatever bugs I and you find.
 - Make the documentation nice.
 
-## Roadmap for versions beyond 1.0
-
-These are things that I want to add to paperless eventually. They are sorted by priority.
-
-- **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like:
-  - Group and limit search results by correspondent, show “more from this” links in the results.
-- **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system.
-- **An interactive consumer** that shows its progress for documents it processes on the web page.
-	- With live updates and websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particularly happy about.
-	- Notifications when a document was added with buttons to open the new document right away.
-- **Arbitrary tag colors**. Allow the selection of any color with a color picker.
-
-Apart from that, paperless is pretty much feature complete.
-
 ## On the chopping block.
 
 - **GnuPG encrypion.** [Here's a note about encryption in paperless](https://paperless-ng.readthedocs.io/en/latest/administration.html#managing-encryption). The gist of it is that I don't see which attacks this implementation protects against. It gives a false sense of security to users who don't care about how it works.

From c808011b75abe61e47a69003f7e951cb10491bb3 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 20 Jan 2021 11:37:32 +0100
Subject: [PATCH 0932/1300] Update Crowdin configuration file

---
 crowdin.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 crowdin.yml

diff --git a/crowdin.yml b/crowdin.yml
new file mode 100644
index 000000000..6291aa2b0
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,5 @@
+files:
+  - source: /src/documents/locale/en-us/LC_MESSAGES/django.po
+    translation: /src/documents/locale/%two_letters_code%/LC_MESSAGES/django.po
+  - source: /src-ui/messages.xlf
+    translation: /src-ui/src/locale/messages.%two_letters_code%.xlf

From f06edebbd863fdcfbf63f74badf4ac3c9a20f922 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 20 Jan 2021 11:39:20 +0100
Subject: [PATCH 0933/1300] Update Crowdin configuration file

---
 crowdin.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crowdin.yml b/crowdin.yml
index 6291aa2b0..f5a7765dd 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,5 +1,5 @@
 files:
-  - source: /src/documents/locale/en-us/LC_MESSAGES/django.po
-    translation: /src/documents/locale/%two_letters_code%/LC_MESSAGES/django.po
+  - source: /src/locale/en-us/LC_MESSAGES/django.po
+    translation: /src/locale/%two_letters_code%/LC_MESSAGES/django.po
   - source: /src-ui/messages.xlf
     translation: /src-ui/src/locale/messages.%two_letters_code%.xlf

From 08046cb83f95dbcb9ebe9bba37d8d2a9c77c0b67 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 20 Jan 2021 11:56:09 +0100
Subject: [PATCH 0934/1300] revert changes for #351

---
 .../management/commands/document_consumer.py  | 41 ++-----------------
 .../tests/test_management_consumer.py         | 27 +-----------
 2 files changed, 5 insertions(+), 63 deletions(-)

diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index 595bd39cd..690f5299a 100644
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -70,31 +70,6 @@ def _consume(filepath):
             "Error while consuming document: {}".format(e))
 
 
-def _test_inotify(directory):
-    if not INotify:
-        return False
-
-    test_file = os.path.join(directory, "__inotify_test_file__")
-    inotify = INotify()
-    descriptor = None
-    try:
-        inotify_flags = flags.CLOSE_WRITE | flags.MOVED_TO
-        descriptor = inotify.add_watch(directory, inotify_flags)
-        Path(test_file).touch()
-        events = inotify.read(timeout=1000)
-        return len(events) == 1
-    except Exception as e:
-        logger.warning(
-            f"Error while checking inotify availability: {str(e)}")
-        return False
-    finally:
-        if descriptor:
-            inotify.rm_watch(descriptor)
-        inotify.close()
-        if os.path.isfile(test_file):
-            os.unlink(test_file)
-
-
 def _consume_wait_unmodified(file, num_tries=20, wait_time=1):
     mtime = -1
     current_try = 0
@@ -179,24 +154,16 @@ class Command(BaseCommand):
             return
 
         if settings.CONSUMER_POLLING == 0:
-            if _test_inotify(directory):
-                self.handle_inotify(directory, recursive)
-            else:
-                logger.warning(
-                    f"Inotify notifications are not available on {directory}, "
-                    f"falling back to polling every 10 seconds")
-                self.handle_polling(
-                    directory, recursive, 10)
+            self.handle_inotify(directory, recursive)
         else:
-            self.handle_polling(
-                directory, recursive, settings.CONSUMER_POLLING)
+            self.handle_polling(directory, recursive)
 
         logger.debug("Consumer exiting.")
 
-    def handle_polling(self, directory, recursive, timeout):
+    def handle_polling(self, directory, recursive):
         logging.getLogger(__name__).info(
             f"Polling directory for changes: {directory}")
-        self.observer = PollingObserver(timeout=timeout)
+        self.observer = PollingObserver(timeout=settings.CONSUMER_POLLING)
         self.observer.schedule(Handler(), directory, recursive=recursive)
         self.observer.start()
         try:
diff --git a/src/documents/tests/test_management_consumer.py b/src/documents/tests/test_management_consumer.py
index 0680e7f56..b6a61a167 100644
--- a/src/documents/tests/test_management_consumer.py
+++ b/src/documents/tests/test_management_consumer.py
@@ -7,9 +7,8 @@ from unittest import mock
 
 from django.conf import settings
 from django.core.management import call_command, CommandError
-from django.test import override_settings, TransactionTestCase, TestCase
+from django.test import override_settings, TransactionTestCase
 
-from documents.management.commands.document_consumer import _test_inotify
 from documents.models import Tag
 from documents.consumer import ConsumerError
 from documents.management.commands import document_consumer
@@ -261,27 +260,3 @@ class TestConsumerTags(DirectoriesMixin, ConsumerMixin, TransactionTestCase):
     @override_settings(CONSUMER_POLLING=1)
     def test_consume_file_with_path_tags_polling(self):
         self.test_consume_file_with_path_tags()
-
-
-class TestInotify(DirectoriesMixin, TestCase):
-
-    def test_inotify(self):
-        self.assertTrue(_test_inotify(self.dirs.consumption_dir))
-
-    @mock.patch("documents.management.commands.document_consumer.Path.touch")
-    def test_inotify_error(self, m):
-        m.side_effect = OSError("Permission error")
-        self.assertFalse(_test_inotify(self.dirs.consumption_dir))
-
-    @mock.patch("documents.management.commands.document_consumer.Command.handle_polling")
-    @mock.patch("documents.management.commands.document_consumer.Command.handle_inotify")
-    @mock.patch("documents.management.commands.document_consumer._test_inotify")
-    def test_polling_fallback(self, test_inotify, handle_inotify, handle_polling):
-        test_inotify.return_value = False
-
-        cmd = document_consumer.Command()
-        cmd.handle(directory=settings.CONSUMPTION_DIR, oneshot=False)
-
-        test_inotify.assert_called_once()
-        handle_polling.assert_called_once()
-        handle_inotify.assert_not_called()

From 9f1436a865621d313de7c6fd4eccd3957eb7b7ea Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 20 Jan 2021 12:34:01 +0100
Subject: [PATCH 0935/1300] more test

---
 src/documents/tests/test_api.py     | 47 +++++++++++++++++++++++++++++
 src/documents/tests/test_parsers.py |  1 +
 2 files changed, 48 insertions(+)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 5f81b83b6..6b9cf14e0 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -923,6 +923,14 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         doc2 = Document.objects.get(id=self.doc2.id)
         self.assertEqual(doc2.correspondent, self.c1)
 
+    def test_api_no_correspondent(self):
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc2.id],
+            "method": "set_correspondent",
+            "parameters": {}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+
     def test_api_invalid_document_type(self):
         self.assertEqual(self.doc2.document_type, self.dt1)
         response = self.client.post("/api/documents/bulk_edit/", json.dumps({
@@ -935,6 +943,14 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         doc2 = Document.objects.get(id=self.doc2.id)
         self.assertEqual(doc2.document_type, self.dt1)
 
+    def test_api_no_document_type(self):
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc2.id],
+            "method": "set_document_type",
+            "parameters": {}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+
     def test_api_add_invalid_tag(self):
         self.assertEqual(list(self.doc2.tags.all()), [self.t1])
         response = self.client.post("/api/documents/bulk_edit/", json.dumps({
@@ -946,6 +962,14 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
 
         self.assertEqual(list(self.doc2.tags.all()), [self.t1])
 
+    def test_api_add_tag_no_tag(self):
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc2.id],
+            "method": "add_tag",
+            "parameters": {}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+
     def test_api_delete_invalid_tag(self):
         self.assertEqual(list(self.doc2.tags.all()), [self.t1])
         response = self.client.post("/api/documents/bulk_edit/", json.dumps({
@@ -957,6 +981,14 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
 
         self.assertEqual(list(self.doc2.tags.all()), [self.t1])
 
+    def test_api_delete_tag_no_tag(self):
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc2.id],
+            "method": "remove_tag",
+            "parameters": {}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+
     def test_api_modify_invalid_tags(self):
         self.assertEqual(list(self.doc2.tags.all()), [self.t1])
         response = self.client.post("/api/documents/bulk_edit/", json.dumps({
@@ -966,6 +998,21 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         }), content_type='application/json')
         self.assertEqual(response.status_code, 400)
 
+    def test_api_modify_tags_no_tags(self):
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc2.id],
+            "method": "modify_tags",
+            "parameters": {"remove_tags": [1123123]}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+
+        response = self.client.post("/api/documents/bulk_edit/", json.dumps({
+            "documents": [self.doc2.id],
+            "method": "modify_tags",
+            "parameters": {'add_tags': [self.t2.id, 1657]}
+        }), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+
     def test_api_selection_data_empty(self):
         response = self.client.post("/api/documents/selection_data/", json.dumps({
             "documents": []
diff --git a/src/documents/tests/test_parsers.py b/src/documents/tests/test_parsers.py
index 805e4beac..392c0504f 100644
--- a/src/documents/tests/test_parsers.py
+++ b/src/documents/tests/test_parsers.py
@@ -120,3 +120,4 @@ class TestParserAvailability(TestCase):
 
         self.assertTrue(is_file_ext_supported('.pdf'))
         self.assertFalse(is_file_ext_supported('.hsdfh'))
+        self.assertFalse(is_file_ext_supported(''))

From f6a2cc74e84847fbd01b0d16e3ed6b3eee76ee85 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 20 Jan 2021 14:25:52 +0100
Subject: [PATCH 0936/1300] clicking on small and large cards changed

---
 .../document-card-large/document-card-large.component.html    | 4 ++--
 .../document-card-small/document-card-small.component.html    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index 85964f528..d26c17159 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -1,6 +1,6 @@
-<div class="card mb-3 shadow-sm" [class.card-selected]="selected" [class.document-card]="selectable" (click)="this.toggleSelected.emit($event)">
+<div class="card mb-3 shadow-sm" [class.card-selected]="selected" [class.document-card]="selectable">
   <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">
+    <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">
 
       <div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index a0d0299a5..882de71ed 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,6 +1,6 @@
 <div class="col p-2 h-100">
-  <div class="card h-100 shadow-sm document-card" [class.card-selected]="selected" (click)="this.toggleSelected.emit($event)">
-    <div class="border-bottom doc-img-container" [class.doc-img-background-selected]="selected">
+  <div class="card h-100 shadow-sm document-card" [class.card-selected]="selected">
+    <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" [src]="getThumbUrl()">
 
       <div class="border-right border-bottom bg-light p-1 rounded document-card-check">

From 43685baff32b1e5c6cee764bd0f95764917cddf6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 20 Jan 2021 14:29:30 +0100
Subject: [PATCH 0937/1300] fix tag clicking on document table list

---
 .../app/components/document-list/document-list.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index a29e146bf..cfc2e655d 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -152,7 +152,7 @@
       </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)"></app-tag>
+        <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">

From 482ef6313da570e6bbe84b4253200efff0377f33 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 20 Jan 2021 14:35:38 +0100
Subject: [PATCH 0938/1300] changelog

---
 docs/changelog.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 721e9520e..28bcc00e6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,7 +5,6 @@
 Changelog
 *********
 
-
 paperless-ng 1.0.0
 ##################
 
@@ -25,7 +24,8 @@ Nothing special about this release, but since there are relatively few bug repor
   * Added a language selector to the settings.
   * Added date format options to the settings.
   * Range selection with shift clicking is now possible in the document list.
-
+  * Filtering correspondent, type and tag management pages by name.
+  * Focus "Name" field in dialogs by default.
 
 
 paperless-ng 0.9.14

From 03e159f67c623d8fc79f4a8c9ca01640a250b4a6 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 20 Jan 2021 13:44:24 +0000
Subject: [PATCH 0939/1300] Translate /src-ui/messages.xlf in nl_NL

at least 99% translated for the source file '/src-ui/messages.xlf'
on the 'nl_NL' language.

 Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
---
 src-ui/src/locale/messages.nl_NL.xlf | 42 ++++++++++++++--------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf
index 39545c0e2..49f3010ad 100644
--- a/src-ui/src/locale/messages.nl_NL.xlf
+++ b/src-ui/src/locale/messages.nl_NL.xlf
@@ -449,12 +449,20 @@
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
+        <source>Filter by:</source>
+        <target>Filter op:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="cff1428d10d59d14e45edec3c735a27b5482db59">
         <source>Name</source>
         <target>Naam</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
@@ -462,7 +470,7 @@
         <target>Kleur</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="d0c4488f742efeba0915e90e285a022da813deff">
@@ -470,7 +478,7 @@
         <target>Overeenkomend</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9bcf8d20d23c111eca1431abd2d2ce0de324499c">
@@ -478,7 +486,7 @@
         <target>Aantal documenten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="030b4423b92167200e39519599f9b863b4f7c62c">
@@ -486,7 +494,7 @@
         <target>Acties</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9d51b3c90afda70700229d1b8a55371c13cb3bce">
@@ -494,7 +502,7 @@
         <target>Documenten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">32</context>
+          <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
@@ -502,7 +510,7 @@
         <target>Bewerk</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">37</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4990731724078522539">
@@ -814,7 +822,7 @@
         <target>Laatste correspondentie</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1234709746630139322">
@@ -1114,14 +1122,6 @@
           <context context-type="linenumber">46</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
-        <source>Filter by:</source>
-        <target>Filter op:</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
         <source>Filter tags</source>
         <target>Etiketten filteren</target>
@@ -1907,7 +1907,7 @@
         <target>Automatisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5044611416737085530">
@@ -1915,7 +1915,7 @@
         <target>Wil je dit element echt verwijderen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8371896857609524947">
@@ -1923,7 +1923,7 @@
         <target>Geassocieerde documenten zullen niet verwijderd worden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">104</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7022070615528435141">
@@ -1931,7 +1931,7 @@
         <target>Verwijderen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5467489005440577210">
@@ -1939,7 +1939,7 @@
         <target>Fout bij het verwijderen van het element: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">93</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5851669019930456395">

From 54916fec2ed1b963cbe2cc177a96faca4c588c4b Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 20 Jan 2021 13:44:31 +0000
Subject: [PATCH 0940/1300] Translate /src-ui/messages.xlf in fr

at least 99% translated for the source file '/src-ui/messages.xlf'
on the 'fr' language.

 Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
---
 src-ui/src/locale/messages.fr.xlf | 42 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
index ee97f7ce0..0ee824d5b 100644
--- a/src-ui/src/locale/messages.fr.xlf
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -449,12 +449,20 @@
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
+        <source>Filter by:</source>
+        <target>Filtrer par : </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="cff1428d10d59d14e45edec3c735a27b5482db59">
         <source>Name</source>
         <target>Nom</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
@@ -462,7 +470,7 @@
         <target>Couleur</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="d0c4488f742efeba0915e90e285a022da813deff">
@@ -470,7 +478,7 @@
         <target>Rapprochement</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9bcf8d20d23c111eca1431abd2d2ce0de324499c">
@@ -478,7 +486,7 @@
         <target>Nombre de documents</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="030b4423b92167200e39519599f9b863b4f7c62c">
@@ -486,7 +494,7 @@
         <target>Actions</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9d51b3c90afda70700229d1b8a55371c13cb3bce">
@@ -494,7 +502,7 @@
         <target>Documents</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">32</context>
+          <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
@@ -502,7 +510,7 @@
         <target>Éditer</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">37</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4990731724078522539">
@@ -814,7 +822,7 @@
         <target>Dernière correspondance</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1234709746630139322">
@@ -1114,14 +1122,6 @@
           <context context-type="linenumber">46</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
-        <source>Filter by:</source>
-        <target>Filtrer par : </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
         <source>Filter tags</source>
         <target>Filtrer les étiquettes</target>
@@ -1907,7 +1907,7 @@
         <target>Automatique</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5044611416737085530">
@@ -1915,7 +1915,7 @@
         <target>Voulez-vous vraiment supprimer cet élément ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8371896857609524947">
@@ -1923,7 +1923,7 @@
         <target>Les documents associés ne seront pas supprimés.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">104</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7022070615528435141">
@@ -1931,7 +1931,7 @@
         <target>Supprimer</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5467489005440577210">
@@ -1939,7 +1939,7 @@
         <target>Une erreur s'est produite lors de la suppression de l'élément : <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">93</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5851669019930456395">

From 937cdaccadc303eff159086bd86c8fcf831162b0 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 20 Jan 2021 13:44:37 +0000
Subject: [PATCH 0941/1300] Translate /src-ui/messages.xlf in de

at least 99% translated for the source file '/src-ui/messages.xlf'
on the 'de' language.

 Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
---
 src-ui/src/locale/messages.de.xlf | 42 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index 80cfefab9..e1539618c 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -449,12 +449,20 @@
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
+        <source>Filter by:</source>
+        <target>Filtern nach:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="cff1428d10d59d14e45edec3c735a27b5482db59">
         <source>Name</source>
         <target>Name</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
@@ -462,7 +470,7 @@
         <target>Farbe</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="d0c4488f742efeba0915e90e285a022da813deff">
@@ -470,7 +478,7 @@
         <target>Zuweisung</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9bcf8d20d23c111eca1431abd2d2ce0de324499c">
@@ -478,7 +486,7 @@
         <target>Anzahl Dokumente</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="030b4423b92167200e39519599f9b863b4f7c62c">
@@ -486,7 +494,7 @@
         <target>Aktionen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9d51b3c90afda70700229d1b8a55371c13cb3bce">
@@ -494,7 +502,7 @@
         <target>Dokumente</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">32</context>
+          <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
@@ -502,7 +510,7 @@
         <target>Bearbeiten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
-          <context context-type="linenumber">37</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4990731724078522539">
@@ -814,7 +822,7 @@
         <target>Letzter Kontakt</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1234709746630139322">
@@ -1114,14 +1122,6 @@
           <context context-type="linenumber">46</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
-        <source>Filter by:</source>
-        <target>Filtern nach:</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
         <source>Filter tags</source>
         <target>Tags filtern</target>
@@ -1907,7 +1907,7 @@
         <target>Automatisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5044611416737085530">
@@ -1915,7 +1915,7 @@
         <target>Möchten Sie dieses Element wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8371896857609524947">
@@ -1923,7 +1923,7 @@
         <target>Assoziierte Dokumente werden nicht gelöscht.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">104</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7022070615528435141">
@@ -1931,7 +1931,7 @@
         <target>Löschen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5467489005440577210">
@@ -1939,7 +1939,7 @@
         <target>Fehler beim Löschen des Elements: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
-          <context context-type="linenumber">93</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5851669019930456395">

From 9575b0fe3210faff9b41ca52d8081ebbc3b9fcba Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 20 Jan 2021 20:28:42 +0100
Subject: [PATCH 0942/1300] fixes #397

---
 src/documents/models.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/documents/models.py b/src/documents/models.py
index 928b8aa4d..86878dd7e 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -63,12 +63,6 @@ class MatchingModel(models.Model):
     def __str__(self):
         return self.name
 
-    def save(self, *args, **kwargs):
-
-        self.match = self.match.lower()
-
-        models.Model.save(self, *args, **kwargs)
-
 
 class Correspondent(MatchingModel):
 

From ddf386c4d4aa61f59c671a54be07e5880ec95276 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 21 Jan 2021 01:02:41 +0100
Subject: [PATCH 0943/1300] add temporary directory during startup and ensure
 correct permissions

---
 docker/docker-entrypoint.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 8e1a21757..5919b14aa 100644
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -79,7 +79,11 @@ initialize() {
 		fi
 	done
 
+	echo "creating directory /tmp/paperless"
+	mkdir -p /tmp/paperless
+
 	chown -R paperless:paperless ../
+	chown -R paperless:paperless /tmp/paperless
 
 	migrations
 

From aeb10d34079bb62d5d748698062de0bfa9a20585 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 21 Jan 2021 12:07:50 +0100
Subject: [PATCH 0944/1300] fixes duplicate documents with tags__id__in

---
 src/documents/tests/test_api.py | 6 ++++++
 src/documents/views.py          | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 6b9cf14e0..2b332a873 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -228,6 +228,12 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(len(results), 2)
         self.assertCountEqual([results[0]['id'], results[1]['id']], [doc1.id, doc3.id])
 
+        response = self.client.get("/api/documents/?tags__id__in={},{}".format(tag_2.id, tag_3.id))
+        self.assertEqual(response.status_code, 200)
+        results = response.data['results']
+        self.assertEqual(len(results), 2)
+        self.assertCountEqual([results[0]['id'], results[1]['id']], [doc2.id, doc3.id])
+
         response = self.client.get("/api/documents/?tags__id__all={},{}".format(tag_2.id, tag_3.id))
         self.assertEqual(response.status_code, 200)
         results = response.data['results']
diff --git a/src/documents/views.py b/src/documents/views.py
index eb9078f75..b99bf11c7 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -159,6 +159,9 @@ class DocumentViewSet(RetrieveModelMixin,
         "added",
         "archive_serial_number")
 
+    def get_queryset(self):
+        return Document.objects.distinct()
+
     def get_serializer(self, *args, **kwargs):
         fields_param = self.request.query_params.get('fields', None)
         if fields_param:

From 10b53bdfd08c08ee3d9e896f4933a10d741b05db Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Thu, 21 Jan 2021 13:49:12 +0100
Subject: [PATCH 0945/1300] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 89f55b2d9..d06f78246 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,10 @@
 
 Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, have a look at the changelog in the documentation.
 
+# Survey
+
+If you already used Paperless-ng for a bit, would like to give some anonymous feedback, and help me decide on what to focus on next: I've created a survey, [see here](https://github.com/jonaswinkler/paperless-ng/issues/402). Thank you!
+
 # How it Works
 
 Paperless does not control your scanner, it only helps you deal with what your scanner produces.

From 11f9616411612e501755b314bd73a3263fb99151 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 21 Jan 2021 21:05:16 +0100
Subject: [PATCH 0946/1300] improve locale selection options

---
 src-ui/messages.xlf                                | 14 +++++++-------
 .../manage/settings/settings.component.html        |  4 ++--
 .../manage/settings/settings.component.ts          |  5 +++--
 src-ui/src/app/services/settings.service.ts        |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 1e89a9408..6175cf700 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -482,35 +482,35 @@
         <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/>&quot; deleted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">63</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5647210819299459618" datatype="html">
         <source>Settings saved successfully.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">79</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6839066544204061364" datatype="html">
         <source>Use system language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7729897675462249787" datatype="html">
         <source>Use date format of display language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8488620293789898901" datatype="html">
         <source>Error while storing settings on server: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">102</context>
+          <context context-type="linenumber">103</context>
         </context-group>
       </trans-unit>
       <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
@@ -1463,8 +1463,8 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5866254605255506989" datatype="html">
-        <source>English</source>
+      <trans-unit id="1206520795340730278" datatype="html">
+        <source>English (US)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
           <context context-type="linenumber">74</context>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 13ffb4517..4ed5ad1ae 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -19,7 +19,7 @@
           <div class="col">
 
             <select class="form-control" formControlName="displayLanguage">
-              <option *ngFor="let lang of displayLanguageOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code"> ({{lang.englishName}})</span></option>
+              <option *ngFor="let lang of displayLanguageOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code && currentLocale != 'en-US'"> - {{lang.englishName}}</span></option>
             </select>
 
             <small class="form-text text-muted" i18n>You need to reload the page after applying a new language.</small>
@@ -34,7 +34,7 @@
           <div class="col">
 
             <select class="form-control" formControlName="dateLocale">
-              <option *ngFor="let lang of dateLocaleOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code"> ({{today | date:'shortDate':null:lang.code}})</span></option>
+              <option *ngFor="let lang of dateLocaleOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code"> - {{today | date:'shortDate':null:lang.code}}</span></option>
             </select>
 
           </div>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 3c4de59b6..47f714c21 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Renderer2  } from '@angular/core';
+import { Component, Inject, LOCALE_ID, OnInit, Renderer2  } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
@@ -38,7 +38,8 @@ export class SettingsComponent implements OnInit {
     public savedViewService: SavedViewService,
     private documentListViewService: DocumentListViewService,
     private toastService: ToastService,
-    private settings: SettingsService
+    private settings: SettingsService,
+    @Inject(LOCALE_ID) public currentLocale: string
   ) { }
 
   ngOnInit() {
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index d2a190c1f..041fb51ca 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -71,7 +71,7 @@ export class SettingsService {
 
   getLanguageOptions(): LanguageOption[] {
     return [
-      {code: "en-us", name: $localize`English`, englishName: "English"},
+      {code: "en-US", name: $localize`English (US)`, englishName: "English (US)"},
       {code: "de", name: $localize`German`, englishName: "German"},
       {code: "nl", name: $localize`Dutch`, englishName: "Dutch"},
       {code: "fr", name: $localize`French`, englishName: "French"}

From 3b22d7131dfd924909da3be7f8a0713f54b60a92 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Thu, 21 Jan 2021 20:08:36 +0000
Subject: [PATCH 0947/1300] Translate /src-ui/messages.xlf in nl_NL

translation completed for the source file '/src-ui/messages.xlf'
on the 'nl_NL' language.
---
 src-ui/src/locale/messages.nl_NL.xlf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf
index 49f3010ad..3753bc92c 100644
--- a/src-ui/src/locale/messages.nl_NL.xlf
+++ b/src-ui/src/locale/messages.nl_NL.xlf
@@ -550,7 +550,7 @@
         <target>Opgeslagen view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; verwijderd.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">63</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -558,7 +558,7 @@
         <target>Instellingen succesvol opgeslagen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">79</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6839066544204061364">
@@ -566,7 +566,7 @@
         <target>Gebruik de systeemtaal</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7729897675462249787">
@@ -574,7 +574,7 @@
         <target>Datumopmaak van weergavetaal gebruiken</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -582,7 +582,7 @@
         <target>Fout bij het opslaan van de instellingen: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">102</context>
+          <context context-type="linenumber">103</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -1670,9 +1670,9 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5866254605255506989">
-        <source>English</source>
-        <target>Engels</target>
+      <trans-unit datatype="html" id="1206520795340730278">
+        <source>English (US)</source>
+        <target>Engels (US)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
           <context context-type="linenumber">74</context>

From 099b84a66dd19a8dd44e2eea613c6b040b871bba Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Thu, 21 Jan 2021 20:08:46 +0000
Subject: [PATCH 0948/1300] Translate /src-ui/messages.xlf in fr

translation completed for the source file '/src-ui/messages.xlf'
on the 'fr' language.
---
 src-ui/src/locale/messages.fr.xlf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
index 0ee824d5b..4f09eab72 100644
--- a/src-ui/src/locale/messages.fr.xlf
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -550,7 +550,7 @@
         <target>Vue &quot;<x equiv-text="savedView.name" id="PH"/>&quot; supprimée.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">63</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -558,7 +558,7 @@
         <target>Paramètres enregistrés avec succès.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">79</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6839066544204061364">
@@ -566,7 +566,7 @@
         <target>Utiliser la langue du système</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7729897675462249787">
@@ -574,7 +574,7 @@
         <target>Utiliser le format de date de la langue d'affichage</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -582,7 +582,7 @@
         <target>Une erreur s'est produite lors de l'enregistrement des paramètres sur le serveur : <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">102</context>
+          <context context-type="linenumber">103</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -1670,9 +1670,9 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5866254605255506989">
-        <source>English</source>
-        <target>Anglais</target>
+      <trans-unit datatype="html" id="1206520795340730278">
+        <source>English (US)</source>
+        <target>Anglais (US)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
           <context context-type="linenumber">74</context>

From 18ebb58dc90cdfb1ddb665ae5cc30918b550efbe Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Thu, 21 Jan 2021 20:08:58 +0000
Subject: [PATCH 0949/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index e1539618c..a898e4630 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -550,7 +550,7 @@
         <target>Gespeicherte Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; gelöscht.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">63</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -558,7 +558,7 @@
         <target>Einstellungen erfolgreich gespeichert.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">79</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6839066544204061364">
@@ -566,7 +566,7 @@
         <target>Benutze Systemsprache</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7729897675462249787">
@@ -574,7 +574,7 @@
         <target>Benutze Datumsformat der Anzeigesprache</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -582,7 +582,7 @@
         <target>Fehler beim Speichern der Einstellungen auf dem Server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">102</context>
+          <context context-type="linenumber">103</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -1670,9 +1670,9 @@
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5866254605255506989">
-        <source>English</source>
-        <target>Englisch</target>
+      <trans-unit datatype="html" id="1206520795340730278">
+        <source>English (US)</source>
+        <target>Englisch (US)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
           <context context-type="linenumber">74</context>

From 87ad2ce1d68be2068992461077721ccea8b90866 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 21 Jan 2021 21:32:08 +0100
Subject: [PATCH 0950/1300] added a note regarding updates after 0.9.13

---
 docs/administration.rst | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/docs/administration.rst b/docs/administration.rst
index bb543e3db..14b986e82 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -90,10 +90,28 @@ B.  If you built the image yourself, do the following:
         $ docker-compose build
         $ docker-compose up
 
-Running `docker-compose up` will also apply any new database migrations.
+Running ``docker-compose up`` will also apply any new database migrations.
 If you see everything working, press CTRL+C once to gracefully stop paperless.
 Then you can start paperless-ng with ``-d`` to have it run in the background.
 
+    .. note::
+
+        In version 0.9.14, the update process was changed. In 0.9.13 and earlier, the
+        docker-compose files specified exact versions and pull won't automatically
+        update to newer versions. In order to enable updates as described above, either
+        get the new ``docker-compose.yml`` file from `here <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`_
+        or edit the ``docker-compose.yml`` file, find the line that says
+        
+            .. code::
+
+                image: jonaswinkler/paperless-ng:0.9.x
+        
+        and replace the version with ``latest``:
+
+            .. code::
+
+                image: jonaswinkler/paperless-ng:latest
+        
 Bare Metal Route
 ================
 

From 227f7b6946c119fd3b69f9313ea49c08f3d22310 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 21 Jan 2021 22:29:47 +0100
Subject: [PATCH 0951/1300] revert a change

---
 src/documents/management/commands/document_consumer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index 690f5299a..9ba1b1a87 100644
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -153,7 +153,7 @@ class Command(BaseCommand):
         if options["oneshot"]:
             return
 
-        if settings.CONSUMER_POLLING == 0:
+        if settings.CONSUMER_POLLING == 0 and INotify:
             self.handle_inotify(directory, recursive)
         else:
             self.handle_polling(directory, recursive)

From eca1289ce2f34f09254341d60801eb3d94ff9bcb Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sat, 9 Jan 2021 10:49:44 +0100
Subject: [PATCH 0952/1300] Build release archive when version is not avail

Default ansible installation version to "latest" (pulls the latest
published release archive).
---
 ansible/defaults/main.yml         |   2 +-
 ansible/tasks/install-release.yml |   6 ++
 ansible/tasks/install-source.yml  | 133 +++++++++++++++++++++++++++
 ansible/tasks/main.yml            | 148 +++++++++++++++++-------------
 4 files changed, 222 insertions(+), 67 deletions(-)
 create mode 100644 ansible/tasks/install-release.yml
 create mode 100644 ansible/tasks/install-source.yml

diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml
index 83047307d..aaeffa507 100644
--- a/ansible/defaults/main.yml
+++ b/ansible/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-paperlessng_version: 0.9.14
+paperlessng_version: latest  # 'latest', release number, or github branch/tag/commit/ref
 
 # Required services
 paperlessng_redis_host: localhost
diff --git a/ansible/tasks/install-release.yml b/ansible/tasks/install-release.yml
new file mode 100644
index 000000000..c2dfb0b9f
--- /dev/null
+++ b/ansible/tasks/install-release.yml
@@ -0,0 +1,6 @@
+---
+- name: extract paperless-ng
+  unarchive:
+    src: "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-{{ paperlessng_version }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
+    remote_src: yes
+    dest: "{{ tempdir.path }}"
diff --git a/ansible/tasks/install-source.yml b/ansible/tasks/install-source.yml
new file mode 100644
index 000000000..823445dd1
--- /dev/null
+++ b/ansible/tasks/install-source.yml
@@ -0,0 +1,133 @@
+---
+# https://github.com/jonaswinkler/paperless-ng/blob/dev/.github/workflows/ci.yml
+- name: install dev dependencies
+  apt:
+    pkg:
+      - git
+      - npm
+      - libqpdf-dev
+
+- name: create temporary git directory
+  tempfile:
+    state: directory
+  register: gitdir
+
+- name: pull paperless-ng
+  git:
+    repo: https://github.com/jonaswinkler/paperless-ng.git
+    dest: "{{ gitdir.path }}"
+    version: "{{ paperlessng_version }}"
+    refspec: "+refs/pull/*:refs/pull/*"
+  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+
+- name: compile frontend
+  command:
+    cmd: "{{ item }}"
+  args:
+    chdir: "{{ gitdir.path }}/src-ui"
+  failed_when: false
+  with_items:
+    - npm install -g @angular/cli
+    - npm install
+    - ./node_modules/.bin/ng build --prod
+
+- name: install pipenv
+  pip:
+    name:
+      - pipenv
+      - pybind11  # building pikepdf for <0.9.14
+    extra_args: --upgrade
+
+- name: allow building with any Python 3 release
+  lineinfile:
+    path: "{{ gitdir.path }}/Pipfile"
+    regexp: '^python_version = ".+"$'
+    line: python_version = "3"
+
+# TODO run dev in separate virtualenv
+- name: install Pipfile dependencies
+  command:
+    cmd: pipenv install --dev
+  args:
+    chdir: "{{ gitdir.path }}"
+
+- name: clean output directory
+  file:
+    path: "{{ gitdir.path }}/dist"
+    state: absent
+
+- name: create output directories
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ gitdir.path }}/dist"
+    - "{{ gitdir.path }}/dist/paperless-ng"
+    - "{{ gitdir.path }}/dist/paperless-ng/scripts"
+
+- name: copy application into place
+  copy:
+    src: "{{ gitdir.path }}/{{ item.src }}"
+    remote_src: yes
+    dest: "{{ gitdir.path }}/dist/paperless-ng/{{ item.dest | default('') }}"
+  with_items:
+    - src: CONTRIBUTING.md
+    - src: LICENSE
+    - src: Pipfile
+    - src: Pipfile.lock
+    - src: README.md
+    - src: paperless.conf.example
+      dest: "paperless.conf"
+
+# TODO can be copied for >=0.9.14
+- name: generate requirements.txt
+  command:
+    cmd: pipenv lock --keep-outdated -r
+  args:
+    chdir: "{{ gitdir.path }}"
+  register: requirements
+
+- name: write requirements.txt
+  copy:
+    content: "{{ requirements.stdout }}"
+    dest: "{{ gitdir.path }}/dist/paperless-ng/requirements.txt"
+
+- name: glob all scripts
+  find:
+    paths: "{{ gitdir.path }}/scripts/"
+    patterns:
+    - "*.service"
+    - "*.sh"
+  register: glob
+
+- name: copy scripts
+  copy:
+    src: "{{ item.path }}"
+    remote_src: yes
+    dest: "{{ gitdir.path }}/dist/paperless-ng/scripts/"
+  with_items:
+    - "{{ glob.files }}"
+
+- name: copy sources
+  command:
+    cmd: "cp -r src/ dist/paperless-ng/src"
+  args:
+    chdir: "{{ gitdir.path }}"
+
+- name: package app
+  archive:
+    path: "{{ gitdir.path }}/dist/"
+    dest: "{{ gitdir.path }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
+    format: xz
+
+- name: extract paperless-ng
+  unarchive:
+    src: "{{ gitdir.path }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
+    remote_src: yes
+    dest: "{{ tempdir.path }}"
+  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+
+- name: remove temporary git directory
+  file:
+    path: "{{ gitdir.path }}"
+    state: absent
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index a353a18ec..15f7f9ba1 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -34,7 +34,13 @@
       - build-essential
       - python3-setuptools
       - python3-wheel
-      - python3-virtualenv
+
+# upstream virtualenv in Ubuntu 20.04 is broken
+# https://github.com/pypa/virtualenv/issues/1873
+- name: install python virtualenv
+  pip:
+    name: virtualenv
+    extra_args: --upgrade
 
 - name: install ocr languages
   apt:
@@ -97,6 +103,18 @@
     # GNUPG_HOME required due to paperless db.py
     create_home: yes
 
+- block:
+    - name: get latest release version
+      uri:
+        url: https://api.github.com/repos/jonaswinkler/paperless-ng/releases/latest
+        method: GET
+      register: latest_release
+    - name: parse latest release version
+      set_fact:
+        paperlessng_version: "{{ latest_release.json['tag_name'] | regex_replace('^ng-(.+)$', '\\1') }}"
+  when: paperlessng_version == "latest"
+
+# TODO store commit hash of installed version, use instead of version number
 - name: check for paperless-ng installation
   command:
     cmd: 'grep -Po "(?<=Paperless-ng )\d+\.\d+\.\d+" {{ paperlessng_directory }}/docs/changelog.html'
@@ -109,59 +127,58 @@
   set_fact:
     fresh_installation: '{{ "No such file or directory" in paperlessng_current_version.stderr }}'
     update_installation: '{{ "No such file or directory" not in paperlessng_current_version.stderr and paperlessng_current_version.stdout != paperlessng_version | string }}'
-    reconfigure_only: '{{ paperlessng_current_version.stdout == paperlessng_version | string }}'
+    reconfigure_only: "{{ paperlessng_current_version.stdout == paperlessng_version | string }}"
 
-- name: backup current paperless-ng installation
-  copy:
-    src: "{{ paperlessng_directory }}"
-    remote_src: yes
-    dest: "{{ paperlessng_directory }}-{{ ansible_date_time.iso8601 }}/"
+- block:
+    - name: backup current paperless-ng installation
+      copy:
+        src: "{{ paperlessng_directory }}"
+        remote_src: yes
+        dest: "{{ paperlessng_directory }}-{{ ansible_date_time.iso8601 }}/"
+    - name: remove current paperless sources
+      file:
+        path: "{{ paperlessng_directory }}/{{ item }}"
+        state: absent
+      with_items:
+        - docker
+        - docs
+        - scripts
+        - src
+        - static
   when: update_installation
 
-- name: remove current paperless sources
-  file:
-    path: "{{ paperlessng_directory }}/{{ item }}"
-    state: absent
-  with_items:
-    - docker
-    - docs
-    - scripts
-    - src
-    - static
-  when: update_installation
-
-- name: create temporary directory
-  tempfile:
-    state: directory
-  register: tempdir
-  when: not reconfigure_only
-
-- name: extract paperless-ng
-  unarchive:
-    src: "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-{{ paperlessng_version }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
-    remote_src: yes
-    dest: "{{ tempdir.path }}"
-  when: not reconfigure_only
-
-- name: change owner and permissions of paperless-ng
-  command:
-    cmd: "{{ item }}"
-    warn: false
-  with_items:
-    - "chown -R {{ paperlessng_system_user }}:{{ paperlessng_system_group }} {{ tempdir.path }}"
-    - "find {{ tempdir.path }} -type d -exec chmod 0750 {} ;"
-    - "find {{ tempdir.path }} -type f -exec chmod 0640 {} ;"
-  when: not reconfigure_only
-
-- name: move paperless-ng
-  command:
-    cmd: "cp -a {{ tempdir.path }}/paperless-ng/. {{ paperlessng_directory }}"
-  when: not reconfigure_only
-
-- name: remove temporary directory
-  file:
-    path: "{{ tempdir.path }}"
-    state: absent
+- block:
+    - name: create temporary directory
+      tempfile:
+        state: directory
+      register: tempdir
+    - name: check if version is available as release archive
+      uri:
+        url: "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-{{ paperlessng_version }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
+        method: GET
+        status_code: [200, 302, 404]
+      register: release_archive
+    - name: install paperless-ng from source
+      include_tasks: install-source.yml
+      when: release_archive.status == 404
+    - name: install paperless-ng from release archive
+      include_tasks: install-release.yml
+      when: release_archive.status != 404
+    - name: change owner and permissions of paperless-ng
+      command:
+        cmd: "{{ item }}"
+        warn: false
+      with_items:
+        - "chown -R {{ paperlessng_system_user }}:{{ paperlessng_system_group }} {{ tempdir.path }}"
+        - "find {{ tempdir.path }} -type d -exec chmod 0750 {} ;"
+        - "find {{ tempdir.path }} -type f -exec chmod 0640 {} ;"
+    - name: move paperless-ng
+      command:
+        cmd: "cp -a {{ tempdir.path }}/paperless-ng/. {{ paperlessng_directory }}"
+    - name: remove temporary directory
+      file:
+        path: "{{ tempdir.path }}"
+        state: absent
   when: not reconfigure_only
 
 - name: create paperless-ng directories and set permissions
@@ -310,21 +327,20 @@
     creates: "{{ paperlessng_virtualenv }}"
   register: venv
 
-- name: install paperlessng requirements
-  become: yes
-  become_user: "{{ paperlessng_system_user }}"
-  pip:
-    requirements: "{{ paperlessng_directory }}/requirements.txt"
-    executable: "{{ paperlessng_virtualenv }}/bin/pip3"
-    extra_args: --upgrade
-  when: not reconfigure_only
-
-- name: migrate database schema
-  become: yes
-  become_user: "{{ paperlessng_system_user }}"
-  command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py migrate"
-  register: database_schema
-  changed_when: '"No migrations to apply." not in database_schema.stdout'
+- block:
+    - name: install paperlessng requirements
+      become: yes
+      become_user: "{{ paperlessng_system_user }}"
+      pip:
+        requirements: "{{ paperlessng_directory }}/requirements.txt"
+        executable: "{{ paperlessng_virtualenv }}/bin/pip3"
+        extra_args: --upgrade
+    - name: migrate database schema
+      become: yes
+      become_user: "{{ paperlessng_system_user }}"
+      command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py migrate"
+      register: database_schema
+      changed_when: '"No migrations to apply." not in database_schema.stdout'
   when: not reconfigure_only
 
 - name: configure paperless superuser

From 8d624937744abf6ed3ce4d521178e1d62f1dfc64 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Fri, 22 Jan 2021 11:10:56 +0100
Subject: [PATCH 0953/1300] Adapt github action to build PR version

---
 .github/workflows/ansible.yml        | 23 ++++++++++++++++++++++-
 ansible/molecule/fresh/converge.yml  |  6 ++++++
 ansible/molecule/update/converge.yml |  5 ++---
 ansible/molecule/update/prepare.yml  |  2 +-
 ansible/tasks/install-source.yml     |  4 +---
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index 646c7ff81..60589f87d 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 
 jobs:
   # https://molecule.readthedocs.io/en/latest/ci.html#github-actions
-  test:
+  test-fresh:
     runs-on: ubuntu-latest
     # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
     if: github.event_name == 'pull_request' || (github.event_name == 'push' && contains(github.ref, 'refs/heads/'))
@@ -31,6 +31,27 @@ jobs:
           cd ansible
           molecule test -s fresh
         working-directory: "${{ github.repository }}"
+  test-update:
+    runs-on: ubuntu-latest
+    # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
+    if: github.event_name == 'pull_request' || (github.event_name == 'push' && contains(github.ref, 'refs/heads/'))
+    steps:
+      - name: Check out the codebase
+        uses: actions/checkout@v2
+        with:
+          path: "${{ github.repository }}"
+      - name: Set up Python
+        uses: actions/setup-python@v2
+      - name: Set up Docker
+        uses: docker-practice/actions-setup-docker@master
+      - name: Install dependencies
+        run: |
+          python3 -m pip install --upgrade pip
+          python3 -m pip install molecule[ansible,docker]
+          ansible --version
+          docker --version
+          molecule --version
+          python --version
       - name: Test release update with molecule
         run: |
           cd ansible
diff --git a/ansible/molecule/fresh/converge.yml b/ansible/molecule/fresh/converge.yml
index 99e25677b..39d20050d 100644
--- a/ansible/molecule/fresh/converge.yml
+++ b/ansible/molecule/fresh/converge.yml
@@ -2,6 +2,12 @@
 - name: fresh installation
   hosts: all
   tasks:
+    - name: set github ref as version when available
+      set_fact:
+        paperlessng_version: "{{ lookup('env', 'GITHUB_REF') | default('latest', True) }}"
+    - name: debug
+      debug:
+        var: paperlessng_version
     - name: install paperless-ng with default parameters
       include_role:
         name: ansible
diff --git a/ansible/molecule/update/converge.yml b/ansible/molecule/update/converge.yml
index b19a5981a..f5f9b17c2 100644
--- a/ansible/molecule/update/converge.yml
+++ b/ansible/molecule/update/converge.yml
@@ -2,10 +2,9 @@
 - name: update previous release to newest release
   hosts: all
   tasks:
-    - name: set current version as installation target
+    - name: set github ref as version when available
       set_fact:
-        paperlessng_version: 0.9.14
-
+        paperlessng_version: "{{ lookup('env', 'GITHUB_REF') | default('latest', True) }}"
     - name: update to newest paperless-ng release
       include_role:
         name: ansible
diff --git a/ansible/molecule/update/prepare.yml b/ansible/molecule/update/prepare.yml
index 6f3734329..138ebdfce 100644
--- a/ansible/molecule/update/prepare.yml
+++ b/ansible/molecule/update/prepare.yml
@@ -3,7 +3,7 @@
   tasks:
     - name: set previous version as installation target
       set_fact:
-        paperlessng_version: 0.9.13
+        paperlessng_version: 1.0.0
 
     - name: install previous paperless-ng release
       include_role:
diff --git a/ansible/tasks/install-source.yml b/ansible/tasks/install-source.yml
index 823445dd1..8f6dc0e03 100644
--- a/ansible/tasks/install-source.yml
+++ b/ansible/tasks/install-source.yml
@@ -18,7 +18,6 @@
     dest: "{{ gitdir.path }}"
     version: "{{ paperlessng_version }}"
     refspec: "+refs/pull/*:refs/pull/*"
-  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
 
 - name: compile frontend
   command:
@@ -31,6 +30,7 @@
     - npm install
     - ./node_modules/.bin/ng build --prod
 
+# TODO run dev in separate virtualenv
 - name: install pipenv
   pip:
     name:
@@ -44,7 +44,6 @@
     regexp: '^python_version = ".+"$'
     line: python_version = "3"
 
-# TODO run dev in separate virtualenv
 - name: install Pipfile dependencies
   command:
     cmd: pipenv install --dev
@@ -125,7 +124,6 @@
     src: "{{ gitdir.path }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
     remote_src: yes
     dest: "{{ tempdir.path }}"
-  when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
 
 - name: remove temporary git directory
   file:

From 25a0845efddb559c0cfb1eb585d9719a7b7047e9 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Fri, 22 Jan 2021 15:07:52 +0100
Subject: [PATCH 0954/1300] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d06f78246..6a570d79d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![ci](https://github.com/jonaswinkler/paperless-ng/workflows/ci/badge.svg)
+[![ci](https://github.com/jonaswinkler/paperless-ng/workflows/ci/badge.svg)](https://github.com/jonaswinkler/paperless-ng/actions)
 [![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)

From 6c3b1db4dd3d9086057bdd7da82bb3748daeba37 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Fri, 22 Jan 2021 14:21:35 +0100
Subject: [PATCH 0955/1300] Determine installed version by git commit hash

---
 .github/workflows/ansible.yml       |  4 +-
 ansible/molecule/fresh/converge.yml |  3 --
 ansible/tasks/install-source.yml    |  4 +-
 ansible/tasks/main.yml              | 73 ++++++++++++++++++++++++-----
 4 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index 60589f87d..c11472361 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Install dependencies
         run: |
           python3 -m pip install --upgrade pip
-          python3 -m pip install molecule[ansible,docker]
+          python3 -m pip install molecule[ansible,docker] jmespath
           ansible --version
           docker --version
           molecule --version
@@ -47,7 +47,7 @@ jobs:
       - name: Install dependencies
         run: |
           python3 -m pip install --upgrade pip
-          python3 -m pip install molecule[ansible,docker]
+          python3 -m pip install molecule[ansible,docker] jmespath
           ansible --version
           docker --version
           molecule --version
diff --git a/ansible/molecule/fresh/converge.yml b/ansible/molecule/fresh/converge.yml
index 39d20050d..eec6e6444 100644
--- a/ansible/molecule/fresh/converge.yml
+++ b/ansible/molecule/fresh/converge.yml
@@ -5,9 +5,6 @@
     - name: set github ref as version when available
       set_fact:
         paperlessng_version: "{{ lookup('env', 'GITHUB_REF') | default('latest', True) }}"
-    - name: debug
-      debug:
-        var: paperlessng_version
     - name: install paperless-ng with default parameters
       include_role:
         name: ansible
diff --git a/ansible/tasks/install-source.yml b/ansible/tasks/install-source.yml
index 8f6dc0e03..64b7dbeb2 100644
--- a/ansible/tasks/install-source.yml
+++ b/ansible/tasks/install-source.yml
@@ -116,12 +116,12 @@
 - name: package app
   archive:
     path: "{{ gitdir.path }}/dist/"
-    dest: "{{ gitdir.path }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
+    dest: "{{ gitdir.path }}/paperless-ng-{{ paperlessng_commit }}.tar.xz"
     format: xz
 
 - name: extract paperless-ng
   unarchive:
-    src: "{{ gitdir.path }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
+    src: "{{ gitdir.path }}/paperless-ng-{{ paperlessng_commit }}.tar.xz"
     remote_src: yes
     dest: "{{ tempdir.path }}"
 
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index 15f7f9ba1..5ad30dfcf 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -111,23 +111,65 @@
       register: latest_release
     - name: parse latest release version
       set_fact:
-        paperlessng_version: "{{ latest_release.json['tag_name'] | regex_replace('^ng-(.+)$', '\\1') }}"
+        paperlessng_version: "{{ latest_release.json['tag_name'] }}"
   when: paperlessng_version == "latest"
 
-# TODO store commit hash of installed version, use instead of version number
+- block:
+    - name: sanitize version string
+      set_fact:
+        paperlessng_version: "{{ paperlessng_version | regex_replace('^ng-(\\d+\\.\\d+\\.\\d+)$', '\\1') }}"
+    - name: get tag data
+      uri:
+        url: https://api.github.com/repos/jonaswinkler/paperless-ng/tags
+        method: GET
+      register: tags
+    - name: get commit for target tag
+      set_fact:
+        paperlessng_commit: "{{ tags.json | json_query('[?name==`ng-' + paperlessng_version +'`] | [0].commit.sha') }}"
+  when: paperlessng_version | regex_search("^(ng-)?(\d+\.\d+\.\d+)$")
+
+- block:
+    - name: check if version is branch
+      uri:
+        url: "https://api.github.com/repos/jonaswinkler/paperless-ng/branches/{{ paperlessng_version }}"
+        method: GET
+        status_code: [200, 404]
+      register: branch
+    - name: get commit for target branch
+      set_fact:
+        paperlessng_commit: "{{ branch.json | json_query('commit.sha') }}"
+      when: branch.status == 200
+    - block:
+        - name: check if version is commit-or-ref
+          uri:
+            url: "https://api.github.com/repos/jonaswinkler/paperless-ng/commits/{{ paperlessng_version }}"
+            method: GET
+            status_code: [200, 404, 422]
+          register: commit
+        - name: get commit for target commit-or-ref
+          set_fact:
+            paperlessng_commit: "{{ commit.json | json_query('sha') }}"
+          when: commit.status == 200
+        - name: fail
+          fail:
+            msg: "Can not determine commit from `paperlessng_version=={{ paperlessng_version }}`!"
+          when: commit.status != 200
+      when: branch.status == 404
+  when: not(paperlessng_version | regex_search("^(ng-)?(\d+\.\d+\.\d+)$"))
+
 - name: check for paperless-ng installation
   command:
-    cmd: 'grep -Po "(?<=Paperless-ng )\d+\.\d+\.\d+" {{ paperlessng_directory }}/docs/changelog.html'
-  changed_when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string'
+    cmd: "cat {{ paperlessng_directory }}/.installed_version"
+  changed_when: '"No such file or directory" in paperlessng_current_commit.stderr or paperlessng_current_commit.stdout != paperlessng_commit | string'
   failed_when: false
   ignore_errors: yes
-  register: paperlessng_current_version
+  register: paperlessng_current_commit
 
 - name: register current state
   set_fact:
-    fresh_installation: '{{ "No such file or directory" in paperlessng_current_version.stderr }}'
-    update_installation: '{{ "No such file or directory" not in paperlessng_current_version.stderr and paperlessng_current_version.stdout != paperlessng_version | string }}'
-    reconfigure_only: "{{ paperlessng_current_version.stdout == paperlessng_version | string }}"
+    fresh_installation: '{{ "No such file or directory" in paperlessng_current_commit.stderr }}'
+    update_installation: '{{ "No such file or directory" not in paperlessng_current_commit.stderr and paperlessng_current_commit.stdout != paperlessng_commit | string }}'
+    reconfigure_only: "{{ paperlessng_current_commit.stdout == paperlessng_commit | string }}"
 
 - block:
     - name: backup current paperless-ng installation
@@ -156,14 +198,14 @@
       uri:
         url: "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-{{ paperlessng_version }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
         method: GET
-        status_code: [200, 302, 404]
+        status_code: [200, 404]
       register: release_archive
     - name: install paperless-ng from source
       include_tasks: install-source.yml
       when: release_archive.status == 404
     - name: install paperless-ng from release archive
       include_tasks: install-release.yml
-      when: release_archive.status != 404
+      when: release_archive.status == 200
     - name: change owner and permissions of paperless-ng
       command:
         cmd: "{{ item }}"
@@ -175,6 +217,13 @@
     - name: move paperless-ng
       command:
         cmd: "cp -a {{ tempdir.path }}/paperless-ng/. {{ paperlessng_directory }}"
+    - name: store commit hash of installed version
+      copy:
+        content: "{{ paperlessng_commit }}"
+        dest: "{{ paperlessng_directory }}/.installed_version"
+        owner: "{{ paperlessng_system_user }}"
+        group: "{{ paperlessng_system_group }}"
+        mode: "0440"
     - name: remove temporary directory
       file:
         path: "{{ tempdir.path }}"
@@ -197,7 +246,7 @@
 
 - name: rename initial config
   command:
-    cmd: "mv {{ paperlessng_directory }}/paperless.conf {{ paperlessng_directory }}/paperless.conf.template"
+    cmd: "mv -f {{ paperlessng_directory }}/paperless.conf {{ paperlessng_directory }}/paperless.conf.template"
     removes: "{{ paperlessng_directory }}/paperless.conf"
 
 - name: configure paperless-ng
@@ -408,7 +457,7 @@
         # https://www.freedesktop.org/software/systemd/man/systemd.exec.html
         { option: "User", value: "{{ paperlessng_system_user }}" },
         { option: "Group", value: "{{ paperlessng_system_group }}" },
-        { option: "WorkingDirectory", value: "{{ paperlessng_directory }}/src", },
+        { option: "WorkingDirectory", value: "{{ paperlessng_directory }}/src" },
         { option: "ProtectSystem", value: "full" },
         { option: "NoNewPrivileges", value: "true" },
         { option: "PrivateUsers", value: "true" },

From ced6a61869cf30b31124afc114b9d9e4087e6996 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Fri, 22 Jan 2021 17:22:02 +0100
Subject: [PATCH 0956/1300] Update README.md

---
 README.md | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/README.md b/README.md
index 6a570d79d..e6b9feace 100644
--- a/README.md
+++ b/README.md
@@ -54,25 +54,6 @@ If you want to see some screenshots of paperless-ng in action, [some are availab
 
 For a complete list of changes from paperless, check out the [changelog](https://paperless-ng.readthedocs.io/en/latest/changelog.html)
 
-# Roadmap for 1.0
-
-- Make the front end nice (except mobile).
-- Fix whatever bugs I and you find.
-- Make the documentation nice.
-
-## On the chopping block.
-
-- **GnuPG encrypion.** [Here's a note about encryption in paperless](https://paperless-ng.readthedocs.io/en/latest/administration.html#managing-encryption). The gist of it is that I don't see which attacks this implementation protects against. It gives a false sense of security to users who don't care about how it works.
-
-## Wont-do list.
-
-These features will probably never make it into paperless, since paperless is meant to be an easy to use set-and-forget solution.
-
-- **Document versions.** I might consider adding the ability to update a document with a newer version, but that's about it. The kind of documents that get added to paperless usually don't change at all.
-- **Workflows.** I don't see a use case for these, yet.
-- **Folders.** Tags are superior in just about every way.
-- **Apps / extension support.** Again, paperless is meant to be simple.
-
 # 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.

From c0882e74e22083b1e34ec1f6ce3d73d0f6127a23 Mon Sep 17 00:00:00 2001
From: Reto <reto007@hotmail.com>
Date: Sat, 23 Jan 2021 12:55:50 +0100
Subject: [PATCH 0957/1300] tried to fill the gaps and change wording where it
 felt necessary for better understanding

---
 docs/setup.rst | 76 ++++++++++++++++++++++++++++----------------------
 1 file changed, 42 insertions(+), 34 deletions(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index a3a0bd1e8..e73e6aeaa 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -25,10 +25,10 @@ Paperless consists of the following components:
     or by any other means such as Apache ``mod_wsgi``.
 
 *   **The consumer:** This is what watches your consumption folder for documents.
-    However, the consumer itself does not consume really consume your documents anymore.
-    It rather notifies a task processor that a new file is ready for consumption.
+    However, the consumer itself does not really consume your documents.
+    Now it notifies a task processor that a new file is ready for consumption.
     I suppose it should be named differently.
-    This also used to check your emails, but that's now gone elsewhere as well.
+    This was also used to check your emails, but that's now done elsewhere as well.
 
     Start the consumer with the management command ``document_consumer``:
 
@@ -40,25 +40,25 @@ Paperless consists of the following components:
     .. _setup-task_processor:
 
 *   **The task processor:** Paperless relies on `Django Q <https://django-q.readthedocs.io/en/latest/>`_
-    for doing much of the heavy lifting. This is a task queue that accepts tasks from
-    multiple sources and processes tasks in parallel. It also comes with a scheduler that executes
+    for doing most of the heavy lifting. This is a task queue that accepts tasks from
+    multiple sources and processes these in parallel. It also comes with a scheduler that executes
     certain commands periodically.
 
     This task processor is responsible for:
 
     *   Consuming documents. When the consumer finds new documents, it notifies the task processor to
         start a consumption task.
-    *   Consuming emails. It periodically checks your configured accounts for new mails and
-        produces consumption tasks for any documents it finds.
     *   The task processor also performs the consumption of any documents you upload through
         the web interface.
-    *   Maintain the search index and the automatic matching algorithm. These are things that paperless
+    *   Consuming emails. It periodically checks your configured accounts for new emails and
+        notifies the task processor to consume the attachment of an email.
+    *   Maintaining the search index and the automatic matching algorithm. These are things that paperless
         needs to do from time to time in order to operate properly.
 
     This allows paperless to process multiple documents from your consumption folder in parallel! On
-    a modern multi core system, consumption with full ocr is blazing fast.
+    a modern multi core system, this makes the consumption process with full OCR blazingly fast.
 
-    The task processor comes with a built-in admin interface that you can use to see whenever any of the
+    The task processor comes with a built-in admin interface that you can use to check whenever any of the
     tasks fail and inspect the errors (i.e., wrong email credentials, errors during consuming a specific
     file, etc).
 
@@ -70,8 +70,8 @@ Paperless consists of the following components:
         $ pipenv run python3 manage.py qcluster
 
 *   A `redis <https://redis.io/>`_ message broker: This is a really lightweight service that is responsible
-    for getting the tasks from the webserver and consumer to the task scheduler. These run in different
-    processes (maybe even on different machines!), and therefore, this is necessary.
+    for getting the tasks from the webserver and the consumer to the task scheduler. These run in a different
+    process (maybe even on different machines!), and therefore, this is necessary.
 
 *   Optional: A database server. Paperless supports both PostgreSQL and SQLite for storing its data.
 
@@ -79,7 +79,7 @@ Paperless consists of the following components:
 Installation
 ############
 
-You can go multiple routes with setting up and running Paperless:
+You can go multiple routes to setup and run Paperless:
 
 * :ref:`Pull the image from Docker Hub <setup-docker_hub>`
 * :ref:`Build the Docker image yourself <setup-docker_build>`
@@ -87,14 +87,15 @@ You can go multiple routes with setting up and running Paperless:
 * :ref:`Use ansible to install Paperless on your system automatically (bare metal) <setup-ansible>`
 
 The Docker routes are quick & easy. These are the recommended routes. This configures all the stuff
-from above automatically so that it just works and uses sensible defaults for all configuration options.
+from the above automatically so that it just works and uses sensible defaults for all configuration options.
+Here you find a cheat-sheet for docker beginners: `CLI Basics <https://sehn.tech/post/devops-with-docker/>`
 
-The bare metal route is more complicated to setup but makes it easier
+The bare metal route is complicated to setup but makes it easier
 should you want to contribute some code back. You need to configure and
 run the above mentioned components yourself.
 
-The ansible route cobines benefits from both options:
-the setup process is fully automated, reproducible and idempotent,
+The ansible route combines benefits of both options:
+the setup process is fully automated, reproducible and independent,
 it includes the same sensible defaults,
 and it simultaneously provides the flexibility of a bare metal installation.
 
@@ -103,10 +104,12 @@ and it simultaneously provides the flexibility of a bare metal installation.
 Install Paperless from Docker Hub
 =================================
 
+1.  Login with your user and create a folder in your home-directory `mkdir -v ~/paperless-ng` to have a place for your configuration files and consumption directory.
+
 1.  Go to the `/docker/compose directory on the project page <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`_
-    and download one of the ``docker-compose.*.yml`` files, depending on which database backend you
+    and download one of the `docker-compose.*.yml` files, depending on which database backend you
     want to use. Rename this file to `docker-compose.yml`.
-    If you want to enable optional support for Office documents, download a file with ``-tika`` in its name.
+    If you want to enable optional support for Office documents, download a file with `-tika` in the file name.
     Download the ``docker-compose.env`` file and the ``.env`` file as well and store them
     in the same directory.
 
@@ -121,30 +124,31 @@ Install Paperless from Docker Hub
 
         If you want to use the included ``docker-compose.*.yml`` file, you
         need to have at least Docker version **17.09.0** and docker-compose
-        version **1.17.0**.
+        version **1.17.0**.  
+        To check do: `docker-compose -v` or `docker -v`
 
         See the `Docker installation guide`_ on how to install the current
         version of Docker for your operating system or Linux distribution of
-        choice. To get an up-to-date version of docker-compose, follow the
-        `docker-compose installation guide`_ if your package repository doesn't
+        choice. To get the latest version of docker-compose, follow the
+        `docker-compose installation guide`_if your package repository doesn't
         include it.
 
         .. _Docker installation guide: https://docs.docker.com/engine/installation/
         .. _docker-compose installation guide: https://docs.docker.com/compose/install/
 
 3.  Modify ``docker-compose.yml`` to your preferences. You may want to change the path
-    to the consumption directory in this file. Find the line that specifies where
+    to the consumption directory. Find the line that specifies where
     to mount the consumption directory:
 
     .. code::
 
-        - ./consume:/usr/src/paperless/consume
+        - ./**consume**:/usr/src/paperless/consume
 
     Replace the part BEFORE the colon with a local directory of your choice:
 
     .. code::
 
-        - /home/jonaswinkler/paperless-inbox:/usr/src/paperless/consume
+        - /**home/jonaswinkler/paperless-inbox**:/usr/src/paperless/consume
 
     Don't change the part after the colon or paperless wont find your documents.
 
@@ -155,23 +159,27 @@ Install Paperless from Docker Hub
     both the docker container and you on the host machine have write access
     to the consumption directory. If your UID and GID on the host system is
     1000 (the default for the first normal user on most systems), it will
-    work out of the box without any modifications.
+    work out of the box without any modifications. `id "username"` to check.
 
     .. note::
 
-        You can use any settings from the file ``paperless.conf.example`` in this file.
-        Have a look at :ref:`configuration` to see whats available.
+        You can copy any setting from the file ``paperless.conf.example`` and paste it here.
+        Have a look at :ref:`configuration` to see what's available.
 
     .. caution::
 
-        Certain file systems such as NFS network shares don't support file system
+        Some file systems such as NFS network shares don't support file system
         notifications with ``inotify``. When storing the consumption directory
-        on such a file system, paperless will be unable to pick up new files
+        on such a file system, paperless will not pick up new files
         with the default configuration. You will need to use ``PAPERLESS_CONSUMER_POLLING``,
         which will disable inotify. See :ref:`here <configuration-polling>`.
+        
+5.  Now head over to: https://hub.docker.com/r/jonaswinkler/paperless-ng and choose your preferred
+    image and copy the link. To download this image do a `docker pull` followed by the link. Do this within the directory with the .yml files.
+    Depending on your network connection and CPU this will take a while. You have time to get a beverage.
 
 5.  Run ``docker-compose up -d``. This will create and start the necessary
-    containers.
+    containers, but your are not done yet!
 
 6.  To be able to login, you will need a super user. To create it, execute the
     following command:
@@ -181,12 +189,12 @@ Install Paperless from Docker Hub
         $ docker-compose run --rm webserver createsuperuser
 
     This will prompt you to set a username, an optional e-mail address and
-    finally a password.
+    finally a password (at least 8 characters).
 
 7.  The default ``docker-compose.yml`` exports the webserver on your local port
     8000. If you haven't adapted this, you should now be able to visit your
-    Paperless instance at ``http://127.0.0.1:8000``. You can login with the
-    user and password you just created.
+    Paperless instance at ``http://127.0.0.1:8000`` or your servers IP-Address:8000. 
+    Use the login credentials you have created with the previous step.
 
 .. _Docker: https://www.docker.com/
 .. _docker-compose: https://docs.docker.com/compose/install/

From 2104e654620fa993c3fa557e61833c07a88228b9 Mon Sep 17 00:00:00 2001
From: Reto <reto007@hotmail.com>
Date: Sat, 23 Jan 2021 13:14:31 +0100
Subject: [PATCH 0958/1300] minor changes, like numbering

---
 docs/setup.rst | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index e73e6aeaa..d2bd7ed0a 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -106,7 +106,7 @@ Install Paperless from Docker Hub
 
 1.  Login with your user and create a folder in your home-directory `mkdir -v ~/paperless-ng` to have a place for your configuration files and consumption directory.
 
-1.  Go to the `/docker/compose directory on the project page <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`_
+2.  Go to the `/docker/compose directory on the project page <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`_
     and download one of the `docker-compose.*.yml` files, depending on which database backend you
     want to use. Rename this file to `docker-compose.yml`.
     If you want to enable optional support for Office documents, download a file with `-tika` in the file name.
@@ -118,7 +118,7 @@ Install Paperless from Docker Hub
         For new installations, it is recommended to use PostgreSQL as the database
         backend.
 
-2.  Install `Docker`_ and `docker-compose`_.
+3.  Install `Docker`_ and `docker-compose`_.
 
     .. caution::
 
@@ -136,24 +136,24 @@ Install Paperless from Docker Hub
         .. _Docker installation guide: https://docs.docker.com/engine/installation/
         .. _docker-compose installation guide: https://docs.docker.com/compose/install/
 
-3.  Modify ``docker-compose.yml`` to your preferences. You may want to change the path
+4.  Modify ``docker-compose.yml`` to your preferences. You may want to change the path
     to the consumption directory. Find the line that specifies where
     to mount the consumption directory:
 
     .. code::
 
-        - ./**consume**:/usr/src/paperless/consume
+        - ./consume:/usr/src/paperless/consume
 
     Replace the part BEFORE the colon with a local directory of your choice:
 
     .. code::
 
-        - /**home/jonaswinkler/paperless-inbox**:/usr/src/paperless/consume
+        - /home/jonaswinkler/paperless-inbox:/usr/src/paperless/consume
 
     Don't change the part after the colon or paperless wont find your documents.
 
 
-4.  Modify ``docker-compose.env``, following the comments in the file. The
+5.  Modify ``docker-compose.env``, following the comments in the file. The
     most important change is to set ``USERMAP_UID`` and ``USERMAP_GID``
     to the uid and gid of your user on the host system. This ensures that
     both the docker container and you on the host machine have write access
@@ -174,14 +174,14 @@ Install Paperless from Docker Hub
         with the default configuration. You will need to use ``PAPERLESS_CONSUMER_POLLING``,
         which will disable inotify. See :ref:`here <configuration-polling>`.
         
-5.  Now head over to: https://hub.docker.com/r/jonaswinkler/paperless-ng and choose your preferred
+6.  Now head over to: https://hub.docker.com/r/jonaswinkler/paperless-ng and choose your preferred
     image and copy the link. To download this image do a `docker pull` followed by the link. Do this within the directory with the .yml files.
     Depending on your network connection and CPU this will take a while. You have time to get a beverage.
 
-5.  Run ``docker-compose up -d``. This will create and start the necessary
+7.  Run ``docker-compose up -d``. This will create and start the necessary
     containers, but your are not done yet!
 
-6.  To be able to login, you will need a super user. To create it, execute the
+8.  To be able to login, you will need a super user. To create it, execute the
     following command:
 
     .. code-block:: shell-session
@@ -191,7 +191,7 @@ Install Paperless from Docker Hub
     This will prompt you to set a username, an optional e-mail address and
     finally a password (at least 8 characters).
 
-7.  The default ``docker-compose.yml`` exports the webserver on your local port
+9.  The default ``docker-compose.yml`` exports the webserver on your local port
     8000. If you haven't adapted this, you should now be able to visit your
     Paperless instance at ``http://127.0.0.1:8000`` or your servers IP-Address:8000. 
     Use the login credentials you have created with the previous step.

From 0d19957d4b96c8414c46d45e21517065fc0f875e Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sat, 23 Jan 2021 22:08:36 +0100
Subject: [PATCH 0959/1300] Fully prepare release package

---
 ansible/tasks/install-source.yml | 63 +++++++++++++-------------------
 1 file changed, 26 insertions(+), 37 deletions(-)

diff --git a/ansible/tasks/install-source.yml b/ansible/tasks/install-source.yml
index 64b7dbeb2..04a2991b9 100644
--- a/ansible/tasks/install-source.yml
+++ b/ansible/tasks/install-source.yml
@@ -5,7 +5,7 @@
     pkg:
       - git
       - npm
-      - libqpdf-dev
+      - gettext
 
 - name: create temporary git directory
   tempfile:
@@ -30,26 +30,6 @@
     - npm install
     - ./node_modules/.bin/ng build --prod
 
-# TODO run dev in separate virtualenv
-- name: install pipenv
-  pip:
-    name:
-      - pipenv
-      - pybind11  # building pikepdf for <0.9.14
-    extra_args: --upgrade
-
-- name: allow building with any Python 3 release
-  lineinfile:
-    path: "{{ gitdir.path }}/Pipfile"
-    regexp: '^python_version = ".+"$'
-    line: python_version = "3"
-
-- name: install Pipfile dependencies
-  command:
-    cmd: pipenv install --dev
-  args:
-    chdir: "{{ gitdir.path }}"
-
 - name: clean output directory
   file:
     path: "{{ gitdir.path }}/dist"
@@ -75,28 +55,16 @@
     - src: Pipfile
     - src: Pipfile.lock
     - src: README.md
+    - src: requirements.txt
     - src: paperless.conf.example
       dest: "paperless.conf"
 
-# TODO can be copied for >=0.9.14
-- name: generate requirements.txt
-  command:
-    cmd: pipenv lock --keep-outdated -r
-  args:
-    chdir: "{{ gitdir.path }}"
-  register: requirements
-
-- name: write requirements.txt
-  copy:
-    content: "{{ requirements.stdout }}"
-    dest: "{{ gitdir.path }}/dist/paperless-ng/requirements.txt"
-
 - name: glob all scripts
   find:
-    paths: "{{ gitdir.path }}/scripts/"
+    paths: ["{{ gitdir.path }}/scripts/"]
     patterns:
-    - "*.service"
-    - "*.sh"
+      - "*.service"
+      - "*.sh"
   register: glob
 
 - name: copy scripts
@@ -113,6 +81,27 @@
   args:
     chdir: "{{ gitdir.path }}"
 
+- name: install paperlessng requirements
+  pip:
+    requirements: "{{ gitdir.path }}/requirements.txt"
+    virtualenv: "{{ gitdir.path }}/.venv/"
+    extra_args: --upgrade
+
+- name: compile messages
+  command: "{{ gitdir.path }}/.venv/bin/python3 manage.py compilemessages"
+  args:
+    chdir: "{{ gitdir.path }}/dist/paperless-ng/src/"
+
+- name: collect static files
+  command: "{{ gitdir.path }}/.venv/bin/python3 manage.py collectstatic --no-input"
+  args:
+    chdir: "{{ gitdir.path }}/dist/paperless-ng/src/"
+
+- name: remove pycache directories
+  shell: find . -name __pycache__ | xargs rm -r
+  args:
+    chdir: "{{ gitdir.path }}/dist/"
+
 - name: package app
   archive:
     path: "{{ gitdir.path }}/dist/"

From bfbdfe857f28d47dd99fda1e8e12689de142faf7 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sat, 23 Jan 2021 22:09:56 +0100
Subject: [PATCH 0960/1300] Simplify molecule tests

"Upgrade" path includes multiple paths anyway:
- installing the latest official release package
- builing the current PR from source
- upgrading between the two versions
---
 .github/workflows/ansible.yml                 | 37 ++------
 .../molecule/{update => default}/converge.yml |  0
 .../molecule/{fresh => default}/molecule.yml  |  0
 .../molecule/{update => default}/prepare.yml  |  2 +-
 ansible/molecule/default/verify.yml           | 91 +++++++++++++++++++
 ansible/molecule/fresh/converge.yml           | 10 --
 ansible/molecule/fresh/verify.yml             | 60 ------------
 ansible/molecule/update/molecule.yml          | 35 -------
 ansible/molecule/update/verify.yml            | 60 ------------
 9 files changed, 100 insertions(+), 195 deletions(-)
 rename ansible/molecule/{update => default}/converge.yml (100%)
 rename ansible/molecule/{fresh => default}/molecule.yml (100%)
 rename ansible/molecule/{update => default}/prepare.yml (85%)
 create mode 100644 ansible/molecule/default/verify.yml
 delete mode 100644 ansible/molecule/fresh/converge.yml
 delete mode 100644 ansible/molecule/fresh/verify.yml
 delete mode 100644 ansible/molecule/update/molecule.yml
 delete mode 100644 ansible/molecule/update/verify.yml

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index c11472361..fd965e760 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 
 jobs:
   # https://molecule.readthedocs.io/en/latest/ci.html#github-actions
-  test-fresh:
+  test:
     runs-on: ubuntu-latest
     # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
     if: github.event_name == 'pull_request' || (github.event_name == 'push' && contains(github.ref, 'refs/heads/'))
@@ -26,36 +26,15 @@ jobs:
           docker --version
           molecule --version
           python --version
-      - name: Test fresh installation with molecule
+      - name: Test installation/build/upgrade with molecule
         run: |
           cd ansible
-          molecule test -s fresh
-        working-directory: "${{ github.repository }}"
-  test-update:
-    runs-on: ubuntu-latest
-    # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
-    if: github.event_name == 'pull_request' || (github.event_name == 'push' && contains(github.ref, 'refs/heads/'))
-    steps:
-      - name: Check out the codebase
-        uses: actions/checkout@v2
-        with:
-          path: "${{ github.repository }}"
-      - name: Set up Python
-        uses: actions/setup-python@v2
-      - name: Set up Docker
-        uses: docker-practice/actions-setup-docker@master
-      - name: Install dependencies
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install molecule[ansible,docker] jmespath
-          ansible --version
-          docker --version
-          molecule --version
-          python --version
-      - name: Test release update with molecule
-        run: |
-          cd ansible
-          molecule test -s update
+          molecule create
+          molecule verify
+          molecule converge
+          molecule idempotence
+          molecule verify
+          molecule destroy
         working-directory: "${{ github.repository }}"
   # # https://galaxy.ansible.com/docs/contributing/importing.html
   # release:
diff --git a/ansible/molecule/update/converge.yml b/ansible/molecule/default/converge.yml
similarity index 100%
rename from ansible/molecule/update/converge.yml
rename to ansible/molecule/default/converge.yml
diff --git a/ansible/molecule/fresh/molecule.yml b/ansible/molecule/default/molecule.yml
similarity index 100%
rename from ansible/molecule/fresh/molecule.yml
rename to ansible/molecule/default/molecule.yml
diff --git a/ansible/molecule/update/prepare.yml b/ansible/molecule/default/prepare.yml
similarity index 85%
rename from ansible/molecule/update/prepare.yml
rename to ansible/molecule/default/prepare.yml
index 138ebdfce..e175eff5b 100644
--- a/ansible/molecule/update/prepare.yml
+++ b/ansible/molecule/default/prepare.yml
@@ -3,7 +3,7 @@
   tasks:
     - name: set previous version as installation target
       set_fact:
-        paperlessng_version: 1.0.0
+        paperlessng_version: latest
 
     - name: install previous paperless-ng release
       include_role:
diff --git a/ansible/molecule/default/verify.yml b/ansible/molecule/default/verify.yml
new file mode 100644
index 000000000..01dc43192
--- /dev/null
+++ b/ansible/molecule/default/verify.yml
@@ -0,0 +1,91 @@
+---
+- name: Verify
+  hosts: all
+  gather_facts: false
+
+  vars_files:
+    - ../../defaults/main.yml
+
+  tasks:
+    - name: check if webserver is up
+      uri:
+        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}"
+        status_code: [200, 302]
+        return_content: yes
+      register: landingpage
+      failed_when: "'Sign in</button>' not in landingpage.content"
+
+    - name: generate random name and content
+      set_fact:
+        content: "{{ lookup('password', '/dev/null length=64 chars=ascii_letters') }}"
+        filename: "{{ lookup('password', '/dev/null length=8 chars=ascii_letters') }}"
+
+    - name: check if document posting works
+      uri:
+        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/documents/post_document/"
+        method: POST
+        body_format: form-multipart
+        body:
+          document:
+            content: "{{ content }}"
+            filename: "{{ filename }}.txt"
+            mime_type: text/plain
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: post_document
+      failed_when: "'OK' not in post_document.content"
+
+    - name: verify uploaded document has been accepted
+      uri:
+        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/"
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: logs
+      failed_when: "('Consuming ' + filename + '.txt') not in logs.content"
+
+    # assumes txt consumption finished by now, might have to sleep a bit
+    - name: verify uploaded document has been consumed
+      uri:
+        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/"
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: logs
+      failed_when: "filename + ' consumption finished' not in logs.content"
+
+    - name: get documents
+      uri:
+        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/documents/"
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: documents
+
+    - name: set document index
+      set_fact:
+        index: "{{ documents.json['results'][0]['id'] }}"
+
+    - name: verify uploaded document is avaiable
+      uri:
+        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/documents/{{ index }}/"
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+        return_content: yes
+      register: document
+      failed_when: "'Not found.' in document.content or content not in document.json['content']"
+
+    - name: check if deleting uploaded document works
+      uri:
+        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/documents/bulk_edit/"
+        method: POST
+        body_format: json
+        body:
+          documents: ["{{ index }}"]
+          method: delete
+          parameters: {}
+        headers:
+          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+      register: delete_document
+      failed_when: "'OK' not in delete_document.json['result']"
diff --git a/ansible/molecule/fresh/converge.yml b/ansible/molecule/fresh/converge.yml
deleted file mode 100644
index eec6e6444..000000000
--- a/ansible/molecule/fresh/converge.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: fresh installation
-  hosts: all
-  tasks:
-    - name: set github ref as version when available
-      set_fact:
-        paperlessng_version: "{{ lookup('env', 'GITHUB_REF') | default('latest', True) }}"
-    - name: install paperless-ng with default parameters
-      include_role:
-        name: ansible
diff --git a/ansible/molecule/fresh/verify.yml b/ansible/molecule/fresh/verify.yml
deleted file mode 100644
index c353783ab..000000000
--- a/ansible/molecule/fresh/verify.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-- name: Verify
-  hosts: all
-  gather_facts: false
-
-  vars_files:
-    - ../../defaults/main.yml
-
-  tasks:
-    - name: check if webserver is up
-      uri:
-        url: http://localhost:8000
-        status_code: [200, 302]
-        return_content: yes
-      register: landingpage
-      failed_when: "'Sign in</button>' not in landingpage.content"
-
-    - name: check if document posting works
-      uri:
-        url: http://localhost:8000/api/documents/post_document/
-        method: POST
-        body_format: form-multipart
-        body:
-          document:
-            content: FOO
-            filename: document.txt
-            mime_type: text/plain
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-        return_content: yes
-      register: post_document
-      failed_when: "'OK' not in post_document.content"
-
-    - name: verify uploaded document has been accepted
-      uri:
-        url: http://localhost:8000/api/logs/
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-        return_content: yes
-      register: logs
-      failed_when: "'Consuming document.txt' not in logs.content"
-
-    # assumes txt consumption finished by now, might have to sleep a bit
-    - name: verify uploaded document has been consumed
-      uri:
-        url: http://localhost:8000/api/logs/
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-        return_content: yes
-      register: logs
-      failed_when: "'document consumption finished' not in logs.content"
-
-    - name: verify uploaded document is avaiable
-      uri:
-        url: http://localhost:8000/api/documents/1/
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-        return_content: yes
-      register: document
-      failed_when: "'Not found.' in document.content or 'FOO' not in document.content"
diff --git a/ansible/molecule/update/molecule.yml b/ansible/molecule/update/molecule.yml
deleted file mode 100644
index 27f37ba63..000000000
--- a/ansible/molecule/update/molecule.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-dependency:
-  name: galaxy
-driver:
-  name: docker
-platforms:
-  - name: ubuntu_focal
-    image: jrei/systemd-ubuntu:20.04
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    tmpfs:
-      - /tmp
-      - /run
-      - /run/lock
-    override_command: False
-  # ubuntu 18.04 bionic works except that
-  #   the default redis configuration expects IPv6 which is not enabled in docker by default
-  #   the default Python environment is configured for ASCII instead of UTF-8
-  # ubuntu 16.04 xenial only has Python 3.5 which is EOL and breaks multiple dependencies
-  - name: debian_buster
-    image: jrei/systemd-debian:10
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    tmpfs:
-      - /tmp
-      - /run
-      - /run/lock
-    override_command: False
-  # debian 9 stretch only has Python 3.5 which is EOL and breaks multiple dependencies
-provisioner:
-  name: ansible
-verifier:
-  name: ansible
diff --git a/ansible/molecule/update/verify.yml b/ansible/molecule/update/verify.yml
deleted file mode 100644
index c353783ab..000000000
--- a/ansible/molecule/update/verify.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-- name: Verify
-  hosts: all
-  gather_facts: false
-
-  vars_files:
-    - ../../defaults/main.yml
-
-  tasks:
-    - name: check if webserver is up
-      uri:
-        url: http://localhost:8000
-        status_code: [200, 302]
-        return_content: yes
-      register: landingpage
-      failed_when: "'Sign in</button>' not in landingpage.content"
-
-    - name: check if document posting works
-      uri:
-        url: http://localhost:8000/api/documents/post_document/
-        method: POST
-        body_format: form-multipart
-        body:
-          document:
-            content: FOO
-            filename: document.txt
-            mime_type: text/plain
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-        return_content: yes
-      register: post_document
-      failed_when: "'OK' not in post_document.content"
-
-    - name: verify uploaded document has been accepted
-      uri:
-        url: http://localhost:8000/api/logs/
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-        return_content: yes
-      register: logs
-      failed_when: "'Consuming document.txt' not in logs.content"
-
-    # assumes txt consumption finished by now, might have to sleep a bit
-    - name: verify uploaded document has been consumed
-      uri:
-        url: http://localhost:8000/api/logs/
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-        return_content: yes
-      register: logs
-      failed_when: "'document consumption finished' not in logs.content"
-
-    - name: verify uploaded document is avaiable
-      uri:
-        url: http://localhost:8000/api/documents/1/
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-        return_content: yes
-      register: document
-      failed_when: "'Not found.' in document.content or 'FOO' not in document.content"

From 6e688a5b820a226c8e7560111d93d47fc0abea78 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 24 Jan 2021 00:00:46 +0100
Subject: [PATCH 0961/1300] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index e6b9feace..a19de79b2 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,8 @@ Here's what you get:
 # Features
 
 * Performs OCR on your documents, adds selectable text to image only documents and adds tags, correspondents and document types to your documents.
+* Supports PDF documents, images, plain text files, and Office documents (Word, Excel, Powerpoint, and LibreOffice equivalents).
+	* Office document support is optional and provided by Apache Tika (see [configuration](https://paperless-ng.readthedocs.io/en/latest/configuration.html#tika-settings))
 * Paperless stores your documents plain on disk. Filenames and folders are managed by paperless and can be configured freely.
 * Single page application front end. Should be pretty snappy. Will be mobile friendly in the future.
 	* Includes a dashboard that shows basic statistics and has document upload.

From be2013975c170c9b8c2f36a5a4407dcfcaea1917 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sun, 24 Jan 2021 09:59:54 +0100
Subject: [PATCH 0962/1300] Simplify building from source

Do not package app, instead copy directly into expected directory
---
 ansible/tasks/install-source.yml | 34 ++++++++------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/ansible/tasks/install-source.yml b/ansible/tasks/install-source.yml
index 04a2991b9..64fbc525b 100644
--- a/ansible/tasks/install-source.yml
+++ b/ansible/tasks/install-source.yml
@@ -30,25 +30,19 @@
     - npm install
     - ./node_modules/.bin/ng build --prod
 
-- name: clean output directory
-  file:
-    path: "{{ gitdir.path }}/dist"
-    state: absent
-
 - name: create output directories
   file:
     path: "{{ item }}"
     state: directory
   with_items:
-    - "{{ gitdir.path }}/dist"
-    - "{{ gitdir.path }}/dist/paperless-ng"
-    - "{{ gitdir.path }}/dist/paperless-ng/scripts"
+    - "{{ tempdir.path }}/paperless-ng"
+    - "{{ tempdir.path }}/paperless-ng/scripts"
 
 - name: copy application into place
   copy:
     src: "{{ gitdir.path }}/{{ item.src }}"
     remote_src: yes
-    dest: "{{ gitdir.path }}/dist/paperless-ng/{{ item.dest | default('') }}"
+    dest: "{{ tempdir.path }}/paperless-ng/{{ item.dest | default('') }}"
   with_items:
     - src: CONTRIBUTING.md
     - src: LICENSE
@@ -71,13 +65,13 @@
   copy:
     src: "{{ item.path }}"
     remote_src: yes
-    dest: "{{ gitdir.path }}/dist/paperless-ng/scripts/"
+    dest: "{{ tempdir.path }}/paperless-ng/scripts/"
   with_items:
     - "{{ glob.files }}"
 
 - name: copy sources
   command:
-    cmd: "cp -r src/ dist/paperless-ng/src"
+    cmd: "cp -r src/ {{ tempdir.path }}/paperless-ng/src"
   args:
     chdir: "{{ gitdir.path }}"
 
@@ -90,29 +84,17 @@
 - name: compile messages
   command: "{{ gitdir.path }}/.venv/bin/python3 manage.py compilemessages"
   args:
-    chdir: "{{ gitdir.path }}/dist/paperless-ng/src/"
+    chdir: "{{ tempdir.path }}/paperless-ng/src/"
 
 - name: collect static files
   command: "{{ gitdir.path }}/.venv/bin/python3 manage.py collectstatic --no-input"
   args:
-    chdir: "{{ gitdir.path }}/dist/paperless-ng/src/"
+    chdir: "{{ tempdir.path }}/paperless-ng/src/"
 
 - name: remove pycache directories
   shell: find . -name __pycache__ | xargs rm -r
   args:
-    chdir: "{{ gitdir.path }}/dist/"
-
-- name: package app
-  archive:
-    path: "{{ gitdir.path }}/dist/"
-    dest: "{{ gitdir.path }}/paperless-ng-{{ paperlessng_commit }}.tar.xz"
-    format: xz
-
-- name: extract paperless-ng
-  unarchive:
-    src: "{{ gitdir.path }}/paperless-ng-{{ paperlessng_commit }}.tar.xz"
-    remote_src: yes
-    dest: "{{ tempdir.path }}"
+    chdir: "{{ tempdir.path }}"
 
 - name: remove temporary git directory
   file:

From 28a2479f24ca7f1b3f1a5887ad9101ead9453d9d Mon Sep 17 00:00:00 2001
From: Reto <reto007@hotmail.com>
Date: Sun, 24 Jan 2021 19:37:46 +0100
Subject: [PATCH 0963/1300] fix my ignorance of idempotent

---
 docs/setup.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index d2bd7ed0a..24d0e5604 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -95,9 +95,8 @@ should you want to contribute some code back. You need to configure and
 run the above mentioned components yourself.
 
 The ansible route combines benefits of both options:
-the setup process is fully automated, reproducible and independent,
-it includes the same sensible defaults,
-and it simultaneously provides the flexibility of a bare metal installation.
+the setup process is fully automated, reproducible and `idempotent <https://docs.ansible.com/ansible/latest/reference_appendices/glossary.html#Idempotency>`,
+it includes the same sensible defaults, and it simultaneously provides the flexibility of a bare metal installation.
 
 .. _setup-docker_hub:
 

From 37ade0c6b23acd0550eb5131c030a383d5e79093 Mon Sep 17 00:00:00 2001
From: Reto <reto007@hotmail.com>
Date: Sun, 24 Jan 2021 20:00:09 +0100
Subject: [PATCH 0964/1300] fix my ignorance of idempotent

---
 docs/setup.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index d2bd7ed0a..73af557e7 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -88,18 +88,19 @@ You can go multiple routes to setup and run Paperless:
 
 The Docker routes are quick & easy. These are the recommended routes. This configures all the stuff
 from the above automatically so that it just works and uses sensible defaults for all configuration options.
-Here you find a cheat-sheet for docker beginners: `CLI Basics <https://sehn.tech/post/devops-with-docker/>`
+Here you find a cheat-sheet for docker beginners: `CLI Basics <https://sehn.tech/post/devops-with-docker/>`_ 
 
 The bare metal route is complicated to setup but makes it easier
 should you want to contribute some code back. You need to configure and
 run the above mentioned components yourself.
 
 The ansible route combines benefits of both options:
-the setup process is fully automated, reproducible and independent,
-it includes the same sensible defaults,
-and it simultaneously provides the flexibility of a bare metal installation.
+the setup process is fully automated, reproducible and `idempotent <https://docs.ansible.com/ansible/latest/reference_appendices/glossary.html#Idempotency>`_,
+it includes the same sensible defaults, and it simultaneously provides the flexibility of a bare metal installation.
 
 .. _setup-docker_hub:
+.. _CLI Basics: https://sehn.tech/post/devops-with-docker/
+.. _idempotent: https://docs.ansible.com/ansible/latest/reference_appendices/glossary.html#Idempotency
 
 Install Paperless from Docker Hub
 =================================

From 29ce2515eea976294e838537215316c2f6d71925 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sun, 24 Jan 2021 10:05:42 +0100
Subject: [PATCH 0965/1300] Build source package in paperlessng_directory

Avoids permission problems in /tmp
---
 ansible/molecule/default/verify.yml |   5 +-
 ansible/tasks/install-source.yml    | 165 +++++++++++++++-------------
 ansible/tasks/main.yml              |  11 +-
 3 files changed, 101 insertions(+), 80 deletions(-)

diff --git a/ansible/molecule/default/verify.yml b/ansible/molecule/default/verify.yml
index 01dc43192..1b3a436ca 100644
--- a/ansible/molecule/default/verify.yml
+++ b/ansible/molecule/default/verify.yml
@@ -45,7 +45,10 @@
       register: logs
       failed_when: "('Consuming ' + filename + '.txt') not in logs.content"
 
-    # assumes txt consumption finished by now, might have to sleep a bit
+    - name: sleep 5 seconds
+      pause:
+        seconds: 5
+
     - name: verify uploaded document has been consumed
       uri:
         url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/"
diff --git a/ansible/tasks/install-source.yml b/ansible/tasks/install-source.yml
index 64fbc525b..ab8fbfef7 100644
--- a/ansible/tasks/install-source.yml
+++ b/ansible/tasks/install-source.yml
@@ -1,5 +1,4 @@
 ---
-# https://github.com/jonaswinkler/paperless-ng/blob/dev/.github/workflows/ci.yml
 - name: install dev dependencies
   apt:
     pkg:
@@ -7,96 +6,106 @@
       - npm
       - gettext
 
-- name: create temporary git directory
-  tempfile:
-    state: directory
-  register: gitdir
-
-- name: pull paperless-ng
-  git:
-    repo: https://github.com/jonaswinkler/paperless-ng.git
-    dest: "{{ gitdir.path }}"
-    version: "{{ paperlessng_version }}"
-    refspec: "+refs/pull/*:refs/pull/*"
-
-- name: compile frontend
-  command:
-    cmd: "{{ item }}"
-  args:
-    chdir: "{{ gitdir.path }}/src-ui"
-  failed_when: false
-  with_items:
-    - npm install -g @angular/cli
-    - npm install
-    - ./node_modules/.bin/ng build --prod
-
 - name: create output directories
   file:
     path: "{{ item }}"
     state: directory
+    owner: "{{ paperlessng_system_user }}"
+    group: "{{ paperlessng_system_group }}"
+    mode: "750"
   with_items:
     - "{{ tempdir.path }}/paperless-ng"
     - "{{ tempdir.path }}/paperless-ng/scripts"
 
-- name: copy application into place
-  copy:
-    src: "{{ gitdir.path }}/{{ item.src }}"
-    remote_src: yes
-    dest: "{{ tempdir.path }}/paperless-ng/{{ item.dest | default('') }}"
-  with_items:
-    - src: CONTRIBUTING.md
-    - src: LICENSE
-    - src: Pipfile
-    - src: Pipfile.lock
-    - src: README.md
-    - src: requirements.txt
-    - src: paperless.conf.example
-      dest: "paperless.conf"
+- block:
+    - name: create temporary git directory
+      tempfile:
+        state: directory
+        path: "{{ paperlessng_directory }}"
+      register: gitdir
 
-- name: glob all scripts
-  find:
-    paths: ["{{ gitdir.path }}/scripts/"]
-    patterns:
-      - "*.service"
-      - "*.sh"
-  register: glob
+    - name: pull paperless-ng
+      git:
+        repo: https://github.com/jonaswinkler/paperless-ng.git
+        dest: "{{ gitdir.path }}"
+        version: "{{ paperlessng_version }}"
+        refspec: "+refs/pull/*:refs/pull/*"
 
-- name: copy scripts
-  copy:
-    src: "{{ item.path }}"
-    remote_src: yes
-    dest: "{{ tempdir.path }}/paperless-ng/scripts/"
-  with_items:
-    - "{{ glob.files }}"
+    - name: compile frontend
+      command:
+        cmd: "{{ item }}"
+      args:
+        chdir: "{{ gitdir.path }}/src-ui"
+      failed_when: false
+      with_items:
+        - npm install -g @angular/cli
+        - npm install
+        - ./node_modules/.bin/ng build --prod
 
-- name: copy sources
-  command:
-    cmd: "cp -r src/ {{ tempdir.path }}/paperless-ng/src"
-  args:
-    chdir: "{{ gitdir.path }}"
+    - name: copy application into place
+      copy:
+        src: "{{ gitdir.path }}/{{ item.src }}"
+        remote_src: yes
+        dest: "{{ tempdir.path }}/paperless-ng/{{ item.dest | default('') }}"
+      with_items:
+        - src: CONTRIBUTING.md
+        - src: LICENSE
+        - src: Pipfile
+        - src: Pipfile.lock
+        - src: README.md
+        - src: requirements.txt
+        - src: paperless.conf.example
+          dest: "paperless.conf"
 
-- name: install paperlessng requirements
-  pip:
-    requirements: "{{ gitdir.path }}/requirements.txt"
-    virtualenv: "{{ gitdir.path }}/.venv/"
-    extra_args: --upgrade
+    - name: glob all scripts
+      find:
+        paths: ["{{ gitdir.path }}/scripts/"]
+        patterns:
+          - "*.service"
+          - "*.sh"
+      register: glob
 
-- name: compile messages
-  command: "{{ gitdir.path }}/.venv/bin/python3 manage.py compilemessages"
-  args:
-    chdir: "{{ tempdir.path }}/paperless-ng/src/"
+    - name: copy scripts
+      copy:
+        src: "{{ item.path }}"
+        remote_src: yes
+        dest: "{{ tempdir.path }}/paperless-ng/scripts/"
+      with_items:
+        - "{{ glob.files }}"
 
-- name: collect static files
-  command: "{{ gitdir.path }}/.venv/bin/python3 manage.py collectstatic --no-input"
-  args:
-    chdir: "{{ tempdir.path }}/paperless-ng/src/"
+    - name: copy sources
+      command:
+        cmd: "cp -r src/ {{ tempdir.path }}/paperless-ng/src"
+      args:
+        chdir: "{{ gitdir.path }}"
 
-- name: remove pycache directories
-  shell: find . -name __pycache__ | xargs rm -r
-  args:
-    chdir: "{{ tempdir.path }}"
+    - name: create paperlessng venv
+      command:
+        cmd: "python3 -m virtualenv {{ gitdir.path }}/.venv/ -p /usr/bin/python3"
 
-- name: remove temporary git directory
-  file:
-    path: "{{ gitdir.path }}"
-    state: absent
+    - name: install paperlessng requirements
+      command:
+        cmd: "{{ gitdir.path }}/.venv/bin/python3 -m pip install -r {{ gitdir.path }}/requirements.txt"
+
+    - name: compile messages
+      command: "{{ gitdir.path }}/.venv/bin/python3 manage.py compilemessages"
+      args:
+        chdir: "{{ tempdir.path }}/paperless-ng/src/"
+
+    - name: collect static files
+      command: "{{ gitdir.path }}/.venv/bin/python3 manage.py collectstatic --no-input"
+      args:
+        chdir: "{{ tempdir.path }}/paperless-ng/src/"
+
+    - name: remove pycache directories
+      shell: find . -name __pycache__ | xargs rm -r
+      args:
+        chdir: "{{ tempdir.path }}"
+
+    - name: remove temporary git directory
+      file:
+        path: "{{ gitdir.path }}"
+        state: absent
+
+  become: yes
+  become_user: "{{ paperlessng_system_user }}"
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index 5ad30dfcf..f45747cb6 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -190,9 +190,19 @@
   when: update_installation
 
 - block:
+    - name: create paperless-ng directory and set permissions
+      file:
+        path: "{{ paperlessng_directory }}"
+        state: directory
+        owner: "{{ paperlessng_system_user }}"
+        group: "{{ paperlessng_system_group }}"
+        mode: "750"
     - name: create temporary directory
+      become: yes
+      become_user: "{{ paperlessng_system_user }}"
       tempfile:
         state: directory
+        path: "{{ paperlessng_directory }}"
       register: tempdir
     - name: check if version is available as release archive
       uri:
@@ -238,7 +248,6 @@
     group: "{{ paperlessng_system_group }}"
     mode: "750"
   with_items:
-    - "{{ paperlessng_directory }}"
     - "{{ paperlessng_consumption_dir }}"
     - "{{ paperlessng_data_dir }}"
     - "{{ paperlessng_media_root }}"

From 77b85b9e93244b8527d0d703dc4b2e3cedff236f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 00:34:36 +0100
Subject: [PATCH 0966/1300] remove status widget

---
 src-ui/src/app/app.module.ts                  |  4 +--
 .../dashboard/dashboard.component.html        |  4 +--
 .../consumer-status-widget.component.html     | 12 -------
 .../consumer-status-widget.component.scss     |  0
 .../consumer-status-widget.component.spec.ts  | 25 -------------
 .../consumer-status-widget.component.ts       | 35 -------------------
 6 files changed, 2 insertions(+), 78 deletions(-)
 delete mode 100644 src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
 delete mode 100644 src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.scss
 delete mode 100644 src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.spec.ts
 delete mode 100644 src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index ae5cc70b9..49e937c0b 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -60,7 +60,6 @@ import { NgSelectModule } from '@ng-select/ng-select';
 import { NumberComponent } from './components/common/input/number/number.component';
 import { SafePipe } from './pipes/safe.pipe';
 import { CustomDatePipe } from './pipes/custom-date.pipe';
-import { ConsumerStatusWidgetComponent } from './components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component';
 
 import localeFr from '@angular/common/locales/fr';
 import localeNl from '@angular/common/locales/nl';
@@ -119,8 +118,7 @@ registerLocaleData(localeDe)
     SelectDialogComponent,
     NumberComponent,
     SafePipe,
-    CustomDatePipe,
-    ConsumerStatusWidgetComponent
+    CustomDatePipe
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 40fee100f..ec2bbd85c 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -19,8 +19,6 @@
     <app-statistics-widget></app-statistics-widget>
 
     <app-upload-file-widget></app-upload-file-widget>
-
-    <app-consumer-status-widget></app-consumer-status-widget>
-
+  
   </div>
 </div>
diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
deleted file mode 100644
index 9ea715043..000000000
--- a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<app-widget-frame title="Document consumer status">
-  <ng-container content>
-    <div class="mb-2 border-bottom" *ngFor="let s of getStatus()">
-      <div class="mb-1"><strong>{{s.filename}}:</strong> {{s.message}}</div>
-      <ngb-progressbar [type]="getType(s.status)" [value]="s.current_progress" [max]="s.max_progress" class="mb-2"></ngb-progressbar>
-      <div *ngIf="isFinished(s)" class="mb-2">
-        <button *ngIf="s.document_id" class="btn btn-sm btn-outline-primary mr-2" routerLink="/documents/{{s.document_id}}" (click)="dismiss(s)">Open document</button>
-        <button class="btn btn-sm btn-outline-secondary" (click)="dismiss(s)">Dismiss</button>
-      </div>
-    </div>
-  </ng-container>
-</app-widget-frame>
diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.spec.ts
deleted file mode 100644
index 02aa088f5..000000000
--- a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ConsumerStatusWidgetComponent } from './consumer-status-widget.component';
-
-describe('ConsumerStatusWidgetComponent', () => {
-  let component: ConsumerStatusWidgetComponent;
-  let fixture: ComponentFixture<ConsumerStatusWidgetComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ ConsumerStatusWidgetComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConsumerStatusWidgetComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.ts
deleted file mode 100644
index 8e44af6d5..000000000
--- a/src-ui/src/app/components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ConsumerStatusService, FileStatus } from 'src/app/services/consumer-status.service';
-
-@Component({
-  selector: 'app-consumer-status-widget',
-  templateUrl: './consumer-status-widget.component.html',
-  styleUrls: ['./consumer-status-widget.component.scss']
-})
-export class ConsumerStatusWidgetComponent implements OnInit {
-
-  constructor(private consumerStatusService: ConsumerStatusService) { }
-
-  ngOnInit(): void {
-  }
-
-  getStatus() {
-    return this.consumerStatusService.consumerStatus
-  }
-
-  isFinished(status: FileStatus) {
-    return status.status == "FAILED" || status.status == "SUCCESS"
-  }
-
-  getType(status) {
-    switch (status) {
-      case "WORKING": return "primary"
-      case "FAILED": return "danger"
-      case "SUCCESS": return "success"
-    }
-  }
-
-  dismiss(status: FileStatus) {
-    this.consumerStatusService.dismiss(status)
-  }
-}

From 2fa78f782062b49a45ad7181865eba609ac958ff Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 00:35:07 +0100
Subject: [PATCH 0967/1300] update Pipfile.lock

---
 Pipfile.lock | 522 +++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 425 insertions(+), 97 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index dab52dbbd..267b18533 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "3c85a487240f18b3feb44f8899395696cb79630f320f0df9ef5ee37b914c89f2"
+            "sha256": "08cd30c074677e99d7b6bada67b7c6b7bb5348a9210753ea3c7841c95cad1037"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -19,6 +19,13 @@
         ]
     },
     "default": {
+        "aioredis": {
+            "hashes": [
+                "sha256:15f8af30b044c771aee6787e5ec24694c048184c7b9e54c3b60c750a4b93273a",
+                "sha256:b61808d7e97b7cd5a92ed574937a079c9387fdadd22bfbfa7ad2fd319ecc26e3"
+            ],
+            "version": "==1.3.1"
+        },
         "arrow": {
             "hashes": [
                 "sha256:e098abbd9af3665aea81bdd6c869e93af4feb078e98468dd351c383af187aac5",
@@ -35,6 +42,38 @@
             "markers": "python_version >= '3.5'",
             "version": "==3.3.1"
         },
+        "async-timeout": {
+            "hashes": [
+                "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f",
+                "sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3"
+            ],
+            "markers": "python_full_version >= '3.5.3'",
+            "version": "==3.0.1"
+        },
+        "attrs": {
+            "hashes": [
+                "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
+                "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==20.3.0"
+        },
+        "autobahn": {
+            "hashes": [
+                "sha256:410a93e0e29882c8b5d5ab05d220b07609b886ef5f23c0b8d39153254ffd6895",
+                "sha256:52ee4236ff9a1fcbbd9500439dcf3284284b37f8a6b31ecc8a36e00cf9f95049"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==20.12.3"
+        },
+        "automat": {
+            "hashes": [
+                "sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33",
+                "sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111",
+                "sha256:d6d976cf8da698fc85fa7def46e2544493f78cb7ee72d2f4acd1a5c759a3060e"
+            ],
+            "version": "==20.2.0"
+        },
         "blessed": {
             "hashes": [
                 "sha256:0a74a8d3f0366db600d061273df77d44f0db07daade7bb7a4d49c8bc22ed9f74",
@@ -92,6 +131,22 @@
             ],
             "version": "==1.14.4"
         },
+        "channels": {
+            "hashes": [
+                "sha256:056b72e51080a517a0f33a0a30003e03833b551d75394d6636c885d4edb8188f",
+                "sha256:3f15bdd2138bb4796e76ea588a0a344b12a7964ea9b2e456f992fddb988a4317"
+            ],
+            "index": "pypi",
+            "version": "==3.0.3"
+        },
+        "channels-redis": {
+            "hashes": [
+                "sha256:18d63f6462a58011740dc8eeb57ea4b31ec220eb551cb71b27de9c6779a549de",
+                "sha256:2fb31a63b05373f6402da2e6a91a22b9e66eb8b56626c6bfc93e156c734c5ae6"
+            ],
+            "index": "pypi",
+            "version": "==3.2.0"
+        },
         "chardet": {
             "hashes": [
                 "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa",
@@ -108,6 +163,13 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==15.0"
         },
+        "constantly": {
+            "hashes": [
+                "sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35",
+                "sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d"
+            ],
+            "version": "==15.1.0"
+        },
         "cryptography": {
             "hashes": [
                 "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d",
@@ -129,6 +191,14 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
             "version": "==3.3.1"
         },
+        "daphne": {
+            "hashes": [
+                "sha256:0052c9887600c57054a5867d4b0240159fa009faa3bcf6a1627271d9cdcb005a",
+                "sha256:c22b692707f514de9013651ecb687f2abe4f35cf6fe292ece634e9f1737bc7e3"
+            ],
+            "index": "pypi",
+            "version": "==3.0.1"
+        },
         "dateparser": {
             "hashes": [
                 "sha256:7552c994f893b5cb8fcf103b4cd2ff7f57aab9bfd2619fdf0cf571c0740fd90b",
@@ -217,6 +287,60 @@
             "index": "pypi",
             "version": "==20.0.4"
         },
+        "hiredis": {
+            "hashes": [
+                "sha256:06a039208f83744a702279b894c8cf24c14fd63c59cd917dcde168b79eef0680",
+                "sha256:0a909bf501459062aa1552be1461456518f367379fdc9fdb1f2ca5e4a1fdd7c0",
+                "sha256:18402d9e54fb278cb9a8c638df6f1550aca36a009d47ecf5aa263a38600f35b0",
+                "sha256:1e4cbbc3858ec7e680006e5ca590d89a5e083235988f26a004acf7244389ac01",
+                "sha256:23344e3c2177baf6975fbfa361ed92eb7d36d08f454636e5054b3faa7c2aff8a",
+                "sha256:289b31885b4996ce04cadfd5fc03d034dce8e2a8234479f7c9e23b9e245db06b",
+                "sha256:2c1c570ae7bf1bab304f29427e2475fe1856814312c4a1cf1cd0ee133f07a3c6",
+                "sha256:2c227c0ed371771ffda256034427320870e8ea2e4fd0c0a618c766e7c49aad73",
+                "sha256:3bb9b63d319402cead8bbd9dd55dca3b667d2997e9a0d8a1f9b6cc274db4baee",
+                "sha256:3ef2183de67b59930d2db8b8e8d4d58e00a50fcc5e92f4f678f6eed7a1c72d55",
+                "sha256:43b8ed3dbfd9171e44c554cb4acf4ee4505caa84c5e341858b50ea27dd2b6e12",
+                "sha256:47bcf3c5e6c1e87ceb86cdda2ee983fa0fe56a999e6185099b3c93a223f2fa9b",
+                "sha256:5263db1e2e1e8ae30500cdd75a979ff99dcc184201e6b4b820d0de74834d2323",
+                "sha256:5b1451727f02e7acbdf6aae4e06d75f66ee82966ff9114550381c3271a90f56c",
+                "sha256:6996883a8a6ff9117cbb3d6f5b0dcbbae6fb9e31e1a3e4e2f95e0214d9a1c655",
+                "sha256:6c96f64a54f030366657a54bb90b3093afc9c16c8e0dfa29fc0d6dbe169103a5",
+                "sha256:7332d5c3e35154cd234fd79573736ddcf7a0ade7a986db35b6196b9171493e75",
+                "sha256:7885b6f32c4a898e825bb7f56f36a02781ac4a951c63e4169f0afcf9c8c30dfb",
+                "sha256:7b0f63f10a166583ab744a58baad04e0f52cfea1ac27bfa1b0c21a48d1003c23",
+                "sha256:819f95d4eba3f9e484dd115ab7ab72845cf766b84286a00d4ecf76d33f1edca1",
+                "sha256:8968eeaa4d37a38f8ca1f9dbe53526b69628edc9c42229a5b2f56d98bb828c1f",
+                "sha256:89ebf69cb19a33d625db72d2ac589d26e936b8f7628531269accf4a3196e7872",
+                "sha256:8daecd778c1da45b8bd54fd41ffcd471a86beed3d8e57a43acf7a8d63bba4058",
+                "sha256:955ba8ea73cf3ed8bd2f963b4cb9f8f0dcb27becd2f4b3dd536fd24c45533454",
+                "sha256:964f18a59f5a64c0170f684c417f4fe3e695a536612e13074c4dd5d1c6d7c882",
+                "sha256:969843fbdfbf56cdb71da6f0bdf50f9985b8b8aeb630102945306cf10a9c6af2",
+                "sha256:996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132",
+                "sha256:9e9c9078a7ce07e6fce366bd818be89365a35d2e4b163268f0ca9ba7e13bb2f6",
+                "sha256:9f4e67f87e072de981570eaf7cb41444bbac7e92b05c8651dbab6eb1fb8d5a14",
+                "sha256:a04901757cb0fb0f5602ac11dda48f5510f94372144d06c2563ba56c480b467c",
+                "sha256:a7bf1492429f18d205f3a818da3ff1f242f60aa59006e53dee00b4ef592a3363",
+                "sha256:aa0af2deb166a5e26e0d554b824605e660039b161e37ed4f01b8d04beec184f3",
+                "sha256:abfb15a6a7822f0fae681785cb38860e7a2cb1616a708d53df557b3d76c5bfd4",
+                "sha256:b253fe4df2afea4dfa6b1fa8c5fef212aff8bcaaeb4207e81eed05cb5e4a7919",
+                "sha256:b27f082f47d23cffc4cf1388b84fdc45c4ef6015f906cd7e0d988d9e35d36349",
+                "sha256:b33aea449e7f46738811fbc6f0b3177c6777a572207412bbbf6f525ffed001ae",
+                "sha256:b39989b49e8aca9d224324d2650029eda410a4faf43f6afb0eb4f9acb7be6097",
+                "sha256:b44f9421c4505c548435244d74037618f452844c5d3c67719d8a55e2613549da",
+                "sha256:bcc371151d1512201d0214c36c0c150b1dc64f19c2b1a8c9cb1d7c7c15ebd93f",
+                "sha256:c2851deeabd96d3f6283e9c6b26e0bfed4de2dc6fb15edf913e78b79fc5909ed",
+                "sha256:cdfd501c7ac5b198c15df800a3a34c38345f5182e5f80770caf362bccca65628",
+                "sha256:d2c0caffa47606d6d7c8af94ba42547bd2a441f06c74fd90a1ffe328524a6c64",
+                "sha256:dcb2db95e629962db5a355047fb8aefb012df6c8ae608930d391619dbd96fd86",
+                "sha256:e0eeb9c112fec2031927a1745788a181d0eecbacbed941fc5c4f7bc3f7b273bf",
+                "sha256:e154891263306200260d7f3051982774d7b9ef35af3509d5adbbe539afd2610c",
+                "sha256:e2e023a42dcbab8ed31f97c2bcdb980b7fbe0ada34037d87ba9d799664b58ded",
+                "sha256:e64be68255234bb489a574c4f2f8df7029c98c81ec4d160d6cd836e7f0679390",
+                "sha256:e82d6b930e02e80e5109b678c663a9ed210680ded81c1abaf54635d88d1da298"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==1.1.0"
+        },
         "humanfriendly": {
             "hashes": [
                 "sha256:066562956639ab21ff2676d1fda0b5987e985c534fc76700a19bd54bcb81121d",
@@ -225,6 +349,13 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==9.1"
         },
+        "hyperlink": {
+            "hashes": [
+                "sha256:427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b",
+                "sha256:e6b14c37ecb73e89c77d78cdb4c2cc8f3fb59a885c5b3f819ff4ed80f25af1b4"
+            ],
+            "version": "==21.0.0"
+        },
         "idna": {
             "hashes": [
                 "sha256:4a57a6379512ade94fa99e2fa46d3cd0f2f553040548d0e2958c6ed90ee48226",
@@ -236,11 +367,11 @@
         },
         "imap-tools": {
             "hashes": [
-                "sha256:7d2d25b35117a3750c3b561dd93cc2fcb24cdc457830a049796c639f4371e317",
-                "sha256:80088839cd1959f20c44206cdad4463ca1e7647ff67cf5b0e31e810fb6aaa6c4"
+                "sha256:4ec9575f21fb5a3efb573e71107806367dd52ecab0bf8f5c3724d1de6762b77b",
+                "sha256:860221dc13eb5d640da240e9bcf7867275c6162b742255789fd84f59124dfdd9"
             ],
             "index": "pypi",
-            "version": "==0.34.0"
+            "version": "==0.36.0"
         },
         "img2pdf": {
             "hashes": [
@@ -257,6 +388,13 @@
             "markers": "python_version < '3.8'",
             "version": "==3.4.0"
         },
+        "incremental": {
+            "hashes": [
+                "sha256:717e12246dddf231a349175f48d74d93e2897244939173b01974ab6661406b9f",
+                "sha256:7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3"
+            ],
+            "version": "==17.5.0"
+        },
         "inotify-simple": {
             "hashes": [
                 "sha256:8440ffe49c4ae81a8df57c1ae1eb4b6bfa7acb830099bfb3e305b383005cc128",
@@ -335,6 +473,41 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==4.6.2"
         },
+        "msgpack": {
+            "hashes": [
+                "sha256:0cb94ee48675a45d3b86e61d13c1e6f1696f0183f0715544976356ff86f741d9",
+                "sha256:1026dcc10537d27dd2d26c327e552f05ce148977e9d7b9f1718748281b38c841",
+                "sha256:26a1759f1a88df5f1d0b393eb582ec022326994e311ba9c5818adc5374736439",
+                "sha256:2a5866bdc88d77f6e1370f82f2371c9bc6fc92fe898fa2dec0c5d4f5435a2694",
+                "sha256:31c17bbf2ae5e29e48d794c693b7ca7a0c73bd4280976d408c53df421e838d2a",
+                "sha256:497d2c12426adcd27ab83144057a705efb6acc7e85957a51d43cdcf7f258900f",
+                "sha256:5a9ee2540c78659a1dd0b110f73773533ee3108d4e1219b5a15a8d635b7aca0e",
+                "sha256:7307e86f7ce75b49e65b55660b10b258e9e7b5e0f80d31d7a86a278d8204d1b4",
+                "sha256:8521e5be9e3b93d4d5e07cb80b7e32353264d143c1f072309e1863174c6aadb1",
+                "sha256:87869ba567fe371c4555d2e11e4948778ab6b59d6cc9d8460d543e4cfbbddd1c",
+                "sha256:8ffb24a3b7518e843cd83538cf859e026d24ec41ac5721c18ed0c55101f9775b",
+                "sha256:92be4b12de4806d3c36810b0fe2aeedd8d493db39e2eb90742b9c09299eb5759",
+                "sha256:9ea52fff0473f9f3000987f313310208c879493491ef3ccf66268eff8d5a0326",
+                "sha256:a4355d2193106c7aa77c98fc955252a737d8550320ecdb2e9ac701e15e2943bc",
+                "sha256:a99b144475230982aee16b3d249170f1cccebf27fb0a08e9f603b69637a62192",
+                "sha256:ac25f3e0513f6673e8b405c3a80500eb7be1cf8f57584be524c4fa78fe8e0c83",
+                "sha256:b28c0876cce1466d7c2195d7658cf50e4730667196e2f1355c4209444717ee06",
+                "sha256:b55f7db883530b74c857e50e149126b91bb75d35c08b28db12dcb0346f15e46e",
+                "sha256:b6d9e2dae081aa35c44af9c4298de4ee72991305503442a5c74656d82b581fe9",
+                "sha256:c747c0cc08bd6d72a586310bda6ea72eeb28e7505990f342552315b229a19b33",
+                "sha256:c82dc0ba34d620fb94d12a7725e9362958bb1be3938688a061f53ed86bee005a",
+                "sha256:d6c64601af8f3893d17ec233237030e3110f11b8a962cb66720bf70c0141aa54",
+                "sha256:d8167b84af26654c1124857d71650404336f4eb5cc06900667a493fc619ddd9f",
+                "sha256:de6bd7990a2c2dabe926b7e62a92886ccbf809425c347ae7de277067f97c2887",
+                "sha256:e36a812ef4705a291cdb4a2fd352f013134f26c6ff63477f20235138d1d21009",
+                "sha256:e89ec55871ed5473a041c0495b7b4e6099f6263438e0bd04ccd8418f92d5d7f2",
+                "sha256:f3e6aaf217ac1c7ce1563cf52a2f4f5d5b1f64e8729d794165db71da57257f0c",
+                "sha256:f484cd2dca68502de3704f056fa9b318c94b1539ed17a4c784266df5d6978c87",
+                "sha256:fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984",
+                "sha256:fe07bc6735d08e492a327f496b7850e98cb4d112c56df69b0c844dbebcbb47f6"
+            ],
+            "version": "==1.0.2"
+        },
         "numpy": {
             "hashes": [
                 "sha256:012426a41bc9ab63bb158635aecccc7610e3eff5d31d1eb43bc099debc979d94",
@@ -524,6 +697,42 @@
             "index": "pypi",
             "version": "==2.8.6"
         },
+        "pyasn1": {
+            "hashes": [
+                "sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359",
+                "sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576",
+                "sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf",
+                "sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7",
+                "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d",
+                "sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00",
+                "sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8",
+                "sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86",
+                "sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12",
+                "sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776",
+                "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba",
+                "sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2",
+                "sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3"
+            ],
+            "version": "==0.4.8"
+        },
+        "pyasn1-modules": {
+            "hashes": [
+                "sha256:0845a5582f6a02bb3e1bde9ecfc4bfcae6ec3210dd270522fee602365430c3f8",
+                "sha256:0fe1b68d1e486a1ed5473f1302bd991c1611d319bba158e98b106ff86e1d7199",
+                "sha256:15b7c67fabc7fc240d87fb9aabf999cf82311a6d6fb2c70d00d3d0604878c811",
+                "sha256:426edb7a5e8879f1ec54a1864f16b882c2837bfd06eee62f2c982315ee2473ed",
+                "sha256:65cebbaffc913f4fe9e4808735c95ea22d7a7775646ab690518c056784bc21b4",
+                "sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e",
+                "sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74",
+                "sha256:a99324196732f53093a84c4369c996713eb8c89d360a496b599fb1a9c47fc3eb",
+                "sha256:b80486a6c77252ea3a3e9b1e360bc9cf28eaac41263d173c032581ad2f20fe45",
+                "sha256:c29a5e5cc7a3f05926aff34e097e84f8589cd790ce0ed41b67aed6857b26aafd",
+                "sha256:cbac4bc38d117f2a49aeedec4407d23e8866ea4ac27ff2cf7fb3e5b570df19e0",
+                "sha256:f39edd8c4ecaa4556e989147ebf219227e2cd2e8a43c7e7fcb1f1c18c5fd6a3d",
+                "sha256:fe0644d9ab041506b62782e92b06b8c68cca799e1a9636ec398675459e031405"
+            ],
+            "version": "==0.2.8"
+        },
         "pycparser": {
             "hashes": [
                 "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0",
@@ -532,6 +741,21 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.20"
         },
+        "pyhamcrest": {
+            "hashes": [
+                "sha256:412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316",
+                "sha256:7ead136e03655af85069b6f47b23eb7c3e5c221aa9f022a4fbb499f5b7308f29"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==2.0.2"
+        },
+        "pyopenssl": {
+            "hashes": [
+                "sha256:4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51",
+                "sha256:818ae18e06922c066f777a33f1fca45786d85edfe71cd043de6379337a7f274b"
+            ],
+            "version": "==20.0.1"
+        },
         "python-dateutil": {
             "hashes": [
                 "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c",
@@ -558,13 +782,12 @@
         },
         "python-levenshtein": {
             "hashes": [
-                "sha256:033a11de5e3d19ea25c9302d11224e1a1898fe5abd23c61c7c360c25195e3eb1",
-                "sha256:15e26882728c29ccdf74cfc6ac4b49fc22c08b44d152348cb0eb1ec4f3dbf9df",
-                "sha256:3df5e5eb144570ecf5ad38864a2393068798328c7f05e7b167a49391d36a2db1",
-                "sha256:7f049b3ddc4b525bd469febafb98bf5202f789b722e0e4ccbec2ffbe8c07d7b4"
+                "sha256:108edd3c271f1afda8b21a8d9da81886414dfb6940a085fa7903c592e0f8f54b",
+                "sha256:1ff19b712c5974080b003fd26ef365cd93dfc1a5e690be621f79f3e63e00a7cc",
+                "sha256:554e273a88060d177e7b3c1e6ea9158dde11563bfae8f7f661f73f47e5ff0911"
             ],
             "index": "pypi",
-            "version": "==0.12.0"
+            "version": "==0.12.1"
         },
         "python-magic": {
             "hashes": [
@@ -640,50 +863,50 @@
         },
         "reportlab": {
             "hashes": [
-                "sha256:009fa61710647cdc62eb373345248d8ebb93583a058990f7c4f9be46d90aa5b1",
-                "sha256:04a08d284da86882ec3a41a7c719833362ef891b09ee8e2fbb47cee352aa684a",
-                "sha256:07bff6742fba612da8d1b1f783c436338c6fdc6962828159827d5ca7d2b67935",
-                "sha256:09fb11ab1500e679fc1b01199d2fed24435499856e75043a9ac0d31dd48fd881",
-                "sha256:18a876449c9000c391dd3415ebc8454cd7bb9e488977b894886a2d7d018f16cd",
-                "sha256:18eec161411026dde49767bee4e5e8eeb8014879554811a62581dc7433628d5b",
-                "sha256:19353aead39fc115a4d6c598d6fb9fa26da7e69160a0443ebb49b02903e704e8",
-                "sha256:1b85c20e89c22ae902ca973df2afdd2d64d27dc4ffd2b29ebad8c805a213756b",
-                "sha256:1da3d7a35f918cee905facfa94bd00ae6091cadc06dca1b0b31b69ae02d41d1d",
-                "sha256:1e484ce83dae26cb40fcbd312d45b8ba921de7856a00339d867dd4ecf145a1e7",
-                "sha256:33f3cfdc492575f8af3225701301a7e62fc478358729820c9e0091aff5831378",
-                "sha256:3b0026c1129147befd4e5a8cf25da8dea1096fce371e7b2412e36d7254019c06",
-                "sha256:3d7713dddaa8081ed709a1fa2456a43f6a74b0f07d605da8441fd53fef334f69",
-                "sha256:3e2b4d69763103b9dc9b54c0952dc3cee05cedd06e28c0987fad7f84705b12c0",
-                "sha256:4ca5233a19a5ceca23546290f43addec2345789c7d65bb32f8b2668aa148351f",
-                "sha256:5214a289cf01ebbd65e49bae83709671dd9edb601891cf0ae8abf85f3c0b392f",
-                "sha256:52f8237654acbc78ea2fa6fb4a6a06e5b023b6da93f7889adfe2deba09473fad",
-                "sha256:5ed00894e0f8281c0b7c0494b4d3067c641fd90c8e5cf933089ec4cc9a48e491",
-                "sha256:6191961533d49c9d860964d42bada4d7ac3bb28502d984feb8034093f2012fa8",
-                "sha256:6f3ad2b1afe99c436563cd436d8693d4a12e2c4bd45f70c7705759ff7837fe53",
-                "sha256:739b743b7ca1ba4b4d64c321de6fccb49b562d0507ea06c817d9cc4faed5cd22",
-                "sha256:792efba0c0c6e4ee94f6dc95f305451733ee9230a1c7d51cb8e5301a549e0dfb",
-                "sha256:79d63ca40231ca3860859b39a92daa5219035ba9553da89a5e1b218550744121",
-                "sha256:83b28104edd58ad65748d2d0e60e0d97e3b91b3e90b4573ea6fe60de6811972c",
-                "sha256:85650446538cd2f606ca234634142a7ccd74cb6db7cfec250f76a4242e0f2431",
-                "sha256:8850eba6de6eb813036eb8dce353e40d60c8af48bbce107de82770b10d3aa525",
-                "sha256:9da445cb79e3f740756924c053edc952cde11a65ff5af8acfda3c0a1317136ef",
-                "sha256:9fabd5fbd24f5971085ffe53150d663f158f7d3050b25c95736e29ebf676d454",
-                "sha256:a0c377bc45e73c3f15f55d7de69fab270d174749d5b454ab0de502b15430ec2a",
-                "sha256:a1d3f7022a920d4a5e165d264581f1862e1c1b877ceeabb96fe98cec98125ae5",
-                "sha256:a315edef5c5610b0c75790142f49487e89ea34397fc247ae8aa890fe6d6dd057",
-                "sha256:a755cca2dcf023130b03bb671670301a992157d5c3151d838c0b68ef89894536",
-                "sha256:b1b20208ecdfffd7ca027955c4fe8972b28b30a4b3b80cf25099a08d3b20ed7c",
-                "sha256:b26d6f416891cef93411d6d478a25db275766081a5fb66368248293ef459f3be",
-                "sha256:b4ba4c30af7044ee987e61c88a5ffb76031ca0c53666bc85d823b7de55ddbc75",
-                "sha256:b71faf3b6e4d7058e1af1b8afedaf39a962db4a219affc8177009d8244ec10d4",
-                "sha256:cfa854bea525f8c913cb77e2bda724d94b965a0eb3bcfc4a645a9baa29bb86e2",
-                "sha256:dd9687359e466086b9f6fe6d8069034017f8b6ca3080944fae5709767ca6814e",
-                "sha256:de0c675fc2998a7eaa929c356ba49c84f53a892e9ab25e8ee7d8ebbbdcb2ac16",
-                "sha256:e2b4e33fea2ce9d3a14ea39191b169e41eb2ac995274f54ac8fd27519974bce8",
-                "sha256:f3d4a1a273dc141e03b72a553c11bc14dd7a27ec7654a071edcf83eb04f004bc",
-                "sha256:ff547cf4c1de7e104cad1a378431ff81efcb03e90e40871ee686107da5b91442"
+                "sha256:10d0cd2ab669fbad8b766db57066270296396caf515731643e7c7e732159a432",
+                "sha256:21508065492fbb750aa6d07297a2ba4bcacb418c84898fe892e12bdceefc3b9a",
+                "sha256:21c433905569af36bc220490a33f8f78442fd71c1bea3d021f851623c8089a78",
+                "sha256:236c4142474a59e4564b0e7c32e4d7b9cfc0dc2236ffa721ae97a4dbc2667d10",
+                "sha256:287b241a9d4189e7bfffd68aea0efd701d703bccee6686b9779bf16e22e9a2ad",
+                "sha256:2bc48a3cad6dd3cd1b5cd09526dad50afbda14afadd6fb40635a5227246bbe26",
+                "sha256:2e4631c49ec72f6a84502cda1710e988fa3027250e17c26713e543af31fff58a",
+                "sha256:2fd3305a75502d11942a9629cf6af96660a508f19adc4abaac5549909d1db1b3",
+                "sha256:32be7f9a55b8dfd91924730644632d19352fd9e0bb77cd03eba8a34fc846c4f6",
+                "sha256:33dc663ac3713e9d2f5a96b20412e16fd00b688b1b5a8057436e3fce69c2a59d",
+                "sha256:3d83cffa1211a7ae4912bfe3ac36051e31371cfb63b716e458c520da9f645fd9",
+                "sha256:3f9d56f5778b54260ce79878761b1f98267677702233daa26edd9f06f3be85c0",
+                "sha256:49a599f1aae7d91649fb10dbe070614740a60e4d2b65882a002dc20a7eba9f6f",
+                "sha256:4d5d62d49f3632cf437ac28ad52a8274fe6392ea2c48d294d2e92f1258d1479e",
+                "sha256:552ea83656f18e52ee073aee04d7e3f4d0eb71147f6882ae4fc15681d8e6ab1c",
+                "sha256:605f4a49ee313eabae4db4694d073dbb0778a0eccbc6d090e58c5a4db862c2a8",
+                "sha256:6289057afa4023f58d7977d105d09503c2cb1031e248fff52b44e41914d176cf",
+                "sha256:669526b580d52c05efbd45a8c9f1adf9370b8818bc2d48adec661ea7037415d4",
+                "sha256:6fc5f21d1383b552dc5b3eb774aaaf14cb7f8f34f15ea45772f72867dfaeecc6",
+                "sha256:74c7499fdda682028bb1b01d7ca89d813175c0f8c18d3ae9924c6393987ea4ef",
+                "sha256:75c0b6cf47c199f1e69283b0678b47537cc15af31acbad783fffe2c9cfa6a626",
+                "sha256:7b3ec1255c940fabfdb05577a4f148cca54943215cecb24efd5840a8ecb618ce",
+                "sha256:7d39eaca932b1d51de84c387616462913fa988c02a4a462798098f62edcf1e21",
+                "sha256:81e2faddfde7a21154d1a08e28e3d9b820274afa282b7ed17fcf1e9d7b4aa7a1",
+                "sha256:8aca938409fc99a9e79514cb97b3478780b261ff74a058c75a3a12552b1d6b9a",
+                "sha256:8f963222cc0c302ed5a15766ea00ff470c80c47d691e828ef21032df95e8a2ff",
+                "sha256:9be1ec218966e2e9982e73109863d91e3e4b9e7649ae6be0bf98b78c52a5a330",
+                "sha256:aa24f56c504d41982eb212f79669c05d4452f7736618dd33ba4167da0b5578b7",
+                "sha256:aa9caa395823130b360b5f3184eb25c9f1ea4fb51ab0370c2e693dc139cd7d83",
+                "sha256:b2f2bf419229bda5d6c8a10219ad1d984d2a6cd246acf613559d4a5fbcee0aea",
+                "sha256:b73f85e09e4271aee192489f5a8a7c33a1a82f42702cd0886f8f630600a23ad8",
+                "sha256:c3fac0186c18d7d5285f508d79bd86f751526190728ef2a33107568533f9aff0",
+                "sha256:c7ea886aa8dc3d3adb0c32ee87522821dd8ead2bac6d41e0481c1d911049c3c9",
+                "sha256:c9a487b646ac367d15bf6749deffa04ecbe339ba067d29414f206a7516a0a775",
+                "sha256:d0ae3cd60b659da41bb4962facec2ed3c8cfb3cedc85c5993e6299938134fc94",
+                "sha256:d6b900b1dc0d3c7b7f69fde25c8e60cb978b774056383c4a03bb38c829342299",
+                "sha256:d6feecad778e2a3d5a5ea48b027063e9baf73c6454235c1c1556b59c114c90cb",
+                "sha256:de5d98f41ffbe567717c334a9866c0f289a02cef37a78323cb5f8a86eecb6a8c",
+                "sha256:e47daf974b68fdcd2ffb5442ea5f1dd849eeaf6f9d4915128bf5374467e7b63a",
+                "sha256:e52536cba231fb3dd0628abf98b23519778e1247d4d69553d879eea6159b648d",
+                "sha256:f3181284502207e78eb472d00e8f9e84f43a7fe502821d2d76f3dd7da1d5e081",
+                "sha256:fc900dbc8f020305e15781210e64f6e96c1f9ca0fa00c4a0ccc1174cc44c5a5b"
             ],
-            "version": "==3.5.59"
+            "version": "==3.5.60"
         },
         "requests": {
             "hashes": [
@@ -695,35 +918,31 @@
         },
         "scikit-learn": {
             "hashes": [
-                "sha256:076369634ee72b5a5941440661e2f306ff4ac30903802dc52031c7e9199ac640",
-                "sha256:18f7131e62265bf2691ed1d0303c640313894ccfe4278427478c6b2f45094b53",
-                "sha256:26f66b3726b54dfb76ea51c5d9c2431ed17ebc066cb4527662b9e851a3e7ba61",
-                "sha256:2951f87d35e72f007701c6e028aa230f6df6212a3194677c0c950486066a454d",
-                "sha256:2a5348585aa793bc8cc5a72f8e9067c9380834b0aadbd55f924843b071f13282",
-                "sha256:3eeff086f7329521d27249a082ea3c48c085cedb110db5f65968ab55c3ba2e09",
-                "sha256:4395e91b3548005f4a645018435b5a94f8cce232b5b70753020e606c6a750656",
-                "sha256:44e452ea8491225c5783d49577aad0f36202dfd52aec7f82c0fdfe5fbd5f7400",
-                "sha256:490436b44b3a1957cb625e871764b0aa330b34cc416aea4abc6c38ca63d0d682",
-                "sha256:5e6e3c042cea83f2e20a45e563b8eabc1f8f72446251fe23ebefdf111a173a33",
-                "sha256:66f27bf21202a850bcd7b6303916e4907f6e22ec59a14974ede4955aed5c7ed0",
-                "sha256:743b6edd98c98991be46c08e6b21df3861d5ae915f91d59f988384d93f7263e7",
-                "sha256:758619e49cd7c17282e6cc60d5cc73c02c072b47c9a10010bb3bb47e0d976e50",
-                "sha256:7f654befc5ad413690cc58f3f34a3e906caf825195ce0fda00a8e9565e1403e6",
-                "sha256:800aaf63f8838c00e85db2267dd226f89858594843fd03932a9eda95746d2c40",
-                "sha256:80ca024154b84b6ac4cfc86930ba13fdc348a209753bf2c16129db6f9eb8a80b",
-                "sha256:890d7d588f65acb0c4f6c083347c9076916bda5e6bd8400f06244b1afc1009af",
-                "sha256:905d8934d1e27a686698864a5863ff2c0e13a2ae1adb78a8a848aacc8a49927d",
-                "sha256:a83fcd9d59c42a2f66b307e3b0b0f08aa8e6e45be33da055697ea499f0e4f7c2",
-                "sha256:afeb06dc69847927634e58579b9cdc72e1390b79497336b2324b1b173f33bd47",
-                "sha256:b0d13fd56d26cf3de0314a4fd48037108c638fe126d813f5c1222bb0f08b6a76",
-                "sha256:c08b27cb78ee8d2dc781a7affed09859441f5b624f9f92da59ac0791c8774dfc",
-                "sha256:c912247e42114f389858ae05d63f4359d4e667ea72aaabee191aee9ad3f9774a",
-                "sha256:d7fe05fcb44eadd6d6c874c768f085f5de1239db3a3b7be4d3d23d12e4120589",
-                "sha256:d819d625832fb2969911a243e009cfa135cb8ef1e150866e417d6e9d75290087",
-                "sha256:e534f5f3796db6781c87e9835dcd51b7854c8c5a379c9210b93605965c1941fd"
+                "sha256:1adf483e91007a87171d7ce58c34b058eb5dab01b5fee6052f15841778a8ecd8",
+                "sha256:259ec35201e82e2db1ae2496f229e63f46d7f1695ae68eef9350b00dc74ba52f",
+                "sha256:3c4f07f47c04e81b134424d53c3f5e16dfd7f494e44fd7584ba9ce9de2c5e6c1",
+                "sha256:4562dcf4793e61c5d0f89836d07bc37521c3a1889da8f651e2c326463c4bd697",
+                "sha256:7b04691eb2f41d2c68dbda8d1bd3cb4ef421bdc43aaa56aeb6c762224552dfb6",
+                "sha256:826b92bf45b8ad80444814e5f4ac032156dd481e48d7da33d611f8fe96d5f08b",
+                "sha256:83b21ff053b1ff1c018a2d24db6dd3ea339b1acfbaa4d9c881731f43748d8b3b",
+                "sha256:8772b99d683be8f67fcc04789032f1b949022a0e6880ee7b75a7ec97dbbb5d0b",
+                "sha256:895dbf2030aa7337649e36a83a007df3c9811396b4e2fa672a851160f36ce90c",
+                "sha256:8aa1b3ac46b80eaa552b637eeadbbce3be5931e4b5002b964698e33a1b589e1e",
+                "sha256:99349d77f54e11f962d608d94dfda08f0c9e5720d97132233ebdf35be2858b2d",
+                "sha256:9a24d1ccec2a34d4cd3f2a1f86409f3f5954cc23d4d2270ba0d03cf018aa4780",
+                "sha256:9bed8a1ef133c8e2f13966a542cb8125eac7f4b67dcd234197c827ba9c7dd3e0",
+                "sha256:9c6097b6a9b2bafc5e0f31f659e6ab5e131383209c30c9e978c5b8abdac5ed2a",
+                "sha256:9dfa564ef27e8e674aa1cc74378416d580ac4ede1136c13dd555a87996e13422",
+                "sha256:a0334a1802e64d656022c3bfab56a73fbd6bf4b1298343f3688af2151810bbdf",
+                "sha256:ae7191f0253145503fbfa1934cbc83f48260f534343e34115398fb5fc2be55b0",
+                "sha256:c3deb3b19dd9806acf00cf0d400e84562c227723013c33abefbbc3cf906596e9",
+                "sha256:d54dbaadeb1425b7d6a66bf44bee2bb2b899fe3e8850b8e94cfb9c904dcb46d0",
+                "sha256:ddb52d088889f5596bc4d1de981f2eca106b58243b6679e4782f3ba5096fd645",
+                "sha256:ed9d65594948678827f4ff0e7ae23344e2f2b4cabbca057ccaed3118fdc392ca",
+                "sha256:fab31f48282ebf54dd69f6663cd2d9800096bad1bb67bbc9c9ac84eb77b41972"
             ],
             "index": "pypi",
-            "version": "==0.24.0"
+            "version": "==0.24.1"
         },
         "scipy": {
             "hashes": [
@@ -757,6 +976,13 @@
             "markers": "python_version >= '3.6'",
             "version": "==1.5.4"
         },
+        "service-identity": {
+            "hashes": [
+                "sha256:001c0707759cb3de7e49c078a7c0c9cd12594161d3bf06b9c254fdcb1a60dc36",
+                "sha256:0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d"
+            ],
+            "version": "==18.1.0"
+        },
         "six": {
             "hashes": [
                 "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
@@ -804,6 +1030,48 @@
             "index": "pypi",
             "version": "==4.56.0"
         },
+        "twisted": {
+            "extras": [
+                "tls"
+            ],
+            "hashes": [
+                "sha256:0150dae5adc962d15e00054cc6926f1e64763fb8dd26e1632593ac06e592104b",
+                "sha256:040eb6641125d2a9a09cf198ec7b83dd8858c6f51f6770325ed9959c00f5098f",
+                "sha256:147780b8caf21ba2aef3688628eaf13d7e7fe02a86747cd54bfaf2140538f042",
+                "sha256:158ddb80719a4813d292293ac44ba41d8b56555ed009d90994a278237ee63d2c",
+                "sha256:15e52271f08f62e2230ff093e0278aa01c9dac057c4557cadadd2429eed86a3e",
+                "sha256:2182000d6ffc05d269e6c03bfcec8b57e20259ca1086180edaedec3f1e689292",
+                "sha256:25ffcf37944bdad4a99981bc74006d735a678d2b5c193781254fbbb6d69e3b22",
+                "sha256:3281d9ce889f7b21bdb73658e887141aa45a102baf3b2320eafcfba954fcefec",
+                "sha256:356e8d8dd3590e790e3dba4db139eb8a17aca64b46629c622e1b1597a4a92478",
+                "sha256:70952c56e4965b9f53b180daecf20a9595cf22b8d0935cd3bd664c90273c3ab2",
+                "sha256:7408c6635ee1b96587289283ebe90ee15dbf9614b05857b446055116bc822d29",
+                "sha256:7c547fd0215db9da8a1bc23182b309e84a232364cc26d829e9ee196ce840b114",
+                "sha256:894f6f3cfa57a15ea0d0714e4283913a5f2511dbd18653dd148eba53b3919797",
+                "sha256:94ac3d55a58c90e2075c5fe1853f2aa3892b73e3bf56395f743aefde8605eeaa",
+                "sha256:a58e61a2a01e5bcbe3b575c0099a2bcb8d70a75b1a087338e0c48dd6e01a5f15",
+                "sha256:c09c47ff9750a8e3aa60ad169c4b95006d455a29b80ad0901f031a103b2991cd",
+                "sha256:ca3a0b8c9110800e576d89b5337373e52018b41069bc879f12fa42b7eb2d0274",
+                "sha256:cd1dc5c85b58494138a3917752b54bb1daa0045d234b7c132c37a61d5483ebad",
+                "sha256:cdbc4c7f0cd7a2218b575844e970f05a1be1861c607b0e048c9bceca0c4d42f7",
+                "sha256:d267125cc0f1e8a0eed6319ba4ac7477da9b78a535601c49ecd20c875576433a",
+                "sha256:d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10",
+                "sha256:d95803193561a243cb0401b0567c6b7987d3f2a67046770e1dccd1c9e49a9780",
+                "sha256:e92703bed0cc21d6cb5c61d66922b3b1564015ca8a51325bd164a5e33798d504",
+                "sha256:f058bd0168271de4dcdc39845b52dd0a4a2fecf5f1246335f13f5e96eaebb467",
+                "sha256:f3c19e5bd42bbe4bf345704ad7c326c74d3fd7a1b3844987853bef180be638d4"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==20.3.0"
+        },
+        "txaio": {
+            "hashes": [
+                "sha256:1488d31d564a116538cc1265ac3f7979fb6223bb5a9e9f1479436ee2c17d8549",
+                "sha256:a8676d6c68aea1f0e2548c4afdb8e6253873af3bc2659bb5bcd9f39dff7ff90f"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==20.12.1"
+        },
         "typing-extensions": {
             "hashes": [
                 "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
@@ -882,6 +1150,66 @@
             ],
             "markers": "python_version >= '3.6'",
             "version": "==3.4.0"
+        },
+        "zope.interface": {
+            "hashes": [
+                "sha256:05a97ba92c1c7c26f25c9f671aa1ef85ffead6cdad13770e5b689cf983adc7e1",
+                "sha256:07d61722dd7d85547b7c6b0f5486b4338001fab349f2ac5cabc0b7182eb3425d",
+                "sha256:09fc3922f235703c0b76f8234867685eee68a24a49fffa2220975f6142db45f1",
+                "sha256:0a990dcc97806e5980bbb54b2e46b9cde9e48932d8e6984daf71ef1745516123",
+                "sha256:150e8bcb7253a34a4535aeea3de36c0bb3b1a6a47a183a95d65a194b3e07f232",
+                "sha256:1743bcfe45af8846b775086471c28258f4c6e9ee8ef37484de4495f15a98b549",
+                "sha256:1b5f6c8fff4ed32aa2dd43e84061bc8346f32d3ba6ad6e58f088fe109608f102",
+                "sha256:21e49123f375703cf824214939d39df0af62c47d122d955b2a8d9153ea08cfd5",
+                "sha256:21f579134a47083ffb5ddd1307f0405c91aa8b61ad4be6fd5af0171474fe0c45",
+                "sha256:27c267dc38a0f0079e96a2945ee65786d38ef111e413c702fbaaacbab6361d00",
+                "sha256:299bde0ab9e5c4a92f01a152b7fbabb460f31343f1416f9b7b983167ab1e33bc",
+                "sha256:2ab88d8f228f803fcb8cb7d222c579d13dab2d3622c51e8cf321280da01102a7",
+                "sha256:2ced4c35061eea623bc84c7711eedce8ecc3c2c51cd9c6afa6290df3bae9e104",
+                "sha256:2dcab01c660983ba5e5a612e0c935141ccbee67d2e2e14b833e01c2354bd8034",
+                "sha256:32546af61a9a9b141ca38d971aa6eb9800450fa6620ce6323cc30eec447861f3",
+                "sha256:32b40a4c46d199827d79c86bb8cb88b1bbb764f127876f2cb6f3a47f63dbada3",
+                "sha256:3cc94c69f6bd48ed86e8e24f358cb75095c8129827df1298518ab860115269a4",
+                "sha256:42b278ac0989d6f5cf58d7e0828ea6b5951464e3cf2ff229dd09a96cb6ba0c86",
+                "sha256:495b63fd0302f282ee6c1e6ea0f1c12cb3d1a49c8292d27287f01845ff252a96",
+                "sha256:4af87cdc0d4b14e600e6d3d09793dce3b7171348a094ba818e2a68ae7ee67546",
+                "sha256:4b94df9f2fdde7b9314321bab8448e6ad5a23b80542dcab53e329527d4099dcb",
+                "sha256:4c48ddb63e2b20fba4c6a2bf81b4d49e99b6d4587fb67a6cd33a2c1f003af3e3",
+                "sha256:4df9afd17bd5477e9f8c8b6bb8507e18dd0f8b4efe73bb99729ff203279e9e3b",
+                "sha256:518950fe6a5d56f94ba125107895f938a4f34f704c658986eae8255edb41163b",
+                "sha256:538298e4e113ccb8b41658d5a4b605bebe75e46a30ceca22a5a289cf02c80bec",
+                "sha256:55465121e72e208a7b69b53de791402affe6165083b2ea71b892728bd19ba9ae",
+                "sha256:588384d70a0f19b47409cfdb10e0c27c20e4293b74fc891df3d8eb47782b8b3e",
+                "sha256:6278c080d4afffc9016e14325f8734456831124e8c12caa754fd544435c08386",
+                "sha256:64ea6c221aeee4796860405e1aedec63424cda4202a7ad27a5066876db5b0fd2",
+                "sha256:681dbb33e2b40262b33fd383bae63c36d33fd79fa1a8e4092945430744ffd34a",
+                "sha256:6936aa9da390402d646a32a6a38d5409c2d2afb2950f045a7d02ab25a4e7d08d",
+                "sha256:778d0ec38bbd288b150a3ae363c8ffd88d2207a756842495e9bffd8a8afbc89a",
+                "sha256:8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24",
+                "sha256:83b4aa5344cce005a9cff5d0321b2e318e871cc1dfc793b66c32dd4f59e9770d",
+                "sha256:844fad925ac5c2ad4faaceb3b2520ad016b5280105c6e16e79838cf951903a7b",
+                "sha256:8ceb3667dd13b8133f2e4d637b5b00f240f066448e2aa89a41f4c2d78a26ce50",
+                "sha256:92dc0fb79675882d0b6138be4bf0cec7ea7c7eede60aaca78303d8e8dbdaa523",
+                "sha256:974f5957e66a7524ea81df7b2686a456bfaf0408dbb7353ddfbedb594eadfef6",
+                "sha256:9789bd945e9f5bd026ed3f5b453d640befb8b1fc33a779c1fe8d3eb21fe3fb4a",
+                "sha256:a2b6d6eb693bc2fc6c484f2e5d93bd0b0da803fa77bf974f160533e555e4d095",
+                "sha256:aab9f1e34d810feb00bf841993552b8fcc6ae71d473c505381627143d0018a6a",
+                "sha256:abb61afd84f23099ac6099d804cdba9bd3b902aaaded3ffff47e490b0a495520",
+                "sha256:adf9ee115ae8ff8b6da4b854b4152f253b390ba64407a22d75456fe07dcbda65",
+                "sha256:aedc6c672b351afe6dfe17ff83ee5e7eb6ed44718f879a9328a68bdb20b57e11",
+                "sha256:b7a00ecb1434f8183395fac5366a21ee73d14900082ca37cf74993cf46baa56c",
+                "sha256:ba32f4a91c1cb7314c429b03afbf87b1fff4fb1c8db32260e7310104bd77f0c7",
+                "sha256:cbd0f2cbd8689861209cd89141371d3a22a11613304d1f0736492590aa0ab332",
+                "sha256:e4bc372b953bf6cec65a8d48482ba574f6e051621d157cf224227dbb55486b1e",
+                "sha256:eccac3d9aadc68e994b6d228cb0c8919fc47a5350d85a1b4d3d81d1e98baf40c",
+                "sha256:efd550b3da28195746bb43bd1d815058181a7ca6d9d6aa89dd37f5eefe2cacb7",
+                "sha256:efef581c8ba4d990770875e1a2218e856849d32ada2680e53aebc5d154a17e20",
+                "sha256:f057897711a630a0b7a6a03f1acf379b6ba25d37dc5dc217a97191984ba7f2fc",
+                "sha256:f37d45fab14ffef9d33a0dc3bc59ce0c5313e2253323312d47739192da94f5fd",
+                "sha256:f44906f70205d456d503105023041f1e63aece7623b31c390a0103db4de17537"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==5.2.0"
         }
     },
     "develop": {
@@ -1043,11 +1371,11 @@
         },
         "faker": {
             "hashes": [
-                "sha256:47ac7d62d5bad8c16422a91f121430ab7656d40ca8fea9c84bcdbdf92e739b03",
-                "sha256:6bc44606d44f711e1d89ad9a5b42394cc6f7eedaffc765ddb5b2d22084c15733"
+                "sha256:0f8198d876bc65edd3699e2542c6ae13cc93fbc4a478c17db190d5d9b6ce790e",
+                "sha256:8fe22be90c0db35d830464918f84beb50f970f4caacae4d88e92692857b78aa7"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==5.5.0"
+            "version": "==5.6.5"
         },
         "filelock": {
             "hashes": [
@@ -1084,11 +1412,11 @@
         },
         "importlib-resources": {
             "hashes": [
-                "sha256:4743f090ed8946e713745ec0e660249ef9fb0b9843eacc5b5ff931d2fd5aa67f",
-                "sha256:ea17df80a0ff04b5dbd3d96dbeab1842acfd1c6c902eaeb8c8858abf2720161e"
+                "sha256:885b8eae589179f661c909d699a546cf10d83692553e34dca1bf5eb06f7f6217",
+                "sha256:bfdad047bce441405a49cf8eb48ddce5e56c696e185f59147a8b79e75e9e6380"
             ],
             "markers": "python_version < '3.7'",
-            "version": "==5.0.0"
+            "version": "==5.1.0"
         },
         "iniconfig": {
             "hashes": [
@@ -1207,11 +1535,11 @@
         },
         "pytest-cov": {
             "hashes": [
-                "sha256:45ec2d5182f89a81fc3eb29e3d1ed3113b9e9a873bcddb2a71faaab066110191",
-                "sha256:47bd0ce14056fdd79f93e1713f88fad7bdcc583dcd7783da86ef2f085a0bb88e"
+                "sha256:359952d9d39b9f822d9d29324483e7ba04a3a17dd7d05aa6beb7ea01e359e5f7",
+                "sha256:bdb9fdb0b85a7cc825269a4c56b48ccaa5c7e365054b6038772c32ddcdc969da"
             ],
             "index": "pypi",
-            "version": "==2.10.1"
+            "version": "==2.11.1"
         },
         "pytest-django": {
             "hashes": [
@@ -1287,10 +1615,10 @@
         },
         "snowballstemmer": {
             "hashes": [
-                "sha256:209f257d7533fdb3cb73bdbd24f436239ca3b2fa67d56f6ff88e86be08cc5ef0",
-                "sha256:df3bac3df4c2c01363f3dd2cfa78cce2840a79b9f1c2d2de9ce8d31683992f52"
+                "sha256:b51b447bea85f9968c13b650126a888aabd4cb4463fca868ec596826325dedc2",
+                "sha256:e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"
             ],
-            "version": "==2.0.0"
+            "version": "==2.1.0"
         },
         "sphinx": {
             "hashes": [
@@ -1380,11 +1708,11 @@
         },
         "tox": {
             "hashes": [
-                "sha256:5efda30ad73e662c3844ac51ce1381bf28f61063773e06996aa8b6277133a7c0",
-                "sha256:8cccede64802e78aa6c69f81051b25f0706639d1cbbb34d9366ce00c70ee054f"
+                "sha256:0aa777ee466f2ef18e6f58428c793c32378779e0a321dbb8934848bc3e78998c",
+                "sha256:f501808381c01c6d7827c2f17328be59c0a715046e94605ddca15fb91e65827d"
             ],
             "index": "pypi",
-            "version": "==3.21.0"
+            "version": "==3.21.2"
         },
         "typing-extensions": {
             "hashes": [
@@ -1405,11 +1733,11 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:205a7577275dd0d9223c730dd498e21a8910600085c3dee97412b041fc4b853b",
-                "sha256:7992b8de87e544a4ab55afc2240bf8388c4e3b5765d03784dad384bfdf9097ee"
+                "sha256:219ee956e38b08e32d5639289aaa5bd190cfbe7dafcb8fa65407fca08e808f9c",
+                "sha256:227a8fed626f2f20a6cdb0870054989f82dd27b2560a911935ba905a2a5e0034"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.3.0"
+            "version": "==20.4.0"
         },
         "zipp": {
             "hashes": [

From f31073a341f4227dfb7ad40df2051403ac5721d2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 00:50:29 +0100
Subject: [PATCH 0968/1300] update dependencies

---
 Pipfile          |  1 -
 Pipfile.lock     | 36 ++++++++++++++++++------------------
 requirements.txt | 32 ++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/Pipfile b/Pipfile
index adb41f314..140df6d02 100644
--- a/Pipfile
+++ b/Pipfile
@@ -18,7 +18,6 @@ django-q = "~=1.3.4"
 djangorestframework = "~=3.12.2"
 filelock = "*"
 fuzzywuzzy = "*"
-gunicorn = "*"
 imap-tools = "*"
 langdetect = "*"
 pdftotext = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 267b18533..9c30dedfa 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "08cd30c074677e99d7b6bada67b7c6b7bb5348a9210753ea3c7841c95cad1037"
+            "sha256": "ede35846cb5a19613a24fa1ad4ba0e0ea0290d45fc912e7e69136bc56bb64007"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -217,11 +217,11 @@
         },
         "django-cors-headers": {
             "hashes": [
-                "sha256:5665fc1b1aabf1b678885cf6f8f8bd7da36ef0a978375e767d491b48d3055d8f",
-                "sha256:ba898dd478cd4be3a38ebc3d8729fa4d044679f8c91b2684edee41129d7e968a"
+                "sha256:1ac2b1213de75a251e2ba04448da15f99bcfcbe164288ae6b5ff929dc49b372f",
+                "sha256:96069c4aaacace786a34ee7894ff680780ec2644e4268b31181044410fecd12e"
             ],
             "index": "pypi",
-            "version": "==3.6.0"
+            "version": "==3.7.0"
         },
         "django-extensions": {
             "hashes": [
@@ -279,14 +279,6 @@
             "index": "pypi",
             "version": "==0.18.0"
         },
-        "gunicorn": {
-            "hashes": [
-                "sha256:1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626",
-                "sha256:cd4a810dd51bf497552cf3f863b575dabd73d6ad6a91075b65936b151cbf4f9c"
-            ],
-            "index": "pypi",
-            "version": "==20.0.4"
-        },
         "hiredis": {
             "hashes": [
                 "sha256:06a039208f83744a702279b894c8cf24c14fd63c59cd917dcde168b79eef0680",
@@ -918,10 +910,13 @@
         },
         "scikit-learn": {
             "hashes": [
+                "sha256:0567a2d29ad08af98653300c623bd8477b448fe66ced7198bef4ed195925f082",
+                "sha256:087dfede39efb06ab30618f9ab55a0397f29c38d63cd0ab88d12b500b7d65fd7",
                 "sha256:1adf483e91007a87171d7ce58c34b058eb5dab01b5fee6052f15841778a8ecd8",
                 "sha256:259ec35201e82e2db1ae2496f229e63f46d7f1695ae68eef9350b00dc74ba52f",
                 "sha256:3c4f07f47c04e81b134424d53c3f5e16dfd7f494e44fd7584ba9ce9de2c5e6c1",
                 "sha256:4562dcf4793e61c5d0f89836d07bc37521c3a1889da8f651e2c326463c4bd697",
+                "sha256:4ddd2b6f7449a5d539ff754fa92d75da22de261fd8fdcfb3596799fadf255101",
                 "sha256:7b04691eb2f41d2c68dbda8d1bd3cb4ef421bdc43aaa56aeb6c762224552dfb6",
                 "sha256:826b92bf45b8ad80444814e5f4ac032156dd481e48d7da33d611f8fe96d5f08b",
                 "sha256:83b21ff053b1ff1c018a2d24db6dd3ea339b1acfbaa4d9c881731f43748d8b3b",
@@ -934,8 +929,13 @@
                 "sha256:9c6097b6a9b2bafc5e0f31f659e6ab5e131383209c30c9e978c5b8abdac5ed2a",
                 "sha256:9dfa564ef27e8e674aa1cc74378416d580ac4ede1136c13dd555a87996e13422",
                 "sha256:a0334a1802e64d656022c3bfab56a73fbd6bf4b1298343f3688af2151810bbdf",
+                "sha256:a29460499c1e62b7a830bb57ca42e615375a6ab1bcad053cd25b493588348ea8",
+                "sha256:a36e159a0521e13bbe15ca8c8d038b3a1dd4c7dad18d276d76992e03b92cf643",
                 "sha256:ae7191f0253145503fbfa1934cbc83f48260f534343e34115398fb5fc2be55b0",
+                "sha256:c13ebac42236b1c46397162471ea1c46af68413000e28b9309f8c05722c65a09",
                 "sha256:c3deb3b19dd9806acf00cf0d400e84562c227723013c33abefbbc3cf906596e9",
+                "sha256:c658432d8a20e95398f6bb95ff9731ce9dfa343fdf21eea7ec6a7edfacd4b4d9",
+                "sha256:c7f4eb77504ac586d8ac1bde1b0c04b504487210f95297235311a0ab7edd7e38",
                 "sha256:d54dbaadeb1425b7d6a66bf44bee2bb2b899fe3e8850b8e94cfb9c904dcb46d0",
                 "sha256:ddb52d088889f5596bc4d1de981f2eca106b58243b6679e4782f3ba5096fd645",
                 "sha256:ed9d65594948678827f4ff0e7ae23344e2f2b4cabbca057ccaed3118fdc392ca",
@@ -1371,11 +1371,11 @@
         },
         "faker": {
             "hashes": [
-                "sha256:0f8198d876bc65edd3699e2542c6ae13cc93fbc4a478c17db190d5d9b6ce790e",
-                "sha256:8fe22be90c0db35d830464918f84beb50f970f4caacae4d88e92692857b78aa7"
+                "sha256:1a40c9696830342e67d30057753323478b848e89334e97e0a64b442b18ae7ece",
+                "sha256:dd98418eceb374c475e85bd49ae826a9b304dabcd794640f35a1d185f4767dd9"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==5.6.5"
+            "version": "==5.7.0"
         },
         "filelock": {
             "hashes": [
@@ -1527,11 +1527,11 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:1969f797a1a0dbd8ccf0fecc80262312729afea9c17f1d70ebf85c5e76c6f7c8",
-                "sha256:66e419b1899bc27346cb2c993e12c5e5e8daba9073c1fbce33b9807abc95c306"
+                "sha256:9d1edf9e7d0b84d72ea3dbcdfd22b35fb543a5e8f2a60092dd578936bf63d7f9",
+                "sha256:b574b57423e818210672e07ca1fa90aaf194a4f63f3ab909a2c67ebb22913839"
             ],
             "index": "pypi",
-            "version": "==6.2.1"
+            "version": "==6.2.2"
         },
         "pytest-cov": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index 3b7a158c1..c70d13ff4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,16 +7,25 @@
 
 -i https://pypi.python.org/simple
 --extra-index-url https://www.piwheels.org/simple
+aioredis==1.3.1
 arrow==0.17.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 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==20.12.3; python_version >= '3.6'
+automat==20.2.0
 blessed==1.17.12
 certifi==2020.12.5
 cffi==1.14.4
+channels-redis==3.2.0
+channels==3.0.3
 chardet==4.0.0; python_version >= '3.1'
 coloredlogs==15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+constantly==15.1.0
 cryptography==3.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+daphne==3.0.1
 dateparser==0.7.6
-django-cors-headers==3.6.0
+django-cors-headers==3.7.0
 django-extensions==3.1.0
 django-filter==2.4.0
 django-picklefield==3.0.1; python_version >= '3'
@@ -25,17 +34,20 @@ django==3.1.5
 djangorestframework==3.12.2
 filelock==3.0.12
 fuzzywuzzy==0.18.0
-gunicorn==20.0.4
+hiredis==1.1.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 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.34.0
+imap-tools==0.36.0
 img2pdf==0.4.0
 importlib-metadata==3.4.0; python_version < '3.8'
+incremental==17.5.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.0; 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'
+msgpack==1.0.2
 numpy==1.19.5; python_version >= '3.6'
 ocrmypdf==11.4.5
 pathvalidate==2.3.2
@@ -45,25 +57,32 @@ pikepdf==2.2.5
 pillow==8.1.0
 pluggy==0.13.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.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'
+pyhamcrest==2.0.2; python_version >= '3.5'
+pyopenssl==20.0.1
 python-dateutil==2.8.1
 python-dotenv==0.15.0
 python-gnupg==0.4.6
-python-levenshtein==0.12.0
+python-levenshtein==0.12.1
 python-magic==0.4.18
 pytz==2020.5
 redis==3.5.3
 regex==2020.11.13
-reportlab==3.5.59
+reportlab==3.5.60
 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
+scikit-learn==0.24.1
 scipy==1.5.4; python_version >= '3.6'
+service-identity==18.1.0
 six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 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.56.0
+twisted[tls]==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+txaio==20.12.1; python_version >= '3.6'
 typing-extensions==3.7.4.3; python_version < '3.8'
 tzlocal==2.1
 urllib3==1.26.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
@@ -72,3 +91,4 @@ wcwidth==0.2.5
 whitenoise==5.2.0
 whoosh==2.7.4
 zipp==3.4.0; python_version >= '3.6'
+zope.interface==5.2.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'

From 339e96b63c369223b8134b271034eb909819a58f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 00:51:20 +0100
Subject: [PATCH 0969/1300] task ids

---
 src/documents/consumer.py | 6 +++++-
 src/documents/tasks.py    | 7 +++++--
 src/documents/views.py    | 6 +++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 71b1294f5..f4a40cbb9 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -35,6 +35,7 @@ class Consumer(LoggingMixin):
                        message, document_id=None):
         payload = {
             'filename': os.path.basename(filename),
+            'task_id': self.task_id,
             'current_progress': current_progress,
             'max_progress': max_progress,
             'status': status,
@@ -58,6 +59,7 @@ class Consumer(LoggingMixin):
         self.override_correspondent_id = None
         self.override_tag_ids = None
         self.override_document_type_id = None
+        self.task_id = None
 
         self.channel_layer = get_channel_layer()
 
@@ -136,7 +138,8 @@ class Consumer(LoggingMixin):
                          override_title=None,
                          override_correspondent_id=None,
                          override_document_type_id=None,
-                         override_tag_ids=None):
+                         override_tag_ids=None,
+                         task_id=None):
         """
         Return the document object if it was successfully created.
         """
@@ -147,6 +150,7 @@ class Consumer(LoggingMixin):
         self.override_correspondent_id = override_correspondent_id
         self.override_document_type_id = override_document_type_id
         self.override_tag_ids = override_tag_ids
+        self.task_id = task_id
 
         self._send_progress(self.filename, 0, 100, 'WORKING',
                             'Received new file.')
diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index 38ff532b5..c67b2b3fa 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -62,7 +62,8 @@ def consume_file(path,
                  override_title=None,
                  override_correspondent_id=None,
                  override_document_type_id=None,
-                 override_tag_ids=None):
+                 override_tag_ids=None,
+                 task_id=None):
 
     document = Consumer().try_consume_file(
         path,
@@ -70,7 +71,9 @@ def consume_file(path,
         override_title=override_title,
         override_correspondent_id=override_correspondent_id,
         override_document_type_id=override_document_type_id,
-        override_tag_ids=override_tag_ids)
+        override_tag_ids=override_tag_ids,
+        task_id=task_id
+    )
 
     if document:
         return "Success. New document id {} created".format(
diff --git a/src/documents/views.py b/src/documents/views.py
index f0c7f10d1..2012e879a 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -1,6 +1,7 @@
 import logging
 import os
 import tempfile
+import uuid
 from datetime import datetime
 from time import mktime
 
@@ -385,6 +386,8 @@ class PostDocumentView(APIView):
             f.write(doc_data)
             os.utime(f.name, times=(t, t))
 
+            task_id = str(uuid.uuid4())
+
             async_task("documents.tasks.consume_file",
                        f.name,
                        override_filename=doc_name,
@@ -392,8 +395,9 @@ class PostDocumentView(APIView):
                        override_correspondent_id=correspondent_id,
                        override_document_type_id=document_type_id,
                        override_tag_ids=tag_ids,
+                       task_id=task_id,
                        task_name=os.path.basename(doc_name)[:100])
-        return Response("OK")
+        return Response({"task_id": task_id})
 
 
 class SelectionDataView(APIView):

From ede3bd1391804d54d0b25e9b45b6fa446a651fef Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 00:51:45 +0100
Subject: [PATCH 0970/1300] rework of the front end components

---
 src-ui/src/app/app.component.ts               |  4 +-
 .../upload-file-widget.component.html         | 12 ++-
 .../upload-file-widget.component.ts           | 69 +++++++------
 .../data/websocket-consumer-status-message.ts | 11 +++
 .../app/services/consumer-status.service.ts   | 97 +++++++++++++++----
 5 files changed, 137 insertions(+), 56 deletions(-)
 create mode 100644 src-ui/src/app/data/websocket-consumer-status-message.ts

diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts
index 8ca276dd4..43c23f2af 100644
--- a/src-ui/src/app/app.component.ts
+++ b/src-ui/src/app/app.component.ts
@@ -32,7 +32,7 @@ export class AppComponent implements OnInit, OnDestroy {
 
     this.successSubscription = this.consumerStatusService.onDocumentConsumptionFinished().subscribe(status => {
       this.toastService.show({title: "Document added", delay: 10000, content: `Document ${status.filename} was added to paperless.`, actionName: "Open document", action: () => {
-        this.router.navigate(['documents', status.document_id])
+        this.router.navigate(['documents', status.documentId])
       }})
     })
 
@@ -42,6 +42,4 @@ export class AppComponent implements OnInit, OnDestroy {
 
   }
 
-
-
 }
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index aa317bd52..59afb74f9 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -9,10 +9,16 @@
 
       </ngx-file-drop>
     </form>
-    <div *ngIf="uploadVisible" class="mt-3">
-      <p i18n>{uploadStatus.length, plural, =1 {Uploading file...} =other {Uploading {{uploadStatus.length}} files...}}</p>
-      <ngb-progressbar [value]="loadedSum" [max]="totalSum" [striped]="true" [animated]="uploadStatus.length > 0">
+    <div *ngFor="let status of getStatus()">
+      <p>{{status.filename}}: {{status.message}}</p>
+      <ngb-progressbar [value]="status.getProgress()" [max]="1" [striped]="true" [animated]="!isFinished(status)" [type]="getType(status)">
       </ngb-progressbar>
+
+      <div *ngIf="isFinished(status)" class="mb-2">
+        <button *ngIf="status.documentId" class="btn btn-sm btn-outline-primary mr-2" routerLink="/documents/{{status.documentId}}" (click)="dismiss(status)">Open document</button>
+        <button class="btn btn-sm btn-outline-secondary" (click)="dismiss(status)">Dismiss</button>
+      </div>
+    
     </div>
   </div>
 </app-widget-frame>
\ No newline at end of file
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index 19d9909a9..ac270fe30 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -1,15 +1,10 @@
 import { HttpEventType } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop';
+import { ConsumerStatusService, FileStatus, FileStatusPhase } from 'src/app/services/consumer-status.service';
 import { DocumentService } from 'src/app/services/rest/document.service';
-import { ToastService } from 'src/app/services/toast.service';
 
 
-interface UploadStatus {
-  loaded: number
-  total: number
-}
-
 @Component({
   selector: 'app-upload-file-widget',
   templateUrl: './upload-file-widget.component.html',
@@ -17,8 +12,35 @@ interface UploadStatus {
 })
 export class UploadFileWidgetComponent implements OnInit {
 
-  constructor(private documentService: DocumentService, private toastService: ToastService) { }
+  constructor(
+    private documentService: DocumentService,
+    private consumerStatusService: ConsumerStatusService
+  ) { }
 
+  getStatus() {
+    return this.consumerStatusService.consumerStatus
+  }
+
+  isFinished(status: FileStatus) {
+    return status.phase == FileStatusPhase.FAILED || status.phase == FileStatusPhase.SUCCESS
+  }
+
+  getType(status: FileStatus) {
+    switch (status.phase) {
+      case FileStatusPhase.PROCESSING:
+      case FileStatusPhase.UPLOADING:
+          return "primary"
+      case FileStatusPhase.FAILED:
+        return "danger"
+      case FileStatusPhase.SUCCESS:
+        return "success"
+    }
+  }
+
+  dismiss(status: FileStatus) {
+    this.consumerStatusService.dismiss(status)
+  }
+  
   ngOnInit(): void {
   }
 
@@ -28,54 +50,37 @@ export class UploadFileWidgetComponent implements OnInit {
   public fileLeave(event){
   }
 
-  uploadStatus: UploadStatus[] = []
-  completedFiles = 0
-
-  uploadVisible = false
-
-  get loadedSum() {
-    return this.uploadStatus.map(s => s.loaded).reduce((a,b) => a+b, this.completedFiles > 0 ? 1 : 0)
-  }
-
-  get totalSum() {
-    return this.uploadStatus.map(s => s.total).reduce((a,b) => a+b, 1)
-  }
-
   public dropped(files: NgxFileDropEntry[]) {
     for (const droppedFile of files) {
       if (droppedFile.fileEntry.isFile) {
-      let uploadStatusObject: UploadStatus = {loaded: 0, total: 1}
-      this.uploadStatus.push(uploadStatusObject)
-      this.uploadVisible = true
 
       const fileEntry = droppedFile.fileEntry as FileSystemFileEntry;
         fileEntry.file((file: File) => {
           let formData = new FormData()
           formData.append('document', file, file.name)
+          let status = this.consumerStatusService.newFileUpload()
+          status.filename = file.name
 
           this.documentService.uploadDocument(formData).subscribe(event => {
             if (event.type == HttpEventType.UploadProgress) {
-              uploadStatusObject.loaded = event.loaded
-              uploadStatusObject.total = event.total
+              status.updateProgress(FileStatusPhase.UPLOADING, event.loaded, event.total)
             } else if (event.type == HttpEventType.Response) {
-              this.uploadStatus.splice(this.uploadStatus.indexOf(uploadStatusObject), 1)
-              this.completedFiles += 1
-              this.toastService.showInfo($localize`The document has been uploaded and will be processed by the consumer shortly.`)
+              status.taskId = event.body["task_id"]
             }
 
           }, error => {
-            this.uploadStatus.splice(this.uploadStatus.indexOf(uploadStatusObject), 1)
-            this.completedFiles += 1
+            status.updateProgress(FileStatusPhase.FAILED)
             switch (error.status) {
               case 400: {
-                this.toastService.showInfo($localize`There was an error while uploading the document: ${error.error.document}`)
+                status.message = error.error.document
                 break;
               }
               default: {
-                this.toastService.showInfo($localize`An error has occurred while uploading the document. Sorry!`)
+                status.message = $localize`An error has occurred while uploading the document. Sorry!`
                 break;
               }
             }
+
           })
         });
       }
diff --git a/src-ui/src/app/data/websocket-consumer-status-message.ts b/src-ui/src/app/data/websocket-consumer-status-message.ts
new file mode 100644
index 000000000..49117b101
--- /dev/null
+++ b/src-ui/src/app/data/websocket-consumer-status-message.ts
@@ -0,0 +1,11 @@
+export interface WebsocketConsumerStatusMessage {
+
+  filename?: string
+  task_id?: string
+  current_progress?: number
+  max_progress?: number
+  status?: string
+  message?: string
+  document_id: number
+
+}
\ No newline at end of file
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index 070420b0f..8aaae1e93 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -1,13 +1,57 @@
 import { Injectable } from '@angular/core';
 import { Subject } from 'rxjs';
+import { WebsocketConsumerStatusMessage } from '../data/websocket-consumer-status-message';
+
+export enum FileStatusPhase {
+  STARTED = 0,
+  UPLOADING = 1,
+  PROCESSING = 2,
+  SUCCESS = 3,
+  FAILED = 4
+}
+
+export class FileStatus {
+
+  filename: string
+
+  taskId: string
+
+  phase: FileStatusPhase = FileStatusPhase.STARTED  
+
+  currentPhaseProgress: number
+
+  currentPhaseMaxProgress: number
+
+  message: string
+
+  documentId: number
+
+  getProgress(): number {
+    switch (this.phase) {
+      case FileStatusPhase.STARTED:
+        return 0.0
+      case FileStatusPhase.UPLOADING:
+        return this.currentPhaseProgress / this.currentPhaseMaxProgress * 0.2
+      case FileStatusPhase.PROCESSING:
+        return this.currentPhaseProgress / this.currentPhaseMaxProgress * 0.8 + 0.2
+      case FileStatusPhase.SUCCESS:
+      case FileStatusPhase.FAILED:
+        return 1.0
+    }
+  }
+
+  updateProgress(status: FileStatusPhase, currentProgress?: number, maxProgress?: number) {
+    if (status >= this.phase) {
+      this.phase = status
+      if (currentProgress) {
+        this.currentPhaseProgress = currentProgress
+      }
+      if (maxProgress) {
+        this.currentPhaseMaxProgress = maxProgress
+      }
+    }
+  }
 
-export interface FileStatus {
-  filename?: string
-  current_progress?: number
-  max_progress?: number
-  status?: string
-  message?: string
-  document_id?: number
 }
 
 @Injectable({
@@ -23,24 +67,41 @@ export class ConsumerStatusService {
   private documentConsumptionFinishedSubject = new Subject<FileStatus>()
   private documentConsumptionFailedSubject = new Subject<FileStatus>()
 
+  private get(taskId: string, filename?: string) {
+    let status = this.consumerStatus.find(e => e.taskId == taskId) || this.consumerStatus.find(e => e.filename == filename)
+    if (!status) {
+      status = new FileStatus()
+      this.consumerStatus.push(status)
+    }
+    status.taskId = taskId
+    status.filename = filename
+    return status
+  }
+
+  newFileUpload(): FileStatus {
+    let status = new FileStatus()
+    this.consumerStatus.push(status)
+    return status
+  }
+
   connect() {
     this.disconnect()
     this.statusWebSocked = new WebSocket("ws://localhost:8000/ws/status/");
     this.statusWebSocked.onmessage = (ev) => {
-      let statusUpdate: FileStatus = JSON.parse(ev['data'])
+      let statusMessage: WebsocketConsumerStatusMessage = JSON.parse(ev['data'])
 
-      let index = this.consumerStatus.findIndex(fs => fs.filename == statusUpdate.filename)
-      if (index > -1) {
-        this.consumerStatus[index] = statusUpdate
-      } else {
-        this.consumerStatus.push(statusUpdate)
-      }
+      let status = this.get(statusMessage.task_id, statusMessage.filename)
+      status.updateProgress(FileStatusPhase.PROCESSING, statusMessage.current_progress, statusMessage.max_progress)
+      status.message = statusMessage.message
+      status.documentId = statusMessage.document_id
 
-      if (statusUpdate.status == "SUCCESS") {
-        this.documentConsumptionFinishedSubject.next(statusUpdate)
+      if (statusMessage.status == "SUCCESS") {
+        status.phase = FileStatusPhase.SUCCESS
+        this.documentConsumptionFinishedSubject.next(status)
       }
-      if (statusUpdate.status == "FAILED") {
-        this.documentConsumptionFailedSubject.next(statusUpdate)
+      if (statusMessage.status == "FAILED") {
+        status.phase = FileStatusPhase.FAILED
+        this.documentConsumptionFailedSubject.next(status)
       }
     }
   }

From b581e4221645bcf1952bfed438623fce9b2f6e79 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 01:10:39 +0100
Subject: [PATCH 0971/1300] functions for combined upload progress bars

---
 .../upload-file-widget.component.html         |  1 +
 .../upload-file-widget.component.ts           | 25 ++++++++++++++++---
 .../app/services/consumer-status.service.ts   | 15 +++++++++--
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index 59afb74f9..263918a73 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -9,6 +9,7 @@
 
       </ngx-file-drop>
     </form>
+    <p>Uploading {{getStatusUploading().length}} files...</p>
     <div *ngFor="let status of getStatus()">
       <p>{{status.filename}}: {{status.message}}</p>
       <ngb-progressbar [value]="status.getProgress()" [max]="1" [striped]="true" [animated]="!isFinished(status)" [type]="getType(status)">
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index ac270fe30..bd0e4e290 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -18,7 +18,23 @@ export class UploadFileWidgetComponent implements OnInit {
   ) { }
 
   getStatus() {
-    return this.consumerStatusService.consumerStatus
+    return this.consumerStatusService.getConsumerStatus()
+  }
+
+  getStatusUploading() {
+    return this.consumerStatusService.getConsumerStatus(FileStatusPhase.UPLOADING)
+  }
+
+  getTotalUploadProgress() {
+    let current = 0
+    let max = 0
+
+    this.getStatusUploading().forEach(status => {
+      current += status.currentPhaseProgress
+      max += status.currentPhaseMaxProgress
+    })
+
+    return current / Math.max(max, 1)
   }
 
   isFinished(status: FileStatus) {
@@ -58,14 +74,17 @@ export class UploadFileWidgetComponent implements OnInit {
         fileEntry.file((file: File) => {
           let formData = new FormData()
           formData.append('document', file, file.name)
-          let status = this.consumerStatusService.newFileUpload()
-          status.filename = file.name
+          let status = this.consumerStatusService.newFileUpload(file.name)
+          
+          status.message = "Connecting..."
 
           this.documentService.uploadDocument(formData).subscribe(event => {
             if (event.type == HttpEventType.UploadProgress) {
               status.updateProgress(FileStatusPhase.UPLOADING, event.loaded, event.total)
+              status.message = "Uploading..."
             } else if (event.type == HttpEventType.Response) {
               status.taskId = event.body["task_id"]
+              status.message = "Upload complete."
             }
 
           }, error => {
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index 8aaae1e93..69e58e2dd 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -63,7 +63,9 @@ export class ConsumerStatusService {
 
   private statusWebSocked: WebSocket
 
-  consumerStatus: FileStatus[] = []
+  private consumerStatus: FileStatus[] = []
+
+
   private documentConsumptionFinishedSubject = new Subject<FileStatus>()
   private documentConsumptionFailedSubject = new Subject<FileStatus>()
 
@@ -78,12 +80,21 @@ export class ConsumerStatusService {
     return status
   }
 
-  newFileUpload(): FileStatus {
+  newFileUpload(filename: string): FileStatus {
     let status = new FileStatus()
+    status.filename = filename
     this.consumerStatus.push(status)
     return status
   }
 
+  getConsumerStatus(phase?: FileStatusPhase) {
+    if (phase) {
+      return this.consumerStatus.filter(s => s.phase == phase)
+    } else {
+      return this.consumerStatus
+    }
+  }
+
   connect() {
     this.disconnect()
     this.statusWebSocked = new WebSocket("ws://localhost:8000/ws/status/");

From 7dedb99daed97632de0bebb7fc0f6aa65dd6a9dc Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 01:15:27 +0100
Subject: [PATCH 0972/1300] fix status reports for consumption directory status
 messages

---
 src/documents/consumer.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index f4a40cbb9..aef8c6345 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -1,6 +1,7 @@
 import datetime
 import hashlib
 import os
+import uuid
 from subprocess import Popen
 
 import magic
@@ -150,7 +151,7 @@ class Consumer(LoggingMixin):
         self.override_correspondent_id = override_correspondent_id
         self.override_document_type_id = override_document_type_id
         self.override_tag_ids = override_tag_ids
-        self.task_id = task_id
+        self.task_id = task_id or str(uuid.uuid4())
 
         self._send_progress(self.filename, 0, 100, 'WORKING',
                             'Received new file.')

From 5651a03b1417f6b5f040e2563ec54456d5dffb3f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 26 Jan 2021 00:17:27 -0800
Subject: [PATCH 0973/1300] Drop over background color

---
 .../upload-file-widget/upload-file-widget.component.scss     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
index e69de29bb..461f9d5b3 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
@@ -0,0 +1,5 @@
+@import "/src/theme";
+
+::ng-deep .ngx-file-drop__drop-zone--over {
+  background-color: $primaryFaded !important;
+}

From 53309f017f7e38940bcafce445ee77b30f9f9173 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 26 Jan 2021 02:32:45 -0800
Subject: [PATCH 0974/1300] Lovely file upload alerts

---
 .../upload-file-widget.component.html         | 26 +++++++++--------
 .../upload-file-widget.component.scss         | 28 +++++++++++++++++++
 .../upload-file-widget.component.ts           |  6 ++--
 .../app/services/consumer-status.service.ts   |  5 ++--
 4 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index 263918a73..b4c4fc01b 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -6,20 +6,22 @@
         (onFileOver)="fileOver($event)" (onFileLeave)="fileLeave($event)" dropZoneClassName="bg-light card"
         multiple="true" contentClassName="justify-content-center d-flex align-items-center p-5" [showBrowseBtn]=true
         browseBtnClassName="btn btn-sm btn-outline-primary ml-2" i18n-dropZoneLabel i18n-browseBtnLabel>
-
       </ngx-file-drop>
     </form>
-    <p>Uploading {{getStatusUploading().length}} files...</p>
     <div *ngFor="let status of getStatus()">
-      <p>{{status.filename}}: {{status.message}}</p>
-      <ngb-progressbar [value]="status.getProgress()" [max]="1" [striped]="true" [animated]="!isFinished(status)" [type]="getType(status)">
-      </ngb-progressbar>
-
-      <div *ngIf="isFinished(status)" class="mb-2">
-        <button *ngIf="status.documentId" class="btn btn-sm btn-outline-primary mr-2" routerLink="/documents/{{status.documentId}}" (click)="dismiss(status)">Open document</button>
-        <button class="btn btn-sm btn-outline-secondary" (click)="dismiss(status)">Dismiss</button>
-      </div>
-    
+      <ngb-alert type="secondary" class="mt-2 mb-0" [dismissible]="isFinished(status)" (closed)="dismiss(status)">
+        <h6 class="alert-heading">{{status.filename}}</h6>
+        <p class="mb-0" *ngIf="!isFinished(status) || (isFinished(status) && !status.documentId)">{{status.message}}</p>
+        <ngb-progressbar [value]="status.getProgress()" [max]="1" [type]="getStatusColor(status)"></ngb-progressbar>
+        <div *ngIf="isFinished(status)">
+          <button *ngIf="status.documentId" class="btn btn-sm btn-outline-primary mr-2" routerLink="/documents/{{status.documentId}}" (click)="dismiss(status)">
+            <small>Open document</small>
+            <svg xmlns="http://www.w3.org/2000/svg" width="1rem" height="1rem" fill="currentColor" class="bi bi-arrow-right-short" viewBox="0 0 16 16">
+              <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"/>
+            </svg>
+          </button>
+        </div>
+      </ngb-alert>
     </div>
   </div>
-</app-widget-frame>
\ No newline at end of file
+</app-widget-frame>
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
index 461f9d5b3..807eac66b 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
@@ -3,3 +3,31 @@
 ::ng-deep .ngx-file-drop__drop-zone--over {
   background-color: $primaryFaded !important;
 }
+
+form {
+  position: relative;
+}
+
+.alert {
+  transition: all 0.2s ease;
+}
+
+.alert-heading {
+  font-size: 80%;
+  font-weight: bold;
+}
+
+.btn-sm {
+  line-height: 1;
+}
+
+::ng-deep .progress {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  height: auto;
+  mix-blend-mode: soft-light;
+  pointer-events: none;
+}
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index bd0e4e290..e9a62cf9c 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -41,7 +41,7 @@ export class UploadFileWidgetComponent implements OnInit {
     return status.phase == FileStatusPhase.FAILED || status.phase == FileStatusPhase.SUCCESS
   }
 
-  getType(status: FileStatus) {
+  getStatusColor(status: FileStatus) {
     switch (status.phase) {
       case FileStatusPhase.PROCESSING:
       case FileStatusPhase.UPLOADING:
@@ -56,7 +56,7 @@ export class UploadFileWidgetComponent implements OnInit {
   dismiss(status: FileStatus) {
     this.consumerStatusService.dismiss(status)
   }
-  
+
   ngOnInit(): void {
   }
 
@@ -75,7 +75,7 @@ export class UploadFileWidgetComponent implements OnInit {
           let formData = new FormData()
           formData.append('document', file, file.name)
           let status = this.consumerStatusService.newFileUpload(file.name)
-          
+
           status.message = "Connecting..."
 
           this.documentService.uploadDocument(formData).subscribe(event => {
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index 69e58e2dd..d5ac1ba47 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -16,7 +16,7 @@ export class FileStatus {
 
   taskId: string
 
-  phase: FileStatusPhase = FileStatusPhase.STARTED  
+  phase: FileStatusPhase = FileStatusPhase.STARTED
 
   currentPhaseProgress: number
 
@@ -33,7 +33,8 @@ export class FileStatus {
       case FileStatusPhase.UPLOADING:
         return this.currentPhaseProgress / this.currentPhaseMaxProgress * 0.2
       case FileStatusPhase.PROCESSING:
-        return this.currentPhaseProgress / this.currentPhaseMaxProgress * 0.8 + 0.2
+        if (this.currentPhaseProgress > 100) this.currentPhaseProgress = 0
+        return (this.currentPhaseProgress / this.currentPhaseMaxProgress * 0.8) + 0.2
       case FileStatusPhase.SUCCESS:
       case FileStatusPhase.FAILED:
         return 1.0

From 532a3d955ccb69acce81268091d68009abefbbbc Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 26 Jan 2021 02:52:16 -0800
Subject: [PATCH 0975/1300] Dismiss all

---
 .../upload-file-widget.component.html                | 12 ++++++++++--
 .../upload-file-widget.component.scss                |  9 +++++++++
 .../upload-file-widget.component.ts                  |  4 ++++
 src-ui/src/app/services/consumer-status.service.ts   |  4 ++++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index b4c4fc01b..d00114934 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -1,5 +1,13 @@
-<app-widget-frame title="Upload new documents" i18n-title>
-
+<app-widget-frame title="Upload new documents" i18n-title [class.has-multiple-status]="getStatus().length > 1">
+  <div header-buttons>
+    <button type="button" class="btn btn-link dismiss-all" [disabled]="!getStatus().length" (click)="dismissAll()">
+      <small class="mr-1">Hide all</small>
+      <svg xmlns="http://www.w3.org/2000/svg" width="1rem" height="1rem" fill="currentColor" class="bi bi-check2-all" viewBox="0 0 16 16">
+        <path d="M12.354 4.354a.5.5 0 0 0-.708-.708L5 10.293 1.854 7.146a.5.5 0 1 0-.708.708l3.5 3.5a.5.5 0 0 0 .708 0l7-7zm-4.208 7l-.896-.897.707-.707.543.543 6.646-6.647a.5.5 0 0 1 .708.708l-7 7a.5.5 0 0 1-.708 0z"/>
+        <path d="M5.354 7.146l.896.897-.707.707-.897-.896a.5.5 0 1 1 .708-.708z"/>
+      </svg>
+    </button>
+  </div>
   <div content>
     <form>
       <ngx-file-drop dropZoneLabel="Drop documents here or" browseBtnLabel="Browse files" (onFileDrop)="dropped($event)"
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
index 807eac66b..10a83e308 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
@@ -21,6 +21,15 @@ form {
   line-height: 1;
 }
 
+.dismiss-all {
+  transition: opacity 0.2s ease;
+  opacity: 0;
+}
+
+.has-multiple-status .dismiss-all {
+  opacity: 1;
+}
+
 ::ng-deep .progress {
   position: absolute;
   top: 0;
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index e9a62cf9c..19ab8d04b 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -57,6 +57,10 @@ export class UploadFileWidgetComponent implements OnInit {
     this.consumerStatusService.dismiss(status)
   }
 
+  dismissAll() {
+    this.consumerStatusService.dismissAll()
+  }
+
   ngOnInit(): void {
   }
 
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index d5ac1ba47..b2804103d 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -133,6 +133,10 @@ export class ConsumerStatusService {
     }
   }
 
+  dismissAll() {
+    this.consumerStatus = []
+  }
+
   onDocumentConsumptionFinished() {
     return this.documentConsumptionFinishedSubject
   }

From 4eeb5642f5aefe81c6a5bdc1b9475291eb78120f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 15:02:46 +0100
Subject: [PATCH 0976/1300] i18n, better error handling

---
 src/documents/consumer.py              |  94 ++++++-----
 src/documents/serialisers.py           |   6 +-
 src/locale/en-us/LC_MESSAGES/django.po | 222 +++++++++++++++----------
 3 files changed, 194 insertions(+), 128 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index aef8c6345..2fbbe7a0a 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -25,6 +25,8 @@ from .signals import (
     document_consumption_started
 )
 
+from django.utils.translation import gettext as _
+
 
 class ConsumerError(Exception):
     pass
@@ -32,10 +34,10 @@ class ConsumerError(Exception):
 
 class Consumer(LoggingMixin):
 
-    def _send_progress(self, filename, current_progress, max_progress, status,
+    def _send_progress(self, current_progress, max_progress, status,
                        message, document_id=None):
         payload = {
-            'filename': os.path.basename(filename),
+            'filename': os.path.basename(self.filename),
             'task_id': self.task_id,
             'current_progress': current_progress,
             'max_progress': max_progress,
@@ -47,10 +49,10 @@ class Consumer(LoggingMixin):
                                                      {'type': 'status_update',
                                                       'data': payload})
 
-    def _fail(self, message):
-        self._send_progress(self.filename, 100, 100, 'FAILED',
-                            message)
-        raise ConsumerError(f"{self.filename}: {message}")
+    def _fail(self, message, log_message=None):
+        self._send_progress(100, 100, 'FAILED', message)
+        self.log("error", log_message or message)
+        raise ConsumerError(f"{self.filename}: {log_message or message}")
 
     def __init__(self):
         super().__init__()
@@ -66,11 +68,10 @@ class Consumer(LoggingMixin):
 
     def pre_check_file_exists(self):
         if not os.path.isfile(self.path):
-            self.log(
-                "error",
-                "Cannot consume {}: It is not a file.".format(self.path)
+            self._fail(
+                _("File not found"),
+                f"Cannot consume {self.path}: It is not a file."
             )
-            self._fail("File not found")
 
     def pre_check_duplicate(self):
         with open(self.path, "rb") as f:
@@ -78,11 +79,10 @@ class Consumer(LoggingMixin):
         if Document.objects.filter(Q(checksum=checksum) | Q(archive_checksum=checksum)).exists():  # NOQA: E501
             if settings.CONSUMER_DELETE_DUPLICATES:
                 os.unlink(self.path)
-            self.log(
-                "error",
-                "Not consuming {}: It is a duplicate.".format(self.filename)
+            self._fail(
+                _("Document is a duplicate"),
+                f"Not consuming {self.filename}: It is a duplicate."
             )
-            self._fail("Document is a duplicate")
 
     def pre_check_directories(self):
         os.makedirs(settings.SCRATCH_DIR, exist_ok=True)
@@ -95,14 +95,16 @@ class Consumer(LoggingMixin):
             return
 
         if not os.path.isfile(settings.PRE_CONSUME_SCRIPT):
-            raise ConsumerError(
+            self._fail(
+                _("Pre-consume script does not exist."),
                 f"Configured pre-consume script "
                 f"{settings.PRE_CONSUME_SCRIPT} does not exist.")
 
         try:
             Popen((settings.PRE_CONSUME_SCRIPT, self.path)).wait()
         except Exception as e:
-            raise ConsumerError(
+            self._fail(
+                _("Error while executing pre-consume script"),
                 f"Error while executing pre-consume script: {e}"
             )
 
@@ -111,9 +113,11 @@ class Consumer(LoggingMixin):
             return
 
         if not os.path.isfile(settings.POST_CONSUME_SCRIPT):
-            raise ConsumerError(
+            self._fail(
+                _("Post-consume script does not exist."),
                 f"Configured post-consume script "
-                f"{settings.POST_CONSUME_SCRIPT} does not exist.")
+                f"{settings.POST_CONSUME_SCRIPT} does not exist."
+            )
 
         try:
             Popen((
@@ -129,8 +133,9 @@ class Consumer(LoggingMixin):
                     "name", flat=True)))
             )).wait()
         except Exception as e:
-            raise ConsumerError(
-                f"Error while executing pre-consume script: {e}"
+            self._fail(
+                _("Error while executing post-consume script"),
+                f"Error while executing post-consume script: {e}"
             )
 
     def try_consume_file(self,
@@ -153,8 +158,7 @@ class Consumer(LoggingMixin):
         self.override_tag_ids = override_tag_ids
         self.task_id = task_id or str(uuid.uuid4())
 
-        self._send_progress(self.filename, 0, 100, 'WORKING',
-                            'Received new file.')
+        self._send_progress(0, 100, 'WORKING', _('Received new file'))
 
         # this is for grouping logging entries for this particular file
         # together.
@@ -177,10 +181,13 @@ class Consumer(LoggingMixin):
 
         parser_class = get_parser_class_for_mime_type(mime_type)
         if not parser_class:
-            self._fail(f"Unsupported mime type {mime_type}")
+            self._fail(
+                _("File type %(type)s not supported") %
+                {'type': mime_type},
+                f"Unsupported mime type {mime_type}"
+            )
         else:
-            self.log("debug",
-                     f"Parser: {parser_class.__name__}")
+            self.log("debug", f"Parser: {parser_class.__name__}")
 
         # Notify all listeners that we're going to do some work.
 
@@ -195,7 +202,7 @@ class Consumer(LoggingMixin):
         def progress_callback(current_progress, max_progress, message):
             # recalculate progress to be within 20 and 80
             p = int((current_progress / max_progress) * 50 + 20)
-            self._send_progress(self.filename, p, 100, "WORKING", message)
+            self._send_progress(p, 100, "WORKING", message)
 
         # This doesn't parse the document yet, but gives us a parser.
 
@@ -206,32 +213,36 @@ class Consumer(LoggingMixin):
 
         # Parse the document. This may take some time.
 
+        text = None
+        date = None
+        thumbnail = None
+        archive_path = None
+
         try:
-            self._send_progress(self.filename, 20, 100, 'WORKING',
-                                'Parsing document...')
+            self._send_progress(20, 100, 'WORKING', _('Parsing document...'))
             self.log("debug", "Parsing {}...".format(self.filename))
             document_parser.parse(self.path, mime_type, self.filename)
 
             self.log("debug", f"Generating thumbnail for {self.filename}...")
-            self._send_progress(self.filename, 70, 100, 'WORKING',
-                                'Generating thumbnail...')
+            self._send_progress(70, 100, 'WORKING',
+                                _('Generating thumbnail...'))
             thumbnail = document_parser.get_optimised_thumbnail(
                 self.path, mime_type)
 
             text = document_parser.get_text()
             date = document_parser.get_date()
             if not date:
-                self._send_progress(self.filename, 90, 100, 'WORKING',
-                                    'Getting date from document...')
+                self._send_progress(90, 100, 'WORKING',
+                                    _('Getting date from document...'))
                 date = parse_date(self.filename, text)
             archive_path = document_parser.get_archive_path()
 
         except ParseError as e:
             document_parser.cleanup()
-            self.log(
-                "error",
-                f"Error while consuming document {self.filename}: {e}")
-            self._fail(str(e))
+            self._fail(
+                str(e),
+                f"Error while consuming document {self.filename}: {e}"
+            )
 
         # Prepare the document classifier.
 
@@ -247,8 +258,7 @@ class Consumer(LoggingMixin):
                 "warning",
                 f"Cannot classify documents: {e}.")
             classifier = None
-        self._send_progress(self.filename, 95, 100, 'WORKING',
-                            'Storing the document...')
+        self._send_progress(95, 100, 'WORKING', _('Saving document...'))
         # now that everything is done, we can start to store the document
         # in the system. This will be a transaction and reasonably fast.
         try:
@@ -302,12 +312,11 @@ class Consumer(LoggingMixin):
                 os.unlink(self.path)
 
         except Exception as e:
-            self.log(
-                "error",
+            self._fail(
+                str(e),
                 f"The following error occured while consuming "
                 f"{self.filename}: {e}"
             )
-            self._fail(str(e))
         finally:
             document_parser.cleanup()
 
@@ -318,8 +327,7 @@ class Consumer(LoggingMixin):
             "Document {} consumption finished".format(document)
         )
 
-        self._send_progress(self.filename, 100, 100, 'SUCCESS',
-                            'Finished.', document.id)
+        self._send_progress(100, 100, 'SUCCESS', _('Finished.'), document.id)
 
         return document
 
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 70a44d3fd..aa4ef4bf8 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -8,6 +8,8 @@ from .models import Correspondent, Tag, Document, Log, DocumentType, \
     SavedView, SavedViewFilterRule
 from .parsers import is_mime_type_supported
 
+from django.utils.translation import gettext as _
+
 
 # https://www.django-rest-framework.org/api-guide/serializers/#example
 class DynamicFieldsModelSerializer(serializers.ModelSerializer):
@@ -378,7 +380,9 @@ class PostDocumentSerializer(serializers.Serializer):
 
         if not is_mime_type_supported(mime_type):
             raise serializers.ValidationError(
-                "This file type is not supported.")
+                _("File type %(type)s not supported") %
+                {'type': mime_type}
+            )
 
         return document.name, document_data
 
diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en-us/LC_MESSAGES/django.po
index 414caba52..5451b8dde 100644
--- a/src/locale/en-us/LC_MESSAGES/django.po
+++ b/src/locale/en-us/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-10 21:41+0000\n"
+"POT-Creation-Date: 2021-01-26 14:59+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,320 +21,374 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#: documents/models.py:32
-msgid "Any word"
+#: documents/consumer.py:72
+msgid "File not found"
+msgstr "Datei nicht gefunden"
+
+#: documents/consumer.py:83
+msgid "Document is a duplicate"
+msgstr "Dokument existiert bereits"
+
+#: documents/consumer.py:99
+msgid "Pre-consume script does not exist."
+msgstr ""
+
+#: documents/consumer.py:107
+msgid "Error while executing pre-consume script"
+msgstr ""
+
+#: documents/consumer.py:117
+msgid "Post-consume script does not exist."
+msgstr ""
+
+#: documents/consumer.py:137
+msgid "Error while executing post-consume script"
+msgstr ""
+
+#: documents/consumer.py:161
+msgid "Received new file"
+msgstr ""
+
+#: documents/consumer.py:185 documents/serialisers.py:383
+#, fuzzy, python-format
+#| msgid "File type {type} not supported."
+msgid "File type %(type)s not supported"
+msgstr "Dateityp {type} wird nicht unterstützt"
+
+#: documents/consumer.py:222
+msgid "Parsing document..."
+msgstr ""
+
+#: documents/consumer.py:228
+msgid "Generating thumbnail..."
+msgstr ""
+
+#: documents/consumer.py:236
+msgid "Getting date from document..."
+msgstr ""
+
+#: documents/consumer.py:261
+msgid "Saving document..."
+msgstr ""
+
+#: documents/consumer.py:330
+msgid "Finished."
 msgstr ""
 
 #: documents/models.py:33
-msgid "All words"
+msgid "Any word"
 msgstr ""
 
 #: documents/models.py:34
-msgid "Exact match"
+msgid "All words"
 msgstr ""
 
 #: documents/models.py:35
-msgid "Regular expression"
+msgid "Exact match"
 msgstr ""
 
 #: documents/models.py:36
-msgid "Fuzzy word"
+msgid "Regular expression"
 msgstr ""
 
 #: documents/models.py:37
+msgid "Fuzzy word"
+msgstr ""
+
+#: documents/models.py:38
 msgid "Automatic"
 msgstr ""
 
-#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
+#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
 #: paperless_mail/models.py:109
 msgid "name"
 msgstr ""
 
-#: documents/models.py:45
+#: documents/models.py:46
 msgid "match"
 msgstr ""
 
-#: documents/models.py:49
+#: documents/models.py:50
 msgid "matching algorithm"
 msgstr ""
 
-#: documents/models.py:55
+#: documents/models.py:56
 msgid "is insensitive"
 msgstr ""
 
-#: documents/models.py:80 documents/models.py:140
+#: documents/models.py:75 documents/models.py:135
 msgid "correspondent"
 msgstr ""
 
-#: documents/models.py:81
+#: documents/models.py:76
 msgid "correspondents"
 msgstr ""
 
-#: documents/models.py:103
+#: documents/models.py:98
 msgid "color"
 msgstr ""
 
-#: documents/models.py:107
+#: documents/models.py:102
 msgid "is inbox tag"
 msgstr ""
 
-#: documents/models.py:109
+#: documents/models.py:104
 msgid ""
 "Marks this tag as an inbox tag: All newly consumed documents will be tagged "
 "with inbox tags."
 msgstr ""
 
-#: documents/models.py:114
+#: documents/models.py:109
 msgid "tag"
 msgstr ""
 
-#: documents/models.py:115 documents/models.py:171
+#: documents/models.py:110 documents/models.py:166
 msgid "tags"
 msgstr ""
 
-#: documents/models.py:121 documents/models.py:153
+#: documents/models.py:116 documents/models.py:148
 msgid "document type"
 msgstr ""
 
-#: documents/models.py:122
+#: documents/models.py:117
 msgid "document types"
 msgstr ""
 
-#: documents/models.py:130
+#: documents/models.py:125
 msgid "Unencrypted"
 msgstr ""
 
-#: documents/models.py:131
+#: documents/models.py:126
 msgid "Encrypted with GNU Privacy Guard"
 msgstr ""
 
-#: documents/models.py:144
+#: documents/models.py:139
 msgid "title"
 msgstr ""
 
-#: documents/models.py:157
+#: documents/models.py:152
 msgid "content"
 msgstr ""
 
-#: documents/models.py:159
+#: documents/models.py:154
 msgid ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
 msgstr ""
 
-#: documents/models.py:164
+#: documents/models.py:159
 msgid "mime type"
 msgstr ""
 
-#: documents/models.py:175
+#: documents/models.py:170
 msgid "checksum"
 msgstr ""
 
-#: documents/models.py:179
+#: documents/models.py:174
 msgid "The checksum of the original document."
 msgstr ""
 
-#: documents/models.py:183
+#: documents/models.py:178
 msgid "archive checksum"
 msgstr ""
 
-#: documents/models.py:188
+#: documents/models.py:183
 msgid "The checksum of the archived document."
 msgstr ""
 
-#: documents/models.py:192 documents/models.py:332
+#: documents/models.py:187 documents/models.py:330
 msgid "created"
 msgstr ""
 
-#: documents/models.py:196
+#: documents/models.py:191
 msgid "modified"
 msgstr ""
 
-#: documents/models.py:200
+#: documents/models.py:195
 msgid "storage type"
 msgstr ""
 
-#: documents/models.py:208
+#: documents/models.py:203
 msgid "added"
 msgstr ""
 
-#: documents/models.py:212
+#: documents/models.py:207
 msgid "filename"
 msgstr ""
 
-#: documents/models.py:217
+#: documents/models.py:212
 msgid "Current filename in storage"
 msgstr ""
 
-#: documents/models.py:221
+#: documents/models.py:216
 msgid "archive serial number"
 msgstr ""
 
-#: documents/models.py:226
+#: documents/models.py:221
 msgid "The position of this document in your physical document archive."
 msgstr ""
 
-#: documents/models.py:232
+#: documents/models.py:227
 msgid "document"
 msgstr ""
 
-#: documents/models.py:233
+#: documents/models.py:228
 msgid "documents"
 msgstr ""
 
-#: documents/models.py:315
+#: documents/models.py:313
 msgid "debug"
 msgstr ""
 
-#: documents/models.py:316
+#: documents/models.py:314
 msgid "information"
 msgstr ""
 
-#: documents/models.py:317
+#: documents/models.py:315
 msgid "warning"
 msgstr ""
 
-#: documents/models.py:318
+#: documents/models.py:316
 msgid "error"
 msgstr ""
 
-#: documents/models.py:319
+#: documents/models.py:317
 msgid "critical"
 msgstr ""
 
-#: documents/models.py:323
+#: documents/models.py:321
 msgid "group"
 msgstr ""
 
-#: documents/models.py:326
+#: documents/models.py:324
 msgid "message"
 msgstr ""
 
-#: documents/models.py:329
+#: documents/models.py:327
 msgid "level"
 msgstr ""
 
-#: documents/models.py:336
+#: documents/models.py:334
 msgid "log"
 msgstr ""
 
-#: documents/models.py:337
+#: documents/models.py:335
 msgid "logs"
 msgstr ""
 
-#: documents/models.py:348 documents/models.py:398
+#: documents/models.py:346 documents/models.py:396
 msgid "saved view"
 msgstr ""
 
-#: documents/models.py:349
+#: documents/models.py:347
 msgid "saved views"
 msgstr ""
 
-#: documents/models.py:352
+#: documents/models.py:350
 msgid "user"
 msgstr ""
 
-#: documents/models.py:358
+#: documents/models.py:356
 msgid "show on dashboard"
 msgstr ""
 
-#: documents/models.py:361
+#: documents/models.py:359
 msgid "show in sidebar"
 msgstr ""
 
-#: documents/models.py:365
+#: documents/models.py:363
 msgid "sort field"
 msgstr ""
 
-#: documents/models.py:368
+#: documents/models.py:366
 msgid "sort reverse"
 msgstr ""
 
-#: documents/models.py:374
+#: documents/models.py:372
 msgid "title contains"
 msgstr ""
 
-#: documents/models.py:375
+#: documents/models.py:373
 msgid "content contains"
 msgstr ""
 
-#: documents/models.py:376
+#: documents/models.py:374
 msgid "ASN is"
 msgstr ""
 
-#: documents/models.py:377
+#: documents/models.py:375
 msgid "correspondent is"
 msgstr ""
 
-#: documents/models.py:378
+#: documents/models.py:376
 msgid "document type is"
 msgstr ""
 
-#: documents/models.py:379
+#: documents/models.py:377
 msgid "is in inbox"
 msgstr ""
 
-#: documents/models.py:380
+#: documents/models.py:378
 msgid "has tag"
 msgstr ""
 
-#: documents/models.py:381
+#: documents/models.py:379
 msgid "has any tag"
 msgstr ""
 
-#: documents/models.py:382
+#: documents/models.py:380
 msgid "created before"
 msgstr ""
 
-#: documents/models.py:383
+#: documents/models.py:381
 msgid "created after"
 msgstr ""
 
-#: documents/models.py:384
+#: documents/models.py:382
 msgid "created year is"
 msgstr ""
 
-#: documents/models.py:385
+#: documents/models.py:383
 msgid "created month is"
 msgstr ""
 
-#: documents/models.py:386
+#: documents/models.py:384
 msgid "created day is"
 msgstr ""
 
-#: documents/models.py:387
+#: documents/models.py:385
 msgid "added before"
 msgstr ""
 
-#: documents/models.py:388
+#: documents/models.py:386
 msgid "added after"
 msgstr ""
 
-#: documents/models.py:389
+#: documents/models.py:387
 msgid "modified before"
 msgstr ""
 
-#: documents/models.py:390
+#: documents/models.py:388
 msgid "modified after"
 msgstr ""
 
-#: documents/models.py:391
+#: documents/models.py:389
 msgid "does not have tag"
 msgstr ""
 
-#: documents/models.py:402
+#: documents/models.py:400
 msgid "rule type"
 msgstr ""
 
-#: documents/models.py:406
+#: documents/models.py:404
 msgid "value"
 msgstr ""
 
-#: documents/models.py:412
+#: documents/models.py:410
 msgid "filter rule"
 msgstr ""
 
-#: documents/models.py:413
+#: documents/models.py:411
 msgid "filter rules"
 msgstr ""
 
@@ -378,23 +432,23 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
-#: paperless/settings.py:268
+#: paperless/settings.py:286
 msgid "English"
 msgstr ""
 
-#: paperless/settings.py:269
+#: paperless/settings.py:287
 msgid "German"
 msgstr ""
 
-#: paperless/settings.py:270
+#: paperless/settings.py:288
 msgid "Dutch"
 msgstr ""
 
-#: paperless/settings.py:271
+#: paperless/settings.py:289
 msgid "French"
 msgstr ""
 
-#: paperless/urls.py:108
+#: paperless/urls.py:114
 msgid "Paperless-ng administration"
 msgstr ""
 

From 868fd4155a4f7b194357bf88f0a622ce169b84fa Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 15:19:56 +0100
Subject: [PATCH 0977/1300] bug fixes, test case fixes

---
 src/documents/consumer.py            |  6 +++---
 src/documents/parsers.py             |  2 +-
 src/documents/tests/test_consumer.py | 20 +++++++++++---------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 2fbbe7a0a..d0f7399c8 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -37,7 +37,7 @@ class Consumer(LoggingMixin):
     def _send_progress(self, current_progress, max_progress, status,
                        message, document_id=None):
         payload = {
-            'filename': os.path.basename(self.filename),
+            'filename': os.path.basename(self.filename) if self.filename else None,  # NOQA: E501
             'task_id': self.task_id,
             'current_progress': current_progress,
             'max_progress': max_progress,
@@ -70,7 +70,7 @@ class Consumer(LoggingMixin):
         if not os.path.isfile(self.path):
             self._fail(
                 _("File not found"),
-                f"Cannot consume {self.path}: It is not a file."
+                f"Cannot consume {self.path}: File not found."
             )
 
     def pre_check_duplicate(self):
@@ -80,7 +80,7 @@ class Consumer(LoggingMixin):
             if settings.CONSUMER_DELETE_DUPLICATES:
                 os.unlink(self.path)
             self._fail(
-                _("Document is a duplicate"),
+                _("Document already exists"),
                 f"Not consuming {self.filename}: It is a duplicate."
             )
 
diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index f8fd117d9..ddad6897a 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -261,7 +261,7 @@ class DocumentParser(LoggingMixin):
     `paperless_tesseract.parsers` for inspiration.
     """
 
-    def __init__(self, logging_group, progress_callback):
+    def __init__(self, logging_group, progress_callback=None):
         super().__init__()
         self.logging_group = logging_group
         os.makedirs(settings.SCRATCH_DIR, exist_ok=True)
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index a6861a541..799250d08 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -170,7 +170,7 @@ class DummyParser(DocumentParser):
         raise NotImplementedError()
 
     def __init__(self, logging_group, scratch_dir, archive_path):
-        super(DummyParser, self).__init__(logging_group)
+        super(DummyParser, self).__init__(logging_group, None)
         _, self.fake_thumb = tempfile.mkstemp(suffix=".png", dir=scratch_dir)
         self.archive_path = archive_path
 
@@ -212,10 +212,10 @@ def fake_magic_from_file(file, mime=False):
 @mock.patch("documents.consumer.magic.from_file", fake_magic_from_file)
 class TestConsumer(DirectoriesMixin, TestCase):
 
-    def make_dummy_parser(self, logging_group):
+    def make_dummy_parser(self, logging_group, progress_callback=None):
         return DummyParser(logging_group, self.dirs.scratch_dir, self.get_test_archive_file())
 
-    def make_faulty_parser(self, logging_group):
+    def make_faulty_parser(self, logging_group, progress_callback=None):
         return FaultyParser(logging_group, self.dirs.scratch_dir)
 
     def setUp(self):
@@ -312,7 +312,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
         try:
             self.consumer.try_consume_file("non-existing-file")
         except ConsumerError as e:
-            self.assertTrue(str(e).endswith('It is not a file'))
+            self.assertTrue(str(e).endswith('File not found.'))
             return
 
         self.fail("Should throw exception")
@@ -350,7 +350,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
         try:
             self.consumer.try_consume_file(self.get_test_file())
         except ConsumerError as e:
-            self.assertEqual("Unsupported mime type application/pdf of file sample.pdf", str(e))
+            self.assertEqual(str(e), "sample.pdf: Unsupported mime type application/pdf")
             return
 
         self.fail("Should throw exception")
@@ -366,7 +366,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
         try:
             self.consumer.try_consume_file(self.get_test_file())
         except ConsumerError as e:
-            self.assertEqual(str(e), "Does not compute.")
+            self.assertEqual(str(e), "sample.pdf: Error while consuming document sample.pdf: Does not compute.")
             return
 
         self.fail("Should throw exception.")
@@ -378,7 +378,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
         try:
             self.consumer.try_consume_file(filename)
         except ConsumerError as e:
-            self.assertEqual(str(e), "NO.")
+            self.assertEqual(str(e), "sample.pdf: The following error occured while consuming sample.pdf: NO.")
         else:
             self.fail("Should raise exception")
 
@@ -482,6 +482,7 @@ class PreConsumeTestCase(TestCase):
     @override_settings(PRE_CONSUME_SCRIPT="does-not-exist")
     def test_pre_consume_script_not_found(self, m):
         c = Consumer()
+        c.filename = "somefile.pdf"
         c.path = "path-to-file"
         self.assertRaises(ConsumerError, c.run_pre_consume_script)
 
@@ -523,8 +524,9 @@ class PostConsumeTestCase(TestCase):
     @override_settings(POST_CONSUME_SCRIPT="does-not-exist")
     def test_post_consume_script_not_found(self):
         doc = Document.objects.create(title="Test", mime_type="application/pdf")
-
-        self.assertRaises(ConsumerError, Consumer().run_post_consume_script, doc)
+        c = Consumer()
+        c.filename = "somefile.pdf"
+        self.assertRaises(ConsumerError, c.run_post_consume_script, doc)
 
     @mock.patch("documents.consumer.Popen")
     def test_post_consume_script_simple(self, m):

From 313f2886d747973dd7d0400d827604c8653d699e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 15:26:25 +0100
Subject: [PATCH 0978/1300] fix test cases

---
 src/documents/tests/test_consumer.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 799250d08..54d20ca8b 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -228,7 +228,11 @@ class TestConsumer(DirectoriesMixin, TestCase):
             "mime_types": {"application/pdf": ".pdf"},
             "weight": 0
         })]
+        self.addCleanup(patcher.stop)
 
+        # this prevents websocket message reports during testing.
+        patcher = mock.patch("documents.consumer.Consumer._send_progress")
+        patcher.start()
         self.addCleanup(patcher.stop)
 
         self.consumer = Consumer()
@@ -479,8 +483,9 @@ class PreConsumeTestCase(TestCase):
         m.assert_not_called()
 
     @mock.patch("documents.consumer.Popen")
+    @mock.patch("documents.consumer.Consumer._send_progress")
     @override_settings(PRE_CONSUME_SCRIPT="does-not-exist")
-    def test_pre_consume_script_not_found(self, m):
+    def test_pre_consume_script_not_found(self, m, m2):
         c = Consumer()
         c.filename = "somefile.pdf"
         c.path = "path-to-file"
@@ -504,7 +509,6 @@ class PreConsumeTestCase(TestCase):
                 self.assertEqual(command[1], "path-to-file")
 
 
-
 class PostConsumeTestCase(TestCase):
 
     @mock.patch("documents.consumer.Popen")
@@ -520,9 +524,9 @@ class PostConsumeTestCase(TestCase):
 
         m.assert_not_called()
 
-
     @override_settings(POST_CONSUME_SCRIPT="does-not-exist")
-    def test_post_consume_script_not_found(self):
+    @mock.patch("documents.consumer.Consumer._send_progress")
+    def test_post_consume_script_not_found(self, m):
         doc = Document.objects.create(title="Test", mime_type="application/pdf")
         c = Consumer()
         c.filename = "somefile.pdf"

From 3b5d55c428861dabd54fe8ac536d4b584297629e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 15:43:07 +0100
Subject: [PATCH 0979/1300] pycodestyle

---
 src/paperless/asgi.py      | 6 +++---
 src/paperless/consumers.py | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/paperless/asgi.py b/src/paperless/asgi.py
index 45565c68a..2f6cc2d5f 100644
--- a/src/paperless/asgi.py
+++ b/src/paperless/asgi.py
@@ -8,10 +8,10 @@ from django.core.asgi import get_asgi_application
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "paperless.settings")
 django_asgi_app = get_asgi_application()
 
-from channels.auth import AuthMiddlewareStack
-from channels.routing import ProtocolTypeRouter, URLRouter
+from channels.auth import AuthMiddlewareStack  # NOQA: E402
+from channels.routing import ProtocolTypeRouter, URLRouter  # NOQA: E402
 
-from paperless.urls import websocket_urlpatterns
+from paperless.urls import websocket_urlpatterns  # NOQA: E402
 
 application = ProtocolTypeRouter({
     "http": get_asgi_application(),
diff --git a/src/paperless/consumers.py b/src/paperless/consumers.py
index fbb7b72d0..21a0e3ede 100644
--- a/src/paperless/consumers.py
+++ b/src/paperless/consumers.py
@@ -7,10 +7,12 @@ from channels.generic.websocket import WebsocketConsumer
 class StatusConsumer(WebsocketConsumer):
     def connect(self):
         self.accept()
-        async_to_sync(self.channel_layer.group_add)('status_updates', self.channel_name)
+        async_to_sync(self.channel_layer.group_add)(
+            'status_updates', self.channel_name)
 
     def disconnect(self, close_code):
-        async_to_sync(self.channel_layer.group_discard)('status_updates', self.channel_name)
+        async_to_sync(self.channel_layer.group_discard)(
+            'status_updates', self.channel_name)
 
     def status_update(self, event):
         self.send(json.dumps(event['data']))

From f0d49a1382830099023ebd9e77a9592a2f381608 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 15:55:47 +0100
Subject: [PATCH 0980/1300] enable docker image builds on feature branches

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 425243163..03b789bb7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -225,7 +225,7 @@ jobs:
 
   # build and push image to docker hub.
   build-docker-image:
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/ng-'))
+    if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/ng-'))
     runs-on: ubuntu-latest
     needs: [frontend, tests]
     steps:

From 18d105b4f8e315b4ea1dbc7cda93c855fcbe8efc Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 18:00:59 +0100
Subject: [PATCH 0981/1300] pinned scikit learn version

---
 Pipfile      |   3 +-
 Pipfile.lock | 170 +++++++++++++++++++++++++--------------------------
 2 files changed, 85 insertions(+), 88 deletions(-)

diff --git a/Pipfile b/Pipfile
index 140df6d02..e30abc064 100644
--- a/Pipfile
+++ b/Pipfile
@@ -32,7 +32,8 @@ python-Levenshtein = "*"
 python-magic = "*"
 psycopg2-binary = "*"
 redis = "*"
-scikit-learn="~=0.24.0"
+# Pinned because aarch64 wheels and updates cause warnings when loading the classifier model.
+scikit-learn="==0.24.0"
 whitenoise = "~=5.2.0"
 watchdog = "*"
 whoosh="~=2.7.4"
diff --git a/Pipfile.lock b/Pipfile.lock
index 9c30dedfa..f60ac0223 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "ede35846cb5a19613a24fa1ad4ba0e0ea0290d45fc912e7e69136bc56bb64007"
+            "sha256": "61ffe4b723ce6b04e67636f1572f833ee9adacdcf74a883c558ed4b0c906e75a"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -910,39 +910,35 @@
         },
         "scikit-learn": {
             "hashes": [
-                "sha256:0567a2d29ad08af98653300c623bd8477b448fe66ced7198bef4ed195925f082",
-                "sha256:087dfede39efb06ab30618f9ab55a0397f29c38d63cd0ab88d12b500b7d65fd7",
-                "sha256:1adf483e91007a87171d7ce58c34b058eb5dab01b5fee6052f15841778a8ecd8",
-                "sha256:259ec35201e82e2db1ae2496f229e63f46d7f1695ae68eef9350b00dc74ba52f",
-                "sha256:3c4f07f47c04e81b134424d53c3f5e16dfd7f494e44fd7584ba9ce9de2c5e6c1",
-                "sha256:4562dcf4793e61c5d0f89836d07bc37521c3a1889da8f651e2c326463c4bd697",
-                "sha256:4ddd2b6f7449a5d539ff754fa92d75da22de261fd8fdcfb3596799fadf255101",
-                "sha256:7b04691eb2f41d2c68dbda8d1bd3cb4ef421bdc43aaa56aeb6c762224552dfb6",
-                "sha256:826b92bf45b8ad80444814e5f4ac032156dd481e48d7da33d611f8fe96d5f08b",
-                "sha256:83b21ff053b1ff1c018a2d24db6dd3ea339b1acfbaa4d9c881731f43748d8b3b",
-                "sha256:8772b99d683be8f67fcc04789032f1b949022a0e6880ee7b75a7ec97dbbb5d0b",
-                "sha256:895dbf2030aa7337649e36a83a007df3c9811396b4e2fa672a851160f36ce90c",
-                "sha256:8aa1b3ac46b80eaa552b637eeadbbce3be5931e4b5002b964698e33a1b589e1e",
-                "sha256:99349d77f54e11f962d608d94dfda08f0c9e5720d97132233ebdf35be2858b2d",
-                "sha256:9a24d1ccec2a34d4cd3f2a1f86409f3f5954cc23d4d2270ba0d03cf018aa4780",
-                "sha256:9bed8a1ef133c8e2f13966a542cb8125eac7f4b67dcd234197c827ba9c7dd3e0",
-                "sha256:9c6097b6a9b2bafc5e0f31f659e6ab5e131383209c30c9e978c5b8abdac5ed2a",
-                "sha256:9dfa564ef27e8e674aa1cc74378416d580ac4ede1136c13dd555a87996e13422",
-                "sha256:a0334a1802e64d656022c3bfab56a73fbd6bf4b1298343f3688af2151810bbdf",
-                "sha256:a29460499c1e62b7a830bb57ca42e615375a6ab1bcad053cd25b493588348ea8",
-                "sha256:a36e159a0521e13bbe15ca8c8d038b3a1dd4c7dad18d276d76992e03b92cf643",
-                "sha256:ae7191f0253145503fbfa1934cbc83f48260f534343e34115398fb5fc2be55b0",
-                "sha256:c13ebac42236b1c46397162471ea1c46af68413000e28b9309f8c05722c65a09",
-                "sha256:c3deb3b19dd9806acf00cf0d400e84562c227723013c33abefbbc3cf906596e9",
-                "sha256:c658432d8a20e95398f6bb95ff9731ce9dfa343fdf21eea7ec6a7edfacd4b4d9",
-                "sha256:c7f4eb77504ac586d8ac1bde1b0c04b504487210f95297235311a0ab7edd7e38",
-                "sha256:d54dbaadeb1425b7d6a66bf44bee2bb2b899fe3e8850b8e94cfb9c904dcb46d0",
-                "sha256:ddb52d088889f5596bc4d1de981f2eca106b58243b6679e4782f3ba5096fd645",
-                "sha256:ed9d65594948678827f4ff0e7ae23344e2f2b4cabbca057ccaed3118fdc392ca",
-                "sha256:fab31f48282ebf54dd69f6663cd2d9800096bad1bb67bbc9c9ac84eb77b41972"
+                "sha256:076369634ee72b5a5941440661e2f306ff4ac30903802dc52031c7e9199ac640",
+                "sha256:18f7131e62265bf2691ed1d0303c640313894ccfe4278427478c6b2f45094b53",
+                "sha256:26f66b3726b54dfb76ea51c5d9c2431ed17ebc066cb4527662b9e851a3e7ba61",
+                "sha256:2951f87d35e72f007701c6e028aa230f6df6212a3194677c0c950486066a454d",
+                "sha256:2a5348585aa793bc8cc5a72f8e9067c9380834b0aadbd55f924843b071f13282",
+                "sha256:3eeff086f7329521d27249a082ea3c48c085cedb110db5f65968ab55c3ba2e09",
+                "sha256:4395e91b3548005f4a645018435b5a94f8cce232b5b70753020e606c6a750656",
+                "sha256:44e452ea8491225c5783d49577aad0f36202dfd52aec7f82c0fdfe5fbd5f7400",
+                "sha256:490436b44b3a1957cb625e871764b0aa330b34cc416aea4abc6c38ca63d0d682",
+                "sha256:5e6e3c042cea83f2e20a45e563b8eabc1f8f72446251fe23ebefdf111a173a33",
+                "sha256:66f27bf21202a850bcd7b6303916e4907f6e22ec59a14974ede4955aed5c7ed0",
+                "sha256:743b6edd98c98991be46c08e6b21df3861d5ae915f91d59f988384d93f7263e7",
+                "sha256:758619e49cd7c17282e6cc60d5cc73c02c072b47c9a10010bb3bb47e0d976e50",
+                "sha256:7f654befc5ad413690cc58f3f34a3e906caf825195ce0fda00a8e9565e1403e6",
+                "sha256:800aaf63f8838c00e85db2267dd226f89858594843fd03932a9eda95746d2c40",
+                "sha256:80ca024154b84b6ac4cfc86930ba13fdc348a209753bf2c16129db6f9eb8a80b",
+                "sha256:890d7d588f65acb0c4f6c083347c9076916bda5e6bd8400f06244b1afc1009af",
+                "sha256:905d8934d1e27a686698864a5863ff2c0e13a2ae1adb78a8a848aacc8a49927d",
+                "sha256:a83fcd9d59c42a2f66b307e3b0b0f08aa8e6e45be33da055697ea499f0e4f7c2",
+                "sha256:afeb06dc69847927634e58579b9cdc72e1390b79497336b2324b1b173f33bd47",
+                "sha256:b0d13fd56d26cf3de0314a4fd48037108c638fe126d813f5c1222bb0f08b6a76",
+                "sha256:c08b27cb78ee8d2dc781a7affed09859441f5b624f9f92da59ac0791c8774dfc",
+                "sha256:c912247e42114f389858ae05d63f4359d4e667ea72aaabee191aee9ad3f9774a",
+                "sha256:d7fe05fcb44eadd6d6c874c768f085f5de1239db3a3b7be4d3d23d12e4120589",
+                "sha256:d819d625832fb2969911a243e009cfa135cb8ef1e150866e417d6e9d75290087",
+                "sha256:e534f5f3796db6781c87e9835dcd51b7854c8c5a379c9210b93605965c1941fd"
             ],
             "index": "pypi",
-            "version": "==0.24.1"
+            "version": "==0.24.0"
         },
         "scipy": {
             "hashes": [
@@ -1268,60 +1264,60 @@
         },
         "coverage": {
             "hashes": [
-                "sha256:08b3ba72bd981531fd557f67beee376d6700fba183b167857038997ba30dd297",
-                "sha256:262066798d786ad67a13c7ba869e3ce0e39609f99f6d6c80160ad602c4808e32",
-                "sha256:2757fa64e11ec12220968f65d086b7a29b6583d16e9a544c889b22ba98555ef1",
-                "sha256:3102bb2c206700a7d28181dbe04d66b30780cde1d1c02c5f3c165cf3d2489497",
-                "sha256:3498b27d8236057def41de3585f317abae235dd3a11d33e01736ffedb2ef8606",
-                "sha256:378ac77af41350a8c6b8801a66021b52da8a05fd77e578b7380e876c0ce4f528",
-                "sha256:38f16b1317b8dd82df67ed5daa5f5e7c959e46579840d77a67a4ceb9cef0a50b",
-                "sha256:3911c2ef96e5ddc748a3c8b4702c61986628bb719b8378bf1e4a6184bbd48fe4",
-                "sha256:3a3c3f8863255f3c31db3889f8055989527173ef6192a283eb6f4db3c579d830",
-                "sha256:3b14b1da110ea50c8bcbadc3b82c3933974dbeea1832e814aab93ca1163cd4c1",
-                "sha256:535dc1e6e68fad5355f9984d5637c33badbdc987b0c0d303ee95a6c979c9516f",
-                "sha256:6f61319e33222591f885c598e3e24f6a4be3533c1d70c19e0dc59e83a71ce27d",
-                "sha256:723d22d324e7997a651478e9c5a3120a0ecbc9a7e94071f7e1954562a8806cf3",
-                "sha256:76b2775dda7e78680d688daabcb485dc87cf5e3184a0b3e012e1d40e38527cc8",
-                "sha256:782a5c7df9f91979a7a21792e09b34a658058896628217ae6362088b123c8500",
-                "sha256:7e4d159021c2029b958b2363abec4a11db0ce8cd43abb0d9ce44284cb97217e7",
-                "sha256:8dacc4073c359f40fcf73aede8428c35f84639baad7e1b46fce5ab7a8a7be4bb",
-                "sha256:8f33d1156241c43755137288dea619105477961cfa7e47f48dbf96bc2c30720b",
-                "sha256:8ffd4b204d7de77b5dd558cdff986a8274796a1e57813ed005b33fd97e29f059",
-                "sha256:93a280c9eb736a0dcca19296f3c30c720cb41a71b1f9e617f341f0a8e791a69b",
-                "sha256:9a4f66259bdd6964d8cf26142733c81fb562252db74ea367d9beb4f815478e72",
-                "sha256:9a9d4ff06804920388aab69c5ea8a77525cf165356db70131616acd269e19b36",
-                "sha256:a2070c5affdb3a5e751f24208c5c4f3d5f008fa04d28731416e023c93b275277",
-                "sha256:a4857f7e2bc6921dbd487c5c88b84f5633de3e7d416c4dc0bb70256775551a6c",
-                "sha256:a607ae05b6c96057ba86c811d9c43423f35e03874ffb03fbdcd45e0637e8b631",
-                "sha256:a66ca3bdf21c653e47f726ca57f46ba7fc1f260ad99ba783acc3e58e3ebdb9ff",
-                "sha256:ab110c48bc3d97b4d19af41865e14531f300b482da21783fdaacd159251890e8",
-                "sha256:b239711e774c8eb910e9b1ac719f02f5ae4bf35fa0420f438cdc3a7e4e7dd6ec",
-                "sha256:be0416074d7f253865bb67630cf7210cbc14eb05f4099cc0f82430135aaa7a3b",
-                "sha256:c46643970dff9f5c976c6512fd35768c4a3819f01f61169d8cdac3f9290903b7",
-                "sha256:c5ec71fd4a43b6d84ddb88c1df94572479d9a26ef3f150cef3dacefecf888105",
-                "sha256:c6e5174f8ca585755988bc278c8bb5d02d9dc2e971591ef4a1baabdf2d99589b",
-                "sha256:c89b558f8a9a5a6f2cfc923c304d49f0ce629c3bd85cb442ca258ec20366394c",
-                "sha256:cc44e3545d908ecf3e5773266c487ad1877be718d9dc65fc7eb6e7d14960985b",
-                "sha256:cc6f8246e74dd210d7e2b56c76ceaba1cc52b025cd75dbe96eb48791e0250e98",
-                "sha256:cd556c79ad665faeae28020a0ab3bda6cd47d94bec48e36970719b0b86e4dcf4",
-                "sha256:ce6f3a147b4b1a8b09aae48517ae91139b1b010c5f36423fa2b866a8b23df879",
-                "sha256:ceb499d2b3d1d7b7ba23abe8bf26df5f06ba8c71127f188333dddcf356b4b63f",
-                "sha256:cef06fb382557f66d81d804230c11ab292d94b840b3cb7bf4450778377b592f4",
-                "sha256:e448f56cfeae7b1b3b5bcd99bb377cde7c4eb1970a525c770720a352bc4c8044",
-                "sha256:e52d3d95df81c8f6b2a1685aabffadf2d2d9ad97203a40f8d61e51b70f191e4e",
-                "sha256:eb33c4c858d06bd8d79713c7628d3f2b50fb1c62071e2e88cb44876be03eabe1",
-                "sha256:ee2f1d1c223c3d2c24e3afbb2dd38be3f03b1a8d6a83ee3d9eb8c36a52bee899",
-                "sha256:f2c6888eada180814b8583c3e793f3f343a692fc802546eed45f40a001b1169f",
-                "sha256:f51dbba78d68a44e99d484ca8c8f604f17e957c1ca09c3ebc2c7e3bbd9ba0448",
-                "sha256:f54de00baf200b4539a5a092a759f000b5f45fd226d6d25a76b0dff71177a714",
-                "sha256:fa10fee7e32213f5c7b0d6428ea92e3a3fdd6d725590238a3f92c0de1c78b9d2",
-                "sha256:fabeeb121735d47d8eab8671b6b031ce08514c86b7ad8f7d5490a7b6dcd6267d",
-                "sha256:fac3c432851038b3e6afe086f777732bcf7f6ebbfd90951fa04ee53db6d0bcdd",
-                "sha256:fda29412a66099af6d6de0baa6bd7c52674de177ec2ad2630ca264142d69c6c7",
-                "sha256:ff1330e8bc996570221b450e2d539134baa9465f5cb98aff0e0f73f34172e0ae"
+                "sha256:03ed2a641e412e42cc35c244508cf186015c217f0e4d496bf6d7078ebe837ae7",
+                "sha256:04b14e45d6a8e159c9767ae57ecb34563ad93440fc1b26516a89ceb5b33c1ad5",
+                "sha256:0cdde51bfcf6b6bd862ee9be324521ec619b20590787d1655d005c3fb175005f",
+                "sha256:0f48fc7dc82ee14aeaedb986e175a429d24129b7eada1b7e94a864e4f0644dde",
+                "sha256:107d327071061fd4f4a2587d14c389a27e4e5c93c7cba5f1f59987181903902f",
+                "sha256:1375bb8b88cb050a2d4e0da901001347a44302aeadb8ceb4b6e5aa373b8ea68f",
+                "sha256:14a9f1887591684fb59fdba8feef7123a0da2424b0652e1b58dd5b9a7bb1188c",
+                "sha256:16baa799ec09cc0dcb43a10680573269d407c159325972dd7114ee7649e56c66",
+                "sha256:1b811662ecf72eb2d08872731636aee6559cae21862c36f74703be727b45df90",
+                "sha256:1ccae21a076d3d5f471700f6d30eb486da1626c380b23c70ae32ab823e453337",
+                "sha256:2f2cf7a42d4b7654c9a67b9d091ec24374f7c58794858bff632a2039cb15984d",
+                "sha256:322549b880b2d746a7672bf6ff9ed3f895e9c9f108b714e7360292aa5c5d7cf4",
+                "sha256:32ab83016c24c5cf3db2943286b85b0a172dae08c58d0f53875235219b676409",
+                "sha256:3fe50f1cac369b02d34ad904dfe0771acc483f82a1b54c5e93632916ba847b37",
+                "sha256:4a780807e80479f281d47ee4af2eb2df3e4ccf4723484f77da0bb49d027e40a1",
+                "sha256:4a8eb7785bd23565b542b01fb39115a975fefb4a82f23d407503eee2c0106247",
+                "sha256:4b40b794775df10d7e3ea677108dd581bfec796235750c617d461874178a67f6",
+                "sha256:5bee3970617b3d74759b2d2df2f6a327d372f9732f9ccbf03fa591b5f7581e39",
+                "sha256:60a3307a84ec60578accd35d7f0c71a3a971430ed7eca6567399d2b50ef37b8c",
+                "sha256:6625e52b6f346a283c3d563d1fd8bae8956daafc64bb5bbd2b8f8a07608e3994",
+                "sha256:66a5aae8233d766a877c5ef293ec5ab9520929c2578fd2069308a98b7374ea8c",
+                "sha256:68fb816a5dd901c6aff352ce49e2a0ffadacdf9b6fae282a69e7a16a02dad5fb",
+                "sha256:6b588b5cf51dc0fd1c9e19f622457cc74b7d26fe295432e434525f1c0fae02bc",
+                "sha256:6c4d7165a4e8f41eca6b990c12ee7f44fef3932fac48ca32cecb3a1b2223c21f",
+                "sha256:6d2e262e5e8da6fa56e774fb8e2643417351427604c2b177f8e8c5f75fc928ca",
+                "sha256:6d9c88b787638a451f41f97446a1c9fd416e669b4d9717ae4615bd29de1ac135",
+                "sha256:755c56beeacac6a24c8e1074f89f34f4373abce8b662470d3aa719ae304931f3",
+                "sha256:7e40d3f8eb472c1509b12ac2a7e24158ec352fc8567b77ab02c0db053927e339",
+                "sha256:812eaf4939ef2284d29653bcfee9665f11f013724f07258928f849a2306ea9f9",
+                "sha256:84df004223fd0550d0ea7a37882e5c889f3c6d45535c639ce9802293b39cd5c9",
+                "sha256:859f0add98707b182b4867359e12bde806b82483fb12a9ae868a77880fc3b7af",
+                "sha256:87c4b38288f71acd2106f5d94f575bc2136ea2887fdb5dfe18003c881fa6b370",
+                "sha256:89fc12c6371bf963809abc46cced4a01ca4f99cba17be5e7d416ed7ef1245d19",
+                "sha256:9564ac7eb1652c3701ac691ca72934dd3009997c81266807aef924012df2f4b3",
+                "sha256:9754a5c265f991317de2bac0c70a746efc2b695cf4d49f5d2cddeac36544fb44",
+                "sha256:a565f48c4aae72d1d3d3f8e8fb7218f5609c964e9c6f68604608e5958b9c60c3",
+                "sha256:a636160680c6e526b84f85d304e2f0bb4e94f8284dd765a1911de9a40450b10a",
+                "sha256:a839e25f07e428a87d17d857d9935dd743130e77ff46524abb992b962eb2076c",
+                "sha256:ae9702c099546e72000d76758b5efec2dd937ba5d746ec8d0563d2fca0f9bc2e",
+                "sha256:b62046592b44263fa7570f1117d372ae3f310222af1fc1407416f037fb3af21b",
+                "sha256:b7f7421841f8db443855d2854e25914a79a1ff48ae92f70d0a5c2f8907ab98c9",
+                "sha256:ba7ca81b6d60a9f7a0b4b4e175dcc38e8fef4992673d9d6e6879fd6de00dd9b8",
+                "sha256:bb32ca14b4d04e172c541c69eec5f385f9a075b38fb22d765d8b0ce3af3a0c22",
+                "sha256:c0ff1c1b4d13e2240821ef23c1efb1f009207cb3f56e16986f713c2b0e7cd37f",
+                "sha256:c669b440ce46ae3abe9b2d44a913b5fd86bb19eb14a8701e88e3918902ecd345",
+                "sha256:c67734cff78383a1f23ceba3b3239c7deefc62ac2b05fa6a47bcd565771e5880",
+                "sha256:c6809ebcbf6c1049002b9ac09c127ae43929042ec1f1dbd8bb1615f7cd9f70a0",
+                "sha256:cd601187476c6bed26a0398353212684c427e10a903aeafa6da40c63309d438b",
+                "sha256:ebfa374067af240d079ef97b8064478f3bf71038b78b017eb6ec93ede1b6bcec",
+                "sha256:fbb17c0d0822684b7d6c09915677a32319f16ff1115df5ec05bdcaaee40b35f3",
+                "sha256:fff1f3a586246110f34dc762098b5afd2de88de507559e63553d7da643053786"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
-            "version": "==5.3.1"
+            "version": "==5.4"
         },
         "coveralls": {
             "hashes": [
@@ -1371,11 +1367,11 @@
         },
         "faker": {
             "hashes": [
-                "sha256:1a40c9696830342e67d30057753323478b848e89334e97e0a64b442b18ae7ece",
-                "sha256:dd98418eceb374c475e85bd49ae826a9b304dabcd794640f35a1d185f4767dd9"
+                "sha256:0783729c61501d52efea2967aff6e6fcb8370f0f6b5a558f2a81233642ae529a",
+                "sha256:6b2995ffff6c2b02bc5daad96f8c24c021e5bd491d9d53d31bcbd66f348181d4"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==5.7.0"
+            "version": "==5.8.0"
         },
         "filelock": {
             "hashes": [

From 7c02a8b414a56fb4ab4f9a0a8962a9f2d94bdd4a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 18:01:24 +0100
Subject: [PATCH 0982/1300] requirements

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index c70d13ff4..a5a564a99 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -72,7 +72,7 @@ redis==3.5.3
 regex==2020.11.13
 reportlab==3.5.60
 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.1
+scikit-learn==0.24.0
 scipy==1.5.4; python_version >= '3.6'
 service-identity==18.1.0
 six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'

From 55584a6a876cc4ac2a263482347fcfe758265b95 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 26 Jan 2021 09:50:48 -0800
Subject: [PATCH 0983/1300] Fix alert resizing

---
 .../upload-file-widget.component.html                  |  4 ++--
 .../upload-file-widget.component.scss                  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index d00114934..213f46fd6 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -19,10 +19,10 @@
     <div *ngFor="let status of getStatus()">
       <ngb-alert type="secondary" class="mt-2 mb-0" [dismissible]="isFinished(status)" (closed)="dismiss(status)">
         <h6 class="alert-heading">{{status.filename}}</h6>
-        <p class="mb-0" *ngIf="!isFinished(status) || (isFinished(status) && !status.documentId)">{{status.message}}</p>
+        <p class="mb-0 pb-1" *ngIf="!isFinished(status) || (isFinished(status) && !status.documentId)">{{status.message}}</p>
         <ngb-progressbar [value]="status.getProgress()" [max]="1" [type]="getStatusColor(status)"></ngb-progressbar>
         <div *ngIf="isFinished(status)">
-          <button *ngIf="status.documentId" class="btn btn-sm btn-outline-primary mr-2" routerLink="/documents/{{status.documentId}}" (click)="dismiss(status)">
+          <button *ngIf="status.documentId" class="btn btn-sm btn-outline-primary btn-open" routerLink="/documents/{{status.documentId}}" (click)="dismiss(status)">
             <small>Open document</small>
             <svg xmlns="http://www.w3.org/2000/svg" width="1rem" height="1rem" fill="currentColor" class="bi bi-arrow-right-short" viewBox="0 0 16 16">
               <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"/>
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
index 10a83e308..2af4a4029 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
@@ -8,17 +8,17 @@ form {
   position: relative;
 }
 
-.alert {
-  transition: all 0.2s ease;
-}
-
 .alert-heading {
   font-size: 80%;
   font-weight: bold;
 }
 
-.btn-sm {
+.btn-open {
   line-height: 1;
+
+  svg {
+    margin-top: -1px;
+  }
 }
 
 .dismiss-all {

From d60b532b8f07582f2b3670d729587e820386aa7d Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 26 Jan 2021 10:09:13 -0800
Subject: [PATCH 0984/1300] Dark mode support

---
 .../upload-file-widget.component.scss                  |  4 ----
 src-ui/src/styles.scss                                 |  4 ++++
 src-ui/src/theme_dark.scss                             | 10 ++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
index 2af4a4029..ed1bca319 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
@@ -1,9 +1,5 @@
 @import "/src/theme";
 
-::ng-deep .ngx-file-drop__drop-zone--over {
-  background-color: $primaryFaded !important;
-}
-
 form {
   position: relative;
 }
diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss
index 8cf4a93f6..34f575a05 100644
--- a/src-ui/src/styles.scss
+++ b/src-ui/src/styles.scss
@@ -111,3 +111,7 @@ body {
     font-size: 16px;
   }
 }
+
+.ngx-file-drop__drop-zone--over {
+  background-color: $primaryFaded !important;
+}
diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index 9a698143d..bd4227fc6 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -352,6 +352,16 @@ $border-color-dark-mode: #47494f;
   .bg-dark {
     background-color: $bg-light-dark-mode !important;
   }
+
+  .ngx-file-drop__drop-zone--over {
+    background-color: darken($primary-dark-mode, 35%) !important;
+  }
+
+  .alert-secondary {
+    background-color: $bg-light-dark-mode;
+    border-color: darken($bg-light-dark-mode, 10%);
+    color: $text-color-dark-mode-accent;
+  }
 }
 
 body.color-scheme-dark {

From 44600961d8671d7a36f635a27c580238de3fb5e1 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 26 Jan 2021 10:17:45 -0800
Subject: [PATCH 0985/1300] Fix initial upload progress > 100%

---
 src-ui/src/app/services/consumer-status.service.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index b2804103d..181e45e15 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -33,7 +33,6 @@ export class FileStatus {
       case FileStatusPhase.UPLOADING:
         return this.currentPhaseProgress / this.currentPhaseMaxProgress * 0.2
       case FileStatusPhase.PROCESSING:
-        if (this.currentPhaseProgress > 100) this.currentPhaseProgress = 0
         return (this.currentPhaseProgress / this.currentPhaseMaxProgress * 0.8) + 0.2
       case FileStatusPhase.SUCCESS:
       case FileStatusPhase.FAILED:
@@ -44,7 +43,7 @@ export class FileStatus {
   updateProgress(status: FileStatusPhase, currentProgress?: number, maxProgress?: number) {
     if (status >= this.phase) {
       this.phase = status
-      if (currentProgress) {
+      if (currentProgress != undefined) {
         this.currentPhaseProgress = currentProgress
       }
       if (maxProgress) {

From 52f17a9ba63472d8863e577e3f72c39e911cca95 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 26 Jan 2021 10:17:58 -0800
Subject: [PATCH 0986/1300] Fix dark mode primary progress color

---
 src-ui/src/theme_dark.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index bd4227fc6..4e850f017 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -362,6 +362,10 @@ $border-color-dark-mode: #47494f;
     border-color: darken($bg-light-dark-mode, 10%);
     color: $text-color-dark-mode-accent;
   }
+
+  .progress-bar.bg-primary {
+    background-color: darken($primary-dark-mode, 5%) !important;
+  }
 }
 
 body.color-scheme-dark {

From 944aaf54383bfa648f3cbeb6d9ffb4eb9528715c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 19:32:09 +0100
Subject: [PATCH 0987/1300] documentation #444

---
 docs/setup.rst | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index 73af557e7..574631a58 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -98,10 +98,11 @@ The ansible route combines benefits of both options:
 the setup process is fully automated, reproducible and `idempotent <https://docs.ansible.com/ansible/latest/reference_appendices/glossary.html#Idempotency>`_,
 it includes the same sensible defaults, and it simultaneously provides the flexibility of a bare metal installation.
 
-.. _setup-docker_hub:
 .. _CLI Basics: https://sehn.tech/post/devops-with-docker/
 .. _idempotent: https://docs.ansible.com/ansible/latest/reference_appendices/glossary.html#Idempotency
 
+.. _setup-docker_hub:
+
 Install Paperless from Docker Hub
 =================================
 
@@ -131,7 +132,7 @@ Install Paperless from Docker Hub
         See the `Docker installation guide`_ on how to install the current
         version of Docker for your operating system or Linux distribution of
         choice. To get the latest version of docker-compose, follow the
-        `docker-compose installation guide`_if your package repository doesn't
+        `docker-compose installation guide`_ if your package repository doesn't
         include it.
 
         .. _Docker installation guide: https://docs.docker.com/engine/installation/
@@ -348,7 +349,8 @@ writing. Windows is not and will never be supported.
     .. warning::
 
         This is a development server which should not be used in
-        production.
+        production. It is not audited for security and performance
+        is inferior to production ready web servers.
 
     .. hint::
 
@@ -363,6 +365,11 @@ writing. Windows is not and will never be supported.
     ``consumer`` script to watch the input folder, and the ``scheduler``
     script to run tasks such as email checking and document consumption.
 
+    You may need to adjust the path to the ``gunicorn`` executable. This
+    will be installed as part of the python dependencies, and is either located
+    in the ``bin`` folder of your virtual environment, or in ``~/.local/bin/`` if
+    no virtual environment is used.
+
     These services rely on redis and optionally the database server, but
     don't need to be started in any particular order. The example files
     depend on redis being started. If you use a database server, you should

From d126ecfa4ddf8c82038c3765509c16b090644211 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 19:42:06 +0100
Subject: [PATCH 0988/1300] troubleshooting for #346

---
 docs/troubleshooting.rst | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index b8343710f..85a9e336a 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -30,9 +30,9 @@ Consumer fails to pickup any new files
 ######################################
 
 If you notice that the consumer will only pickup files in the consumption
-directory at startup, but won't find any other files added later, check out
-the configuration file and enable filesystem polling with the setting
-``PAPERLESS_CONSUMER_POLLING``.
+directory at startup, but won't find any other files added later, you will need to
+enable filesystem polling with the configuration option
+``PAPERLESS_CONSUMER_POLLING``, see :ref:`here <configuration-polling>`.
 
 This will disable listening to filesystem changes with inotify and paperless will
 manually check the consumption directory for changes instead.
@@ -64,6 +64,22 @@ This may have two reasons:
     with Inbox tags. Verify that there are documents in your archive without inbox tags.
     The algorithm will only learn from documents not in your inbox.
 
+UserWarning in sklearn on every single document
+###############################################
+
+You may encounter warnings like this:
+
+.. code::
+    
+    /usr/local/lib/python3.7/site-packages/sklearn/base.py:315:
+    UserWarning: Trying to unpickle estimator CountVectorizer from version 0.23.2 when using version 0.24.0.
+    This might lead to breaking code or invalid results. Use at your own risk.
+
+This happens when certain dependencies of paperless that are responsible for the auto matching algorithm are
+updated. After updating these, your current training data *might* not be compatible anymore. This can be ignored
+in most cases. If you want to get rid of the warning or actually experience issues with automatic matching, delete
+the file ``classification_model.pickle`` in the data directory and let paperless recreate it.
+
 Permission denied errors in the consumption directory
 #####################################################
 

From 20732794736674b7a4fe2ba4c782cab5125a3509 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 19:53:56 +0100
Subject: [PATCH 0989/1300] documentation for #441

---
 docs/troubleshooting.rst | 44 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index 85a9e336a..a5d020d21 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -94,3 +94,47 @@ Ensure that ``USERMAP_UID`` and ``USERMAP_GID`` are set to the user id and group
 different from ``1000``. See :ref:`setup-docker_hub`.
 
 Also ensure that you are able to read and write to the consumption directory on the host.
+
+Web-UI stuck at "Loading..."
+############################
+
+This might have multiple reasons.
+
+
+1.  If you built the docker image yourself or deployed using the bare metal route,
+    make sure that there are files in ``<paperless-root>/static/frontend/<lang-code>/``.
+    If there are no files, make sure that you executed ``collectstatic`` successfully, either
+    manually or as part of the docker image build.
+
+    If the front end is still missing, make sure that the front end is compiled (files present in
+    ``src/documents/static/frontend``). If it is not, you need to compile the front end yourself
+    or download the release archive instead of cloning the repository.
+
+2.  Check the output of the web server. You might see errors like this:
+
+
+    .. code::
+
+        [2021-01-25 10:08:04 +0000] [40] [ERROR] Socket error processing request.
+        Traceback (most recent call last):
+        File "/usr/local/lib/python3.7/site-packages/gunicorn/workers/sync.py", line 134, in handle
+            self.handle_request(listener, req, client, addr)
+        File "/usr/local/lib/python3.7/site-packages/gunicorn/workers/sync.py", line 190, in handle_request
+            util.reraise(*sys.exc_info())
+        File "/usr/local/lib/python3.7/site-packages/gunicorn/util.py", line 625, in reraise
+            raise value
+        File "/usr/local/lib/python3.7/site-packages/gunicorn/workers/sync.py", line 178, in handle_request
+            resp.write_file(respiter)
+        File "/usr/local/lib/python3.7/site-packages/gunicorn/http/wsgi.py", line 396, in write_file
+            if not self.sendfile(respiter):
+        File "/usr/local/lib/python3.7/site-packages/gunicorn/http/wsgi.py", line 386, in sendfile
+            sent += os.sendfile(sockno, fileno, offset + sent, count)
+        OSError: [Errno 22] Invalid argument
+    
+    To fix this issue, add
+
+    .. code::
+
+        SENDFILE=0
+    
+    to your `docker-compose.env` file.
\ No newline at end of file

From 600c13204ee3a1ae7bdb66b325be741ab6e58f53 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 20:13:29 +0100
Subject: [PATCH 0990/1300] added FAQ for #449

---
 docs/troubleshooting.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index a5d020d21..7f819a772 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -37,6 +37,15 @@ enable filesystem polling with the configuration option
 This will disable listening to filesystem changes with inotify and paperless will
 manually check the consumption directory for changes instead.
 
+
+Paperless always redirects to /admin
+####################################
+
+You probably had the old paperless installed at some point. Paperless installed
+a permanent redirect to /admin in your browser, and you need to clear your
+browsing data / cache to fix that.
+
+
 Operation not permitted
 #######################
 

From 1483f450ad99a664ea09e10662101fc4c01ad38e Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Tue, 26 Jan 2021 20:32:35 +0100
Subject: [PATCH 0991/1300] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 42 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 18 ++++++++++
 .github/ISSUE_TEMPLATE/other.md           | 14 ++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/other.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..b72d397c4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,42 @@
+---
+name: Bug report
+about: Something is not working
+title: "[BUG] Concise description of the issue"
+labels: ''
+assignees: ''
+
+---
+
+<!---
+=> Before opening an issue, please check the documentation and see if it helps you resolve your issue: https://paperless-ng.readthedocs.io/en/latest/troubleshooting.html
+=> Please also make sure that you followed the installation instructions.
+=> Please search the issues and look for similar issues before opening a bug report.
+-->
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Webserver logs**
+```
+If available, post any logs from the web server related to your issue.
+```
+
+**Relevant information**
+ - Host OS of the machine running paperless: [e.g. Archlinux / Ubuntu 20.04]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 1.0.0]
+ - Installation method: [docker / bare metal]
+ - Any configuration changes you made in `docker-compose.yml`, `docker-compose.env` or `paperless.conf`.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..21d474b36
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature Request] Consice and clear description of your feature request"
+labels: ''
+assignees: ''
+
+---
+
+<!--
+=> We already have lots of feature requests open. Please search the existing requests first and look for feature requests similar to yours.
+-->
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
new file mode 100644
index 000000000..aae462edf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -0,0 +1,14 @@
+---
+name: Other
+about: Anything that is not a feature request or bug.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+=> Discussions, Feedback and other suggestions belong in the "Disussion" section and not on the issue tracker.
+
+-->

From 0b07c3bd8f77487abd18c5c049f2421729aeba3e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 20:37:36 +0100
Subject: [PATCH 0992/1300] more documentation

---
 docs/troubleshooting.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index 7f819a772..ec430b477 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -86,7 +86,9 @@ You may encounter warnings like this:
 
 This happens when certain dependencies of paperless that are responsible for the auto matching algorithm are
 updated. After updating these, your current training data *might* not be compatible anymore. This can be ignored
-in most cases. If you want to get rid of the warning or actually experience issues with automatic matching, delete
+in most cases. This warning will disappear automatically when paperless updates the training data.
+
+ f you want to get rid of the warning or actually experience issues with automatic matching, delete
 the file ``classification_model.pickle`` in the data directory and let paperless recreate it.
 
 Permission denied errors in the consumption directory

From edfebe18a25c8f10b62e22cc1310a09a7d15f28a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 20:48:32 +0100
Subject: [PATCH 0993/1300] removed all occurences of pipenv from the
 documentation

---
 docs/administration.rst  | 21 +++++----------------
 docs/setup.rst           | 25 ++++++++++++++-----------
 docs/troubleshooting.rst |  2 +-
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/docs/administration.rst b/docs/administration.rst
index 14b986e82..c54323e6e 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -121,27 +121,19 @@ After grabbing the new release and unpacking the contents, do the following:
     dependencies. The dependencies required are listed in the section about
     :ref:`bare metal installations <setup-bare_metal>`.
 
-2.  Update python requirements. If you use Pipenv, this is done with the following steps.
+2.  Update python requirements. Keep in mind to activate your virtual environment
+    before that, if you use one.
 
     .. code:: shell-session
 
-        $ pip install --upgrade pipenv
-        $ cd /path/to/paperless
-        $ pipenv clean
-        $ pipenv install
-
-    This creates a new virtual environment (or uses your existing environment)
-    and installs all dependencies into it.
-
-    You can also use the included ``requirements.txt`` file instead and create the virtual
-    environment yourself. This file includes exactly the same dependencies.
+        $ pip install -r requirements.txt
 
 3.  Migrate the database.
 
     .. code:: shell-session
 
         $ cd src
-        $ pipenv run python3 manage.py migrate
+        $ python3 manage.py migrate
 
     This might not actually do anything. Not every new paperless version comes with new
     database migrations.
@@ -195,7 +187,7 @@ or
 .. code:: shell-session
 
     $ cd /path/to/paperless/src
-    $ pipenv run python manage.py <command> <arguments>
+    $ python3 manage.py <command> <arguments>
 
 depending on whether you use docker or not.
 
@@ -462,6 +454,3 @@ Basic usage to disable encryption of your document store:
 .. code::
 
     decrypt_documents [--passphrase SECR3TP4SSPHRA$E]
-
-
-.. _Pipenv: https://pipenv.pypa.io/en/latest/
diff --git a/docs/setup.rst b/docs/setup.rst
index 574631a58..40f6bb1b6 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -20,7 +20,7 @@ Paperless consists of the following components:
     .. code:: shell-session
 
         $ cd /path/to/paperless/src/
-        $ pipenv run gunicorn -c /usr/src/paperless/gunicorn.conf.py -b 0.0.0.0:8000 paperless.wsgi
+        $ gunicorn -c ../gunicorn.conf.py -b 0.0.0.0:8000 paperless.wsgi
 
     or by any other means such as Apache ``mod_wsgi``.
 
@@ -35,7 +35,7 @@ Paperless consists of the following components:
     .. code:: shell-session
 
         $ cd /path/to/paperless/src/
-        $ pipenv run python3 manage.py document_consumer
+        $ python3 manage.py document_consumer
 
     .. _setup-task_processor:
 
@@ -67,7 +67,7 @@ Paperless consists of the following components:
     .. code:: shell-session
 
         $ cd /path/to/paperless/src/
-        $ pipenv run python3 manage.py qcluster
+        $ python3 manage.py qcluster
 
 *   A `redis <https://redis.io/>`_ message broker: This is a really lightweight service that is responsible
     for getting the tasks from the webserver and the consumer to the task scheduler. These run in a different
@@ -255,7 +255,7 @@ writing. Windows is not and will never be supported.
 1.  Install dependencies. Paperless requires the following packages.
 
     *   ``python3`` 3.6, 3.7, 3.8 (3.9 is untested).
-    *   ``python3-pip``, optionally ``pipenv`` for package installation
+    *   ``python3-pip``
     *   ``python3-dev``
 
     *   ``fonts-liberation`` for generating thumbnails for plain text files
@@ -324,8 +324,13 @@ writing. Windows is not and will never be supported.
 
     Adjust as necessary if you configured different folders.
 
-7.  Install python requirements. Paperless comes with both Pipfiles for ``pipenv`` as well as with a ``requirements.txt``.
-    Both will install exactly the same requirements. It is up to you if you wish to use a virtual environment or not.
+7.  Install python requirements from the ``requirements.txt`` file.
+    It is up to you if you wish to use a virtual environment or not.
+
+    .. code:: shell-session
+
+        pip3 install -r requirements.txt
+
 
 8.  Go to ``/opt/paperless/src``, and execute the following commands:
 
@@ -654,14 +659,12 @@ management commands as below.
 
         This will launch the container and initialize the PostgreSQL database.
 
-    b)  Without docker, open a shell in your virtual environment, switch to
+    b)  Without docker, remember to activate any virtual environment, switch to
         the ``src`` directory and create the database schema:
 
         .. code:: shell-session
 
-            $ cd /path/to/paperless
-            $ pipenv shell
-            $ cd src
+            $ cd /path/to/paperless/src
             $ python3 manage.py migrate
 
         This will not copy any data yet.
@@ -678,7 +681,7 @@ management commands as below.
 
         $ python3 manage.py loaddata data.json
 
-6.  Exit the shell.
+6.  If operating inside Docker, you may exit the shell now.
 
     .. code:: shell-session
 
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index ec430b477..f55d57af5 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -88,7 +88,7 @@ This happens when certain dependencies of paperless that are responsible for the
 updated. After updating these, your current training data *might* not be compatible anymore. This can be ignored
 in most cases. This warning will disappear automatically when paperless updates the training data.
 
- f you want to get rid of the warning or actually experience issues with automatic matching, delete
+If you want to get rid of the warning or actually experience issues with automatic matching, delete
 the file ``classification_model.pickle`` in the data directory and let paperless recreate it.
 
 Permission denied errors in the consumption directory

From ab04817bea12ffe030f5d9772eb9f74c615abaa6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 26 Jan 2021 22:10:43 +0100
Subject: [PATCH 0994/1300] alter defaults for workers and threads to allow
 more parallel tasks #446

---
 docs/configuration.rst               | 15 +++++++--------
 src/documents/tests/test_settings.py |  4 ++--
 src/paperless/settings.py            |  6 ++++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 5edc003f6..36b124350 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -376,25 +376,24 @@ PAPERLESS_THREADS_PER_WORKER=<num>
         use a higher thread per worker count.
 
     The default is a balance between the two, according to your CPU core count,
-    with a slight favor towards threads per worker, and leaving at least one core
-    free for other tasks:
+    with a slight favor towards threads per worker:
 
     +----------------+---------+---------+
     | CPU core count | Workers | Threads |
     +----------------+---------+---------+
     |              1 |       1 |       1 |
     +----------------+---------+---------+
-    |              2 |       1 |       1 |
+    |              2 |       2 |       1 |
     +----------------+---------+---------+
-    |              4 |       1 |       3 |
+    |              4 |       2 |       2 |
     +----------------+---------+---------+
-    |              6 |       2 |       2 |
+    |              6 |       2 |       3 |
     +----------------+---------+---------+
-    |              8 |       2 |       3 |
+    |              8 |       2 |       4 |
     +----------------+---------+---------+
-    |             12 |       3 |       3 |
+    |             12 |       3 |       4 |
     +----------------+---------+---------+
-    |             16 |       3 |       5 |
+    |             16 |       4 |       4 |
     +----------------+---------+---------+
 
     If you only specify PAPERLESS_TASK_WORKERS, paperless will adjust
diff --git a/src/documents/tests/test_settings.py b/src/documents/tests/test_settings.py
index 21f29b4d9..0036daee7 100644
--- a/src/documents/tests/test_settings.py
+++ b/src/documents/tests/test_settings.py
@@ -20,7 +20,7 @@ class TestSettings(TestCase):
         self.assertEqual(default_threads, 1)
 
     def test_workers_threads(self):
-        for i in range(2, 64):
+        for i in range(1, 64):
             with mock.patch("paperless.settings.multiprocessing.cpu_count") as cpu_count:
                 cpu_count.return_value = i
 
@@ -31,4 +31,4 @@ class TestSettings(TestCase):
                 self.assertTrue(default_workers >= 1)
                 self.assertTrue(default_threads >= 1)
 
-                self.assertTrue(default_workers * default_threads < i, f"{i}")
+                self.assertTrue(default_workers * default_threads <= i, f"{i}")
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 894ecb60b..bc70cb331 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -354,8 +354,10 @@ LOGGING = {
 
 def default_task_workers():
     # always leave one core open
-    available_cores = max(multiprocessing.cpu_count() - 1, 1)
+    available_cores = max(multiprocessing.cpu_count(), 1)
     try:
+        if available_cores < 4:
+            return available_cores
         return max(
             math.floor(math.sqrt(available_cores)),
             1
@@ -376,7 +378,7 @@ Q_CLUSTER = {
 
 def default_threads_per_worker(task_workers):
     # always leave one core open
-    available_cores = max(multiprocessing.cpu_count() - 1, 1)
+    available_cores = max(multiprocessing.cpu_count(), 1)
     try:
         return max(
             math.floor(available_cores / task_workers),

From 51dc40ae734cc419ae058a7dc0614a02ece4c659 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Tue, 26 Jan 2021 14:48:39 -0800
Subject: [PATCH 0995/1300] Maximum limit of alerts

---
 .../upload-file-widget.component.html         | 38 ++++++++++++-------
 .../upload-file-widget.component.scss         |  6 +++
 .../upload-file-widget.component.ts           |  9 ++++-
 3 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index 213f46fd6..c8104dae1 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -1,4 +1,4 @@
-<app-widget-frame title="Upload new documents" i18n-title [class.has-multiple-status]="getStatus().length > 1">
+<app-widget-frame title="Upload new documents" i18n-title [class.has-multiple-status]="(getStatus().length + getStatusesHidden().length)> 1">
   <div header-buttons>
     <button type="button" class="btn btn-link dismiss-all" [disabled]="!getStatus().length" (click)="dismissAll()">
       <small class="mr-1">Hide all</small>
@@ -17,19 +17,31 @@
       </ngx-file-drop>
     </form>
     <div *ngFor="let status of getStatus()">
-      <ngb-alert type="secondary" class="mt-2 mb-0" [dismissible]="isFinished(status)" (closed)="dismiss(status)">
-        <h6 class="alert-heading">{{status.filename}}</h6>
-        <p class="mb-0 pb-1" *ngIf="!isFinished(status) || (isFinished(status) && !status.documentId)">{{status.message}}</p>
-        <ngb-progressbar [value]="status.getProgress()" [max]="1" [type]="getStatusColor(status)"></ngb-progressbar>
-        <div *ngIf="isFinished(status)">
-          <button *ngIf="status.documentId" class="btn btn-sm btn-outline-primary btn-open" routerLink="/documents/{{status.documentId}}" (click)="dismiss(status)">
-            <small>Open document</small>
-            <svg xmlns="http://www.w3.org/2000/svg" width="1rem" height="1rem" fill="currentColor" class="bi bi-arrow-right-short" viewBox="0 0 16 16">
-              <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"/>
-            </svg>
-          </button>
+      <ng-container [ngTemplateOutlet]="consumerAlert" [ngTemplateOutletContext]="{ $implicit: status }"></ng-container>
+    </div>
+    <div *ngIf="getStatusesHidden().length" class="alerts-hidden">
+      <p *ngIf="!alertsExpanded" class="mt-3 mb-0 text-center">{{getStatusesHidden().length}} more hidden <button class="btn btn-sm btn-link py-0" (click)="alertsExpanded = !alertsExpanded" aria-controls="hiddenAlerts" [attr.aria-expanded]="alertsExpanded">Show all</button></p>
+      <div #hiddenAlerts="ngbCollapse" [(ngbCollapse)]="!alertsExpanded">
+        <div *ngFor="let status of getStatusesHidden()">
+          <ng-container [ngTemplateOutlet]="consumerAlert" [ngTemplateOutletContext]="{ $implicit: status }"></ng-container>
         </div>
-      </ngb-alert>
+      </div>
     </div>
   </div>
 </app-widget-frame>
+
+<ng-template #consumerAlert let-status>
+  <ngb-alert type="secondary" class="mt-2 mb-0" [dismissible]="isFinished(status)" (closed)="dismiss(status)">
+    <h6 class="alert-heading">{{status.filename}}</h6>
+    <p class="mb-0 pb-1" *ngIf="!isFinished(status) || (isFinished(status) && !status.documentId)">{{status.message}}</p>
+    <ngb-progressbar [value]="status.getProgress()" [max]="1" [type]="getStatusColor(status)"></ngb-progressbar>
+    <div *ngIf="isFinished(status)">
+      <button *ngIf="status.documentId" class="btn btn-sm btn-outline-primary btn-open" routerLink="/documents/{{status.documentId}}" (click)="dismiss(status)">
+        <small>Open document</small>
+        <svg xmlns="http://www.w3.org/2000/svg" width="1rem" height="1rem" fill="currentColor" class="bi bi-arrow-right-short" viewBox="0 0 16 16">
+          <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"/>
+        </svg>
+      </button>
+    </div>
+  </ngb-alert>
+</ng-template>
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
index ed1bca319..5e404bb8e 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
@@ -9,6 +9,12 @@ form {
   font-weight: bold;
 }
 
+.alerts-hidden {
+  .btn {
+    line-height: 1;
+  }
+}
+
 .btn-open {
   line-height: 1;
 
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index 19ab8d04b..27f67f976 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -4,6 +4,7 @@ import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop';
 import { ConsumerStatusService, FileStatus, FileStatusPhase } from 'src/app/services/consumer-status.service';
 import { DocumentService } from 'src/app/services/rest/document.service';
 
+const MAX_ALERTS = 5
 
 @Component({
   selector: 'app-upload-file-widget',
@@ -11,6 +12,7 @@ import { DocumentService } from 'src/app/services/rest/document.service';
   styleUrls: ['./upload-file-widget.component.scss']
 })
 export class UploadFileWidgetComponent implements OnInit {
+  alertsExpanded = false
 
   constructor(
     private documentService: DocumentService,
@@ -18,7 +20,12 @@ export class UploadFileWidgetComponent implements OnInit {
   ) { }
 
   getStatus() {
-    return this.consumerStatusService.getConsumerStatus()
+    return this.consumerStatusService.getConsumerStatus().slice(0, MAX_ALERTS)
+  }
+
+  getStatusesHidden() {
+    if (this.consumerStatusService.getConsumerStatus().length < MAX_ALERTS) return []
+    else return this.consumerStatusService.getConsumerStatus().slice(MAX_ALERTS)
   }
 
   getStatusUploading() {

From 763b780aa4c16ddbb0540ba8acbd4e019c1109bd Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 27 Jan 2021 11:32:30 +0100
Subject: [PATCH 0996/1300] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 4 ++++
 .github/ISSUE_TEMPLATE/feature_request.md | 3 +++
 .github/ISSUE_TEMPLATE/other.md           | 6 +++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b72d397c4..0f0ac44e2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,6 +11,10 @@ assignees: ''
 => Before opening an issue, please check the documentation and see if it helps you resolve your issue: https://paperless-ng.readthedocs.io/en/latest/troubleshooting.html
 => Please also make sure that you followed the installation instructions.
 => Please search the issues and look for similar issues before opening a bug report.
+
+=> If you encounter issues while installing of configuring Paperless-ng, please post that in the "Support" section of the discussions. Remember that Paperless successfully runs on a variety of different systems. If paperless does not start, it's probably an issue with your system, and not an issue of paperless.
+
+=> Don't remove the [BUG] prefix from the title.
 -->
 
 **Describe the bug**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 21d474b36..47c36c23d 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -9,6 +9,9 @@ assignees: ''
 
 <!--
 => We already have lots of feature requests open. Please search the existing requests first and look for feature requests similar to yours.
+
+=> Don't remove the [Feature Request] prefix from the title.
+
 -->
 
 **Is your feature request related to a problem? Please describe.**
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
index aae462edf..ef394f7f9 100644
--- a/.github/ISSUE_TEMPLATE/other.md
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -1,7 +1,7 @@
 ---
 name: Other
 about: Anything that is not a feature request or bug.
-title: ''
+title: "[Other] Title of your issue"
 labels: ''
 assignees: ''
 
@@ -11,4 +11,8 @@ assignees: ''
 
 => Discussions, Feedback and other suggestions belong in the "Disussion" section and not on the issue tracker.
 
+=> If you encounter issues while installing of configuring Paperless-ng, please post that in the "Support" section of the discussions. Remember that Paperless successfully runs on a variety of different systems. If paperless does not start, it's probably is an issue with your system, and not an issue of paperless.
+
+=> Don't remove the [Other] prefix from the title.
+
 -->

From 682cf33c78678424d7b640d79f26f1cad62e89df Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 12:05:30 +0100
Subject: [PATCH 0997/1300] clarification for some steps in the migration guide

---
 docs/setup.rst | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index 40f6bb1b6..afb3784d6 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -539,7 +539,10 @@ Migration to paperless-ng
 
 At its core, paperless-ng is still paperless and fully compatible. However, some
 things have changed under the hood, so you need to adapt your setup depending on
-how you installed paperless. The important things to keep in mind are as follows.
+how you installed paperless.
+
+This setup describes how to update an existing paperless Docker installation.
+The important things to keep in mind are as follows:
 
 * Read the :ref:`changelog <paperless_changelog>` and take note of breaking changes.
 * You should decide if you want to stick with SQLite or want to migrate your database
@@ -574,11 +577,18 @@ Migration to paperless-ng is then performed in a few simple steps:
 
     .. caution::
 
-        Paperless includes a ``.env`` file. This will set the
-        project name for docker compose to ``paperless`` so that paperless-ng will
-        automatically reuse your existing paperless volumes. When you start it, it
-        will migrate your existing data. After that, your old paperless installation
-        will be incompatible with the migrated volumes.
+        Paperless-ng includes a ``.env`` file. This will set the
+        project name for docker compose to ``paperless``, which will also define the name
+        of the volumes by paperless-ng. However, if you experience that paperless-ng
+        is not using your old paperless volumes, verify the names of your volumes with
+
+        .. code:: shell-session
+
+            $ docker volume ls | grep _data
+        
+        and adjust the project name in the ``.env`` file so that it matches the name
+        of the volumes before the ``_data`` part.
+
 
 4.  Download the ``docker-compose.sqlite.yml`` file to ``docker-compose.yml``.
     If you want to switch to PostgreSQL, do that after you migrated your existing

From 68a9dd7e052908c7ad70e4ce0f46e60252b478c7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 15:23:29 +0100
Subject: [PATCH 0998/1300] fix an issue with upload status identification

---
 src-ui/src/app/services/consumer-status.service.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index 181e45e15..90ba4f0ef 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -43,10 +43,10 @@ export class FileStatus {
   updateProgress(status: FileStatusPhase, currentProgress?: number, maxProgress?: number) {
     if (status >= this.phase) {
       this.phase = status
-      if (currentProgress != undefined) {
+      if (currentProgress != null) {
         this.currentPhaseProgress = currentProgress
       }
-      if (maxProgress) {
+      if (maxProgress != null) {
         this.currentPhaseMaxProgress = maxProgress
       }
     }
@@ -70,7 +70,7 @@ export class ConsumerStatusService {
   private documentConsumptionFailedSubject = new Subject<FileStatus>()
 
   private get(taskId: string, filename?: string) {
-    let status = this.consumerStatus.find(e => e.taskId == taskId) || this.consumerStatus.find(e => e.filename == filename)
+    let status = this.consumerStatus.find(e => e.taskId == taskId) || this.consumerStatus.find(e => e.filename == filename && e.taskId == null)
     if (!status) {
       status = new FileStatus()
       this.consumerStatus.push(status)

From cc74be9ccc574548ffb99efba796afc568d83a18 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 15:50:37 +0100
Subject: [PATCH 0999/1300] better error messages

---
 .../upload-file-widget/upload-file-widget.component.ts    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index 27f67f976..8c2dfec07 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -87,15 +87,15 @@ export class UploadFileWidgetComponent implements OnInit {
           formData.append('document', file, file.name)
           let status = this.consumerStatusService.newFileUpload(file.name)
 
-          status.message = "Connecting..."
+          status.message = $localize`Connecting...`
 
           this.documentService.uploadDocument(formData).subscribe(event => {
             if (event.type == HttpEventType.UploadProgress) {
               status.updateProgress(FileStatusPhase.UPLOADING, event.loaded, event.total)
-              status.message = "Uploading..."
+              status.message = $localize`Uploading...`
             } else if (event.type == HttpEventType.Response) {
               status.taskId = event.body["task_id"]
-              status.message = "Upload complete."
+              status.message = $localize`Waiting for consumer...`
             }
 
           }, error => {
@@ -106,7 +106,7 @@ export class UploadFileWidgetComponent implements OnInit {
                 break;
               }
               default: {
-                status.message = $localize`An error has occurred while uploading the document. Sorry!`
+                status.message = `${error.status} ${error.statusText}`
                 break;
               }
             }

From 5a4cb5fe4a805b26301b039ce0f1d50625dc02be Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 16:04:06 +0100
Subject: [PATCH 1000/1300] proper messages when uploading fails

---
 .../upload-file-widget/upload-file-widget.component.ts    | 5 ++---
 src-ui/src/app/services/consumer-status.service.ts        | 8 +++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index 8c2dfec07..1c5ed5438 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -99,14 +99,13 @@ export class UploadFileWidgetComponent implements OnInit {
             }
 
           }, error => {
-            status.updateProgress(FileStatusPhase.FAILED)
             switch (error.status) {
               case 400: {
-                status.message = error.error.document
+                this.consumerStatusService.fail(status, error.error.document)
                 break;
               }
               default: {
-                status.message = `${error.status} ${error.statusText}`
+                this.consumerStatusService.fail(status, `${error.status} ${error.statusText}`)
                 break;
               }
             }
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index 90ba4f0ef..a3c942499 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -117,6 +117,12 @@ export class ConsumerStatusService {
     }
   }
 
+  fail(status: FileStatus, message: string) {
+    status.message = message
+    status.phase = FileStatusPhase.FAILED
+    this.documentConsumptionFailedSubject.next(status)
+  }
+
   disconnect() {
     if (this.statusWebSocked) {
       this.statusWebSocked.close()
@@ -133,7 +139,7 @@ export class ConsumerStatusService {
   }
 
   dismissAll() {
-    this.consumerStatus = []
+    this.consumerStatus = this.consumerStatus.filter(status => status.phase < FileStatusPhase.SUCCESS)
   }
 
   onDocumentConsumptionFinished() {

From 91f7c4e6855c384f133e2714e3d6104205a486ea Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 17:28:11 +0100
Subject: [PATCH 1001/1300] settings and localization

---
 src-ui/messages.xlf                           | 166 ++++++++++++++----
 src-ui/src/app/app.component.ts               |  41 ++++-
 .../upload-file-widget.component.html         |   4 +-
 .../manage/settings/settings.component.html   |  14 ++
 .../manage/settings/settings.component.ts     |   8 +
 .../app/services/consumer-status.service.ts   |  18 +-
 src-ui/src/app/services/settings.service.ts   |  12 +-
 7 files changed, 214 insertions(+), 49 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 6175cf700..ec718acc6 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -2,6 +2,48 @@
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
   <file source-language="en-US" datatype="plaintext" original="ng2.template">
     <body>
+      <trans-unit id="9103526311244275943" datatype="html">
+        <source>Document added</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9204248378636247318" datatype="html">
+        <source>Document <x id="PH" equiv-text="status.filename"/> was added to paperless.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1931214133925051574" datatype="html">
+        <source>Open document</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8582620835547864448" datatype="html">
+        <source>Could not add <x id="PH" equiv-text="status.filename"/>: <x id="PH_1" equiv-text="status.message"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1710712016675379662" datatype="html">
+        <source>New document detected</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="587031278561344416" datatype="html">
+        <source>Document <x id="PH" equiv-text="status.filename"/> is being processed by paperless.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="4733307402565258070" datatype="html">
         <source>Documents</source>
         <context-group purpose="location">
@@ -482,35 +524,35 @@
         <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/>&quot; deleted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5647210819299459618" datatype="html">
         <source>Settings saved successfully.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6839066544204061364" datatype="html">
         <source>Use system language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7729897675462249787" datatype="html">
         <source>Use date format of display language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8488620293789898901" datatype="html">
         <source>Error while storing settings on server: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
@@ -531,7 +573,7 @@
         <source>Saved views</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">128</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13" datatype="html">
@@ -639,60 +681,109 @@
           <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab" datatype="html">
+        <source>Notifications</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">102</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="69c5a98f8aa92e4db060f10dcd37781c8f40a48f" datatype="html">
+        <source>Consumer status</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0" datatype="html">
+        <source>Show notifications when new documents are detected</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">109</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f2361d3f65b6c77ef0a15fad8af8e858b043ace3" datatype="html">
+        <source>Show notifications when document consumption completes successfully</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">110</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2bcbcbe99e207803e21183580b98d90410dd8718" datatype="html">
+        <source>Show notifications when document consumption fails</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="af113f7c9f7e13145c3461f61a1aedf12d57bd71" datatype="html">
+        <source>Suppress notifications on dashboard</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="59fe5c9233a2aaab3079a2300e4dfa439ddb1890" datatype="html">
+        <source>This will suppress all consumer related status messages on the dashboard.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="3863a86cd9e69a61d143d3daf51df44203df4a82" datatype="html">
         <source>Bulk editing</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">102</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586" datatype="html">
         <source>Show confirmation dialogs</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit>
       <trans-unit id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a" datatype="html">
         <source>Deleting documents will always ask for confirmation.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8cfddc13e04f5545ac63f419ef363505d6f78c2e" datatype="html">
         <source>Apply on close</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">121</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8cb90334f5dfd7fc67205085f59381e2a334ccfc" datatype="html">
         <source>Appears on</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5" datatype="html">
         <source>Show on dashboard</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">129</context>
+          <context context-type="linenumber">143</context>
         </context-group>
       </trans-unit>
       <trans-unit id="541bfc5b123b3f8867fd681eaceefb663a811973" datatype="html">
         <source>Show in sidebar</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">133</context>
+          <context context-type="linenumber">147</context>
         </context-group>
       </trans-unit>
       <trans-unit id="abba764a7a595d04dc8c3b26e04b3780d4fdb540" datatype="html">
         <source>No saved views defined.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">143</context>
+          <context context-type="linenumber">157</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ef60a738a565f498b858e903e42bc5ffc3cc1299" datatype="html">
@@ -1323,25 +1414,25 @@
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8705589528094706681" datatype="html">
-        <source>The document has been uploaded and will be processed by the consumer shortly.</source>
+      <trans-unit id="3852289441366561594" datatype="html">
+        <source>Connecting...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4956689020592747108" datatype="html">
-        <source>There was an error while uploading the document: <x id="PH" equiv-text="error.error.document"/></source>
+      <trans-unit id="1245343823699368872" datatype="html">
+        <source>Uploading...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="7554858521017940575" datatype="html">
-        <source>An error has occurred while uploading the document. Sorry!</source>
+      <trans-unit id="3994065460580948013" datatype="html">
+        <source>Waiting for consumer...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e022072b3e4dd77e3f09960817ef3359a49963b3" datatype="html">
@@ -1351,25 +1442,32 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="bd4a8607e4a002d939cffb347ec056664dfb2c73" datatype="html">
+        <source>Dismiss completed</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="52d5d56b6667ba3f7c759cbc0d4c39d34a99701e" datatype="html">
         <source>Drop documents here or</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
       <trans-unit id="865c511f4a24558ed0e954f9bbbff557bbb8954d" datatype="html">
         <source>Browse files</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="33c76d75ce25ce3b05ab22877f1b6b09dcf603ae" datatype="html">
-        <source>{VAR_PLURAL, plural, =1 {Uploading file...} =other {Uploading <x id="INTERPOLATION"/> files...}}</source>
+      <trans-unit id="710254a196a2649674438edf8a15b7ab1f48271b" datatype="html">
+        <source>Open document</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
       <trans-unit id="45854ddec74086b271e62be6a363f4fa5036f7fc" datatype="html">
@@ -1467,42 +1565,42 @@
         <source>English (US)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1858110241312746425" datatype="html">
         <source>German</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3071065188816255493" datatype="html">
         <source>Dutch</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7633754075223722162" datatype="html">
         <source>French</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1519954996184640001" datatype="html">
         <source>Error</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/toast.service.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5037437391296624618" datatype="html">
         <source>Information</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/toast.service.ts</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7517688192215738656" datatype="html">
diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts
index 43c23f2af..836a6f66a 100644
--- a/src-ui/src/app/app.component.ts
+++ b/src-ui/src/app/app.component.ts
@@ -1,9 +1,9 @@
-import { SettingsService } from './services/settings.service';
+import { SettingsService, SETTINGS_KEYS } from './services/settings.service';
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { Subscription } from 'rxjs';
 import { ConsumerStatusService } from './services/consumer-status.service';
-import { Toast, ToastService } from './services/toast.service';
+import { ToastService } from './services/toast.service';
 
 @Component({
   selector: 'app-root',
@@ -12,6 +12,7 @@ import { Toast, ToastService } from './services/toast.service';
 })
 export class AppComponent implements OnInit, OnDestroy {
 
+  newDocumentSubscription: Subscription;
   successSubscription: Subscription;
   failedSubscription: Subscription;
 
@@ -23,23 +24,47 @@ export class AppComponent implements OnInit, OnDestroy {
 
   ngOnDestroy(): void {
     this.consumerStatusService.disconnect()
-    this.successSubscription.unsubscribe()
-    this.failedSubscription.unsubscribe()
+    if (this.successSubscription) {
+      this.successSubscription.unsubscribe()
+    }
+    if (this.failedSubscription) {
+      this.failedSubscription.unsubscribe()
+    }
+    if (this.newDocumentSubscription) {
+      this.newDocumentSubscription.unsubscribe()
+    }
+  }
+
+  private showNotification(key) {
+    if (this.router.url == '/dashboard' && this.settings.get(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD)) {
+      return false
+    }
+    return this.settings.get(key)
   }
 
   ngOnInit(): void {
     this.consumerStatusService.connect()
 
+    
     this.successSubscription = this.consumerStatusService.onDocumentConsumptionFinished().subscribe(status => {
-      this.toastService.show({title: "Document added", delay: 10000, content: `Document ${status.filename} was added to paperless.`, actionName: "Open document", action: () => {
-        this.router.navigate(['documents', status.documentId])
-      }})
+      if (this.showNotification(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS)) {
+        this.toastService.show({title: $localize`Document added`, delay: 10000, content: $localize`Document ${status.filename} was added to paperless.`, actionName: $localize`Open document`, action: () => {
+          this.router.navigate(['documents', status.documentId])
+        }})
+      }
     })
 
     this.failedSubscription = this.consumerStatusService.onDocumentConsumptionFailed().subscribe(status => {
-      this.toastService.showError(`Could not consume ${status.filename}: ${status.message}`)
+      if (this.showNotification(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED)) {
+        this.toastService.showError($localize`Could not add ${status.filename}\: ${status.message}`)
+      }
     })
 
+    this.newDocumentSubscription = this.consumerStatusService.onDocumentDetected().subscribe(status => {
+      if (this.showNotification(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT)) {
+        this.toastService.show({title: $localize`New document detected`, delay: 5000, content: $localize`Document ${status.filename} is being processed by paperless.`})
+      }
+    })
   }
 
 }
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index c8104dae1..a9658bcf7 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -1,7 +1,7 @@
 <app-widget-frame title="Upload new documents" i18n-title [class.has-multiple-status]="(getStatus().length + getStatusesHidden().length)> 1">
   <div header-buttons>
     <button type="button" class="btn btn-link dismiss-all" [disabled]="!getStatus().length" (click)="dismissAll()">
-      <small class="mr-1">Hide all</small>
+      <small class="mr-1" i18n>Dismiss completed</small>
       <svg xmlns="http://www.w3.org/2000/svg" width="1rem" height="1rem" fill="currentColor" class="bi bi-check2-all" viewBox="0 0 16 16">
         <path d="M12.354 4.354a.5.5 0 0 0-.708-.708L5 10.293 1.854 7.146a.5.5 0 1 0-.708.708l3.5 3.5a.5.5 0 0 0 .708 0l7-7zm-4.208 7l-.896-.897.707-.707.543.543 6.646-6.647a.5.5 0 0 1 .708.708l-7 7a.5.5 0 0 1-.708 0z"/>
         <path d="M5.354 7.146l.896.897-.707.707-.897-.896a.5.5 0 1 1 .708-.708z"/>
@@ -37,7 +37,7 @@
     <ngb-progressbar [value]="status.getProgress()" [max]="1" [type]="getStatusColor(status)"></ngb-progressbar>
     <div *ngIf="isFinished(status)">
       <button *ngIf="status.documentId" class="btn btn-sm btn-outline-primary btn-open" routerLink="/documents/{{status.documentId}}" (click)="dismiss(status)">
-        <small>Open document</small>
+        <small i18n>Open document</small>
         <svg xmlns="http://www.w3.org/2000/svg" width="1rem" height="1rem" fill="currentColor" class="bi bi-arrow-right-short" viewBox="0 0 16 16">
           <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"/>
         </svg>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 4ed5ad1ae..910867ace 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -99,6 +99,20 @@
           </div>
         </div>
 
+        <h4 class="mt-4" i18n>Notifications</h4>
+
+        <div class="form-row form-group">
+          <div class="col-md-3 col-form-label">
+            <span i18n>Consumer status</span>
+          </div>
+          <div class="col">
+            <app-input-check i18n-title title="Show notifications when new documents are detected" formControlName="notificationsConsumerNewDocument"></app-input-check>
+            <app-input-check i18n-title title="Show notifications when document consumption completes successfully" formControlName="notificationsConsumerSuccess"></app-input-check>
+            <app-input-check i18n-title title="Show notifications when document consumption fails" formControlName="notificationsConsumerFailed"></app-input-check>
+            <app-input-check i18n-title title="Suppress notifications on dashboard" formControlName="notificationsConsumerSuppressOnDashboard" i18n-hint hint="This will suppress all consumer related status messages on the dashboard."></app-input-check>
+          </div>
+        </div>
+
         <h4 class="mt-4" i18n>Bulk editing</h4>
 
         <div class="form-row form-group">
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 47f714c21..47c7b8d7b 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -26,6 +26,10 @@ export class SettingsComponent implements OnInit {
     'displayLanguage': new FormControl(this.settings.getLanguage()),
     'dateLocale': new FormControl(this.settings.get(SETTINGS_KEYS.DATE_LOCALE)),
     'dateFormat': new FormControl(this.settings.get(SETTINGS_KEYS.DATE_FORMAT)),
+    'notificationsConsumerNewDocument': new FormControl(this.settings.get(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT)),
+    'notificationsConsumerSuccess': new FormControl(this.settings.get(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS)),
+    'notificationsConsumerFailed': new FormControl(this.settings.get(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED)),
+    'notificationsConsumerSuppressOnDashboard': new FormControl(this.settings.get(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD)),
   })
 
   savedViews: PaperlessSavedView[]
@@ -73,6 +77,10 @@ export class SettingsComponent implements OnInit {
     this.settings.set(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, this.settingsForm.value.useNativePdfViewer)
     this.settings.set(SETTINGS_KEYS.DATE_LOCALE, this.settingsForm.value.dateLocale)
     this.settings.set(SETTINGS_KEYS.DATE_FORMAT, this.settingsForm.value.dateFormat)
+    this.settings.set(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT, this.settingsForm.value.notificationsConsumerNewDocument)
+    this.settings.set(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS, this.settingsForm.value.notificationsConsumerSuccess)
+    this.settings.set(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED, this.settingsForm.value.notificationsConsumerFailed)
+    this.settings.set(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD, this.settingsForm.value.notificationsConsumerSuppressOnDashboard)
     this.settings.setLanguage(this.settingsForm.value.displayLanguage)
     this.documentListViewService.updatePageSize()
     this.settings.updateDarkModeSettings()
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index a3c942499..feb04f3d6 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -65,19 +65,21 @@ export class ConsumerStatusService {
 
   private consumerStatus: FileStatus[] = []
 
-
+  private documentDetectedSubject = new Subject<FileStatus>()
   private documentConsumptionFinishedSubject = new Subject<FileStatus>()
   private documentConsumptionFailedSubject = new Subject<FileStatus>()
 
   private get(taskId: string, filename?: string) {
     let status = this.consumerStatus.find(e => e.taskId == taskId) || this.consumerStatus.find(e => e.filename == filename && e.taskId == null)
+    let created = false
     if (!status) {
       status = new FileStatus()
       this.consumerStatus.push(status)
+      created = true
     }
     status.taskId = taskId
     status.filename = filename
-    return status
+    return {'status': status, 'created': created}
   }
 
   newFileUpload(filename: string): FileStatus {
@@ -101,11 +103,17 @@ export class ConsumerStatusService {
     this.statusWebSocked.onmessage = (ev) => {
       let statusMessage: WebsocketConsumerStatusMessage = JSON.parse(ev['data'])
 
-      let status = this.get(statusMessage.task_id, statusMessage.filename)
+      let statusMessageGet = this.get(statusMessage.task_id, statusMessage.filename)
+      let status = statusMessageGet.status
+      let created = statusMessageGet.created
+
       status.updateProgress(FileStatusPhase.PROCESSING, statusMessage.current_progress, statusMessage.max_progress)
       status.message = statusMessage.message
       status.documentId = statusMessage.document_id
 
+      if (created && statusMessage.status == 'STARTING') {
+        this.documentDetectedSubject.next(status)
+      }
       if (statusMessage.status == "SUCCESS") {
         status.phase = FileStatusPhase.SUCCESS
         this.documentConsumptionFinishedSubject.next(status)
@@ -150,4 +158,8 @@ export class ConsumerStatusService {
     return this.documentConsumptionFailedSubject
   }
 
+  onDocumentDetected() {
+    return this.documentDetectedSubject
+  }
+
 }
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index 041fb51ca..f3e437ada 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -23,7 +23,11 @@ export const SETTINGS_KEYS = {
   DARK_MODE_ENABLED: 'general-settings:dark-mode:enabled',
   USE_NATIVE_PDF_VIEWER: 'general-settings:document-details:native-pdf-viewer',
   DATE_LOCALE: 'general-settings:date-display:date-locale',
-  DATE_FORMAT: 'general-settings:date-display:date-format'
+  DATE_FORMAT: 'general-settings:date-display:date-format',
+  NOTIFICATIONS_CONSUMER_NEW_DOCUMENT: 'general-settings:notifications:consumer-new-documents',
+  NOTIFICATIONS_CONSUMER_SUCCESS: 'general-settings:notifications:consumer-success',
+  NOTIFICATIONS_CONSUMER_FAILED: 'general-settings:notifications:consumer-failed',
+  NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD: 'general-settings:notifications:consumer-suppress-on-dashboard',
 }
 
 const SETTINGS: PaperlessSettings[] = [
@@ -34,7 +38,11 @@ const SETTINGS: PaperlessSettings[] = [
   {key: SETTINGS_KEYS.DARK_MODE_ENABLED, type: "boolean", default: false},
   {key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, type: "boolean", default: false},
   {key: SETTINGS_KEYS.DATE_LOCALE, type: "string", default: ""},
-  {key: SETTINGS_KEYS.DATE_FORMAT, type: "string", default: "mediumDate"}
+  {key: SETTINGS_KEYS.DATE_FORMAT, type: "string", default: "mediumDate"},
+  {key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT, type: "boolean", default: true},
+  {key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS, type: "boolean", default: true},
+  {key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED, type: "boolean", default: true},
+  {key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD, type: "boolean", default: true},
 ]
 
 @Injectable({

From b0ed06003b1073a1457bf00815be4cea18c1415a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 17:56:06 +0100
Subject: [PATCH 1002/1300] better error messages

---
 src/documents/consumer.py          | 2 +-
 src/paperless_tesseract/parsers.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index d0f7399c8..05043201b 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -158,7 +158,7 @@ class Consumer(LoggingMixin):
         self.override_tag_ids = override_tag_ids
         self.task_id = task_id or str(uuid.uuid4())
 
-        self._send_progress(0, 100, 'WORKING', _('Received new file'))
+        self._send_progress(0, 100, 'STARTING', _('Received new file'))
 
         # this is for grouping logging entries for this particular file
         # together.
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 31e956284..52b50e983 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -190,11 +190,11 @@ class RasterisedDocumentParser(DocumentParser):
             # Also, no archived file.
             if not self.text:
                 # However, if we don't have anything, fail:
-                raise ParseError(e)
+                raise ParseError(e.__class__.__name__ + ": " + str(e))
 
         except Exception as e:
             # Anything else is probably serious.
-            raise ParseError(e)
+            raise ParseError(e.__class__.__name__ + ": " + str(e))
 
         if not self.text:
             # This may happen for files that don't have any text.

From 71d5af233d6b3c077fe9be09e4106d01957f5efa Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 17:57:16 +0100
Subject: [PATCH 1003/1300] update messages

---
 src/locale/en-us/LC_MESSAGES/django.po | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en-us/LC_MESSAGES/django.po
index 5451b8dde..8513c577b 100644
--- a/src/locale/en-us/LC_MESSAGES/django.po
+++ b/src/locale/en-us/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-26 14:59+0100\n"
+"POT-Creation-Date: 2021-01-27 17:57+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,8 +26,8 @@ msgid "File not found"
 msgstr "Datei nicht gefunden"
 
 #: documents/consumer.py:83
-msgid "Document is a duplicate"
-msgstr "Dokument existiert bereits"
+msgid "Document already exists"
+msgstr ""
 
 #: documents/consumer.py:99
 msgid "Pre-consume script does not exist."
@@ -674,3 +674,6 @@ msgstr ""
 #: paperless_mail/models.py:205
 msgid "assign this correspondent"
 msgstr ""
+
+#~ msgid "Document is a duplicate"
+#~ msgstr "Dokument existiert bereits"

From 3b541b22e858153f253c3aceb847bac6f1777c3e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 18:34:59 +0100
Subject: [PATCH 1004/1300] improved the logic of the "dismiss completed"
 button

---
 .../upload-file-widget/upload-file-widget.component.html | 8 ++++----
 .../upload-file-widget/upload-file-widget.component.scss | 9 ---------
 .../upload-file-widget/upload-file-widget.component.ts   | 3 +++
 src-ui/src/app/services/consumer-status.service.ts       | 4 ++++
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index a9658bcf7..45d63264a 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -1,12 +1,12 @@
-<app-widget-frame title="Upload new documents" i18n-title [class.has-multiple-status]="(getStatus().length + getStatusesHidden().length)> 1">
+<app-widget-frame title="Upload new documents" i18n-title>
   <div header-buttons>
-    <button type="button" class="btn btn-link dismiss-all" [disabled]="!getStatus().length" (click)="dismissAll()">
-      <small class="mr-1" i18n>Dismiss completed</small>
+    <a *ngIf="getStatusCompleted().length > 0" (click)="dismissAll()" [routerLink]="" >
+      <span i18n>Dismiss completed</span>&nbsp;
       <svg xmlns="http://www.w3.org/2000/svg" width="1rem" height="1rem" fill="currentColor" class="bi bi-check2-all" viewBox="0 0 16 16">
         <path d="M12.354 4.354a.5.5 0 0 0-.708-.708L5 10.293 1.854 7.146a.5.5 0 1 0-.708.708l3.5 3.5a.5.5 0 0 0 .708 0l7-7zm-4.208 7l-.896-.897.707-.707.543.543 6.646-6.647a.5.5 0 0 1 .708.708l-7 7a.5.5 0 0 1-.708 0z"/>
         <path d="M5.354 7.146l.896.897-.707.707-.897-.896a.5.5 0 1 1 .708-.708z"/>
       </svg>
-    </button>
+    </a>
   </div>
   <div content>
     <form>
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
index 5e404bb8e..b37606ff3 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss
@@ -23,15 +23,6 @@ form {
   }
 }
 
-.dismiss-all {
-  transition: opacity 0.2s ease;
-  opacity: 0;
-}
-
-.has-multiple-status .dismiss-all {
-  opacity: 1;
-}
-
 ::ng-deep .progress {
   position: absolute;
   top: 0;
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index 1c5ed5438..a6870e0e7 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -32,6 +32,9 @@ export class UploadFileWidgetComponent implements OnInit {
     return this.consumerStatusService.getConsumerStatus(FileStatusPhase.UPLOADING)
   }
 
+  getStatusCompleted() {
+    return this.consumerStatusService.getConsumerStatusCompleted()
+  }
   getTotalUploadProgress() {
     let current = 0
     let max = 0
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index feb04f3d6..c2169d51f 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -97,6 +97,10 @@ export class ConsumerStatusService {
     }
   }
 
+  getConsumerStatusCompleted() {
+    return this.consumerStatus.filter(s => s.phase == FileStatusPhase.FAILED || s.phase == FileStatusPhase.SUCCESS)
+  }
+
   connect() {
     this.disconnect()
     this.statusWebSocked = new WebSocket("ws://localhost:8000/ws/status/");

From 9167357908a761b1b2a1677d8ff3a38b4d41e442 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 18:47:02 +0100
Subject: [PATCH 1005/1300] update list view when documents are added

---
 .../document-list/document-list.component.ts  | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 509c0a735..0d1562c24 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,9 +1,11 @@
-import { AfterViewInit, Component, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
+import { AfterViewInit, Component, OnDestroy, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Subscription } from 'rxjs';
 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';
+import { ConsumerStatusService } from 'src/app/services/consumer-status.service';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
@@ -16,7 +18,7 @@ import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-vi
   templateUrl: './document-list.component.html',
   styleUrls: ['./document-list.component.scss']
 })
-export class DocumentListComponent implements OnInit {
+export class DocumentListComponent implements OnInit, OnDestroy {
 
   constructor(
     public list: DocumentListViewService,
@@ -24,7 +26,9 @@ export class DocumentListComponent implements OnInit {
     public route: ActivatedRoute,
     private router: Router,
     private toastService: ToastService,
-    private modalService: NgbModal) { }
+    private modalService: NgbModal,
+    private consumerStatusService: ConsumerStatusService
+  ) { }
 
   @ViewChild("filterEditor")
   private filterEditor: FilterEditorComponent
@@ -35,6 +39,8 @@ export class DocumentListComponent implements OnInit {
 
   filterRulesModified: boolean = false
 
+  private consumptionFinishedSubscription: Subscription
+
   get isFiltered() {
     return this.list.filterRules?.length > 0
   }
@@ -63,6 +69,9 @@ export class DocumentListComponent implements OnInit {
     if (localStorage.getItem('document-list:displayMode') != null) {
       this.displayMode = localStorage.getItem('document-list:displayMode')
     }
+    this.consumptionFinishedSubscription = this.consumerStatusService.onDocumentConsumptionFinished().subscribe(() => {
+      this.list.reload()
+    })
     this.route.paramMap.subscribe(params => {
       this.list.clear()
       if (params.has('id')) {
@@ -83,6 +92,12 @@ export class DocumentListComponent implements OnInit {
     })
   }
 
+  ngOnDestroy() {
+    if (this.consumptionFinishedSubscription) {
+      this.consumptionFinishedSubscription.unsubscribe()
+    }
+  }
+
   loadViewConfig(view: PaperlessSavedView) {
     this.list.load(view)
     this.list.reload()

From d9e6f6e07c327c26aec21d2e2dbd904625323850 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 19:11:18 +0100
Subject: [PATCH 1006/1300] add gunicorn again

---
 Pipfile          |  1 +
 Pipfile.lock     | 30 +++++++++++++++++++-----------
 requirements.txt |  3 ++-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Pipfile b/Pipfile
index e30abc064..884279142 100644
--- a/Pipfile
+++ b/Pipfile
@@ -18,6 +18,7 @@ django-q = "~=1.3.4"
 djangorestframework = "~=3.12.2"
 filelock = "*"
 fuzzywuzzy = "*"
+gunicorn = "*"
 imap-tools = "*"
 langdetect = "*"
 pdftotext = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index f60ac0223..1deb2913a 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "61ffe4b723ce6b04e67636f1572f833ee9adacdcf74a883c558ed4b0c906e75a"
+            "sha256": "80ebe7269056bd328736aea532b3baccb3314763cc76fabd8e6ca28d84c3b1c0"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -279,6 +279,14 @@
             "index": "pypi",
             "version": "==0.18.0"
         },
+        "gunicorn": {
+            "hashes": [
+                "sha256:1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626",
+                "sha256:cd4a810dd51bf497552cf3f863b575dabd73d6ad6a91075b65936b151cbf4f9c"
+            ],
+            "index": "pypi",
+            "version": "==20.0.4"
+        },
         "hiredis": {
             "hashes": [
                 "sha256:06a039208f83744a702279b894c8cf24c14fd63c59cd917dcde168b79eef0680",
@@ -1086,11 +1094,11 @@
         },
         "urllib3": {
             "hashes": [
-                "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08",
-                "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473"
+                "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80",
+                "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
-            "version": "==1.26.2"
+            "version": "==1.26.3"
         },
         "watchdog": {
             "hashes": [
@@ -1351,11 +1359,11 @@
         },
         "execnet": {
             "hashes": [
-                "sha256:cacb9df31c9680ec5f95553976c4da484d407e85e41c83cb812aa014f0eddc50",
-                "sha256:d4efd397930c46415f62f8a31388d6be4f27a91d7550eb79bc64a756e0056547"
+                "sha256:7a13113028b1e1cc4c6492b28098b3c6576c9dccc7973bfe47b342afadafb2ac",
+                "sha256:b73c5565e517f24b62dea8a5ceac178c661c4309d3aa0c3e420856c072c411b4"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.7.1"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==1.8.0"
         },
         "factory-boy": {
             "hashes": [
@@ -1721,11 +1729,11 @@
         },
         "urllib3": {
             "hashes": [
-                "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08",
-                "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473"
+                "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80",
+                "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
-            "version": "==1.26.2"
+            "version": "==1.26.3"
         },
         "virtualenv": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index a5a564a99..e1a382426 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -34,6 +34,7 @@ django==3.1.5
 djangorestframework==3.12.2
 filelock==3.0.12
 fuzzywuzzy==0.18.0
+gunicorn==20.0.4
 hiredis==1.1.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 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
@@ -85,7 +86,7 @@ twisted[tls]==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.
 txaio==20.12.1; python_version >= '3.6'
 typing-extensions==3.7.4.3; python_version < '3.8'
 tzlocal==2.1
-urllib3==1.26.2; 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.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
 watchdog==1.0.2
 wcwidth==0.2.5
 whitenoise==5.2.0

From a0a781a3d5d990ac89325a30fa0345f16e4f78b3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 19:11:50 +0100
Subject: [PATCH 1007/1300] i18n

---
 src-ui/messages.xlf                           | 33 +++++++++++--------
 .../upload-file-widget.component.html         |  2 +-
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index ec718acc6..84ca4888b 100644
--- a/src-ui/messages.xlf
+++ b/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">43</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2155249406916744630" datatype="html">
         <source>View &quot;<x id="PH" equiv-text="this.list.savedView.name"/>&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">94</context>
+          <context context-type="linenumber">109</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">115</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9ca82952a6bc860b5391d5975322d8af8ceddfa4" datatype="html">
@@ -1418,21 +1418,21 @@
         <source>Connecting...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">93</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1245343823699368872" datatype="html">
         <source>Uploading...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3994065460580948013" datatype="html">
         <source>Waiting for consumer...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">98</context>
+          <context context-type="linenumber">101</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e022072b3e4dd77e3f09960817ef3359a49963b3" datatype="html">
@@ -1442,13 +1442,6 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="bd4a8607e4a002d939cffb347ec056664dfb2c73" datatype="html">
-        <source>Dismiss completed</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="52d5d56b6667ba3f7c759cbc0d4c39d34a99701e" datatype="html">
         <source>Drop documents here or</source>
         <context-group purpose="location">
@@ -1463,6 +1456,20 @@
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="bd4a8607e4a002d939cffb347ec056664dfb2c73" datatype="html">
+        <source>Dismiss completed</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7cf3abd55bf1d2095435a050325927f083e6034e" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{getStatusesHidden().length}}"/> more hidden</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="710254a196a2649674438edf8a15b7ab1f48271b" datatype="html">
         <source>Open document</source>
         <context-group purpose="location">
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index 45d63264a..5cabb3c85 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -20,7 +20,7 @@
       <ng-container [ngTemplateOutlet]="consumerAlert" [ngTemplateOutletContext]="{ $implicit: status }"></ng-container>
     </div>
     <div *ngIf="getStatusesHidden().length" class="alerts-hidden">
-      <p *ngIf="!alertsExpanded" class="mt-3 mb-0 text-center">{{getStatusesHidden().length}} more hidden <button class="btn btn-sm btn-link py-0" (click)="alertsExpanded = !alertsExpanded" aria-controls="hiddenAlerts" [attr.aria-expanded]="alertsExpanded">Show all</button></p>
+      <p *ngIf="!alertsExpanded" class="mt-3 mb-0 text-center"><span i18n>{{getStatusesHidden().length}} more hidden</span> <button class="btn btn-sm btn-link py-0" (click)="alertsExpanded = !alertsExpanded" aria-controls="hiddenAlerts" [attr.aria-expanded]="alertsExpanded" i18n>Show all</button></p>
       <div #hiddenAlerts="ngbCollapse" [(ngbCollapse)]="!alertsExpanded">
         <div *ngFor="let status of getStatusesHidden()">
           <ng-container [ngTemplateOutlet]="consumerAlert" [ngTemplateOutletContext]="{ $implicit: status }"></ng-container>

From 7414b3d23aed1633a6f2ba60aa9ac57266fc3ab9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 19:57:04 +0100
Subject: [PATCH 1008/1300] update configuration

---
 Pipfile                             |   2 +-
 Pipfile.lock                        | 238 ++++++++++++++++++----------
 ansible/tasks/main.yml              |   2 +-
 docker/gunicorn.conf.py             |   2 +-
 docker/supervisord.conf             |   4 +-
 requirements.txt                    |  17 +-
 scripts/paperless-webserver.service |   2 +-
 7 files changed, 167 insertions(+), 100 deletions(-)

diff --git a/Pipfile b/Pipfile
index 884279142..c97ec297b 100644
--- a/Pipfile
+++ b/Pipfile
@@ -44,7 +44,7 @@ tqdm = "*"
 tika = "*"
 channels = "~=3.0"
 channels-redis = "*"
-daphne = "~=3.0"
+uvicorn = {extras = ["standard"], version = "*"}
 
 [dev-packages]
 coveralls = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 1deb2913a..5ae121105 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "80ebe7269056bd328736aea532b3baccb3314763cc76fabd8e6ca28d84c3b1c0"
+            "sha256": "33586bca793586bd4e413ae634780628b6df65a0d67b581c86ab4d2a16a817e0"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -155,6 +155,15 @@
             "markers": "python_version >= '3.1'",
             "version": "==4.0.0"
         },
+        "click": {
+            "hashes": [
+                "sha256:a3747c864f8e400a3664f5f4fd6dae11b4605bf6b727dae7b6f22ba9bd0a194a",
+                "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a",
+                "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==7.1.2"
+        },
         "coloredlogs": {
             "hashes": [
                 "sha256:5e78691e2673a8e294499e1832bb13efcfb44a86b92e18109fa18951093218ab",
@@ -196,7 +205,7 @@
                 "sha256:0052c9887600c57054a5867d4b0240159fa009faa3bcf6a1627271d9cdcb005a",
                 "sha256:c22b692707f514de9013651ecb687f2abe4f35cf6fe292ece634e9f1737bc7e3"
             ],
-            "index": "pypi",
+            "markers": "python_version >= '3.6'",
             "version": "==3.0.1"
         },
         "dateparser": {
@@ -287,6 +296,14 @@
             "index": "pypi",
             "version": "==20.0.4"
         },
+        "h11": {
+            "hashes": [
+                "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6",
+                "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==0.12.0"
+        },
         "hiredis": {
             "hashes": [
                 "sha256:06a039208f83744a702279b894c8cf24c14fd63c59cd917dcde168b79eef0680",
@@ -341,6 +358,25 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.1.0"
         },
+        "httptools": {
+            "hashes": [
+                "sha256:0a4b1b2012b28e68306575ad14ad5e9120b34fccd02a81eb08838d7e3bbb48be",
+                "sha256:3592e854424ec94bd17dc3e0c96a64e459ec4147e6d53c0a42d0ebcef9cb9c5d",
+                "sha256:41b573cf33f64a8f8f3400d0a7faf48e1888582b6f6e02b82b9bd4f0bf7497ce",
+                "sha256:56b6393c6ac7abe632f2294da53f30d279130a92e8ae39d8d14ee2e1b05ad1f2",
+                "sha256:7f6c82262d3bdde886a29ae0d65d4fae6b3ac6fba763891ddb72e72e1dbe7075",
+                "sha256:86c6acd66765a934e8730bf0e9dfaac6fdcf2a4334212bd4a0a1c78f16475ca6",
+                "sha256:96da81e1992be8ac2fd5597bf0283d832287e20cb3cfde8996d2b00356d4e17f",
+                "sha256:96eb359252aeed57ea5c7b3d79839aaa0382c9d3149f7d24dd7172b1bcecb009",
+                "sha256:a2719e1d7a84bb131c4f1e0cb79705034b48de6ae486eb5297a139d6a3296dce",
+                "sha256:ac0aa11e99454b6a66989aa2d44bca41d4e0f968e395a0a8f164b401fefe359a",
+                "sha256:bc3114b9edbca5a1eb7ae7db698c669eb53eb8afbbebdde116c174925260849c",
+                "sha256:cb46a65a0ed99c38dfcbf9f5be8be6cf9cb497e527505fefac7cbd38a467f3c6",
+                "sha256:fa3cd71e31436911a44620473e873a256851e1f53dee56669dae403ba41756a4",
+                "sha256:fea04e126014169384dee76a153d4573d90d0cbd1d12185da089f73c78390437"
+            ],
+            "version": "==0.1.1"
+        },
         "humanfriendly": {
             "hashes": [
                 "sha256:066562956639ab21ff2676d1fda0b5987e985c534fc76700a19bd54bcb81121d",
@@ -380,14 +416,6 @@
             ],
             "version": "==0.4.0"
         },
-        "importlib-metadata": {
-            "hashes": [
-                "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771",
-                "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d"
-            ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.4.0"
-        },
         "incremental": {
             "hashes": [
                 "sha256:717e12246dddf231a349175f48d74d93e2897244939173b01974ab6661406b9f",
@@ -754,6 +782,7 @@
                 "sha256:4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51",
                 "sha256:818ae18e06922c066f777a33f1fca45786d85edfe71cd043de6379337a7f274b"
             ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==20.0.1"
         },
         "python-dateutil": {
@@ -804,6 +833,32 @@
             ],
             "version": "==2020.5"
         },
+        "pyyaml": {
+            "hashes": [
+                "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf",
+                "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696",
+                "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393",
+                "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77",
+                "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922",
+                "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5",
+                "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8",
+                "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10",
+                "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc",
+                "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018",
+                "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e",
+                "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253",
+                "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183",
+                "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb",
+                "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185",
+                "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db",
+                "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46",
+                "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b",
+                "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63",
+                "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df",
+                "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"
+            ],
+            "version": "==5.4.1"
+        },
         "redis": {
             "hashes": [
                 "sha256:0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2",
@@ -950,35 +1005,29 @@
         },
         "scipy": {
             "hashes": [
-                "sha256:168c45c0c32e23f613db7c9e4e780bc61982d71dcd406ead746c7c7c2f2004ce",
-                "sha256:213bc59191da2f479984ad4ec39406bf949a99aba70e9237b916ce7547b6ef42",
-                "sha256:25b241034215247481f53355e05f9e25462682b13bd9191359075682adcd9554",
-                "sha256:2c872de0c69ed20fb1a9b9cf6f77298b04a26f0b8720a5457be08be254366c6e",
-                "sha256:3397c129b479846d7eaa18f999369a24322d008fac0782e7828fa567358c36ce",
-                "sha256:368c0f69f93186309e1b4beb8e26d51dd6f5010b79264c0f1e9ca00cd92ea8c9",
-                "sha256:3d5db5d815370c28d938cf9b0809dade4acf7aba57eaf7ef733bfedc9b2474c4",
-                "sha256:4598cf03136067000855d6b44d7a1f4f46994164bcd450fb2c3d481afc25dd06",
-                "sha256:4a453d5e5689de62e5d38edf40af3f17560bfd63c9c5bd228c18c1f99afa155b",
-                "sha256:4f12d13ffbc16e988fa40809cbbd7a8b45bc05ff6ea0ba8e3e41f6f4db3a9e47",
-                "sha256:634568a3018bc16a83cda28d4f7aed0d803dd5618facb36e977e53b2df868443",
-                "sha256:65923bc3809524e46fb7eb4d6346552cbb6a1ffc41be748535aa502a2e3d3389",
-                "sha256:6b0ceb23560f46dd236a8ad4378fc40bad1783e997604ba845e131d6c680963e",
-                "sha256:8c8d6ca19c8497344b810b0b0344f8375af5f6bb9c98bd42e33f747417ab3f57",
-                "sha256:9ad4fcddcbf5dc67619379782e6aeef41218a79e17979aaed01ed099876c0e62",
-                "sha256:a254b98dbcc744c723a838c03b74a8a34c0558c9ac5c86d5561703362231107d",
-                "sha256:b03c4338d6d3d299e8ca494194c0ae4f611548da59e3c038813f1a43976cb437",
-                "sha256:b5e9d3e4474644915809d6aa1416ff20430a3ed9ae723a5d295da5ddb24985e2",
-                "sha256:cc1f78ebc982cd0602c9a7615d878396bec94908db67d4ecddca864d049112f2",
-                "sha256:d6d25c41a009e3c6b7e757338948d0076ee1dd1770d1c09ec131f11946883c54",
-                "sha256:d84cadd7d7998433334c99fa55bcba0d8b4aeff0edb123b2a1dfcface538e474",
-                "sha256:e360cb2299028d0b0d0f65a5c5e51fc16a335f1603aa2357c25766c8dab56938",
-                "sha256:e98d49a5717369d8241d6cf33ecb0ca72deee392414118198a8e5b4c35c56340",
-                "sha256:ed572470af2438b526ea574ff8f05e7f39b44ac37f712105e57fc4d53a6fb660",
-                "sha256:f87b39f4d69cf7d7529d7b1098cb712033b17ea7714aed831b95628f483fd012",
-                "sha256:fa789583fc94a7689b45834453fec095245c7e69c58561dc159b5d5277057e4c"
+                "sha256:155225621df90fcd151e25d51c50217e412de717475999ebb76e17e310176981",
+                "sha256:1bc5b446600c4ff7ab36bade47180673141322f0febaa555f1c433fe04f2a0e3",
+                "sha256:2f1c2ebca6fd867160e70102200b1bd07b3b2d31a3e6af3c58d688c15d0d07b7",
+                "sha256:313785c4dab65060f9648112d025f6d2fec69a8a889c714328882d678a95f053",
+                "sha256:31ab217b5c27ab429d07428a76002b33662f98986095bbce5d55e0788f7e8b15",
+                "sha256:3d4303e3e21d07d9557b26a1707bb9fc065510ee8501c9bf22a0157249a82fd0",
+                "sha256:4f1d9cc977ac6a4a63c124045c1e8bf67ec37098f67c699887a93736961a00ae",
+                "sha256:58731bbe0103e96b89b2f41516699db9b63066e4317e31b8402891571f6d358f",
+                "sha256:8629135ee00cc2182ac8be8e75643b9f02235942443732c2ed69ab48edcb6614",
+                "sha256:876badc33eec20709d4e042a09834f5953ebdac4088d45a4f3a1f18b56885718",
+                "sha256:8840a9adb4ede3751f49761653d3ebf664f25195fdd42ada394ffea8903dd51d",
+                "sha256:aef3a2dbc436bbe8f6e0b635f0b5fe5ed024b522eee4637dbbe0b974129ca734",
+                "sha256:b8af26839ae343655f3ca377a5d5e5466f1d3b3ac7432a43449154fe958ae0e0",
+                "sha256:c0911f3180de343643f369dc5cfedad6ba9f939c2d516bddea4a6871eb000722",
+                "sha256:cb6dc9f82dfd95f6b9032a8d7ea70efeeb15d5b5fd6ed4e8537bb3c673580566",
+                "sha256:cdbc47628184a0ebeb5c08f1892614e1bd4a51f6e0d609c6eed253823a960f5b",
+                "sha256:d902d3a5ad7f28874c0a82db95246d24ca07ad932741df668595fe00a4819870",
+                "sha256:eab389aba0ad8b5e6b5abdc3337ade46823df75f80a8edd4c67833567577cb3d",
+                "sha256:eb7928275f3560d47e5538e15e9f32b3d64cd30ea8f85f3e82987425476f53f6",
+                "sha256:f68d5761a2d2376e2b194c8e9192bbf7c51306ca176f1a0889990a52ef0d551f"
             ],
-            "markers": "python_version >= '3.6'",
-            "version": "==1.5.4"
+            "markers": "python_version >= '3.7'",
+            "version": "==1.6.0"
         },
         "service-identity": {
             "hashes": [
@@ -1076,15 +1125,6 @@
             "markers": "python_version >= '3.6'",
             "version": "==20.12.1"
         },
-        "typing-extensions": {
-            "hashes": [
-                "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
-                "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
-                "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
-            ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.7.4.3"
-        },
         "tzlocal": {
             "hashes": [
                 "sha256:643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44",
@@ -1100,6 +1140,33 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
             "version": "==1.26.3"
         },
+        "uvicorn": {
+            "extras": [
+                "standard"
+            ],
+            "hashes": [
+                "sha256:1079c50a06f6338095b4f203e7861dbff318dde5f22f3a324fc6e94c7654164c",
+                "sha256:ef1e0bb5f7941c6fe324e06443ddac0331e1632a776175f87891c7bd02694355"
+            ],
+            "index": "pypi",
+            "version": "==0.13.3"
+        },
+        "uvloop": {
+            "hashes": [
+                "sha256:08b109f0213af392150e2fe6f81d33261bb5ce968a288eb698aad4f46eb711bd",
+                "sha256:123ac9c0c7dd71464f58f1b4ee0bbd81285d96cdda8bc3519281b8973e3a461e",
+                "sha256:2e57a28567d874afd803b6d8a7aeee7bfa0a34994f1b237837e6d7e525cea9a4",
+                "sha256:4315d2ec3ca393dd5bc0b0089d23101276778c304d42faff5dc4579cb6caef09",
+                "sha256:4544dcf77d74f3a84f03dd6278174575c44c67d7165d4c42c71db3fdc3860726",
+                "sha256:63c0bd965e73a4e8dde6a15635262ec38036d83327230552ada21298ee5fa3b7",
+                "sha256:afd5513c0ae414ec71d24f6f123614a80f3d27ca655a4fcf6cabe50994cc1891",
+                "sha256:b4f591aa4b3fa7f32fb51e2ee9fea1b495eb75b0b3c8d0ca52514ad675ae63f7",
+                "sha256:bcac356d62edd330080aed082e78d4b580ff260a677508718f88016333e2c9c5",
+                "sha256:e7514d7a48c063226b7d06617cbb12a14278d4323a065a8d46a7962686ce2e95",
+                "sha256:f07909cd9fc08c52d294b1570bba92186181ca01fe3dc9ffba68955273dd7362"
+            ],
+            "version": "==0.14.0"
+        },
         "watchdog": {
             "hashes": [
                 "sha256:016b01495b9c55b5d4126ed8ae75d93ea0d99377084107c33162df52887cee18",
@@ -1123,6 +1190,14 @@
             "index": "pypi",
             "version": "==1.0.2"
         },
+        "watchgod": {
+            "hashes": [
+                "sha256:59700dab7445aa8e6067a5b94f37bae90fc367554549b1ed2e9d0f4f38a90d2a",
+                "sha256:5fb60afa9558b79736395db1cb60ad3ed59df5c2f507a3ff729220cf1251ffdc",
+                "sha256:e9cca0ab9c63f17fc85df9fd8bd18156ff00aff04ebe5976cee473f4968c6858"
+            ],
+            "version": "==0.6"
+        },
         "wcwidth": {
             "hashes": [
                 "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784",
@@ -1130,6 +1205,34 @@
             ],
             "version": "==0.2.5"
         },
+        "websockets": {
+            "hashes": [
+                "sha256:0e4fb4de42701340bd2353bb2eee45314651caa6ccee80dbd5f5d5978888fed5",
+                "sha256:1d3f1bf059d04a4e0eb4985a887d49195e15ebabc42364f4eb564b1d065793f5",
+                "sha256:20891f0dddade307ffddf593c733a3fdb6b83e6f9eef85908113e628fa5a8308",
+                "sha256:295359a2cc78736737dd88c343cd0747546b2174b5e1adc223824bcaf3e164cb",
+                "sha256:2db62a9142e88535038a6bcfea70ef9447696ea77891aebb730a333a51ed559a",
+                "sha256:3762791ab8b38948f0c4d281c8b2ddfa99b7e510e46bd8dfa942a5fff621068c",
+                "sha256:3db87421956f1b0779a7564915875ba774295cc86e81bc671631379371af1170",
+                "sha256:3ef56fcc7b1ff90de46ccd5a687bbd13a3180132268c4254fc0fa44ecf4fc422",
+                "sha256:4f9f7d28ce1d8f1295717c2c25b732c2bc0645db3215cf757551c392177d7cb8",
+                "sha256:5c01fd846263a75bc8a2b9542606927cfad57e7282965d96b93c387622487485",
+                "sha256:5c65d2da8c6bce0fca2528f69f44b2f977e06954c8512a952222cea50dad430f",
+                "sha256:745a1c8ca62f7d27de42b517ca7c6f716d1eb96c5aa73cf6407936c0167cbb3c",
+                "sha256:751a556205d8245ff94aeef23546a1113b1dd4f6e4d102ded66c39b99c2ce6c8",
+                "sha256:7ff46d441db78241f4c6c27b3868c9ae71473fe03341340d2dfdbe8d79310acc",
+                "sha256:965889d9f0e2a75edd81a07592d0ced54daa5b0785f57dc429c378edbcffe779",
+                "sha256:9b248ba3dd8a03b1a10b19efe7d4f7fa41d158fdaa95e2cf65af5a7b95a4f989",
+                "sha256:9bef37ee224e104a413f0780e29adb3e514a5b698aabe0d969a6ba426b8435d1",
+                "sha256:c1ec8db4fac31850286b7cd3b9c0e1b944204668b8eb721674916d4e28744092",
+                "sha256:c8a116feafdb1f84607cb3b14aa1418424ae71fee131642fc568d21423b51824",
+                "sha256:ce85b06a10fc65e6143518b96d3dca27b081a740bae261c2fb20375801a9d56d",
+                "sha256:d705f8aeecdf3262379644e4b55107a3b55860eb812b673b28d0fbc347a60c55",
+                "sha256:e898a0863421650f0bebac8ba40840fc02258ef4714cb7e1fd76b6a6354bda36",
+                "sha256:f8a7bff6e8664afc4e6c28b983845c5bc14965030e3fb98789734d416af77c4b"
+            ],
+            "version": "==8.1"
+        },
         "whitenoise": {
             "hashes": [
                 "sha256:05ce0be39ad85740a78750c86a93485c40f08ad8c62a6006de0233765996e5c7",
@@ -1147,14 +1250,6 @@
             "index": "pypi",
             "version": "==2.7.4"
         },
-        "zipp": {
-            "hashes": [
-                "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108",
-                "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.4.0"
-        },
         "zope.interface": {
             "hashes": [
                 "sha256:05a97ba92c1c7c26f25c9f671aa1ef85ffead6cdad13770e5b689cf983adc7e1",
@@ -1406,22 +1501,6 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.2.0"
         },
-        "importlib-metadata": {
-            "hashes": [
-                "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771",
-                "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d"
-            ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.4.0"
-        },
-        "importlib-resources": {
-            "hashes": [
-                "sha256:885b8eae589179f661c909d699a546cf10d83692553e34dca1bf5eb06f7f6217",
-                "sha256:bfdad047bce441405a49cf8eb48ddce5e56c696e185f59147a8b79e75e9e6380"
-            ],
-            "markers": "python_version < '3.7'",
-            "version": "==5.1.0"
-        },
         "iniconfig": {
             "hashes": [
                 "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3",
@@ -1718,15 +1797,6 @@
             "index": "pypi",
             "version": "==3.21.2"
         },
-        "typing-extensions": {
-            "hashes": [
-                "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
-                "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
-                "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
-            ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.7.4.3"
-        },
         "urllib3": {
             "hashes": [
                 "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80",
@@ -1742,14 +1812,6 @@
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==20.4.0"
-        },
-        "zipp": {
-            "hashes": [
-                "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108",
-                "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.4.0"
         }
     }
 }
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index a353a18ec..6412fa30f 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -418,7 +418,7 @@
     path: "{{ paperlessng_directory }}/scripts/paperless-webserver.service"
     section: "Service"
     option: "ExecStart"
-    value: "{{ paperlessng_virtualenv }}/bin/gunicorn paperless.wsgi -w 2 -b {{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}"
+    value: "{{ paperlessng_virtualenv }}/bin/gunicorn paperless.asgi:application -w 2 -k uvicorn.workers.UvicornWorker -b {{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}"
 
 - name: copy systemd services
   copy:
diff --git a/docker/gunicorn.conf.py b/docker/gunicorn.conf.py
index edfb362d9..36bde9cf7 100644
--- a/docker/gunicorn.conf.py
+++ b/docker/gunicorn.conf.py
@@ -1,7 +1,7 @@
 bind = '0.0.0.0:8000'
 backlog = 2048
 workers = 3
-worker_class = 'sync'
+worker_class = 'uvicorn.workers.UvicornWorker'
 worker_connections = 1000
 timeout = 20
 keepalive = 2
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
index a643b1136..fca66c83c 100644
--- a/docker/supervisord.conf
+++ b/docker/supervisord.conf
@@ -7,8 +7,8 @@ logfile_backups=10           ; # of main logfile backups; 0 means none, default
 loglevel=info                ; log level; default info; others: debug,warn,trace
 user=root
 
-[program:daphne]
-command=daphne -b 0.0.0.0 -p 8000 paperless.asgi:application
+[program:gunicorn]
+command=gunicorn -c /usr/src/paperless/gunicorn.conf.py paperless.asgi:application
 user=paperless
 
 stdout_logfile=/dev/stdout
diff --git a/requirements.txt b/requirements.txt
index e1a382426..c0228d378 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,10 +20,11 @@ cffi==1.14.4
 channels-redis==3.2.0
 channels==3.0.3
 chardet==4.0.0; python_version >= '3.1'
+click==7.1.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 coloredlogs==15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 constantly==15.1.0
 cryptography==3.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
-daphne==3.0.1
+daphne==3.0.1; python_version >= '3.6'
 dateparser==0.7.6
 django-cors-headers==3.7.0
 django-extensions==3.1.0
@@ -35,13 +36,14 @@ djangorestframework==3.12.2
 filelock==3.0.12
 fuzzywuzzy==0.18.0
 gunicorn==20.0.4
+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'
+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.36.0
 img2pdf==0.4.0
-importlib-metadata==3.4.0; python_version < '3.8'
 incremental==17.5.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
@@ -62,19 +64,20 @@ 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'
 pyhamcrest==2.0.2; python_version >= '3.5'
-pyopenssl==20.0.1
+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-levenshtein==0.12.1
 python-magic==0.4.18
 pytz==2020.5
+pyyaml==5.4.1
 redis==3.5.3
 regex==2020.11.13
 reportlab==3.5.60
 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; python_version >= '3.6'
+scipy==1.6.0; python_version >= '3.7'
 service-identity==18.1.0
 six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 sortedcontainers==2.3.0
@@ -84,12 +87,14 @@ tika==1.24
 tqdm==4.56.0
 twisted[tls]==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 txaio==20.12.1; python_version >= '3.6'
-typing-extensions==3.7.4.3; python_version < '3.8'
 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'
+uvicorn[standard]==0.13.3
+uvloop==0.14.0
 watchdog==1.0.2
+watchgod==0.6
 wcwidth==0.2.5
+websockets==8.1
 whitenoise==5.2.0
 whoosh==2.7.4
-zipp==3.4.0; python_version >= '3.6'
 zope.interface==5.2.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
diff --git a/scripts/paperless-webserver.service b/scripts/paperless-webserver.service
index a43110be2..77d2def34 100644
--- a/scripts/paperless-webserver.service
+++ b/scripts/paperless-webserver.service
@@ -8,7 +8,7 @@ Requires=redis.service
 User=paperless
 Group=paperless
 WorkingDirectory=/opt/paperless/src
-ExecStart=/opt/paperless/.local/bin/gunicorn paperless.wsgi -w 2 -b 0.0.0.0:8000
+ExecStart=/opt/paperless/.local/bin/gunicorn paperless.asgi:application -w 2 -k uvicorn.workers.UvicornWorker -b 0.0.0.0:8000
 
 [Install]
 WantedBy=multi-user.target

From d2a8bc5c4c9e3642a2bb7b4890d290313f15ed85 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 20:08:09 +0100
Subject: [PATCH 1009/1300] fix redis configuration

---
 src/paperless/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index b36ab6cf1..678ce5a21 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -160,7 +160,7 @@ CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels_redis.core.RedisChannelLayer",
         "CONFIG": {
-            "hosts": ["redis://localhost:6379"],
+            "hosts": [os.getenv("PAPERLESS_REDIS", "redis://localhost:6379")],
         },
     },
 }

From 29e1b51164ac531c965c921b0b6ed48e777e74bb Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 20:27:06 +0100
Subject: [PATCH 1010/1300] add python 3.9 for tests

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 03b789bb7..e92afcc06 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8']
+        python-version: ['3.6', '3.7', '3.8', '3.9']
       fail-fast: false
     steps:
       -

From 062008269b8d8cd2a79d1fcd9b1dab5365ab9280 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 20:27:40 +0100
Subject: [PATCH 1011/1300] prevent updates to scipy, since 1.6 is incompatible
 with python 3.6

---
 Pipfile          |   2 +
 Pipfile.lock     | 110 +++++++++++++++++++++++++++++++++++++----------
 requirements.txt |   5 ++-
 3 files changed, 93 insertions(+), 24 deletions(-)

diff --git a/Pipfile b/Pipfile
index c97ec297b..95d845d1f 100644
--- a/Pipfile
+++ b/Pipfile
@@ -35,6 +35,8 @@ psycopg2-binary = "*"
 redis = "*"
 # Pinned because aarch64 wheels and updates cause warnings when loading the classifier model.
 scikit-learn="==0.24.0"
+# Prevent scipy updates because 1.6 is incompatible with python 3.6
+scipy="~=1.5.4"
 whitenoise = "~=5.2.0"
 watchdog = "*"
 whoosh="~=2.7.4"
diff --git a/Pipfile.lock b/Pipfile.lock
index 5ae121105..b8cb29b29 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "33586bca793586bd4e413ae634780628b6df65a0d67b581c86ab4d2a16a817e0"
+            "sha256": "d80d2539a4528a8fd9e848875c2e2d5bcdb3e98154f45b612706094b84ecaaea"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -416,6 +416,14 @@
             ],
             "version": "==0.4.0"
         },
+        "importlib-metadata": {
+            "hashes": [
+                "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771",
+                "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==3.4.0"
+        },
         "incremental": {
             "hashes": [
                 "sha256:717e12246dddf231a349175f48d74d93e2897244939173b01974ab6661406b9f",
@@ -1005,29 +1013,35 @@
         },
         "scipy": {
             "hashes": [
-                "sha256:155225621df90fcd151e25d51c50217e412de717475999ebb76e17e310176981",
-                "sha256:1bc5b446600c4ff7ab36bade47180673141322f0febaa555f1c433fe04f2a0e3",
-                "sha256:2f1c2ebca6fd867160e70102200b1bd07b3b2d31a3e6af3c58d688c15d0d07b7",
-                "sha256:313785c4dab65060f9648112d025f6d2fec69a8a889c714328882d678a95f053",
-                "sha256:31ab217b5c27ab429d07428a76002b33662f98986095bbce5d55e0788f7e8b15",
-                "sha256:3d4303e3e21d07d9557b26a1707bb9fc065510ee8501c9bf22a0157249a82fd0",
-                "sha256:4f1d9cc977ac6a4a63c124045c1e8bf67ec37098f67c699887a93736961a00ae",
-                "sha256:58731bbe0103e96b89b2f41516699db9b63066e4317e31b8402891571f6d358f",
-                "sha256:8629135ee00cc2182ac8be8e75643b9f02235942443732c2ed69ab48edcb6614",
-                "sha256:876badc33eec20709d4e042a09834f5953ebdac4088d45a4f3a1f18b56885718",
-                "sha256:8840a9adb4ede3751f49761653d3ebf664f25195fdd42ada394ffea8903dd51d",
-                "sha256:aef3a2dbc436bbe8f6e0b635f0b5fe5ed024b522eee4637dbbe0b974129ca734",
-                "sha256:b8af26839ae343655f3ca377a5d5e5466f1d3b3ac7432a43449154fe958ae0e0",
-                "sha256:c0911f3180de343643f369dc5cfedad6ba9f939c2d516bddea4a6871eb000722",
-                "sha256:cb6dc9f82dfd95f6b9032a8d7ea70efeeb15d5b5fd6ed4e8537bb3c673580566",
-                "sha256:cdbc47628184a0ebeb5c08f1892614e1bd4a51f6e0d609c6eed253823a960f5b",
-                "sha256:d902d3a5ad7f28874c0a82db95246d24ca07ad932741df668595fe00a4819870",
-                "sha256:eab389aba0ad8b5e6b5abdc3337ade46823df75f80a8edd4c67833567577cb3d",
-                "sha256:eb7928275f3560d47e5538e15e9f32b3d64cd30ea8f85f3e82987425476f53f6",
-                "sha256:f68d5761a2d2376e2b194c8e9192bbf7c51306ca176f1a0889990a52ef0d551f"
+                "sha256:168c45c0c32e23f613db7c9e4e780bc61982d71dcd406ead746c7c7c2f2004ce",
+                "sha256:213bc59191da2f479984ad4ec39406bf949a99aba70e9237b916ce7547b6ef42",
+                "sha256:25b241034215247481f53355e05f9e25462682b13bd9191359075682adcd9554",
+                "sha256:2c872de0c69ed20fb1a9b9cf6f77298b04a26f0b8720a5457be08be254366c6e",
+                "sha256:3397c129b479846d7eaa18f999369a24322d008fac0782e7828fa567358c36ce",
+                "sha256:368c0f69f93186309e1b4beb8e26d51dd6f5010b79264c0f1e9ca00cd92ea8c9",
+                "sha256:3d5db5d815370c28d938cf9b0809dade4acf7aba57eaf7ef733bfedc9b2474c4",
+                "sha256:4598cf03136067000855d6b44d7a1f4f46994164bcd450fb2c3d481afc25dd06",
+                "sha256:4a453d5e5689de62e5d38edf40af3f17560bfd63c9c5bd228c18c1f99afa155b",
+                "sha256:4f12d13ffbc16e988fa40809cbbd7a8b45bc05ff6ea0ba8e3e41f6f4db3a9e47",
+                "sha256:634568a3018bc16a83cda28d4f7aed0d803dd5618facb36e977e53b2df868443",
+                "sha256:65923bc3809524e46fb7eb4d6346552cbb6a1ffc41be748535aa502a2e3d3389",
+                "sha256:6b0ceb23560f46dd236a8ad4378fc40bad1783e997604ba845e131d6c680963e",
+                "sha256:8c8d6ca19c8497344b810b0b0344f8375af5f6bb9c98bd42e33f747417ab3f57",
+                "sha256:9ad4fcddcbf5dc67619379782e6aeef41218a79e17979aaed01ed099876c0e62",
+                "sha256:a254b98dbcc744c723a838c03b74a8a34c0558c9ac5c86d5561703362231107d",
+                "sha256:b03c4338d6d3d299e8ca494194c0ae4f611548da59e3c038813f1a43976cb437",
+                "sha256:b5e9d3e4474644915809d6aa1416ff20430a3ed9ae723a5d295da5ddb24985e2",
+                "sha256:cc1f78ebc982cd0602c9a7615d878396bec94908db67d4ecddca864d049112f2",
+                "sha256:d6d25c41a009e3c6b7e757338948d0076ee1dd1770d1c09ec131f11946883c54",
+                "sha256:d84cadd7d7998433334c99fa55bcba0d8b4aeff0edb123b2a1dfcface538e474",
+                "sha256:e360cb2299028d0b0d0f65a5c5e51fc16a335f1603aa2357c25766c8dab56938",
+                "sha256:e98d49a5717369d8241d6cf33ecb0ca72deee392414118198a8e5b4c35c56340",
+                "sha256:ed572470af2438b526ea574ff8f05e7f39b44ac37f712105e57fc4d53a6fb660",
+                "sha256:f87b39f4d69cf7d7529d7b1098cb712033b17ea7714aed831b95628f483fd012",
+                "sha256:fa789583fc94a7689b45834453fec095245c7e69c58561dc159b5d5277057e4c"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==1.6.0"
+            "index": "pypi",
+            "version": "==1.5.4"
         },
         "service-identity": {
             "hashes": [
@@ -1125,6 +1139,15 @@
             "markers": "python_version >= '3.6'",
             "version": "==20.12.1"
         },
+        "typing-extensions": {
+            "hashes": [
+                "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
+                "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
+                "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==3.7.4.3"
+        },
         "tzlocal": {
             "hashes": [
                 "sha256:643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44",
@@ -1250,6 +1273,14 @@
             "index": "pypi",
             "version": "==2.7.4"
         },
+        "zipp": {
+            "hashes": [
+                "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108",
+                "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==3.4.0"
+        },
         "zope.interface": {
             "hashes": [
                 "sha256:05a97ba92c1c7c26f25c9f671aa1ef85ffead6cdad13770e5b689cf983adc7e1",
@@ -1501,6 +1532,22 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.2.0"
         },
+        "importlib-metadata": {
+            "hashes": [
+                "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771",
+                "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==3.4.0"
+        },
+        "importlib-resources": {
+            "hashes": [
+                "sha256:885b8eae589179f661c909d699a546cf10d83692553e34dca1bf5eb06f7f6217",
+                "sha256:bfdad047bce441405a49cf8eb48ddce5e56c696e185f59147a8b79e75e9e6380"
+            ],
+            "markers": "python_version < '3.7'",
+            "version": "==5.1.0"
+        },
         "iniconfig": {
             "hashes": [
                 "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3",
@@ -1797,6 +1844,15 @@
             "index": "pypi",
             "version": "==3.21.2"
         },
+        "typing-extensions": {
+            "hashes": [
+                "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
+                "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
+                "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==3.7.4.3"
+        },
         "urllib3": {
             "hashes": [
                 "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80",
@@ -1812,6 +1868,14 @@
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==20.4.0"
+        },
+        "zipp": {
+            "hashes": [
+                "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108",
+                "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==3.4.0"
         }
     }
 }
diff --git a/requirements.txt b/requirements.txt
index c0228d378..0c6deff1d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -44,6 +44,7 @@ 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.36.0
 img2pdf==0.4.0
+importlib-metadata==3.4.0; python_version < '3.8'
 incremental==17.5.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
@@ -77,7 +78,7 @@ regex==2020.11.13
 reportlab==3.5.60
 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.6.0; python_version >= '3.7'
+scipy==1.5.4
 service-identity==18.1.0
 six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 sortedcontainers==2.3.0
@@ -87,6 +88,7 @@ tika==1.24
 tqdm==4.56.0
 twisted[tls]==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 txaio==20.12.1; python_version >= '3.6'
+typing-extensions==3.7.4.3; python_version < '3.8'
 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'
 uvicorn[standard]==0.13.3
@@ -97,4 +99,5 @@ wcwidth==0.2.5
 websockets==8.1
 whitenoise==5.2.0
 whoosh==2.7.4
+zipp==3.4.0; python_version >= '3.6'
 zope.interface==5.2.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'

From 41fe607157710bcdb54ad3e6802cc3ab293c6916 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 27 Jan 2021 20:45:14 +0100
Subject: [PATCH 1012/1300] documentation

---
 docs/setup.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index a3a0bd1e8..60a8b79d4 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -244,7 +244,7 @@ writing. Windows is not and will never be supported.
 
 1.  Install dependencies. Paperless requires the following packages.
 
-    *   ``python3`` 3.6, 3.7, 3.8 (3.9 is untested).
+    *   ``python3`` 3.6, 3.7, 3.8, 3.9
     *   ``python3-pip``, optionally ``pipenv`` for package installation
     *   ``python3-dev``
 

From fafe259e537b30301b604b6ec3ff8c6aef5cad36 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 28 Jan 2021 10:54:56 +0100
Subject: [PATCH 1013/1300] added a status summary line

---
 src-ui/messages.xlf                           | 35 +++++++++++++++----
 .../upload-file-widget.component.html         |  9 ++---
 .../upload-file-widget.component.ts           | 27 +++++++++++++-
 .../app/services/consumer-status.service.ts   |  6 +++-
 4 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 84ca4888b..93f970d86 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -1414,25 +1414,46 @@
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="6443586946875325554" datatype="html">
+        <source>Processing: <x id="PH" equiv-text="countUploadingAndProcessing"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9182918211699394982" datatype="html">
+        <source>Failed: <x id="PH" equiv-text="countFailed"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="534116346205124059" datatype="html">
+        <source>Added: <x id="PH" equiv-text="countSuccess"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="3852289441366561594" datatype="html">
         <source>Connecting...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">93</context>
+          <context context-type="linenumber">118</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1245343823699368872" datatype="html">
         <source>Uploading...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">98</context>
+          <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3994065460580948013" datatype="html">
         <source>Waiting for consumer...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">101</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e022072b3e4dd77e3f09960817ef3359a49963b3" datatype="html">
@@ -1463,18 +1484,18 @@
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="7cf3abd55bf1d2095435a050325927f083e6034e" datatype="html">
-        <source><x id="INTERPOLATION" equiv-text="{{getStatusesHidden().length}}"/> more hidden</source>
+      <trans-unit id="1fc4e0a1e93fdda0ed3c9e590971d283afb68265" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{getStatusHidden().length}}"/> more hidden</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit id="710254a196a2649674438edf8a15b7ab1f48271b" datatype="html">
         <source>Open document</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">40</context>
+          <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
       <trans-unit id="45854ddec74086b271e62be6a363f4fa5036f7fc" datatype="html">
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index 5cabb3c85..3e2908b84 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -12,17 +12,18 @@
     <form>
       <ngx-file-drop dropZoneLabel="Drop documents here or" browseBtnLabel="Browse files" (onFileDrop)="dropped($event)"
         (onFileOver)="fileOver($event)" (onFileLeave)="fileLeave($event)" dropZoneClassName="bg-light card"
-        multiple="true" contentClassName="justify-content-center d-flex align-items-center p-5" [showBrowseBtn]=true
+        multiple="true" contentClassName="justify-content-center d-flex align-items-center py-5 px-2" [showBrowseBtn]=true
         browseBtnClassName="btn btn-sm btn-outline-primary ml-2" i18n-dropZoneLabel i18n-browseBtnLabel>
       </ngx-file-drop>
     </form>
+    <p class="mt-3" *ngIf="getStatus().length > 0">{{getStatusSummary()}}</p>
     <div *ngFor="let status of getStatus()">
       <ng-container [ngTemplateOutlet]="consumerAlert" [ngTemplateOutletContext]="{ $implicit: status }"></ng-container>
     </div>
-    <div *ngIf="getStatusesHidden().length" class="alerts-hidden">
-      <p *ngIf="!alertsExpanded" class="mt-3 mb-0 text-center"><span i18n>{{getStatusesHidden().length}} more hidden</span> <button class="btn btn-sm btn-link py-0" (click)="alertsExpanded = !alertsExpanded" aria-controls="hiddenAlerts" [attr.aria-expanded]="alertsExpanded" i18n>Show all</button></p>
+    <div *ngIf="getStatusHidden().length" class="alerts-hidden">
+      <p *ngIf="!alertsExpanded" class="mt-3 mb-0 text-center"><span i18n>{{getStatusHidden().length}} more hidden</span> <button class="btn btn-sm btn-link py-0" (click)="alertsExpanded = !alertsExpanded" aria-controls="hiddenAlerts" [attr.aria-expanded]="alertsExpanded" i18n>Show all</button></p>
       <div #hiddenAlerts="ngbCollapse" [(ngbCollapse)]="!alertsExpanded">
-        <div *ngFor="let status of getStatusesHidden()">
+        <div *ngFor="let status of getStatusHidden()">
           <ng-container [ngTemplateOutlet]="consumerAlert" [ngTemplateOutletContext]="{ $implicit: status }"></ng-container>
         </div>
       </div>
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index a6870e0e7..5ac68d42a 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -23,7 +23,24 @@ export class UploadFileWidgetComponent implements OnInit {
     return this.consumerStatusService.getConsumerStatus().slice(0, MAX_ALERTS)
   }
 
-  getStatusesHidden() {
+  getStatusSummary() {
+    let strings = []
+    let countUploadingAndProcessing =  this.consumerStatusService.getConsumerStatusNotCompleted().length
+    let countFailed = this.getStatusFailed().length
+    let countSuccess = this.getStatusSuccess().length
+    if (countUploadingAndProcessing > 0) {
+      strings.push($localize`Processing: ${countUploadingAndProcessing}`)
+    }
+    if (countFailed > 0) {
+      strings.push($localize`Failed: ${countFailed}`)
+    }
+    if (countSuccess > 0) {
+      strings.push($localize`Added: ${countSuccess}`)
+    }
+    return strings.join($localize`:this string is used to separate processing, failed and added on the file upload widget:, `)
+  }
+
+  getStatusHidden() {
     if (this.consumerStatusService.getConsumerStatus().length < MAX_ALERTS) return []
     else return this.consumerStatusService.getConsumerStatus().slice(MAX_ALERTS)
   }
@@ -32,6 +49,14 @@ export class UploadFileWidgetComponent implements OnInit {
     return this.consumerStatusService.getConsumerStatus(FileStatusPhase.UPLOADING)
   }
 
+  getStatusFailed() {
+    return this.consumerStatusService.getConsumerStatus(FileStatusPhase.FAILED)
+  }
+
+  getStatusSuccess() {
+    return this.consumerStatusService.getConsumerStatus(FileStatusPhase.SUCCESS)
+  }
+
   getStatusCompleted() {
     return this.consumerStatusService.getConsumerStatusCompleted()
   }
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index c2169d51f..8151b1c18 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -90,13 +90,17 @@ export class ConsumerStatusService {
   }
 
   getConsumerStatus(phase?: FileStatusPhase) {
-    if (phase) {
+    if (phase != null) {
       return this.consumerStatus.filter(s => s.phase == phase)
     } else {
       return this.consumerStatus
     }
   }
 
+  getConsumerStatusNotCompleted() {
+    return this.consumerStatus.filter(s => s.phase < FileStatusPhase.SUCCESS)
+  }
+
   getConsumerStatusCompleted() {
     return this.consumerStatus.filter(s => s.phase == FileStatusPhase.FAILED || s.phase == FileStatusPhase.SUCCESS)
   }

From 47189342e4488f63486a7a9e6efb9feeeb39e1a0 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 28 Jan 2021 12:43:27 +0100
Subject: [PATCH 1014/1300] update dependencies

---
 Pipfile          |  2 ++
 Pipfile.lock     | 12 ++++++------
 requirements.txt |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Pipfile b/Pipfile
index 95d845d1f..cbe5c5103 100644
--- a/Pipfile
+++ b/Pipfile
@@ -44,6 +44,8 @@ inotifyrecursive = "~=0.3.4"
 ocrmypdf = "~=11.4.5"
 tqdm = "*"
 tika = "*"
+# TODO: This will sadly also install daphne+dependencies,
+#  which an ASGI server we don't need. Adds about 15MB image size.
 channels = "~=3.0"
 channels-redis = "*"
 uvicorn = {extras = ["standard"], version = "*"}
diff --git a/Pipfile.lock b/Pipfile.lock
index b8cb29b29..04e8b7fe0 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -403,11 +403,11 @@
         },
         "imap-tools": {
             "hashes": [
-                "sha256:4ec9575f21fb5a3efb573e71107806367dd52ecab0bf8f5c3724d1de6762b77b",
-                "sha256:860221dc13eb5d640da240e9bcf7867275c6162b742255789fd84f59124dfdd9"
+                "sha256:0eaa9b990fae336601dd44f353fac2d35ea25ca3b1b682a83700511635fc30ae",
+                "sha256:1c809e286d439e41fbe796c522ad4e565fd47a4260253343fa1b1045b6bfe8b1"
             ],
             "index": "pypi",
-            "version": "==0.36.0"
+            "version": "==0.37.0"
         },
         "img2pdf": {
             "hashes": [
@@ -1838,11 +1838,11 @@
         },
         "tox": {
             "hashes": [
-                "sha256:0aa777ee466f2ef18e6f58428c793c32378779e0a321dbb8934848bc3e78998c",
-                "sha256:f501808381c01c6d7827c2f17328be59c0a715046e94605ddca15fb91e65827d"
+                "sha256:76df3db6eee929bb62bdbacca5bb6bc840669d98e86a015b7a57b7df0a6eaf8b",
+                "sha256:854e6e4a71c614b488f81cb88df3b92edcb1a9ec43d4102e6289e9669bbf7f18"
             ],
             "index": "pypi",
-            "version": "==3.21.2"
+            "version": "==3.21.3"
         },
         "typing-extensions": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index 0c6deff1d..d6f45fea4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -42,7 +42,7 @@ 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.36.0
+imap-tools==0.37.0
 img2pdf==0.4.0
 importlib-metadata==3.4.0; python_version < '3.8'
 incremental==17.5.0

From 94be8781e9dd3ecfad762af6ec5e4b062a94a8ac Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 28 Jan 2021 19:28:48 +0100
Subject: [PATCH 1015/1300] test cases

---
 src/documents/tests/test_consumer.py | 119 ++++++++++++++++++---------
 1 file changed, 82 insertions(+), 37 deletions(-)

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 54d20ca8b..22e6afb61 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -212,6 +212,20 @@ def fake_magic_from_file(file, mime=False):
 @mock.patch("documents.consumer.magic.from_file", fake_magic_from_file)
 class TestConsumer(DirectoriesMixin, TestCase):
 
+    def _assert_first_last_send_progress(self, first_status="STARTING", last_status="SUCCESS", first_progress=0, first_progress_max=100, last_progress=100, last_progress_max=100):
+
+        self._send_progress.assert_called()
+
+        args, kwargs = self._send_progress.call_args_list[0]
+        self.assertEqual(args[0], first_progress)
+        self.assertEqual(args[1], first_progress_max)
+        self.assertEqual(args[2], first_status)
+
+        args, kwargs = self._send_progress.call_args_list[len(self._send_progress.call_args_list) - 1]
+        self.assertEqual(args[0], last_progress)
+        self.assertEqual(args[1], last_progress_max)
+        self.assertEqual(args[2], last_status)
+
     def make_dummy_parser(self, logging_group, progress_callback=None):
         return DummyParser(logging_group, self.dirs.scratch_dir, self.get_test_archive_file())
 
@@ -232,7 +246,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         # this prevents websocket message reports during testing.
         patcher = mock.patch("documents.consumer.Consumer._send_progress")
-        patcher.start()
+        self._send_progress = patcher.start()
         self.addCleanup(patcher.stop)
 
         self.consumer = Consumer()
@@ -278,6 +292,8 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self.assertFalse(os.path.isfile(filename))
 
+        self._assert_first_last_send_progress()
+
     def testOverrideFilename(self):
         filename = self.get_test_file()
         override_filename = "Statement for November.pdf"
@@ -286,21 +302,26 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self.assertEqual(document.title, "Statement for November")
 
+        self._assert_first_last_send_progress()
+
     def testOverrideTitle(self):
         document = self.consumer.try_consume_file(self.get_test_file(), override_title="Override Title")
         self.assertEqual(document.title, "Override Title")
+        self._assert_first_last_send_progress()
 
     def testOverrideCorrespondent(self):
         c = Correspondent.objects.create(name="test")
 
         document = self.consumer.try_consume_file(self.get_test_file(), override_correspondent_id=c.pk)
         self.assertEqual(document.correspondent.id, c.id)
+        self._assert_first_last_send_progress()
 
     def testOverrideDocumentType(self):
         dt = DocumentType.objects.create(name="test")
 
         document = self.consumer.try_consume_file(self.get_test_file(), override_document_type_id=dt.pk)
         self.assertEqual(document.document_type.id, dt.id)
+        self._assert_first_last_send_progress()
 
     def testOverrideTags(self):
         t1 = Tag.objects.create(name="t1")
@@ -311,37 +332,42 @@ class TestConsumer(DirectoriesMixin, TestCase):
         self.assertIn(t1, document.tags.all())
         self.assertNotIn(t2, document.tags.all())
         self.assertIn(t3, document.tags.all())
+        self._assert_first_last_send_progress()
 
     def testNotAFile(self):
-        try:
-            self.consumer.try_consume_file("non-existing-file")
-        except ConsumerError as e:
-            self.assertTrue(str(e).endswith('File not found.'))
-            return
 
-        self.fail("Should throw exception")
+        self.assertRaisesMessage(
+            ConsumerError,
+            "File not found",
+            self.consumer.try_consume_file,
+            "non-existing-file"
+        )
+
+        self._assert_first_last_send_progress(last_status="FAILED")
 
     def testDuplicates1(self):
         self.consumer.try_consume_file(self.get_test_file())
 
-        try:
-            self.consumer.try_consume_file(self.get_test_file())
-        except ConsumerError as e:
-            self.assertTrue(str(e).endswith("It is a duplicate."))
-            return
+        self.assertRaisesMessage(
+            ConsumerError,
+            "It is a duplicate",
+            self.consumer.try_consume_file,
+            self.get_test_file()
+        )
 
-        self.fail("Should throw exception")
+        self._assert_first_last_send_progress(last_status="FAILED")
 
     def testDuplicates2(self):
         self.consumer.try_consume_file(self.get_test_file())
 
-        try:
-            self.consumer.try_consume_file(self.get_test_archive_file())
-        except ConsumerError as e:
-            self.assertTrue(str(e).endswith("It is a duplicate."))
-            return
+        self.assertRaisesMessage(
+            ConsumerError,
+            "It is a duplicate",
+            self.consumer.try_consume_file,
+            self.get_test_archive_file()
+        )
 
-        self.fail("Should throw exception")
+        self._assert_first_last_send_progress(last_status="FAILED")
 
     def testDuplicates3(self):
         self.consumer.try_consume_file(self.get_test_archive_file())
@@ -351,13 +377,15 @@ class TestConsumer(DirectoriesMixin, TestCase):
     def testNoParsers(self, m):
         m.return_value = []
 
-        try:
-            self.consumer.try_consume_file(self.get_test_file())
-        except ConsumerError as e:
-            self.assertEqual(str(e), "sample.pdf: Unsupported mime type application/pdf")
-            return
+        self.assertRaisesMessage(
+            ConsumerError,
+            "sample.pdf: Unsupported mime type application/pdf",
+            self.consumer.try_consume_file,
+            self.get_test_file()
+        )
+
+        self._assert_first_last_send_progress(last_status="FAILED")
 
-        self.fail("Should throw exception")
 
     @mock.patch("documents.parsers.document_consumer_declaration.send")
     def testFaultyParser(self, m):
@@ -367,24 +395,28 @@ class TestConsumer(DirectoriesMixin, TestCase):
             "weight": 0
         })]
 
-        try:
-            self.consumer.try_consume_file(self.get_test_file())
-        except ConsumerError as e:
-            self.assertEqual(str(e), "sample.pdf: Error while consuming document sample.pdf: Does not compute.")
-            return
+        self.assertRaisesMessage(
+            ConsumerError,
+            "sample.pdf: Error while consuming document sample.pdf: Does not compute.",
+            self.consumer.try_consume_file,
+            self.get_test_file()
+        )
 
-        self.fail("Should throw exception.")
+        self._assert_first_last_send_progress(last_status="FAILED")
 
     @mock.patch("documents.consumer.Consumer._write")
     def testPostSaveError(self, m):
         filename = self.get_test_file()
         m.side_effect = OSError("NO.")
-        try:
-            self.consumer.try_consume_file(filename)
-        except ConsumerError as e:
-            self.assertEqual(str(e), "sample.pdf: The following error occured while consuming sample.pdf: NO.")
-        else:
-            self.fail("Should raise exception")
+
+        self.assertRaisesMessage(
+            ConsumerError,
+            "sample.pdf: The following error occured while consuming sample.pdf: NO.",
+            self.consumer.try_consume_file,
+            filename
+        )
+
+        self._assert_first_last_send_progress(last_status="FAILED")
 
         # file not deleted
         self.assertTrue(os.path.isfile(filename))
@@ -401,6 +433,8 @@ class TestConsumer(DirectoriesMixin, TestCase):
         self.assertEqual(document.title, "new docs")
         self.assertEqual(document.filename, "none/new docs.pdf")
 
+        self._assert_first_last_send_progress()
+
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
     @mock.patch("documents.signals.handlers.generate_unique_filename")
     def testFilenameHandlingUnstableFormat(self, m):
@@ -424,6 +458,8 @@ class TestConsumer(DirectoriesMixin, TestCase):
         self.assertIsNotNone(os.path.isfile(document.title))
         self.assertTrue(os.path.isfile(document.source_path))
 
+        self._assert_first_last_send_progress()
+
     @mock.patch("documents.consumer.DocumentClassifier")
     def testClassifyDocument(self, m):
         correspondent = Correspondent.objects.create(name="test")
@@ -443,19 +479,26 @@ class TestConsumer(DirectoriesMixin, TestCase):
         self.assertIn(t1, document.tags.all())
         self.assertNotIn(t2, document.tags.all())
 
+        self._assert_first_last_send_progress()
+
     @override_settings(CONSUMER_DELETE_DUPLICATES=True)
     def test_delete_duplicate(self):
         dst = self.get_test_file()
         self.assertTrue(os.path.isfile(dst))
         doc = self.consumer.try_consume_file(dst)
 
+        self._assert_first_last_send_progress()
+
         self.assertFalse(os.path.isfile(dst))
         self.assertIsNotNone(doc)
 
+        self._send_progress.reset_mock()
+
         dst = self.get_test_file()
         self.assertTrue(os.path.isfile(dst))
         self.assertRaises(ConsumerError, self.consumer.try_consume_file, dst)
         self.assertFalse(os.path.isfile(dst))
+        self._assert_first_last_send_progress(last_status="FAILED")
 
     @override_settings(CONSUMER_DELETE_DUPLICATES=False)
     def test_no_delete_duplicate(self):
@@ -471,6 +514,8 @@ class TestConsumer(DirectoriesMixin, TestCase):
         self.assertRaises(ConsumerError, self.consumer.try_consume_file, dst)
         self.assertTrue(os.path.isfile(dst))
 
+        self._assert_first_last_send_progress(last_status="FAILED")
+
 
 class PreConsumeTestCase(TestCase):
 

From 2faa425caf1ff90f0a1824e84d16d8050e7fd9d3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 28 Jan 2021 22:06:02 +0100
Subject: [PATCH 1016/1300] localization for websockets

---
 src-ui/messages.xlf                           | 91 +++++++++++++++++++
 .../app/services/consumer-status.service.ts   | 22 ++++-
 src/documents/consumer.py                     | 50 ++++++----
 src/documents/parsers.py                      |  5 +
 src/locale/en-us/LC_MESSAGES/django.po        | 64 ++-----------
 5 files changed, 154 insertions(+), 78 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 93f970d86..eab8ed80e 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -1617,6 +1617,97 @@
           <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="2119857572761283468" datatype="html">
+        <source>Document already exists.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="148389968432135849" datatype="html">
+        <source>File not found.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1520671543092565667" datatype="html">
+        <source>Pre-consume script does not exist.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7742915911032564889" datatype="html">
+        <source>Error while executing pre-consume script.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8995193730018060346" datatype="html">
+        <source>Post-consume script does not exist.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="256773668518189604" datatype="html">
+        <source>Error while executing post-consume script.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6252258095055634191" datatype="html">
+        <source>Received new file.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7337565919209746135" datatype="html">
+        <source>File type not supported.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5002399167376099234" datatype="html">
+        <source>Processing document...</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1085975194762600381" datatype="html">
+        <source>Generating thumbnail...</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3280851677698431426" datatype="html">
+        <source>Retrieving date from document...</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7162102384876037296" datatype="html">
+        <source>Saving document...</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4550450765009165976" datatype="html">
+        <source>Finished.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="1519954996184640001" datatype="html">
         <source>Error</source>
         <context-group purpose="location">
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index 8151b1c18..026c3c64f 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -10,6 +10,22 @@ export enum FileStatusPhase {
   FAILED = 4
 }
 
+export const FILE_STATUS_MESSAGES = {
+  "document_already_exists": $localize`Document already exists.`,
+  "file_not_found": $localize`File not found.`,
+  "pre_consume_script_not_found": $localize`Pre-consume script does not exist.`,
+  "pre_consume_script_error": $localize`Error while executing pre-consume script.`,
+  "post_consume_script_not_found": $localize`Post-consume script does not exist.`,
+  "post_consume_script_error": $localize`Error while executing post-consume script.`,
+  "new_file": $localize`Received new file.`,
+  "unsupported_type": $localize`File type not supported.`,
+  "parsing_document": $localize`Processing document...`,
+  "generating_thumbnail": $localize`Generating thumbnail...`,
+  "parse_date": $localize`Retrieving date from document...`,
+  "save_document": $localize`Saving document...`,
+  "finished": $localize`Finished.`
+}
+
 export class FileStatus {
 
   filename: string
@@ -116,7 +132,11 @@ export class ConsumerStatusService {
       let created = statusMessageGet.created
 
       status.updateProgress(FileStatusPhase.PROCESSING, statusMessage.current_progress, statusMessage.max_progress)
-      status.message = statusMessage.message
+      if (statusMessage.message && statusMessage.message in FILE_STATUS_MESSAGES) {
+        status.message = FILE_STATUS_MESSAGES[statusMessage.message]
+      } else if (statusMessage.message) {
+        status.message = statusMessage.message
+      }
       status.documentId = statusMessage.document_id
 
       if (created && statusMessage.status == 'STARTING') {
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 05043201b..146b11014 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -25,17 +25,30 @@ from .signals import (
     document_consumption_started
 )
 
-from django.utils.translation import gettext as _
-
 
 class ConsumerError(Exception):
     pass
 
 
+MESSAGE_DOCUMENT_ALREADY_EXISTS = "document_already_exists"
+MESSAGE_FILE_NOT_FOUND = "file_not_found"
+MESSAGE_PRE_CONSUME_SCRIPT_NOT_FOUND = "pre_consume_script_not_found"
+MESSAGE_PRE_CONSUME_SCRIPT_ERROR = "pre_consume_script_error"
+MESSAGE_POST_CONSUME_SCRIPT_NOT_FOUND = "post_consume_script_not_found"
+MESSAGE_POST_CONSUME_SCRIPT_ERROR = "post_consume_script_error"
+MESSAGE_NEW_FILE = "new_file"
+MESSAGE_UNSUPPORTED_TYPE = "unsupported_type"
+MESSAGE_PARSING_DOCUMENT = "parsing_document"
+MESSAGE_GENERATING_THUMBNAIL = "generating_thumbnail"
+MESSAGE_PARSE_DATE = "parse_date"
+MESSAGE_SAVE_DOCUMENT = "save_document"
+MESSAGE_FINISHED = "finished"
+
+
 class Consumer(LoggingMixin):
 
     def _send_progress(self, current_progress, max_progress, status,
-                       message, document_id=None):
+                       message=None, document_id=None):
         payload = {
             'filename': os.path.basename(self.filename) if self.filename else None,  # NOQA: E501
             'task_id': self.task_id,
@@ -69,7 +82,7 @@ class Consumer(LoggingMixin):
     def pre_check_file_exists(self):
         if not os.path.isfile(self.path):
             self._fail(
-                _("File not found"),
+                MESSAGE_FILE_NOT_FOUND,
                 f"Cannot consume {self.path}: File not found."
             )
 
@@ -80,7 +93,7 @@ class Consumer(LoggingMixin):
             if settings.CONSUMER_DELETE_DUPLICATES:
                 os.unlink(self.path)
             self._fail(
-                _("Document already exists"),
+                MESSAGE_DOCUMENT_ALREADY_EXISTS,
                 f"Not consuming {self.filename}: It is a duplicate."
             )
 
@@ -96,7 +109,7 @@ class Consumer(LoggingMixin):
 
         if not os.path.isfile(settings.PRE_CONSUME_SCRIPT):
             self._fail(
-                _("Pre-consume script does not exist."),
+                MESSAGE_PRE_CONSUME_SCRIPT_NOT_FOUND,
                 f"Configured pre-consume script "
                 f"{settings.PRE_CONSUME_SCRIPT} does not exist.")
 
@@ -104,7 +117,7 @@ class Consumer(LoggingMixin):
             Popen((settings.PRE_CONSUME_SCRIPT, self.path)).wait()
         except Exception as e:
             self._fail(
-                _("Error while executing pre-consume script"),
+                MESSAGE_PRE_CONSUME_SCRIPT_ERROR,
                 f"Error while executing pre-consume script: {e}"
             )
 
@@ -114,7 +127,7 @@ class Consumer(LoggingMixin):
 
         if not os.path.isfile(settings.POST_CONSUME_SCRIPT):
             self._fail(
-                _("Post-consume script does not exist."),
+                MESSAGE_POST_CONSUME_SCRIPT_NOT_FOUND,
                 f"Configured post-consume script "
                 f"{settings.POST_CONSUME_SCRIPT} does not exist."
             )
@@ -134,7 +147,7 @@ class Consumer(LoggingMixin):
             )).wait()
         except Exception as e:
             self._fail(
-                _("Error while executing post-consume script"),
+                MESSAGE_POST_CONSUME_SCRIPT_ERROR,
                 f"Error while executing post-consume script: {e}"
             )
 
@@ -158,7 +171,7 @@ class Consumer(LoggingMixin):
         self.override_tag_ids = override_tag_ids
         self.task_id = task_id or str(uuid.uuid4())
 
-        self._send_progress(0, 100, 'STARTING', _('Received new file'))
+        self._send_progress(0, 100, 'STARTING', MESSAGE_NEW_FILE)
 
         # this is for grouping logging entries for this particular file
         # together.
@@ -182,8 +195,7 @@ class Consumer(LoggingMixin):
         parser_class = get_parser_class_for_mime_type(mime_type)
         if not parser_class:
             self._fail(
-                _("File type %(type)s not supported") %
-                {'type': mime_type},
+                MESSAGE_UNSUPPORTED_TYPE,
                 f"Unsupported mime type {mime_type}"
             )
         else:
@@ -199,10 +211,10 @@ class Consumer(LoggingMixin):
 
         self.run_pre_consume_script()
 
-        def progress_callback(current_progress, max_progress, message):
+        def progress_callback(current_progress, max_progress):
             # recalculate progress to be within 20 and 80
             p = int((current_progress / max_progress) * 50 + 20)
-            self._send_progress(p, 100, "WORKING", message)
+            self._send_progress(p, 100, "WORKING")
 
         # This doesn't parse the document yet, but gives us a parser.
 
@@ -219,13 +231,13 @@ class Consumer(LoggingMixin):
         archive_path = None
 
         try:
-            self._send_progress(20, 100, 'WORKING', _('Parsing document...'))
+            self._send_progress(20, 100, 'WORKING', MESSAGE_PARSING_DOCUMENT)
             self.log("debug", "Parsing {}...".format(self.filename))
             document_parser.parse(self.path, mime_type, self.filename)
 
             self.log("debug", f"Generating thumbnail for {self.filename}...")
             self._send_progress(70, 100, 'WORKING',
-                                _('Generating thumbnail...'))
+                                MESSAGE_GENERATING_THUMBNAIL)
             thumbnail = document_parser.get_optimised_thumbnail(
                 self.path, mime_type)
 
@@ -233,7 +245,7 @@ class Consumer(LoggingMixin):
             date = document_parser.get_date()
             if not date:
                 self._send_progress(90, 100, 'WORKING',
-                                    _('Getting date from document...'))
+                                    MESSAGE_PARSE_DATE)
                 date = parse_date(self.filename, text)
             archive_path = document_parser.get_archive_path()
 
@@ -258,7 +270,7 @@ class Consumer(LoggingMixin):
                 "warning",
                 f"Cannot classify documents: {e}.")
             classifier = None
-        self._send_progress(95, 100, 'WORKING', _('Saving document...'))
+        self._send_progress(95, 100, 'WORKING', MESSAGE_SAVE_DOCUMENT)
         # now that everything is done, we can start to store the document
         # in the system. This will be a transaction and reasonably fast.
         try:
@@ -327,7 +339,7 @@ class Consumer(LoggingMixin):
             "Document {} consumption finished".format(document)
         )
 
-        self._send_progress(100, 100, 'SUCCESS', _('Finished.'), document.id)
+        self._send_progress(100, 100, 'SUCCESS', MESSAGE_FINISHED, document.id)
 
         return document
 
diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index ddad6897a..3f0879b3c 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -273,6 +273,11 @@ class DocumentParser(LoggingMixin):
         self.date = None
         self.progress_callback = progress_callback
 
+    def progress(self, current, max):
+        print(self.progress_callback)
+        if self.progress_callback:
+            self.progress_callback(current, max)
+
     def extract_metadata(self, document_path, mime_type):
         return []
 
diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en-us/LC_MESSAGES/django.po
index 8513c577b..fdf3fd809 100644
--- a/src/locale/en-us/LC_MESSAGES/django.po
+++ b/src/locale/en-us/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-27 17:57+0100\n"
+"POT-Creation-Date: 2021-01-28 22:02+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,60 +21,6 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#: documents/consumer.py:72
-msgid "File not found"
-msgstr "Datei nicht gefunden"
-
-#: documents/consumer.py:83
-msgid "Document already exists"
-msgstr ""
-
-#: documents/consumer.py:99
-msgid "Pre-consume script does not exist."
-msgstr ""
-
-#: documents/consumer.py:107
-msgid "Error while executing pre-consume script"
-msgstr ""
-
-#: documents/consumer.py:117
-msgid "Post-consume script does not exist."
-msgstr ""
-
-#: documents/consumer.py:137
-msgid "Error while executing post-consume script"
-msgstr ""
-
-#: documents/consumer.py:161
-msgid "Received new file"
-msgstr ""
-
-#: documents/consumer.py:185 documents/serialisers.py:383
-#, fuzzy, python-format
-#| msgid "File type {type} not supported."
-msgid "File type %(type)s not supported"
-msgstr "Dateityp {type} wird nicht unterstützt"
-
-#: documents/consumer.py:222
-msgid "Parsing document..."
-msgstr ""
-
-#: documents/consumer.py:228
-msgid "Generating thumbnail..."
-msgstr ""
-
-#: documents/consumer.py:236
-msgid "Getting date from document..."
-msgstr ""
-
-#: documents/consumer.py:261
-msgid "Saving document..."
-msgstr ""
-
-#: documents/consumer.py:330
-msgid "Finished."
-msgstr ""
-
 #: documents/models.py:33
 msgid "Any word"
 msgstr ""
@@ -392,6 +338,11 @@ msgstr ""
 msgid "filter rules"
 msgstr ""
 
+#: documents/serialisers.py:383
+#, python-format
+msgid "File type %(type)s not supported"
+msgstr ""
+
 #: documents/templates/index.html:20
 msgid "Paperless-ng is loading..."
 msgstr ""
@@ -674,6 +625,3 @@ msgstr ""
 #: paperless_mail/models.py:205
 msgid "assign this correspondent"
 msgstr ""
-
-#~ msgid "Document is a duplicate"
-#~ msgstr "Dokument existiert bereits"

From f872221c49c092c323ed3ebaf02b6f3c467f256b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 28 Jan 2021 22:22:25 +0100
Subject: [PATCH 1017/1300] filesystem permission checks now issue warnings
 instead of errors, improves NFS compatibility

---
 src/paperless/checks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/paperless/checks.py b/src/paperless/checks.py
index 1329ad679..df4d45e38 100644
--- a/src/paperless/checks.py
+++ b/src/paperless/checks.py
@@ -22,7 +22,7 @@ def path_check(var, directory):
                 exists_hint.format(directory)
             ))
         elif not os.access(directory, os.W_OK | os.X_OK):
-            messages.append(Error(
+            messages.append(Warning(
                 writeable_message.format(var),
                 writeable_hint.format(directory)
             ))

From 107cc2ca208806b493c15eee545afad340abe2b2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 28 Jan 2021 22:38:12 +0100
Subject: [PATCH 1018/1300] add missing quotes

---
 src-ui/messages.xlf                                | 14 +++++++-------
 .../bulk-editor/bulk-editor.component.ts           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 6175cf700..8bc640c33 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -1124,6 +1124,13 @@
           <context context-type="linenumber">73</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="7894972847287473517" datatype="html">
+        <source>&quot;<x id="PH" equiv-text="items[0].name"/>&quot;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="8639884465898458690" datatype="html">
         <source>&quot;<x id="PH" equiv-text="items[0].name"/>&quot; and &quot;<x id="PH_1" equiv-text="items[1].name"/>&quot;</source>
         <context-group purpose="location">
@@ -1132,13 +1139,6 @@
         </context-group>
         <note priority="1" from="description">This is for messages like &apos;modify &quot;tag1&quot; and &quot;tag2&quot;&apos;</note>
       </trans-unit>
-      <trans-unit id="7894972847287473517" datatype="html">
-        <source>&quot;<x id="PH" equiv-text="i.name"/>&quot;</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">116</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="760986369763309193" datatype="html">
         <source>, </source>
         <context-group purpose="location">
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 6b2598fe8..04fc2a978 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -109,7 +109,7 @@ export class BulkEditorComponent {
     if (items.length == 0) {
       return ""
     } else if (items.length == 1) {
-      return items[0].name
+      return $localize`"${items[0].name}"`
     } else if (items.length == 2) {
       return $localize`:This is for messages like 'modify "tag1" and "tag2"':"${items[0].name}" and "${items[1].name}"`
     } else {

From dcd350a30c3797bcf50891a8660b6bb0b156fc8d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 29 Jan 2021 00:26:17 +0100
Subject: [PATCH 1019/1300] not sure what happened with reportlab 3.5.60, maybe
 a bad release.

---
 Pipfile.lock     | 86 ++++++++++++++++++++++++------------------------
 requirements.txt |  2 +-
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 04e8b7fe0..ff9e96717 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -926,50 +926,50 @@
         },
         "reportlab": {
             "hashes": [
-                "sha256:10d0cd2ab669fbad8b766db57066270296396caf515731643e7c7e732159a432",
-                "sha256:21508065492fbb750aa6d07297a2ba4bcacb418c84898fe892e12bdceefc3b9a",
-                "sha256:21c433905569af36bc220490a33f8f78442fd71c1bea3d021f851623c8089a78",
-                "sha256:236c4142474a59e4564b0e7c32e4d7b9cfc0dc2236ffa721ae97a4dbc2667d10",
-                "sha256:287b241a9d4189e7bfffd68aea0efd701d703bccee6686b9779bf16e22e9a2ad",
-                "sha256:2bc48a3cad6dd3cd1b5cd09526dad50afbda14afadd6fb40635a5227246bbe26",
-                "sha256:2e4631c49ec72f6a84502cda1710e988fa3027250e17c26713e543af31fff58a",
-                "sha256:2fd3305a75502d11942a9629cf6af96660a508f19adc4abaac5549909d1db1b3",
-                "sha256:32be7f9a55b8dfd91924730644632d19352fd9e0bb77cd03eba8a34fc846c4f6",
-                "sha256:33dc663ac3713e9d2f5a96b20412e16fd00b688b1b5a8057436e3fce69c2a59d",
-                "sha256:3d83cffa1211a7ae4912bfe3ac36051e31371cfb63b716e458c520da9f645fd9",
-                "sha256:3f9d56f5778b54260ce79878761b1f98267677702233daa26edd9f06f3be85c0",
-                "sha256:49a599f1aae7d91649fb10dbe070614740a60e4d2b65882a002dc20a7eba9f6f",
-                "sha256:4d5d62d49f3632cf437ac28ad52a8274fe6392ea2c48d294d2e92f1258d1479e",
-                "sha256:552ea83656f18e52ee073aee04d7e3f4d0eb71147f6882ae4fc15681d8e6ab1c",
-                "sha256:605f4a49ee313eabae4db4694d073dbb0778a0eccbc6d090e58c5a4db862c2a8",
-                "sha256:6289057afa4023f58d7977d105d09503c2cb1031e248fff52b44e41914d176cf",
-                "sha256:669526b580d52c05efbd45a8c9f1adf9370b8818bc2d48adec661ea7037415d4",
-                "sha256:6fc5f21d1383b552dc5b3eb774aaaf14cb7f8f34f15ea45772f72867dfaeecc6",
-                "sha256:74c7499fdda682028bb1b01d7ca89d813175c0f8c18d3ae9924c6393987ea4ef",
-                "sha256:75c0b6cf47c199f1e69283b0678b47537cc15af31acbad783fffe2c9cfa6a626",
-                "sha256:7b3ec1255c940fabfdb05577a4f148cca54943215cecb24efd5840a8ecb618ce",
-                "sha256:7d39eaca932b1d51de84c387616462913fa988c02a4a462798098f62edcf1e21",
-                "sha256:81e2faddfde7a21154d1a08e28e3d9b820274afa282b7ed17fcf1e9d7b4aa7a1",
-                "sha256:8aca938409fc99a9e79514cb97b3478780b261ff74a058c75a3a12552b1d6b9a",
-                "sha256:8f963222cc0c302ed5a15766ea00ff470c80c47d691e828ef21032df95e8a2ff",
-                "sha256:9be1ec218966e2e9982e73109863d91e3e4b9e7649ae6be0bf98b78c52a5a330",
-                "sha256:aa24f56c504d41982eb212f79669c05d4452f7736618dd33ba4167da0b5578b7",
-                "sha256:aa9caa395823130b360b5f3184eb25c9f1ea4fb51ab0370c2e693dc139cd7d83",
-                "sha256:b2f2bf419229bda5d6c8a10219ad1d984d2a6cd246acf613559d4a5fbcee0aea",
-                "sha256:b73f85e09e4271aee192489f5a8a7c33a1a82f42702cd0886f8f630600a23ad8",
-                "sha256:c3fac0186c18d7d5285f508d79bd86f751526190728ef2a33107568533f9aff0",
-                "sha256:c7ea886aa8dc3d3adb0c32ee87522821dd8ead2bac6d41e0481c1d911049c3c9",
-                "sha256:c9a487b646ac367d15bf6749deffa04ecbe339ba067d29414f206a7516a0a775",
-                "sha256:d0ae3cd60b659da41bb4962facec2ed3c8cfb3cedc85c5993e6299938134fc94",
-                "sha256:d6b900b1dc0d3c7b7f69fde25c8e60cb978b774056383c4a03bb38c829342299",
-                "sha256:d6feecad778e2a3d5a5ea48b027063e9baf73c6454235c1c1556b59c114c90cb",
-                "sha256:de5d98f41ffbe567717c334a9866c0f289a02cef37a78323cb5f8a86eecb6a8c",
-                "sha256:e47daf974b68fdcd2ffb5442ea5f1dd849eeaf6f9d4915128bf5374467e7b63a",
-                "sha256:e52536cba231fb3dd0628abf98b23519778e1247d4d69553d879eea6159b648d",
-                "sha256:f3181284502207e78eb472d00e8f9e84f43a7fe502821d2d76f3dd7da1d5e081",
-                "sha256:fc900dbc8f020305e15781210e64f6e96c1f9ca0fa00c4a0ccc1174cc44c5a5b"
+                "sha256:009fa61710647cdc62eb373345248d8ebb93583a058990f7c4f9be46d90aa5b1",
+                "sha256:04a08d284da86882ec3a41a7c719833362ef891b09ee8e2fbb47cee352aa684a",
+                "sha256:07bff6742fba612da8d1b1f783c436338c6fdc6962828159827d5ca7d2b67935",
+                "sha256:09fb11ab1500e679fc1b01199d2fed24435499856e75043a9ac0d31dd48fd881",
+                "sha256:18a876449c9000c391dd3415ebc8454cd7bb9e488977b894886a2d7d018f16cd",
+                "sha256:18eec161411026dde49767bee4e5e8eeb8014879554811a62581dc7433628d5b",
+                "sha256:19353aead39fc115a4d6c598d6fb9fa26da7e69160a0443ebb49b02903e704e8",
+                "sha256:1b85c20e89c22ae902ca973df2afdd2d64d27dc4ffd2b29ebad8c805a213756b",
+                "sha256:1da3d7a35f918cee905facfa94bd00ae6091cadc06dca1b0b31b69ae02d41d1d",
+                "sha256:1e484ce83dae26cb40fcbd312d45b8ba921de7856a00339d867dd4ecf145a1e7",
+                "sha256:33f3cfdc492575f8af3225701301a7e62fc478358729820c9e0091aff5831378",
+                "sha256:3b0026c1129147befd4e5a8cf25da8dea1096fce371e7b2412e36d7254019c06",
+                "sha256:3d7713dddaa8081ed709a1fa2456a43f6a74b0f07d605da8441fd53fef334f69",
+                "sha256:3e2b4d69763103b9dc9b54c0952dc3cee05cedd06e28c0987fad7f84705b12c0",
+                "sha256:4ca5233a19a5ceca23546290f43addec2345789c7d65bb32f8b2668aa148351f",
+                "sha256:5214a289cf01ebbd65e49bae83709671dd9edb601891cf0ae8abf85f3c0b392f",
+                "sha256:52f8237654acbc78ea2fa6fb4a6a06e5b023b6da93f7889adfe2deba09473fad",
+                "sha256:5ed00894e0f8281c0b7c0494b4d3067c641fd90c8e5cf933089ec4cc9a48e491",
+                "sha256:6191961533d49c9d860964d42bada4d7ac3bb28502d984feb8034093f2012fa8",
+                "sha256:6f3ad2b1afe99c436563cd436d8693d4a12e2c4bd45f70c7705759ff7837fe53",
+                "sha256:739b743b7ca1ba4b4d64c321de6fccb49b562d0507ea06c817d9cc4faed5cd22",
+                "sha256:792efba0c0c6e4ee94f6dc95f305451733ee9230a1c7d51cb8e5301a549e0dfb",
+                "sha256:79d63ca40231ca3860859b39a92daa5219035ba9553da89a5e1b218550744121",
+                "sha256:83b28104edd58ad65748d2d0e60e0d97e3b91b3e90b4573ea6fe60de6811972c",
+                "sha256:85650446538cd2f606ca234634142a7ccd74cb6db7cfec250f76a4242e0f2431",
+                "sha256:8850eba6de6eb813036eb8dce353e40d60c8af48bbce107de82770b10d3aa525",
+                "sha256:9da445cb79e3f740756924c053edc952cde11a65ff5af8acfda3c0a1317136ef",
+                "sha256:9fabd5fbd24f5971085ffe53150d663f158f7d3050b25c95736e29ebf676d454",
+                "sha256:a0c377bc45e73c3f15f55d7de69fab270d174749d5b454ab0de502b15430ec2a",
+                "sha256:a1d3f7022a920d4a5e165d264581f1862e1c1b877ceeabb96fe98cec98125ae5",
+                "sha256:a315edef5c5610b0c75790142f49487e89ea34397fc247ae8aa890fe6d6dd057",
+                "sha256:a755cca2dcf023130b03bb671670301a992157d5c3151d838c0b68ef89894536",
+                "sha256:b1b20208ecdfffd7ca027955c4fe8972b28b30a4b3b80cf25099a08d3b20ed7c",
+                "sha256:b26d6f416891cef93411d6d478a25db275766081a5fb66368248293ef459f3be",
+                "sha256:b4ba4c30af7044ee987e61c88a5ffb76031ca0c53666bc85d823b7de55ddbc75",
+                "sha256:b71faf3b6e4d7058e1af1b8afedaf39a962db4a219affc8177009d8244ec10d4",
+                "sha256:cfa854bea525f8c913cb77e2bda724d94b965a0eb3bcfc4a645a9baa29bb86e2",
+                "sha256:dd9687359e466086b9f6fe6d8069034017f8b6ca3080944fae5709767ca6814e",
+                "sha256:de0c675fc2998a7eaa929c356ba49c84f53a892e9ab25e8ee7d8ebbbdcb2ac16",
+                "sha256:e2b4e33fea2ce9d3a14ea39191b169e41eb2ac995274f54ac8fd27519974bce8",
+                "sha256:f3d4a1a273dc141e03b72a553c11bc14dd7a27ec7654a071edcf83eb04f004bc",
+                "sha256:ff547cf4c1de7e104cad1a378431ff81efcb03e90e40871ee686107da5b91442"
             ],
-            "version": "==3.5.60"
+            "version": "==3.5.59"
         },
         "requests": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index d6f45fea4..c3f32002b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -75,7 +75,7 @@ pytz==2020.5
 pyyaml==5.4.1
 redis==3.5.3
 regex==2020.11.13
-reportlab==3.5.60
+reportlab==3.5.59
 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

From 05866da04bdcde28dd6eb007117acf31be3c226e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 29 Jan 2021 12:54:54 +0100
Subject: [PATCH 1020/1300] remove dead code

---
 src/documents/views.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/documents/views.py b/src/documents/views.py
index b99bf11c7..d6a894db6 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -132,10 +132,6 @@ class DocumentTypeViewSet(ModelViewSet):
     ordering_fields = ("name", "matching_algorithm", "match", "document_count")
 
 
-class BulkEditForm(object):
-    pass
-
-
 class DocumentViewSet(RetrieveModelMixin,
                       UpdateModelMixin,
                       DestroyModelMixin,

From 439f06ccda6a34df34042fc2ff43e88a7b42a0f0 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Fri, 29 Jan 2021 12:42:54 +0000
Subject: [PATCH 1021/1300] Translate /src-ui/messages.xlf in fr

translation completed for the source file '/src-ui/messages.xlf'
on the 'fr' language.
---
 src-ui/src/locale/messages.fr.xlf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
index 4f09eab72..b5f602c7f 100644
--- a/src-ui/src/locale/messages.fr.xlf
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -1283,6 +1283,14 @@
           <context context-type="linenumber">73</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="7894972847287473517">
+        <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</source>
+        <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
         <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
         <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; et &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
@@ -1292,14 +1300,6 @@
         </context-group>
         <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
       </trans-unit>
-      <trans-unit datatype="html" id="7894972847287473517">
-        <source>&quot;<x equiv-text="i.name" id="PH"/>&quot;</source>
-        <target>&quot;<x equiv-text="i.name" id="PH"/>&quot;</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">116</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="760986369763309193">
         <source>, </source>
         <target>, </target>

From ddcc0883eb4f2e04285569e5ffea575eec3f12ba Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 29 Jan 2021 16:45:23 +0100
Subject: [PATCH 1022/1300] add support for suggestions

---
 src/documents/tests/test_api.py | 28 +++++++++++++
 src/documents/views.py          | 73 +++++++++++++++++++++++----------
 2 files changed, 79 insertions(+), 22 deletions(-)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 2b332a873..9e4b77189 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -590,6 +590,10 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(len(meta['original_metadata']), 0)
         self.assertGreater(len(meta['archive_metadata']), 0)
 
+    def test_get_metadata_invalid_doc(self):
+        response = self.client.get(f"/api/documents/34576/metadata/")
+        self.assertEqual(response.status_code, 404)
+
     def test_get_metadata_no_archive(self):
         doc = Document.objects.create(title="test", filename="file.pdf", mime_type="application/pdf")
 
@@ -605,6 +609,30 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertGreater(len(meta['original_metadata']), 0)
         self.assertIsNone(meta['archive_metadata'])
 
+    def test_get_empty_suggestions(self):
+        doc = Document.objects.create(title="test", mime_type="application/pdf")
+
+        response = self.client.get(f"/api/documents/{doc.pk}/suggestions/")
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data, {'correspondents': [], 'tags': [], 'document_types': []})
+
+    def test_get_suggestions_invalid_doc(self):
+        response = self.client.get(f"/api/documents/34676/suggestions/")
+        self.assertEqual(response.status_code, 404)
+
+    @mock.patch("documents.views.match_correspondents")
+    @mock.patch("documents.views.match_tags")
+    @mock.patch("documents.views.match_document_types")
+    def test_get_suggestions(self, match_document_types, match_tags, match_correspondents):
+        doc = Document.objects.create(title="test", mime_type="application/pdf", content="this is an invoice!")
+        match_tags.return_value = [Tag(id=56), Tag(id=123)]
+        match_document_types.return_value = [DocumentType(id=23)]
+        match_correspondents.return_value = [Correspondent(id=88), Correspondent(id=2)]
+
+        response = self.client.get(f"/api/documents/{doc.pk}/suggestions/")
+        self.assertEqual(response.data, {'correspondents': [88,2], 'tags': [56,123], 'document_types': [23]})
+
     def test_saved_views(self):
         u1 = User.objects.create_user("user1")
         u2 = User.objects.create_user("user2")
diff --git a/src/documents/views.py b/src/documents/views.py
index d6a894db6..43ae2b103 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -34,6 +34,7 @@ from rest_framework.viewsets import (
 import documents.index as index
 from paperless.db import GnuPG
 from paperless.views import StandardPagination
+from .classifier import DocumentClassifier, IncompatibleClassifierVersionError
 from .filters import (
     CorrespondentFilterSet,
     DocumentFilterSet,
@@ -41,6 +42,7 @@ from .filters import (
     DocumentTypeFilterSet,
     LogFilterSet
 )
+from .matching import match_correspondents, match_tags, match_document_types
 from .models import Correspondent, Document, Log, Tag, DocumentType, SavedView
 from .parsers import get_parser_class_for_mime_type
 from .serialisers import (
@@ -225,31 +227,58 @@ class DocumentViewSet(RetrieveModelMixin,
     def metadata(self, request, pk=None):
         try:
             doc = Document.objects.get(pk=pk)
-
-            meta = {
-                "original_checksum": doc.checksum,
-                "original_size": os.stat(doc.source_path).st_size,
-                "original_mime_type": doc.mime_type,
-                "media_filename": doc.filename,
-                "has_archive_version": os.path.isfile(doc.archive_path),
-                "original_metadata": self.get_metadata(
-                    doc.source_path, doc.mime_type)
-            }
-
-            if doc.archive_checksum and os.path.isfile(doc.archive_path):
-                meta['archive_checksum'] = doc.archive_checksum
-                meta['archive_size'] = os.stat(doc.archive_path).st_size,
-                meta['archive_metadata'] = self.get_metadata(
-                    doc.archive_path, "application/pdf")
-            else:
-                meta['archive_checksum'] = None
-                meta['archive_size'] = None
-                meta['archive_metadata'] = None
-
-            return Response(meta)
         except Document.DoesNotExist:
             raise Http404()
 
+        meta = {
+            "original_checksum": doc.checksum,
+            "original_size": os.stat(doc.source_path).st_size,
+            "original_mime_type": doc.mime_type,
+            "media_filename": doc.filename,
+            "has_archive_version": os.path.isfile(doc.archive_path),
+            "original_metadata": self.get_metadata(
+                doc.source_path, doc.mime_type)
+        }
+
+        if doc.archive_checksum and os.path.isfile(doc.archive_path):
+            meta['archive_checksum'] = doc.archive_checksum
+            meta['archive_size'] = os.stat(doc.archive_path).st_size,
+            meta['archive_metadata'] = self.get_metadata(
+                doc.archive_path, "application/pdf")
+        else:
+            meta['archive_checksum'] = None
+            meta['archive_size'] = None
+            meta['archive_metadata'] = None
+
+        return Response(meta)
+
+    @action(methods=['get'], detail=True)
+    def suggestions(self, request, pk=None):
+        try:
+            doc = Document.objects.get(pk=pk)
+        except Document.DoesNotExist:
+            raise Http404()
+
+        try:
+            classifier = DocumentClassifier()
+            classifier.reload()
+        except (OSError, EOFError, IncompatibleClassifierVersionError) as e:
+            logging.getLogger(__name__).warning(
+                "Cannot load classifier: Not providing auto matching "
+                "suggestions"
+            )
+            classifier = None
+
+        return Response({
+            "correspondents": [
+                c.id for c in match_correspondents(doc, classifier)
+            ],
+            "tags": [t.id for t in match_tags(doc, classifier)],
+            "document_types": [
+                dt.id for dt in match_document_types(doc, classifier)
+            ]
+        })
+
     @action(methods=['get'], detail=True)
     def preview(self, request, pk=None):
         try:

From d22d9a023c63f8b7c2274318456255c92821741e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 29 Jan 2021 16:48:51 +0100
Subject: [PATCH 1023/1300] frontend support for suggestions #264

---
 src-ui/messages.xlf                           | 31 ++++++++------
 .../common/input/select/select.component.html |  8 ++++
 .../common/input/select/select.component.ts   | 13 +++++-
 .../common/input/tags/tags.component.html     | 23 ++++++-----
 .../common/input/tags/tags.component.ts       | 41 +++++++++++--------
 .../document-detail.component.html            |  8 ++--
 .../document-detail.component.ts              |  7 ++++
 .../data/paperless-document-suggestions.ts    |  9 ++++
 .../src/app/services/rest/document.service.ts |  5 +++
 9 files changed, 102 insertions(+), 43 deletions(-)
 create mode 100644 src-ui/src/app/data/paperless-document-suggestions.ts

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 8bc640c33..d105ae31d 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -146,35 +146,35 @@
         <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">192</context>
+          <context context-type="linenumber">199</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">193</context>
+          <context context-type="linenumber">200</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">194</context>
+          <context context-type="linenumber">201</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">196</context>
+          <context context-type="linenumber">203</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">203</context>
+          <context context-type="linenumber">210</context>
         </context-group>
       </trans-unit>
       <trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7" datatype="html">
@@ -1288,6 +1288,13 @@
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="993900b5f9b0d14c7dbf3afd308afcfc1be5c356" datatype="html">
+        <source>Suggested:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/input/select/select.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="27d158b47717ff9305d19866960418c603f19d55" datatype="html">
         <source>Save current view</source>
         <context-group purpose="location">
@@ -1509,49 +1516,49 @@
         <source>ASN</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2691296884221415710" datatype="html">
         <source>Correspondent</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5701618810648052610" datatype="html">
         <source>Title</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5066119607229701477" datatype="html">
         <source>Document type</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4207916966377787111" datatype="html">
         <source>Created</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit id="231679111972850796" datatype="html">
         <source>Added</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3553216189604488439" datatype="html">
         <source>Modified</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2056433880533904076" datatype="html">
diff --git a/src-ui/src/app/components/common/input/select/select.component.html b/src-ui/src/app/components/common/input/select/select.component.html
index aa500d0d1..973b09a55 100644
--- a/src-ui/src/app/components/common/input/select/select.component.html
+++ b/src-ui/src/app/components/common/input/select/select.component.html
@@ -22,4 +22,12 @@
     </div>
   </div>
   <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
+  <small *ngIf="getSuggestions().length > 0">
+    <span i18n>Suggested:</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>
diff --git a/src-ui/src/app/components/common/input/select/select.component.ts b/src-ui/src/app/components/common/input/select/select.component.ts
index 18f30cf6e..e02aaab72 100644
--- a/src-ui/src/app/components/common/input/select/select.component.ts
+++ b/src-ui/src/app/components/common/input/select/select.component.ts
@@ -30,11 +30,22 @@ export class SelectComponent extends AbstractInputComponent<number> {
   @Input()
   allowNull: boolean = false
 
+  @Input()
+  suggestions: number[]
+
   @Output()
   createNew = new EventEmitter()
-  
+
   showPlusButton(): boolean {
     return this.createNew.observers.length > 0
   }
 
+  getSuggestions() {
+    if (this.suggestions && this.items) {
+      return this.suggestions.filter(id => id != this.value).map(id => this.items.find(item => item.id == id))
+    } else {
+      return []
+    }
+  }
+
 }
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html
index c9a0c96d6..22a7e640a 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.html
+++ b/src-ui/src/app/components/common/input/tags/tags.component.html
@@ -2,30 +2,25 @@
   <label for="tags" i18n>Tags</label>
 
   <div class="input-group flex-nowrap">
-    <ng-select name="tags" [items]="tags" bindLabel="name" bindValue="id" [(ngModel)]="displayValue"
+    <ng-select name="tags" [items]="tags" bindLabel="name" bindValue="id" [(ngModel)]="value"
       [multiple]="true"
       [closeOnSelect]="false"
       [clearSearchOnAdd]="true"
-      [disabled]="disabled"
       [hideSelected]="true"
-      (change)="ngSelectChange()">
+      (change)="onChange(value)"
+      (blur)="onTouched()">
 
       <ng-template ng-label-tmp let-item="item">
         <span class="tag-wrap tag-wrap-delete" (click)="removeTag(item.id)">
           <svg width="1.2em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
             <use xlink:href="assets/bootstrap-icons.svg#x"/>
           </svg>
-          <app-tag style="background-color: none;" [tag]="getTag(item.id)"></app-tag>
+          <app-tag *ngIf="item.id && tags" style="background-color: none;" [tag]="getTag(item.id)"></app-tag>
         </span>
       </ng-template>
       <ng-template ng-option-tmp let-item="item" let-index="index" let-search="searchTerm">
         <div class="tag-wrap">
-          <div class="selected-icon d-inline-block mr-1">
-            <svg *ngIf="displayValue.includes(item.id)" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-              <use xlink:href="assets/bootstrap-icons.svg#check"/>
-            </svg>
-          </div>
-          <app-tag class="mr-2" [tag]="getTag(item.id)"></app-tag>
+          <app-tag *ngIf="item.id && tags" class="mr-2" [tag]="getTag(item.id)"></app-tag>
         </div>
       </ng-template>
     </ng-select>
@@ -39,5 +34,13 @@
     </div>
   </div>
   <small class="form-text text-muted" *ngIf="hint">{{hint}}</small>
+  <small *ngIf="getSuggestions().length > 0">
+    <span i18n>Suggested:</span>&nbsp;
+    <ng-container *ngFor="let tag of getSuggestions()">
+      <a (click)="addTag(tag.id)" [routerLink]="">{{tag.name}}</a>&nbsp;
+    </ng-container>
+    
+    
+  </small>
 
 </div>
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.ts b/src-ui/src/app/components/common/input/tags/tags.component.ts
index 5501ac5a6..f77d0570d 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.ts
+++ b/src-ui/src/app/components/common/input/tags/tags.component.ts
@@ -26,9 +26,6 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
 
   writeValue(newValue: number[]): void {
     this.value = newValue
-    if (this.tags) {
-      this.displayValue = newValue
-    }
   }
   registerOnChange(fn: any): void {
     this.onChange = fn;
@@ -43,7 +40,6 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
   ngOnInit(): void {
     this.tagService.listAll().subscribe(result => {
       this.tags = result.results
-      this.displayValue = this.value
     })
   }
 
@@ -53,23 +49,28 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
   @Input()
   hint
 
-  value: number[]
+  @Input()
+  suggestions: number[]
 
-  displayValue: number[] = []
+  value: number[]
 
   tags: PaperlessTag[]
 
   getTag(id) {
-    return this.tags.find(tag => tag.id == id)
+    if (this.tags) {
+      return this.tags.find(tag => tag.id == id)
+    } else {
+      return null
+    }
   }
 
   removeTag(id) {
-    let index = this.displayValue.indexOf(id)
+    let index = this.value.indexOf(id)
     if (index > -1) {
-      let oldValue = this.displayValue
+      let oldValue = this.value
       oldValue.splice(index, 1)
-      this.displayValue = [...oldValue]
-      this.onChange(this.displayValue)
+      this.value = [...oldValue]
+      this.onChange(this.value)
     }
   }
 
@@ -79,15 +80,23 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
     modal.componentInstance.success.subscribe(newTag => {
       this.tagService.listAll().subscribe(tags => {
         this.tags = tags.results
-        this.displayValue = [...this.displayValue, newTag.id]
-        this.onChange(this.displayValue)
+        this.value = [...this.value, newTag.id]
+        this.onChange(this.value)
       })
     })
   }
 
-  ngSelectChange() {
-    this.value = this.displayValue
-    this.onChange(this.displayValue)
+  getSuggestions() {
+    if (this.suggestions && this.tags) {
+      return this.suggestions.filter(id => !this.value.includes(id)).map(id => this.tags.find(tag => tag.id == id))
+    } else {
+      return []
+    }
+  }
+
+  addTag(id) {
+    this.value = [...this.value, id]
+    this.onChange(this.value)
   }
 
 }
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 639b9e260..2814a1242 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -60,10 +60,10 @@
                         <app-input-number i18n-title title="Archive serial number" [error]="error?.archive_serial_number" formControlName='archive_serial_number'></app-input-number>
                         <app-input-date-time i18n-titleDate titleDate="Date created" formControlName="created"></app-input-date-time>
                         <app-input-select [items]="correspondents" i18n-title title="Correspondent" formControlName="correspondent" [allowNull]="true"
-                            (createNew)="createCorrespondent()"></app-input-select>
+                            (createNew)="createCorrespondent()" [suggestions]="suggestions?.correspondents"></app-input-select>
                         <app-input-select [items]="documentTypes" i18n-title title="Document type" formControlName="document_type" [allowNull]="true"
-                            (createNew)="createDocumentType()"></app-input-select>
-                        <app-input-tags formControlName="tags"></app-input-tags>
+                            (createNew)="createDocumentType()" [suggestions]="suggestions?.document_types"></app-input-select>
+                        <app-input-tags formControlName="tags" [suggestions]="suggestions?.tags"></app-input-tags>
 
                     </ng-template>
                 </li>
@@ -145,6 +145,6 @@
         <ng-container *ngIf="getContentType() == 'text/plain'">
             <object [data]="previewUrl | safe" type="text/plain" class="preview-sticky" width="100%"></object>
         </ng-container>
-          
+
     </div>
 </div>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index aa2308eac..a7cce715e 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -19,6 +19,7 @@ import { PDFDocumentProxy } from 'ng2-pdf-viewer';
 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';
 
 @Component({
   selector: 'app-document-detail',
@@ -40,6 +41,8 @@ export class DocumentDetailComponent implements OnInit {
   documentId: number
   document: PaperlessDocument
   metadata: PaperlessDocumentMetadata
+  suggestions: PaperlessDocumentSuggestions
+
   title: string
   previewUrl: string
   downloadUrl: string
@@ -95,6 +98,7 @@ export class DocumentDetailComponent implements OnInit {
       this.previewUrl = this.documentsService.getPreviewUrl(this.documentId)
       this.downloadUrl = this.documentsService.getDownloadUrl(this.documentId)
       this.downloadOriginalUrl = this.documentsService.getDownloadUrl(this.documentId, true)
+      this.suggestions = null
       if (this.openDocumentService.getOpenDocument(this.documentId)) {
         this.updateComponent(this.openDocumentService.getOpenDocument(this.documentId))
       } else {
@@ -112,6 +116,9 @@ export class DocumentDetailComponent implements OnInit {
     this.documentsService.getMetadata(doc.id).subscribe(result => {
       this.metadata = result
     })
+    this.documentsService.getSuggestions(doc.id).subscribe(result => {
+      this.suggestions = result
+    })
     this.title = this.documentTitlePipe.transform(doc.title)
     this.documentForm.patchValue(doc)
   }
diff --git a/src-ui/src/app/data/paperless-document-suggestions.ts b/src-ui/src/app/data/paperless-document-suggestions.ts
new file mode 100644
index 000000000..71459eff2
--- /dev/null
+++ b/src-ui/src/app/data/paperless-document-suggestions.ts
@@ -0,0 +1,9 @@
+export interface PaperlessDocumentSuggestions {
+
+  tags?: number[]
+
+  correspondents?: number[]
+
+  document_types?: number[]
+
+}
\ No newline at end of file
diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index dd2c32fa8..19b18cfeb 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -11,6 +11,7 @@ import { CorrespondentService } from './correspondent.service';
 import { DocumentTypeService } from './document-type.service';
 import { TagService } from './tag.service';
 import { FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
+import { PaperlessDocumentSuggestions } from 'src/app/data/paperless-document-suggestions';
 
 export const DOCUMENT_SORT_FIELDS = [
   { field: 'archive_serial_number', name: $localize`ASN` },
@@ -129,4 +130,8 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     return this.http.post<SelectionData>(this.getResourceUrl(null, 'selection_data'), {"documents": ids})
   }
 
+  getSuggestions(id: number): Observable<PaperlessDocumentSuggestions> {
+    return this.http.get<PaperlessDocumentSuggestions>(this.getResourceUrl(id, 'suggestions'))
+  }
+
 }

From a40e4fe3bc1f0fd9868f7ee40d6c319e303a99dd Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 29 Jan 2021 16:57:00 +0100
Subject: [PATCH 1024/1300] update messages

---
 src-ui/messages.xlf                                           | 4 ++--
 .../app/components/common/input/select/select.component.html  | 2 +-
 .../src/app/components/common/input/tags/tags.component.html  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index d105ae31d..0ad552100 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -1288,8 +1288,8 @@
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="993900b5f9b0d14c7dbf3afd308afcfc1be5c356" datatype="html">
-        <source>Suggested:</source>
+      <trans-unit id="a1e6c11f20d4bf6e8e6b43e3c6d2561b2080645e" datatype="html">
+        <source>Suggestions:</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/input/select/select.component.html</context>
           <context context-type="linenumber">26</context>
diff --git a/src-ui/src/app/components/common/input/select/select.component.html b/src-ui/src/app/components/common/input/select/select.component.html
index 973b09a55..540429e89 100644
--- a/src-ui/src/app/components/common/input/select/select.component.html
+++ b/src-ui/src/app/components/common/input/select/select.component.html
@@ -23,7 +23,7 @@
   </div>
   <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
   <small *ngIf="getSuggestions().length > 0">
-    <span i18n>Suggested:</span>&nbsp;
+    <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>
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html
index 22a7e640a..677b9f4d1 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.html
+++ b/src-ui/src/app/components/common/input/tags/tags.component.html
@@ -35,7 +35,7 @@
   </div>
   <small class="form-text text-muted" *ngIf="hint">{{hint}}</small>
   <small *ngIf="getSuggestions().length > 0">
-    <span i18n>Suggested:</span>&nbsp;
+    <span i18n>Suggestions:</span>&nbsp;
     <ng-container *ngFor="let tag of getSuggestions()">
       <a (click)="addTag(tag.id)" [routerLink]="">{{tag.name}}</a>&nbsp;
     </ng-container>

From a54784da11b0b86503e6a8ebd6a6c9c85a0a8c9e Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Fri, 29 Jan 2021 18:59:00 +0000
Subject: [PATCH 1025/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 54 ++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index a898e4630..b6e2708ba 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -147,7 +147,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
         <source>Created</source>
-        <target>Erstellt</target>
+        <target>Ausgestellt</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">129</context>
@@ -166,7 +166,7 @@
         <target>Löschen bestätigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">192</context>
+          <context context-type="linenumber">199</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
@@ -174,7 +174,7 @@
         <target>Möchten Sie das Dokument &quot;<x equiv-text="this.document.title" id="PH"/>&quot; wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">193</context>
+          <context context-type="linenumber">200</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6691075929777935948">
@@ -182,7 +182,7 @@
         <target>Die Dateien dieses Dokuments werden permanent gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">194</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="719892092227206532">
@@ -190,7 +190,7 @@
         <target>Dokument löschen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">196</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1844801255494293730">
@@ -198,7 +198,7 @@
         <target>Fehler beim Löschen des Dokuments: <x equiv-text="JSON.stringify(error)" id="PH"/></target>
         <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">210</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -307,7 +307,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="30eebc2dd656dbcb259d8d5286d244ee397d63bd">
         <source>Date created</source>
-        <target>Erstellt am</target>
+        <target>Ausgestellt am</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
           <context context-type="linenumber">61</context>
@@ -1283,6 +1283,14 @@
           <context context-type="linenumber">73</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="7894972847287473517">
+        <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</source>
+        <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
         <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
         <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; und &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
@@ -1292,14 +1300,6 @@
         </context-group>
         <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
       </trans-unit>
-      <trans-unit datatype="html" id="7894972847287473517">
-        <source>&quot;<x equiv-text="i.name" id="PH"/>&quot;</source>
-        <target>&quot;<x equiv-text="i.name" id="PH"/>&quot;</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">116</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="760986369763309193">
         <source>, </source>
         <target>, </target>
@@ -1470,6 +1470,14 @@
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="a1e6c11f20d4bf6e8e6b43e3c6d2561b2080645e">
+        <source>Suggestions:</source>
+        <target>Vorschläge:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/input/select/select.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">
         <source>Save current view</source>
         <target>Aktuelle Ansicht speichern</target>
@@ -1723,7 +1731,7 @@
         <target>ASN</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2691296884221415710">
@@ -1731,7 +1739,7 @@
         <target>Korrespondent</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5701618810648052610">
@@ -1739,7 +1747,7 @@
         <target>Titel</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5066119607229701477">
@@ -1747,15 +1755,15 @@
         <target>Dokumenttyp</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4207916966377787111">
         <source>Created</source>
-        <target>Erstellt am</target>
+        <target>Ausgestellt am</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="231679111972850796">
@@ -1763,7 +1771,7 @@
         <target>Hinzugefügt am</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3553216189604488439">
@@ -1771,7 +1779,7 @@
         <target>Geändert am</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2056433880533904076">

From e4aa31a62d23df8533903764a55dbf291a57d67c Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Fri, 29 Jan 2021 19:57:40 +0000
Subject: [PATCH 1026/1300] Translate /src-ui/messages.xlf in fr

translation completed for the source file '/src-ui/messages.xlf'
on the 'fr' language.
---
 src-ui/src/locale/messages.fr.xlf | 32 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
index b5f602c7f..62dbad342 100644
--- a/src-ui/src/locale/messages.fr.xlf
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -166,7 +166,7 @@
         <target>Confirmer la suppression</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">192</context>
+          <context context-type="linenumber">199</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
@@ -174,7 +174,7 @@
         <target>Voulez-vous vraiment supprimer le document &quot;<x equiv-text="this.document.title" id="PH"/>&quot; ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">193</context>
+          <context context-type="linenumber">200</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6691075929777935948">
@@ -182,7 +182,7 @@
         <target>Les fichiers liés à ce document seront supprimés définitivement. Cette action est irréversible.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">194</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="719892092227206532">
@@ -190,7 +190,7 @@
         <target>Supprimer le document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">196</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1844801255494293730">
@@ -198,7 +198,7 @@
         <target>Une erreur s'est produite lors de la suppression du document : <x equiv-text="JSON.stringify(error)" id="PH"/></target>
         <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">210</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -1470,6 +1470,14 @@
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="a1e6c11f20d4bf6e8e6b43e3c6d2561b2080645e">
+        <source>Suggestions:</source>
+        <target>Suggestions : </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/input/select/select.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">
         <source>Save current view</source>
         <target>Enregistrer la vue actuelle</target>
@@ -1723,7 +1731,7 @@
         <target>NSA</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2691296884221415710">
@@ -1731,7 +1739,7 @@
         <target>Correspondant</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5701618810648052610">
@@ -1739,7 +1747,7 @@
         <target>Titre</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5066119607229701477">
@@ -1747,7 +1755,7 @@
         <target>Type de document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4207916966377787111">
@@ -1755,7 +1763,7 @@
         <target>Date de création</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="231679111972850796">
@@ -1763,7 +1771,7 @@
         <target>Date d'ajout</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3553216189604488439">
@@ -1771,7 +1779,7 @@
         <target>Date de modification</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2056433880533904076">

From 21c501de28f09c582b78dbce45b825c57feef84e Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Wed, 27 Jan 2021 07:17:46 +0100
Subject: [PATCH 1027/1300] force flush on temp file during consumption

file.write() does not guarantee that a file handle contains anything
without calling an accompanying file.flush()
For typical files that are larger than the OS-file buffer, this is no
problem
For small files (e.g. 64 characters in a .TXT), this race condition
leads to `inode/x-empty` because the file inode is created, but no
content is written to it
---
 ansible/molecule/default/verify.yml | 6 +-----
 src/documents/views.py              | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ansible/molecule/default/verify.yml b/ansible/molecule/default/verify.yml
index 1b3a436ca..4d7e30f4d 100644
--- a/ansible/molecule/default/verify.yml
+++ b/ansible/molecule/default/verify.yml
@@ -29,9 +29,9 @@
           document:
             content: "{{ content }}"
             filename: "{{ filename }}.txt"
-            mime_type: text/plain
         headers:
           Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
+          Content-Type: text/plain
         return_content: yes
       register: post_document
       failed_when: "'OK' not in post_document.content"
@@ -45,10 +45,6 @@
       register: logs
       failed_when: "('Consuming ' + filename + '.txt') not in logs.content"
 
-    - name: sleep 5 seconds
-      pause:
-        seconds: 5
-
     - name: verify uploaded document has been consumed
       uri:
         url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/"
diff --git a/src/documents/views.py b/src/documents/views.py
index b99bf11c7..7aadba36d 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -383,6 +383,7 @@ class PostDocumentView(APIView):
                                          dir=settings.SCRATCH_DIR,
                                          delete=False) as f:
             f.write(doc_data)
+            f.flush()
             os.utime(f.name, times=(t, t))
 
             async_task("documents.tasks.consume_file",

From 063bfc245cca390fd6745b95fac2ae6875c6e836 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sat, 30 Jan 2021 12:20:55 +0100
Subject: [PATCH 1028/1300] DEBUG - force newline in .txt

---
 ansible/molecule/default/verify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/molecule/default/verify.yml b/ansible/molecule/default/verify.yml
index 4d7e30f4d..fde2e8905 100644
--- a/ansible/molecule/default/verify.yml
+++ b/ansible/molecule/default/verify.yml
@@ -17,7 +17,7 @@
 
     - name: generate random name and content
       set_fact:
-        content: "{{ lookup('password', '/dev/null length=64 chars=ascii_letters') }}"
+        content: "{{ lookup('password', '/dev/null length=64 chars=ascii_letters') }}\n"
         filename: "{{ lookup('password', '/dev/null length=8 chars=ascii_letters') }}"
 
     - name: check if document posting works

From d9e06958dcd1dc1888f16efc614dce7feb57f667 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sat, 30 Jan 2021 12:50:05 +0100
Subject: [PATCH 1029/1300] DEBUG - force flush 2nd try

---
 ansible/molecule/default/verify.yml | 2 +-
 src/documents/views.py              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/molecule/default/verify.yml b/ansible/molecule/default/verify.yml
index fde2e8905..4d7e30f4d 100644
--- a/ansible/molecule/default/verify.yml
+++ b/ansible/molecule/default/verify.yml
@@ -17,7 +17,7 @@
 
     - name: generate random name and content
       set_fact:
-        content: "{{ lookup('password', '/dev/null length=64 chars=ascii_letters') }}\n"
+        content: "{{ lookup('password', '/dev/null length=64 chars=ascii_letters') }}"
         filename: "{{ lookup('password', '/dev/null length=8 chars=ascii_letters') }}"
 
     - name: check if document posting works
diff --git a/src/documents/views.py b/src/documents/views.py
index 7aadba36d..808ecb925 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -381,9 +381,9 @@ class PostDocumentView(APIView):
 
         with tempfile.NamedTemporaryFile(prefix="paperless-upload-",
                                          dir=settings.SCRATCH_DIR,
+                                         buffering=0,
                                          delete=False) as f:
             f.write(doc_data)
-            f.flush()
             os.utime(f.name, times=(t, t))
 
             async_task("documents.tasks.consume_file",

From 269673ce05c15ceb05cdda6907c207878ec14d4c Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sat, 30 Jan 2021 13:58:54 +0100
Subject: [PATCH 1030/1300] DEBUG - use very long txt file

---
 ansible/molecule/default/verify.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ansible/molecule/default/verify.yml b/ansible/molecule/default/verify.yml
index 4d7e30f4d..185840783 100644
--- a/ansible/molecule/default/verify.yml
+++ b/ansible/molecule/default/verify.yml
@@ -17,7 +17,7 @@
 
     - name: generate random name and content
       set_fact:
-        content: "{{ lookup('password', '/dev/null length=64 chars=ascii_letters') }}"
+        content: "{{ lookup('password', '/dev/null length=65536 chars=ascii_letters') }}"
         filename: "{{ lookup('password', '/dev/null length=8 chars=ascii_letters') }}"
 
     - name: check if document posting works
@@ -45,6 +45,10 @@
       register: logs
       failed_when: "('Consuming ' + filename + '.txt') not in logs.content"
 
+    - name: sleep till consumption finished
+      pause:
+        seconds: 10
+
     - name: verify uploaded document has been consumed
       uri:
         url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/"

From 87a18eae2d37b1c05052aafb7c4142a13ad10892 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 30 Jan 2021 14:22:23 +0100
Subject: [PATCH 1031/1300] centralized classifier loading, better error
 handling, no error messages when auto matching is not used

---
 src/documents/classifier.py                   | 28 ++++++++++
 src/documents/consumer.py                     | 11 +---
 .../management/commands/document_retagger.py  | 11 +---
 src/documents/tasks.py                        | 24 +++++----
 src/documents/tests/test_classifier.py        | 32 ++++++++++-
 src/documents/tests/test_consumer.py          |  2 +-
 src/documents/tests/test_tasks.py             | 54 +++++++++++++++++--
 src/documents/views.py                        | 12 +----
 8 files changed, 131 insertions(+), 43 deletions(-)

diff --git a/src/documents/classifier.py b/src/documents/classifier.py
index 60c9abeec..41cd05412 100755
--- a/src/documents/classifier.py
+++ b/src/documents/classifier.py
@@ -26,6 +26,34 @@ def preprocess_content(content):
     return content
 
 
+def load_classifier():
+    if not os.path.isfile(settings.MODEL_FILE):
+        logger.debug(
+            f"Document classification model does not exist (yet), not "
+            f"performing automatic matching."
+        )
+        return None
+
+    try:
+        classifier = DocumentClassifier()
+        classifier.reload()
+    except (EOFError, IncompatibleClassifierVersionError) as e:
+        # there's something wrong with the model file.
+        logger.error(
+            f"Unrecoverable error while loading document classification model: "
+            f"{str(e)}, deleting model file."
+        )
+        os.unlink(settings.MODEL_FILE)
+        classifier = None
+    except OSError as e:
+        logger.error(
+            f"Error while loading document classification model: {str(e)}"
+        )
+        classifier = None
+
+    return classifier
+
+
 class DocumentClassifier(object):
 
     FORMAT_VERSION = 6
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 5418e3b59..5e76ad03a 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -11,7 +11,7 @@ from django.utils import timezone
 from filelock import FileLock
 from rest_framework.reverse import reverse
 
-from .classifier import DocumentClassifier, IncompatibleClassifierVersionError
+from .classifier import load_classifier
 from .file_handling import create_source_path_directory, \
     generate_unique_filename
 from .loggers import LoggingMixin
@@ -201,14 +201,7 @@ class Consumer(LoggingMixin):
         #   reloading the classifier multiple times, since there are multiple
         #   post-consume hooks that all require the classifier.
 
-        try:
-            classifier = DocumentClassifier()
-            classifier.reload()
-        except (OSError, EOFError, IncompatibleClassifierVersionError) as e:
-            self.log(
-                "warning",
-                f"Cannot classify documents: {e}.")
-            classifier = None
+        classifier = load_classifier()
 
         # now that everything is done, we can start to store the document
         # in the system. This will be a transaction and reasonably fast.
diff --git a/src/documents/management/commands/document_retagger.py b/src/documents/management/commands/document_retagger.py
index 0fb9782c1..b2f5d8918 100755
--- a/src/documents/management/commands/document_retagger.py
+++ b/src/documents/management/commands/document_retagger.py
@@ -2,8 +2,7 @@ import logging
 
 from django.core.management.base import BaseCommand
 
-from documents.classifier import DocumentClassifier, \
-    IncompatibleClassifierVersionError
+from documents.classifier import load_classifier
 from documents.models import Document
 from ...mixins import Renderable
 from ...signals.handlers import set_correspondent, set_document_type, set_tags
@@ -70,13 +69,7 @@ class Command(Renderable, BaseCommand):
             queryset = Document.objects.all()
         documents = queryset.distinct()
 
-        classifier = DocumentClassifier()
-        try:
-            classifier.reload()
-        except (OSError, EOFError, IncompatibleClassifierVersionError) as e:
-            logging.getLogger(__name__).warning(
-                f"Cannot classify documents: {e}.")
-            classifier = None
+        classifier = load_classifier()
 
         for document in documents:
             logging.getLogger(__name__).info(
diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index 38ff532b5..4e74d7350 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -6,10 +6,9 @@ from django.db.models.signals import post_save
 from whoosh.writing import AsyncWriter
 
 from documents import index, sanity_checker
-from documents.classifier import DocumentClassifier, \
-    IncompatibleClassifierVersionError
+from documents.classifier import DocumentClassifier, load_classifier
 from documents.consumer import Consumer, ConsumerError
-from documents.models import Document
+from documents.models import Document, Tag, DocumentType, Correspondent
 from documents.sanity_checker import SanityFailedError
 
 
@@ -30,13 +29,18 @@ def index_reindex():
 
 
 def train_classifier():
-    classifier = DocumentClassifier()
+    if (not Tag.objects.filter(
+                matching_algorithm=Tag.MATCH_AUTO).exists() and
+        not DocumentType.objects.filter(
+            matching_algorithm=Tag.MATCH_AUTO).exists() and
+        not Correspondent.objects.filter(
+            matching_algorithm=Tag.MATCH_AUTO).exists()):
 
-    try:
-        # load the classifier, since we might not have to train it again.
-        classifier.reload()
-    except (OSError, EOFError, IncompatibleClassifierVersionError):
-        # This is what we're going to fix here.
+        return
+
+    classifier = load_classifier()
+
+    if not classifier:
         classifier = DocumentClassifier()
 
     try:
@@ -52,7 +56,7 @@ def train_classifier():
             )
 
     except Exception as e:
-        logging.getLogger(__name__).error(
+        logging.getLogger(__name__).warning(
             "Classifier error: " + str(e)
         )
 
diff --git a/src/documents/tests/test_classifier.py b/src/documents/tests/test_classifier.py
index 9e999794d..43c38b691 100644
--- a/src/documents/tests/test_classifier.py
+++ b/src/documents/tests/test_classifier.py
@@ -1,10 +1,13 @@
+import os
 import tempfile
+from pathlib import Path
 from time import sleep
 from unittest import mock
 
+from django.conf import settings
 from django.test import TestCase, override_settings
 
-from documents.classifier import DocumentClassifier, IncompatibleClassifierVersionError
+from documents.classifier import DocumentClassifier, IncompatibleClassifierVersionError, load_classifier
 from documents.models import Correspondent, Document, Tag, DocumentType
 from documents.tests.utils import DirectoriesMixin
 
@@ -235,3 +238,30 @@ class TestClassifier(DirectoriesMixin, TestCase):
         self.classifier.train()
         self.assertListEqual(self.classifier.predict_tags(doc1.content), [t1.pk])
         self.assertListEqual(self.classifier.predict_tags(doc2.content), [])
+
+    def test_load_classifier_not_exists(self):
+        self.assertFalse(os.path.exists(settings.MODEL_FILE))
+        self.assertIsNone(load_classifier())
+
+    @mock.patch("documents.classifier.DocumentClassifier.reload")
+    def test_load_classifier(self, reload):
+        Path(settings.MODEL_FILE).touch()
+        self.assertIsNotNone(load_classifier())
+
+    @mock.patch("documents.classifier.DocumentClassifier.reload")
+    def test_load_classifier_incompatible_version(self, reload):
+        Path(settings.MODEL_FILE).touch()
+        self.assertTrue(os.path.exists(settings.MODEL_FILE))
+
+        reload.side_effect = IncompatibleClassifierVersionError()
+        self.assertIsNone(load_classifier())
+        self.assertFalse(os.path.exists(settings.MODEL_FILE))
+
+    @mock.patch("documents.classifier.DocumentClassifier.reload")
+    def test_load_classifier_os_error(self, reload):
+        Path(settings.MODEL_FILE).touch()
+        self.assertTrue(os.path.exists(settings.MODEL_FILE))
+
+        reload.side_effect = OSError()
+        self.assertIsNone(load_classifier())
+        self.assertTrue(os.path.exists(settings.MODEL_FILE))
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index a6861a541..02d1d0004 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -420,7 +420,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
         self.assertIsNotNone(os.path.isfile(document.title))
         self.assertTrue(os.path.isfile(document.source_path))
 
-    @mock.patch("documents.consumer.DocumentClassifier")
+    @mock.patch("documents.consumer.load_classifier")
     def testClassifyDocument(self, m):
         correspondent = Correspondent.objects.create(name="test")
         dtype = DocumentType.objects.create(name="test")
diff --git a/src/documents/tests/test_tasks.py b/src/documents/tests/test_tasks.py
index 653590707..eb310d357 100644
--- a/src/documents/tests/test_tasks.py
+++ b/src/documents/tests/test_tasks.py
@@ -1,11 +1,12 @@
-from datetime import datetime
+import os
 from unittest import mock
 
+from django.conf import settings
 from django.test import TestCase
 from django.utils import timezone
 
 from documents import tasks
-from documents.models import Document
+from documents.models import Document, Tag, Correspondent, DocumentType
 from documents.sanity_checker import SanityError, SanityFailedError
 from documents.tests.utils import DirectoriesMixin
 
@@ -22,8 +23,55 @@ class TestTasks(DirectoriesMixin, TestCase):
 
         tasks.index_optimize()
 
-    def test_train_classifier(self):
+    @mock.patch("documents.tasks.load_classifier")
+    def test_train_classifier_no_auto_matching(self, load_classifier):
         tasks.train_classifier()
+        load_classifier.assert_not_called()
+
+    @mock.patch("documents.tasks.load_classifier")
+    def test_train_classifier_with_auto_tag(self, load_classifier):
+        load_classifier.return_value = None
+        Tag.objects.create(matching_algorithm=Tag.MATCH_AUTO, name="test")
+        tasks.train_classifier()
+        load_classifier.assert_called_once()
+        self.assertFalse(os.path.isfile(settings.MODEL_FILE))
+
+    @mock.patch("documents.tasks.load_classifier")
+    def test_train_classifier_with_auto_type(self, load_classifier):
+        load_classifier.return_value = None
+        DocumentType.objects.create(matching_algorithm=Tag.MATCH_AUTO, name="test")
+        tasks.train_classifier()
+        load_classifier.assert_called_once()
+        self.assertFalse(os.path.isfile(settings.MODEL_FILE))
+
+    @mock.patch("documents.tasks.load_classifier")
+    def test_train_classifier_with_auto_correspondent(self, load_classifier):
+        load_classifier.return_value = None
+        Correspondent.objects.create(matching_algorithm=Tag.MATCH_AUTO, name="test")
+        tasks.train_classifier()
+        load_classifier.assert_called_once()
+        self.assertFalse(os.path.isfile(settings.MODEL_FILE))
+
+    def test_train_classifier(self):
+        c = Correspondent.objects.create(matching_algorithm=Tag.MATCH_AUTO, name="test")
+        doc = Document.objects.create(correspondent=c, content="test", title="test")
+        self.assertFalse(os.path.isfile(settings.MODEL_FILE))
+
+        tasks.train_classifier()
+        self.assertTrue(os.path.isfile(settings.MODEL_FILE))
+        mtime = os.stat(settings.MODEL_FILE).st_mtime
+
+        tasks.train_classifier()
+        self.assertTrue(os.path.isfile(settings.MODEL_FILE))
+        mtime2 = os.stat(settings.MODEL_FILE).st_mtime
+        self.assertEqual(mtime, mtime2)
+
+        doc.content = "test2"
+        doc.save()
+        tasks.train_classifier()
+        self.assertTrue(os.path.isfile(settings.MODEL_FILE))
+        mtime3 = os.stat(settings.MODEL_FILE).st_mtime
+        self.assertNotEqual(mtime2, mtime3)
 
     @mock.patch("documents.tasks.sanity_checker.check_sanity")
     def test_sanity_check(self, m):
diff --git a/src/documents/views.py b/src/documents/views.py
index 43ae2b103..6fbb42976 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -34,7 +34,7 @@ from rest_framework.viewsets import (
 import documents.index as index
 from paperless.db import GnuPG
 from paperless.views import StandardPagination
-from .classifier import DocumentClassifier, IncompatibleClassifierVersionError
+from .classifier import load_classifier
 from .filters import (
     CorrespondentFilterSet,
     DocumentFilterSet,
@@ -259,15 +259,7 @@ class DocumentViewSet(RetrieveModelMixin,
         except Document.DoesNotExist:
             raise Http404()
 
-        try:
-            classifier = DocumentClassifier()
-            classifier.reload()
-        except (OSError, EOFError, IncompatibleClassifierVersionError) as e:
-            logging.getLogger(__name__).warning(
-                "Cannot load classifier: Not providing auto matching "
-                "suggestions"
-            )
-            classifier = None
+        classifier = load_classifier()
 
         return Response({
             "correspondents": [

From 4c6a02aee7e3869b9e7daab3ce9c06b8304518d8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 30 Jan 2021 15:22:51 +0100
Subject: [PATCH 1032/1300] pycodestyle

---
 src/documents/classifier.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/documents/classifier.py b/src/documents/classifier.py
index 41cd05412..b427264c8 100755
--- a/src/documents/classifier.py
+++ b/src/documents/classifier.py
@@ -40,8 +40,8 @@ def load_classifier():
     except (EOFError, IncompatibleClassifierVersionError) as e:
         # there's something wrong with the model file.
         logger.error(
-            f"Unrecoverable error while loading document classification model: "
-            f"{str(e)}, deleting model file."
+            f"Unrecoverable error while loading document "
+            f"classification model: {str(e)}, deleting model file."
         )
         os.unlink(settings.MODEL_FILE)
         classifier = None

From ffa44f51cdc0ce26621fced9d06fa724d483e9d1 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sat, 30 Jan 2021 15:30:39 +0100
Subject: [PATCH 1033/1300] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a19de79b2..0fc3185a1 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 [Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and contributors that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents.
 
-Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, have a look at the changelog in the documentation.
+Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. 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.
 
 # Survey
 

From 35a4779cc06d6e7bfd03ed7073804d15d789c7e8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 30 Jan 2021 15:44:23 +0100
Subject: [PATCH 1034/1300] fix typo

---
 src/documents/tests/test_tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/documents/tests/test_tasks.py b/src/documents/tests/test_tasks.py
index eb310d357..d008f995a 100644
--- a/src/documents/tests/test_tasks.py
+++ b/src/documents/tests/test_tasks.py
@@ -83,7 +83,7 @@ class TestTasks(DirectoriesMixin, TestCase):
         self.assertRaises(SanityFailedError, tasks.sanity_check)
         m.assert_called_once()
 
-    def test_culk_update_documents(self):
+    def test_bulk_update_documents(self):
         doc1 = Document.objects.create(title="test", content="my document", checksum="wow", added=timezone.now(),
                                 created=timezone.now(), modified=timezone.now())
 

From ba637c85823f13d92e362a41c6844a916e08c2ef Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 30 Jan 2021 21:56:17 +0100
Subject: [PATCH 1035/1300] replace preview icon #471

---
 .../document-card-large/document-card-large.component.html  | 6 +++---
 .../document-card-small/document-card-small.component.html  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index d26c17159..a47f13653 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -44,9 +44,9 @@
               </svg>&nbsp;<span class="d-block d-md-inline" i18n>Edit</span>
             </a>
             <a class="btn btn-sm btn-outline-secondary" [href]="getPreviewUrl()">
-              <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-search" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-                <path fill-rule="evenodd" d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"/>
-                <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
+              <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>
             <a class="btn btn-sm btn-outline-secondary" [href]="getDownloadUrl()">
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 882de71ed..28dc84236 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -38,9 +38,9 @@
             </svg>
           </a>
           <a [href]="getPreviewUrl()" class="btn btn-sm btn-outline-secondary" title="View in browser" i18n-title>
-            <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-search" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-              <path fill-rule="evenodd" d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"/>
-              <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
+            <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>
           <a [href]="getDownloadUrl()" class="btn btn-sm btn-outline-secondary" title="Download" (click)="$event.stopPropagation()" i18n-title>

From 9c3b16c879cf90b4ef2c82172d583681f8445fd3 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sun, 31 Jan 2021 11:25:39 +0100
Subject: [PATCH 1036/1300] Switch CI target to sha instead of ref

---
 ansible/molecule/default/converge.yml | 4 ++--
 ansible/tasks/main.yml                | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ansible/molecule/default/converge.yml b/ansible/molecule/default/converge.yml
index f5f9b17c2..1ae260bac 100644
--- a/ansible/molecule/default/converge.yml
+++ b/ansible/molecule/default/converge.yml
@@ -2,9 +2,9 @@
 - name: update previous release to newest release
   hosts: all
   tasks:
-    - name: set github ref as version when available
+    - name: set current github commit as version when available
       set_fact:
-        paperlessng_version: "{{ lookup('env', 'GITHUB_REF') | default('latest', True) }}"
+        paperlessng_version: "{{ lookup('env', 'GITHUB_SHA') | default('master', True) }}"
     - name: update to newest paperless-ng release
       include_role:
         name: ansible
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index f45747cb6..dba409549 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -114,6 +114,12 @@
         paperlessng_version: "{{ latest_release.json['tag_name'] }}"
   when: paperlessng_version == "latest"
 
+- name: check if version is ref
+  fail:
+    msg: "Specifying `paperlessng_version` as git ref may not work as expected!"
+  ignore_errors: True  # Output failure (as warning), but don't consider play failed
+  when: paperlessng_version.startswith('refs/')
+
 - block:
     - name: sanitize version string
       set_fact:

From eb6153c5aa301ce6339de248d74b95d584b0a732 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Sun, 31 Jan 2021 12:00:41 +0100
Subject: [PATCH 1037/1300] Change CI ref from merge to head

At this time in the CI, merge is not accessible from tree
https://github.community/t/github-sha-but-how-to-get-the-latest-commit-reference-on-a-branch/17160
---
 .github/workflows/ansible.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index fd965e760..a27ce103c 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -7,13 +7,20 @@ jobs:
   # https://molecule.readthedocs.io/en/latest/ci.html#github-actions
   test:
     runs-on: ubuntu-latest
-    # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
-    if: github.event_name == 'pull_request' || (github.event_name == 'push' && contains(github.ref, 'refs/heads/'))
     steps:
       - name: Check out the codebase
         uses: actions/checkout@v2
+        if: github.event_name != 'pull_request'
         with:
           path: "${{ github.repository }}"
+      - name: Check out the codebase
+        uses: actions/checkout@v2
+        if: github.event_name == 'pull_request'
+        with:
+          # merge commit is not available from tree at this point in time
+          # https://github.com/actions/checkout#checkout-pull-request-head-commit-instead-of-merge-commit
+          ref: "${{ github.event.pull_request.head.sha }}"
+          path: "${{ github.repository }}"
       - name: Set up Python
         uses: actions/setup-python@v2
       - name: Set up Docker

From 4e2efebaa724c7a7f5a728689fbda7cbbb8da619 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 31 Jan 2021 13:20:21 +0100
Subject: [PATCH 1038/1300] addresses race condition between API and document
 consumer #472

---
 src/documents/views.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/documents/views.py b/src/documents/views.py
index 208f0fd07..f7c640e77 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -398,19 +398,20 @@ class PostDocumentView(APIView):
 
         with tempfile.NamedTemporaryFile(prefix="paperless-upload-",
                                          dir=settings.SCRATCH_DIR,
-                                         buffering=0,
                                          delete=False) as f:
             f.write(doc_data)
             os.utime(f.name, times=(t, t))
+            temp_filename = f.name
+
+        async_task("documents.tasks.consume_file",
+                   temp_filename,
+                   override_filename=doc_name,
+                   override_title=title,
+                   override_correspondent_id=correspondent_id,
+                   override_document_type_id=document_type_id,
+                   override_tag_ids=tag_ids,
+                   task_name=os.path.basename(doc_name)[:100])
 
-            async_task("documents.tasks.consume_file",
-                       f.name,
-                       override_filename=doc_name,
-                       override_title=title,
-                       override_correspondent_id=correspondent_id,
-                       override_document_type_id=document_type_id,
-                       override_tag_ids=tag_ids,
-                       task_name=os.path.basename(doc_name)[:100])
         return Response("OK")
 
 

From adb76eafafdb9d6dd159ce41a1bceebc33e5a092 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 31 Jan 2021 13:52:21 +0100
Subject: [PATCH 1039/1300] moved gunicorn.conf.py to a more appropriate place
 and reference that in the configuration scripts.

---
 .github/workflows/ci.yml                    |  1 +
 Dockerfile                                  |  3 ++-
 docs/setup.rst                              | 16 ++++++++--------
 docker/gunicorn.conf.py => gunicorn.conf.py |  0
 scripts/paperless-webserver.service         |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)
 rename docker/gunicorn.conf.py => gunicorn.conf.py (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 425243163..f27d258b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -155,6 +155,7 @@ jobs:
           mkdir dist/paperless-ng/scripts
           cp .dockerignore .env Dockerfile Pipfile Pipfile.lock LICENSE README.md requirements.txt dist/paperless-ng/
           cp paperless.conf.example dist/paperless-ng/paperless.conf
+          cp gunicorn.conf.py dist/paperless-ng/gunicorn.conf.py
           cp docker/ dist/paperless-ng/docker -r
           cp scripts/*.service scripts/*.sh dist/paperless-ng/scripts/
           cp src/ dist/paperless-ng/src -r
diff --git a/Dockerfile b/Dockerfile
index 291036f55..6247ef009 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -77,7 +77,8 @@ RUN apt-get update \
 # copy scripts
 # this fixes issues with imagemagick and PDF
 COPY docker/imagemagick-policy.xml /etc/ImageMagick-6/policy.xml
-COPY docker/gunicorn.conf.py ./
+
+COPY gunicorn.conf.py ./
 COPY docker/supervisord.conf /etc/supervisord.conf
 COPY docker/docker-entrypoint.sh /sbin/docker-entrypoint.sh
 
diff --git a/docs/setup.rst b/docs/setup.rst
index afb3784d6..268352d4f 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -20,7 +20,7 @@ Paperless consists of the following components:
     .. code:: shell-session
 
         $ cd /path/to/paperless/src/
-        $ gunicorn -c ../gunicorn.conf.py -b 0.0.0.0:8000 paperless.wsgi
+        $ gunicorn -c ../gunicorn.conf.py paperless.wsgi
 
     or by any other means such as Apache ``mod_wsgi``.
 
@@ -88,7 +88,7 @@ You can go multiple routes to setup and run Paperless:
 
 The Docker routes are quick & easy. These are the recommended routes. This configures all the stuff
 from the above automatically so that it just works and uses sensible defaults for all configuration options.
-Here you find a cheat-sheet for docker beginners: `CLI Basics <https://sehn.tech/post/devops-with-docker/>`_ 
+Here you find a cheat-sheet for docker beginners: `CLI Basics <https://sehn.tech/post/devops-with-docker/>`_
 
 The bare metal route is complicated to setup but makes it easier
 should you want to contribute some code back. You need to configure and
@@ -126,7 +126,7 @@ Install Paperless from Docker Hub
 
         If you want to use the included ``docker-compose.*.yml`` file, you
         need to have at least Docker version **17.09.0** and docker-compose
-        version **1.17.0**.  
+        version **1.17.0**.
         To check do: `docker-compose -v` or `docker -v`
 
         See the `Docker installation guide`_ on how to install the current
@@ -175,7 +175,7 @@ Install Paperless from Docker Hub
         on such a file system, paperless will not pick up new files
         with the default configuration. You will need to use ``PAPERLESS_CONSUMER_POLLING``,
         which will disable inotify. See :ref:`here <configuration-polling>`.
-        
+
 6.  Now head over to: https://hub.docker.com/r/jonaswinkler/paperless-ng and choose your preferred
     image and copy the link. To download this image do a `docker pull` followed by the link. Do this within the directory with the .yml files.
     Depending on your network connection and CPU this will take a while. You have time to get a beverage.
@@ -195,7 +195,7 @@ Install Paperless from Docker Hub
 
 9.  The default ``docker-compose.yml`` exports the webserver on your local port
     8000. If you haven't adapted this, you should now be able to visit your
-    Paperless instance at ``http://127.0.0.1:8000`` or your servers IP-Address:8000. 
+    Paperless instance at ``http://127.0.0.1:8000`` or your servers IP-Address:8000.
     Use the login credentials you have created with the previous step.
 
 .. _Docker: https://www.docker.com/
@@ -224,7 +224,7 @@ Build the docker image yourself
 
         webserver:
             image: jonaswinkler/paperless-ng:latest
-    
+
     and replace it with a line that instructs docker-compose to build the image from the current working directory instead:
 
     .. code:: yaml
@@ -427,7 +427,7 @@ Install Paperless using ansible
 
         This role currently only supports Debian 10 Buster and Ubuntu 20.04 Focal or later as target hosts.
 
-1.  Install ansible 2.7+ on the management node. 
+1.  Install ansible 2.7+ on the management node.
     This may be the target host paperless-ng is being installed on or any remote host which can access the target host.
     For further details, check the ansible `inventory <https://docs.ansible.com/ansible/latest/user_guide/intro_inventory.html>`_ documentation.
 
@@ -585,7 +585,7 @@ Migration to paperless-ng is then performed in a few simple steps:
         .. code:: shell-session
 
             $ docker volume ls | grep _data
-        
+
         and adjust the project name in the ``.env`` file so that it matches the name
         of the volumes before the ``_data`` part.
 
diff --git a/docker/gunicorn.conf.py b/gunicorn.conf.py
similarity index 100%
rename from docker/gunicorn.conf.py
rename to gunicorn.conf.py
diff --git a/scripts/paperless-webserver.service b/scripts/paperless-webserver.service
index a43110be2..00bc4fa37 100644
--- a/scripts/paperless-webserver.service
+++ b/scripts/paperless-webserver.service
@@ -8,7 +8,7 @@ Requires=redis.service
 User=paperless
 Group=paperless
 WorkingDirectory=/opt/paperless/src
-ExecStart=/opt/paperless/.local/bin/gunicorn paperless.wsgi -w 2 -b 0.0.0.0:8000
+ExecStart=/opt/paperless/.local/bin/gunicorn -c /opt/paperless/gunicorn.conf.py paperless.wsgi
 
 [Install]
 WantedBy=multi-user.target

From 3180b38797b092243787ccec4ada675cc4d94fb6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 31 Jan 2021 15:36:52 +0100
Subject: [PATCH 1040/1300] adjust ansible scripts to use gunicorn.conf.py

---
 ansible/tasks/install-source.yml | 1 +
 ansible/tasks/main.yml           | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ansible/tasks/install-source.yml b/ansible/tasks/install-source.yml
index ab8fbfef7..4fc8b1fd8 100644
--- a/ansible/tasks/install-source.yml
+++ b/ansible/tasks/install-source.yml
@@ -54,6 +54,7 @@
         - src: Pipfile.lock
         - src: README.md
         - src: requirements.txt
+        - src: gunicorn.conf.py
         - src: paperless.conf.example
           dest: "paperless.conf"
 
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index db8edcc75..6857a7c63 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -456,6 +456,12 @@
     line: '\1<policy domain="coder" rights="read|write" pattern="PDF" />'
     backrefs: yes
 
+- name: configure gunicorn web server
+  lineinfile:
+    path: "{{ paperlessng_directory }}/gunicorn.conf.py"
+    regexp: '^bind = '
+    line: "bind = '{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}'"
+
 - name: configure systemd services
   ini_file:
     path: "{{ paperlessng_directory }}/scripts/{{ item[0] }}"
@@ -498,7 +504,7 @@
     path: "{{ paperlessng_directory }}/scripts/paperless-webserver.service"
     section: "Service"
     option: "ExecStart"
-    value: "{{ paperlessng_virtualenv }}/bin/gunicorn paperless.asgi:application -w 2 -k uvicorn.workers.UvicornWorker -b {{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}"
+    value: "{{ paperlessng_virtualenv }}/bin/gunicorn -c {{ paperlessng_directory }}/gunicorn.conf.py paperless.asgi:application"
 
 - name: copy systemd services
   copy:

From d7b2906977a8793769632a573e1d8c6d00515966 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 31 Jan 2021 15:37:09 +0100
Subject: [PATCH 1041/1300] fix typo

---
 scripts/paperless-webserver.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/paperless-webserver.service b/scripts/paperless-webserver.service
index 7b7fa329a..6a4655b6f 100644
--- a/scripts/paperless-webserver.service
+++ b/scripts/paperless-webserver.service
@@ -8,7 +8,7 @@ Requires=redis.service
 User=paperless
 Group=paperless
 WorkingDirectory=/opt/paperless/src
-ExecStart=/opt/paperless/.local/bin/gunicorn -c /opt/paperless/gunicorn.conf.py paperless..asgi:application
+ExecStart=/opt/paperless/.local/bin/gunicorn -c /opt/paperless/gunicorn.conf.py paperless.asgi:application
 
 [Install]
 WantedBy=multi-user.target

From cd28fbf563e738c33eb402ed5c13d5c3666acf29 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 31 Jan 2021 14:45:43 +0000
Subject: [PATCH 1042/1300] Apply translations in de

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'de' language.
---
 src/locale/de/LC_MESSAGES/django.po | 191 ++++++++++++++--------------
 1 file changed, 98 insertions(+), 93 deletions(-)

diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po
index c9257e0f1..c53985275 100644
--- a/src/locale/de/LC_MESSAGES/django.po
+++ b/src/locale/de/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-10 21:41+0000\n"
+"POT-Creation-Date: 2021-01-28 22:02+0100\n"
 "PO-Revision-Date: 2020-12-30 19:27+0000\n"
 "Last-Translator: Jonas Winkler, 2021\n"
 "Language-Team: German (https://www.transifex.com/paperless/teams/115905/de/)\n"
@@ -25,64 +25,64 @@ msgstr ""
 msgid "Documents"
 msgstr "Dokumente"
 
-#: documents/models.py:32
+#: documents/models.py:33
 msgid "Any word"
 msgstr "Irgendein Wort"
 
-#: documents/models.py:33
+#: documents/models.py:34
 msgid "All words"
 msgstr "Alle Wörter"
 
-#: documents/models.py:34
+#: documents/models.py:35
 msgid "Exact match"
 msgstr "Exakte Übereinstimmung"
 
-#: documents/models.py:35
+#: documents/models.py:36
 msgid "Regular expression"
 msgstr "Regulärer Ausdruck"
 
-#: documents/models.py:36
+#: documents/models.py:37
 msgid "Fuzzy word"
 msgstr "Ungenaues Wort"
 
-#: documents/models.py:37
+#: documents/models.py:38
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
+#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
 #: paperless_mail/models.py:109
 msgid "name"
 msgstr "Name"
 
-#: documents/models.py:45
+#: documents/models.py:46
 msgid "match"
 msgstr "Zuweisungsmuster"
 
-#: documents/models.py:49
+#: documents/models.py:50
 msgid "matching algorithm"
 msgstr "Zuweisungsalgorithmus"
 
-#: documents/models.py:55
+#: documents/models.py:56
 msgid "is insensitive"
 msgstr "Groß-/Kleinschreibung irrelevant"
 
-#: documents/models.py:80 documents/models.py:140
+#: documents/models.py:75 documents/models.py:135
 msgid "correspondent"
 msgstr "Korrespondent"
 
-#: documents/models.py:81
+#: documents/models.py:76
 msgid "correspondents"
 msgstr "Korrespondenten"
 
-#: documents/models.py:103
+#: documents/models.py:98
 msgid "color"
 msgstr "Farbe"
 
-#: documents/models.py:107
+#: documents/models.py:102
 msgid "is inbox tag"
 msgstr "Posteingangs-Tag"
 
-#: documents/models.py:109
+#: documents/models.py:104
 msgid ""
 "Marks this tag as an inbox tag: All newly consumed documents will be tagged "
 "with inbox tags."
@@ -90,39 +90,39 @@ msgstr ""
 "Markiert das Tag als Posteingangs-Tag. Neue Dokumente werden immer mit "
 "diesem Tag versehen."
 
-#: documents/models.py:114
+#: documents/models.py:109
 msgid "tag"
 msgstr "Tag"
 
-#: documents/models.py:115 documents/models.py:171
+#: documents/models.py:110 documents/models.py:166
 msgid "tags"
 msgstr "Tags"
 
-#: documents/models.py:121 documents/models.py:153
+#: documents/models.py:116 documents/models.py:148
 msgid "document type"
 msgstr "Dokumenttyp"
 
-#: documents/models.py:122
+#: documents/models.py:117
 msgid "document types"
 msgstr "Dokumenttypen"
 
-#: documents/models.py:130
+#: documents/models.py:125
 msgid "Unencrypted"
 msgstr "Nicht verschlüsselt"
 
-#: documents/models.py:131
+#: documents/models.py:126
 msgid "Encrypted with GNU Privacy Guard"
 msgstr "Verschlüsselt mit GNU Privacy Guard"
 
-#: documents/models.py:144
+#: documents/models.py:139
 msgid "title"
 msgstr "Titel"
 
-#: documents/models.py:157
+#: documents/models.py:152
 msgid "content"
 msgstr "Inhalt"
 
-#: documents/models.py:159
+#: documents/models.py:154
 msgid ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
@@ -130,222 +130,227 @@ msgstr ""
 "Der Inhalt des Dokuments in Textform. Dieses Feld wird primär für die Suche "
 "verwendet."
 
-#: documents/models.py:164
+#: documents/models.py:159
 msgid "mime type"
 msgstr "MIME-Typ"
 
-#: documents/models.py:175
+#: documents/models.py:170
 msgid "checksum"
 msgstr "Prüfsumme"
 
-#: documents/models.py:179
+#: documents/models.py:174
 msgid "The checksum of the original document."
 msgstr "Die Prüfsumme des originalen Dokuments."
 
-#: documents/models.py:183
+#: documents/models.py:178
 msgid "archive checksum"
 msgstr "Archiv-Prüfsumme"
 
-#: documents/models.py:188
+#: documents/models.py:183
 msgid "The checksum of the archived document."
 msgstr "Die Prüfsumme des archivierten Dokuments."
 
-#: documents/models.py:192 documents/models.py:332
+#: documents/models.py:187 documents/models.py:330
 msgid "created"
-msgstr "Erstellt"
+msgstr "Ausgestellt"
 
-#: documents/models.py:196
+#: documents/models.py:191
 msgid "modified"
 msgstr "Geändert"
 
-#: documents/models.py:200
+#: documents/models.py:195
 msgid "storage type"
 msgstr "Speichertyp"
 
-#: documents/models.py:208
+#: documents/models.py:203
 msgid "added"
 msgstr "Hinzugefügt"
 
-#: documents/models.py:212
+#: documents/models.py:207
 msgid "filename"
 msgstr "Dateiname"
 
-#: documents/models.py:217
+#: documents/models.py:212
 msgid "Current filename in storage"
 msgstr "Aktueller Dateiname im Datenspeicher"
 
-#: documents/models.py:221
+#: documents/models.py:216
 msgid "archive serial number"
 msgstr "Archiv-Seriennummer"
 
-#: documents/models.py:226
+#: documents/models.py:221
 msgid "The position of this document in your physical document archive."
 msgstr "Die Position dieses Dokuments in Ihrem physischen Dokumentenarchiv."
 
-#: documents/models.py:232
+#: documents/models.py:227
 msgid "document"
 msgstr "Dokument"
 
-#: documents/models.py:233
+#: documents/models.py:228
 msgid "documents"
 msgstr "Dokumente"
 
-#: documents/models.py:315
+#: documents/models.py:313
 msgid "debug"
 msgstr "Debug"
 
-#: documents/models.py:316
+#: documents/models.py:314
 msgid "information"
 msgstr "Information"
 
-#: documents/models.py:317
+#: documents/models.py:315
 msgid "warning"
 msgstr "Warnung"
 
-#: documents/models.py:318
+#: documents/models.py:316
 msgid "error"
 msgstr "Fehler"
 
-#: documents/models.py:319
+#: documents/models.py:317
 msgid "critical"
 msgstr "Kritisch"
 
-#: documents/models.py:323
+#: documents/models.py:321
 msgid "group"
 msgstr "Gruppe"
 
-#: documents/models.py:326
+#: documents/models.py:324
 msgid "message"
 msgstr "Nachricht"
 
-#: documents/models.py:329
+#: documents/models.py:327
 msgid "level"
 msgstr "Level"
 
-#: documents/models.py:336
+#: documents/models.py:334
 msgid "log"
 msgstr "Protokoll"
 
-#: documents/models.py:337
+#: documents/models.py:335
 msgid "logs"
 msgstr "Protokoll"
 
-#: documents/models.py:348 documents/models.py:398
+#: documents/models.py:346 documents/models.py:396
 msgid "saved view"
 msgstr "Gespeicherte Ansicht"
 
-#: documents/models.py:349
+#: documents/models.py:347
 msgid "saved views"
 msgstr "Gespeicherte Ansichten"
 
-#: documents/models.py:352
+#: documents/models.py:350
 msgid "user"
 msgstr "Benutzer"
 
-#: documents/models.py:358
+#: documents/models.py:356
 msgid "show on dashboard"
 msgstr "Auf Startseite zeigen"
 
-#: documents/models.py:361
+#: documents/models.py:359
 msgid "show in sidebar"
 msgstr "In Seitenleiste zeigen"
 
-#: documents/models.py:365
+#: documents/models.py:363
 msgid "sort field"
 msgstr "Sortierfeld"
 
-#: documents/models.py:368
+#: documents/models.py:366
 msgid "sort reverse"
 msgstr "Umgekehrte Sortierung"
 
-#: documents/models.py:374
+#: documents/models.py:372
 msgid "title contains"
 msgstr "Titel enthält"
 
-#: documents/models.py:375
+#: documents/models.py:373
 msgid "content contains"
 msgstr "Inhalt enthält"
 
-#: documents/models.py:376
+#: documents/models.py:374
 msgid "ASN is"
 msgstr "ASN ist"
 
-#: documents/models.py:377
+#: documents/models.py:375
 msgid "correspondent is"
 msgstr "Korrespondent ist"
 
-#: documents/models.py:378
+#: documents/models.py:376
 msgid "document type is"
 msgstr "Dokumenttyp ist"
 
-#: documents/models.py:379
+#: documents/models.py:377
 msgid "is in inbox"
 msgstr "Ist im Posteingang"
 
-#: documents/models.py:380
+#: documents/models.py:378
 msgid "has tag"
 msgstr "Hat Tag"
 
-#: documents/models.py:381
+#: documents/models.py:379
 msgid "has any tag"
 msgstr "Hat irgendein Tag"
 
-#: documents/models.py:382
+#: documents/models.py:380
 msgid "created before"
-msgstr "Erstellt vor"
+msgstr "Ausgestellt vor"
+
+#: documents/models.py:381
+msgid "created after"
+msgstr "Ausgestellt nach"
+
+#: documents/models.py:382
+msgid "created year is"
+msgstr "Ausgestellt im Jahr"
 
 #: documents/models.py:383
-msgid "created after"
-msgstr "Erstellt nach"
+msgid "created month is"
+msgstr "Ausgestellt im Monat"
 
 #: documents/models.py:384
-msgid "created year is"
-msgstr "Erstellt im Jahr"
+msgid "created day is"
+msgstr "Ausgestellt am Tag"
 
 #: documents/models.py:385
-msgid "created month is"
-msgstr "Erstellt im Monat"
-
-#: documents/models.py:386
-msgid "created day is"
-msgstr "Erstellt am Tag"
-
-#: documents/models.py:387
 msgid "added before"
 msgstr "Hinzugefügt vor"
 
-#: documents/models.py:388
+#: documents/models.py:386
 msgid "added after"
 msgstr "Hinzugefügt nach"
 
-#: documents/models.py:389
+#: documents/models.py:387
 msgid "modified before"
 msgstr "Geändert vor"
 
-#: documents/models.py:390
+#: documents/models.py:388
 msgid "modified after"
 msgstr "Geändert nach"
 
-#: documents/models.py:391
+#: documents/models.py:389
 msgid "does not have tag"
 msgstr "Hat nicht folgendes Tag"
 
-#: documents/models.py:402
+#: documents/models.py:400
 msgid "rule type"
 msgstr "Regeltyp"
 
-#: documents/models.py:406
+#: documents/models.py:404
 msgid "value"
 msgstr "Wert"
 
-#: documents/models.py:412
+#: documents/models.py:410
 msgid "filter rule"
 msgstr "Filterregel"
 
-#: documents/models.py:413
+#: documents/models.py:411
 msgid "filter rules"
 msgstr "Filterregeln"
 
+#: documents/serialisers.py:383
+#, python-format
+msgid "File type %(type)s not supported"
+msgstr "Dateityp %(type)s nicht unterstützt"
+
 #: documents/templates/index.html:20
 msgid "Paperless-ng is loading..."
 msgstr "Paperless-ng wird geladen..."
@@ -388,23 +393,23 @@ msgstr "Passwort"
 msgid "Sign in"
 msgstr "Anmelden"
 
-#: paperless/settings.py:268
+#: paperless/settings.py:286
 msgid "English"
 msgstr "Englisch"
 
-#: paperless/settings.py:269
+#: paperless/settings.py:287
 msgid "German"
 msgstr "Deutsch"
 
-#: paperless/settings.py:270
+#: paperless/settings.py:288
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: paperless/settings.py:271
+#: paperless/settings.py:289
 msgid "French"
 msgstr "Französisch"
 
-#: paperless/urls.py:108
+#: paperless/urls.py:114
 msgid "Paperless-ng administration"
 msgstr "Paperless-ng Administration"
 

From 24b3a030004a02d955d79fc21c3cb73391935076 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 31 Jan 2021 14:45:58 +0000
Subject: [PATCH 1043/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 330 ++++++++++++++++++++++++++----
 1 file changed, 289 insertions(+), 41 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index b6e2708ba..54acbd23e 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -1,12 +1,60 @@
 <?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
   <file datatype="plaintext" original="ng2.template" source-language="en-US" target-language="de">
     <body>
+      <trans-unit datatype="html" id="9103526311244275943">
+        <source>Document added</source>
+        <target>Dokument hinzugefügt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9204248378636247318">
+        <source>Document <x equiv-text="status.filename" id="PH"/> was added to paperless.</source>
+        <target>Das Dokument <x equiv-text="status.filename" id="PH"/> wurde zu Paperless hinzugefügt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1931214133925051574">
+        <source>Open document</source>
+        <target>Dokument öffnen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8582620835547864448">
+        <source>Could not add <x equiv-text="status.filename" id="PH"/>: <x equiv-text="status.message" id="PH_1"/></source>
+        <target>Konnte <x equiv-text="status.filename" id="PH"/> nicht hinzufügen: <x equiv-text="status.message" id="PH_1"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1710712016675379662">
+        <source>New document detected</source>
+        <target>Neues Dokument erkannt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="587031278561344416">
+        <source>Document <x equiv-text="status.filename" id="PH"/> is being processed by paperless.</source>
+        <target>Dokument <x equiv-text="status.filename" id="PH"/> wird von Paperless verarbeitet.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="4733307402565258070">
         <source>Documents</source>
         <target>Dokumente</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">43</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
@@ -14,7 +62,7 @@
         <target>Ansicht &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; erfolgreich gespeichert.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">109</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
@@ -22,7 +70,7 @@
         <target>Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; erfolgreich erstellt.</target>
         <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">130</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
@@ -550,7 +598,7 @@
         <target>Gespeicherte Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; gelöscht.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -558,7 +606,7 @@
         <target>Einstellungen erfolgreich gespeichert.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6839066544204061364">
@@ -566,7 +614,7 @@
         <target>Benutze Systemsprache</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7729897675462249787">
@@ -574,7 +622,7 @@
         <target>Benutze Datumsformat der Anzeigesprache</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -582,7 +630,7 @@
         <target>Fehler beim Speichern der Einstellungen auf dem Server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -606,7 +654,7 @@
         <target>Gespeicherte Ansichten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">128</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
@@ -729,12 +777,68 @@
           <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab">
+        <source>Notifications</source>
+        <target>Benachrichtigungen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">102</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="69c5a98f8aa92e4db060f10dcd37781c8f40a48f">
+        <source>Consumer status</source>
+        <target>Status Dokumentenverarbeitung</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0">
+        <source>Show notifications when new documents are detected</source>
+        <target>Zeige Benachrichtigungen wenn neue Dokumente erkannt werden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">109</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f2361d3f65b6c77ef0a15fad8af8e858b043ace3">
+        <source>Show notifications when document consumption completes successfully</source>
+        <target>Zeige Benachrichtigungen wenn neue Dokumente erfolgreich hinzugefügt wurden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">110</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2bcbcbe99e207803e21183580b98d90410dd8718">
+        <source>Show notifications when document consumption fails</source>
+        <target>Zeige Benachrichtigungen wenn Dokumente nicht hinzugefügt werden können</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af113f7c9f7e13145c3461f61a1aedf12d57bd71">
+        <source>Suppress notifications on dashboard</source>
+        <target>Unterdrücke Benachrichtigungen auf der Startseite.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="59fe5c9233a2aaab3079a2300e4dfa439ddb1890">
+        <source>This will suppress all consumer related status messages on the dashboard.</source>
+        <target>Dadurch werden alle Benachrichtigungen über die Dokumentenverarbeitung auf der Startseite unterdrückt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
         <source>Bulk editing</source>
         <target>Massenbearbeitung</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">102</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
@@ -742,7 +846,7 @@
         <target>Bestätigungsdialoge anzeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
@@ -750,7 +854,7 @@
         <target>Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
@@ -758,7 +862,7 @@
         <target>Anwenden beim Schließen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">121</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -766,7 +870,7 @@
         <target>Erscheint auf</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -774,7 +878,7 @@
         <target>Auf Startseite zeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">129</context>
+          <context context-type="linenumber">143</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -782,7 +886,7 @@
         <target>In Seitenleiste zeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">133</context>
+          <context context-type="linenumber">147</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -790,7 +894,7 @@
         <target>Keine gespeicherten Ansichten vorhanden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">143</context>
+          <context context-type="linenumber">157</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -1518,28 +1622,52 @@
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="8705589528094706681">
-        <source>The document has been uploaded and will be processed by the consumer shortly.</source>
-        <target>Das Dokument wurde hochgeladen und wird in Kürze durch Paperless-ng verarbeitet.</target>
+      <trans-unit datatype="html" id="6443586946875325554">
+        <source>Processing: <x equiv-text="countUploadingAndProcessing" id="PH"/></source>
+        <target>Verarbeite: <x equiv-text="countUploadingAndProcessing" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">32</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="4956689020592747108">
-        <source>There was an error while uploading the document: <x equiv-text="error.error.document" id="PH"/></source>
-        <target>Konnte Dokument nicht hochladen: <x equiv-text="error.error.document" id="PH"/></target>
+      <trans-unit datatype="html" id="9182918211699394982">
+        <source>Failed: <x equiv-text="countFailed" id="PH"/></source>
+        <target>Fehlgeschlagen: <x equiv-text="countFailed" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="7554858521017940575">
-        <source>An error has occurred while uploading the document. Sorry!</source>
-        <target>Beim Hochladen trat ein Fehler auf. Entschuldigung!</target>
+      <trans-unit datatype="html" id="534116346205124059">
+        <source>Added: <x equiv-text="countSuccess" id="PH"/></source>
+        <target>Hinzugefügt: <x equiv-text="countSuccess" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3852289441366561594">
+        <source>Connecting...</source>
+        <target>Verbinde...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1245343823699368872">
+        <source>Uploading...</source>
+        <target>Hochladen...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3994065460580948013">
+        <source>Waiting for consumer...</source>
+        <target>Warte auf Consumer...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
@@ -1555,7 +1683,7 @@
         <target>Dokumente hier ablegen oder</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="865c511f4a24558ed0e954f9bbbff557bbb8954d">
@@ -1563,15 +1691,31 @@
         <target>Datei auswählen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="33c76d75ce25ce3b05ab22877f1b6b09dcf603ae">
-        <source>{VAR_PLURAL, plural, =1 {Uploading file...} =other {Uploading <x id="INTERPOLATION"/> files...}}</source>
-        <target>{VAR_PLURAL, plural, =1 {Lade Datei hoch...} =other {Lade <x id="INTERPOLATION"/> Dateien hoch...}}</target>
+      <trans-unit datatype="html" id="bd4a8607e4a002d939cffb347ec056664dfb2c73">
+        <source>Dismiss completed</source>
+        <target>Fertiggestellte verbergen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1fc4e0a1e93fdda0ed3c9e590971d283afb68265">
+        <source><x equiv-text="{{getStatusHidden().length}}" id="INTERPOLATION"/> more hidden</source>
+        <target><x equiv-text="{{getStatusHidden().length}}" id="INTERPOLATION"/> weitere versteckt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="710254a196a2649674438edf8a15b7ab1f48271b">
+        <source>Open document</source>
+        <target>Dokument öffnen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="45854ddec74086b271e62be6a363f4fa5036f7fc">
@@ -1683,7 +1827,7 @@
         <target>Englisch (US)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
@@ -1691,7 +1835,7 @@
         <target>Deutsch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1699,7 +1843,7 @@
         <target>Niederländisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1707,7 +1851,111 @@
         <target>Französisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2119857572761283468">
+        <source>Document already exists.</source>
+        <target>Dokument existiert bereits.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="148389968432135849">
+        <source>File not found.</source>
+        <target>Datei nicht gefunden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1520671543092565667">
+        <source>Pre-consume script does not exist.</source>
+        <target>Pre-Consume-Skript existiert nicht.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7742915911032564889">
+        <source>Error while executing pre-consume script.</source>
+        <target>Fehler beim Ausführen des Pre-Consume-Skripts.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8995193730018060346">
+        <source>Post-consume script does not exist.</source>
+        <target>Post-Consume-Skript existiert nicht.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="256773668518189604">
+        <source>Error while executing post-consume script.</source>
+        <target>Fehler beim Ausführen des Post-Consume-Skripts.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6252258095055634191">
+        <source>Received new file.</source>
+        <target>Neue Datei erhalten.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7337565919209746135">
+        <source>File type not supported.</source>
+        <target>Dateityp wird nicht unterstützt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5002399167376099234">
+        <source>Processing document...</source>
+        <target>Verarbeite Dokument...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1085975194762600381">
+        <source>Generating thumbnail...</source>
+        <target>Erzeuge Miniaturbild...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3280851677698431426">
+        <source>Retrieving date from document...</source>
+        <target>Ermittle Datum des Dokuments...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7162102384876037296">
+        <source>Saving document...</source>
+        <target>Speichere Dokument...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4550450765009165976">
+        <source>Finished.</source>
+        <target>Abgeschlossen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1519954996184640001">
@@ -1715,7 +1963,7 @@
         <target>Fehler</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/toast.service.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5037437391296624618">
@@ -1723,7 +1971,7 @@
         <target>Information</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/toast.service.ts</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7517688192215738656">

From 32780472db57c94e1406cd7ff85ad8ad57c92e70 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 31 Jan 2021 15:45:35 +0000
Subject: [PATCH 1044/1300] Apply translations in nl_NL

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'nl_NL' language.
---
 src/locale/nl_NL/LC_MESSAGES/django.po | 177 +++++++++++++------------
 1 file changed, 91 insertions(+), 86 deletions(-)

diff --git a/src/locale/nl_NL/LC_MESSAGES/django.po b/src/locale/nl_NL/LC_MESSAGES/django.po
index 36293e7b8..63391da15 100644
--- a/src/locale/nl_NL/LC_MESSAGES/django.po
+++ b/src/locale/nl_NL/LC_MESSAGES/django.po
@@ -4,17 +4,17 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Ben <bzweekhorst@gmail.com>, 2021
 # Jo Vandeginste <jo.vandeginste@gmail.com>, 2021
+# Ben <bzweekhorst@gmail.com>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-10 21:41+0000\n"
+"POT-Creation-Date: 2021-01-28 22:02+0100\n"
 "PO-Revision-Date: 2020-12-30 19:27+0000\n"
-"Last-Translator: Jo Vandeginste <jo.vandeginste@gmail.com>, 2021\n"
+"Last-Translator: Ben <bzweekhorst@gmail.com>, 2021\n"
 "Language-Team: Dutch (Netherlands) (https://www.transifex.com/paperless/teams/115905/nl_NL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,64 +26,64 @@ msgstr ""
 msgid "Documents"
 msgstr "Documenten"
 
-#: documents/models.py:32
+#: documents/models.py:33
 msgid "Any word"
 msgstr "Eender welk woord"
 
-#: documents/models.py:33
+#: documents/models.py:34
 msgid "All words"
 msgstr "Alle woorden"
 
-#: documents/models.py:34
+#: documents/models.py:35
 msgid "Exact match"
 msgstr "Exacte overeenkomst"
 
-#: documents/models.py:35
+#: documents/models.py:36
 msgid "Regular expression"
 msgstr "Reguliere expressie"
 
-#: documents/models.py:36
+#: documents/models.py:37
 msgid "Fuzzy word"
 msgstr "Gelijkaardig woord"
 
-#: documents/models.py:37
+#: documents/models.py:38
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
+#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
 #: paperless_mail/models.py:109
 msgid "name"
 msgstr "naam"
 
-#: documents/models.py:45
+#: documents/models.py:46
 msgid "match"
 msgstr "Overeenkomst"
 
-#: documents/models.py:49
+#: documents/models.py:50
 msgid "matching algorithm"
 msgstr "Algoritme voor het bepalen van de overeenkomst"
 
-#: documents/models.py:55
+#: documents/models.py:56
 msgid "is insensitive"
 msgstr "is niet hoofdlettergevoelig"
 
-#: documents/models.py:80 documents/models.py:140
+#: documents/models.py:75 documents/models.py:135
 msgid "correspondent"
 msgstr "correspondent"
 
-#: documents/models.py:81
+#: documents/models.py:76
 msgid "correspondents"
 msgstr "correspondenten"
 
-#: documents/models.py:103
+#: documents/models.py:98
 msgid "color"
 msgstr "Kleur"
 
-#: documents/models.py:107
+#: documents/models.py:102
 msgid "is inbox tag"
 msgstr "is \"Postvak in\"-etiket"
 
-#: documents/models.py:109
+#: documents/models.py:104
 msgid ""
 "Marks this tag as an inbox tag: All newly consumed documents will be tagged "
 "with inbox tags."
@@ -91,39 +91,39 @@ msgstr ""
 "Markeer dit etiket als een \"Postvak in\"-etiket: alle nieuw verwerkte "
 "documenten krijgen de \"Postvak in\"-etiketten."
 
-#: documents/models.py:114
+#: documents/models.py:109
 msgid "tag"
 msgstr "etiket"
 
-#: documents/models.py:115 documents/models.py:171
+#: documents/models.py:110 documents/models.py:166
 msgid "tags"
 msgstr "etiketten"
 
-#: documents/models.py:121 documents/models.py:153
+#: documents/models.py:116 documents/models.py:148
 msgid "document type"
 msgstr "documenttype"
 
-#: documents/models.py:122
+#: documents/models.py:117
 msgid "document types"
 msgstr "documenttypen"
 
-#: documents/models.py:130
+#: documents/models.py:125
 msgid "Unencrypted"
 msgstr "Niet versleuteld"
 
-#: documents/models.py:131
+#: documents/models.py:126
 msgid "Encrypted with GNU Privacy Guard"
 msgstr "Versleuteld met GNU Privacy Guard"
 
-#: documents/models.py:144
+#: documents/models.py:139
 msgid "title"
 msgstr "titel"
 
-#: documents/models.py:157
+#: documents/models.py:152
 msgid "content"
 msgstr "inhoud"
 
-#: documents/models.py:159
+#: documents/models.py:154
 msgid ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
@@ -131,222 +131,227 @@ msgstr ""
 "De onbewerkte gegevens van het document. Dit veld wordt voornamelijk "
 "gebruikt om te zoeken."
 
-#: documents/models.py:164
+#: documents/models.py:159
 msgid "mime type"
 msgstr "mimetype"
 
-#: documents/models.py:175
+#: documents/models.py:170
 msgid "checksum"
 msgstr "checksum"
 
-#: documents/models.py:179
+#: documents/models.py:174
 msgid "The checksum of the original document."
 msgstr "Het controlecijfer van het originele document."
 
-#: documents/models.py:183
+#: documents/models.py:178
 msgid "archive checksum"
 msgstr "archief checksum"
 
-#: documents/models.py:188
+#: documents/models.py:183
 msgid "The checksum of the archived document."
 msgstr "De checksum van het gearchiveerde document."
 
-#: documents/models.py:192 documents/models.py:332
+#: documents/models.py:187 documents/models.py:330
 msgid "created"
 msgstr "aangemaakt"
 
-#: documents/models.py:196
+#: documents/models.py:191
 msgid "modified"
 msgstr "gewijzigd"
 
-#: documents/models.py:200
+#: documents/models.py:195
 msgid "storage type"
 msgstr "type opslag"
 
-#: documents/models.py:208
+#: documents/models.py:203
 msgid "added"
 msgstr "toegevoegd"
 
-#: documents/models.py:212
+#: documents/models.py:207
 msgid "filename"
 msgstr "bestandsnaam"
 
-#: documents/models.py:217
+#: documents/models.py:212
 msgid "Current filename in storage"
 msgstr "Huidige bestandsnaam in opslag"
 
-#: documents/models.py:221
+#: documents/models.py:216
 msgid "archive serial number"
 msgstr "serienummer in archief"
 
-#: documents/models.py:226
+#: documents/models.py:221
 msgid "The position of this document in your physical document archive."
 msgstr "De positie van dit document in je fysieke documentenarchief."
 
-#: documents/models.py:232
+#: documents/models.py:227
 msgid "document"
 msgstr "document"
 
-#: documents/models.py:233
+#: documents/models.py:228
 msgid "documents"
 msgstr "documenten"
 
-#: documents/models.py:315
+#: documents/models.py:313
 msgid "debug"
 msgstr "debug"
 
-#: documents/models.py:316
+#: documents/models.py:314
 msgid "information"
 msgstr "informatie"
 
-#: documents/models.py:317
+#: documents/models.py:315
 msgid "warning"
 msgstr "waarschuwing"
 
-#: documents/models.py:318
+#: documents/models.py:316
 msgid "error"
 msgstr "fout"
 
-#: documents/models.py:319
+#: documents/models.py:317
 msgid "critical"
 msgstr "kritisch"
 
-#: documents/models.py:323
+#: documents/models.py:321
 msgid "group"
 msgstr "groep"
 
-#: documents/models.py:326
+#: documents/models.py:324
 msgid "message"
 msgstr "bericht"
 
-#: documents/models.py:329
+#: documents/models.py:327
 msgid "level"
 msgstr "niveau"
 
-#: documents/models.py:336
+#: documents/models.py:334
 msgid "log"
 msgstr "bericht"
 
-#: documents/models.py:337
+#: documents/models.py:335
 msgid "logs"
 msgstr "berichten"
 
-#: documents/models.py:348 documents/models.py:398
+#: documents/models.py:346 documents/models.py:396
 msgid "saved view"
 msgstr "opgeslagen view"
 
-#: documents/models.py:349
+#: documents/models.py:347
 msgid "saved views"
 msgstr "opgeslagen views"
 
-#: documents/models.py:352
+#: documents/models.py:350
 msgid "user"
 msgstr "gebruiker"
 
-#: documents/models.py:358
+#: documents/models.py:356
 msgid "show on dashboard"
 msgstr "weergeven op dashboard"
 
-#: documents/models.py:361
+#: documents/models.py:359
 msgid "show in sidebar"
 msgstr "weergeven in zijbalk"
 
-#: documents/models.py:365
+#: documents/models.py:363
 msgid "sort field"
 msgstr "sorteerveld"
 
-#: documents/models.py:368
+#: documents/models.py:366
 msgid "sort reverse"
 msgstr "omgekeerd sorteren"
 
-#: documents/models.py:374
+#: documents/models.py:372
 msgid "title contains"
 msgstr "titel bevat"
 
-#: documents/models.py:375
+#: documents/models.py:373
 msgid "content contains"
 msgstr "inhoud bevat"
 
-#: documents/models.py:376
+#: documents/models.py:374
 msgid "ASN is"
 msgstr "ASN is"
 
-#: documents/models.py:377
+#: documents/models.py:375
 msgid "correspondent is"
 msgstr "correspondent is"
 
-#: documents/models.py:378
+#: documents/models.py:376
 msgid "document type is"
 msgstr "documenttype is"
 
-#: documents/models.py:379
+#: documents/models.py:377
 msgid "is in inbox"
 msgstr "zit in \"Postvak in\""
 
-#: documents/models.py:380
+#: documents/models.py:378
 msgid "has tag"
 msgstr "heeft etiket"
 
-#: documents/models.py:381
+#: documents/models.py:379
 msgid "has any tag"
 msgstr "heeft één van de etiketten"
 
-#: documents/models.py:382
+#: documents/models.py:380
 msgid "created before"
 msgstr "aangemaakt voor"
 
-#: documents/models.py:383
+#: documents/models.py:381
 msgid "created after"
 msgstr "aangemaakt na"
 
-#: documents/models.py:384
+#: documents/models.py:382
 msgid "created year is"
 msgstr "aangemaakt jaar is"
 
-#: documents/models.py:385
+#: documents/models.py:383
 msgid "created month is"
 msgstr "aangemaakte maand is"
 
-#: documents/models.py:386
+#: documents/models.py:384
 msgid "created day is"
 msgstr "aangemaakte dag is"
 
-#: documents/models.py:387
+#: documents/models.py:385
 msgid "added before"
 msgstr "toegevoegd voor"
 
-#: documents/models.py:388
+#: documents/models.py:386
 msgid "added after"
 msgstr "toegevoegd na"
 
-#: documents/models.py:389
+#: documents/models.py:387
 msgid "modified before"
 msgstr "gewijzigd voor"
 
-#: documents/models.py:390
+#: documents/models.py:388
 msgid "modified after"
 msgstr "gewijzigd na"
 
-#: documents/models.py:391
+#: documents/models.py:389
 msgid "does not have tag"
 msgstr "heeft geen etiket"
 
-#: documents/models.py:402
+#: documents/models.py:400
 msgid "rule type"
 msgstr "type regel"
 
-#: documents/models.py:406
+#: documents/models.py:404
 msgid "value"
 msgstr "waarde"
 
-#: documents/models.py:412
+#: documents/models.py:410
 msgid "filter rule"
 msgstr "filterregel"
 
-#: documents/models.py:413
+#: documents/models.py:411
 msgid "filter rules"
 msgstr "filterregels"
 
+#: documents/serialisers.py:383
+#, python-format
+msgid "File type %(type)s not supported"
+msgstr "Bestandstype %(type)s niet ondersteund"
+
 #: documents/templates/index.html:20
 msgid "Paperless-ng is loading..."
 msgstr "Paperless-ng is aan het laden..."
@@ -387,23 +392,23 @@ msgstr "Wachtwoord"
 msgid "Sign in"
 msgstr "Aanmelden"
 
-#: paperless/settings.py:268
+#: paperless/settings.py:286
 msgid "English"
 msgstr "Engels"
 
-#: paperless/settings.py:269
+#: paperless/settings.py:287
 msgid "German"
 msgstr "Duits"
 
-#: paperless/settings.py:270
+#: paperless/settings.py:288
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: paperless/settings.py:271
+#: paperless/settings.py:289
 msgid "French"
 msgstr "Frans"
 
-#: paperless/urls.py:108
+#: paperless/urls.py:114
 msgid "Paperless-ng administration"
 msgstr "Paperless-ng administratie"
 

From b9690de9ab915407d3cac38a0aff4c1cf3722244 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 13:19:55 -0800
Subject: [PATCH 1045/1300] Add GH Ideas info to readme

---
 README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0fc3185a1..4d87119c1 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@ Paperless-ng is a fork of the original project, adding a new interface and many
 
 If you already used Paperless-ng for a bit, would like to give some anonymous feedback, and help me decide on what to focus on next: I've created a survey, [see here](https://github.com/jonaswinkler/paperless-ng/issues/402). Thank you!
 
+*See also [Feature Requests](#feature-requests)*
+
 # How it Works
 
 Paperless does not control your scanner, it only helps you deal with what your scanner produces.
@@ -78,9 +80,13 @@ Paperless is currently available in English, German, Dutch and French. Translati
 
 If you want to see paperless in your own language, request that language at transifex and you can start translating after I approve the language.
 
-# Suggestions? Questions? Something not working?
+# Feature Requests
 
-Please open an issue and start a discussion about it!
+Feature requests can be submitted via [GitHub Discussions](https://github.com/jonaswinkler/paperless-ng/discussions/categories/ideas), you can search for existing ideas, add your own and vote for the ones you care about! Note that some older feature requests can also be found under [issues](https://github.com/jonaswinkler/paperless-ng/issues).
+
+# Questions? Something not working?
+
+For bugs please [open an issue](https://github.com/jonaswinkler/paperless-ng/issues) or [start a discussion](https://github.com/jonaswinkler/paperless-ng/discussions) if you have questions.
 
 ## Feel like helping out?
 

From ad29fc23a663b1b330713d9f252bf67aa4692381 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 31 Jan 2021 22:28:26 +0100
Subject: [PATCH 1046/1300] added an easy install script

---
 install-paperless-ng.sh | 223 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 223 insertions(+)
 create mode 100755 install-paperless-ng.sh

diff --git a/install-paperless-ng.sh b/install-paperless-ng.sh
new file mode 100755
index 000000000..ad992fe8c
--- /dev/null
+++ b/install-paperless-ng.sh
@@ -0,0 +1,223 @@
+#!/bin/bash
+
+set -e
+
+ask() {
+	while true ; do
+		if [[ -z $3 ]] ; then
+			read -p "$1 [$2]: " result
+		else
+			read -p "$1 ($3) [$2]: " result
+		fi
+		if [[ -z $result ]]; then
+			ask_result=$2
+			return
+		fi
+		array=$3
+		if [[ -z $3 || " ${array[@]} " =~ " ${result} " ]]; then
+    	ask_result=$result
+			return
+		else
+			echo "Invalid option: $result"
+		fi
+	done
+}
+
+echo ""
+echo "############################################"
+echo "###   Paperless-ng docker installation   ###"
+echo "############################################"
+echo ""
+echo "This script will download, configure and start paperless-ng."
+
+echo ""
+echo "1. Folder configuration"
+echo "======================="
+echo ""
+echo "The target folder is used to store the configuration files of "
+echo "paperless. You can move this folder around after installing paperless."
+echo "You will need this folder whenever you want to start, stop, update or "
+echo "maintain your paperless instance."
+echo ""
+
+ask "Target folder" "$(pwd)/paperless-ng"
+TARGET_FOLDER=$ask_result
+
+echo ""
+echo "The consume folder is where paperles will search for new documents."
+echo "Point this to a folder where your scanner is able to put your scanned"
+echo "documents."
+echo ""
+echo "HINT: If paperless is unable to pick up any files from this directory after"
+echo "installation, you might need to configure PAPERLESS_CONSUMER_POLLING."
+echo "See the documentation for details."
+echo ""
+echo "CAUTION: You must specify an absolute path starting with /"
+echo ""
+
+ask "Consume folder" "$TARGET_FOLDER/consume"
+CONSUME_FOLDER=$ask_result
+
+echo ""
+echo "The media folder is where paperless stores your documents."
+echo "Leave empty and docker will manage this folder for you."
+echo "Docker usually stores managed folders in /var/lib/docker/volumes."
+echo ""
+echo "CAUTION: If specified, you must specify an absolute path starting with /"
+echo ""
+
+ask "Media folder" ""
+MEDIA_FOLDER=$ask_result
+
+echo ""
+echo "The data folder is where paperless stores other data, such as your"
+echo "SQLite database (if used), the search index and other data."
+echo "As with the media folder, leave empty to have this managed by docker."
+echo ""
+
+ask "Data folder" ""
+DATA_FOLDER=$ask_result
+
+echo ""
+echo "2. Application configuration"
+echo "============================"
+
+echo ""
+echo "The port on which the paperless webserver will listen for incoming"
+echo "connections."
+echo ""
+
+ask "Port" "8000"
+PORT=$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"
+echo "Pi, use SQLite to save resources."
+echo ""
+
+ask "Database backend" "postgres" "postgres sqlite"
+DATABASE_BACKEND=$ask_result
+
+echo ""
+echo "Paperless is able to use Apache Tika to support Office documents such as"
+echo "Word, Excel, Powerpoint, and Libreoffice equivalents. This feature"
+echo "requires more resources due to the required services."
+echo ""
+
+ask "Enable Apache Tika?" "no" "yes no"
+TIKA_ENABLED=$ask_result
+
+echo ""
+echo "Specify the default language that most of your documents are written in."
+echo "Use ISO 639-2, (T) variant language codes: "
+echo "https://www.loc.gov/standards/iso639-2/php/code_list.php"
+echo "Common values: eng (English) deu (German) nld (Dutch) fra (French)"
+echo ""
+
+ask "OCR language" "eng"
+OCR_LANGUAGE=$ask_result
+
+echo ""
+echo "Specify the user id and group id you wish to run paperless as."
+echo "Paperless will also change ownership on the data, media and consume"
+echo "folder to the specified values, so it's a good idea to supply the user id"
+echo "and group id of your unix user account."
+echo "If unsure, leave default."
+echo ""
+
+ask "User ID" "$(id -u)"
+USERMAP_UID=$ask_result
+
+ask "Group ID" "$(id -g)"
+USERMAP_GID=$ask_result
+
+echo ""
+echo "3. Login credentials"
+echo "===================="
+echo ""
+echo "Specify initial login credentials. You can change these later."
+echo "A mail address is required, however it is not used in paperless. You don't"
+echo "need to provide an actual mail address."
+echo ""
+
+ask "Paperless username" "$(whoami)"
+USERNAME=$ask_result
+
+while true; do
+	read -sp "Paperless password: " PASSWORD
+	echo ""
+
+	if [[ -z $PASSWORD ]] ; then
+		echo "Password cannot be empty."
+		continue
+	fi
+
+	read -sp "Paperless password (again): " PASSWORD_REPEAT
+	echo ""
+
+	if [[ ! "$PASSWORD" == "$PASSWORD_REPEAT" ]] ; then
+		echo "Passwords did not match"
+	else
+		break
+	fi
+done
+
+ask "Email" "$USERNAME@localhost"
+EMAIL=$ask_result
+
+echo "Done collecting data. Press any key to install."
+read
+
+echo ""
+echo "Installing paperless..."
+echo ""
+
+mkdir -p "$TARGET_FOLDER"
+
+cd "$TARGET_FOLDER"
+
+DOCKER_COMPOSE_VERSION=$DATABASE_BACKEND
+
+if [[ $TIKA_ENABLED == "yes" ]] ; then
+	DOCKER_COMPOSE_VERSION="$DOCKER_COMPOSE_VERSION-tika"
+fi
+
+wget "https://raw.githubusercontent.com/jonaswinkler/paperless-ng/master/docker/compose/docker-compose.$DOCKER_COMPOSE_VERSION.yml" -O docker-compose.yml
+wget "https://raw.githubusercontent.com/jonaswinkler/paperless-ng/master/docker/compose/.env" -O .env
+
+SECRET_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 64 | head -n 1)
+
+DEFAULT_LANGUAGES="deu eng fra ita spa"
+
+{
+	if [[ ! $USERMAP_UID == "1000" ]] ; then
+		echo "USERMAP_UID=$USERMAP_UID"
+	fi
+	if [[ ! $USERMAP_GID == "1000" ]] ; then
+		echo "USERMAP_GID=$USERMAP_GID"
+	fi
+	echo "PAPERLESS_OCR_LANGUAGE=$OCR_LANGUAGE"
+	echo "PAPERLESS_SECRET_KEY=$SECRET_KEY"
+	if [[ ! " ${DEFAULT_LANGUAGES[@]} " =~ " ${OCR_LANGUAGE} " ]] ; then
+		echo "PAPERLESS_OCR_LANGUAGES=$OCR_LANGUAGE"
+	fi
+} > docker-compose.env
+
+sed -i "s/- 8000:8000/- $PORT:8000/g" docker-compose.yml
+
+sed -i "s#- \./consume:/usr/src/paperless/consume#- $CONSUME_FOLDER:/usr/src/paperless/consume#g" docker-compose.yml
+
+if [[ -n $MEDIA_FOLDER ]] ; then
+	sed -i "s#- data:/usr/src/paperless/media#- $MEDIA_FOLDER:/usr/src/paperless/media#g" docker-compose.yml
+fi
+
+if [[ -n $DATA_FOLDER ]] ; then
+	sed -i "s#- data:/usr/src/paperless/data#- $DATA_FOLDER:/usr/src/paperless/data#g" docker-compose.yml
+fi
+
+docker-compose pull
+
+docker-compose run --rm -e DJANGO_SUPERUSER_PASSWORD="$PASSWORD" webserver createsuperuser --noinput --username "$USERNAME" --email "$EMAIL"
+
+docker-compose up -d

From 406ec170507295d05c982b720e1a53feafb445bf Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 14:19:25 -0800
Subject: [PATCH 1047/1300] App 'submit an idea icon'

---
 src-ui/src/app/components/app-frame/app-frame.component.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index c4258ceae..eae597b22 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -172,6 +172,11 @@
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#link"/>
               </svg>&nbsp;<ng-container i18n>GitHub</ng-container>
+              <a href="https://github.com/jonaswinkler/paperless-ng/discussions/categories/ideas" title="Suggest an idea">
+                <svg xmlns="http://www.w3.org/2000/svg" width=".95rem" height=".95rem" fill="currentColor" class="bi bi-lightbulb pb-1 ml-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>
+              </a>
             </a>
           </li>
         </ul>

From 85ee74f2d8ced44c9182699b3ef371b5b9805437 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 14:32:09 -0800
Subject: [PATCH 1048/1300] Remove feature request template, update others to
 point to Discussions

---
 .github/ISSUE_TEMPLATE/bug_report.md      |  2 ++
 .github/ISSUE_TEMPLATE/feature_request.md | 21 ---------------------
 .github/ISSUE_TEMPLATE/other.md           |  4 +++-
 3 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 0f0ac44e2..d64504494 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -12,6 +12,8 @@ assignees: ''
 => Please also make sure that you followed the installation instructions.
 => Please search the issues and look for similar issues before opening a bug report.
 
+=> If you would like to submit a feature request please submit one under https://github.com/jonaswinkler/paperless-ng/discussions/categories/ideas
+
 => If you encounter issues while installing of configuring Paperless-ng, please post that in the "Support" section of the discussions. Remember that Paperless successfully runs on a variety of different systems. If paperless does not start, it's probably an issue with your system, and not an issue of paperless.
 
 => Don't remove the [BUG] prefix from the title.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 47c36c23d..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[Feature Request] Consice and clear description of your feature request"
-labels: ''
-assignees: ''
-
----
-
-<!--
-=> We already have lots of feature requests open. Please search the existing requests first and look for feature requests similar to yours.
-
-=> Don't remove the [Feature Request] prefix from the title.
-
--->
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
index ef394f7f9..1ceae0893 100644
--- a/.github/ISSUE_TEMPLATE/other.md
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -9,7 +9,9 @@ assignees: ''
 
 <!--
 
-=> Discussions, Feedback and other suggestions belong in the "Disussion" section and not on the issue tracker.
+=> Discussions, Feedback and other suggestions belong in the "Discussion" section and not on the issue tracker.
+
+=> If you would like to submit a feature request please submit one under https://github.com/jonaswinkler/paperless-ng/discussions/categories/ideas
 
 => If you encounter issues while installing of configuring Paperless-ng, please post that in the "Support" section of the discussions. Remember that Paperless successfully runs on a variety of different systems. If paperless does not start, it's probably is an issue with your system, and not an issue of paperless.
 

From 004e3134fc8beac0e9708bf90a0401c5307d8fdd Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 31 Jan 2021 22:33:04 +0000
Subject: [PATCH 1049/1300] Apply translations in fr

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'fr' language.
---
 src/locale/fr/LC_MESSAGES/django.po | 173 ++++++++++++++--------------
 1 file changed, 89 insertions(+), 84 deletions(-)

diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po
index 7ab8aa45f..e956642d4 100644
--- a/src/locale/fr/LC_MESSAGES/django.po
+++ b/src/locale/fr/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-10 21:41+0000\n"
+"POT-Creation-Date: 2021-01-28 22:02+0100\n"
 "PO-Revision-Date: 2020-12-30 19:27+0000\n"
 "Last-Translator: Philmo67, 2021\n"
 "Language-Team: French (https://www.transifex.com/paperless/teams/115905/fr/)\n"
@@ -26,64 +26,64 @@ msgstr ""
 msgid "Documents"
 msgstr "Documents"
 
-#: documents/models.py:32
+#: documents/models.py:33
 msgid "Any word"
 msgstr "Un des mots"
 
-#: documents/models.py:33
+#: documents/models.py:34
 msgid "All words"
 msgstr "Tous les mots"
 
-#: documents/models.py:34
+#: documents/models.py:35
 msgid "Exact match"
 msgstr "Concordance exacte"
 
-#: documents/models.py:35
+#: documents/models.py:36
 msgid "Regular expression"
 msgstr "Expression régulière"
 
-#: documents/models.py:36
+#: documents/models.py:37
 msgid "Fuzzy word"
 msgstr "Mot approximatif"
 
-#: documents/models.py:37
+#: documents/models.py:38
 msgid "Automatic"
 msgstr "Automatique"
 
-#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25
+#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
 #: paperless_mail/models.py:109
 msgid "name"
 msgstr "nom"
 
-#: documents/models.py:45
+#: documents/models.py:46
 msgid "match"
 msgstr "rapprochement"
 
-#: documents/models.py:49
+#: documents/models.py:50
 msgid "matching algorithm"
 msgstr "algorithme de rapprochement"
 
-#: documents/models.py:55
+#: documents/models.py:56
 msgid "is insensitive"
 msgstr "est insensible à la casse"
 
-#: documents/models.py:80 documents/models.py:140
+#: documents/models.py:75 documents/models.py:135
 msgid "correspondent"
 msgstr "correspondant"
 
-#: documents/models.py:81
+#: documents/models.py:76
 msgid "correspondents"
 msgstr "correspondants"
 
-#: documents/models.py:103
+#: documents/models.py:98
 msgid "color"
 msgstr "couleur"
 
-#: documents/models.py:107
+#: documents/models.py:102
 msgid "is inbox tag"
 msgstr "est une étiquette de boîte de réception"
 
-#: documents/models.py:109
+#: documents/models.py:104
 msgid ""
 "Marks this tag as an inbox tag: All newly consumed documents will be tagged "
 "with inbox tags."
@@ -91,39 +91,39 @@ msgstr ""
 "Marque cette étiquette comme étiquette de boîte de réception : ces "
 "étiquettes sont affectées à tous les documents nouvellement traités."
 
-#: documents/models.py:114
+#: documents/models.py:109
 msgid "tag"
 msgstr "étiquette"
 
-#: documents/models.py:115 documents/models.py:171
+#: documents/models.py:110 documents/models.py:166
 msgid "tags"
 msgstr "étiquettes"
 
-#: documents/models.py:121 documents/models.py:153
+#: documents/models.py:116 documents/models.py:148
 msgid "document type"
 msgstr "type de document"
 
-#: documents/models.py:122
+#: documents/models.py:117
 msgid "document types"
 msgstr "types de document"
 
-#: documents/models.py:130
+#: documents/models.py:125
 msgid "Unencrypted"
 msgstr "Non chiffré"
 
-#: documents/models.py:131
+#: documents/models.py:126
 msgid "Encrypted with GNU Privacy Guard"
 msgstr "Chiffré avec GNU Privacy Guard"
 
-#: documents/models.py:144
+#: documents/models.py:139
 msgid "title"
 msgstr "titre"
 
-#: documents/models.py:157
+#: documents/models.py:152
 msgid "content"
 msgstr "contenu"
 
-#: documents/models.py:159
+#: documents/models.py:154
 msgid ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
@@ -131,223 +131,228 @@ msgstr ""
 "Les données brutes du document, en format texte uniquement. Ce champ est "
 "principalement utilisé pour la recherche."
 
-#: documents/models.py:164
+#: documents/models.py:159
 msgid "mime type"
 msgstr "type mime"
 
-#: documents/models.py:175
+#: documents/models.py:170
 msgid "checksum"
 msgstr "somme de contrôle"
 
-#: documents/models.py:179
+#: documents/models.py:174
 msgid "The checksum of the original document."
 msgstr "La somme de contrôle du document original."
 
-#: documents/models.py:183
+#: documents/models.py:178
 msgid "archive checksum"
 msgstr "somme de contrôle de l'archive"
 
-#: documents/models.py:188
+#: documents/models.py:183
 msgid "The checksum of the archived document."
 msgstr "La somme de contrôle du document archivé."
 
-#: documents/models.py:192 documents/models.py:332
+#: documents/models.py:187 documents/models.py:330
 msgid "created"
 msgstr "créé le"
 
-#: documents/models.py:196
+#: documents/models.py:191
 msgid "modified"
 msgstr "modifié"
 
-#: documents/models.py:200
+#: documents/models.py:195
 msgid "storage type"
 msgstr "forme d'enregistrement :"
 
-#: documents/models.py:208
+#: documents/models.py:203
 msgid "added"
 msgstr "date d'ajout"
 
-#: documents/models.py:212
+#: documents/models.py:207
 msgid "filename"
 msgstr "nom du fichier"
 
-#: documents/models.py:217
+#: documents/models.py:212
 msgid "Current filename in storage"
 msgstr "Nom du fichier courant en base de données"
 
-#: documents/models.py:221
+#: documents/models.py:216
 msgid "archive serial number"
 msgstr "numéro de série de l'archive"
 
-#: documents/models.py:226
+#: documents/models.py:221
 msgid "The position of this document in your physical document archive."
 msgstr ""
 "Le classement de ce document dans votre archive de documents physiques."
 
-#: documents/models.py:232
+#: documents/models.py:227
 msgid "document"
 msgstr "document"
 
-#: documents/models.py:233
+#: documents/models.py:228
 msgid "documents"
 msgstr "documents"
 
-#: documents/models.py:315
+#: documents/models.py:313
 msgid "debug"
 msgstr "débogage"
 
-#: documents/models.py:316
+#: documents/models.py:314
 msgid "information"
 msgstr "information"
 
-#: documents/models.py:317
+#: documents/models.py:315
 msgid "warning"
 msgstr "avertissement"
 
-#: documents/models.py:318
+#: documents/models.py:316
 msgid "error"
 msgstr "erreur"
 
-#: documents/models.py:319
+#: documents/models.py:317
 msgid "critical"
 msgstr "critique"
 
-#: documents/models.py:323
+#: documents/models.py:321
 msgid "group"
 msgstr "groupe"
 
-#: documents/models.py:326
+#: documents/models.py:324
 msgid "message"
 msgstr "message"
 
-#: documents/models.py:329
+#: documents/models.py:327
 msgid "level"
 msgstr "niveau"
 
-#: documents/models.py:336
+#: documents/models.py:334
 msgid "log"
 msgstr "rapport"
 
-#: documents/models.py:337
+#: documents/models.py:335
 msgid "logs"
 msgstr "rapports"
 
-#: documents/models.py:348 documents/models.py:398
+#: documents/models.py:346 documents/models.py:396
 msgid "saved view"
 msgstr "vue enregistrée"
 
-#: documents/models.py:349
+#: documents/models.py:347
 msgid "saved views"
 msgstr "vues enregistrées"
 
-#: documents/models.py:352
+#: documents/models.py:350
 msgid "user"
 msgstr "utilisateur"
 
-#: documents/models.py:358
+#: documents/models.py:356
 msgid "show on dashboard"
 msgstr "montrer sur le tableau de bord"
 
-#: documents/models.py:361
+#: documents/models.py:359
 msgid "show in sidebar"
 msgstr "montrer dans la barre latérale"
 
-#: documents/models.py:365
+#: documents/models.py:363
 msgid "sort field"
 msgstr "champ de tri"
 
-#: documents/models.py:368
+#: documents/models.py:366
 msgid "sort reverse"
 msgstr "tri inverse"
 
-#: documents/models.py:374
+#: documents/models.py:372
 msgid "title contains"
 msgstr "le titre contient"
 
-#: documents/models.py:375
+#: documents/models.py:373
 msgid "content contains"
 msgstr "le contenu contient"
 
-#: documents/models.py:376
+#: documents/models.py:374
 msgid "ASN is"
 msgstr "le NSA est"
 
-#: documents/models.py:377
+#: documents/models.py:375
 msgid "correspondent is"
 msgstr "le correspondant est"
 
-#: documents/models.py:378
+#: documents/models.py:376
 msgid "document type is"
 msgstr "le type de document est"
 
-#: documents/models.py:379
+#: documents/models.py:377
 msgid "is in inbox"
 msgstr "est dans la boîte de réception"
 
-#: documents/models.py:380
+#: documents/models.py:378
 msgid "has tag"
 msgstr "porte l'étiquette"
 
-#: documents/models.py:381
+#: documents/models.py:379
 msgid "has any tag"
 msgstr "porte l'une des étiquettes"
 
-#: documents/models.py:382
+#: documents/models.py:380
 msgid "created before"
 msgstr "créé avant"
 
-#: documents/models.py:383
+#: documents/models.py:381
 msgid "created after"
 msgstr "créé après"
 
-#: documents/models.py:384
+#: documents/models.py:382
 msgid "created year is"
 msgstr "l'année de création est"
 
-#: documents/models.py:385
+#: documents/models.py:383
 msgid "created month is"
 msgstr "le mois de création est"
 
-#: documents/models.py:386
+#: documents/models.py:384
 msgid "created day is"
 msgstr "le jour de création est"
 
-#: documents/models.py:387
+#: documents/models.py:385
 msgid "added before"
 msgstr "ajouté avant"
 
-#: documents/models.py:388
+#: documents/models.py:386
 msgid "added after"
 msgstr "ajouté après"
 
-#: documents/models.py:389
+#: documents/models.py:387
 msgid "modified before"
 msgstr "modifié avant"
 
-#: documents/models.py:390
+#: documents/models.py:388
 msgid "modified after"
 msgstr "modifié après"
 
-#: documents/models.py:391
+#: documents/models.py:389
 msgid "does not have tag"
 msgstr "ne porte pas d'étiquette"
 
-#: documents/models.py:402
+#: documents/models.py:400
 msgid "rule type"
 msgstr "type de règle"
 
-#: documents/models.py:406
+#: documents/models.py:404
 msgid "value"
 msgstr "valeur"
 
-#: documents/models.py:412
+#: documents/models.py:410
 msgid "filter rule"
 msgstr "règle de filtrage"
 
-#: documents/models.py:413
+#: documents/models.py:411
 msgid "filter rules"
 msgstr "règles de filtrage"
 
+#: documents/serialisers.py:383
+#, python-format
+msgid "File type %(type)s not supported"
+msgstr "Type de fichier %(type)s non pris en charge"
+
 #: documents/templates/index.html:20
 msgid "Paperless-ng is loading..."
 msgstr "Paperless-ng est en cours de chargement..."
@@ -390,23 +395,23 @@ msgstr "Mot de passe"
 msgid "Sign in"
 msgstr "S'identifier"
 
-#: paperless/settings.py:268
+#: paperless/settings.py:286
 msgid "English"
 msgstr "Anglais"
 
-#: paperless/settings.py:269
+#: paperless/settings.py:287
 msgid "German"
 msgstr "Allemand"
 
-#: paperless/settings.py:270
+#: paperless/settings.py:288
 msgid "Dutch"
 msgstr "Néerlandais"
 
-#: paperless/settings.py:271
+#: paperless/settings.py:289
 msgid "French"
 msgstr "Français"
 
-#: paperless/urls.py:108
+#: paperless/urls.py:114
 msgid "Paperless-ng administration"
 msgstr "Administration de Paperless-ng"
 

From ddf01eef1451140e6676214cb81b511616d56140 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 16:22:41 -0800
Subject: [PATCH 1050/1300] Update to use new feature-requests category of
 discussions

---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 +-
 .github/ISSUE_TEMPLATE/other.md      | 2 +-
 README.md                            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d64504494..9a4b9bc2f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -12,7 +12,7 @@ assignees: ''
 => Please also make sure that you followed the installation instructions.
 => Please search the issues and look for similar issues before opening a bug report.
 
-=> If you would like to submit a feature request please submit one under https://github.com/jonaswinkler/paperless-ng/discussions/categories/ideas
+=> If you would like to submit a feature request please submit one under https://github.com/jonaswinkler/paperless-ng/discussions/categories/feature-requests
 
 => If you encounter issues while installing of configuring Paperless-ng, please post that in the "Support" section of the discussions. Remember that Paperless successfully runs on a variety of different systems. If paperless does not start, it's probably an issue with your system, and not an issue of paperless.
 
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
index 1ceae0893..8bb40d9d1 100644
--- a/.github/ISSUE_TEMPLATE/other.md
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -11,7 +11,7 @@ assignees: ''
 
 => Discussions, Feedback and other suggestions belong in the "Discussion" section and not on the issue tracker.
 
-=> If you would like to submit a feature request please submit one under https://github.com/jonaswinkler/paperless-ng/discussions/categories/ideas
+=> If you would like to submit a feature request please submit one under https://github.com/jonaswinkler/paperless-ng/discussions/categories/feature-requests
 
 => If you encounter issues while installing of configuring Paperless-ng, please post that in the "Support" section of the discussions. Remember that Paperless successfully runs on a variety of different systems. If paperless does not start, it's probably is an issue with your system, and not an issue of paperless.
 
diff --git a/README.md b/README.md
index 4d87119c1..cb866e2ca 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ If you want to see paperless in your own language, request that language at tran
 
 # Feature Requests
 
-Feature requests can be submitted via [GitHub Discussions](https://github.com/jonaswinkler/paperless-ng/discussions/categories/ideas), you can search for existing ideas, add your own and vote for the ones you care about! Note that some older feature requests can also be found under [issues](https://github.com/jonaswinkler/paperless-ng/issues).
+Feature requests can be submitted via [GitHub Discussions](https://github.com/jonaswinkler/paperless-ng/discussions/categories/feature-requests), you can search for existing ideas, add your own and vote for the ones you care about! Note that some older feature requests can also be found under [issues](https://github.com/jonaswinkler/paperless-ng/issues).
 
 # Questions? Something not working?
 
@@ -90,7 +90,7 @@ For bugs please [open an issue](https://github.com/jonaswinkler/paperless-ng/iss
 
 ## Feel like helping out?
 
-There's still lots of things to be done, just have a look at that issue log. 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.
+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.
 

From e657ca749684613578ca99f8ee934fac5c18f18f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 16:23:08 -0800
Subject: [PATCH 1051/1300] Revert "App 'submit an idea icon'"

This reverts commit 406ec170507295d05c982b720e1a53feafb445bf.
---
 src-ui/src/app/components/app-frame/app-frame.component.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index eae597b22..c4258ceae 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -172,11 +172,6 @@
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#link"/>
               </svg>&nbsp;<ng-container i18n>GitHub</ng-container>
-              <a href="https://github.com/jonaswinkler/paperless-ng/discussions/categories/ideas" title="Suggest an idea">
-                <svg xmlns="http://www.w3.org/2000/svg" width=".95rem" height=".95rem" fill="currentColor" class="bi bi-lightbulb pb-1 ml-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>
-              </a>
             </a>
           </li>
         </ul>

From 76c971574895f6bb2546782c1c33bc262b6d6db2 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 16:31:32 -0800
Subject: [PATCH 1052/1300] Change "Misc" to "Info"

Also move to bottom of screen, add suggestions link, change GH icon
---
 .../app-frame/app-frame.component.html        | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index c4258ceae..0507efc3f 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -52,12 +52,7 @@
 <div class="container-fluid">
   <div class="row">
     <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse" [ngbCollapse]="isMenuCollapsed">
-
-      <div style="position: absolute; bottom: 0; left: 0;" class="text-muted p-1">
-        {{versionString}}
-      </div>
-
-      <div class="sidebar-sticky pt-3">
+      <div class="sidebar-sticky pt-3 d-flex flex-column justify-space-around">
         <ul class="nav flex-column">
           <li class="nav-item">
             <a class="nav-link" routerLink="dashboard" routerLinkActive="active" (click)="closeMenu()">
@@ -156,8 +151,8 @@
           </li>
         </ul>
 
-        <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
-          <ng-container i18n>Misc</ng-container>
+        <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-auto mb-1 text-muted">
+          <ng-container i18n>Info</ng-container>
         </h6>
         <ul class="nav flex-column mb-2">
           <li class="nav-item">
@@ -167,12 +162,21 @@
               </svg>&nbsp;<ng-container i18n>Documentation</ng-container>
             </a>
           </li>
-          <li class="nav-item">
+          <li class="nav-item d-flex">
             <a class="nav-link" target="_blank" rel="noopener noreferrer" href="https://github.com/jonaswinkler/paperless-ng">
-              <svg class="sidebaricon" fill="currentColor">
-                <use xlink:href="assets/bootstrap-icons.svg#link"/>
+              <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="sidebaricon bi bi-github" viewBox="0 0 16 16">
+                <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"/>
               </svg>&nbsp;<ng-container i18n>GitHub</ng-container>
             </a>
+            <a class="small pt-2 mt-1 ml-1 text-muted" target="_blank" rel="noopener noreferrer" href="https://github.com/jonaswinkler/paperless-ng/discussions/categories/ideas" 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">
+                <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>
+            </a>
+          </li>
+          <li class="nav-item px-3 py-2 text-muted small">
+            {{versionString}}
           </li>
         </ul>
       </div>

From 6a4b31b35489027b54a170ab38eea4549c9cad55 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 16:33:39 -0800
Subject: [PATCH 1053/1300] Correct discussions category link

---
 src-ui/src/app/components/app-frame/app-frame.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 0507efc3f..c53d69f8a 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -168,7 +168,7 @@
                 <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"/>
               </svg>&nbsp;<ng-container i18n>GitHub</ng-container>
             </a>
-            <a class="small pt-2 mt-1 ml-1 text-muted" target="_blank" rel="noopener noreferrer" href="https://github.com/jonaswinkler/paperless-ng/discussions/categories/ideas" title="Suggest an idea">
+            <a class="small pt-2 mt-1 ml-1 text-muted" 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">
                 <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>

From 4c314130f7db9b5b47fd0de55c9d1723710958c7 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 17:16:39 -0800
Subject: [PATCH 1054/1300] Use div containers

---
 .../app-frame/app-frame.component.html        | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index c53d69f8a..854b2557d 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -162,21 +162,25 @@
               </svg>&nbsp;<ng-container i18n>Documentation</ng-container>
             </a>
           </li>
-          <li class="nav-item d-flex">
-            <a class="nav-link" target="_blank" rel="noopener noreferrer" href="https://github.com/jonaswinkler/paperless-ng">
-              <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="sidebaricon bi bi-github" viewBox="0 0 16 16">
-                <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"/>
-              </svg>&nbsp;<ng-container i18n>GitHub</ng-container>
-            </a>
-            <a class="small pt-2 mt-1 ml-1 text-muted" 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">
-                <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>
-            </a>
+          <li class="nav-item">
+            <div class="d-flex w-100">
+              <a class="nav-link" target="_blank" rel="noopener noreferrer" href="https://github.com/jonaswinkler/paperless-ng">
+                <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="sidebaricon bi bi-github" viewBox="0 0 16 16">
+                  <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"/>
+                </svg>&nbsp;<ng-container i18n>GitHub</ng-container>
+              </a>
+              <a class="small pt-2 mt-1 ml-1 text-muted" 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">
+                  <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>
+              </a>
+            </div>
           </li>
-          <li class="nav-item px-3 py-2 text-muted small">
-            {{versionString}}
+          <li class="nav-item">
+            <div class="px-3 py-2 text-muted small">
+              {{versionString}}
+            </div>
           </li>
         </ul>
       </div>

From dabcdbad0005c691571b54482366b8bf59a4f230 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 19:09:31 -0800
Subject: [PATCH 1055/1300] Prevent safari wrap

---
 src-ui/src/app/components/app-frame/app-frame.component.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index e4b21add7..e62b4651d 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -57,6 +57,10 @@
   text-transform: uppercase;
 }
 
+.nav {
+  flex-wrap: nowrap;
+}
+
 /*
  * Navbar
  */

From 34104f0d4279df42d211f069853a2572159a4229 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 19:11:21 -0800
Subject: [PATCH 1056/1300] These arent needed on h6s

---
 .../src/app/components/app-frame/app-frame.component.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 854b2557d..95feda841 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -70,7 +70,7 @@
           </li>
         </ul>
 
-        <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted" *ngIf='savedViewService.sidebarViews.length > 0'>
+        <h6 class="sidebar-heading px-3 mt-4 mb-1 text-muted" *ngIf='savedViewService.sidebarViews.length > 0'>
           <ng-container i18n>Saved views</ng-container>
         </h6>
         <ul class="nav flex-column mb-2">
@@ -83,7 +83,7 @@
           </li>
         </ul>
 
-        <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted" *ngIf='openDocuments.length > 0'>
+        <h6 class="sidebar-heading px-3 mt-4 mb-1 text-muted" *ngIf='openDocuments.length > 0'>
           <ng-container i18n>Open documents</ng-container>
         </h6>
         <ul class="nav flex-column mb-2">
@@ -103,7 +103,7 @@
           </li>
         </ul>
 
-        <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
+        <h6 class="sidebar-heading px-3 mt-4 mb-1 text-muted">
           <ng-container i18n>Manage</ng-container>
         </h6>
         <ul class="nav flex-column mb-2">
@@ -151,7 +151,7 @@
           </li>
         </ul>
 
-        <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-auto mb-1 text-muted">
+        <h6 class="sidebar-heading px-3 mt-auto mb-1 text-muted">
           <ng-container i18n>Info</ng-container>
         </h6>
         <ul class="nav flex-column mb-2">

From 58ae14c364ecdbe481022e36bd42679a8261fb61 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 19:11:27 -0800
Subject: [PATCH 1057/1300] space for info heading

---
 src-ui/src/app/components/app-frame/app-frame.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 95feda841..fc9efd8a6 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -151,7 +151,7 @@
           </li>
         </ul>
 
-        <h6 class="sidebar-heading px-3 mt-auto mb-1 text-muted">
+        <h6 class="sidebar-heading px-3 mt-auto pt-4 mb-1 text-muted">
           <ng-container i18n>Info</ng-container>
         </h6>
         <ul class="nav flex-column mb-2">

From abee54ebe3cf74791e716dfe031e5d6236677f34 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 19:16:38 -0800
Subject: [PATCH 1058/1300] Fix Safari overflow issue

---
 src-ui/src/app/components/app-frame/app-frame.component.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index e62b4651d..6615ea9d6 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -24,6 +24,7 @@
   padding-top: 0.5rem;
   overflow-x: hidden;
   overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
+  min-height: min-content;
 }
 @supports ((position: -webkit-sticky) or (position: sticky)) {
   .sidebar-sticky {

From 32f0a2fdbc0bdc38c5f86c05922733c709fadf98 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 19:20:00 -0800
Subject: [PATCH 1059/1300] Yes, 2px margin on the svg icon

---
 src-ui/src/app/components/app-frame/app-frame.component.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index 6615ea9d6..3a8f58176 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -62,6 +62,10 @@
   flex-wrap: nowrap;
 }
 
+.nav-item .small svg {
+  margin-bottom: 2px;
+}
+
 /*
  * Navbar
  */

From 4a549ccd33f489420352f3088acaa80d5e3f0462 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 31 Jan 2021 19:24:37 -0800
Subject: [PATCH 1060/1300] additional link spacing

---
 .../app/components/app-frame/app-frame.component.html  |  2 +-
 .../app/components/app-frame/app-frame.component.scss  | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index fc9efd8a6..70329d537 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -169,7 +169,7 @@
                   <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"/>
                 </svg>&nbsp;<ng-container i18n>GitHub</ng-container>
               </a>
-              <a class="small pt-2 mt-1 ml-1 text-muted" target="_blank" rel="noopener noreferrer" href="https://github.com/jonaswinkler/paperless-ng/discussions/categories/feature-requests" title="Suggest an idea">
+              <a class="nav-link-additional small text-muted" 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">
                   <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>
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index 3a8f58176..b6181b364 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.scss
+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss
@@ -62,8 +62,14 @@
   flex-wrap: nowrap;
 }
 
-.nav-item .small svg {
-  margin-bottom: 2px;
+.nav-item .nav-link-additional {
+  margin-top: 0.2rem;
+  margin-left: 0.25rem;
+  padding-top: 0.5rem;
+
+  svg {
+    margin-bottom: 2px;
+  }
 }
 
 /*

From 689579c7f2005e0abd54b6eae578975fb132e8fb Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 09:31:34 +0000
Subject: [PATCH 1061/1300] Translate /src-ui/messages.xlf in nl_NL

translation completed for the source file '/src-ui/messages.xlf'
on the 'nl_NL' language.
---
 src-ui/src/locale/messages.nl_NL.xlf | 380 ++++++++++++++++++++++-----
 1 file changed, 318 insertions(+), 62 deletions(-)

diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf
index 3753bc92c..0e164d688 100644
--- a/src-ui/src/locale/messages.nl_NL.xlf
+++ b/src-ui/src/locale/messages.nl_NL.xlf
@@ -1,12 +1,60 @@
 <?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
   <file datatype="plaintext" original="ng2.template" source-language="en-US" target-language="nl-NL">
     <body>
+      <trans-unit datatype="html" id="9103526311244275943">
+        <source>Document added</source>
+        <target>Document toegevoegd</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9204248378636247318">
+        <source>Document <x equiv-text="status.filename" id="PH"/> was added to paperless.</source>
+        <target>Document <x equiv-text="status.filename" id="PH"/> werd toegevoegd aan paperless.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1931214133925051574">
+        <source>Open document</source>
+        <target>Open document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8582620835547864448">
+        <source>Could not add <x equiv-text="status.filename" id="PH"/>: <x equiv-text="status.message" id="PH_1"/></source>
+        <target>Kon niet toevoegen <x equiv-text="status.filename" id="PH"/>: <x equiv-text="status.message" id="PH_1"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1710712016675379662">
+        <source>New document detected</source>
+        <target>Nieuw document gedetecteerd</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="587031278561344416">
+        <source>Document <x equiv-text="status.filename" id="PH"/> is being processed by paperless.</source>
+        <target>Document <x equiv-text="status.filename" id="PH"/> wordt verwerkt door paperless.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="4733307402565258070">
         <source>Documents</source>
         <target>Documenten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">43</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
@@ -14,7 +62,7 @@
         <target>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; met succes opgeslagen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">109</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
@@ -22,7 +70,7 @@
         <target>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; met succes gemaakt.</target>
         <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">130</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
@@ -166,7 +214,7 @@
         <target>Bevestig het verwijderen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">192</context>
+          <context context-type="linenumber">199</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
@@ -174,7 +222,7 @@
         <target>Wilt u het document echt verwijderen &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">193</context>
+          <context context-type="linenumber">200</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6691075929777935948">
@@ -182,7 +230,7 @@
         <target>De bestanden voor dit document worden definitief verwijderd. Deze bewerking kan niet ongedaan worden gemaakt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">194</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="719892092227206532">
@@ -190,7 +238,7 @@
         <target>Verwijder document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">196</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1844801255494293730">
@@ -198,7 +246,7 @@
         <target>Fout bij het verwijderen van het document: <x equiv-text="JSON.stringify(error)" id="PH"/></target>
         <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">210</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -550,7 +598,7 @@
         <target>Opgeslagen view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; verwijderd.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -558,7 +606,7 @@
         <target>Instellingen succesvol opgeslagen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6839066544204061364">
@@ -566,7 +614,7 @@
         <target>Gebruik de systeemtaal</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7729897675462249787">
@@ -574,7 +622,7 @@
         <target>Datumopmaak van weergavetaal gebruiken</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -582,7 +630,7 @@
         <target>Fout bij het opslaan van de instellingen: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -606,7 +654,7 @@
         <target>Opgeslagen views</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">128</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
@@ -729,12 +777,68 @@
           <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab">
+        <source>Notifications</source>
+        <target>Meldingen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">102</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="69c5a98f8aa92e4db060f10dcd37781c8f40a48f">
+        <source>Consumer status</source>
+        <target>Status van de verwerker</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0">
+        <source>Show notifications when new documents are detected</source>
+        <target>Toon meldingen wanneer nieuwe documenten worden gedetecteerd</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">109</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f2361d3f65b6c77ef0a15fad8af8e858b043ace3">
+        <source>Show notifications when document consumption completes successfully</source>
+        <target>Toon meldingen wanneer documenten met succes zijn verwerkt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">110</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2bcbcbe99e207803e21183580b98d90410dd8718">
+        <source>Show notifications when document consumption fails</source>
+        <target>Toon meldingen wanneer het verwerken van documenten faalt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af113f7c9f7e13145c3461f61a1aedf12d57bd71">
+        <source>Suppress notifications on dashboard</source>
+        <target>Onderdruk meldingen op het dashboard</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="59fe5c9233a2aaab3079a2300e4dfa439ddb1890">
+        <source>This will suppress all consumer related status messages on the dashboard.</source>
+        <target>Dit verbergt alle statusberichten op het dashboard die met de verwerker te maken hebben.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
         <source>Bulk editing</source>
         <target>Massabewerking</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">102</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
@@ -742,7 +846,7 @@
         <target>Toon dialoogvenster ter bevestiging</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
@@ -750,7 +854,7 @@
         <target>Er zal altijd om bevestiging gevraagd worden voor het verwijderen van documenten.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
@@ -758,7 +862,7 @@
         <target>Toepassen bij het sluiten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">121</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -766,7 +870,7 @@
         <target>Komt voor bij</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -774,7 +878,7 @@
         <target>Toon op het dashboard</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">129</context>
+          <context context-type="linenumber">143</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -782,7 +886,7 @@
         <target>Toon in de zijbalk</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">133</context>
+          <context context-type="linenumber">147</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -790,7 +894,7 @@
         <target>Geen opgeslagen views gedefinieerd.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">143</context>
+          <context context-type="linenumber">157</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -915,7 +1019,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="5e2f1a4ea12a1b8606ee3f0548d0ba64bf266077">
         <source>Inbox tags are automatically assigned to all consumed documents.</source>
-        <target>&quot;Postvak in&quot;-etiketten worden automatisch toegewezen aan alle verwerkte documenten.</target>
+        <target>&quot;Postvak in&quot;-etiketten worden automatisch toegewezen aan alle verwerkte documenten.&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
           <context context-type="linenumber">21</context>
@@ -1283,6 +1387,14 @@
           <context context-type="linenumber">73</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="7894972847287473517">
+        <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</source>
+        <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
         <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
         <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; en &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
@@ -1292,14 +1404,6 @@
         </context-group>
         <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
       </trans-unit>
-      <trans-unit datatype="html" id="7894972847287473517">
-        <source>&quot;<x equiv-text="i.name" id="PH"/>&quot;</source>
-        <target>&quot;<x equiv-text="i.name" id="PH"/>&quot;</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">116</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="760986369763309193">
         <source>, </source>
         <target>, </target>
@@ -1470,6 +1574,14 @@
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="a1e6c11f20d4bf6e8e6b43e3c6d2561b2080645e">
+        <source>Suggestions:</source>
+        <target>Suggesties:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/input/select/select.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">
         <source>Save current view</source>
         <target>Huidige view opslaan</target>
@@ -1510,28 +1622,52 @@
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="8705589528094706681">
-        <source>The document has been uploaded and will be processed by the consumer shortly.</source>
-        <target>Het document werd opgeladen en zal binnenkort worden verwerkt.</target>
+      <trans-unit datatype="html" id="6443586946875325554">
+        <source>Processing: <x equiv-text="countUploadingAndProcessing" id="PH"/></source>
+        <target>Bezig met verwerken: <x equiv-text="countUploadingAndProcessing" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">32</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="4956689020592747108">
-        <source>There was an error while uploading the document: <x equiv-text="error.error.document" id="PH"/></source>
-        <target>Fout bij het opladen van het document: <x equiv-text="error.error.document" id="PH"/></target>
+      <trans-unit datatype="html" id="9182918211699394982">
+        <source>Failed: <x equiv-text="countFailed" id="PH"/></source>
+        <target>Gefaald: <x equiv-text="countFailed" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="7554858521017940575">
-        <source>An error has occurred while uploading the document. Sorry!</source>
-        <target>Er ging iets mis bij het opladen van het document. Onze excuses!</target>
+      <trans-unit datatype="html" id="534116346205124059">
+        <source>Added: <x equiv-text="countSuccess" id="PH"/></source>
+        <target>Toegevoegd: <x equiv-text="countSuccess" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3852289441366561594">
+        <source>Connecting...</source>
+        <target>Bezig met verbinden...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1245343823699368872">
+        <source>Uploading...</source>
+        <target>Bezig met opladen...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3994065460580948013">
+        <source>Waiting for consumer...</source>
+        <target>Wachten op het verwerken...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
@@ -1547,7 +1683,7 @@
         <target>Sleep documenten hierheen, of</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="865c511f4a24558ed0e954f9bbbff557bbb8954d">
@@ -1555,15 +1691,31 @@
         <target>Kies bestanden</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="33c76d75ce25ce3b05ab22877f1b6b09dcf603ae">
-        <source>{VAR_PLURAL, plural, =1 {Uploading file...} =other {Uploading <x id="INTERPOLATION"/> files...}}</source>
-        <target>{VAR_PLURAL, plural, =1 {Bezig met opladen van het bestand...} =other {Bezig met opladen van <x id="INTERPOLATION"/> bestanden...}}</target>
+      <trans-unit datatype="html" id="bd4a8607e4a002d939cffb347ec056664dfb2c73">
+        <source>Dismiss completed</source>
+        <target>Verberg verwerkte documenten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1fc4e0a1e93fdda0ed3c9e590971d283afb68265">
+        <source><x equiv-text="{{getStatusHidden().length}}" id="INTERPOLATION"/> more hidden</source>
+        <target><x equiv-text="{{getStatusHidden().length}}" id="INTERPOLATION"/> niet getoond</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="710254a196a2649674438edf8a15b7ab1f48271b">
+        <source>Open document</source>
+        <target>Open document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="45854ddec74086b271e62be6a363f4fa5036f7fc">
@@ -1675,7 +1827,7 @@
         <target>Engels (US)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
@@ -1683,7 +1835,7 @@
         <target>Duits</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1691,7 +1843,7 @@
         <target>Nederlands</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1699,7 +1851,111 @@
         <target>Frans</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2119857572761283468">
+        <source>Document already exists.</source>
+        <target>Document bestaat al.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="148389968432135849">
+        <source>File not found.</source>
+        <target>Bestand niet gevonden.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1520671543092565667">
+        <source>Pre-consume script does not exist.</source>
+        <target>Pre-verwerkingsscript bestaat niet.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7742915911032564889">
+        <source>Error while executing pre-consume script.</source>
+        <target>Fout tijdens het uitvoeren van het pre-verwerkingsscript</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8995193730018060346">
+        <source>Post-consume script does not exist.</source>
+        <target>Post-verwerkingsscript bestaat niet.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="256773668518189604">
+        <source>Error while executing post-consume script.</source>
+        <target>Fout tijdens het uitvoeren van het post-verwerkingsscript</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6252258095055634191">
+        <source>Received new file.</source>
+        <target>Nieuw bestand ontvangen.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7337565919209746135">
+        <source>File type not supported.</source>
+        <target>Bestandstype niet ondersteund.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5002399167376099234">
+        <source>Processing document...</source>
+        <target>Document wordt verwerkt...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1085975194762600381">
+        <source>Generating thumbnail...</source>
+        <target>Voorbeeldweergave wordt gemaakt...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3280851677698431426">
+        <source>Retrieving date from document...</source>
+        <target>Datum wordt gezocht in document...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7162102384876037296">
+        <source>Saving document...</source>
+        <target>Document wordt opgeslagen...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4550450765009165976">
+        <source>Finished.</source>
+        <target>Klaar.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1519954996184640001">
@@ -1707,7 +1963,7 @@
         <target>Fout</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/toast.service.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5037437391296624618">
@@ -1715,7 +1971,7 @@
         <target>Informatie</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/toast.service.ts</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7517688192215738656">
@@ -1723,7 +1979,7 @@
         <target>ASN</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2691296884221415710">
@@ -1731,7 +1987,7 @@
         <target>Correspondent</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5701618810648052610">
@@ -1739,7 +1995,7 @@
         <target>Titel</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5066119607229701477">
@@ -1747,7 +2003,7 @@
         <target>Documenttype</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4207916966377787111">
@@ -1755,7 +2011,7 @@
         <target>Aangemaakt</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="231679111972850796">
@@ -1763,7 +2019,7 @@
         <target>Toegevoegd</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3553216189604488439">
@@ -1771,7 +2027,7 @@
         <target>Gewijzigd</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2056433880533904076">

From 48b042bfb0af66ef495c9af095d5cdb8697e04db Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Mon, 1 Feb 2021 20:14:29 +0100
Subject: [PATCH 1062/1300] troubleshooting for #216

---
 docs/troubleshooting.rst | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index f55d57af5..ae7fe14c7 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -60,7 +60,8 @@ required so that the user running paperless inside docker has write permissions
 to these folders. This happens when pointing these directories to NFS shares,
 for example.
 
-Ensure that `chown` is possible on these directories.
+Ensure that ``chown`` is possible on these directories.
+
 
 Classifier error: No training data available
 ############################################
@@ -73,6 +74,7 @@ This may have two reasons:
     with Inbox tags. Verify that there are documents in your archive without inbox tags.
     The algorithm will only learn from documents not in your inbox.
 
+
 UserWarning in sklearn on every single document
 ###############################################
 
@@ -91,6 +93,7 @@ in most cases. This warning will disappear automatically when paperless updates
 If you want to get rid of the warning or actually experience issues with automatic matching, delete
 the file ``classification_model.pickle`` in the data directory and let paperless recreate it.
 
+
 Permission denied errors in the consumption directory
 #####################################################
 
@@ -106,6 +109,38 @@ different from ``1000``. See :ref:`setup-docker_hub`.
 
 Also ensure that you are able to read and write to the consumption directory on the host.
 
+
+OSError: [Errno 19] No such device when consuming files
+#######################################################
+
+If you experience errors such as:
+
+.. code:: shell-session
+
+    File "/usr/local/lib/python3.7/site-packages/whoosh/codec/base.py", line 570, in open_compound_file
+    return CompoundStorage(dbfile, use_mmap=storage.supports_mmap)
+    File "/usr/local/lib/python3.7/site-packages/whoosh/filedb/compound.py", line 75, in __init__
+    self._source = mmap.mmap(fileno, 0, access=mmap.ACCESS_READ)
+    OSError: [Errno 19] No such device
+
+    During handling of the above exception, another exception occurred:
+
+    Traceback (most recent call last):
+    File "/usr/local/lib/python3.7/site-packages/django_q/cluster.py", line 436, in worker
+    res = f(*task["args"], **task["kwargs"])
+    File "/usr/src/paperless/src/documents/tasks.py", line 73, in consume_file
+    override_tag_ids=override_tag_ids)
+    File "/usr/src/paperless/src/documents/consumer.py", line 271, in try_consume_file
+    raise ConsumerError(e)
+
+Paperless uses a search index to provide better and faster full text searching. This search index is stored inside
+the ``data`` folder. The search index uses memory-mapped files (mmap). The above error indicates that paperless
+was unable to create and open these files.
+
+This happens when you're trying to store the data directory on certain file systems (mostly network shares)
+that don't support memory-mapped files.
+
+
 Web-UI stuck at "Loading..."
 ############################
 
@@ -148,4 +183,4 @@ This might have multiple reasons.
 
         SENDFILE=0
     
-    to your `docker-compose.env` file.
\ No newline at end of file
+    to your `docker-compose.env` file.

From 0a28ccf62fac76d1fef0e18434d81ce1c3597ca2 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Mon, 1 Feb 2021 21:43:50 +0100
Subject: [PATCH 1063/1300] adjustments to setup

---
 docs/setup.rst | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index afb3784d6..a86c4ce27 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -151,13 +151,16 @@ Install Paperless from Docker Hub
     .. code::
 
         - /home/jonaswinkler/paperless-inbox:/usr/src/paperless/consume
-
+    
     Don't change the part after the colon or paperless wont find your documents.
 
 
 5.  Modify ``docker-compose.env``, following the comments in the file. The
     most important change is to set ``USERMAP_UID`` and ``USERMAP_GID``
-    to the uid and gid of your user on the host system. This ensures that
+    to the uid and gid of your user on the host system. Use ``id -u`` and
+    ``id -g`` to get these.
+    
+    This ensures that
     both the docker container and you on the host machine have write access
     to the consumption directory. If your UID and GID on the host system is
     1000 (the default for the first normal user on most systems), it will
@@ -175,15 +178,11 @@ Install Paperless from Docker Hub
         on such a file system, paperless will not pick up new files
         with the default configuration. You will need to use ``PAPERLESS_CONSUMER_POLLING``,
         which will disable inotify. See :ref:`here <configuration-polling>`.
-        
-6.  Now head over to: https://hub.docker.com/r/jonaswinkler/paperless-ng and choose your preferred
-    image and copy the link. To download this image do a `docker pull` followed by the link. Do this within the directory with the .yml files.
-    Depending on your network connection and CPU this will take a while. You have time to get a beverage.
 
-7.  Run ``docker-compose up -d``. This will create and start the necessary
-    containers, but your are not done yet!
+6.  Run ``docker-compose up -d``. This will pull the image, create and start the necessary
+    containers.
 
-8.  To be able to login, you will need a super user. To create it, execute the
+7.  To be able to login, you will need a super user. To create it, execute the
     following command:
 
     .. code-block:: shell-session
@@ -193,8 +192,8 @@ Install Paperless from Docker Hub
     This will prompt you to set a username, an optional e-mail address and
     finally a password (at least 8 characters).
 
-9.  The default ``docker-compose.yml`` exports the webserver on your local port
-    8000. If you haven't adapted this, you should now be able to visit your
+8.  The default ``docker-compose.yml`` exports the webserver on your local port
+    8000. If you did not change this, you should now be able to visit your
     Paperless instance at ``http://127.0.0.1:8000`` or your servers IP-Address:8000. 
     Use the login credentials you have created with the previous step.
 

From 2efb99192a67fb28269ec513ef1f2f3acddb511c Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Mon, 1 Feb 2021 21:45:45 +0100
Subject: [PATCH 1064/1300] add pull to docker setup

---
 docs/setup.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index a86c4ce27..5c3c9c361 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -179,8 +179,8 @@ Install Paperless from Docker Hub
         with the default configuration. You will need to use ``PAPERLESS_CONSUMER_POLLING``,
         which will disable inotify. See :ref:`here <configuration-polling>`.
 
-6.  Run ``docker-compose up -d``. This will pull the image, create and start the necessary
-    containers.
+6.  Run ``docker-compose pull``, followed by ``docker-compose up -d``.
+    This will pull the image, create and start the necessary containers.
 
 7.  To be able to login, you will need a super user. To create it, execute the
     following command:

From 2a629b81ce0b7e29805a9d540c7b43ea27e62e55 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 12:56:26 +0100
Subject: [PATCH 1065/1300] updates messages

---
 src-ui/messages.xlf                           | 21 ++++++++++---------
 .../upload-file-widget.component.html         |  2 +-
 .../upload-file-widget.component.ts           |  2 +-
 .../manage/settings/settings.component.html   |  8 +++----
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index ff928863d..17c585c28 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -688,8 +688,8 @@
           <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="69c5a98f8aa92e4db060f10dcd37781c8f40a48f" datatype="html">
-        <source>Consumer status</source>
+      <trans-unit id="8680abbea249ebe9c2fe35556559c8e1a9eb5841" datatype="html">
+        <source>Document processing</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">106</context>
@@ -702,15 +702,15 @@
           <context context-type="linenumber">109</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="f2361d3f65b6c77ef0a15fad8af8e858b043ace3" datatype="html">
-        <source>Show notifications when document consumption completes successfully</source>
+      <trans-unit id="e775f4f7c40249d31426ae61a21616a0c9d8e84f" datatype="html">
+        <source>Show notifications when document processing completes successfully</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">110</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2bcbcbe99e207803e21183580b98d90410dd8718" datatype="html">
-        <source>Show notifications when document consumption fails</source>
+      <trans-unit id="e3844dd174d8e817ddb551fae28f14ae80ca36b6" datatype="html">
+        <source>Show notifications when document processing fails</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">111</context>
@@ -723,8 +723,8 @@
           <context context-type="linenumber">112</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="59fe5c9233a2aaab3079a2300e4dfa439ddb1890" datatype="html">
-        <source>This will suppress all consumer related status messages on the dashboard.</source>
+      <trans-unit id="e27bd3804d2936a6897e81c2e52e294490e5e5a8" datatype="html">
+        <source>This will suppress all messages about document processing status on the dashboard.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">112</context>
@@ -1456,8 +1456,8 @@
           <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="3994065460580948013" datatype="html">
-        <source>Waiting for consumer...</source>
+      <trans-unit id="7446520539098045935" datatype="html">
+        <source>Upload complete, waiting...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
           <context context-type="linenumber">126</context>
@@ -1490,6 +1490,7 @@
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
+        <note priority="1" from="description">This button dismisses all status messages about processed documents on the dashboard (failed and successful)</note>
       </trans-unit>
       <trans-unit id="1fc4e0a1e93fdda0ed3c9e590971d283afb68265" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{getStatusHidden().length}}"/> more hidden</source>
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index 3e2908b84..252480147 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -1,7 +1,7 @@
 <app-widget-frame title="Upload new documents" i18n-title>
   <div header-buttons>
     <a *ngIf="getStatusCompleted().length > 0" (click)="dismissAll()" [routerLink]="" >
-      <span i18n>Dismiss completed</span>&nbsp;
+      <span i18n="This button dismisses all status messages about processed documents on the dashboard (failed and successful)">Dismiss completed</span>&nbsp;
       <svg xmlns="http://www.w3.org/2000/svg" width="1rem" height="1rem" fill="currentColor" class="bi bi-check2-all" viewBox="0 0 16 16">
         <path d="M12.354 4.354a.5.5 0 0 0-.708-.708L5 10.293 1.854 7.146a.5.5 0 1 0-.708.708l3.5 3.5a.5.5 0 0 0 .708 0l7-7zm-4.208 7l-.896-.897.707-.707.543.543 6.646-6.647a.5.5 0 0 1 .708.708l-7 7a.5.5 0 0 1-.708 0z"/>
         <path d="M5.354 7.146l.896.897-.707.707-.897-.896a.5.5 0 1 1 .708-.708z"/>
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index 5ac68d42a..f604a3fc1 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -123,7 +123,7 @@ export class UploadFileWidgetComponent implements OnInit {
               status.message = $localize`Uploading...`
             } else if (event.type == HttpEventType.Response) {
               status.taskId = event.body["task_id"]
-              status.message = $localize`Waiting for consumer...`
+              status.message = $localize`Upload complete, waiting...`
             }
 
           }, error => {
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 910867ace..b95b56133 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -103,13 +103,13 @@
 
         <div class="form-row form-group">
           <div class="col-md-3 col-form-label">
-            <span i18n>Consumer status</span>
+            <span i18n>Document processing</span>
           </div>
           <div class="col">
             <app-input-check i18n-title title="Show notifications when new documents are detected" formControlName="notificationsConsumerNewDocument"></app-input-check>
-            <app-input-check i18n-title title="Show notifications when document consumption completes successfully" formControlName="notificationsConsumerSuccess"></app-input-check>
-            <app-input-check i18n-title title="Show notifications when document consumption fails" formControlName="notificationsConsumerFailed"></app-input-check>
-            <app-input-check i18n-title title="Suppress notifications on dashboard" formControlName="notificationsConsumerSuppressOnDashboard" i18n-hint hint="This will suppress all consumer related status messages on the dashboard."></app-input-check>
+            <app-input-check i18n-title title="Show notifications when document processing completes successfully" formControlName="notificationsConsumerSuccess"></app-input-check>
+            <app-input-check i18n-title title="Show notifications when document processing fails" formControlName="notificationsConsumerFailed"></app-input-check>
+            <app-input-check i18n-title title="Suppress notifications on dashboard" formControlName="notificationsConsumerSuppressOnDashboard" i18n-hint hint="This will suppress all messages about document processing status on the dashboard."></app-input-check>
           </div>
         </div>
 

From 211a88129eeb983526db2b0758b4af99d0ba8157 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 12:58:23 +0100
Subject: [PATCH 1066/1300] removed dead files

---
 src-ui/src/app/components/login/login.component.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src-ui/src/app/components/login/login.component.ts

diff --git a/src-ui/src/app/components/login/login.component.ts b/src-ui/src/app/components/login/login.component.ts
deleted file mode 100644
index e69de29bb..000000000

From 55c50e3ac234b9967c7e64d11f5778ec09b4aacd Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 13:10:51 +0100
Subject: [PATCH 1067/1300] more message changes

---
 src-ui/messages.xlf                                 | 13 +++++++++----
 .../upload-file-widget.component.html               |  8 ++++++--
 src-ui/src/app/services/consumer-status.service.ts  |  8 ++++----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 17c585c28..d07659793 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -1492,18 +1492,19 @@
         </context-group>
         <note priority="1" from="description">This button dismisses all status messages about processed documents on the dashboard (failed and successful)</note>
       </trans-unit>
-      <trans-unit id="1fc4e0a1e93fdda0ed3c9e590971d283afb68265" datatype="html">
-        <source><x id="INTERPOLATION" equiv-text="{{getStatusHidden().length}}"/> more hidden</source>
+      <trans-unit id="90917e1a0a7bb59e9d11bdde9183e9391963e17b" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {One more document} other {<x id="INTERPOLATION"/> more documents}}</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">25</context>
         </context-group>
+        <note priority="1" from="description">This is shown as a summary line when there are more than 5 document in the processing pipeline.</note>
       </trans-unit>
       <trans-unit id="710254a196a2649674438edf8a15b7ab1f48271b" datatype="html">
         <source>Open document</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit>
       <trans-unit id="45854ddec74086b271e62be6a363f4fa5036f7fc" datatype="html">
@@ -1645,6 +1646,7 @@
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
           <context context-type="linenumber">16</context>
         </context-group>
+        <note priority="1" from="description">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
       <trans-unit id="7742915911032564889" datatype="html">
         <source>Error while executing pre-consume script.</source>
@@ -1652,6 +1654,7 @@
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
           <context context-type="linenumber">17</context>
         </context-group>
+        <note priority="1" from="description">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
       <trans-unit id="8995193730018060346" datatype="html">
         <source>Post-consume script does not exist.</source>
@@ -1659,6 +1662,7 @@
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
           <context context-type="linenumber">18</context>
         </context-group>
+        <note priority="1" from="description">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
       <trans-unit id="256773668518189604" datatype="html">
         <source>Error while executing post-consume script.</source>
@@ -1666,6 +1670,7 @@
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
           <context context-type="linenumber">19</context>
         </context-group>
+        <note priority="1" from="description">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
       <trans-unit id="6252258095055634191" datatype="html">
         <source>Received new file.</source>
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index 252480147..cabeb0643 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -20,8 +20,12 @@
     <div *ngFor="let status of getStatus()">
       <ng-container [ngTemplateOutlet]="consumerAlert" [ngTemplateOutletContext]="{ $implicit: status }"></ng-container>
     </div>
-    <div *ngIf="getStatusHidden().length" class="alerts-hidden">
-      <p *ngIf="!alertsExpanded" class="mt-3 mb-0 text-center"><span i18n>{{getStatusHidden().length}} more hidden</span> <button class="btn btn-sm btn-link py-0" (click)="alertsExpanded = !alertsExpanded" aria-controls="hiddenAlerts" [attr.aria-expanded]="alertsExpanded" i18n>Show all</button></p>
+    <div *ngIf="!getStatusHidden().length" class="alerts-hidden">
+      <p *ngIf="!alertsExpanded" class="mt-3 mb-0 text-center">
+        <span i18n="This is shown as a summary line when there are more than 5 document in the processing pipeline.">{getStatusHidden().length, plural, =1 {One more document} other {{{getStatusHidden().length}} more documents}}</span>
+        &nbsp;&bull;&nbsp;
+        <a [routerLink]="" (click)="alertsExpanded = !alertsExpanded" aria-controls="hiddenAlerts" [attr.aria-expanded]="alertsExpanded" i18n>Show all</a>
+      </p>
       <div #hiddenAlerts="ngbCollapse" [(ngbCollapse)]="!alertsExpanded">
         <div *ngFor="let status of getStatusHidden()">
           <ng-container [ngTemplateOutlet]="consumerAlert" [ngTemplateOutletContext]="{ $implicit: status }"></ng-container>
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index 026c3c64f..9c7d0417a 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -13,10 +13,10 @@ export enum FileStatusPhase {
 export const FILE_STATUS_MESSAGES = {
   "document_already_exists": $localize`Document already exists.`,
   "file_not_found": $localize`File not found.`,
-  "pre_consume_script_not_found": $localize`Pre-consume script does not exist.`,
-  "pre_consume_script_error": $localize`Error while executing pre-consume script.`,
-  "post_consume_script_not_found": $localize`Post-consume script does not exist.`,
-  "post_consume_script_error": $localize`Error while executing post-consume script.`,
+  "pre_consume_script_not_found": $localize`:Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation:Pre-consume script does not exist.`,
+  "pre_consume_script_error": $localize`:Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation:Error while executing pre-consume script.`,
+  "post_consume_script_not_found": $localize`:Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation:Post-consume script does not exist.`,
+  "post_consume_script_error": $localize`:Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation:Error while executing post-consume script.`,
   "new_file": $localize`Received new file.`,
   "unsupported_type": $localize`File type not supported.`,
   "parsing_document": $localize`Processing document...`,

From ffc82c17ba0dc356f65306ccd370b7397989e2c2 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 2 Feb 2021 12:17:25 +0000
Subject: [PATCH 1068/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 44 ++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index 54acbd23e..ce6fa0c1b 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -785,9 +785,9 @@
           <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="69c5a98f8aa92e4db060f10dcd37781c8f40a48f">
-        <source>Consumer status</source>
-        <target>Status Dokumentenverarbeitung</target>
+      <trans-unit datatype="html" id="8680abbea249ebe9c2fe35556559c8e1a9eb5841">
+        <source>Document processing</source>
+        <target>Dokumentverarbeitung</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">106</context>
@@ -801,17 +801,17 @@
           <context context-type="linenumber">109</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="f2361d3f65b6c77ef0a15fad8af8e858b043ace3">
-        <source>Show notifications when document consumption completes successfully</source>
-        <target>Zeige Benachrichtigungen wenn neue Dokumente erfolgreich hinzugefügt wurden.</target>
+      <trans-unit datatype="html" id="e775f4f7c40249d31426ae61a21616a0c9d8e84f">
+        <source>Show notifications when document processing completes successfully</source>
+        <target>Zeige Benachrichtigungen wenn neue Dokumente erfolgreich hinzugefügt wurden</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">110</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="2bcbcbe99e207803e21183580b98d90410dd8718">
-        <source>Show notifications when document consumption fails</source>
-        <target>Zeige Benachrichtigungen wenn Dokumente nicht hinzugefügt werden können</target>
+      <trans-unit datatype="html" id="e3844dd174d8e817ddb551fae28f14ae80ca36b6">
+        <source>Show notifications when document processing fails</source>
+        <target>Zeige Benachrichtigungen wenn Dokumente nicht hinzugefügt werden konnten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">111</context>
@@ -825,8 +825,8 @@
           <context context-type="linenumber">112</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="59fe5c9233a2aaab3079a2300e4dfa439ddb1890">
-        <source>This will suppress all consumer related status messages on the dashboard.</source>
+      <trans-unit datatype="html" id="e27bd3804d2936a6897e81c2e52e294490e5e5a8">
+        <source>This will suppress all messages about document processing status on the dashboard.</source>
         <target>Dadurch werden alle Benachrichtigungen über die Dokumentenverarbeitung auf der Startseite unterdrückt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
@@ -1662,9 +1662,9 @@
           <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="3994065460580948013">
-        <source>Waiting for consumer...</source>
-        <target>Warte auf Consumer...</target>
+      <trans-unit datatype="html" id="7446520539098045935">
+        <source>Upload complete, waiting...</source>
+        <target>Dateo hochgeladen, warte...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
           <context context-type="linenumber">126</context>
@@ -1701,21 +1701,23 @@
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
+        <note from="description" priority="1">This button dismisses all status messages about processed documents on the dashboard (failed and successful)</note>
       </trans-unit>
-      <trans-unit datatype="html" id="1fc4e0a1e93fdda0ed3c9e590971d283afb68265">
-        <source><x equiv-text="{{getStatusHidden().length}}" id="INTERPOLATION"/> more hidden</source>
-        <target><x equiv-text="{{getStatusHidden().length}}" id="INTERPOLATION"/> weitere versteckt</target>
+      <trans-unit datatype="html" id="90917e1a0a7bb59e9d11bdde9183e9391963e17b">
+        <source>{VAR_PLURAL, plural, =1 {One more document} other {<x id="INTERPOLATION"/> more documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Ein weiteres Dokument} other {<x id="INTERPOLATION"/> weitere Dokumente}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">25</context>
         </context-group>
+        <note from="description" priority="1">This is shown as a summary line when there are more than 5 document in the processing pipeline.</note>
       </trans-unit>
       <trans-unit datatype="html" id="710254a196a2649674438edf8a15b7ab1f48271b">
         <source>Open document</source>
         <target>Dokument öffnen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="45854ddec74086b271e62be6a363f4fa5036f7fc">
@@ -1877,6 +1879,7 @@
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
           <context context-type="linenumber">16</context>
         </context-group>
+        <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
       <trans-unit datatype="html" id="7742915911032564889">
         <source>Error while executing pre-consume script.</source>
@@ -1885,6 +1888,7 @@
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
           <context context-type="linenumber">17</context>
         </context-group>
+        <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
       <trans-unit datatype="html" id="8995193730018060346">
         <source>Post-consume script does not exist.</source>
@@ -1893,6 +1897,7 @@
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
           <context context-type="linenumber">18</context>
         </context-group>
+        <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
       <trans-unit datatype="html" id="256773668518189604">
         <source>Error while executing post-consume script.</source>
@@ -1901,6 +1906,7 @@
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
           <context context-type="linenumber">19</context>
         </context-group>
+        <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
       <trans-unit datatype="html" id="6252258095055634191">
         <source>Received new file.</source>

From 5f44ab5abc127fdca539f0de72670b042c0a5e93 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 13:27:08 +0100
Subject: [PATCH 1069/1300] CI: ignore translation branches

---
 .github/workflows/ansible.yml | 8 +++++++-
 .github/workflows/ci.yml      | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index a27ce103c..fe5789e2c 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -1,7 +1,13 @@
 ---
 name: Ansible Role
 
-on: [push, pull_request]
+on:
+  push:
+    branches-ignore:
+      - 'translations_**'
+  pull_request:
+    branches-ignore:
+      - 'translations_**'
 
 jobs:
   # https://molecule.readthedocs.io/en/latest/ci.html#github-actions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1e9640d4..423028275 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,12 @@
 name: ci
 
-on: [push, pull_request]
+on:
+  push:
+    branches-ignore:
+      - 'translations_**'
+  pull_request:
+    branches-ignore:
+      - 'translations_**'
 
 jobs:
   documentation:

From 9ebe16d8232a0c8cc7557ef371e9530d682fc41f Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 2 Feb 2021 12:30:13 +0000
Subject: [PATCH 1070/1300] Translate /src-ui/messages.xlf in de

translated for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index ce6fa0c1b..fab64cb44 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -1664,7 +1664,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7446520539098045935">
         <source>Upload complete, waiting...</source>
-        <target>Dateo hochgeladen, warte...</target>
+        <target>Datei hochgeladen, warte...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
           <context context-type="linenumber">126</context>
@@ -2038,7 +2038,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="2056433880533904076">
         <source>Light blue</source>
-        <target>Hellblau</target>
+        <target>Blau, hell</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
           <context context-type="linenumber">6</context>
@@ -2054,7 +2054,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="1143414876575720034">
         <source>Light green</source>
-        <target>Hellgrün</target>
+        <target>Grün, hell</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
           <context context-type="linenumber">8</context>
@@ -2070,7 +2070,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="3250646524116252719">
         <source>Light red</source>
-        <target>Hellrot</target>
+        <target>Rot, hell</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
           <context context-type="linenumber">10</context>
@@ -2086,7 +2086,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="5479028842846122610">
         <source>Light orange</source>
-        <target>Hellorange</target>
+        <target>Orange, hell</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
           <context context-type="linenumber">12</context>
@@ -2102,7 +2102,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="1789283185177957430">
         <source>Light violet</source>
-        <target>Hellviolet</target>
+        <target>Violet, hell</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
           <context context-type="linenumber">14</context>
@@ -2134,7 +2134,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="461048771215121187">
         <source>Light grey</source>
-        <target>Hellgrau</target>
+        <target>Grau, hell</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
           <context context-type="linenumber">18</context>

From e70af0032183376b40c3336d225b3429d964a296 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 2 Feb 2021 12:34:03 +0000
Subject: [PATCH 1071/1300] Translate /src-ui/messages.xlf in fr

translation completed for the source file '/src-ui/messages.xlf'
on the 'fr' language.
---
 src-ui/src/locale/messages.fr.xlf | 336 ++++++++++++++++++++++++++----
 1 file changed, 295 insertions(+), 41 deletions(-)

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
index 62dbad342..b3c84f14c 100644
--- a/src-ui/src/locale/messages.fr.xlf
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -1,12 +1,60 @@
 <?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
   <file datatype="plaintext" original="ng2.template" source-language="en-US" target-language="fr">
     <body>
+      <trans-unit datatype="html" id="9103526311244275943">
+        <source>Document added</source>
+        <target>Document ajouté</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9204248378636247318">
+        <source>Document <x equiv-text="status.filename" id="PH"/> was added to paperless.</source>
+        <target>Le document <x equiv-text="status.filename" id="PH"/> a été ajouté à Paperless-ng.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1931214133925051574">
+        <source>Open document</source>
+        <target>Ouvrir le document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8582620835547864448">
+        <source>Could not add <x equiv-text="status.filename" id="PH"/>: <x equiv-text="status.message" id="PH_1"/></source>
+        <target>Impossible d'ajouter <x equiv-text="status.filename" id="PH"/> : <x equiv-text="status.message" id="PH_1"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1710712016675379662">
+        <source>New document detected</source>
+        <target>Nouveau document détecté</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="587031278561344416">
+        <source>Document <x equiv-text="status.filename" id="PH"/> is being processed by paperless.</source>
+        <target>Le document <x equiv-text="status.filename" id="PH"/> est en cours de traitement par Paperless-ng.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="4733307402565258070">
         <source>Documents</source>
         <target>Documents</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">43</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
@@ -14,7 +62,7 @@
         <target>Vue &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; enregistrée avec succès.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">109</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
@@ -22,7 +70,7 @@
         <target>Vue &quot;<x equiv-text="savedView.name" id="PH"/>&quot; créée avec succès.</target>
         <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">130</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
@@ -550,7 +598,7 @@
         <target>Vue &quot;<x equiv-text="savedView.name" id="PH"/>&quot; supprimée.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5647210819299459618">
@@ -558,7 +606,7 @@
         <target>Paramètres enregistrés avec succès.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6839066544204061364">
@@ -566,7 +614,7 @@
         <target>Utiliser la langue du système</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7729897675462249787">
@@ -574,7 +622,7 @@
         <target>Utiliser le format de date de la langue d'affichage</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -582,7 +630,7 @@
         <target>Une erreur s'est produite lors de l'enregistrement des paramètres sur le serveur : <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -606,7 +654,7 @@
         <target>Vues enregistrées</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">128</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
@@ -729,12 +777,68 @@
           <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab">
+        <source>Notifications</source>
+        <target>Notifications</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">102</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8680abbea249ebe9c2fe35556559c8e1a9eb5841">
+        <source>Document processing</source>
+        <target>Traitement de document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0">
+        <source>Show notifications when new documents are detected</source>
+        <target>Afficher des notifications lorsque de nouveaux documents sont détectés</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">109</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e775f4f7c40249d31426ae61a21616a0c9d8e84f">
+        <source>Show notifications when document processing completes successfully</source>
+        <target>Afficher des notifications lorsque le traitement des documents se termine avec succès</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">110</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e3844dd174d8e817ddb551fae28f14ae80ca36b6">
+        <source>Show notifications when document processing fails</source>
+        <target>Afficher des notifications en cas d'échec du traitement des documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af113f7c9f7e13145c3461f61a1aedf12d57bd71">
+        <source>Suppress notifications on dashboard</source>
+        <target>Supprimer les notifications du tableau de bord</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e27bd3804d2936a6897e81c2e52e294490e5e5a8">
+        <source>This will suppress all messages about document processing status on the dashboard.</source>
+        <target>Cela supprimera tous les messages liés au traitement de documents sur le tableau de bord.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
         <source>Bulk editing</source>
         <target>Edition en masse</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">102</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
@@ -742,7 +846,7 @@
         <target>Afficher les messages de confirmation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
@@ -750,7 +854,7 @@
         <target>La suppression de documents requiert toujours une confirmation.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
@@ -758,7 +862,7 @@
         <target>Appliquer lors de la fermeture</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">121</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -766,7 +870,7 @@
         <target>Apparaît sur</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -774,7 +878,7 @@
         <target>Montrer sur le tableau de bord</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">129</context>
+          <context context-type="linenumber">143</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -782,7 +886,7 @@
         <target>Montrer dans la barre latérale</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">133</context>
+          <context context-type="linenumber">147</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -790,7 +894,7 @@
         <target>Aucune vue sauvegardée n'est définie.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">143</context>
+          <context context-type="linenumber">157</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -1518,28 +1622,52 @@
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="8705589528094706681">
-        <source>The document has been uploaded and will be processed by the consumer shortly.</source>
-        <target>Le document a été transmis et sera traité sous peu.</target>
+      <trans-unit datatype="html" id="6443586946875325554">
+        <source>Processing: <x equiv-text="countUploadingAndProcessing" id="PH"/></source>
+        <target>Traitement : <x equiv-text="countUploadingAndProcessing" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">32</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="4956689020592747108">
-        <source>There was an error while uploading the document: <x equiv-text="error.error.document" id="PH"/></source>
-        <target>Une erreur s'est produite lors du téléchargement du document : <x equiv-text="error.error.document" id="PH"/></target>
+      <trans-unit datatype="html" id="9182918211699394982">
+        <source>Failed: <x equiv-text="countFailed" id="PH"/></source>
+        <target>Échec : <x equiv-text="countFailed" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="7554858521017940575">
-        <source>An error has occurred while uploading the document. Sorry!</source>
-        <target>Une erreur s'est produite lors du téléchargement du document. Désolé !</target>
+      <trans-unit datatype="html" id="534116346205124059">
+        <source>Added: <x equiv-text="countSuccess" id="PH"/></source>
+        <target>Ajout : <x equiv-text="countSuccess" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3852289441366561594">
+        <source>Connecting...</source>
+        <target>Connexion...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1245343823699368872">
+        <source>Uploading...</source>
+        <target>Téléchargement...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7446520539098045935">
+        <source>Upload complete, waiting...</source>
+        <target>Chargement terminé, en attente...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
@@ -1555,7 +1683,7 @@
         <target>Déposer des documents ici ou</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="865c511f4a24558ed0e954f9bbbff557bbb8954d">
@@ -1563,15 +1691,33 @@
         <target>Parcourir les fichiers</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="33c76d75ce25ce3b05ab22877f1b6b09dcf603ae">
-        <source>{VAR_PLURAL, plural, =1 {Uploading file...} =other {Uploading <x id="INTERPOLATION"/> files...}}</source>
-        <target>{VAR_PLURAL, plural, =1 {Chargement du fichier...} =other {Chargement des <x id="INTERPOLATION"/> fichiers...}}</target>
+      <trans-unit datatype="html" id="bd4a8607e4a002d939cffb347ec056664dfb2c73">
+        <source>Dismiss completed</source>
+        <target>Masquer lorsque terminé</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+        <note from="description" priority="1">This button dismisses all status messages about processed documents on the dashboard (failed and successful)</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="90917e1a0a7bb59e9d11bdde9183e9391963e17b">
+        <source>{VAR_PLURAL, plural, =1 {One more document} other {<x id="INTERPOLATION"/> more documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Un document supplémentaire} other {<x id="INTERPOLATION"/> documents supplémentaires}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+        <note from="description" priority="1">This is shown as a summary line when there are more than 5 document in the processing pipeline.</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="710254a196a2649674438edf8a15b7ab1f48271b">
+        <source>Open document</source>
+        <target>Ouvrir le document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="45854ddec74086b271e62be6a363f4fa5036f7fc">
@@ -1683,7 +1829,7 @@
         <target>Anglais (US)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
@@ -1691,7 +1837,7 @@
         <target>Allemand</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1699,7 +1845,7 @@
         <target>Néerlandais</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1707,7 +1853,115 @@
         <target>Français</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2119857572761283468">
+        <source>Document already exists.</source>
+        <target>Le document existe déjà.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="148389968432135849">
+        <source>File not found.</source>
+        <target>Fichier non trouvé.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1520671543092565667">
+        <source>Pre-consume script does not exist.</source>
+        <target>Le script de pré-traitement n'existe pas.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+        <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="7742915911032564889">
+        <source>Error while executing pre-consume script.</source>
+        <target>Erreur lors de l'exécution du script de pré-traitement.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+        <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="8995193730018060346">
+        <source>Post-consume script does not exist.</source>
+        <target>Le script de post-traitement n'existe pas.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+        <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="256773668518189604">
+        <source>Error while executing post-consume script.</source>
+        <target>Erreur lors de l'exécution du script de post-traitement.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+        <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="6252258095055634191">
+        <source>Received new file.</source>
+        <target>Réception d'un nouveau fichier.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7337565919209746135">
+        <source>File type not supported.</source>
+        <target>Type de fichier non pris en charge.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5002399167376099234">
+        <source>Processing document...</source>
+        <target>Traitement du document...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1085975194762600381">
+        <source>Generating thumbnail...</source>
+        <target>Génération de vignette...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3280851677698431426">
+        <source>Retrieving date from document...</source>
+        <target>Extraction de la date du document...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7162102384876037296">
+        <source>Saving document...</source>
+        <target>Enregistrement du document...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4550450765009165976">
+        <source>Finished.</source>
+        <target>Terminé.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1519954996184640001">
@@ -1715,7 +1969,7 @@
         <target>Erreur</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/toast.service.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5037437391296624618">
@@ -1723,7 +1977,7 @@
         <target>Information</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/toast.service.ts</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7517688192215738656">

From 060dcd71cd8f27cca2c10284792eed0088265af9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 14:06:16 +0100
Subject: [PATCH 1072/1300] messages, reorganized settings

---
 src-ui/messages.xlf                           | 141 +++++++++---------
 .../manage/settings/settings.component.html   |  33 ++--
 2 files changed, 93 insertions(+), 81 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index d07659793..86198ca7f 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -569,11 +569,18 @@
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab" datatype="html">
+        <source>Notifications</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="99dee94e92dbd9e21a008d4569f9719ed206ae37" datatype="html">
         <source>Saved views</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">128</context>
+          <context context-type="linenumber">133</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13" datatype="html">
@@ -681,109 +688,102 @@
           <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab" datatype="html">
-        <source>Notifications</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">102</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="8680abbea249ebe9c2fe35556559c8e1a9eb5841" datatype="html">
-        <source>Document processing</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">106</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0" datatype="html">
-        <source>Show notifications when new documents are detected</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">109</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="e775f4f7c40249d31426ae61a21616a0c9d8e84f" datatype="html">
-        <source>Show notifications when document processing completes successfully</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">110</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="e3844dd174d8e817ddb551fae28f14ae80ca36b6" datatype="html">
-        <source>Show notifications when document processing fails</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">111</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="af113f7c9f7e13145c3461f61a1aedf12d57bd71" datatype="html">
-        <source>Suppress notifications on dashboard</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">112</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="e27bd3804d2936a6897e81c2e52e294490e5e5a8" datatype="html">
-        <source>This will suppress all messages about document processing status on the dashboard.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">112</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="3863a86cd9e69a61d143d3daf51df44203df4a82" datatype="html">
         <source>Bulk editing</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586" datatype="html">
         <source>Show confirmation dialogs</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a" datatype="html">
         <source>Deleting documents will always ask for confirmation.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8cfddc13e04f5545ac63f419ef363505d6f78c2e" datatype="html">
         <source>Apply on close</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">121</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8680abbea249ebe9c2fe35556559c8e1a9eb5841" datatype="html">
+        <source>Document processing</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0" datatype="html">
+        <source>Show notifications when new documents are detected</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">122</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e775f4f7c40249d31426ae61a21616a0c9d8e84f" datatype="html">
+        <source>Show notifications when document processing completes successfully</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e3844dd174d8e817ddb551fae28f14ae80ca36b6" datatype="html">
+        <source>Show notifications when document processing fails</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">124</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="af113f7c9f7e13145c3461f61a1aedf12d57bd71" datatype="html">
+        <source>Suppress notifications on dashboard</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e27bd3804d2936a6897e81c2e52e294490e5e5a8" datatype="html">
+        <source>This will suppress all messages about document processing status on the dashboard.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8cb90334f5dfd7fc67205085f59381e2a334ccfc" datatype="html">
         <source>Appears on</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">140</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5" datatype="html">
         <source>Show on dashboard</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">143</context>
+          <context context-type="linenumber">148</context>
         </context-group>
       </trans-unit>
       <trans-unit id="541bfc5b123b3f8867fd681eaceefb663a811973" datatype="html">
         <source>Show in sidebar</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">147</context>
+          <context context-type="linenumber">152</context>
         </context-group>
       </trans-unit>
       <trans-unit id="abba764a7a595d04dc8c3b26e04b3780d4fdb540" datatype="html">
         <source>No saved views defined.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ef60a738a565f498b858e903e42bc5ffc3cc1299" datatype="html">
@@ -980,35 +980,42 @@
         <source>Manage</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">112</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit id="408cb6073e60c5d966296a3207fc596adca75e01" datatype="html">
         <source>Admin</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">154</context>
+          <context context-type="linenumber">149</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="46aa32e581922d6d2c3d7bc4c87209ad5808b029" datatype="html">
-        <source>Misc</source>
+      <trans-unit id="321e4419a943044e674beb55b8039f42a9761ca5" datatype="html">
+        <source>Info</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">155</context>
         </context-group>
       </trans-unit>
       <trans-unit id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7" datatype="html">
         <source>Documentation</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">167</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit id="355a222236bc01b9a8cd3cb9ecf76891125aed69" datatype="html">
         <source>GitHub</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">174</context>
+          <context context-type="linenumber">170</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ea3a452c5238897cabc5781308cceb2d37dcf258" datatype="html">
+        <source>Suggest an idea</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">176</context>
         </context-group>
       </trans-unit>
       <trans-unit id="af665f8de8fabe306aaf27443957e69bcbbce63c" datatype="html">
@@ -1022,14 +1029,14 @@
         <source>Open documents</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="dca5bf9344a759fa5a07f1b21f50286ec242ba44" datatype="html">
         <source>Close all</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">101</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5195932016807797291" datatype="html">
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index b95b56133..affe2f0b0 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -99,20 +99,6 @@
           </div>
         </div>
 
-        <h4 class="mt-4" i18n>Notifications</h4>
-
-        <div class="form-row form-group">
-          <div class="col-md-3 col-form-label">
-            <span i18n>Document processing</span>
-          </div>
-          <div class="col">
-            <app-input-check i18n-title title="Show notifications when new documents are detected" formControlName="notificationsConsumerNewDocument"></app-input-check>
-            <app-input-check i18n-title title="Show notifications when document processing completes successfully" formControlName="notificationsConsumerSuccess"></app-input-check>
-            <app-input-check i18n-title title="Show notifications when document processing fails" formControlName="notificationsConsumerFailed"></app-input-check>
-            <app-input-check i18n-title title="Suppress notifications on dashboard" formControlName="notificationsConsumerSuppressOnDashboard" i18n-hint hint="This will suppress all messages about document processing status on the dashboard."></app-input-check>
-          </div>
-        </div>
-
         <h4 class="mt-4" i18n>Bulk editing</h4>
 
         <div class="form-row form-group">
@@ -124,7 +110,26 @@
 
       </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">
+          <div class="offset-md-3 col">
+            <app-input-check i18n-title title="Show notifications when new documents are detected" formControlName="notificationsConsumerNewDocument"></app-input-check>
+            <app-input-check i18n-title title="Show notifications when document processing completes successfully" formControlName="notificationsConsumerSuccess"></app-input-check>
+            <app-input-check i18n-title title="Show notifications when document processing fails" formControlName="notificationsConsumerFailed"></app-input-check>
+            <app-input-check i18n-title title="Suppress notifications on dashboard" formControlName="notificationsConsumerSuppressOnDashboard" i18n-hint hint="This will suppress all messages about document processing status on the dashboard."></app-input-check>
+          </div>
+        </div>
+
+      </ng-template>
+    </li>
+
+    <li [ngbNavItem]="3">
       <a ngbNavLink i18n>Saved views</a>
       <ng-template ngbNavContent>
 

From 8efba4c57fda1ffa3f57642352efe76d69b04807 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 2 Feb 2021 13:07:05 +0000
Subject: [PATCH 1073/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 158 ++++++++++++++++--------------
 1 file changed, 83 insertions(+), 75 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index fab64cb44..44fa03f5c 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -649,12 +649,20 @@
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab">
+        <source>Notifications</source>
+        <target>Benachrichtigungen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="99dee94e92dbd9e21a008d4569f9719ed206ae37">
         <source>Saved views</source>
         <target>Gespeicherte Ansichten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">128</context>
+          <context context-type="linenumber">133</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
@@ -777,68 +785,12 @@
           <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab">
-        <source>Notifications</source>
-        <target>Benachrichtigungen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">102</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8680abbea249ebe9c2fe35556559c8e1a9eb5841">
-        <source>Document processing</source>
-        <target>Dokumentverarbeitung</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">106</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0">
-        <source>Show notifications when new documents are detected</source>
-        <target>Zeige Benachrichtigungen wenn neue Dokumente erkannt werden</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">109</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="e775f4f7c40249d31426ae61a21616a0c9d8e84f">
-        <source>Show notifications when document processing completes successfully</source>
-        <target>Zeige Benachrichtigungen wenn neue Dokumente erfolgreich hinzugefügt wurden</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">110</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="e3844dd174d8e817ddb551fae28f14ae80ca36b6">
-        <source>Show notifications when document processing fails</source>
-        <target>Zeige Benachrichtigungen wenn Dokumente nicht hinzugefügt werden konnten</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">111</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="af113f7c9f7e13145c3461f61a1aedf12d57bd71">
-        <source>Suppress notifications on dashboard</source>
-        <target>Unterdrücke Benachrichtigungen auf der Startseite.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">112</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="e27bd3804d2936a6897e81c2e52e294490e5e5a8">
-        <source>This will suppress all messages about document processing status on the dashboard.</source>
-        <target>Dadurch werden alle Benachrichtigungen über die Dokumentenverarbeitung auf der Startseite unterdrückt.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">112</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
         <source>Bulk editing</source>
         <target>Massenbearbeitung</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
@@ -846,7 +798,7 @@
         <target>Bestätigungsdialoge anzeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
@@ -854,7 +806,7 @@
         <target>Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
@@ -862,7 +814,55 @@
         <target>Anwenden beim Schließen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">121</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8680abbea249ebe9c2fe35556559c8e1a9eb5841">
+        <source>Document processing</source>
+        <target>Dokumentverarbeitung</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0">
+        <source>Show notifications when new documents are detected</source>
+        <target>Zeige Benachrichtigungen wenn neue Dokumente erkannt werden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">122</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e775f4f7c40249d31426ae61a21616a0c9d8e84f">
+        <source>Show notifications when document processing completes successfully</source>
+        <target>Zeige Benachrichtigungen wenn neue Dokumente erfolgreich hinzugefügt wurden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e3844dd174d8e817ddb551fae28f14ae80ca36b6">
+        <source>Show notifications when document processing fails</source>
+        <target>Zeige Benachrichtigungen wenn Dokumente nicht hinzugefügt werden konnten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">124</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af113f7c9f7e13145c3461f61a1aedf12d57bd71">
+        <source>Suppress notifications on dashboard</source>
+        <target>Unterdrücke Benachrichtigungen auf der Startseite.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e27bd3804d2936a6897e81c2e52e294490e5e5a8">
+        <source>This will suppress all messages about document processing status on the dashboard.</source>
+        <target>Dadurch werden alle Benachrichtigungen über die Dokumentenverarbeitung auf der Startseite unterdrückt.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -870,7 +870,7 @@
         <target>Erscheint auf</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">140</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -878,7 +878,7 @@
         <target>Auf Startseite zeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">143</context>
+          <context context-type="linenumber">148</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -886,7 +886,7 @@
         <target>In Seitenleiste zeigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">147</context>
+          <context context-type="linenumber">152</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -894,7 +894,7 @@
         <target>Keine gespeicherten Ansichten vorhanden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -1119,7 +1119,7 @@
         <target>Verwalten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">112</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="408cb6073e60c5d966296a3207fc596adca75e01">
@@ -1127,15 +1127,15 @@
         <target>Administration</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">154</context>
+          <context context-type="linenumber">149</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
-        <source>Misc</source>
-        <target>Weiteres</target>
+      <trans-unit datatype="html" id="321e4419a943044e674beb55b8039f42a9761ca5">
+        <source>Info</source>
+        <target>Info</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">155</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
@@ -1143,7 +1143,7 @@
         <target>Dokumentation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">167</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
@@ -1151,7 +1151,15 @@
         <target>GitHub</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">174</context>
+          <context context-type="linenumber">170</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ea3a452c5238897cabc5781308cceb2d37dcf258">
+        <source>Suggest an idea</source>
+        <target>Eine Idee vorschlagen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">176</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
@@ -1167,7 +1175,7 @@
         <target>Geöffnete Dokumente</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="dca5bf9344a759fa5a07f1b21f50286ec242ba44">
@@ -1175,7 +1183,7 @@
         <target>Alle schließen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">101</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5195932016807797291">

From 47ea60372f749ac387839e432e826e30681d4b05 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 14:07:43 +0100
Subject: [PATCH 1074/1300] disable CI for translation branches

---
 .github/workflows/ansible.yml | 4 ++--
 .github/workflows/ci.yml      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index fe5789e2c..05419d5e8 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -4,10 +4,10 @@ name: Ansible Role
 on:
   push:
     branches-ignore:
-      - 'translations_**'
+      - 'translations**'
   pull_request:
     branches-ignore:
-      - 'translations_**'
+      - 'translations**'
 
 jobs:
   # https://molecule.readthedocs.io/en/latest/ci.html#github-actions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 423028275..5eaca123a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,10 +3,10 @@ name: ci
 on:
   push:
     branches-ignore:
-      - 'translations_**'
+      - 'translations**'
   pull_request:
     branches-ignore:
-      - 'translations_**'
+      - 'translations**'
 
 jobs:
   documentation:

From 2624aec758dec262fcf36f2dfacc15b0a5388e3c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 14:51:54 +0100
Subject: [PATCH 1075/1300] changelog

---
 docs/changelog.rst | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 28bcc00e6..1da8621bb 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,57 @@
 Changelog
 *********
 
+paperless-ng 1.1.0
+##################
+
+* Document processing status
+
+  * Paperless now shows the status of processing documents on the dashboard in real time.
+  * Status notifications when
+
+    * New documents are detected in the consumption folder, in mails, uploaded on the front end,
+      or added with one of the mobile apps.
+    * Documents are successfully added to paperless.
+    * Document consumption failed (with error messages)
+  
+  * Configuration options to enable/disable individual notifications.
+
+* Live updates to document lists and saved views when new documents are added.
+
+  .. hint::
+
+    For status notifications and live updates to work, paperless now requires an `ASGI <https://asgi.readthedocs.io/en/latest/>`_-enabled
+    web server. The docker images uses ``gunicorn`` and an ASGI-enabled worker called `uvicorn <http://www.uvicorn.org/>`_,
+    and there is no need to configure anything.
+
+    For bare metal installations, changes are required for the notifications to work. Adapt the service ``paperless-webserver.service``
+    to use the supplied ``gunicorn.conf.py`` configuration file and adapt the reference to the ASGI application as follows:
+
+    .. code::
+
+      ExecStart=/opt/paperless/.local/bin/gunicorn -c /opt/paperless/gunicorn.conf.py paperless.asgi:application
+
+    Paperless will continue to work with WSGI, but you will not get any status notifications.
+
+* Paperless now offers suggestions for tags, correspondents and types on the document detail page.
+
+* Added an interactive easy install script that automatically downloads, configures and starts paperless with docker.
+
+* Official support for Python 3.9.
+
+* Other changes and fixes
+
+  * Adjusted the default parallelization settings to run more than one task in parallel on systems with 4 or less cores.
+    This addresses issues with paperless not consuming any new files when other tasks are running.
+
+  * Fixed a rare race condition that would cause paperless to process incompletely written files when using the upload on the dashboard.
+
+  * The document classifier no longer issues warnings and errors when auto matching is not used at all.
+
+  * Better icon for document previews.
+
+  * Better info section in the side bar.
+
 paperless-ng 1.0.0
 ##################
 

From b2a744e8803e0e279861a9ec0eac65ce9b37c09a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 15:11:29 +0100
Subject: [PATCH 1076/1300] version bump

---
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index fbd65d573..e8e801a83 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,5 +2,5 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "1.0.0"
+  version: "1.1.0"
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 8dcd08521..37a1329f2 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (1, 0, 0)
+__version__ = (1, 1, 0)

From 08d96a1b767d19644ef6d88c9934b46ec93f0c10 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 16:22:36 +0100
Subject: [PATCH 1077/1300] configure websocket endpoint for production

---
 src-ui/src/app/services/consumer-status.service.ts | 14 ++++++++------
 src-ui/src/environments/environment.prod.ts        |  4 +++-
 src-ui/src/environments/environment.ts             |  3 ++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index 9c7d0417a..38f29a528 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Subject } from 'rxjs';
+import { environment } from 'src/environments/environment';
 import { WebsocketConsumerStatusMessage } from '../data/websocket-consumer-status-message';
 
 export enum FileStatusPhase {
@@ -77,7 +78,7 @@ export class ConsumerStatusService {
 
   constructor() { }
 
-  private statusWebSocked: WebSocket
+  private statusWebSocket: WebSocket
 
   private consumerStatus: FileStatus[] = []
 
@@ -123,8 +124,9 @@ export class ConsumerStatusService {
 
   connect() {
     this.disconnect()
-    this.statusWebSocked = new WebSocket("ws://localhost:8000/ws/status/");
-    this.statusWebSocked.onmessage = (ev) => {
+
+    this.statusWebSocket = new WebSocket(`${environment.webSocketProtocol}//${environment.webSocketHost}/ws/status/`);
+    this.statusWebSocket.onmessage = (ev) => {
       let statusMessage: WebsocketConsumerStatusMessage = JSON.parse(ev['data'])
 
       let statusMessageGet = this.get(statusMessage.task_id, statusMessage.filename)
@@ -160,9 +162,9 @@ export class ConsumerStatusService {
   }
 
   disconnect() {
-    if (this.statusWebSocked) {
-      this.statusWebSocked.close()
-      this.statusWebSocked = null
+    if (this.statusWebSocket) {
+      this.statusWebSocket.close()
+      this.statusWebSocket = null
     }
   }
 
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index e8e801a83..4e38813b5 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,5 +2,7 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "1.1.0"
+  version: "1.1.0",
+  webSocketHost: window.location.host,
+  webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:")
 };
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts
index 29dcb7ba1..b2c40e261 100644
--- a/src-ui/src/environments/environment.ts
+++ b/src-ui/src/environments/environment.ts
@@ -7,7 +7,8 @@ export const environment = {
   apiBaseUrl: "http://localhost:8000/api/",
   appTitle: "Paperless-ng",
   version: "DEVELOPMENT",
-  wsBaseUrl: "ws://localhost:8000/ws/"
+  webSocketHost: "localhost:8000",
+  webSocketProtocol: "ws:"
 };
 
 /*

From c78d54e71e96386a3b6a28545925a60521ae27e3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 19:54:56 +0100
Subject: [PATCH 1078/1300] update the easy install script and documentation

---
 docs/setup.rst          | 19 ++++++++
 install-paperless-ng.sh | 96 +++++++++++++++++++++++++++++++++++------
 2 files changed, 103 insertions(+), 12 deletions(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index eda03550e..5e0e3e4a6 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -81,6 +81,7 @@ Installation
 
 You can go multiple routes to setup and run Paperless:
 
+* :ref:`Use the easy install docker script <setup-docker_script>`
 * :ref:`Pull the image from Docker Hub <setup-docker_hub>`
 * :ref:`Build the Docker image yourself <setup-docker_build>`
 * :ref:`Install Paperless directly on your system manually (bare metal) <setup-bare_metal>`
@@ -101,6 +102,24 @@ it includes the same sensible defaults, and it simultaneously provides the flexi
 .. _CLI Basics: https://sehn.tech/post/devops-with-docker/
 .. _idempotent: https://docs.ansible.com/ansible/latest/reference_appendices/glossary.html#Idempotency
 
+.. _setup-docker_script:
+
+Install Paperless from Docker Hub using the installation script
+===============================================================
+
+Paperless provides an interactive installation script. This script will ask you
+for a couple configuration options, download and create the necessary configuration files, pull the docker image, start paperless and create your user account. This script essentially
+performs all the steps described in :ref:`setup-docker_hub` automatically.
+
+1.  Make sure that docker and docker-compose are installed.
+2.  Download and run the installation script:
+
+    .. code:: shell-session
+
+        $ wget https://raw.githubusercontent.com/jonaswinkler/paperless-ng/master/install-paperless-ng.sh
+        $ chmod +x install-paperless-ng.sh
+        $ ./install-paperless-ng.sh
+
 .. _setup-docker_hub:
 
 Install Paperless from Docker Hub
diff --git a/install-paperless-ng.sh b/install-paperless-ng.sh
index ad992fe8c..8fb44e222 100755
--- a/install-paperless-ng.sh
+++ b/install-paperless-ng.sh
@@ -15,7 +15,7 @@ ask() {
 		fi
 		array=$3
 		if [[ -z $3 || " ${array[@]} " =~ " ${result} " ]]; then
-    	ask_result=$result
+			ask_result=$result
 			return
 		else
 			echo "Invalid option: $result"
@@ -23,6 +23,47 @@ ask() {
 	done
 }
 
+ask_docker_folder() {
+	while true ; do
+
+		read -p "$1 [$2]: " result
+
+		if [[ -z $result ]]; then
+			ask_result=$2
+			return
+		fi
+
+		if [[ $result == /* || $result == ./* ]]; then
+			ask_result=$result
+			return
+		else
+			echo "Invalid folder: $result"
+		fi
+
+
+	done
+}
+
+if [[ $(id -u) == "0" ]] ; then
+	echo "Do not run this script as root."
+	exit 1
+fi
+
+if [[ -z $(which wget) ]] ; then
+	echo "wget executable not found. Is wget installed?"
+	exit 1
+fi
+
+if [[ -z $(which docker) ]] ; then
+	echo "docker executable not found. Is docker installed?"
+	exit 1
+fi
+
+if [[ -z $(which docker-compose) ]] ; then
+	echo "docker-compose executable not found. Is docker-compose installed?"
+	exit 1
+fi
+
 echo ""
 echo "############################################"
 echo "###   Paperless-ng docker installation   ###"
@@ -48,14 +89,13 @@ echo "The consume folder is where paperles will search for new documents."
 echo "Point this to a folder where your scanner is able to put your scanned"
 echo "documents."
 echo ""
-echo "HINT: If paperless is unable to pick up any files from this directory after"
-echo "installation, you might need to configure PAPERLESS_CONSUMER_POLLING."
-echo "See the documentation for details."
-echo ""
-echo "CAUTION: You must specify an absolute path starting with /"
+echo "CAUTION: You must specify an absolute path starting with / or a relative "
+echo "path starting with ./ here. Examples:"
+echo "  /mnt/consume"
+echo "  ./consume"
 echo ""
 
-ask "Consume folder" "$TARGET_FOLDER/consume"
+ask_docker_folder "Consume folder" "$TARGET_FOLDER/consume"
 CONSUME_FOLDER=$ask_result
 
 echo ""
@@ -64,9 +104,10 @@ echo "Leave empty and docker will manage this folder for you."
 echo "Docker usually stores managed folders in /var/lib/docker/volumes."
 echo ""
 echo "CAUTION: If specified, you must specify an absolute path starting with /"
+echo "or a relative path starting with ./ here."
 echo ""
 
-ask "Media folder" ""
+ask_docker_folder "Media folder" ""
 MEDIA_FOLDER=$ask_result
 
 echo ""
@@ -74,8 +115,11 @@ echo "The data folder is where paperless stores other data, such as your"
 echo "SQLite database (if used), the search index and other data."
 echo "As with the media folder, leave empty to have this managed by docker."
 echo ""
+echo "CAUTION: If specified, you must specify an absolute path starting with /"
+echo "or a relative path starting with ./ here."
+echo ""
 
-ask "Data folder" ""
+ask_docker_folder "Data folder" ""
 DATA_FOLDER=$ask_result
 
 echo ""
@@ -166,8 +210,36 @@ done
 ask "Email" "$USERNAME@localhost"
 EMAIL=$ask_result
 
-echo "Done collecting data. Press any key to install."
-read
+echo ""
+echo "Summary"
+echo "======="
+echo ""
+
+echo "Target folder: $TARGET_FOLDER"
+echo "Consume folder: $CONSUME_FOLDER"
+if [[ -z $MEDIA_FOLDER ]] ; then
+	echo "Media folder: Managed by docker"
+else
+	echo "Media folder: $MEDIA_FOLDER"
+fi
+if [[ -z $DATA_FOLDER ]] ; then
+	echo "Data folder: Managed by docker"
+else
+	echo "Data folder: $DATA_FOLDER"
+fi
+echo ""
+echo "Port: $PORT"
+echo "Database: $DATABASE_BACKEND"
+echo "Tika enabled: $TIKA_ENABLED"
+echo "OCR language: $OCR_LANGUAGE"
+echo "User id: $USERMAP_UID"
+echo "Group id: $USERMAP_GID"
+echo ""
+echo "Paperless username: $USERNAME"
+echo "Paperless email: $EMAIL"
+
+echo ""
+read -p "Press any key to install."
 
 echo ""
 echo "Installing paperless..."
@@ -209,7 +281,7 @@ sed -i "s/- 8000:8000/- $PORT:8000/g" docker-compose.yml
 sed -i "s#- \./consume:/usr/src/paperless/consume#- $CONSUME_FOLDER:/usr/src/paperless/consume#g" docker-compose.yml
 
 if [[ -n $MEDIA_FOLDER ]] ; then
-	sed -i "s#- data:/usr/src/paperless/media#- $MEDIA_FOLDER:/usr/src/paperless/media#g" docker-compose.yml
+	sed -i "s#- media:/usr/src/paperless/media#- $MEDIA_FOLDER:/usr/src/paperless/media#g" docker-compose.yml
 fi
 
 if [[ -n $DATA_FOLDER ]] ; then

From 82730ab491cb8d7ea093c5aa3564829da5d86e32 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 20:31:25 +0100
Subject: [PATCH 1079/1300] update dependencies

---
 Pipfile          |   4 +-
 Pipfile.lock     | 121 +++++++++++++++++++++++++++--------------------
 requirements.txt |  10 ++--
 3 files changed, 78 insertions(+), 57 deletions(-)

diff --git a/Pipfile b/Pipfile
index cbe5c5103..e5e13ccac 100644
--- a/Pipfile
+++ b/Pipfile
@@ -25,7 +25,7 @@ pdftotext = "*"
 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.2.5"
+pikepdf = "~=2.5.0"
 python-gnupg = "*"
 python-dotenv = "*"
 python-dateutil = "*"
@@ -41,7 +41,7 @@ whitenoise = "~=5.2.0"
 watchdog = "*"
 whoosh="~=2.7.4"
 inotifyrecursive = "~=0.3.4"
-ocrmypdf = "~=11.4.5"
+ocrmypdf = "~=11.6"
 tqdm = "*"
 tika = "*"
 # TODO: This will sadly also install daphne+dependencies,
diff --git a/Pipfile.lock b/Pipfile.lock
index ff9e96717..6d200ce4b 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "d80d2539a4528a8fd9e848875c2e2d5bcdb3e98154f45b612706094b84ecaaea"
+            "sha256": "3e5b28740397136ffd0a397889e232192414eca2e2e6e9284f452d60cbbceda8"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -107,6 +107,7 @@
                 "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009",
                 "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03",
                 "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b",
+                "sha256:7ef7d4ced6b325e92eb4d3502946c78c5367bc416398d387b39591532536734e",
                 "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909",
                 "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53",
                 "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35",
@@ -218,11 +219,11 @@
         },
         "django": {
             "hashes": [
-                "sha256:2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7",
-                "sha256:efa2ab96b33b20c2182db93147a0c3cd7769d418926f9e9f140a60dca7c64ca9"
+                "sha256:169e2e7b4839a7910b393eec127fd7cbae62e80fa55f89c6510426abf673fe5f",
+                "sha256:c6c0462b8b361f8691171af1fb87eceb4442da28477e12200c40420176206ba7"
             ],
             "index": "pypi",
-            "version": "==3.1.5"
+            "version": "==3.1.6"
         },
         "django-cors-headers": {
             "hashes": [
@@ -587,11 +588,11 @@
         },
         "ocrmypdf": {
             "hashes": [
-                "sha256:416a9c4321bfc844f250694b8c68ebb538f60609bbc8686bd9f84a13c5127d68",
-                "sha256:f45fc7e844e6026d6080a623a2936be120fc077d99aaa599df022acf35fb31e6"
+                "sha256:a54634d017a2f44aa2115b0b6ae5aa41a7cec018f5c53d16ad3abec1e70b3db7",
+                "sha256:d0e2da48d4abd90f48f0937b2cd4ba57503b56c603f5e3aa91e20e3b21a036cd"
             ],
             "index": "pypi",
-            "version": "==11.4.5"
+            "version": "==11.6.0"
         },
         "pathvalidate": {
             "hashes": [
@@ -618,30 +619,32 @@
         },
         "pikepdf": {
             "hashes": [
-                "sha256:0e67e5beeeed5422b3b8e862e4777fed5a4cd3c72e711e2a449a65d9ee641448",
-                "sha256:138155ae1f71634cd6eca79f5517f77b2067ef0bd5b627ea9414e308fe868dc5",
-                "sha256:15cf648dd760a47c55a4106b601b92bb653ae98155b10f04310553629c6695dd",
-                "sha256:1d6a011ae4c501c78509caf19cbe152c2e3cb5c267f7b47bc3db8cd3436585a7",
-                "sha256:211f529313953e44ae42eb896c2b688668385e6e8f9d04d21484bddb3c42b34c",
-                "sha256:22049ad288d603a7fc68e90a0722770d307886788373ddfe71fbf614ced0f5b2",
-                "sha256:24f7c371f6ecbee8f0ae30030992fc75cd32cd575dcfca8d466a03a8290377ca",
-                "sha256:26cdf561632866d584fedb6b1c1fce78cefa49b5cae54c65aa6a6ca5fe6de4ac",
-                "sha256:2c37afcd21a2eb1da1773687e853327fa8ec7d2c5cd90cdcd70180f55f0221e1",
-                "sha256:65b8ec6403814f51e1b9c7e18a8ff26087fcc7a199b1405583e5ff9eb931db56",
-                "sha256:66a03103aadb2e2738271cb18c89837ac3980fa0b4687195c4c150228b7e79de",
-                "sha256:6e8f0124354c53a66f83ec5a18111b760aeff1a64db3a86e7ee5fed8e8624707",
-                "sha256:70f2836cd468aa25bc8b09a2b9561364bd75d3e6ddb0e50a25d248d7da6cff25",
-                "sha256:82cebf68952cfb65c86d880eb782a0c558b37531cdae59f2e11fcd0f2bb4669c",
-                "sha256:84ad3e8fd5f3251fb5b534614da64b04a264ce9348f0fe35b781c0fb378b0f82",
-                "sha256:af13fbc022efa85d1ae161129d4cde66493479db52b9adb74d525b890a078208",
-                "sha256:c1d40fb8f8192c75f54f0e74a569ccf45e4e13bed8da78a78a5b488be29979bf",
-                "sha256:d147ec1ab58512871fdf40a161809f698eaa75720b4a230198e7e028582b20a1",
-                "sha256:dedad1f68d6b0b54000f7f99386351f1c6e19c8cf70a9700d8dd06b9809c54fb",
-                "sha256:e72c3f5b624b9c7341fd6a7e657926d4cf12a7ea453681ffd7332cabc3530c62",
-                "sha256:eb75f22e261b3bc69b6fc9a17b1d6966c95e79d3e792b7737a018a2bf6a2b07f"
+                "sha256:02815df9499d3a6dfac2e07e4d2fdbe25fcbefae208970e76bff90af4a402d49",
+                "sha256:06b0c3004cc9e9068ebc62bb59c3c3a54e7af13867f4a326690d79c69a1cf288",
+                "sha256:1a471c6ca288fbcd0e1b0e128ef12bb14c5e7db745786308ba292fc7cff30bb5",
+                "sha256:489ed0fd1281beb0343a34fe8b9d94407c440ed0419ab2e6f5ea297a41824a31",
+                "sha256:5106b27f7085ed449e057b9988f07c80a87292d2bf46c585a8635ac7a3ccf0d5",
+                "sha256:51acffba6f3d21674eea7a0432ce1adaf0743641d57844a5e3dc92b4a7e81c85",
+                "sha256:53d694d70dd072a47bd2dd71329dcef0f809dcd8084d1d11c31baf3b64cd345c",
+                "sha256:6a640fef52dc785abd354d6800a52ecc02656c98dbfc2ecde559323b001bd43f",
+                "sha256:7006ef95f847412605dea6e772019f637949eaeaf65363d5d6afd9aa96bf5623",
+                "sha256:81e13b62877dbc089095e7efa03c27834bdf6b49d404d064cb227b0e179ce049",
+                "sha256:8fc3e97b24dafbd4b1ac057c8f144c18467ce55d342a1a8c42688890ead58ef3",
+                "sha256:9158dc4d3ef4e2301fb1879d5825530fdb32143ced770d60fa8e5badeee70a35",
+                "sha256:961337a10b42bd656b59116ce1c574eafd515b45a513221df6ae1f11734bfb6c",
+                "sha256:994ccac972357a7b9b147217e1beea2f7688697944b862dbb2a3e64aa9a5ff14",
+                "sha256:a8e9abf7db0351357b55c3f935979e7dc14f3f259a25d15bcc86abce730955a7",
+                "sha256:b836eda7f70b9dd75ccdeaf4e78b38393118a66821a69a10054b1430f945d1fd",
+                "sha256:b859a225f6bd953472c50f4df612b4575df646e560189e3720310ad65b6805a0",
+                "sha256:cae106bd461cfad73c554c09f6db1d5f2c6a28f5b8cb0602b63046840f488226",
+                "sha256:cdc75b8fa5a650f4fc91214a315358fde7470e09b95a00981b73a7c4ac5ddb97",
+                "sha256:e2c28da4f37ad9a3efbedbbfc6f1084941bde43903d30dfdbb338d5ba94c9f50",
+                "sha256:e596bd8fdbf40bfb8dc8068cdbc7e5b72052188d1ad8ca84da9d6b77658a8b31",
+                "sha256:ee957b9c60b6def20cbdf656d35859ce211eec02dafa3abb9d5ca937d32a3c3b",
+                "sha256:f9428d4b1f70af4f4560be4dccbbc5ab5308c00c5b62ed2f1c44ce9e2591b3d2"
             ],
             "index": "pypi",
-            "version": "==2.2.5"
+            "version": "==2.5.2"
         },
         "pillow": {
             "hashes": [
@@ -819,12 +822,12 @@
         },
         "python-levenshtein": {
             "hashes": [
-                "sha256:108edd3c271f1afda8b21a8d9da81886414dfb6940a085fa7903c592e0f8f54b",
-                "sha256:1ff19b712c5974080b003fd26ef365cd93dfc1a5e690be621f79f3e63e00a7cc",
-                "sha256:554e273a88060d177e7b3c1e6ea9158dde11563bfae8f7f661f73f47e5ff0911"
+                "sha256:212db61934fcb819f5cb2fcb5ad5c0e2e43f3161f524eef4a135f7285dfb308a",
+                "sha256:d92fe5c3b10c8ad8f2d880499f5e96ed24dbc7cd0414a665c2e2505feaf4ec58",
+                "sha256:dc2395fbd148a1ab31090dd113c366695934b9e85fe5a4b2a032745efd0346f6"
             ],
             "index": "pypi",
-            "version": "==0.12.1"
+            "version": "==0.12.2"
         },
         "python-magic": {
             "hashes": [
@@ -836,10 +839,10 @@
         },
         "pytz": {
             "hashes": [
-                "sha256:16962c5fb8db4a8f63a26646d8886e9d769b6c511543557bc84e9569fb9a9cb4",
-                "sha256:180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5"
+                "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da",
+                "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"
             ],
-            "version": "==2020.5"
+            "version": "==2021.1"
         },
         "pyyaml": {
             "hashes": [
@@ -1558,12 +1561,11 @@
         },
         "jinja2": {
             "hashes": [
-                "sha256:3f172970d5670703bd3812e8ca6459a9a7e069fa8e51b40195f83c81db191ec4",
-                "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0",
-                "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035"
+                "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419",
+                "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==2.11.2"
+            "version": "==2.11.3"
         },
         "markupsafe": {
             "hashes": [
@@ -1573,8 +1575,12 @@
                 "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5",
                 "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42",
                 "sha256:19536834abffb3fa155017053c607cb835b2ecc6a3a2554a88043d991dffb736",
+                "sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f",
+                "sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39",
                 "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff",
                 "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b",
+                "sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014",
+                "sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f",
                 "sha256:3d61f15e39611aacd91b7e71d903787da86d9e80896e683c0103fced9add7834",
                 "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1",
                 "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e",
@@ -1584,36 +1590,51 @@
                 "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1",
                 "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15",
                 "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1",
+                "sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85",
+                "sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1",
                 "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e",
                 "sha256:7952deddf24b85c88dab48f6ec366ac6e39d2761b5280f2f9594911e03fcd064",
                 "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b",
                 "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905",
+                "sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850",
+                "sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0",
                 "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735",
                 "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d",
+                "sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb",
                 "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e",
                 "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d",
                 "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c",
+                "sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1",
+                "sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2",
                 "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21",
                 "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2",
                 "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5",
+                "sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7",
                 "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b",
+                "sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8",
                 "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6",
+                "sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193",
                 "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f",
+                "sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b",
                 "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f",
                 "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2",
+                "sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5",
+                "sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c",
+                "sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032",
                 "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7",
-                "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"
+                "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be",
+                "sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.1.1"
         },
         "packaging": {
             "hashes": [
-                "sha256:24e0da08660a87484d1602c30bb4902d74816b6985b93de36926f5bc95741858",
-                "sha256:78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093"
+                "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5",
+                "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.8"
+            "version": "==20.9"
         },
         "pluggy": {
             "hashes": [
@@ -1722,10 +1743,10 @@
         },
         "pytz": {
             "hashes": [
-                "sha256:16962c5fb8db4a8f63a26646d8886e9d769b6c511543557bc84e9569fb9a9cb4",
-                "sha256:180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5"
+                "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da",
+                "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"
             ],
-            "version": "==2020.5"
+            "version": "==2021.1"
         },
         "requests": {
             "hashes": [
@@ -1863,11 +1884,11 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:219ee956e38b08e32d5639289aaa5bd190cfbe7dafcb8fa65407fca08e808f9c",
-                "sha256:227a8fed626f2f20a6cdb0870054989f82dd27b2560a911935ba905a2a5e0034"
+                "sha256:147b43894e51dd6bba882cf9c282447f780e2251cd35172403745fc381a0a80d",
+                "sha256:2be72df684b74df0ea47679a7df93fd0e04e72520022c57b479d8f881485dbe3"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.4.0"
+            "version": "==20.4.2"
         },
         "zipp": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index c3f32002b..536e84e3b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,7 +31,7 @@ django-extensions==3.1.0
 django-filter==2.4.0
 django-picklefield==3.0.1; python_version >= '3'
 django-q==1.3.4
-django==3.1.5
+django==3.1.6
 djangorestframework==3.12.2
 filelock==3.0.12
 fuzzywuzzy==0.18.0
@@ -53,11 +53,11 @@ 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'
 msgpack==1.0.2
 numpy==1.19.5; python_version >= '3.6'
-ocrmypdf==11.4.5
+ocrmypdf==11.6.0
 pathvalidate==2.3.2
 pdfminer.six==20201018; python_version >= '3.4'
 pdftotext==2.1.5
-pikepdf==2.2.5
+pikepdf==2.5.2
 pillow==8.1.0
 pluggy==0.13.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 psycopg2-binary==2.8.6
@@ -69,9 +69,9 @@ pyopenssl==20.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1,
 python-dateutil==2.8.1
 python-dotenv==0.15.0
 python-gnupg==0.4.6
-python-levenshtein==0.12.1
+python-levenshtein==0.12.2
 python-magic==0.4.18
-pytz==2020.5
+pytz==2021.1
 pyyaml==5.4.1
 redis==3.5.3
 regex==2020.11.13

From d198a89f22c5a72f93a8a7fe07331f33d903eda0 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 20:43:07 +0100
Subject: [PATCH 1080/1300] update dependencies

---
 Pipfile          | 3 +--
 Pipfile.lock     | 6 ++++--
 requirements.txt | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Pipfile b/Pipfile
index e5e13ccac..293d71603 100644
--- a/Pipfile
+++ b/Pipfile
@@ -17,7 +17,7 @@ django-filter = "~=2.4.0"
 django-q = "~=1.3.4"
 djangorestframework = "~=3.12.2"
 filelock = "*"
-fuzzywuzzy = "*"
+fuzzywuzzy = {extras = ["speedup"], version = "*"}
 gunicorn = "*"
 imap-tools = "*"
 langdetect = "*"
@@ -29,7 +29,6 @@ pikepdf = "~=2.5.0"
 python-gnupg = "*"
 python-dotenv = "*"
 python-dateutil = "*"
-python-Levenshtein = "*"
 python-magic = "*"
 psycopg2-binary = "*"
 redis = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 6d200ce4b..78cfecf95 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "3e5b28740397136ffd0a397889e232192414eca2e2e6e9284f452d60cbbceda8"
+            "sha256": "658e2907c680baea81e77da9081ee063ff843b185d02c95d6483b747f0acd84d"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -282,6 +282,9 @@
             "version": "==3.0.12"
         },
         "fuzzywuzzy": {
+            "extras": [
+                "speedup"
+            ],
             "hashes": [
                 "sha256:45016e92264780e58972dca1b3d939ac864b78437422beecebb3095f8efd00e8",
                 "sha256:928244b28db720d1e0ee7587acf660ea49d7e4c632569cad4f1cd7e68a5f0993"
@@ -826,7 +829,6 @@
                 "sha256:d92fe5c3b10c8ad8f2d880499f5e96ed24dbc7cd0414a665c2e2505feaf4ec58",
                 "sha256:dc2395fbd148a1ab31090dd113c366695934b9e85fe5a4b2a032745efd0346f6"
             ],
-            "index": "pypi",
             "version": "==0.12.2"
         },
         "python-magic": {
diff --git a/requirements.txt b/requirements.txt
index 536e84e3b..e1b76a4a0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -34,7 +34,7 @@ django-q==1.3.4
 django==3.1.6
 djangorestframework==3.12.2
 filelock==3.0.12
-fuzzywuzzy==0.18.0
+fuzzywuzzy[speedup]==0.18.0
 gunicorn==20.0.4
 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'

From 85f46424a812707f63360432107b69846c2384d3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 23:58:11 +0100
Subject: [PATCH 1081/1300] fixes layout issues #482

---
 .../src/app/components/app-frame/app-frame.component.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 70329d537..34a978fe5 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -163,13 +163,13 @@
             </a>
           </li>
           <li class="nav-item">
-            <div class="d-flex w-100">
-              <a class="nav-link" target="_blank" rel="noopener noreferrer" href="https://github.com/jonaswinkler/paperless-ng">
+            <div class="d-flex w-100 flex-wrap">
+              <a class="nav-link pr-0 pb-0" target="_blank" rel="noopener noreferrer" href="https://github.com/jonaswinkler/paperless-ng">
                 <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="sidebaricon bi bi-github" viewBox="0 0 16 16">
                   <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"/>
                 </svg>&nbsp;<ng-container i18n>GitHub</ng-container>
               </a>
-              <a class="nav-link-additional small text-muted" target="_blank" rel="noopener noreferrer" href="https://github.com/jonaswinkler/paperless-ng/discussions/categories/feature-requests" title="Suggest an idea">
+              <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">
                   <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>
@@ -177,7 +177,7 @@
               </a>
             </div>
           </li>
-          <li class="nav-item">
+          <li class="nav-item mt-2">
             <div class="px-3 py-2 text-muted small">
               {{versionString}}
             </div>

From bdc247ce49a73a810e813e2db011e2e86016cc73 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 2 Feb 2021 23:58:25 +0100
Subject: [PATCH 1082/1300] code style

---
 src/documents/management/commands/document_consumer.py | 2 +-
 src/documents/parsers.py                               | 5 ++---
 src/paperless_tesseract/parsers.py                     | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index 9ba1b1a87..232a5b23c 100644
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -21,7 +21,7 @@ logger = logging.getLogger(__name__)
 
 
 def _tags_from_path(filepath):
-    """Walk up the directory tree from filepath to CONSUMPTION_DIr
+    """Walk up the directory tree from filepath to CONSUMPTION_DIR
        and get or create Tag IDs for every directory.
     """
     tag_ids = set()
diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index 3f0879b3c..a2eb14cef 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -273,10 +273,9 @@ class DocumentParser(LoggingMixin):
         self.date = None
         self.progress_callback = progress_callback
 
-    def progress(self, current, max):
-        print(self.progress_callback)
+    def progress(self, current_progress, max_progress):
         if self.progress_callback:
-            self.progress_callback(current, max)
+            self.progress_callback(current_progress, max_progress)
 
     def extract_metadata(self, document_path, mime_type):
         return []
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 52b50e983..4e5ceac1b 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -190,11 +190,11 @@ class RasterisedDocumentParser(DocumentParser):
             # Also, no archived file.
             if not self.text:
                 # However, if we don't have anything, fail:
-                raise ParseError(e.__class__.__name__ + ": " + str(e))
+                raise ParseError(f"{e.__class__.__name__}: {str(e)}")
 
         except Exception as e:
             # Anything else is probably serious.
-            raise ParseError(e.__class__.__name__ + ": " + str(e))
+            raise ParseError(f"{e.__class__.__name__}: {str(e)}")
 
         if not self.text:
             # This may happen for files that don't have any text.

From 32c9369ba18e1f109c3b6707a49dd459767925e7 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Wed, 3 Feb 2021 07:53:49 +0100
Subject: [PATCH 1083/1300] Apply consistent name structure to vars

---
 ansible/README.md         |  2 +-
 ansible/defaults/main.yml | 16 ++++++++--------
 ansible/tasks/main.yml    | 16 ++++++++--------
 docs/setup.rst            | 20 ++++++++++----------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/ansible/README.md b/ansible/README.md
index 6cd9e9f9b..0940cf072 100644
--- a/ansible/README.md
+++ b/ansible/README.md
@@ -107,7 +107,7 @@ Example Playbook
     paperlessng_db_type: postgresql
     paperlessng_db_pass: PLEASEPROVIDEASTRONGPASSWORDHERE
 
-    paperless_secret_key: AGAINPLEASECHANGETHISNOW
+    paperlessng_secret_key: AGAINPLEASECHANGETHISNOW
 
     paperlessng_ocr_languages:
       - eng
diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml
index aaeffa507..f1cbb8f88 100644
--- a/ansible/defaults/main.yml
+++ b/ansible/defaults/main.yml
@@ -23,14 +23,14 @@ paperlessng_filename_format:
 paperlessng_virtualenv: "{{ paperlessng_directory }}/.venv"
 
 # Hosting & Security
-paperless_secret_key: PLEASECHANGETHISFORTHELOVEOFGOD
-paperless_allowed_hosts: "*"
-paperless_cors_allowed_hosts: http://localhost:8000
-paperless_force_script_name:
-paperless_static_url: /static/
-paperless_auto_login_username:
-paperless_cookie_prefix: ""
-paperless_enable_http_remote_user: False
+paperlessng_secret_key: PLEASECHANGETHISFORTHELOVEOFGOD
+paperlessng_allowed_hosts: "*"
+paperlessng_cors_allowed_hosts: http://localhost:8000
+paperlessng_force_script_name:
+paperlessng_static_url: /static/
+paperlessng_auto_login_username:
+paperlessng_cookie_prefix: ""
+paperlessng_enable_http_remote_user: False
 
 # OCR settings
 paperlessng_ocr_languages:
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index dba409549..ed05cd05e 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -286,21 +286,21 @@
       line: "PAPERLESS_FILENAME_FORMAT={{ paperlessng_filename_format }}"
     # Hosting & Security
     - regexp: PAPERLESS_SECRET_KEY
-      line: "PAPERLESS_SECRET_KEY={{ paperless_secret_key }}"
+      line: "PAPERLESS_SECRET_KEY={{ paperlessng_secret_key }}"
     - regexp: PAPERLESS_ALLOWED_HOSTS
-      line: "PAPERLESS_ALLOWED_HOSTS={{ paperless_allowed_hosts }}"
+      line: "PAPERLESS_ALLOWED_HOSTS={{ paperlessng_allowed_hosts }}"
     - regexp: PAPERLESS_CORS_ALLOWED_HOSTS
-      line: "PAPERLESS_CORS_ALLOWED_HOSTS={{ paperless_cors_allowed_hosts }}"
+      line: "PAPERLESS_CORS_ALLOWED_HOSTS={{ paperlessng_cors_allowed_hosts }}"
     - regexp: PAPERLESS_FORCE_SCRIPT_NAME
-      line: "PAPERLESS_FORCE_SCRIPT_NAME={{ paperless_force_script_name }}"
+      line: "PAPERLESS_FORCE_SCRIPT_NAME={{ paperlessng_force_script_name }}"
     - regexp: PAPERLESS_STATIC_URL
-      line: "PAPERLESS_STATIC_URL={{ paperless_static_url }}"
+      line: "PAPERLESS_STATIC_URL={{ paperlessng_static_url }}"
     - regexp: PAPERLESS_AUTO_LOGIN_USERNAME
-      line: "PAPERLESS_AUTO_LOGIN_USERNAME={{ paperless_auto_login_username }}"
+      line: "PAPERLESS_AUTO_LOGIN_USERNAME={{ paperlessng_auto_login_username }}"
     - regexp: PAPERLESS_COOKIE_PREFIX
-      line: "PAPERLESS_COOKIE_PREFIX={{ paperless_cookie_prefix }}"
+      line: "PAPERLESS_COOKIE_PREFIX={{ paperlessng_cookie_prefix }}"
     - regexp: PAPERLESS_ENABLE_HTTP_REMOTE_USER
-      line: "PAPERLESS_ENABLE_HTTP_REMOTE_USER={{ paperless_enable_http_remote_user }}"
+      line: "PAPERLESS_ENABLE_HTTP_REMOTE_USER={{ paperlessng_enable_http_remote_user }}"
     # OCR settings
     - regexp: PAPERLESS_OCR_LANGUAGE
       line: "PAPERLESS_OCR_LANGUAGE={{ paperlessng_ocr_languages | join('+') }}"
diff --git a/docs/setup.rst b/docs/setup.rst
index 5c3c9c361..e040db790 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -88,7 +88,7 @@ You can go multiple routes to setup and run Paperless:
 
 The Docker routes are quick & easy. These are the recommended routes. This configures all the stuff
 from the above automatically so that it just works and uses sensible defaults for all configuration options.
-Here you find a cheat-sheet for docker beginners: `CLI Basics <https://sehn.tech/post/devops-with-docker/>`_ 
+Here you find a cheat-sheet for docker beginners: `CLI Basics <https://sehn.tech/post/devops-with-docker/>`_
 
 The bare metal route is complicated to setup but makes it easier
 should you want to contribute some code back. You need to configure and
@@ -126,7 +126,7 @@ Install Paperless from Docker Hub
 
         If you want to use the included ``docker-compose.*.yml`` file, you
         need to have at least Docker version **17.09.0** and docker-compose
-        version **1.17.0**.  
+        version **1.17.0**.
         To check do: `docker-compose -v` or `docker -v`
 
         See the `Docker installation guide`_ on how to install the current
@@ -151,7 +151,7 @@ Install Paperless from Docker Hub
     .. code::
 
         - /home/jonaswinkler/paperless-inbox:/usr/src/paperless/consume
-    
+
     Don't change the part after the colon or paperless wont find your documents.
 
 
@@ -159,7 +159,7 @@ Install Paperless from Docker Hub
     most important change is to set ``USERMAP_UID`` and ``USERMAP_GID``
     to the uid and gid of your user on the host system. Use ``id -u`` and
     ``id -g`` to get these.
-    
+
     This ensures that
     both the docker container and you on the host machine have write access
     to the consumption directory. If your UID and GID on the host system is
@@ -194,7 +194,7 @@ Install Paperless from Docker Hub
 
 8.  The default ``docker-compose.yml`` exports the webserver on your local port
     8000. If you did not change this, you should now be able to visit your
-    Paperless instance at ``http://127.0.0.1:8000`` or your servers IP-Address:8000. 
+    Paperless instance at ``http://127.0.0.1:8000`` or your servers IP-Address:8000.
     Use the login credentials you have created with the previous step.
 
 .. _Docker: https://www.docker.com/
@@ -223,7 +223,7 @@ Build the docker image yourself
 
         webserver:
             image: jonaswinkler/paperless-ng:latest
-    
+
     and replace it with a line that instructs docker-compose to build the image from the current working directory instead:
 
     .. code:: yaml
@@ -426,7 +426,7 @@ Install Paperless using ansible
 
         This role currently only supports Debian 10 Buster and Ubuntu 20.04 Focal or later as target hosts.
 
-1.  Install ansible 2.7+ on the management node. 
+1.  Install ansible 2.7+ on the management node.
     This may be the target host paperless-ng is being installed on or any remote host which can access the target host.
     For further details, check the ansible `inventory <https://docs.ansible.com/ansible/latest/user_guide/intro_inventory.html>`_ documentation.
 
@@ -461,7 +461,7 @@ Install Paperless using ansible
     .. code:: sh
 
         cd paperless-ng
-        git checkout ng-0.9.14
+        git checkout ng-1.0.0
 
 3.  Create an ansible ``playbook.yml`` in the paperless-ng root directory:
 
@@ -511,7 +511,7 @@ Install Paperless using ansible
 
     .. code:: yaml
 
-        paperless_secret_key: PleaseGenerateAStrongKeyForThis
+        paperlessng_secret_key: PleaseGenerateAStrongKeyForThis
 
         paperlessng_superuser_name: YourUserName
         paperlessng_superuser_email: name@domain.tld
@@ -584,7 +584,7 @@ Migration to paperless-ng is then performed in a few simple steps:
         .. code:: shell-session
 
             $ docker volume ls | grep _data
-        
+
         and adjust the project name in the ``.env`` file so that it matches the name
         of the volumes before the ``_data`` part.
 

From d17de457916b46491ea74ca467146a757d599165 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 3 Feb 2021 14:51:04 +0100
Subject: [PATCH 1084/1300] fix typo

---
 src/paperless_tesseract/parsers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 4e5ceac1b..5a08c601b 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -200,7 +200,7 @@ class RasterisedDocumentParser(DocumentParser):
             # This may happen for files that don't have any text.
             self.log(
                 'warning',
-                f"Document {document_path} does not have any text."
+                f"Document {document_path} does not have any text. "
                 f"This is probably an error or you tried to add an image "
                 f"without text, or something is wrong with this document.")
             self.text = ""

From a186d6fae2f55d521c58348de102c56766fac632 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 3 Feb 2021 15:22:20 +0100
Subject: [PATCH 1085/1300] bugfix

---
 .../components/document-detail/document-detail.component.ts   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index a7cce715e..071c8e249 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -115,9 +115,13 @@ export class DocumentDetailComponent implements OnInit {
     this.document = doc
     this.documentsService.getMetadata(doc.id).subscribe(result => {
       this.metadata = result
+    }, error => {
+      this.metadata = null
     })
     this.documentsService.getSuggestions(doc.id).subscribe(result => {
       this.suggestions = result
+    }, error => {
+      this.suggestions = null
     })
     this.title = this.documentTitlePipe.transform(doc.title)
     this.documentForm.patchValue(doc)

From 2129cda38d45819a367b658123c41e1d6b6bd8ca Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 3 Feb 2021 16:01:32 +0100
Subject: [PATCH 1086/1300] display http errors

---
 src-ui/messages.xlf                           | 43 +++++++++++--------
 .../upload-file-widget.component.ts           |  2 +-
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 86198ca7f..a80bd082f 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -188,35 +188,35 @@
         <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">199</context>
+          <context context-type="linenumber">203</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">200</context>
+          <context context-type="linenumber">204</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">201</context>
+          <context context-type="linenumber">205</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">203</context>
+          <context context-type="linenumber">207</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">210</context>
+          <context context-type="linenumber">214</context>
         </context-group>
       </trans-unit>
       <trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7" datatype="html">
@@ -1470,6 +1470,13 @@
           <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="1405142710727603568" datatype="html">
+        <source>HTTP error: <x id="PH" equiv-text="error.status"/> <x id="PH_1" equiv-text="error.statusText"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="e022072b3e4dd77e3f09960817ef3359a49963b3" datatype="html">
         <source>Upload new documents</source>
         <context-group purpose="location">
@@ -1637,21 +1644,21 @@
         <source>Document already exists.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
       <trans-unit id="148389968432135849" datatype="html">
         <source>File not found.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1520671543092565667" datatype="html">
         <source>Pre-consume script does not exist.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">17</context>
         </context-group>
         <note priority="1" from="description">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
@@ -1659,7 +1666,7 @@
         <source>Error while executing pre-consume script.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">18</context>
         </context-group>
         <note priority="1" from="description">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
@@ -1667,7 +1674,7 @@
         <source>Post-consume script does not exist.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="linenumber">19</context>
         </context-group>
         <note priority="1" from="description">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
@@ -1675,7 +1682,7 @@
         <source>Error while executing post-consume script.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
         <note priority="1" from="description">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
@@ -1683,49 +1690,49 @@
         <source>Received new file.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7337565919209746135" datatype="html">
         <source>File type not supported.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5002399167376099234" datatype="html">
         <source>Processing document...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1085975194762600381" datatype="html">
         <source>Generating thumbnail...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3280851677698431426" datatype="html">
         <source>Retrieving date from document...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7162102384876037296" datatype="html">
         <source>Saving document...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4550450765009165976" datatype="html">
         <source>Finished.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">26</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1519954996184640001" datatype="html">
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index f604a3fc1..2412290c0 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -133,7 +133,7 @@ export class UploadFileWidgetComponent implements OnInit {
                 break;
               }
               default: {
-                this.consumerStatusService.fail(status, `${error.status} ${error.statusText}`)
+                this.consumerStatusService.fail(status, $localize`HTTP error: ${error.status} ${error.statusText}`)
                 break;
               }
             }

From ee487529fe23a8382f893c63c88a2dcd2b0dd880 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 3 Feb 2021 15:11:49 +0000
Subject: [PATCH 1087/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 62 +++++++++++++++++--------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index 44fa03f5c..cc5e1d68a 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -214,7 +214,7 @@
         <target>Löschen bestätigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">199</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
@@ -222,7 +222,7 @@
         <target>Möchten Sie das Dokument &quot;<x equiv-text="this.document.title" id="PH"/>&quot; wirklich löschen?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6691075929777935948">
@@ -230,7 +230,7 @@
         <target>Die Dateien dieses Dokuments werden permanent gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">201</context>
+          <context context-type="linenumber">205</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="719892092227206532">
@@ -238,7 +238,7 @@
         <target>Dokument löschen</target>
         <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">207</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1844801255494293730">
@@ -246,7 +246,7 @@
         <target>Fehler beim Löschen des Dokuments: <x equiv-text="JSON.stringify(error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">210</context>
+          <context context-type="linenumber">214</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -427,7 +427,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f">
         <source>Original document metadata</source>
-        <target>Original-Metadaten</target>
+        <target>Metadaten Original</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
           <context context-type="linenumber">121</context>
@@ -435,7 +435,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7174dcea4a3d0b743e7e4a78747e902230727f67">
         <source>Archived document metadata</source>
-        <target>Metadaten des archivierten Dokuments</target>
+        <target>Metadaten Archiv</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
           <context context-type="linenumber">122</context>
@@ -451,7 +451,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="8765497970646365998">
         <source>Hello <x equiv-text="this.displayName" id="PH"/>, welcome to Paperless-ng!</source>
-        <target>Hallo <x equiv-text="this.displayName" id="PH"/>, Willkommen zu Paperless-ng</target>
+        <target>Hallo <x equiv-text="this.displayName" id="PH"/>, willkommen zu Paperless-ng!</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
           <context context-type="linenumber">33</context>
@@ -1678,6 +1678,14 @@
           <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="1405142710727603568">
+        <source>HTTP error: <x equiv-text="error.status" id="PH"/> <x equiv-text="error.statusText" id="PH_1"/></source>
+        <target>HTTP-Fehler: <x equiv-text="error.status" id="PH"/> <x equiv-text="error.statusText" id="PH_1"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
         <source>Upload new documents</source>
         <target>Neue Dokumente hochladen</target>
@@ -1746,7 +1754,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="ea8d9a9486d5639d1c38c012900b8d34d5e4135d">
         <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message.</source>
-        <target>Sie können Ihre Dokumente hochladen, indem Sie sie in die Hochladebox auf der rechten Seite ziehen oder in den konfigurierten Ablageordner kopieren/verschieben. Danach werden sie inder Dokumentliste erscheinen. Nachdem Sie den Dokumenten einige Metadaten zugewiesen haben, können Sie die Filtermechanismen zur Erstellung individueller Ansichten benutzen (zum Beispiel &quot;Kürzlich hinzugefügt&quot; oder &quot;Mit TODO markiert&quot;) und die Ansichten werden auf der Startseite erscheinen und diese Nachricht ersetzen.</target>
+        <target>Sie können Ihre Dokumente hochladen, indem Sie sie in die Hochladebox auf der rechten Seite ziehen oder in den konfigurierten Ablageordner kopieren/verschieben. Danach werden sie in der Dokumentenliste erscheinen. Nachdem Sie den Dokumenten einige Metadaten zugewiesen haben, können Sie die Filtermechanismen zur Erstellung individueller Ansichten benutzen (zum Beispiel &quot;Kürzlich hinzugefügt&quot; oder &quot;Mit TODO markiert&quot;) und die Ansichten werden auf der Startseite anstelle dieser Nachricht erscheinen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
           <context context-type="linenumber">6,7</context>
@@ -1762,7 +1770,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="edb41dc36af2e70789d8e3422325d930e783253e">
         <source>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</source>
-        <target>Nachdem Sie einige Dokumente hochgeladen und mit Metadatebn haben, kann Paperless diese Metadaten automatisch passenden neuen Dokumenten zuweisen.</target>
+        <target>Nachdem Sie einige Dokumente hochgeladen und diesen Korrespondenten, Tags und Dokumenttypen zugewiesen haben, kann Paperless-ng diese Metadaten automatisch passenden neuen Dokumenten zuweisen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
           <context context-type="linenumber">10</context>
@@ -1770,7 +1778,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="9dca488928c0b7af46c3866f86a6c2c8548399aa">
         <source>You can configure paperless to read your mails and add documents from attached files.</source>
-        <target>Sie können in Paperless Ihre E-Mail-Konten einrichten und Paperless wird automatisch Dokumente aus Dateianhängen erzeugen.</target>
+        <target>Sie können in Paperless Ihre E-Mail-Konten einrichten und Paperless wird automatisch Dokumente aus Dateianhängen hinzufügen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
           <context context-type="linenumber">11</context>
@@ -1869,7 +1877,7 @@
         <target>Dokument existiert bereits.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="148389968432135849">
@@ -1877,7 +1885,7 @@
         <target>Datei nicht gefunden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1520671543092565667">
@@ -1885,7 +1893,7 @@
         <target>Pre-Consume-Skript existiert nicht.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">17</context>
         </context-group>
         <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
@@ -1894,7 +1902,7 @@
         <target>Fehler beim Ausführen des Pre-Consume-Skripts.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">18</context>
         </context-group>
         <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
@@ -1903,7 +1911,7 @@
         <target>Post-Consume-Skript existiert nicht.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="linenumber">19</context>
         </context-group>
         <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
@@ -1912,7 +1920,7 @@
         <target>Fehler beim Ausführen des Post-Consume-Skripts.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
         <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
@@ -1921,7 +1929,7 @@
         <target>Neue Datei erhalten.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7337565919209746135">
@@ -1929,7 +1937,7 @@
         <target>Dateityp wird nicht unterstützt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5002399167376099234">
@@ -1937,7 +1945,7 @@
         <target>Verarbeite Dokument...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1085975194762600381">
@@ -1945,7 +1953,7 @@
         <target>Erzeuge Miniaturbild...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3280851677698431426">
@@ -1953,7 +1961,7 @@
         <target>Ermittle Datum des Dokuments...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7162102384876037296">
@@ -1961,7 +1969,7 @@
         <target>Speichere Dokument...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4550450765009165976">
@@ -1969,7 +1977,7 @@
         <target>Abgeschlossen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">26</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1519954996184640001">
@@ -2222,7 +2230,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7517655726614958140">
         <source>Any: Document contains any of these words (space separated)</source>
-        <target>Irgendein Wort: Dokument enthält eins der folgender Wörter</target>
+        <target>Irgendein Wort: Dokument enthält eins der folgenden Wörter</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">12</context>
@@ -2270,7 +2278,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7548151332424148033">
         <source>Regular expression: Document matches this regular expression</source>
-        <target>Regulärer Ausdruck: Dokument passt zum folgenden Audruck</target>
+        <target>Regulärer Ausdruck: Dokument passt zum folgenden Ausdruck</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">15</context>
@@ -2286,7 +2294,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="8419167206585286450">
         <source>Fuzzy: Document contains a word similar to this word</source>
-        <target>Ungenau: Dokument enthält ein zum folgendem Wort ähnliches Wort</target>
+        <target>Ungenau: Dokument enthält ein zum folgenden Wort ähnliches Wort</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/matching-model.ts</context>
           <context context-type="linenumber">16</context>

From 611b4fe31bc38e448618896723f7028f6f29699c Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 3 Feb 2021 15:25:14 +0000
Subject: [PATCH 1088/1300] Translate /src-ui/messages.xlf in nl_NL

translation completed for the source file '/src-ui/messages.xlf'
on the 'nl_NL' language.
---
 src-ui/src/locale/messages.nl_NL.xlf | 224 +++++++++++++++------------
 1 file changed, 123 insertions(+), 101 deletions(-)

diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf
index 0e164d688..becc0e797 100644
--- a/src-ui/src/locale/messages.nl_NL.xlf
+++ b/src-ui/src/locale/messages.nl_NL.xlf
@@ -214,7 +214,7 @@
         <target>Bevestig het verwijderen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">199</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
@@ -222,7 +222,7 @@
         <target>Wilt u het document echt verwijderen &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6691075929777935948">
@@ -230,7 +230,7 @@
         <target>De bestanden voor dit document worden definitief verwijderd. Deze bewerking kan niet ongedaan worden gemaakt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">201</context>
+          <context context-type="linenumber">205</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="719892092227206532">
@@ -238,7 +238,7 @@
         <target>Verwijder document</target>
         <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">207</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1844801255494293730">
@@ -246,7 +246,7 @@
         <target>Fout bij het verwijderen van het document: <x equiv-text="JSON.stringify(error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">210</context>
+          <context context-type="linenumber">214</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -649,12 +649,20 @@
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab">
+        <source>Notifications</source>
+        <target>Meldingen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="99dee94e92dbd9e21a008d4569f9719ed206ae37">
         <source>Saved views</source>
         <target>Opgeslagen views</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">128</context>
+          <context context-type="linenumber">133</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
@@ -777,68 +785,12 @@
           <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab">
-        <source>Notifications</source>
-        <target>Meldingen</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">102</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="69c5a98f8aa92e4db060f10dcd37781c8f40a48f">
-        <source>Consumer status</source>
-        <target>Status van de verwerker</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">106</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0">
-        <source>Show notifications when new documents are detected</source>
-        <target>Toon meldingen wanneer nieuwe documenten worden gedetecteerd</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">109</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="f2361d3f65b6c77ef0a15fad8af8e858b043ace3">
-        <source>Show notifications when document consumption completes successfully</source>
-        <target>Toon meldingen wanneer documenten met succes zijn verwerkt.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">110</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2bcbcbe99e207803e21183580b98d90410dd8718">
-        <source>Show notifications when document consumption fails</source>
-        <target>Toon meldingen wanneer het verwerken van documenten faalt.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">111</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="af113f7c9f7e13145c3461f61a1aedf12d57bd71">
-        <source>Suppress notifications on dashboard</source>
-        <target>Onderdruk meldingen op het dashboard</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">112</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="59fe5c9233a2aaab3079a2300e4dfa439ddb1890">
-        <source>This will suppress all consumer related status messages on the dashboard.</source>
-        <target>Dit verbergt alle statusberichten op het dashboard die met de verwerker te maken hebben.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">112</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
         <source>Bulk editing</source>
         <target>Massabewerking</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
@@ -846,7 +798,7 @@
         <target>Toon dialoogvenster ter bevestiging</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
@@ -854,7 +806,7 @@
         <target>Er zal altijd om bevestiging gevraagd worden voor het verwijderen van documenten.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
@@ -862,7 +814,55 @@
         <target>Toepassen bij het sluiten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">121</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8680abbea249ebe9c2fe35556559c8e1a9eb5841">
+        <source>Document processing</source>
+        <target>Verwerking van documenten</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0">
+        <source>Show notifications when new documents are detected</source>
+        <target>Toon meldingen wanneer nieuwe documenten worden gedetecteerd</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">122</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e775f4f7c40249d31426ae61a21616a0c9d8e84f">
+        <source>Show notifications when document processing completes successfully</source>
+        <target>Toon een melding wanneer documenten met succes zijn verwerkt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e3844dd174d8e817ddb551fae28f14ae80ca36b6">
+        <source>Show notifications when document processing fails</source>
+        <target>Toon meldingen wanneer het verwerken van documenten faalt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">124</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af113f7c9f7e13145c3461f61a1aedf12d57bd71">
+        <source>Suppress notifications on dashboard</source>
+        <target>Onderdruk meldingen op het dashboard</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e27bd3804d2936a6897e81c2e52e294490e5e5a8">
+        <source>This will suppress all messages about document processing status on the dashboard.</source>
+        <target>Dit verbergt alle statusberichten op het dashboard die met het verwerken van documenten te maken hebben.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -870,7 +870,7 @@
         <target>Komt voor bij</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">140</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -878,7 +878,7 @@
         <target>Toon op het dashboard</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">143</context>
+          <context context-type="linenumber">148</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -886,7 +886,7 @@
         <target>Toon in de zijbalk</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">147</context>
+          <context context-type="linenumber">152</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -894,7 +894,7 @@
         <target>Geen opgeslagen views gedefinieerd.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -1119,7 +1119,7 @@
         <target>Beheren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">112</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="408cb6073e60c5d966296a3207fc596adca75e01">
@@ -1127,15 +1127,15 @@
         <target>Beheer</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">154</context>
+          <context context-type="linenumber">149</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
-        <source>Misc</source>
-        <target>Andere</target>
+      <trans-unit datatype="html" id="321e4419a943044e674beb55b8039f42a9761ca5">
+        <source>Info</source>
+        <target>Informatie</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">155</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
@@ -1143,7 +1143,7 @@
         <target>Handleiding</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">167</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
@@ -1151,7 +1151,15 @@
         <target>GitHub</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">174</context>
+          <context context-type="linenumber">170</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ea3a452c5238897cabc5781308cceb2d37dcf258">
+        <source>Suggest an idea</source>
+        <target>Ideeënbus</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">176</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
@@ -1167,7 +1175,7 @@
         <target>Open documenten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="dca5bf9344a759fa5a07f1b21f50286ec242ba44">
@@ -1175,7 +1183,7 @@
         <target>Alles sluiten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">101</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5195932016807797291">
@@ -1662,14 +1670,22 @@
           <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="3994065460580948013">
-        <source>Waiting for consumer...</source>
-        <target>Wachten op het verwerken...</target>
+      <trans-unit datatype="html" id="7446520539098045935">
+        <source>Upload complete, waiting...</source>
+        <target>Upload voltooid, klaar voor meer...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
           <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="1405142710727603568">
+        <source>HTTP error: <x equiv-text="error.status" id="PH"/> <x equiv-text="error.statusText" id="PH_1"/></source>
+        <target>HTTP fout: <x equiv-text="error.status" id="PH"/> <x equiv-text="error.statusText" id="PH_1"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
         <source>Upload new documents</source>
         <target>Nieuwe documenten opladen</target>
@@ -1701,21 +1717,23 @@
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
+        <note from="description" priority="1">This button dismisses all status messages about processed documents on the dashboard (failed and successful)</note>
       </trans-unit>
-      <trans-unit datatype="html" id="1fc4e0a1e93fdda0ed3c9e590971d283afb68265">
-        <source><x equiv-text="{{getStatusHidden().length}}" id="INTERPOLATION"/> more hidden</source>
-        <target><x equiv-text="{{getStatusHidden().length}}" id="INTERPOLATION"/> niet getoond</target>
+      <trans-unit datatype="html" id="90917e1a0a7bb59e9d11bdde9183e9391963e17b">
+        <source>{VAR_PLURAL, plural, =1 {One more document} other {<x id="INTERPOLATION"/> more documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Nog één document} other {Nog <x id="INTERPOLATION"/> documenten}}</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">25</context>
         </context-group>
+        <note from="description" priority="1">This is shown as a summary line when there are more than 5 document in the processing pipeline.</note>
       </trans-unit>
       <trans-unit datatype="html" id="710254a196a2649674438edf8a15b7ab1f48271b">
         <source>Open document</source>
         <target>Open document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="45854ddec74086b271e62be6a363f4fa5036f7fc">
@@ -1859,7 +1877,7 @@
         <target>Document bestaat al.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="148389968432135849">
@@ -1867,7 +1885,7 @@
         <target>Bestand niet gevonden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1520671543092565667">
@@ -1875,39 +1893,43 @@
         <target>Pre-verwerkingsscript bestaat niet.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">17</context>
         </context-group>
+        <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
       <trans-unit datatype="html" id="7742915911032564889">
         <source>Error while executing pre-consume script.</source>
         <target>Fout tijdens het uitvoeren van het pre-verwerkingsscript</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">18</context>
         </context-group>
+        <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
       <trans-unit datatype="html" id="8995193730018060346">
         <source>Post-consume script does not exist.</source>
         <target>Post-verwerkingsscript bestaat niet.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="linenumber">19</context>
         </context-group>
+        <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
       <trans-unit datatype="html" id="256773668518189604">
         <source>Error while executing post-consume script.</source>
         <target>Fout tijdens het uitvoeren van het post-verwerkingsscript</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
+        <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
       <trans-unit datatype="html" id="6252258095055634191">
         <source>Received new file.</source>
         <target>Nieuw bestand ontvangen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7337565919209746135">
@@ -1915,7 +1937,7 @@
         <target>Bestandstype niet ondersteund.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5002399167376099234">
@@ -1923,7 +1945,7 @@
         <target>Document wordt verwerkt...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1085975194762600381">
@@ -1931,7 +1953,7 @@
         <target>Voorbeeldweergave wordt gemaakt...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3280851677698431426">
@@ -1939,7 +1961,7 @@
         <target>Datum wordt gezocht in document...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7162102384876037296">
@@ -1947,7 +1969,7 @@
         <target>Document wordt opgeslagen...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4550450765009165976">
@@ -1955,7 +1977,7 @@
         <target>Klaar.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">26</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1519954996184640001">

From 28c79f1abb337ceb840178861ece2842129f4b59 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 3 Feb 2021 17:07:37 +0100
Subject: [PATCH 1089/1300] documentation

---
 docs/changelog.rst |  2 ++
 docs/faq.rst       | 36 ++++++++++++++++++++++++++----------
 docs/index.rst     |  2 +-
 docs/setup.rst     | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1da8621bb..2b9821408 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -37,6 +37,8 @@ paperless-ng 1.1.0
 
     Paperless will continue to work with WSGI, but you will not get any status notifications.
 
+    Apache ``mod_wsgi`` users, see :ref:`this note <faq-mod_wsgi>`.
+
 * Paperless now offers suggestions for tags, correspondents and types on the document detail page.
 
 * Added an interactive easy install script that automatically downloads, configures and starts paperless with docker.
diff --git a/docs/faq.rst b/docs/faq.rst
index e41f9aace..0f4527d62 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -62,9 +62,9 @@ file extensions do not matter.
 
 **A:** The short answer is yes. I've tested it on a Raspberry Pi 3 B.
 The long answer is that certain parts of
-Paperless will run very slow, such as the tesseract OCR. On Raspberry Pi,
+Paperless will run very slow, such as the OCR. On Raspberry Pi,
 try to OCR documents before feeding them into paperless so that paperless can
-reuse the text. The web interface should be a lot snappier, since it runs
+reuse the text. The web interface is a lot snappier, since it runs
 in your browser and paperless has to do much less work to serve the data.
 
 .. note::
@@ -76,7 +76,14 @@ in your browser and paperless has to do much less work to serve the data.
 **Q:** *How do I install paperless-ng on Raspberry Pi?*
 
 **A:** Docker images are available for arm and arm64 hardware, so just follow
-the docker-compose instructions, or go the bare metal route.
+the docker-compose instructions. Apart from more required disk space compared to
+a bare metal installation, docker comes with close to zero overhead, even on
+Raspberry Pi.
+
+If you decide to got with the bare metal route, be aware that some of the
+python requirements do not have precompiled packages for ARM / ARM64. Installation
+of these will require additional development libraries and compilation will take
+a long time.
 
 **Q:** *How do I run this on unRaid?*
 
@@ -95,12 +102,21 @@ occasionally build the image on and see if it works.
 
 **Q:** *How do I proxy this with NGINX?*
 
-.. code::
+**A:** See :ref:`here <setup-nginx>`.
 
-    location / {
-        proxy_pass http://localhost:8000/
-    }
+.. _faq-mod_wsgi:
 
-And that's about it. Paperless serves everything, including static files by itself
-when running the docker image. If you want to do anything fancy, you have to
-install paperless bare metal.
+**Q:** *How do I get WebSocket support with Apache mod_wsgi*?
+
+**A:** ``mod_wsgi`` by itself does not support ASGI. Paperless will continue
+to work with WSGI, but certain features such as status notifications about
+document consumption won't be available.
+
+If you want to continue using ``mod_wsgi``, you will have to run an ASGI-enabled
+web server as well that processes WebSocket connections, and configure Apache to
+redirect WebSocket connections to this server. Multiple options for ASGI servers
+exist:
+
+* ``gunicorn`` with ``uvicorn`` as the worker implementation (the default of paperless)
+* ``daphne`` as a standalone server, which is the reference implementation for ASGI.
+* ``uvicorn`` as a standalone server
diff --git a/docs/index.rst b/docs/index.rst
index a083fb3d1..4035d822e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -70,8 +70,8 @@ Contents
    configuration
    api
    faq
-   extending
    troubleshooting
+   extending
    contributing
    scanners
    screenshots
diff --git a/docs/setup.rst b/docs/setup.rst
index 6d601378d..139db549a 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -588,7 +588,7 @@ Migration to paperless-ng is then performed in a few simple steps:
     paperless.
 
 3.  Download the latest release of paperless-ng. You can either go with the
-    docker-compose files from `here <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`_
+    docker-compose files from `here <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`__
     or clone the repository to build the image yourself (see :ref:`above <setup-docker_build>`).
     You can either replace your current paperless folder or put paperless-ng
     in a different location.
@@ -787,3 +787,46 @@ For details, refer to :ref:`configuration`.
     well as on any other device.
 
 .. _redis: https://redis.io/
+
+
+.. _setup-nginx:
+
+Using nginx as a reverse proxy
+##############################
+
+If you want to expose paperless to the internet, you should hide it behind a
+reverse proxy with SSL enabled. 
+
+In addition to the usual configuration for SSL,
+the following configuration is required for paperless to operate:
+
+.. code:: nginx
+
+    http {
+
+        # Adjust as required. This is the maximum size for file uploads.
+        # The default value 1M might be a little too small.
+        client_max_body_size 10M;
+
+        server {
+
+            location / {
+
+                # Adjust host and port as required.
+                proxy_pass http://localhost:8000/;
+
+                # These configuration options are required for WebSockets to work.
+                proxy_http_version 1.1;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "upgrade";
+
+                proxy_redirect off;
+                proxy_set_header Host $host;
+                proxy_set_header X-Real-IP $remote_addr;
+                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+                proxy_set_header X-Forwarded-Host $server_name;
+            }
+        }
+    }
+
+Also read `this <https://channels.readthedocs.io/en/stable/deploying.html#nginx-supervisor-ubuntu>`__, towards the end of the section.

From 49d2084d8a41b7c76a9651cf5f1cc5daf4020442 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 3 Feb 2021 17:10:45 +0000
Subject: [PATCH 1090/1300] Translate /src-ui/messages.xlf in fr

translation completed for the source file '/src-ui/messages.xlf'
on the 'fr' language.
---
 src-ui/src/locale/messages.fr.xlf | 202 ++++++++++++++++--------------
 1 file changed, 109 insertions(+), 93 deletions(-)

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
index b3c84f14c..0b7e86165 100644
--- a/src-ui/src/locale/messages.fr.xlf
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -214,7 +214,7 @@
         <target>Confirmer la suppression</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">199</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
@@ -222,7 +222,7 @@
         <target>Voulez-vous vraiment supprimer le document &quot;<x equiv-text="this.document.title" id="PH"/>&quot; ?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6691075929777935948">
@@ -230,7 +230,7 @@
         <target>Les fichiers liés à ce document seront supprimés définitivement. Cette action est irréversible.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">201</context>
+          <context context-type="linenumber">205</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="719892092227206532">
@@ -238,7 +238,7 @@
         <target>Supprimer le document</target>
         <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">207</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1844801255494293730">
@@ -246,7 +246,7 @@
         <target>Une erreur s'est produite lors de la suppression du document : <x equiv-text="JSON.stringify(error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">210</context>
+          <context context-type="linenumber">214</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -649,12 +649,20 @@
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab">
+        <source>Notifications</source>
+        <target>Notifications</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="99dee94e92dbd9e21a008d4569f9719ed206ae37">
         <source>Saved views</source>
         <target>Vues enregistrées</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">128</context>
+          <context context-type="linenumber">133</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
@@ -777,68 +785,12 @@
           <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab">
-        <source>Notifications</source>
-        <target>Notifications</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">102</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="8680abbea249ebe9c2fe35556559c8e1a9eb5841">
-        <source>Document processing</source>
-        <target>Traitement de document</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">106</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0">
-        <source>Show notifications when new documents are detected</source>
-        <target>Afficher des notifications lorsque de nouveaux documents sont détectés</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">109</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="e775f4f7c40249d31426ae61a21616a0c9d8e84f">
-        <source>Show notifications when document processing completes successfully</source>
-        <target>Afficher des notifications lorsque le traitement des documents se termine avec succès</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">110</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="e3844dd174d8e817ddb551fae28f14ae80ca36b6">
-        <source>Show notifications when document processing fails</source>
-        <target>Afficher des notifications en cas d'échec du traitement des documents</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">111</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="af113f7c9f7e13145c3461f61a1aedf12d57bd71">
-        <source>Suppress notifications on dashboard</source>
-        <target>Supprimer les notifications du tableau de bord</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">112</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="e27bd3804d2936a6897e81c2e52e294490e5e5a8">
-        <source>This will suppress all messages about document processing status on the dashboard.</source>
-        <target>Cela supprimera tous les messages liés au traitement de documents sur le tableau de bord.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">112</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
         <source>Bulk editing</source>
         <target>Edition en masse</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
@@ -846,7 +798,7 @@
         <target>Afficher les messages de confirmation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
@@ -854,7 +806,7 @@
         <target>La suppression de documents requiert toujours une confirmation.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
@@ -862,7 +814,55 @@
         <target>Appliquer lors de la fermeture</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">121</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8680abbea249ebe9c2fe35556559c8e1a9eb5841">
+        <source>Document processing</source>
+        <target>Traitement de document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0">
+        <source>Show notifications when new documents are detected</source>
+        <target>Afficher des notifications lorsque de nouveaux documents sont détectés</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">122</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e775f4f7c40249d31426ae61a21616a0c9d8e84f">
+        <source>Show notifications when document processing completes successfully</source>
+        <target>Afficher des notifications lorsque le traitement des documents se termine avec succès</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e3844dd174d8e817ddb551fae28f14ae80ca36b6">
+        <source>Show notifications when document processing fails</source>
+        <target>Afficher des notifications en cas d'échec du traitement des documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">124</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af113f7c9f7e13145c3461f61a1aedf12d57bd71">
+        <source>Suppress notifications on dashboard</source>
+        <target>Supprimer les notifications du tableau de bord</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e27bd3804d2936a6897e81c2e52e294490e5e5a8">
+        <source>This will suppress all messages about document processing status on the dashboard.</source>
+        <target>Cela supprimera tous les messages liés au traitement de documents sur le tableau de bord.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
@@ -870,7 +870,7 @@
         <target>Apparaît sur</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">140</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
@@ -878,7 +878,7 @@
         <target>Montrer sur le tableau de bord</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">143</context>
+          <context context-type="linenumber">148</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
@@ -886,7 +886,7 @@
         <target>Montrer dans la barre latérale</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">147</context>
+          <context context-type="linenumber">152</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
@@ -894,7 +894,7 @@
         <target>Aucune vue sauvegardée n'est définie.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
@@ -1119,7 +1119,7 @@
         <target>Gestion</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">112</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="408cb6073e60c5d966296a3207fc596adca75e01">
@@ -1127,15 +1127,15 @@
         <target>Administration</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">154</context>
+          <context context-type="linenumber">149</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
-        <source>Misc</source>
-        <target>Divers</target>
+      <trans-unit datatype="html" id="321e4419a943044e674beb55b8039f42a9761ca5">
+        <source>Info</source>
+        <target>Info</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">155</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
@@ -1143,7 +1143,7 @@
         <target>Documentation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">167</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
@@ -1151,7 +1151,15 @@
         <target>GitHub</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">174</context>
+          <context context-type="linenumber">170</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ea3a452c5238897cabc5781308cceb2d37dcf258">
+        <source>Suggest an idea</source>
+        <target>Suggérer une idée</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">176</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
@@ -1167,7 +1175,7 @@
         <target>Documents ouverts</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="dca5bf9344a759fa5a07f1b21f50286ec242ba44">
@@ -1175,7 +1183,7 @@
         <target>Fermer tout</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">101</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5195932016807797291">
@@ -1670,6 +1678,14 @@
           <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="1405142710727603568">
+        <source>HTTP error: <x equiv-text="error.status" id="PH"/> <x equiv-text="error.statusText" id="PH_1"/></source>
+        <target>Erreur HTTP : <x equiv-text="error.status" id="PH"/> <x equiv-text="error.statusText" id="PH_1"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
         <source>Upload new documents</source>
         <target>Charger de nouveaux documents</target>
@@ -1861,7 +1877,7 @@
         <target>Le document existe déjà.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="148389968432135849">
@@ -1869,7 +1885,7 @@
         <target>Fichier non trouvé.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1520671543092565667">
@@ -1877,7 +1893,7 @@
         <target>Le script de pré-traitement n'existe pas.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">17</context>
         </context-group>
         <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
@@ -1886,7 +1902,7 @@
         <target>Erreur lors de l'exécution du script de pré-traitement.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">18</context>
         </context-group>
         <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
@@ -1895,7 +1911,7 @@
         <target>Le script de post-traitement n'existe pas.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="linenumber">19</context>
         </context-group>
         <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
@@ -1904,7 +1920,7 @@
         <target>Erreur lors de l'exécution du script de post-traitement.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
         <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
       </trans-unit>
@@ -1913,7 +1929,7 @@
         <target>Réception d'un nouveau fichier.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7337565919209746135">
@@ -1921,7 +1937,7 @@
         <target>Type de fichier non pris en charge.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5002399167376099234">
@@ -1929,7 +1945,7 @@
         <target>Traitement du document...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1085975194762600381">
@@ -1937,7 +1953,7 @@
         <target>Génération de vignette...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3280851677698431426">
@@ -1945,7 +1961,7 @@
         <target>Extraction de la date du document...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7162102384876037296">
@@ -1953,7 +1969,7 @@
         <target>Enregistrement du document...</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4550450765009165976">
@@ -1961,7 +1977,7 @@
         <target>Terminé.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
-          <context context-type="linenumber">26</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1519954996184640001">

From ba3c8308b369a329f1e92e4419f6d8ad697c667f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 3 Feb 2021 20:44:10 +0100
Subject: [PATCH 1091/1300] websocket authentication

---
 src/paperless/consumers.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/paperless/consumers.py b/src/paperless/consumers.py
index 21a0e3ede..b3d31b402 100644
--- a/src/paperless/consumers.py
+++ b/src/paperless/consumers.py
@@ -1,14 +1,19 @@
 import json
 
 from asgiref.sync import async_to_sync
+from channels.exceptions import DenyConnection, AcceptConnection
 from channels.generic.websocket import WebsocketConsumer
 
 
 class StatusConsumer(WebsocketConsumer):
+
     def connect(self):
-        self.accept()
-        async_to_sync(self.channel_layer.group_add)(
-            'status_updates', self.channel_name)
+        if not self.scope['user'].is_authenticated:
+            raise DenyConnection()
+        else:
+            async_to_sync(self.channel_layer.group_add)(
+                'status_updates', self.channel_name)
+            raise AcceptConnection()
 
     def disconnect(self, close_code):
         async_to_sync(self.channel_layer.group_discard)(

From c51fa6017235fe14b757a6d536f74064cff6c578 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 3 Feb 2021 21:53:39 +0100
Subject: [PATCH 1092/1300] close connection when not authenticated anymore.

---
 src/paperless/consumers.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/paperless/consumers.py b/src/paperless/consumers.py
index b3d31b402..45f6ad9c5 100644
--- a/src/paperless/consumers.py
+++ b/src/paperless/consumers.py
@@ -7,8 +7,11 @@ from channels.generic.websocket import WebsocketConsumer
 
 class StatusConsumer(WebsocketConsumer):
 
+    def _authenticated(self):
+        return 'user' in self.scope and self.scope['user'].is_authenticated
+
     def connect(self):
-        if not self.scope['user'].is_authenticated:
+        if not self._authenticated():
             raise DenyConnection()
         else:
             async_to_sync(self.channel_layer.group_add)(
@@ -20,4 +23,7 @@ class StatusConsumer(WebsocketConsumer):
             'status_updates', self.channel_name)
 
     def status_update(self, event):
-        self.send(json.dumps(event['data']))
+        if not self._authenticated():
+            self.close()
+        else:
+            self.send(json.dumps(event['data']))

From b9e1ed7d7e2a60752434a6493be429040d502c75 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 3 Feb 2021 23:18:28 +0100
Subject: [PATCH 1093/1300] added test for web socket authentication

---
 src/paperless/tests/test_websockets.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 src/paperless/tests/test_websockets.py

diff --git a/src/paperless/tests/test_websockets.py b/src/paperless/tests/test_websockets.py
new file mode 100644
index 000000000..e5745ce77
--- /dev/null
+++ b/src/paperless/tests/test_websockets.py
@@ -0,0 +1,25 @@
+from unittest import mock
+
+from channels.testing import WebsocketCommunicator
+from django.test import TestCase
+
+from paperless.asgi import application
+
+
+class TestWebSockets(TestCase):
+
+    async def test_no_auth(self):
+        communicator = WebsocketCommunicator(application, "/ws/status/")
+        connected, subprotocol = await communicator.connect()
+        self.assertFalse(connected)
+        await communicator.disconnect()
+
+    @mock.patch("paperless.consumers.StatusConsumer._authenticated")
+    async def test_auth(self, _authenticated):
+        _authenticated.return_value = True
+
+        communicator = WebsocketCommunicator(application, "/ws/status/")
+        connected, subprotocol = await communicator.connect()
+        self.assertTrue(connected)
+
+        await communicator.disconnect()

From 883a6b26a4e71e94e65749389a6d82812f5dfced Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 4 Feb 2021 00:17:23 +0100
Subject: [PATCH 1094/1300] update gunicorn.conf

---
 gunicorn.conf.py | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/gunicorn.conf.py b/gunicorn.conf.py
index 36bde9cf7..a67b20d0c 100644
--- a/gunicorn.conf.py
+++ b/gunicorn.conf.py
@@ -1,21 +1,7 @@
 bind = '0.0.0.0:8000'
-backlog = 2048
-workers = 3
+workers = 2
 worker_class = 'uvicorn.workers.UvicornWorker'
-worker_connections = 1000
 timeout = 20
-keepalive = 2
-spew = False
-daemon = False
-pidfile = None
-umask = 0
-user = None
-group = None
-tmp_upload_dir = None
-loglevel = 'info'
-errorlog = '-'
-accesslog = '-'
-proc_name = None
 
 def pre_fork(server, worker):
     pass

From 44ec3a3d9c5fe0b5916839495fcd3461d4af106d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 4 Feb 2021 13:17:24 +0100
Subject: [PATCH 1095/1300] lazy loading for parsers

---
 src/documents/tests/test_parsers.py | 4 ++--
 src/paperless_tesseract/signals.py  | 8 ++++++--
 src/paperless_text/signals.py       | 8 ++++++--
 src/paperless_tika/__init__.py      | 0
 src/paperless_tika/signals.py       | 8 ++++++--
 5 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 src/paperless_tika/__init__.py

diff --git a/src/documents/tests/test_parsers.py b/src/documents/tests/test_parsers.py
index 392c0504f..8da6470a4 100644
--- a/src/documents/tests/test_parsers.py
+++ b/src/documents/tests/test_parsers.py
@@ -114,8 +114,8 @@ class TestParserAvailability(TestCase):
         self.assertEqual(get_default_file_extension('application/zip'), ".zip")
         self.assertEqual(get_default_file_extension('aasdasd/dgfgf'), "")
 
-        self.assertEqual(get_parser_class_for_mime_type('application/pdf'), RasterisedDocumentParser)
-        self.assertEqual(get_parser_class_for_mime_type('text/plain'), TextDocumentParser)
+        self.assertIsInstance(get_parser_class_for_mime_type('application/pdf')(logging_group=None), RasterisedDocumentParser)
+        self.assertIsInstance(get_parser_class_for_mime_type('text/plain')(logging_group=None), TextDocumentParser)
         self.assertEqual(get_parser_class_for_mime_type('text/sdgsdf'), None)
 
         self.assertTrue(is_file_ext_supported('.pdf'))
diff --git a/src/paperless_tesseract/signals.py b/src/paperless_tesseract/signals.py
index 1e1cd1e1a..fedd08a92 100644
--- a/src/paperless_tesseract/signals.py
+++ b/src/paperless_tesseract/signals.py
@@ -1,9 +1,13 @@
-from .parsers import RasterisedDocumentParser
+
+def get_parser(*args, **kwargs):
+    from .parsers import RasterisedDocumentParser
+
+    return RasterisedDocumentParser(*args, **kwargs)
 
 
 def tesseract_consumer_declaration(sender, **kwargs):
     return {
-        "parser": RasterisedDocumentParser,
+        "parser": get_parser,
         "weight": 0,
         "mime_types": {
             "application/pdf": ".pdf",
diff --git a/src/paperless_text/signals.py b/src/paperless_text/signals.py
index 1e0493f4f..833d0be28 100644
--- a/src/paperless_text/signals.py
+++ b/src/paperless_text/signals.py
@@ -1,9 +1,13 @@
-from .parsers import TextDocumentParser
+
+def get_parser(*args, **kwargs):
+    from .parsers import TextDocumentParser
+
+    return TextDocumentParser(*args, **kwargs)
 
 
 def text_consumer_declaration(sender, **kwargs):
     return {
-        "parser": TextDocumentParser,
+        "parser": get_parser,
         "weight": 10,
         "mime_types": {
             "text/plain": ".txt",
diff --git a/src/paperless_tika/__init__.py b/src/paperless_tika/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/paperless_tika/signals.py b/src/paperless_tika/signals.py
index 137416abb..dbda377ca 100644
--- a/src/paperless_tika/signals.py
+++ b/src/paperless_tika/signals.py
@@ -1,9 +1,13 @@
-from .parsers import TikaDocumentParser
+
+def get_parser(*args, **kwargs):
+    from .parsers import TikaDocumentParser
+
+    return TikaDocumentParser(*args, **kwargs)
 
 
 def tika_consumer_declaration(sender, **kwargs):
     return {
-        "parser": TikaDocumentParser,
+        "parser": get_parser,
         "weight": 10,
         "mime_types": {
             "application/msword": ".doc",

From 8711a206a0eb7dafa40ba172c51f0d6ce8821845 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 4 Feb 2021 13:26:58 +0100
Subject: [PATCH 1096/1300] fix websocket test cases

---
 src/paperless/tests/test_websockets.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/paperless/tests/test_websockets.py b/src/paperless/tests/test_websockets.py
index e5745ce77..4f98fe2b5 100644
--- a/src/paperless/tests/test_websockets.py
+++ b/src/paperless/tests/test_websockets.py
@@ -8,14 +8,16 @@ from paperless.asgi import application
 
 class TestWebSockets(TestCase):
 
-    async def test_no_auth(self):
+    @mock.patch("paperless.consumers.async_to_sync")
+    async def test_no_auth(self, async_to_sync):
         communicator = WebsocketCommunicator(application, "/ws/status/")
         connected, subprotocol = await communicator.connect()
         self.assertFalse(connected)
         await communicator.disconnect()
 
+    @mock.patch("paperless.consumers.async_to_sync")
     @mock.patch("paperless.consumers.StatusConsumer._authenticated")
-    async def test_auth(self, _authenticated):
+    async def test_auth(self, _authenticated, async_to_sync):
         _authenticated.return_value = True
 
         communicator = WebsocketCommunicator(application, "/ws/status/")

From 758631c53f29ca5d8637fc44a6fb643237c790ce Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Thu, 4 Feb 2021 13:31:20 +0100
Subject: [PATCH 1097/1300] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0fc3185a1..80b9c85fe 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 [![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)
 [![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)

From 866c8fc848d1b5918bdbd76b87caff71b9e9cf50 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 4 Feb 2021 14:17:18 +0100
Subject: [PATCH 1098/1300] websocket testing

---
 src/paperless/tests/test_websockets.py | 43 +++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/paperless/tests/test_websockets.py b/src/paperless/tests/test_websockets.py
index 4f98fe2b5..e1b948edf 100644
--- a/src/paperless/tests/test_websockets.py
+++ b/src/paperless/tests/test_websockets.py
@@ -1,23 +1,31 @@
 from unittest import mock
 
+from channels.layers import get_channel_layer
 from channels.testing import WebsocketCommunicator
-from django.test import TestCase
+from django.test import TestCase, override_settings
 
 from paperless.asgi import application
 
 
+TEST_CHANNEL_LAYERS = {
+    'default': {
+        'BACKEND': 'channels.layers.InMemoryChannelLayer',
+    },
+}
+
+
 class TestWebSockets(TestCase):
 
-    @mock.patch("paperless.consumers.async_to_sync")
-    async def test_no_auth(self, async_to_sync):
+    @override_settings(CHANNEL_LAYERS=TEST_CHANNEL_LAYERS)
+    async def test_no_auth(self):
         communicator = WebsocketCommunicator(application, "/ws/status/")
         connected, subprotocol = await communicator.connect()
         self.assertFalse(connected)
         await communicator.disconnect()
 
-    @mock.patch("paperless.consumers.async_to_sync")
+    @override_settings(CHANNEL_LAYERS=TEST_CHANNEL_LAYERS)
     @mock.patch("paperless.consumers.StatusConsumer._authenticated")
-    async def test_auth(self, _authenticated, async_to_sync):
+    async def test_auth(self, _authenticated):
         _authenticated.return_value = True
 
         communicator = WebsocketCommunicator(application, "/ws/status/")
@@ -25,3 +33,28 @@ class TestWebSockets(TestCase):
         self.assertTrue(connected)
 
         await communicator.disconnect()
+
+    @override_settings(CHANNEL_LAYERS=TEST_CHANNEL_LAYERS)
+    @mock.patch("paperless.consumers.StatusConsumer._authenticated")
+    async def test_receive(self, _authenticated):
+        _authenticated.return_value = True
+
+        communicator = WebsocketCommunicator(application, "/ws/status/")
+        connected, subprotocol = await communicator.connect()
+        self.assertTrue(connected)
+
+        message = {
+            "task_id": "test"
+        }
+
+        channel_layer = get_channel_layer()
+        await channel_layer.group_send("status_updates", {
+            "type": "status_update",
+            "data": message
+        })
+
+        response = await communicator.receive_json_from()
+
+        self.assertEqual(response, message)
+
+        await communicator.disconnect()

From d8e0ef257e73f28bc8eb7ae71a6d56f1c518ea7d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 4 Feb 2021 15:15:11 +0100
Subject: [PATCH 1099/1300] don't load sklearn libraries unless needed

---
 src/documents/classifier.py            |  10 ++++++----
 src/documents/tests/data/model.pickle  | Bin 0 -> 156345 bytes
 src/documents/tests/test_classifier.py |   9 +++++++++
 src/paperless/settings.py              |  13 ++++++++-----
 4 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 src/documents/tests/data/model.pickle

diff --git a/src/documents/classifier.py b/src/documents/classifier.py
index b427264c8..3051b82a5 100755
--- a/src/documents/classifier.py
+++ b/src/documents/classifier.py
@@ -5,10 +5,6 @@ import pickle
 import re
 
 from django.conf import settings
-from sklearn.feature_extraction.text import CountVectorizer
-from sklearn.neural_network import MLPClassifier
-from sklearn.preprocessing import MultiLabelBinarizer, LabelBinarizer
-from sklearn.utils.multiclass import type_of_target
 
 from documents.models import Document, MatchingModel
 
@@ -109,6 +105,10 @@ class DocumentClassifier(object):
             pickle.dump(self.document_type_classifier, f)
 
     def train(self):
+        from sklearn.feature_extraction.text import CountVectorizer
+        from sklearn.neural_network import MLPClassifier
+        from sklearn.preprocessing import MultiLabelBinarizer, LabelBinarizer
+
         data = list()
         labels_tags = list()
         labels_correspondent = list()
@@ -265,6 +265,8 @@ class DocumentClassifier(object):
             return None
 
     def predict_tags(self, content):
+        from sklearn.utils.multiclass import type_of_target
+
         if self.tags_classifier:
             X = self.data_vectorizer.transform([preprocess_content(content)])
             y = self.tags_classifier.predict(X)
diff --git a/src/documents/tests/data/model.pickle b/src/documents/tests/data/model.pickle
new file mode 100644
index 0000000000000000000000000000000000000000..db303ec807671383449aa8ac83a427d814a5ca2f
GIT binary patch
literal 156345
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

literal 0
HcmV?d00001

diff --git a/src/documents/tests/test_classifier.py b/src/documents/tests/test_classifier.py
index 43c38b691..14673ae65 100644
--- a/src/documents/tests/test_classifier.py
+++ b/src/documents/tests/test_classifier.py
@@ -130,6 +130,15 @@ class TestClassifier(DirectoriesMixin, TestCase):
         new_classifier.reload()
         self.assertFalse(new_classifier.train())
 
+    @override_settings(MODEL_FILE=os.path.join(os.path.dirname(__file__), "data", "model.pickle"))
+    def test_load_and_classify(self):
+        self.generate_test_data()
+
+        new_classifier = DocumentClassifier()
+        new_classifier.reload()
+
+        self.assertCountEqual(new_classifier.predict_tags(self.doc2.content), [45, 12])
+
     def test_one_correspondent_predict(self):
         c1 = Correspondent.objects.create(name="c1", matching_algorithm=Correspondent.MATCH_AUTO)
         doc1 = Document.objects.create(title="doc1", content="this is a document from c1", correspondent=c1, checksum="A")
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index b6d01ba53..56e91695e 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -4,7 +4,6 @@ import multiprocessing
 import os
 import re
 
-import dateparser
 from dotenv import load_dotenv
 
 from django.utils.translation import gettext_lazy as _
@@ -491,7 +490,11 @@ if PAPERLESS_TIKA_ENABLED:
 
 # List dates that should be ignored when trying to parse date from document text
 IGNORE_DATES = set()
-for s in os.getenv("PAPERLESS_IGNORE_DATES", "").split(","):
-    d = dateparser.parse(s)
-    if d:
-        IGNORE_DATES.add(d.date())
+
+if os.getenv("PAPERLESS_IGNORE_DATES", ""):
+    import dateparser
+
+    for s in os.getenv("PAPERLESS_IGNORE_DATES", "").split(","):
+        d = dateparser.parse(s)
+        if d:
+            IGNORE_DATES.add(d.date())

From 5718f50c4f16982232128ea6da83067e48b6bc5a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 4 Feb 2021 15:46:51 +0100
Subject: [PATCH 1100/1300] increase worker timeout for Raspberry Pi

---
 gunicorn.conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gunicorn.conf.py b/gunicorn.conf.py
index a67b20d0c..f80be548d 100644
--- a/gunicorn.conf.py
+++ b/gunicorn.conf.py
@@ -1,7 +1,7 @@
 bind = '0.0.0.0:8000'
 workers = 2
 worker_class = 'uvicorn.workers.UvicornWorker'
-timeout = 20
+timeout = 60
 
 def pre_fork(server, worker):
     pass

From 222fb483789ef5ec78064427f74c8afef07c0294 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 4 Feb 2021 16:55:48 +0100
Subject: [PATCH 1101/1300] dismiss completed dismisses successful items only

---
 .../upload-file-widget/upload-file-widget.component.html      | 2 +-
 .../upload-file-widget/upload-file-widget.component.ts        | 4 ++--
 src-ui/src/app/services/consumer-status.service.ts            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
index eb1e1da73..c4f7fa21c 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html
@@ -1,6 +1,6 @@
 <app-widget-frame title="Upload new documents" i18n-title>
   <div header-buttons>
-    <a *ngIf="getStatusCompleted().length > 0" (click)="dismissAll()" [routerLink]="" >
+    <a *ngIf="getStatusSuccess().length > 0" (click)="dismissCompleted()" [routerLink]="" >
       <span i18n="This button dismisses all status messages about processed documents on the dashboard (failed and successful)">Dismiss completed</span>&nbsp;
       <svg xmlns="http://www.w3.org/2000/svg" width="1rem" height="1rem" fill="currentColor" class="bi bi-check2-all" viewBox="0 0 16 16">
         <path d="M12.354 4.354a.5.5 0 0 0-.708-.708L5 10.293 1.854 7.146a.5.5 0 1 0-.708.708l3.5 3.5a.5.5 0 0 0 .708 0l7-7zm-4.208 7l-.896-.897.707-.707.543.543 6.646-6.647a.5.5 0 0 1 .708.708l-7 7a.5.5 0 0 1-.708 0z"/>
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
index 2412290c0..e74e2bc41 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
@@ -92,8 +92,8 @@ export class UploadFileWidgetComponent implements OnInit {
     this.consumerStatusService.dismiss(status)
   }
 
-  dismissAll() {
-    this.consumerStatusService.dismissAll()
+  dismissCompleted() {
+    this.consumerStatusService.dismissCompleted()
   }
 
   ngOnInit(): void {
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index 38f29a528..23df0871f 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -176,8 +176,8 @@ export class ConsumerStatusService {
     }
   }
 
-  dismissAll() {
-    this.consumerStatus = this.consumerStatus.filter(status => status.phase < FileStatusPhase.SUCCESS)
+  dismissCompleted() {
+    this.consumerStatus = this.consumerStatus.filter(status => status.phase != FileStatusPhase.SUCCESS)
   }
 
   onDocumentConsumptionFinished() {

From 138f38d1f379a405b63b36cab9f8d8b7d8458746 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 4 Feb 2021 23:32:11 +0100
Subject: [PATCH 1102/1300] fix lost messages when queuing many files

---
 src/paperless/settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 56e91695e..5a3c206ed 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -160,6 +160,8 @@ CHANNEL_LAYERS = {
         "BACKEND": "channels_redis.core.RedisChannelLayer",
         "CONFIG": {
             "hosts": [os.getenv("PAPERLESS_REDIS", "redis://localhost:6379")],
+            "capacity": 2000,  # default 100
+            "expiry": 15,  # default 60
         },
     },
 }

From 0d3ab3aaf7479d2b644c1746497f669d9f43d461 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 4 Feb 2021 23:40:53 +0100
Subject: [PATCH 1103/1300] remove lots of unused code

---
 .../management/commands/document_archiver.py         |  7 +------
 .../commands/document_create_classifier.py           |  3 +--
 .../management/commands/document_exporter.py         |  3 +--
 .../management/commands/document_importer.py         |  3 +--
 src/documents/management/commands/document_index.py  |  9 +--------
 src/documents/management/commands/document_logs.py   | 12 ------------
 .../management/commands/document_renamer.py          |  9 +--------
 .../management/commands/document_retagger.py         |  9 +--------
 .../management/commands/document_thumbnails.py       | 10 +---------
 src/documents/mixins.py                              |  9 ---------
 10 files changed, 8 insertions(+), 66 deletions(-)
 delete mode 100644 src/documents/management/commands/document_logs.py
 delete mode 100755 src/documents/mixins.py

diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index 01bd819c5..9e0d8fabf 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -17,7 +17,6 @@ from whoosh.writing import AsyncWriter
 from documents.models import Document
 from ... import index
 from ...file_handling import create_source_path_directory
-from ...mixins import Renderable
 from ...parsers import get_parser_class_for_mime_type
 
 
@@ -62,7 +61,7 @@ def handle_document(document_id):
         parser.cleanup()
 
 
-class Command(Renderable, BaseCommand):
+class Command(BaseCommand):
 
     help = """
         Using the current classification model, assigns correspondents, tags
@@ -71,10 +70,6 @@ class Command(Renderable, BaseCommand):
         modified) after their initial import.
     """.replace("    ", "")
 
-    def __init__(self, *args, **kwargs):
-        self.verbosity = 0
-        BaseCommand.__init__(self, *args, **kwargs)
-
     def add_arguments(self, parser):
         parser.add_argument(
             "-f", "--overwrite",
diff --git a/src/documents/management/commands/document_create_classifier.py b/src/documents/management/commands/document_create_classifier.py
index fbfb7f7e6..a4ede88b5 100755
--- a/src/documents/management/commands/document_create_classifier.py
+++ b/src/documents/management/commands/document_create_classifier.py
@@ -1,10 +1,9 @@
 from django.core.management.base import BaseCommand
 
-from ...mixins import Renderable
 from ...tasks import train_classifier
 
 
-class Command(Renderable, BaseCommand):
+class Command(BaseCommand):
 
     help = """
         Trains the classifier on your data and saves the resulting models to a
diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py
index 37fcf2024..1505b0856 100644
--- a/src/documents/management/commands/document_exporter.py
+++ b/src/documents/management/commands/document_exporter.py
@@ -16,10 +16,9 @@ from documents.settings import EXPORTER_FILE_NAME, EXPORTER_THUMBNAIL_NAME, \
     EXPORTER_ARCHIVE_NAME
 from paperless.db import GnuPG
 from ...file_handling import generate_filename, delete_empty_directories
-from ...mixins import Renderable
 
 
-class Command(Renderable, BaseCommand):
+class Command(BaseCommand):
 
     help = """
         Decrypt and rename all files in our collection into a given target
diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py
index a2e19e3cc..7e5d32085 100644
--- a/src/documents/management/commands/document_importer.py
+++ b/src/documents/management/commands/document_importer.py
@@ -15,7 +15,6 @@ from documents.models import Document
 from documents.settings import EXPORTER_FILE_NAME, EXPORTER_THUMBNAIL_NAME, \
     EXPORTER_ARCHIVE_NAME
 from ...file_handling import create_source_path_directory
-from ...mixins import Renderable
 from ...signals.handlers import update_filename_and_move_files
 
 
@@ -28,7 +27,7 @@ def disable_signal(sig, receiver, sender):
         sig.connect(receiver=receiver, sender=sender)
 
 
-class Command(Renderable, BaseCommand):
+class Command(BaseCommand):
 
     help = """
         Using a manifest.json file, load the data from there, and import the
diff --git a/src/documents/management/commands/document_index.py b/src/documents/management/commands/document_index.py
index 08e20e1d2..5faa70b9f 100644
--- a/src/documents/management/commands/document_index.py
+++ b/src/documents/management/commands/document_index.py
@@ -1,24 +1,17 @@
 from django.core.management import BaseCommand
 from django.db import transaction
 
-from documents.mixins import Renderable
 from documents.tasks import index_reindex, index_optimize
 
 
-class Command(Renderable, BaseCommand):
+class Command(BaseCommand):
 
     help = "Manages the document index."
 
-    def __init__(self, *args, **kwargs):
-        self.verbosity = 0
-        BaseCommand.__init__(self, *args, **kwargs)
-
     def add_arguments(self, parser):
         parser.add_argument("command", choices=['reindex', 'optimize'])
 
     def handle(self, *args, **options):
-
-        self.verbosity = options["verbosity"]
         with transaction.atomic():
             if options['command'] == 'reindex':
                 index_reindex()
diff --git a/src/documents/management/commands/document_logs.py b/src/documents/management/commands/document_logs.py
deleted file mode 100644
index 06efc3850..000000000
--- a/src/documents/management/commands/document_logs.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from django.core.management.base import BaseCommand
-
-from documents.models import Log
-
-
-class Command(BaseCommand):
-
-    help = "A quick & dirty way to see what's in the logs"
-
-    def handle(self, *args, **options):
-        for log in Log.objects.order_by("pk"):
-            print(log)
diff --git a/src/documents/management/commands/document_renamer.py b/src/documents/management/commands/document_renamer.py
index 745d2d03d..f311715c6 100644
--- a/src/documents/management/commands/document_renamer.py
+++ b/src/documents/management/commands/document_renamer.py
@@ -5,23 +5,16 @@ from django.core.management.base import BaseCommand
 from django.db.models.signals import post_save
 
 from documents.models import Document
-from ...mixins import Renderable
 
 
-class Command(Renderable, BaseCommand):
+class Command(BaseCommand):
 
     help = """
         This will rename all documents to match the latest filename format.
     """.replace("    ", "")
 
-    def __init__(self, *args, **kwargs):
-        self.verbosity = 0
-        BaseCommand.__init__(self, *args, **kwargs)
-
     def handle(self, *args, **options):
 
-        self.verbosity = options["verbosity"]
-
         logging.getLogger().handlers[0].level = logging.ERROR
 
         for document in tqdm.tqdm(Document.objects.all()):
diff --git a/src/documents/management/commands/document_retagger.py b/src/documents/management/commands/document_retagger.py
index b2f5d8918..a37ab9ef2 100755
--- a/src/documents/management/commands/document_retagger.py
+++ b/src/documents/management/commands/document_retagger.py
@@ -4,11 +4,10 @@ from django.core.management.base import BaseCommand
 
 from documents.classifier import load_classifier
 from documents.models import Document
-from ...mixins import Renderable
 from ...signals.handlers import set_correspondent, set_document_type, set_tags
 
 
-class Command(Renderable, BaseCommand):
+class Command(BaseCommand):
 
     help = """
         Using the current classification model, assigns correspondents, tags
@@ -17,10 +16,6 @@ class Command(Renderable, BaseCommand):
         modified) after their initial import.
     """.replace("    ", "")
 
-    def __init__(self, *args, **kwargs):
-        self.verbosity = 0
-        BaseCommand.__init__(self, *args, **kwargs)
-
     def add_arguments(self, parser):
         parser.add_argument(
             "-c", "--correspondent",
@@ -61,8 +56,6 @@ class Command(Renderable, BaseCommand):
 
     def handle(self, *args, **options):
 
-        self.verbosity = options["verbosity"]
-
         if options["inbox_only"]:
             queryset = Document.objects.filter(tags__is_inbox_tag=True)
         else:
diff --git a/src/documents/management/commands/document_thumbnails.py b/src/documents/management/commands/document_thumbnails.py
index 6f6451599..cf2cbeb77 100644
--- a/src/documents/management/commands/document_thumbnails.py
+++ b/src/documents/management/commands/document_thumbnails.py
@@ -7,7 +7,6 @@ from django import db
 from django.core.management.base import BaseCommand
 
 from documents.models import Document
-from ...mixins import Renderable
 from ...parsers import get_parser_class_for_mime_type
 
 
@@ -30,16 +29,12 @@ def _process_document(doc_in):
         parser.cleanup()
 
 
-class Command(Renderable, BaseCommand):
+class Command(BaseCommand):
 
     help = """
         This will regenerate the thumbnails for all documents.
     """.replace("    ", "")
 
-    def __init__(self, *args, **kwargs):
-        self.verbosity = 0
-        BaseCommand.__init__(self, *args, **kwargs)
-
     def add_arguments(self, parser):
         parser.add_argument(
             "-d", "--document",
@@ -51,9 +46,6 @@ class Command(Renderable, BaseCommand):
         )
 
     def handle(self, *args, **options):
-
-        self.verbosity = options["verbosity"]
-
         logging.getLogger().handlers[0].level = logging.ERROR
 
         if options['document']:
diff --git a/src/documents/mixins.py b/src/documents/mixins.py
deleted file mode 100755
index 949be02e8..000000000
--- a/src/documents/mixins.py
+++ /dev/null
@@ -1,9 +0,0 @@
-class Renderable:
-    """
-    A handy mixin to make it easier/cleaner to print output based on a
-    verbosity value.
-    """
-
-    def _render(self, text, verbosity):
-        if self.verbosity >= verbosity:
-            print(text)

From 431d4fd8e460bf9e93b912fb5a55b76aaa6933df Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 5 Feb 2021 01:10:29 +0100
Subject: [PATCH 1104/1300] rework most of the logging

---
 src/documents/classifier.py                   | 20 +++++-----
 src/documents/consumer.py                     |  2 +
 src/documents/file_handling.py                |  5 ++-
 src/documents/index.py                        |  2 +-
 src/documents/loggers.py                      | 26 ++++---------
 .../management/commands/document_archiver.py  |  2 +-
 .../management/commands/document_consumer.py  | 13 ++-----
 .../management/commands/document_retagger.py  |  5 ++-
 src/documents/matching.py                     |  2 +-
 src/documents/parsers.py                      |  6 ++-
 src/documents/signals/handlers.py             | 39 +++++++++----------
 src/documents/tasks.py                        |  9 +++--
 src/documents/views.py                        |  5 ++-
 src/paperless_mail/mail.py                    |  2 +
 src/paperless_mail/tasks.py                   |  7 +++-
 src/paperless_tesseract/parsers.py            |  2 +
 src/paperless_text/parsers.py                 |  2 +
 src/paperless_tika/parsers.py                 |  2 +
 18 files changed, 80 insertions(+), 71 deletions(-)

diff --git a/src/documents/classifier.py b/src/documents/classifier.py
index 3051b82a5..2acebe04a 100755
--- a/src/documents/classifier.py
+++ b/src/documents/classifier.py
@@ -13,7 +13,7 @@ class IncompatibleClassifierVersionError(Exception):
     pass
 
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("paperless.classifier")
 
 
 def preprocess_content(content):
@@ -115,7 +115,7 @@ class DocumentClassifier(object):
         labels_document_type = list()
 
         # Step 1: Extract and preprocess training data from the database.
-        logging.getLogger(__name__).debug("Gathering data from database...")
+        logger.debug("Gathering data from database...")
         m = hashlib.sha1()
         for doc in Document.objects.order_by('pk').exclude(tags__is_inbox_tag=True):  # NOQA: E501
             preprocessed_content = preprocess_content(doc.content)
@@ -162,7 +162,7 @@ class DocumentClassifier(object):
         num_correspondents = len(set(labels_correspondent) | {-1}) - 1
         num_document_types = len(set(labels_document_type) | {-1}) - 1
 
-        logging.getLogger(__name__).debug(
+        logger.debug(
             "{} documents, {} tag(s), {} correspondent(s), "
             "{} document type(s).".format(
                 len(data),
@@ -173,7 +173,7 @@ class DocumentClassifier(object):
         )
 
         # Step 2: vectorize data
-        logging.getLogger(__name__).debug("Vectorizing data...")
+        logger.debug("Vectorizing data...")
         self.data_vectorizer = CountVectorizer(
             analyzer="word",
             ngram_range=(1, 2),
@@ -183,7 +183,7 @@ class DocumentClassifier(object):
 
         # Step 3: train the classifiers
         if num_tags > 0:
-            logging.getLogger(__name__).debug("Training tags classifier...")
+            logger.debug("Training tags classifier...")
 
             if num_tags == 1:
                 # Special case where only one tag has auto:
@@ -202,12 +202,12 @@ class DocumentClassifier(object):
             self.tags_classifier.fit(data_vectorized, labels_tags_vectorized)
         else:
             self.tags_classifier = None
-            logging.getLogger(__name__).debug(
+            logger.debug(
                 "There are no tags. Not training tags classifier."
             )
 
         if num_correspondents > 0:
-            logging.getLogger(__name__).debug(
+            logger.debug(
                 "Training correspondent classifier..."
             )
             self.correspondent_classifier = MLPClassifier(tol=0.01)
@@ -217,13 +217,13 @@ class DocumentClassifier(object):
             )
         else:
             self.correspondent_classifier = None
-            logging.getLogger(__name__).debug(
+            logger.debug(
                 "There are no correspondents. Not training correspondent "
                 "classifier."
             )
 
         if num_document_types > 0:
-            logging.getLogger(__name__).debug(
+            logger.debug(
                 "Training document type classifier..."
             )
             self.document_type_classifier = MLPClassifier(tol=0.01)
@@ -233,7 +233,7 @@ class DocumentClassifier(object):
             )
         else:
             self.document_type_classifier = None
-            logging.getLogger(__name__).debug(
+            logger.debug(
                 "There are no document types. Not training document type "
                 "classifier."
             )
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index f8f7576ef..23988c7c1 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -47,6 +47,8 @@ MESSAGE_FINISHED = "finished"
 
 class Consumer(LoggingMixin):
 
+    logging_name = "paperless.consumer"
+
     def _send_progress(self, current_progress, max_progress, status,
                        message=None, document_id=None):
         payload = {
diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index dd798e8ab..6ee97f5c3 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -8,6 +8,9 @@ from django.conf import settings
 from django.template.defaultfilters import slugify
 
 
+logger = logging.getLogger("paperless.filehandling")
+
+
 class defaultdictNoStr(defaultdict):
 
     def __str__(self):
@@ -140,7 +143,7 @@ def generate_filename(doc, counter=0, append_gpg=True):
             path = path.strip(os.sep)
 
     except (ValueError, KeyError, IndexError):
-        logging.getLogger(__name__).warning(
+        logger.warning(
             f"Invalid PAPERLESS_FILENAME_FORMAT: "
             f"{settings.PAPERLESS_FILENAME_FORMAT}, falling back to default")
 
diff --git a/src/documents/index.py b/src/documents/index.py
index 51197e252..bc17daeb1 100644
--- a/src/documents/index.py
+++ b/src/documents/index.py
@@ -12,7 +12,7 @@ from whoosh.qparser.dateparse import DateParserPlugin
 from whoosh.writing import AsyncWriter
 
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("paperless.index")
 
 
 class JsonFormatter(Formatter):
diff --git a/src/documents/loggers.py b/src/documents/loggers.py
index 863bc0c34..4b0f03552 100644
--- a/src/documents/loggers.py
+++ b/src/documents/loggers.py
@@ -4,33 +4,21 @@ import uuid
 from django.conf import settings
 
 
-class PaperlessHandler(logging.Handler):
-    def emit(self, record):
-        if settings.DISABLE_DBHANDLER:
-            return
-
-        # We have to do the import here or Django will barf when it tries to
-        # load this because the apps aren't loaded at that point
-        from .models import Log
-
-        kwargs = {"message": record.msg, "level": record.levelno}
-
-        if hasattr(record, "group"):
-            kwargs["group"] = record.group
-
-        Log.objects.create(**kwargs)
-
-
 class LoggingMixin:
 
     logging_group = None
 
+    logging_name = None
+
     def renew_logging_group(self):
         self.logging_group = uuid.uuid4()
 
     def log(self, level, message, **kwargs):
-        target = ".".join([self.__class__.__module__, self.__class__.__name__])
-        logger = logging.getLogger(target)
+        if self.logging_name:
+            logger = logging.getLogger(self.logging_name)
+        else:
+            name = ".".join([self.__class__.__module__, self.__class__.__name__])
+            logger = logging.getLogger(name)
 
         getattr(logger, level)(message, extra={
             "group": self.logging_group
diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index 9e0d8fabf..d2ff9c8c2 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -20,7 +20,7 @@ from ...file_handling import create_source_path_directory
 from ...parsers import get_parser_class_for_mime_type
 
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("paperless.management.archiver")
 
 
 def handle_document(document_id):
diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index 232a5b23c..c01743628 100644
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -17,7 +17,7 @@ try:
 except ImportError:
     INotify = flags = None
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("paperless.management.consumer")
 
 
 def _tags_from_path(filepath):
@@ -108,12 +108,7 @@ class Command(BaseCommand):
     # This is here primarily for the tests and is irrelevant in production.
     stop_flag = False
 
-    def __init__(self, *args, **kwargs):
-
-        self.logger = logging.getLogger(__name__)
-
-        BaseCommand.__init__(self, *args, **kwargs)
-        self.observer = None
+    observer = None
 
     def add_arguments(self, parser):
         parser.add_argument(
@@ -161,7 +156,7 @@ class Command(BaseCommand):
         logger.debug("Consumer exiting.")
 
     def handle_polling(self, directory, recursive):
-        logging.getLogger(__name__).info(
+        logger.info(
             f"Polling directory for changes: {directory}")
         self.observer = PollingObserver(timeout=settings.CONSUMER_POLLING)
         self.observer.schedule(Handler(), directory, recursive=recursive)
@@ -176,7 +171,7 @@ class Command(BaseCommand):
         self.observer.join()
 
     def handle_inotify(self, directory, recursive):
-        logging.getLogger(__name__).info(
+        logger.info(
             f"Using inotify to watch directory for changes: {directory}")
 
         inotify = INotify()
diff --git a/src/documents/management/commands/document_retagger.py b/src/documents/management/commands/document_retagger.py
index a37ab9ef2..854117fdd 100755
--- a/src/documents/management/commands/document_retagger.py
+++ b/src/documents/management/commands/document_retagger.py
@@ -7,6 +7,9 @@ from documents.models import Document
 from ...signals.handlers import set_correspondent, set_document_type, set_tags
 
 
+logger = logging.getLogger("paperless.management.retagger")
+
+
 class Command(BaseCommand):
 
     help = """
@@ -65,7 +68,7 @@ class Command(BaseCommand):
         classifier = load_classifier()
 
         for document in documents:
-            logging.getLogger(__name__).info(
+            logger.info(
                 f"Processing document {document.title}")
 
             if options['correspondent']:
diff --git a/src/documents/matching.py b/src/documents/matching.py
index fa9ce6af3..21102bc98 100644
--- a/src/documents/matching.py
+++ b/src/documents/matching.py
@@ -6,7 +6,7 @@ from fuzzywuzzy import fuzz
 from documents.models import MatchingModel, Correspondent, DocumentType, Tag
 
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("paperless.matching")
 
 
 def log_reason(matching_model, document, reason):
diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index a2eb14cef..98af4f080 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -36,7 +36,7 @@ DATE_REGEX = re.compile(
 )
 
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("paperless.parsing")
 
 
 def is_mime_type_supported(mime_type):
@@ -261,6 +261,8 @@ class DocumentParser(LoggingMixin):
     `paperless_tesseract.parsers` for inspiration.
     """
 
+    logging_name = "paperless.parsing"
+
     def __init__(self, logging_group, progress_callback=None):
         super().__init__()
         self.logging_group = logging_group
@@ -316,5 +318,5 @@ class DocumentParser(LoggingMixin):
         return self.date
 
     def cleanup(self):
-        self.log("debug", "Deleting directory {}".format(self.tempdir))
+        self.log("debug", f"Deleting directory {self.tempdir}")
         shutil.rmtree(self.tempdir)
diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 76c1e76ed..848bcb900 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -19,8 +19,7 @@ from ..file_handling import delete_empty_directories, \
 from ..models import Document, Tag
 
 
-def logger(message, group):
-    logging.getLogger(__name__).debug(message, extra={"group": group})
+logger = logging.getLogger("paperless.handlers")
 
 
 def add_inbox_tags(sender, document=None, logging_group=None, **kwargs):
@@ -48,23 +47,23 @@ def set_correspondent(sender,
         selected = None
     if potential_count > 1:
         if use_first:
-            logger(
+            logger.info(
                 f"Detected {potential_count} potential correspondents, "
                 f"so we've opted for {selected}",
-                logging_group
+                extra={'group': logging_group}
             )
         else:
-            logger(
+            logger.info(
                 f"Detected {potential_count} potential correspondents, "
                 f"not assigning any correspondent",
-                logging_group
+                extra={'group': logging_group}
             )
             return
 
     if selected or replace:
-        logger(
+        logger.info(
             f"Assigning correspondent {selected} to {document}",
-            logging_group
+            extra={'group': logging_group}
         )
 
         document.correspondent = selected
@@ -92,23 +91,23 @@ def set_document_type(sender,
 
     if potential_count > 1:
         if use_first:
-            logger(
+            logger.info(
                 f"Detected {potential_count} potential document types, "
                 f"so we've opted for {selected}",
-                logging_group
+                extra={'group': logging_group}
             )
         else:
-            logger(
+            logger.info(
                 f"Detected {potential_count} potential document types, "
                 f"not assigning any document type",
-                logging_group
+                extra={'group': logging_group}
             )
             return
 
     if selected or replace:
-        logger(
+        logger.info(
             f"Assigning document type {selected} to {document}",
-            logging_group
+            extra={'group': logging_group}
         )
 
         document.document_type = selected
@@ -138,9 +137,9 @@ def set_tags(sender,
         return
 
     message = 'Tagging "{}" with "{}"'
-    logger(
+    logger.info(
         message.format(document, ", ".join([t.name for t in relevant_tags])),
-        logging_group
+        extra={'group': logging_group}
     )
 
     document.tags.add(*relevant_tags)
@@ -155,10 +154,10 @@ def cleanup_document_deletion(sender, instance, using, **kwargs):
             if os.path.isfile(f):
                 try:
                     os.unlink(f)
-                    logging.getLogger(__name__).debug(
+                    logger.debug(
                         f"Deleted file {f}.")
                 except OSError as e:
-                    logging.getLogger(__name__).warning(
+                    logger.warning(
                         f"While deleting document {str(instance)}, the file "
                         f"{f} could not be deleted: {e}"
                     )
@@ -177,13 +176,13 @@ def cleanup_document_deletion(sender, instance, using, **kwargs):
 def validate_move(instance, old_path, new_path):
     if not os.path.isfile(old_path):
         # Can't do anything if the old file does not exist anymore.
-        logging.getLogger(__name__).fatal(
+        logger.fatal(
             f"Document {str(instance)}: File {old_path} has gone.")
         return False
 
     if os.path.isfile(new_path):
         # Can't do anything if the new file already exists. Skip updating file.
-        logging.getLogger(__name__).warning(
+        logger.warning(
             f"Document {str(instance)}: Cannot rename file "
             f"since target path {new_path} already exists.")
         return False
diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index e0d726d3e..8c7d91585 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -12,6 +12,9 @@ from documents.models import Document, Tag, DocumentType, Correspondent
 from documents.sanity_checker import SanityFailedError
 
 
+logger = logging.getLogger("paperless.tasks")
+
+
 def index_optimize():
     ix = index.open_index()
     writer = AsyncWriter(ix)
@@ -45,18 +48,18 @@ def train_classifier():
 
     try:
         if classifier.train():
-            logging.getLogger(__name__).info(
+            logger.info(
                 "Saving updated classifier model to {}...".format(
                     settings.MODEL_FILE)
             )
             classifier.save_classifier()
         else:
-            logging.getLogger(__name__).debug(
+            logger.debug(
                 "Training data unchanged."
             )
 
     except Exception as e:
-        logging.getLogger(__name__).warning(
+        logger.warning(
             "Classifier error: " + str(e)
         )
 
diff --git a/src/documents/views.py b/src/documents/views.py
index c2b31c996..e413d4b35 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -58,6 +58,9 @@ from .serialisers import (
 )
 
 
+logger = logging.getLogger("paperless.api")
+
+
 class IndexView(TemplateView):
     template_name = "index.html"
 
@@ -488,7 +491,7 @@ class SearchView(APIView):
         try:
             doc = Document.objects.get(id=r['id'])
         except Document.DoesNotExist:
-            logging.getLogger(__name__).warning(
+            logger.warning(
                 f"Search index returned a non-existing document: "
                 f"id: {r['id']}, title: {r['title']}. "
                 f"Search index needs reindex."
diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
index e1916c1dd..4a62ffd95 100644
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@ -102,6 +102,8 @@ def get_mailbox(server, port, security):
 
 class MailAccountHandler(LoggingMixin):
 
+    logging_name = "paperless.mail"
+
     def _correspondent_from_name(self, name):
         try:
             return Correspondent.objects.get_or_create(name=name)[0]
diff --git a/src/paperless_mail/tasks.py b/src/paperless_mail/tasks.py
index 68fb859a4..086edef7b 100644
--- a/src/paperless_mail/tasks.py
+++ b/src/paperless_mail/tasks.py
@@ -4,6 +4,9 @@ from paperless_mail.mail import MailAccountHandler, MailError
 from paperless_mail.models import MailAccount
 
 
+logger = logging.getLogger("paperless.mail.tasks")
+
+
 def process_mail_accounts():
     total_new_documents = 0
     for account in MailAccount.objects.all():
@@ -11,7 +14,7 @@ def process_mail_accounts():
             total_new_documents += MailAccountHandler().handle_mail_account(
                 account)
         except MailError as e:
-            logging.getLogger(__name__).error(
+            logger.error(
                 f"Error while processing mail account {account}: {e}",
                 exc_info=True
             )
@@ -27,4 +30,4 @@ def process_mail_account(name):
         account = MailAccount.objects.get(name=name)
         MailAccountHandler().handle_mail_account(account)
     except MailAccount.DoesNotExist:
-        logging.getLogger(__name__).error(f"Unknown mail acccount: {name}")
+        logger.error(f"Unknown mail acccount: {name}")
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 5a08c601b..0a976b569 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -19,6 +19,8 @@ class RasterisedDocumentParser(DocumentParser):
     image, whether it's a PDF, or other graphical format (JPEG, TIFF, etc.)
     """
 
+    logging_name = "paperless.parsing.tesseract"
+
     def extract_metadata(self, document_path, mime_type):
         namespace_pattern = re.compile(r"\{(.*)\}(.*)")
 
diff --git a/src/paperless_text/parsers.py b/src/paperless_text/parsers.py
index c1afe07fc..c307bf10b 100644
--- a/src/paperless_text/parsers.py
+++ b/src/paperless_text/parsers.py
@@ -11,6 +11,8 @@ class TextDocumentParser(DocumentParser):
     This parser directly parses a text document (.txt, .md, or .csv)
     """
 
+    logging_name = "paperless.parsing.text"
+
     def get_thumbnail(self, document_path, mime_type):
 
         def read_text():
diff --git a/src/paperless_tika/parsers.py b/src/paperless_tika/parsers.py
index cde6543be..b888af820 100644
--- a/src/paperless_tika/parsers.py
+++ b/src/paperless_tika/parsers.py
@@ -14,6 +14,8 @@ class TikaDocumentParser(DocumentParser):
     This parser sends documents to a local tika server
     """
 
+    logging_name = "paperless.parsing.tika"
+
     def get_thumbnail(self, document_path, mime_type):
         if not self.archive_path:
             self.archive_path = self.convert_to_pdf(document_path)

From 96d7114fa7d281a9f0735af3cc7086379dbfb1d1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 5 Feb 2021 01:11:03 +0100
Subject: [PATCH 1105/1300] lazy load fuzzy only when required

---
 src/documents/matching.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/documents/matching.py b/src/documents/matching.py
index 21102bc98..edbbdc1b8 100644
--- a/src/documents/matching.py
+++ b/src/documents/matching.py
@@ -1,7 +1,6 @@
 import logging
 import re
 
-from fuzzywuzzy import fuzz
 
 from documents.models import MatchingModel, Correspondent, DocumentType, Tag
 
@@ -123,6 +122,8 @@ def matches(matching_model, document):
         return bool(match)
 
     elif matching_model.matching_algorithm == MatchingModel.MATCH_FUZZY:
+        from fuzzywuzzy import fuzz
+
         match = re.sub(r'[^\w\s]', '', matching_model.match)
         text = re.sub(r'[^\w\s]', '', document_content)
         if matching_model.is_insensitive:

From 00903bd90cf4b052579f1186518a71c3594631b5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 00:13:49 +0100
Subject: [PATCH 1106/1300] update statistics when new documents are added

---
 .../saved-view-widget.component.ts            |  2 +-
 .../statistics-widget.component.ts            | 27 ++++++++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
index 04e7e56bd..36feeea1e 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
@@ -12,7 +12,7 @@ import { DocumentService } from 'src/app/services/rest/document.service';
   templateUrl: './saved-view-widget.component.html',
   styleUrls: ['./saved-view-widget.component.scss']
 })
-export class SavedViewWidgetComponent implements OnInit {
+export class SavedViewWidgetComponent implements OnInit, OnDestroy {
 
   constructor(
     private documentService: DocumentService,
diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts
index c3f45d63c..5207d56ab 100644
--- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts
@@ -1,6 +1,7 @@
 import { HttpClient } from '@angular/common/http';
-import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Observable, Subscription } from 'rxjs';
+import { ConsumerStatusService } from 'src/app/services/consumer-status.service';
 import { environment } from 'src/environments/environment';
 
 export interface Statistics {
@@ -14,20 +15,34 @@ export interface Statistics {
   templateUrl: './statistics-widget.component.html',
   styleUrls: ['./statistics-widget.component.scss']
 })
-export class StatisticsWidgetComponent implements OnInit {
+export class StatisticsWidgetComponent implements OnInit, OnDestroy {
 
-  constructor(private http: HttpClient) { }
+  constructor(private http: HttpClient,
+    private consumerStatusService: ConsumerStatusService) { }
 
   statistics: Statistics = {}
 
-  getStatistics(): Observable<Statistics> {
+  subscription: Subscription
+  
+  private getStatistics(): Observable<Statistics> {
     return this.http.get(`${environment.apiBaseUrl}statistics/`)
   }
 
-  ngOnInit(): void {
+  reload() {
     this.getStatistics().subscribe(statistics => {
       this.statistics = statistics
     })
   }
 
+  ngOnInit(): void {
+    this.reload()
+    this.subscription = this.consumerStatusService.onDocumentConsumptionFinished().subscribe(status => {
+      this.reload()
+    })
+  }
+
+  ngOnDestroy(): void {
+    this.subscription.unsubscribe()
+  }
+
 }

From 2f68f236bb8d0cb637c8ad2736d94a27dcea6026 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sat, 6 Feb 2021 00:09:49 +0000
Subject: [PATCH 1107/1300] Apply translations in en_GB

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'en_GB' language.
---
 src/locale/en_GB/LC_MESSAGES/django.po | 650 +++++++++++++++++++++++++
 1 file changed, 650 insertions(+)
 create mode 100644 src/locale/en_GB/LC_MESSAGES/django.po

diff --git a/src/locale/en_GB/LC_MESSAGES/django.po b/src/locale/en_GB/LC_MESSAGES/django.po
new file mode 100644
index 000000000..5f6901f7f
--- /dev/null
+++ b/src/locale/en_GB/LC_MESSAGES/django.po
@@ -0,0 +1,650 @@
+# 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 <xadium@gmail.com>, 2021
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\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: Ali Bates <xadium@gmail.com>, 2021\n"
+"Language-Team: English (United Kingdom) (https://www.transifex.com/paperless/teams/115905/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"
+
+#: documents/apps.py:10
+msgid "Documents"
+msgstr "Documents"
+
+#: documents/models.py:33
+msgid "Any word"
+msgstr "Any word"
+
+#: documents/models.py:34
+msgid "All words"
+msgstr "All words"
+
+#: documents/models.py:35
+msgid "Exact match"
+msgstr "Exact match"
+
+#: documents/models.py:36
+msgid "Regular expression"
+msgstr "Regular expression"
+
+#: documents/models.py:37
+msgid "Fuzzy word"
+msgstr "Fuzzy word"
+
+#: documents/models.py:38
+msgid "Automatic"
+msgstr "Automatic"
+
+#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
+#: paperless_mail/models.py:109
+msgid "name"
+msgstr "name"
+
+#: documents/models.py:46
+msgid "match"
+msgstr "match"
+
+#: documents/models.py:50
+msgid "matching algorithm"
+msgstr "matching algorithm"
+
+#: documents/models.py:56
+msgid "is insensitive"
+msgstr "is insensitive"
+
+#: documents/models.py:75 documents/models.py:135
+msgid "correspondent"
+msgstr "correspondent"
+
+#: documents/models.py:76
+msgid "correspondents"
+msgstr "correspondents"
+
+#: documents/models.py:98
+msgid "color"
+msgstr "color"
+
+#: documents/models.py:102
+msgid "is inbox tag"
+msgstr "is inbox tag"
+
+#: documents/models.py:104
+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:109
+msgid "tag"
+msgstr "tag"
+
+#: documents/models.py:110 documents/models.py:166
+msgid "tags"
+msgstr "tags"
+
+#: documents/models.py:116 documents/models.py:148
+msgid "document type"
+msgstr "document type"
+
+#: documents/models.py:117
+msgid "document types"
+msgstr "document types"
+
+#: documents/models.py:125
+msgid "Unencrypted"
+msgstr "Unencrypted"
+
+#: documents/models.py:126
+msgid "Encrypted with GNU Privacy Guard"
+msgstr "Encrypted with GNU Privacy Guard"
+
+#: documents/models.py:139
+msgid "title"
+msgstr "title"
+
+#: documents/models.py:152
+msgid "content"
+msgstr "content"
+
+#: documents/models.py:154
+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:159
+msgid "mime type"
+msgstr "mime type"
+
+#: documents/models.py:170
+msgid "checksum"
+msgstr "checksum"
+
+#: documents/models.py:174
+msgid "The checksum of the original document."
+msgstr "The checksum of the original document."
+
+#: documents/models.py:178
+msgid "archive checksum"
+msgstr "archive checksum"
+
+#: documents/models.py:183
+msgid "The checksum of the archived document."
+msgstr "The checksum of the archived document."
+
+#: documents/models.py:187 documents/models.py:330
+msgid "created"
+msgstr "created"
+
+#: documents/models.py:191
+msgid "modified"
+msgstr "modified"
+
+#: documents/models.py:195
+msgid "storage type"
+msgstr "storage type"
+
+#: documents/models.py:203
+msgid "added"
+msgstr "added"
+
+#: documents/models.py:207
+msgid "filename"
+msgstr "filename"
+
+#: documents/models.py:212
+msgid "Current filename in storage"
+msgstr "Current filename in storage"
+
+#: documents/models.py:216
+msgid "archive serial number"
+msgstr "archive serial number"
+
+#: documents/models.py:221
+msgid "The position of this document in your physical document archive."
+msgstr "The position of this document in your physical document archive."
+
+#: documents/models.py:227
+msgid "document"
+msgstr "document"
+
+#: documents/models.py:228
+msgid "documents"
+msgstr "documents"
+
+#: documents/models.py:313
+msgid "debug"
+msgstr "debug"
+
+#: documents/models.py:314
+msgid "information"
+msgstr "information"
+
+#: documents/models.py:315
+msgid "warning"
+msgstr "warning"
+
+#: documents/models.py:316
+msgid "error"
+msgstr "error"
+
+#: documents/models.py:317
+msgid "critical"
+msgstr "critical"
+
+#: documents/models.py:321
+msgid "group"
+msgstr "group"
+
+#: documents/models.py:324
+msgid "message"
+msgstr "message"
+
+#: documents/models.py:327
+msgid "level"
+msgstr "level"
+
+#: documents/models.py:334
+msgid "log"
+msgstr "log"
+
+#: documents/models.py:335
+msgid "logs"
+msgstr "logs"
+
+#: documents/models.py:346 documents/models.py:396
+msgid "saved view"
+msgstr "saved view"
+
+#: documents/models.py:347
+msgid "saved views"
+msgstr "saved views"
+
+#: documents/models.py:350
+msgid "user"
+msgstr "user"
+
+#: documents/models.py:356
+msgid "show on dashboard"
+msgstr "show on dashboard"
+
+#: documents/models.py:359
+msgid "show in sidebar"
+msgstr "show in sidebar"
+
+#: documents/models.py:363
+msgid "sort field"
+msgstr "sort field"
+
+#: documents/models.py:366
+msgid "sort reverse"
+msgstr "sort reverse"
+
+#: documents/models.py:372
+msgid "title contains"
+msgstr "title contains"
+
+#: documents/models.py:373
+msgid "content contains"
+msgstr "content contains"
+
+#: documents/models.py:374
+msgid "ASN is"
+msgstr "ASN is"
+
+#: documents/models.py:375
+msgid "correspondent is"
+msgstr "correspondent is"
+
+#: documents/models.py:376
+msgid "document type is"
+msgstr "document type is"
+
+#: documents/models.py:377
+msgid "is in inbox"
+msgstr "is in inbox"
+
+#: documents/models.py:378
+msgid "has tag"
+msgstr "has tag"
+
+#: documents/models.py:379
+msgid "has any tag"
+msgstr "has any tag"
+
+#: documents/models.py:380
+msgid "created before"
+msgstr "created before"
+
+#: documents/models.py:381
+msgid "created after"
+msgstr "created after"
+
+#: documents/models.py:382
+msgid "created year is"
+msgstr "created year is"
+
+#: documents/models.py:383
+msgid "created month is"
+msgstr "created month is"
+
+#: documents/models.py:384
+msgid "created day is"
+msgstr "created day is"
+
+#: documents/models.py:385
+msgid "added before"
+msgstr "added before"
+
+#: documents/models.py:386
+msgid "added after"
+msgstr "added after"
+
+#: documents/models.py:387
+msgid "modified before"
+msgstr "modified before"
+
+#: documents/models.py:388
+msgid "modified after"
+msgstr "modified after"
+
+#: documents/models.py:389
+msgid "does not have tag"
+msgstr "does not have tag"
+
+#: documents/models.py:400
+msgid "rule type"
+msgstr "rule type"
+
+#: documents/models.py:404
+msgid "value"
+msgstr "value"
+
+#: documents/models.py:410
+msgid "filter rule"
+msgstr "filter rule"
+
+#: documents/models.py:411
+msgid "filter rules"
+msgstr "filter rules"
+
+#: documents/serialisers.py:383
+#, python-format
+msgid "File type %(type)s not supported"
+msgstr "File type %(type)s not supported"
+
+#: documents/templates/index.html:20
+msgid "Paperless-ng is loading..."
+msgstr "Paperless-ng is loading..."
+
+#: documents/templates/registration/logged_out.html:13
+msgid "Paperless-ng signed out"
+msgstr "Paperless-ng signed out"
+
+#: documents/templates/registration/logged_out.html:41
+msgid "You have been successfully logged out. Bye!"
+msgstr "You have been successfully logged out. Bye!"
+
+#: documents/templates/registration/logged_out.html:42
+msgid "Sign in again"
+msgstr "Sign in again"
+
+#: documents/templates/registration/login.html:13
+msgid "Paperless-ng sign in"
+msgstr "Paperless-ng sign in"
+
+#: documents/templates/registration/login.html:42
+msgid "Please sign in."
+msgstr "Please sign in."
+
+#: documents/templates/registration/login.html:45
+msgid "Your username and password didn't match. Please try again."
+msgstr "Your username and password didn't match. Please try again."
+
+#: documents/templates/registration/login.html:48
+msgid "Username"
+msgstr "Username"
+
+#: documents/templates/registration/login.html:49
+msgid "Password"
+msgstr "Password"
+
+#: documents/templates/registration/login.html:54
+msgid "Sign in"
+msgstr "Sign in"
+
+#: paperless/settings.py:286
+msgid "English"
+msgstr "English"
+
+#: paperless/settings.py:287
+msgid "German"
+msgstr "German"
+
+#: paperless/settings.py:288
+msgid "Dutch"
+msgstr "Dutch"
+
+#: paperless/settings.py:289
+msgid "French"
+msgstr "French"
+
+#: paperless/urls.py:114
+msgid "Paperless-ng administration"
+msgstr "Paperless-ng administration"
+
+#: paperless_mail/admin.py:25
+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."
+
+#: 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."
+
+#: 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."
+
+#: paperless_mail/apps.py:9
+msgid "Paperless mail"
+msgstr "Paperless mail"
+
+#: paperless_mail/models.py:11
+msgid "mail account"
+msgstr "mail account"
+
+#: paperless_mail/models.py:12
+msgid "mail accounts"
+msgstr "mail accounts"
+
+#: paperless_mail/models.py:19
+msgid "No encryption"
+msgstr "No encryption"
+
+#: paperless_mail/models.py:20
+msgid "Use SSL"
+msgstr "Use SSL"
+
+#: paperless_mail/models.py:21
+msgid "Use STARTTLS"
+msgstr "Use STARTTLS"
+
+#: paperless_mail/models.py:29
+msgid "IMAP server"
+msgstr "IMAP server"
+
+#: paperless_mail/models.py:33
+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."
+
+#: paperless_mail/models.py:40
+msgid "IMAP security"
+msgstr "IMAP security"
+
+#: paperless_mail/models.py:46
+msgid "username"
+msgstr "username"
+
+#: paperless_mail/models.py:50
+msgid "password"
+msgstr "password"
+
+#: paperless_mail/models.py:60
+msgid "mail rule"
+msgstr "mail rule"
+
+#: paperless_mail/models.py:61
+msgid "mail rules"
+msgstr "mail rules"
+
+#: paperless_mail/models.py:67
+msgid "Only process attachments."
+msgstr "Only process attachments."
+
+#: paperless_mail/models.py:68
+msgid "Process all files, including 'inline' attachments."
+msgstr "Process all files, including 'inline' attachments."
+
+#: paperless_mail/models.py:78
+msgid "Mark as read, don't process read mails"
+msgstr "Mark as read, don't process read mails"
+
+#: paperless_mail/models.py:79
+msgid "Flag the mail, don't process flagged mails"
+msgstr "Flag the mail, don't process flagged mails"
+
+#: paperless_mail/models.py:80
+msgid "Move to specified folder"
+msgstr "Move to specified folder"
+
+#: paperless_mail/models.py:81
+msgid "Delete"
+msgstr "Delete"
+
+#: paperless_mail/models.py:88
+msgid "Use subject as title"
+msgstr "Use subject as title"
+
+#: paperless_mail/models.py:89
+msgid "Use attachment filename as title"
+msgstr "Use attachment filename as title"
+
+#: paperless_mail/models.py:99
+msgid "Do not assign a correspondent"
+msgstr "Do not assign a correspondent"
+
+#: paperless_mail/models.py:101
+msgid "Use mail address"
+msgstr "Use mail address"
+
+#: paperless_mail/models.py:103
+msgid "Use name (or mail address if not available)"
+msgstr "Use name (or mail address if not available)"
+
+#: paperless_mail/models.py:105
+msgid "Use correspondent selected below"
+msgstr "Use correspondent selected below"
+
+#: paperless_mail/models.py:113
+msgid "order"
+msgstr "order"
+
+#: paperless_mail/models.py:120
+msgid "account"
+msgstr "account"
+
+#: paperless_mail/models.py:124
+msgid "folder"
+msgstr "folder"
+
+#: paperless_mail/models.py:128
+msgid "filter from"
+msgstr "filter from"
+
+#: paperless_mail/models.py:131
+msgid "filter subject"
+msgstr "filter subject"
+
+#: paperless_mail/models.py:134
+msgid "filter body"
+msgstr "filter body"
+
+#: paperless_mail/models.py:138
+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."
+
+#: paperless_mail/models.py:146
+msgid "maximum age"
+msgstr "maximum age"
+
+#: paperless_mail/models.py:148
+msgid "Specified in days."
+msgstr "Specified in days."
+
+#: paperless_mail/models.py:151
+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."
+
+#: paperless_mail/models.py:159
+msgid "action"
+msgstr "action"
+
+#: paperless_mail/models.py:165
+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."
+
+#: paperless_mail/models.py:173
+msgid "assign title from"
+msgstr "assign title from"
+
+#: paperless_mail/models.py:183
+msgid "assign this tag"
+msgstr "assign this tag"
+
+#: paperless_mail/models.py:191
+msgid "assign this document type"
+msgstr "assign this document type"
+
+#: paperless_mail/models.py:195
+msgid "assign correspondent from"
+msgstr "assign correspondent from"
+
+#: paperless_mail/models.py:205
+msgid "assign this correspondent"
+msgstr "assign this correspondent"

From 968614a289ae89468cf496502aaef05ae0e78bb4 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sat, 6 Feb 2021 00:12:00 +0000
Subject: [PATCH 1108/1300] Translate /src-ui/messages.xlf in en_GB

translation completed for the source file '/src-ui/messages.xlf'
on the 'en_GB' language.
---
 src-ui/src/locale/messages.en_GB.xlf | 2313 ++++++++++++++++++++++++++
 1 file changed, 2313 insertions(+)
 create mode 100644 src-ui/src/locale/messages.en_GB.xlf

diff --git a/src-ui/src/locale/messages.en_GB.xlf b/src-ui/src/locale/messages.en_GB.xlf
new file mode 100644
index 000000000..4df278c69
--- /dev/null
+++ b/src-ui/src/locale/messages.en_GB.xlf
@@ -0,0 +1,2313 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="plaintext" original="ng2.template" source-language="en-US" target-language="en-GB">
+    <body>
+      <trans-unit datatype="html" id="9103526311244275943">
+        <source>Document added</source>
+        <target>Document added</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9204248378636247318">
+        <source>Document <x equiv-text="status.filename" id="PH"/> was added to paperless.</source>
+        <target>Document <x equiv-text="status.filename" id="PH"/> was added to paperless.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1931214133925051574">
+        <source>Open document</source>
+        <target>Open document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8582620835547864448">
+        <source>Could not add <x equiv-text="status.filename" id="PH"/>: <x equiv-text="status.message" id="PH_1"/></source>
+        <target>Could not add <x equiv-text="status.filename" id="PH"/>: <x equiv-text="status.message" id="PH_1"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1710712016675379662">
+        <source>New document detected</source>
+        <target>New document detected</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="587031278561344416">
+        <source>Document <x equiv-text="status.filename" id="PH"/> is being processed by paperless.</source>
+        <target>Document <x equiv-text="status.filename" id="PH"/> is being processed by paperless.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4733307402565258070">
+        <source>Documents</source>
+        <target>Documents</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2155249406916744630">
+        <source>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; saved successfully.</source>
+        <target>View &amp;quot;<x equiv-text="this.list.savedView.name" id="PH"/>&amp;quot; saved successfully.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">109</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6837554170707123455">
+        <source>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; created successfully.</source>
+        <target>View &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; created successfully.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
+          <context context-type="linenumber">130</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
+        <source>Select</source>
+        <target>Select</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7e1f9a7054aff842832620c03dedae894787ba41">
+        <source>Select none</source>
+        <target>Select none</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9">
+        <source>Select page</source>
+        <target>Select page</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74">
+        <source>Select all</source>
+        <target>Select all</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5d43539fc358c3a548b9d487be821db73e2702ff">
+        <source>Sort</source>
+        <target>Sort</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b7641aed03492978b4ec6843b1e53f30464294d9">
+        <source>Views</source>
+        <target>Views</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b69d81ff62cdc22b6bf88fe0b72dc1f66ccfa44f">
+        <source>Save as...</source>
+        <target>Save as...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="72e7d343f9165602cce1ca7faffbc565fd31ef92">
+        <source>Save &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
+        <target>Save &amp;quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="439e7cc3c1ecefded167ed4d37f7d22dad6a9159">
+        <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9">
+        <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb91083b44e3f77dd68de773ceab467ca3d57507">
+        <source>(filtered)</source>
+        <target>(filtered)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
+        <source>ASN</source>
+        <target>ASN</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
+        <source>Correspondent</source>
+        <target>Correspondent</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
+        <source>Title</source>
+        <target>Title</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
+        <source>Document type</source>
+        <target>Document type</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
+        <source>Created</source>
+        <target>Created</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
+        <source>Added</source>
+        <target>Added</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9021887951960049161">
+        <source>Confirm delete</source>
+        <target>Confirm delete</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5382975254277698192">
+        <source>Do you really want to delete document &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</source>
+        <target>Do you really want to delete document &amp;quot;<x equiv-text="this.document.title" id="PH"/>&amp;quot;?</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6691075929777935948">
+        <source>The files for this document will be deleted permanently. This operation cannot be undone.</source>
+        <target>The files for this document will be deleted permanently. This operation cannot be undone.</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="719892092227206532">
+        <source>Delete document</source>
+        <target>Delete document</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1844801255494293730">
+        <source>Error deleting document: <x equiv-text="JSON.stringify(error)" id="PH"/></source>
+        <target>Error deleting document: <x equiv-text="JSON.stringify(error)" id="PH"/></target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
+        <source>Delete</source>
+        <target>Delete</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dc75033a5238fdc4f462212c847a45ba8018a3fd">
+        <source>Download</source>
+        <target>Download</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4ea3c236bca3528318e3b3a411a20909e5fa8be4">
+        <source>More like this</source>
+        <target>More like this</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f4e529ae5ffd73001d1ff4bbdeeb0a72e342e5c8">
+        <source>Close</source>
+        <target>Close</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4f8b2bb476981727ab34ed40fde1218361f92c45">
+        <source>Details</source>
+        <target>Details</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4ab4cb601522b9194922554d934c4c30bd93567d">
+        <source>Content</source>
+        <target>Content</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f721a500a68c357e8f2a01e60510f6a01e4ba529">
+        <source>Metadata</source>
+        <target>Metadata</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">81</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7">
+        <source>Discard</source>
+        <target>Discard</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">130</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="52c9a103b812f258bcddc3d90a6e3f46871d25fe">
+        <source>Save</source>
+        <target>Save</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">132</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3">
+        <source>Page</source>
+        <target>Page</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c972a8e7d09f86e0c408a80349990fb213b32c08">
+        <source>of <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></source>
+        <target>of <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a071e35fecc10753065b1cb5b38608be66da2c8b">
+        <source>Download original</source>
+        <target>Download original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9b3996b5ddcc628a999a7df72fbfc2a2eae8c8a5">
+        <source>Archive serial number</source>
+        <target>Archive serial number</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">60</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="30eebc2dd656dbcb259d8d5286d244ee397d63bd">
+        <source>Date created</source>
+        <target>Date created</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720">
+        <source>Date modified</source>
+        <target>Date modified</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269">
+        <source>Date added</source>
+        <target>Date added</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3">
+        <source>Media filename</source>
+        <target>Media filename</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8">
+        <source>Original MD5 checksum</source>
+        <target>Original MD5 checksum</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">99</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e92ca184ea785769fb26138fc25ee9fa06fff6e5">
+        <source>Original file size</source>
+        <target>Original file size</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd">
+        <source>Original mime type</source>
+        <target>Original mime type</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="edbf54e4117606b5dd87aaea3c14b21ebf398020">
+        <source>Archive MD5 checksum</source>
+        <target>Archive MD5 checksum</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e6bf12eadecbfd80016eca15fa78651c6ca90c64">
+        <source>Archive file size</source>
+        <target>Archive file size</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f">
+        <source>Original document metadata</source>
+        <target>Original document metadata</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">121</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7174dcea4a3d0b743e7e4a78747e902230727f67">
+        <source>Archived document metadata</source>
+        <target>Archived document metadata</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">122</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3fb9f1a31c3798173b2fea72638732c783b152fe">
+        <source>Save &amp; next</source>
+        <target>Save &amp; next</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">131</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8765497970646365998">
+        <source>Hello <x equiv-text="this.displayName" id="PH"/>, welcome to Paperless-ng!</source>
+        <target>Hello <x equiv-text="this.displayName" id="PH"/>, welcome to Paperless-ng!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7016571167317583872">
+        <source>Welcome to Paperless-ng!</source>
+        <target>Welcome to Paperless-ng!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f65253954b66e929a8b4d5ecaf61f9129f8cec64">
+        <source>Dashboard</source>
+        <target>Dashboard</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="93754014749412887">
+        <source>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Do you really want to delete the tag &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
+        <source>Tags</source>
+        <target>Tags</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="70a67e04629f6d412db0a12d51820b480788d795">
+        <source>Create</source>
+        <target>Create</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
+        <source>Filter by:</source>
+        <target>Filter by:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cff1428d10d59d14e45edec3c735a27b5482db59">
+        <source>Name</source>
+        <target>Name</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
+        <source>Color</source>
+        <target>Color</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d0c4488f742efeba0915e90e285a022da813deff">
+        <source>Matching</source>
+        <target>Matching</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9bcf8d20d23c111eca1431abd2d2ce0de324499c">
+        <source>Document count</source>
+        <target>Document count</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="030b4423b92167200e39519599f9b863b4f7c62c">
+        <source>Actions</source>
+        <target>Actions</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9d51b3c90afda70700229d1b8a55371c13cb3bce">
+        <source>Documents</source>
+        <target>Documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
+        <source>Edit</source>
+        <target>Edit</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4990731724078522539">
+        <source>Do you really want to delete the document type &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Do you really want to delete the document type &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8">
+        <source>Document types</source>
+        <target>Document types</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="eb3d5aefff38a814b76da74371cbf02c0789a1ef">
+        <source>Logs</source>
+        <target>Logs</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5ca707824ab93066c7d9b44e1b8bf216725c2c22">
+        <source>Filter</source>
+        <target>Filter</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5610279464668232148">
+        <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
+        <target>Saved view &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; deleted.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5647210819299459618">
+        <source>Settings saved successfully.</source>
+        <target>Settings saved successfully.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6839066544204061364">
+        <source>Use system language</source>
+        <target>Use system language</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7729897675462249787">
+        <source>Use date format of display language</source>
+        <target>Use date format of display language</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8488620293789898901">
+        <source>Error while storing settings on server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Error while storing settings on server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
+        <source>Settings</source>
+        <target>Settings</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="11ebd254cc9294717105c5982eb0cd2af30a446d">
+        <source>General settings</source>
+        <target>General settings</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab">
+        <source>Notifications</source>
+        <target>Notifications</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="99dee94e92dbd9e21a008d4569f9719ed206ae37">
+        <source>Saved views</source>
+        <target>Saved views</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">133</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
+        <source>Appearance</source>
+        <target>Appearance</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="75f8908d266f7cc9b9e68e0be906fd080a223606">
+        <source>Display language</source>
+        <target>Display language</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1284a077dc18a2d1ff1b744f16f1797eea28ae37">
+        <source>You need to reload the page after applying a new language.</source>
+        <target>You need to reload the page after applying a new language.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0cd55822928764cc82a62ee3e6f3adbc1c630479">
+        <source>Date display</source>
+        <target>Date display</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7df4de0d0704a06a302d853e31f2580eba98f127">
+        <source>Date format</source>
+        <target>Date format</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="69852399a18b8ca4fca8c5bfddd3f00a6d137593">
+        <source>Short: <x equiv-text="{{today | customDate:'shortDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Short: <x equiv-text="{{today | customDate:'shortDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d01a59285e711252b98c4f193394e4b854615c78">
+        <source>Medium: <x equiv-text="{{today | customDate:'mediumDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Medium: <x equiv-text="{{today | customDate:'mediumDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="00481629776699b1caebd12b3b1176e2e23740a8">
+        <source>Long: <x equiv-text="{{today | customDate:'longDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Long: <x equiv-text="{{today | customDate:'longDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
+        <source>Items per page</source>
+        <target>Items per page</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c4435e56bf0289e78fedc462f1d21fb30b9de55d">
+        <source>Document editor</source>
+        <target>Document editor</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4903e521c9bfd11ce88e7a5575106ef638912e0d">
+        <source>Use PDF viewer provided by the browser</source>
+        <target>Use PDF viewer provided by the browser</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d7db07023e53f8396d18d375c2b78c25fc81c197">
+        <source>This is usually faster for displaying large PDF documents, but it might not work on some browsers.</source>
+        <target>This is usually faster for displaying large PDF documents, but it might not work on some browsers.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
+        <source>Dark mode</source>
+        <target>Dark mode</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">94</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
+        <source>Use system settings</source>
+        <target>Use system settings</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">97</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8ee474504043fa89821d626e4f3413240fa91b53">
+        <source>Enable dark mode</source>
+        <target>Enable dark mode</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
+        <source>Bulk editing</source>
+        <target>Bulk editing</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">102</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
+        <source>Show confirmation dialogs</source>
+        <target>Show confirmation dialogs</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
+        <source>Deleting documents will always ask for confirmation.</source>
+        <target>Deleting documents will always ask for confirmation.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
+        <source>Apply on close</source>
+        <target>Apply on close</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8680abbea249ebe9c2fe35556559c8e1a9eb5841">
+        <source>Document processing</source>
+        <target>Document processing</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0">
+        <source>Show notifications when new documents are detected</source>
+        <target>Show notifications when new documents are detected</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">122</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e775f4f7c40249d31426ae61a21616a0c9d8e84f">
+        <source>Show notifications when document processing completes successfully</source>
+        <target>Show notifications when document processing completes successfully</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e3844dd174d8e817ddb551fae28f14ae80ca36b6">
+        <source>Show notifications when document processing fails</source>
+        <target>Show notifications when document processing fails</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">124</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af113f7c9f7e13145c3461f61a1aedf12d57bd71">
+        <source>Suppress notifications on dashboard</source>
+        <target>Suppress notifications on dashboard</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e27bd3804d2936a6897e81c2e52e294490e5e5a8">
+        <source>This will suppress all messages about document processing status on the dashboard.</source>
+        <target>This will suppress all messages about document processing status on the dashboard.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
+        <source>Appears on</source>
+        <target>Appears on</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">145</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
+        <source>Show on dashboard</source>
+        <target>Show on dashboard</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">148</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
+        <source>Show in sidebar</source>
+        <target>Show in sidebar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
+        <source>No saved views defined.</source>
+        <target>No saved views defined.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">162</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
+        <source>404 Not Found</source>
+        <target>404 Not Found</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/not-found/not-found.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7427874343955308724">
+        <source>Do you really want to delete the correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Do you really want to delete the correspondent &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c3f3334de899327bf3ec8999236e10798ff76e72">
+        <source>Correspondents</source>
+        <target>Correspondents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0488919cff4fcc2174d34e4a1167f1b3c586ca37">
+        <source>Last correspondence</source>
+        <target>Last correspondence</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1234709746630139322">
+        <source>Confirmation</source>
+        <target>Confirmation</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9178182467454450952">
+        <source>Confirm</source>
+        <target>Confirm</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
+        <source>Cancel</source>
+        <target>Cancel</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6457471243969293847">
+        <source>Create new correspondent</source>
+        <target>Create new correspondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2059822531169388684">
+        <source>Edit correspondent</source>
+        <target>Edit correspondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3d5caa52b0a51bfd2757215f7614183554d740f0">
+        <source>Matching algorithm</source>
+        <target>Matching algorithm</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="eab7fc7cf2d663e54de934b779fce4275a303f0f">
+        <source>Matching pattern</source>
+        <target>Matching pattern</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
+        <source>Case insensitive</source>
+        <target>Case insensitive</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9153094873118985366">
+        <source>Create new tag</source>
+        <target>Create new tag</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5872175735754226507">
+        <source>Edit tag</source>
+        <target>Edit tag</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42">
+        <source>Inbox tag</source>
+        <target>Inbox tag</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5e2f1a4ea12a1b8606ee3f0548d0ba64bf266077">
+        <source>Inbox tags are automatically assigned to all consumed documents.</source>
+        <target>Inbox tags are automatically assigned to all consumed documents.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6672809941092516947">
+        <source>Create new document type</source>
+        <target>Create new document type</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="36335016091244220">
+        <source>Edit document type</source>
+        <target>Edit document type</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="49c9ede51100b454f7841b24cd02355c6622bf44">
+        <source>Search results</source>
+        <target>Search results</target>
+        <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 datatype="html" id="31976d04f98e8a38098f66ac3a83ad33b576e5db">
+        <source>Invalid search query: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></source>
+        <target>Invalid search query: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></target>
+        <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 datatype="html" id="2abff6a01d9b342a5a14b7fb90309a95ce934f8e">
+        <source> Showing documents similar to <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></source>
+        <target> Showing documents similar to <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></target>
+        <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 datatype="html" id="6e0b0a1ea16f18f2fb1586c53d99d2f22e1aee2e">
+        <source>Search query: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></source>
+        <target>Search query: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></target>
+        <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 datatype="html" id="afa760e48c97d64d19c1455d18b7834a2256e23f">
+        <source>Did you mean &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</source>
+        <target>Did you mean &amp;quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&amp;quot;?</target>
+        <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 datatype="html" id="fe6ced3fcc803bba5a2e6c1a067b9ce62542500e">
+        <source>{VAR_PLURAL, plural, =0 {No results} =1 {One result} other {<x id="INTERPOLATION"/> results}}</source>
+        <target>{VAR_PLURAL, plural, =0 {No results} =1 {One result} other {<x id="INTERPOLATION"/> results}}</target>
+        <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 datatype="html" id="41147374f427980a9f1a8cd5e3f4b1666e6f2418">
+        <source>Paperless-ng</source>
+        <target>Paperless-ng</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+        <note from="description" priority="1">app title</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="069566c6ed4f051b5b5617ef1935837226585dad">
+        <source>Search documents</source>
+        <target>Search documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb694b49d408265c91c62799c2b3a7e3151c824d">
+        <source>Logout</source>
+        <target>Logout</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="68949525c4d9a901e0cd15a94e3fc8d2711e9918">
+        <source>Manage</source>
+        <target>Manage</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="408cb6073e60c5d966296a3207fc596adca75e01">
+        <source>Admin</source>
+        <target>Admin</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">149</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="321e4419a943044e674beb55b8039f42a9761ca5">
+        <source>Info</source>
+        <target>Info</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">155</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
+        <source>Documentation</source>
+        <target>Documentation</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">162</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
+        <source>GitHub</source>
+        <target>GitHub</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">170</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ea3a452c5238897cabc5781308cceb2d37dcf258">
+        <source>Suggest an idea</source>
+        <target>Suggest an idea</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">176</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
+        <source>Logged in as <x equiv-text="{{displayName}}" id="INTERPOLATION"/></source>
+        <target>Logged in as <x equiv-text="{{displayName}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">34</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4f55b670f49d927c6026bb614c7c62b1f2a394c0">
+        <source>Open documents</source>
+        <target>Open documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dca5bf9344a759fa5a07f1b21f50286ec242ba44">
+        <source>Close all</source>
+        <target>Close all</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">101</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5195932016807797291">
+        <source>Correspondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></source>
+        <target>Correspondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8170755470576301659">
+        <source>Without correspondent</source>
+        <target>Without correspondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8705701325879965907">
+        <source>Type: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></source>
+        <target>Type: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4362173610367509215">
+        <source>Without document type</source>
+        <target>Without document type</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8180755793012580465">
+        <source>Tag: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></source>
+        <target>Tag: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6494566478302448576">
+        <source>Without any tag</source>
+        <target>Without any tag</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
+        <source>Filter tags</source>
+        <target>Filter tags</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4b089ca12c472cf0b46167bb5afe4b527b301bbc">
+        <source>Filter correspondents</source>
+        <target>Filter correspondents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0ad509732aaf702b7ea8c771c7809fa84bc85908">
+        <source>Filter document types</source>
+        <target>Filter document types</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2d9d55f1b70142ff4597ba32179d16888fd9c6b2">
+        <source>Reset filters</source>
+        <target>Reset filters</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7593728289020204896">
+        <source>Not assigned</source>
+        <target>Not assigned</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
+          <context context-type="linenumber">166</context>
+        </context-group>
+        <note from="description" priority="1">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="c2d0ac9f528bbd5f53fd34269fde8b59e029621b">
+        <source>Apply</source>
+        <target>Apply</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4873149362496451858">
+        <source>Last 7 days</source>
+        <target>Last 7 days</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4463380307954693363">
+        <source>Last month</source>
+        <target>Last month</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8697368973702409683">
+        <source>Last 3 months</source>
+        <target>Last 3 months</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3566342898065860218">
+        <source>Last year</source>
+        <target>Last year</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="be2add3a3d9e4e2556b8f9048a15a9c0f00bf1ad">
+        <source>After</source>
+        <target>After</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8785188e6c678b842fcb93b7392faf86db7ec676">
+        <source>Before</source>
+        <target>Before</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="99ee4faa69cd2ea8e3678c1f557c0ff1f05aae46">
+        <source>Clear</source>
+        <target>Clear</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6829218544e108e152f5fa72cb79c4ccb82e0d06">
+        <source>View</source>
+        <target>View</target>
+        <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 datatype="html" id="849b42384616374df49bd8b3711ec159cb10b845">
+        <source>Created: <x equiv-text="{{document.created | customDate}}" id="INTERPOLATION"/></source>
+        <target>Created: <x equiv-text="{{document.created | customDate}}" id="INTERPOLATION"/></target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8">
+        <source>Filter by correspondent</source>
+        <target>Filter by correspondent</target>
+        <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">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bdb9a910523610254872e147222689e9a4115b84">
+        <source>Filter by tag</source>
+        <target>Filter by tag</target>
+        <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">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60">
+        <source>Score:</source>
+        <target>Score:</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2840db547019ce8c76b2cdbe3a1653c5b68b06af">
+        <source>View in browser</source>
+        <target>View in browser</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7985804062689412812">
+        <source>Error executing bulk operation: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Error executing bulk operation: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">73</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7894972847287473517">
+        <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</source>
+        <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">112</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8639884465898458690">
+        <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
+        <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot; and &amp;quot;<x equiv-text="items[1].name" id="PH_1"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
+        <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="760986369763309193">
+        <source>, </source>
+        <target>, </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">116</context>
+        </context-group>
+        <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="1822679894391095557">
+        <source><x equiv-text="list" id="PH"/> and &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</source>
+        <target><x equiv-text="list" id="PH"/> and &amp;quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">117</context>
+        </context-group>
+        <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="4137232459980262849">
+        <source>Confirm tags assignment</source>
+        <target>Confirm tags assignment</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">126</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6619516195038467207">
+        <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>This operation will add the tag &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">129</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1894412783609570695">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">131</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7181166515756808573">
+        <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>This operation will remove the tag &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3819792277998068944">
+        <source>This operation will remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>This operation will remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2739066218579571288">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> and remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> on <x equiv-text="this.list.selected.size" id="PH_2"/> selected document(s).</source>
+        <target>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> and remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> on <x equiv-text="this.list.selected.size" id="PH_2"/> selected document(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">138</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2996713129519325161">
+        <source>Confirm correspondent assignment</source>
+        <target>Confirm correspondent assignment</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">158</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6900893559485781849">
+        <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>This operation will assign the correspondent &amp;quot;<x equiv-text="correspondent.name" id="PH"/>&amp;quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">160</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1257522660364398440">
+        <source>This operation will remove the correspondent from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>This operation will remove the correspondent from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">162</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5393409374423140648">
+        <source>Confirm document type assignment</source>
+        <target>Confirm document type assignment</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">181</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="332180123895325027">
+        <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>This operation will assign the document type &amp;quot;<x equiv-text="documentType.name" id="PH"/>&amp;quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">183</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2236642492594872779">
+        <source>This operation will remove the document type from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>This operation will remove the document type from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">185</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="749430623564850405">
+        <source>Delete confirm</source>
+        <target>Delete confirm</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">200</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4303174930844518780">
+        <source>This operation will permanently delete <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>This operation will permanently delete <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">201</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5641451190833696892">
+        <source>This operation cannot be undone.</source>
+        <target>This operation cannot be undone.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">202</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6734339521247847366">
+        <source>Delete document(s)</source>
+        <target>Delete document(s)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">204</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
+        <source>Select:</source>
+        <target>Select:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dfc3c34e182ea73c5d784ff7c8135f087992dac1">
+        <source>All</source>
+        <target>All</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="907df6a2b68daecc3c399cf40a764b358bd9fd84">
+        <source>Edit:</source>
+        <target>Edit:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a1e6c11f20d4bf6e8e6b43e3c6d2561b2080645e">
+        <source>Suggestions:</source>
+        <target>Suggestions:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/input/select/select.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">
+        <source>Save current view</source>
+        <target>Save current view</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4eb84de23219c85432e38fb4fbdeb6c0f103ff8b">
+        <source>Show all</source>
+        <target>Show all</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="61e0f26d843eec0b33ff475e111b0c2f7a80b835">
+        <source>Statistics</source>
+        <target>Statistics</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="46c8fe557cf52c9389783627d4f85453f4ddb459">
+        <source>Documents in inbox: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></source>
+        <target>Documents in inbox: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438">
+        <source>Total documents: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></source>
+        <target>Total documents: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6443586946875325554">
+        <source>Processing: <x equiv-text="countUploadingAndProcessing" id="PH"/></source>
+        <target>Processing: <x equiv-text="countUploadingAndProcessing" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9182918211699394982">
+        <source>Failed: <x equiv-text="countFailed" id="PH"/></source>
+        <target>Failed: <x equiv-text="countFailed" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="534116346205124059">
+        <source>Added: <x equiv-text="countSuccess" id="PH"/></source>
+        <target>Added: <x equiv-text="countSuccess" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3852289441366561594">
+        <source>Connecting...</source>
+        <target>Connecting...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1245343823699368872">
+        <source>Uploading...</source>
+        <target>Uploading...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7446520539098045935">
+        <source>Upload complete, waiting...</source>
+        <target>Upload complete, waiting...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">126</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1405142710727603568">
+        <source>HTTP error: <x equiv-text="error.status" id="PH"/> <x equiv-text="error.statusText" id="PH_1"/></source>
+        <target>HTTP error: <x equiv-text="error.status" id="PH"/> <x equiv-text="error.statusText" id="PH_1"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
+        <source>Upload new documents</source>
+        <target>Upload new documents</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="52d5d56b6667ba3f7c759cbc0d4c39d34a99701e">
+        <source>Drop documents here or</source>
+        <target>Drop documents here or</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="865c511f4a24558ed0e954f9bbbff557bbb8954d">
+        <source>Browse files</source>
+        <target>Browse files</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bd4a8607e4a002d939cffb347ec056664dfb2c73">
+        <source>Dismiss completed</source>
+        <target>Dismiss completed</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+        <note from="description" priority="1">This button dismisses all status messages about processed documents on the dashboard (failed and successful)</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="90917e1a0a7bb59e9d11bdde9183e9391963e17b">
+        <source>{VAR_PLURAL, plural, =1 {One more document} other {<x id="INTERPOLATION"/> more documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {One more document} other {<x id="INTERPOLATION"/> more documents}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+        <note from="description" priority="1">This is shown as a summary line when there are more than 5 document in the processing pipeline.</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="710254a196a2649674438edf8a15b7ab1f48271b">
+        <source>Open document</source>
+        <target>Open document</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="45854ddec74086b271e62be6a363f4fa5036f7fc">
+        <source>First steps</source>
+        <target>First steps</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a0dc8218a6fcc5d11a4723ed127bd6be9d6d3ef3">
+        <source>Paperless is running! :)</source>
+        <target>Paperless is running! :)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ea8d9a9486d5639d1c38c012900b8d34d5e4135d">
+        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message.</source>
+        <target>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">6,7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cf5f85690feaba6e29343f9881e57a6c0ea6e82b">
+        <source>Paperless offers some more features that try to make your life easier:</source>
+        <target>Paperless offers some more features that try to make your life easier:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="edb41dc36af2e70789d8e3422325d930e783253e">
+        <source>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</source>
+        <target>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9dca488928c0b7af46c3866f86a6c2c8548399aa">
+        <source>You can configure paperless to read your mails and add documents from attached files.</source>
+        <target>You can configure paperless to read your mails and add documents from attached files.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d282f6277cbf6704f697170d2ad19ce500790e20">
+        <source>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</source>
+        <target>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="218403386307979629">
+        <source>Metadata</source>
+        <target>Metadata</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3797570084942068182">
+        <source>Select</source>
+        <target>Select</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7103181924469214926">
+        <source>Please select an object</source>
+        <target>Please select an object</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2807800733729323332">
+        <source>Yes</source>
+        <target>Yes</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3542042671420335679">
+        <source>No</source>
+        <target>No</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7536524521722799066">
+        <source>(no title)</source>
+        <target>(no title)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/document-title.pipe.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1206520795340730278">
+        <source>English (US)</source>
+        <target>English (US)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">82</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1858110241312746425">
+        <source>German</source>
+        <target>German</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3071065188816255493">
+        <source>Dutch</source>
+        <target>Dutch</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7633754075223722162">
+        <source>French</source>
+        <target>French</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2119857572761283468">
+        <source>Document already exists.</source>
+        <target>Document already exists.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="148389968432135849">
+        <source>File not found.</source>
+        <target>File not found.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1520671543092565667">
+        <source>Pre-consume script does not exist.</source>
+        <target>Pre-consume script does not exist.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+        <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="7742915911032564889">
+        <source>Error while executing pre-consume script.</source>
+        <target>Error while executing pre-consume script.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+        <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="8995193730018060346">
+        <source>Post-consume script does not exist.</source>
+        <target>Post-consume script does not exist.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+        <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="256773668518189604">
+        <source>Error while executing post-consume script.</source>
+        <target>Error while executing post-consume script.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+        <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="6252258095055634191">
+        <source>Received new file.</source>
+        <target>Received new file.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7337565919209746135">
+        <source>File type not supported.</source>
+        <target>File type not supported.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5002399167376099234">
+        <source>Processing document...</source>
+        <target>Processing document...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1085975194762600381">
+        <source>Generating thumbnail...</source>
+        <target>Generating thumbnail...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3280851677698431426">
+        <source>Retrieving date from document...</source>
+        <target>Retrieving date from document...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7162102384876037296">
+        <source>Saving document...</source>
+        <target>Saving document...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4550450765009165976">
+        <source>Finished.</source>
+        <target>Finished.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1519954996184640001">
+        <source>Error</source>
+        <target>Error</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5037437391296624618">
+        <source>Information</source>
+        <target>Information</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7517688192215738656">
+        <source>ASN</source>
+        <target>ASN</target>
+        <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 datatype="html" id="2691296884221415710">
+        <source>Correspondent</source>
+        <target>Correspondent</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5701618810648052610">
+        <source>Title</source>
+        <target>Title</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5066119607229701477">
+        <source>Document type</source>
+        <target>Document type</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4207916966377787111">
+        <source>Created</source>
+        <target>Created</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="231679111972850796">
+        <source>Added</source>
+        <target>Added</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3553216189604488439">
+        <source>Modified</source>
+        <target>Modified</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2056433880533904076">
+        <source>Light blue</source>
+        <target>Light blue</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4082253113407591781">
+        <source>Blue</source>
+        <target>Blue</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1143414876575720034">
+        <source>Light green</source>
+        <target>Light green</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="119581980963263815">
+        <source>Green</source>
+        <target>Green</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3250646524116252719">
+        <source>Light red</source>
+        <target>Light red</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1628552745302385832">
+        <source>Red </source>
+        <target>Red </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5479028842846122610">
+        <source>Light orange</source>
+        <target>Light orange</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8598918991528773310">
+        <source>Orange</source>
+        <target>Orange</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1789283185177957430">
+        <source>Light violet</source>
+        <target>Light violet</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2682868487071320453">
+        <source>Violet</source>
+        <target>Violet</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1449010446077321264">
+        <source>Brown</source>
+        <target>Brown</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="30300572504753589">
+        <source>Black</source>
+        <target>Black</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="461048771215121187">
+        <source>Light grey</source>
+        <target>Light grey</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4561076822163447092">
+        <source>Create new item</source>
+        <target>Create new item</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5324147361912094446">
+        <source>Edit item</source>
+        <target>Edit item</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">54</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1699589597032579396">
+        <source>Could not save element: <x equiv-text="error" id="PH"/></source>
+        <target>Could not save element: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">58</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="810888510148304696">
+        <source>Automatic</source>
+        <target>Automatic</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5044611416737085530">
+        <source>Do you really want to delete this element?</source>
+        <target>Do you really want to delete this element?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">97</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8371896857609524947">
+        <source>Associated documents will not be deleted.</source>
+        <target>Associated documents will not be deleted.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">104</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7022070615528435141">
+        <source>Delete</source>
+        <target>Delete</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5467489005440577210">
+        <source>Error while deleting element: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Error while deleting element: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5851669019930456395">
+        <source>Any word</source>
+        <target>Any word</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7517655726614958140">
+        <source>Any: Document contains any of these words (space separated)</source>
+        <target>Any: Document contains any of these words (space separated)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="700315718208181326">
+        <source>All words</source>
+        <target>All words</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="111914402588955480">
+        <source>All: Document contains all of these words (space separated)</source>
+        <target>All: Document contains all of these words (space separated)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9180173992399180575">
+        <source>Exact match</source>
+        <target>Exact match</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7109184332944610787">
+        <source>Exact: Document contains this string</source>
+        <target>Exact: Document contains this string</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1338733395833138319">
+        <source>Regular expression</source>
+        <target>Regular expression</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7548151332424148033">
+        <source>Regular expression: Document matches this regular expression</source>
+        <target>Regular expression: Document matches this regular expression</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1856513373880048959">
+        <source>Fuzzy word</source>
+        <target>Fuzzy word</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8419167206585286450">
+        <source>Fuzzy: Document contains a word similar to this word</source>
+        <target>Fuzzy: Document contains a word similar to this word</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2167862279705099846">
+        <source>Auto: Learn matching automatically</source>
+        <target>Auto: Learn matching automatically</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file

From 1d50d017acf871b0a0a7b7b6006578aa4a33f8eb Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 14:54:00 +0100
Subject: [PATCH 1109/1300] update bare metal instructions

---
 docs/setup.rst | 63 +++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index 139db549a..4025b6721 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -221,7 +221,7 @@ Install Paperless from Docker Hub
 
 .. _setup-docker_build:
 
-Build the docker image yourself
+Build the Docker image yourself
 ===============================
 
 1.  Clone the entire repository of paperless:
@@ -252,14 +252,14 @@ Build the docker image yourself
 
 4.  Run the ``compile-frontend.sh`` script. This requires ``node`` and ``npm >= v15``.
 
-5.  Follow steps 2 to 7 of :ref:`setup-docker_hub`. When asked to run
-    ``docker-compose up -d`` to start the containers, do
+5.  Follow steps 3 to 8 of :ref:`setup-docker_hub`. When asked to run
+    ``docker-compose pull`` to pull the image, do
 
     .. code:: shell-session
 
         $ docker-compose build
 
-    before that to build the image.
+    instead to build the image.
 
 .. _setup-bare_metal:
 
@@ -309,7 +309,7 @@ writing. Windows is not and will never be supported.
 2.  Install ``redis`` >= 5.0 and configure it to start automatically.
 
 3.  Optional. Install ``postgresql`` and configure a database, user and password for paperless. If you do not wish
-    to use PostgreSQL, SQLite is avialable as well.
+    to use PostgreSQL, SQLite is available as well.
 
 4.  Get the release archive from `<https://github.com/jonaswinkler/paperless-ng/releases>`_.
     If you clone the git repo as it is, you also have to compile the front end by yourself.
@@ -333,8 +333,14 @@ writing. Windows is not and will never be supported.
     *   Set ``PAPERLESS_OCR_LANGUAGE`` to the language most of your documents are written in.
     *   Set ``PAPERLESS_TIME_ZONE`` to your local time zone.
 
-6.  Setup permissions. Create a system users under which you wish to run paperless. Ensure that these directories exist
-    and that the user has write permissions to the following directories
+6.  Create a system user under which you wish to run paperless.
+
+    .. code:: shell-session
+
+        adduser paperless --system --home /opt/paperless --group
+
+7.  Ensure that these directories exist
+    and that the paperless user has write permissions to the following directories:
 
     *   ``/opt/paperless/media``
     *   ``/opt/paperless/data``
@@ -342,30 +348,32 @@ writing. Windows is not and will never be supported.
 
     Adjust as necessary if you configured different folders.
 
-7.  Install python requirements from the ``requirements.txt`` file.
+8.  Install python requirements from the ``requirements.txt`` file.
     It is up to you if you wish to use a virtual environment or not.
 
     .. code:: shell-session
 
-        pip3 install -r requirements.txt
+        sudo -Hu paperless pip3 install -r requirements.txt
+    
+    This will install all python dependencies in the home directory of
+    the new paperless user.
 
-
-8.  Go to ``/opt/paperless/src``, and execute the following commands:
+9.  Go to ``/opt/paperless/src``, and execute the following commands:
 
     .. code:: bash
 
         # This creates the database schema.
-        python3 manage.py migrate
+        sudo -Hu paperless python3 manage.py migrate
 
         # This creates your first paperless user
-        python3 manage.py createsuperuser
+        sudo -Hu paperless python3 manage.py createsuperuser
 
-9.  Optional: Test that paperless is working by executing
+10. Optional: Test that paperless is working by executing
 
       .. code:: bash
 
         # This collects static files from paperless and django.
-        python3 manage.py runserver
+        sudo -Hu paperless python3 manage.py runserver
 
     and pointing your browser to http://localhost:8000/.
 
@@ -380,7 +388,7 @@ writing. Windows is not and will never be supported.
         This will not start the consumer. Paperless does this in a
         separate process.
 
-10. Setup systemd services to run paperless automatically. You may
+11. Setup systemd services to run paperless automatically. You may
     use the service definition files included in the ``scripts`` folder
     as a starting point.
 
@@ -396,14 +404,7 @@ writing. Windows is not and will never be supported.
     These services rely on redis and optionally the database server, but
     don't need to be started in any particular order. The example files
     depend on redis being started. If you use a database server, you should
-    add additinal dependencies.
-
-    .. hint::
-
-        You may optionally set up your preferred web server to serve
-        paperless as a wsgi application directly instead of running the
-        ``webserver`` service. The module containing the wsgi application
-        is named ``paperless.wsgi``.
+    add additional dependencies.
 
     .. caution::
 
@@ -412,10 +413,13 @@ writing. Windows is not and will never be supported.
         however, the documentation of GUnicorn states that you should
         use a proxy server in front of gunicorn instead.
 
-11. Optional: Install a samba server and make the consumption folder
+        For instructions on how to use nginx for that,
+        :ref:`see the instructions below <setup-nginx>`.
+
+12. Optional: Install a samba server and make the consumption folder
     available as a network share.
 
-12. Configure ImageMagick to allow processing of PDF documents. Most distributions have
+13. Configure ImageMagick to allow processing of PDF documents. Most distributions have
     this disabled by default, since PDF documents can contain malware. If
     you don't do this, paperless will fall back to ghostscript for certain steps
     such as thumbnail generation.
@@ -432,7 +436,7 @@ writing. Windows is not and will never be supported.
 
         <policy domain="coder" rights="read|write" pattern="PDF" />
 
-13. Optional: Install the `jbig2enc <https://ocrmypdf.readthedocs.io/en/latest/jbig2.html>`_
+14. Optional: Install the `jbig2enc <https://ocrmypdf.readthedocs.io/en/latest/jbig2.html>`_
     encoder. This will reduce the size of generated PDF documents. You'll most likely need
     to compile this by yourself, because this software has been patented until around 2017 and
     binary packages are not available for most distributions.
@@ -441,9 +445,10 @@ writing. Windows is not and will never be supported.
 
 Install Paperless using ansible
 ===============================
-    .. note::
 
-        This role currently only supports Debian 10 Buster and Ubuntu 20.04 Focal or later as target hosts.
+.. note::
+
+    This role currently only supports Debian 10 Buster and Ubuntu 20.04 Focal or later as target hosts.
 
 1.  Install ansible 2.7+ on the management node.
     This may be the target host paperless-ng is being installed on or any remote host which can access the target host.

From e35723e7af318f3fa1bc82c5c77fb05e00679eb2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 15:30:47 +0100
Subject: [PATCH 1110/1300] fix some logging messages

---
 src/documents/consumer.py | 4 ++--
 src/documents/matching.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 23988c7c1..3baedb5c3 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -200,8 +200,6 @@ class Consumer(LoggingMixin):
                 MESSAGE_UNSUPPORTED_TYPE,
                 f"Unsupported mime type {mime_type}"
             )
-        else:
-            self.log("debug", f"Parser: {parser_class.__name__}")
 
         # Notify all listeners that we're going to do some work.
 
@@ -222,6 +220,8 @@ class Consumer(LoggingMixin):
 
         document_parser = parser_class(self.logging_group, progress_callback)
 
+        self.log("debug", f"Parser: {type(document_parser).__name__}")
+
         # However, this already created working directories which we have to
         # clean up.
 
diff --git a/src/documents/matching.py b/src/documents/matching.py
index edbbdc1b8..3b70930b6 100644
--- a/src/documents/matching.py
+++ b/src/documents/matching.py
@@ -11,7 +11,7 @@ logger = logging.getLogger("paperless.matching")
 def log_reason(matching_model, document, reason):
     class_name = type(matching_model).__name__
     logger.debug(
-        f"Assigning {class_name} {matching_model.name} to document "
+        f"{class_name} {matching_model.name} matched on document "
         f"{document} because {reason}")
 
 

From 019dfeb3eec3962ff219d17bae4e0c999e44283a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 16:59:04 +0100
Subject: [PATCH 1111/1300] separate mail logging

---
 src/paperless_mail/mail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
index 4a62ffd95..28a8a0784 100644
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@ -102,7 +102,7 @@ def get_mailbox(server, port, security):
 
 class MailAccountHandler(LoggingMixin):
 
-    logging_name = "paperless.mail"
+    logging_name = "paperless_mail"
 
     def _correspondent_from_name(self, name):
         try:

From 5696c02ac319657c262a00250aff46aef341a3c2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 17:00:06 +0100
Subject: [PATCH 1112/1300] remove log admin

---
 src/documents/admin.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/documents/admin.py b/src/documents/admin.py
index 78437f91c..266422d51 100755
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -116,22 +116,6 @@ class DocumentAdmin(admin.ModelAdmin):
         return format_html("<{} {}/>", kind, attributes)
 
 
-class LogAdmin(admin.ModelAdmin):
-
-    def has_add_permission(self, request):
-        return False
-
-    def has_change_permission(self, request, obj=None):
-        return False
-
-    list_display = ("created", "message", "level",)
-    list_filter = ("level", "created",)
-
-    ordering = ('-created',)
-
-    list_display_links = ("created", "message")
-
-
 class RuleInline(admin.TabularInline):
     model = SavedViewFilterRule
 
@@ -149,5 +133,4 @@ admin.site.register(Correspondent, CorrespondentAdmin)
 admin.site.register(Tag, TagAdmin)
 admin.site.register(DocumentType, DocumentTypeAdmin)
 admin.site.register(Document, DocumentAdmin)
-admin.site.register(Log, LogAdmin)
 admin.site.register(SavedView, SavedViewAdmin)

From fe435f66538f82e73d3cb37c5d18b8ae2b0a70ff Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 17:02:00 +0100
Subject: [PATCH 1113/1300] update API access for logs

---
 src/documents/serialisers.py       | 13 ------
 src/documents/tests/test_api.py    | 24 +++++++++++
 src/documents/tests/test_logger.py | 66 ------------------------------
 src/documents/tests/utils.py       |  4 ++
 src/documents/views.py             | 36 ++++++++++------
 src/paperless/urls.py              |  2 +-
 6 files changed, 52 insertions(+), 93 deletions(-)
 delete mode 100644 src/documents/tests/test_logger.py

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index aa4ef4bf8..fb0962902 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -153,19 +153,6 @@ class DocumentSerializer(DynamicFieldsModelSerializer):
         )
 
 
-class LogSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = Log
-        fields = (
-            "id",
-            "created",
-            "message",
-            "group",
-            "level"
-        )
-
-
 class SavedViewFilterRuleSerializer(serializers.ModelSerializer):
 
     class Meta:
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 9e4b77189..54d2b292d 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -4,7 +4,9 @@ import shutil
 import tempfile
 from unittest import mock
 
+from django.conf import settings
 from django.contrib.auth.models import User
+from django.test import override_settings
 from rest_framework.test import APITestCase
 from whoosh.writing import AsyncWriter
 
@@ -717,6 +719,28 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         v1 = SavedView.objects.get(id=v1.id)
         self.assertEqual(v1.filter_rules.count(), 0)
 
+    def test_get_logs(self):
+        response = self.client.get("/api/logs/")
+        self.assertEqual(response.status_code, 200)
+        self.assertCountEqual(response.data, ["mail", "paperless"])
+
+    def test_get_invalid_log(self):
+        response = self.client.get("/api/logs/bogus_log/")
+        self.assertEqual(response.status_code, 404)
+
+    @override_settings(LOGGING_DIR="bogus_dir")
+    def test_get_nonexistent_log(self):
+        response = self.client.get("/api/logs/paperless/")
+        self.assertEqual(response.status_code, 404)
+
+    def test_get_log(self):
+        log_data = "test\ntest2\n"
+        with open(os.path.join(settings.LOGGING_DIR, "paperless.log"), "w") as f:
+            f.write(log_data)
+        response = self.client.get("/api/logs/paperless/")
+        self.assertEqual(response.status_code, 200)
+        self.assertListEqual(response.data, ["test", "test2"])
+
 
 class TestBulkEdit(DirectoriesMixin, APITestCase):
 
diff --git a/src/documents/tests/test_logger.py b/src/documents/tests/test_logger.py
deleted file mode 100644
index bbc9c2b5d..000000000
--- a/src/documents/tests/test_logger.py
+++ /dev/null
@@ -1,66 +0,0 @@
-import logging
-import uuid
-from unittest import mock
-
-from django.test import TestCase, override_settings
-
-from ..models import Log
-
-
-class TestPaperlessLog(TestCase):
-
-    def __init__(self, *args, **kwargs):
-        TestCase.__init__(self, *args, **kwargs)
-        self.logger = logging.getLogger(
-            "documents.management.commands.document_consumer")
-
-    @override_settings(DISABLE_DBHANDLER=False)
-    def test_that_it_saves_at_all(self):
-
-        kw = {"group": uuid.uuid4()}
-
-        self.assertEqual(Log.objects.all().count(), 0)
-
-        with mock.patch("logging.StreamHandler.emit") as __:
-
-            # Debug messages are ignored by default
-            self.logger.debug("This is a debugging message", extra=kw)
-            self.assertEqual(Log.objects.all().count(), 1)
-
-            self.logger.info("This is an informational message", extra=kw)
-            self.assertEqual(Log.objects.all().count(), 2)
-
-            self.logger.warning("This is an warning message", extra=kw)
-            self.assertEqual(Log.objects.all().count(), 3)
-
-            self.logger.error("This is an error message", extra=kw)
-            self.assertEqual(Log.objects.all().count(), 4)
-
-            self.logger.critical("This is a critical message", extra=kw)
-            self.assertEqual(Log.objects.all().count(), 5)
-
-    @override_settings(DISABLE_DBHANDLER=False)
-    def test_groups(self):
-
-        kw1 = {"group": uuid.uuid4()}
-        kw2 = {"group": uuid.uuid4()}
-
-        self.assertEqual(Log.objects.all().count(), 0)
-
-        with mock.patch("logging.StreamHandler.emit") as __:
-
-            self.logger.info("This is an informational message", extra=kw2)
-            self.assertEqual(Log.objects.all().count(), 1)
-            self.assertEqual(Log.objects.filter(group=kw2["group"]).count(), 1)
-
-            self.logger.warning("This is an warning message", extra=kw1)
-            self.assertEqual(Log.objects.all().count(), 2)
-            self.assertEqual(Log.objects.filter(group=kw1["group"]).count(), 1)
-
-            self.logger.error("This is an error message", extra=kw2)
-            self.assertEqual(Log.objects.all().count(), 3)
-            self.assertEqual(Log.objects.filter(group=kw2["group"]).count(), 2)
-
-            self.logger.critical("This is a critical message", extra=kw1)
-            self.assertEqual(Log.objects.all().count(), 4)
-            self.assertEqual(Log.objects.filter(group=kw1["group"]).count(), 2)
diff --git a/src/documents/tests/utils.py b/src/documents/tests/utils.py
index dfefc4061..ebf79f6c5 100644
--- a/src/documents/tests/utils.py
+++ b/src/documents/tests/utils.py
@@ -19,12 +19,15 @@ def setup_directories():
     dirs.originals_dir = os.path.join(dirs.media_dir, "documents", "originals")
     dirs.thumbnail_dir = os.path.join(dirs.media_dir, "documents", "thumbnails")
     dirs.archive_dir = os.path.join(dirs.media_dir, "documents", "archive")
+    dirs.logging_dir = os.path.join(dirs.data_dir, "log")
 
     os.makedirs(dirs.index_dir, exist_ok=True)
     os.makedirs(dirs.originals_dir, exist_ok=True)
     os.makedirs(dirs.thumbnail_dir, exist_ok=True)
     os.makedirs(dirs.archive_dir, exist_ok=True)
 
+    os.makedirs(dirs.logging_dir, exist_ok=True)
+
     dirs.settings_override = override_settings(
         DATA_DIR=dirs.data_dir,
         SCRATCH_DIR=dirs.scratch_dir,
@@ -33,6 +36,7 @@ def setup_directories():
         THUMBNAIL_DIR=dirs.thumbnail_dir,
         ARCHIVE_DIR=dirs.archive_dir,
         CONSUMPTION_DIR=dirs.consumption_dir,
+        LOGGING_DIR=dirs.logging_dir,
         INDEX_DIR=dirs.index_dir,
         MODEL_FILE=os.path.join(dirs.data_dir, "classification_model.pickle"),
         MEDIA_LOCK=os.path.join(dirs.media_dir, "media.lock")
diff --git a/src/documents/views.py b/src/documents/views.py
index e413d4b35..2443ae342 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -29,7 +29,7 @@ from rest_framework.views import APIView
 from rest_framework.viewsets import (
     GenericViewSet,
     ModelViewSet,
-    ReadOnlyModelViewSet
+    ViewSet
 )
 
 import documents.index as index
@@ -40,16 +40,14 @@ from .filters import (
     CorrespondentFilterSet,
     DocumentFilterSet,
     TagFilterSet,
-    DocumentTypeFilterSet,
-    LogFilterSet
+    DocumentTypeFilterSet
 )
 from .matching import match_correspondents, match_tags, match_document_types
-from .models import Correspondent, Document, Log, Tag, DocumentType, SavedView
+from .models import Correspondent, Document, Tag, DocumentType, SavedView
 from .parsers import get_parser_class_for_mime_type
 from .serialisers import (
     CorrespondentSerializer,
     DocumentSerializer,
-    LogSerializer,
     TagSerializer,
     DocumentTypeSerializer,
     PostDocumentSerializer,
@@ -307,16 +305,28 @@ class DocumentViewSet(RetrieveModelMixin,
             raise Http404()
 
 
-class LogViewSet(ReadOnlyModelViewSet):
-    model = Log
+class LogViewSet(ViewSet):
 
-    queryset = Log.objects.all()
-    serializer_class = LogSerializer
-    pagination_class = StandardPagination
     permission_classes = (IsAuthenticated,)
-    filter_backends = (DjangoFilterBackend, OrderingFilter)
-    filterset_class = LogFilterSet
-    ordering_fields = ("created",)
+
+    log_files = ["paperless", "mail"]
+
+    def retrieve(self, request, pk=None, *args, **kwargs):
+        if not pk in self.log_files:
+            raise Http404()
+
+        filename = os.path.join(settings.LOGGING_DIR, f"{pk}.log")
+
+        if not os.path.isfile(filename):
+            raise Http404()
+
+        with open(filename, "r") as f:
+            lines = [l.rstrip() for l in f.readlines()]
+
+        return Response(lines)
+
+    def list(self, request, *args, **kwargs):
+        return Response(self.log_files)
 
 
 class SavedViewViewSet(ModelViewSet):
diff --git a/src/paperless/urls.py b/src/paperless/urls.py
index 5b58de454..40f4bd754 100755
--- a/src/paperless/urls.py
+++ b/src/paperless/urls.py
@@ -31,7 +31,7 @@ api_router = DefaultRouter()
 api_router.register(r"correspondents", CorrespondentViewSet)
 api_router.register(r"document_types", DocumentTypeViewSet)
 api_router.register(r"documents", DocumentViewSet)
-api_router.register(r"logs", LogViewSet)
+api_router.register(r"logs", LogViewSet, basename="logs")
 api_router.register(r"tags", TagViewSet)
 api_router.register(r"saved_views", SavedViewViewSet)
 

From 9fa3f91e8a870c165094034c4d84337f365dd544 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 17:05:07 +0100
Subject: [PATCH 1114/1300] update logging config

---
 Pipfile                   |   1 +
 Pipfile.lock              | 158 +++++++++++++-------------------------
 src/paperless/settings.py |  51 +++++++-----
 3 files changed, 86 insertions(+), 124 deletions(-)

diff --git a/Pipfile b/Pipfile
index 293d71603..43b9afd3f 100644
--- a/Pipfile
+++ b/Pipfile
@@ -48,6 +48,7 @@ tika = "*"
 channels = "~=3.0"
 channels-redis = "*"
 uvicorn = {extras = ["standard"], version = "*"}
+concurrent-log-handler = "*"
 
 [dev-packages]
 coveralls = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 78cfecf95..4da3d625d 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "658e2907c680baea81e77da9081ee063ff843b185d02c95d6483b747f0acd84d"
+            "sha256": "70117fd0d9bc10ab46b05ec2c58b59ca0e52b32a3c3e4e130c83bcfb70b51d5f"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -60,11 +60,11 @@
         },
         "autobahn": {
             "hashes": [
-                "sha256:410a93e0e29882c8b5d5ab05d220b07609b886ef5f23c0b8d39153254ffd6895",
-                "sha256:52ee4236ff9a1fcbbd9500439dcf3284284b37f8a6b31ecc8a36e00cf9f95049"
+                "sha256:93df8fc9d1821c9dabff9fed52181a9ad6eea5e9989d53102c391607d7c1666e",
+                "sha256:cceed2121b7a93024daa93c91fae33007f8346f0e522796421f36a6183abea99"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==20.12.3"
+            "version": "==21.1.1"
         },
         "automat": {
             "hashes": [
@@ -173,6 +173,14 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==15.0"
         },
+        "concurrent-log-handler": {
+            "hashes": [
+                "sha256:00d5ca24d463a7013c3479b026f34b76da4b50df8d76194132b8d8403c014379",
+                "sha256:b12f79abed3f94121c25ce9c24cdb57d889282ec6ff61f5535ab2068dc37d409"
+            ],
+            "index": "pypi",
+            "version": "==0.9.19"
+        },
         "constantly": {
             "hashes": [
                 "sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35",
@@ -420,14 +428,6 @@
             ],
             "version": "==0.4.0"
         },
-        "importlib-metadata": {
-            "hashes": [
-                "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771",
-                "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d"
-            ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.4.0"
-        },
         "incremental": {
             "hashes": [
                 "sha256:717e12246dddf231a349175f48d74d93e2897244939173b01974ab6661406b9f",
@@ -550,44 +550,34 @@
         },
         "numpy": {
             "hashes": [
-                "sha256:012426a41bc9ab63bb158635aecccc7610e3eff5d31d1eb43bc099debc979d94",
-                "sha256:06fab248a088e439402141ea04f0fffb203723148f6ee791e9c75b3e9e82f080",
-                "sha256:0eef32ca3132a48e43f6a0f5a82cb508f22ce5a3d6f67a8329c81c8e226d3f6e",
-                "sha256:1ded4fce9cfaaf24e7a0ab51b7a87be9038ea1ace7f34b841fe3b6894c721d1c",
-                "sha256:2e55195bc1c6b705bfd8ad6f288b38b11b1af32f3c8289d6c50d47f950c12e76",
-                "sha256:2ea52bd92ab9f768cc64a4c3ef8f4b2580a17af0a5436f6126b08efbd1838371",
-                "sha256:36674959eed6957e61f11c912f71e78857a8d0604171dfd9ce9ad5cbf41c511c",
-                "sha256:384ec0463d1c2671170901994aeb6dce126de0a95ccc3976c43b0038a37329c2",
-                "sha256:39b70c19ec771805081578cc936bbe95336798b7edf4732ed102e7a43ec5c07a",
-                "sha256:400580cbd3cff6ffa6293df2278c75aef2d58d8d93d3c5614cd67981dae68ceb",
-                "sha256:43d4c81d5ffdff6bae58d66a3cd7f54a7acd9a0e7b18d97abb255defc09e3140",
-                "sha256:50a4a0ad0111cc1b71fa32dedd05fa239f7fb5a43a40663269bb5dc7877cfd28",
-                "sha256:603aa0706be710eea8884af807b1b3bc9fb2e49b9f4da439e76000f3b3c6ff0f",
-                "sha256:6149a185cece5ee78d1d196938b2a8f9d09f5a5ebfbba66969302a778d5ddd1d",
-                "sha256:6373751c4b6fd325606d29dd98dc2bf7092485ad20aafbfc6a177acd3b89059e",
-                "sha256:759e4095edc3c1b3ac031f34d9459fa781777a93ccc633a472a5468587a190ff",
-                "sha256:7fb43004bce0ca31d8f13a6eb5e943fa73371381e53f7074ed21a4cb786c32f8",
-                "sha256:811daee36a58dc79cf3d8bdd4a490e4277d0e4b7d103a001a4e73ddb48e7e6aa",
-                "sha256:8b5e972b43c8fc27d56550b4120fe6257fdc15f9301914380b27f74856299fea",
-                "sha256:99abf4f353c3d1a0c7a5f27699482c987cf663b1eac20db59b8c7b061eabd7fc",
-                "sha256:a0d53e51a6cb6f0d9082decb7a4cb6dfb33055308c4c44f53103c073f649af73",
-                "sha256:a12ff4c8ddfee61f90a1633a4c4afd3f7bcb32b11c52026c92a12e1325922d0d",
-                "sha256:a4646724fba402aa7504cd48b4b50e783296b5e10a524c7a6da62e4a8ac9698d",
-                "sha256:a76f502430dd98d7546e1ea2250a7360c065a5fdea52b2dffe8ae7180909b6f4",
-                "sha256:a9d17f2be3b427fbb2bce61e596cf555d6f8a56c222bd2ca148baeeb5e5c783c",
-                "sha256:ab83f24d5c52d60dbc8cd0528759532736b56db58adaa7b5f1f76ad551416a1e",
-                "sha256:aeb9ed923be74e659984e321f609b9ba54a48354bfd168d21a2b072ed1e833ea",
-                "sha256:c843b3f50d1ab7361ca4f0b3639bf691569493a56808a0b0c54a051d260b7dbd",
-                "sha256:cae865b1cae1ec2663d8ea56ef6ff185bad091a5e33ebbadd98de2cfa3fa668f",
-                "sha256:cc6bd4fd593cb261332568485e20a0712883cf631f6f5e8e86a52caa8b2b50ff",
-                "sha256:cf2402002d3d9f91c8b01e66fbb436a4ed01c6498fffed0e4c7566da1d40ee1e",
-                "sha256:d051ec1c64b85ecc69531e1137bb9751c6830772ee5c1c426dbcfe98ef5788d7",
-                "sha256:d6631f2e867676b13026e2846180e2c13c1e11289d67da08d71cacb2cd93d4aa",
-                "sha256:dbd18bcf4889b720ba13a27ec2f2aac1981bd41203b3a3b27ba7a33f88ae4827",
-                "sha256:df609c82f18c5b9f6cb97271f03315ff0dbe481a2a02e56aeb1b1a985ce38e60"
+                "sha256:0d28a54afcf46f1f9ebd163e49ad6b49087f22986fefd01a23ca0c1cdda25ca6",
+                "sha256:1264c66129f5ef63187649dd43f1ca59532e8c098723643336a85131c0dcce3f",
+                "sha256:1abc02e30e3efd81a4571e00f8e62bf42e343c76698e0a3e11d9c2b3ee0d77a7",
+                "sha256:2445a96fbae23a4109c61be0f0af0f3bc273905dc5687a710850c1dfde0fc994",
+                "sha256:2bf0e68c92ef077fe766e53f8937d8ac341bdbca68ec128ae049b7d5c34e3206",
+                "sha256:33edfc0eb229f86f539493917b34035054313a11afbed48404aaf9f86bf4b0f6",
+                "sha256:3d8233c03f116d068d5365fed4477f2947c7229582dad81e5953088989294cec",
+                "sha256:4d592264d2a4f368afbb4288b5ceb646d4cbaf559c0249c096fbb0a149806b90",
+                "sha256:5ae765dd29c71a555f8102281f6fb15a3f4dbd35f6e7daf36af9df6d9dd716a5",
+                "sha256:894aaee60043a98b03f0ad992c810f62e3a15f98a701e1c0f58a4f4a0df13429",
+                "sha256:89bd70c9ad540febe6c28451ba225eb4e49d27f64728357f512c808002325dfa",
+                "sha256:93c2abea7bb69f47029b84ceac30ab46dfcfdb99b671ad850a333ff794a765e4",
+                "sha256:abdfa075e293d73638ece434708aa60b510dc6e70d805f57f481a0f550b25a9e",
+                "sha256:afeee581b50df20ef07b736e62ca612858f1fcdba96651d26ab44e3d567a4e6e",
+                "sha256:b51b9ef0624f4b01b846c981034c10d2e30db33f9f8be71e992f3900741f6f77",
+                "sha256:b66a6c15d793eda7cdad986e737775aa31b9306d588c14dd0277d2dda5546150",
+                "sha256:bd08254aac78b363b14acac456038ce6438bad848e02b275837930115e41ea21",
+                "sha256:cb257bb0c0a3176c32782a63cfab2eace7eabfa2a3b2dfd85a13700617ccaf28",
+                "sha256:cf5d9dcbdbe523fa665c5309cce5f144648d94a7fddbf5a40f8e0d5c9f5b596d",
+                "sha256:d1bc331e1706fd1809a1bc8a31205329e5b30cf5ba50461c624da267e99f6ae6",
+                "sha256:db5e69d08756a2fa75a42b4e433880b6187768fe1bc73d21819def893e5128c6",
+                "sha256:e3db646af9f6a145f0c57202f4b55d4a33f975e395e78fb7b394644c17c1a3a6",
+                "sha256:e9c5fd330d2fedf06051bafb996252de9b032fcb2ec03eefc9a543e56efa66d4",
+                "sha256:eee454d3aa3955d0c0069a0f265fea47f1e1384c35a110a95efed358eb6e1562",
+                "sha256:f1e9424e9aa3834ea27cc12f9c6ea8ace5da18ee60a720bb3a85b2f733f41782"
             ],
-            "markers": "python_version >= '3.6'",
-            "version": "==1.19.5"
+            "markers": "python_version >= '3.7'",
+            "version": "==1.20.0"
         },
         "ocrmypdf": {
             "hashes": [
@@ -696,6 +686,14 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==0.13.1"
         },
+        "portalocker": {
+            "hashes": [
+                "sha256:afa66c85041d7bac1532acb74ff26cc2406472dcf7145c90c31ff8ca4f1cc146",
+                "sha256:e5f6ffb2f360e9aef615a7c284143d2a93bb640c62e8e45a703e6083fc5aa114"
+            ],
+            "markers": "python_version >= '3'",
+            "version": "==2.2.1"
+        },
         "psycopg2-binary": {
             "hashes": [
                 "sha256:0deac2af1a587ae12836aa07970f5cb91964f05a7c6cdb69d8425ff4c15d4e2c",
@@ -1144,15 +1142,6 @@
             "markers": "python_version >= '3.6'",
             "version": "==20.12.1"
         },
-        "typing-extensions": {
-            "hashes": [
-                "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
-                "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
-                "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
-            ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.7.4.3"
-        },
         "tzlocal": {
             "hashes": [
                 "sha256:643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44",
@@ -1278,14 +1267,6 @@
             "index": "pypi",
             "version": "==2.7.4"
         },
-        "zipp": {
-            "hashes": [
-                "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108",
-                "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.4.0"
-        },
         "zope.interface": {
             "hashes": [
                 "sha256:05a97ba92c1c7c26f25c9f671aa1ef85ffead6cdad13770e5b689cf983adc7e1",
@@ -1506,11 +1487,11 @@
         },
         "faker": {
             "hashes": [
-                "sha256:0783729c61501d52efea2967aff6e6fcb8370f0f6b5a558f2a81233642ae529a",
-                "sha256:6b2995ffff6c2b02bc5daad96f8c24c021e5bd491d9d53d31bcbd66f348181d4"
+                "sha256:190f0d3ce037866b5d230f0b9fd0f513f07c25dc326dcad6ee019849c68d441c",
+                "sha256:db7adc3b4755005fc960cf96fb4ed46b54b6eb21413741ab3f31a9595f379905"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==5.8.0"
+            "version": "==6.0.0"
         },
         "filelock": {
             "hashes": [
@@ -1537,22 +1518,6 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.2.0"
         },
-        "importlib-metadata": {
-            "hashes": [
-                "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771",
-                "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d"
-            ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.4.0"
-        },
-        "importlib-resources": {
-            "hashes": [
-                "sha256:885b8eae589179f661c909d699a546cf10d83692553e34dca1bf5eb06f7f6217",
-                "sha256:bfdad047bce441405a49cf8eb48ddce5e56c696e185f59147a8b79e75e9e6380"
-            ],
-            "markers": "python_version < '3.7'",
-            "version": "==5.1.0"
-        },
         "iniconfig": {
             "hashes": [
                 "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3",
@@ -1861,20 +1826,11 @@
         },
         "tox": {
             "hashes": [
-                "sha256:76df3db6eee929bb62bdbacca5bb6bc840669d98e86a015b7a57b7df0a6eaf8b",
-                "sha256:854e6e4a71c614b488f81cb88df3b92edcb1a9ec43d4102e6289e9669bbf7f18"
+                "sha256:65d0e90ceb816638a50d64f4b47b11da767b284c0addda2294cb3cd69bd72425",
+                "sha256:cf7fef81a3a2434df4d7af2a6d1bf606d2970220addfbe7dea2615bd4bb2c252"
             ],
             "index": "pypi",
-            "version": "==3.21.3"
-        },
-        "typing-extensions": {
-            "hashes": [
-                "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
-                "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
-                "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
-            ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.7.4.3"
+            "version": "==3.21.4"
         },
         "urllib3": {
             "hashes": [
@@ -1891,14 +1847,6 @@
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==20.4.2"
-        },
-        "zipp": {
-            "hashes": [
-                "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108",
-                "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.4.0"
         }
     }
 }
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 5a3c206ed..d518249c6 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -4,6 +4,7 @@ import multiprocessing
 import os
 import re
 
+from concurrent_log_handler.queue import setup_logging_queues
 from dotenv import load_dotenv
 
 from django.utils.translation import gettext_lazy as _
@@ -62,6 +63,8 @@ MEDIA_LOCK = os.path.join(MEDIA_ROOT, "media.lock")
 INDEX_DIR = os.path.join(DATA_DIR, "index")
 MODEL_FILE = os.path.join(DATA_DIR, "classification_model.pickle")
 
+LOGGING_DIR = os.getenv('PAPERLESS_LOGGING_DIR', os.path.join(DATA_DIR, "log"))
+
 CONSUMPTION_DIR = os.getenv("PAPERLESS_CONSUMPTION_DIR", os.path.join(BASE_DIR, "..", "consume"))
 
 # This will be created if it doesn't exist
@@ -306,14 +309,19 @@ USE_TZ = True
 # Logging                                                                     #
 ###############################################################################
 
-DISABLE_DBHANDLER = __get_boolean("PAPERLESS_DISABLE_DBHANDLER")
+setup_logging_queues()
+
+os.makedirs(LOGGING_DIR, exist_ok=True)
+
+LOGROTATE_MAX_SIZE = os.getenv("PAPERLESS_LOGROTATE_MAX_SIZE", 1000000)
+LOGROTATE_MAX_BACKUPS = os.getenv("PAPERLESS_LOGROTATE_MAX_BACKUPS", 20)
 
 LOGGING = {
     "version": 1,
     "disable_existing_loggers": False,
     'formatters': {
         'verbose': {
-            'format': '{levelname} {asctime} {module} {message}',
+            'format': '[{asctime}] [{levelname}] [{name}] {message}',
             'style': '{',
         },
         'simple': {
@@ -322,34 +330,39 @@ LOGGING = {
         },
     },
     "handlers": {
-        "db": {
-            "level": "DEBUG",
-            "class": "documents.loggers.PaperlessHandler",
-        },
         "console": {
             "level": "DEBUG" if DEBUG else "INFO",
             "class": "logging.StreamHandler",
             "formatter": "verbose",
+        },
+        "file_paperless": {
+            "class": "concurrent_log_handler.ConcurrentRotatingFileHandler",
+            "formatter": "verbose",
+            "filename": os.path.join(LOGGING_DIR, "paperless.log"),
+            "maxBytes": LOGROTATE_MAX_SIZE,
+            "backupCount": LOGROTATE_MAX_BACKUPS
+        },
+        "file_mail": {
+            "class": "concurrent_log_handler.ConcurrentRotatingFileHandler",
+            "formatter": "verbose",
+            "filename": os.path.join(LOGGING_DIR, "mail.log"),
+            "maxBytes": LOGROTATE_MAX_SIZE,
+            "backupCount": LOGROTATE_MAX_BACKUPS
         }
     },
     "root": {
-        "handlers": ["console"],
-        "level": "DEBUG",
+        "handlers": ["console"]
     },
     "loggers": {
-        "documents": {
-            "handlers": ["db"],
-            "propagate": True,
+        "paperless": {
+            "handlers": ["file_paperless"],
+            "level": "DEBUG"
         },
         "paperless_mail": {
-            "handlers": ["db"],
-            "propagate": True,
-        },
-        "paperless_tesseract": {
-            "handlers": ["db"],
-            "propagate": True,
-        },
-    },
+            "handlers": ["file_mail"],
+            "level": "DEBUG"
+        }
+    }
 }
 
 ###############################################################################

From 9993381cda1fad164625259ede9dc57cb6620ad1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 17:07:25 +0100
Subject: [PATCH 1115/1300] rework of the log viewer

---
 .../manage/logs/logs.component.html           | 33 ++++-------
 .../manage/logs/logs.component.scss           |  8 +++
 .../components/manage/logs/logs.component.ts  | 57 ++++++++++---------
 src-ui/src/app/data/paperless-log.ts          | 27 ---------
 src-ui/src/app/services/rest/log.service.ts   | 17 ++++--
 5 files changed, 62 insertions(+), 80 deletions(-)
 delete mode 100644 src-ui/src/app/data/paperless-log.ts

diff --git a/src-ui/src/app/components/manage/logs/logs.component.html b/src-ui/src/app/components/manage/logs/logs.component.html
index be14faf1d..8a2a28ef8 100644
--- a/src-ui/src/app/components/manage/logs/logs.component.html
+++ b/src-ui/src/app/components/manage/logs/logs.component.html
@@ -1,27 +1,18 @@
 <app-page-header title="Logs" i18n-title>
 
-  <div ngbDropdown class="btn-group">
-    <button class="btn btn-outline-primary btn-sm" id="dropdownBasic1" ngbDropdownToggle>
-      <svg class="toolbaricon" fill="currentColor">
-        <use xlink:href="assets/bootstrap-icons.svg#funnel" />
-      </svg>&nbsp;<ng-container i18n>Filter</ng-container>
-
-
-    </button>
-    <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-      <button *ngFor="let f of getLevels()" ngbDropdownItem (click)="setLevel(f.id)"
-        [class.active]="level == f.id">{{f.name}}</button>
-    </div>
-  </div>
-
 </app-page-header>
 
-<div class="bg-dark p-3 mb-3 text-light text-monospace" infiniteScroll (scrolled)="onScroll()">
+
+<ul ngbNav #nav="ngbNav" [(activeId)]="activeLog" (activeIdChange)="reloadLogs()" class="nav-tabs">
+  <li *ngFor="let logFile of logFiles" [ngbNavItem]="logFile">
+    <a ngbNavLink>{{logFile}}.log</a>
+  </li>
+</ul>
+
+<div [ngbNavOutlet]="nav" class="mt-2"></div>
+
+<div #logContainer class="bg-dark p-3 mb-3 text-light text-monospace log-container">
   <p
-    class="m-0 p-0 log-entry-{{log.level}}"
-    *ngFor="let log of logs">
-      {{log.created | customDate:'short'}}
-      {{getLevelText(log.level)}}
-      {{log.message}}
-  </p>
+    class="m-0 p-0 log-entry-{{getLogLevel(log)}}"
+    *ngFor="let log of logs" style="white-space: pre;">{{log}}</p>
 </div>
diff --git a/src-ui/src/app/components/manage/logs/logs.component.scss b/src-ui/src/app/components/manage/logs/logs.component.scss
index dee9b10dc..a99506c12 100644
--- a/src-ui/src/app/components/manage/logs/logs.component.scss
+++ b/src-ui/src/app/components/manage/logs/logs.component.scss
@@ -13,4 +13,12 @@
 .log-entry-50 {
   color: lightcoral !important;
   font-weight: bold;
+}
+
+.log-container {
+
+  overflow: scroll;
+
+  height: calc(100vh - 190px);
+  top: 70px;
 }
\ No newline at end of file
diff --git a/src-ui/src/app/components/manage/logs/logs.component.ts b/src-ui/src/app/components/manage/logs/logs.component.ts
index b131796ee..0754e4253 100644
--- a/src-ui/src/app/components/manage/logs/logs.component.ts
+++ b/src-ui/src/app/components/manage/logs/logs.component.ts
@@ -1,5 +1,4 @@
-import { Component, OnInit } from '@angular/core';
-import { LOG_LEVELS, LOG_LEVEL_INFO, PaperlessLog } from 'src/app/data/paperless-log';
+import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { LogService } from 'src/app/services/rest/log.service';
 
 @Component({
@@ -11,38 +10,42 @@ export class LogsComponent implements OnInit {
 
   constructor(private logService: LogService) { }
 
-  logs: PaperlessLog[] = []
-  level: number = LOG_LEVEL_INFO
+  @ViewChild('logContainer') private logContainer: ElementRef
+
+  logs: string[] = []
+
+  logFiles: string[] = []
+
+  activeLog: string
 
   ngOnInit(): void {
-    this.reload()
-  }
-
-  reload() {
-    this.logService.list(1, 50, 'created', true, {'level__gte': this.level}).subscribe(result => this.logs = result.results)
-  }
-
-  getLevelText(level: number) {
-    return LOG_LEVELS.find(l => l.id == level)?.name
-  }
-
-  onScroll() {
-    let lastCreated = null
-    if (this.logs.length > 0) {
-      lastCreated = new Date(this.logs[this.logs.length-1].created).toISOString()
-    }
-    this.logService.list(1, 25, 'created', true, {'created__lt': lastCreated, 'level__gte': this.level}).subscribe(result => {
-      this.logs.push(...result.results)
+    this.logService.list().subscribe(result => {
+      this.logFiles = result
+      if (this.logFiles.length > 0) {
+        this.activeLog = this.logFiles[0]
+        this.reloadLogs()
+      }
     })
   }
 
-  getLevels() {
-    return LOG_LEVELS
+  reloadLogs() {
+    this.logService.get(this.activeLog).subscribe(result => {
+      this.logs = result
+    })
   }
 
-  setLevel(id) {
-    this.level = id
-    this.reload()
+  getLogLevel(log: string) {
+    if (log.indexOf("[DEBUG]") != -1) {
+      return 10
+    } else if (log.indexOf("[WARNING]") != -1) {
+      return 30
+    } else if (log.indexOf("[ERROR]") != -1) {
+      return 40
+    } else if (log.indexOf("[CRITICAL]") != -1) {
+      return 50
+    } else {
+      return 20
+    }
   }
 
 }
diff --git a/src-ui/src/app/data/paperless-log.ts b/src-ui/src/app/data/paperless-log.ts
deleted file mode 100644
index 61a6fce99..000000000
--- a/src-ui/src/app/data/paperless-log.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-export const LOG_LEVEL_DEBUG = 10
-export const LOG_LEVEL_INFO = 20
-export const LOG_LEVEL_WARNING = 30
-export const LOG_LEVEL_ERROR = 40
-export const LOG_LEVEL_CRITICAL = 50
-
-export const LOG_LEVELS = [
-  {id: LOG_LEVEL_DEBUG, name: "DEBUG"},
-  {id: LOG_LEVEL_INFO, name: "INFO"},
-  {id: LOG_LEVEL_WARNING, name: "WARNING"},
-  {id: LOG_LEVEL_ERROR, name: "ERROR"},
-  {id: LOG_LEVEL_CRITICAL, name: "CRITICAL"}
-]
-
-export interface PaperlessLog {
-
-  id?: number
-
-  group?: string
-
-  message?: string
-
-  created?: Date
-
-  level?: number
-
-}
diff --git a/src-ui/src/app/services/rest/log.service.ts b/src-ui/src/app/services/rest/log.service.ts
index 797d9b6b9..3abf2fb6f 100644
--- a/src-ui/src/app/services/rest/log.service.ts
+++ b/src-ui/src/app/services/rest/log.service.ts
@@ -1,14 +1,21 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { PaperlessLog } from 'src/app/data/paperless-log';
-import { AbstractPaperlessService } from './abstract-paperless-service';
+import { Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
 
 @Injectable({
   providedIn: 'root'
 })
-export class LogService extends AbstractPaperlessService<PaperlessLog> {
+export class LogService {
 
-  constructor(http: HttpClient) {
-    super(http, 'logs')
+  constructor(private http: HttpClient) {
+  }
+
+  list(): Observable<string[]> {
+    return this.http.get<string[]>(`${environment.apiBaseUrl}logs/`)
+  }
+
+  get(id: string): Observable<string[]> {
+    return this.http.get<string[]>(`${environment.apiBaseUrl}logs/${id}/`)
   }
 }

From 80b3fa75a540ce6507334fe2224babe1b6b99400 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 17:21:32 +0100
Subject: [PATCH 1116/1300] pycodestyle

---
 src/documents/loggers.py | 5 ++++-
 src/documents/views.py   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/documents/loggers.py b/src/documents/loggers.py
index 4b0f03552..90f6770e0 100644
--- a/src/documents/loggers.py
+++ b/src/documents/loggers.py
@@ -17,7 +17,10 @@ class LoggingMixin:
         if self.logging_name:
             logger = logging.getLogger(self.logging_name)
         else:
-            name = ".".join([self.__class__.__module__, self.__class__.__name__])
+            name = ".".join([
+                self.__class__.__module__,
+                self.__class__.__name__
+            ])
             logger = logging.getLogger(name)
 
         getattr(logger, level)(message, extra={
diff --git a/src/documents/views.py b/src/documents/views.py
index 2443ae342..5ab4ca9df 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -312,7 +312,7 @@ class LogViewSet(ViewSet):
     log_files = ["paperless", "mail"]
 
     def retrieve(self, request, pk=None, *args, **kwargs):
-        if not pk in self.log_files:
+        if pk not in self.log_files:
             raise Http404()
 
         filename = os.path.join(settings.LOGGING_DIR, f"{pk}.log")
@@ -321,7 +321,7 @@ class LogViewSet(ViewSet):
             raise Http404()
 
         with open(filename, "r") as f:
-            lines = [l.rstrip() for l in f.readlines()]
+            lines = [line.rstrip() for line in f.readlines()]
 
         return Response(lines)
 

From 5ef6f2697ea949a571672557b081658b483a54d6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 17:21:40 +0100
Subject: [PATCH 1117/1300] default settings

---
 src/paperless/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index d518249c6..718738f71 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -313,7 +313,7 @@ setup_logging_queues()
 
 os.makedirs(LOGGING_DIR, exist_ok=True)
 
-LOGROTATE_MAX_SIZE = os.getenv("PAPERLESS_LOGROTATE_MAX_SIZE", 1000000)
+LOGROTATE_MAX_SIZE = os.getenv("PAPERLESS_LOGROTATE_MAX_SIZE", 1024*1024)
 LOGROTATE_MAX_BACKUPS = os.getenv("PAPERLESS_LOGROTATE_MAX_BACKUPS", 20)
 
 LOGGING = {

From e8a1fde1c7ab0d086fc15210e98d02948990377b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 17:22:05 +0100
Subject: [PATCH 1118/1300] documentation

---
 docs/changelog.rst     |  7 +++++++
 docs/configuration.rst | 27 +++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2b9821408..537e898c7 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -58,6 +58,13 @@ paperless-ng 1.1.0
 
   * Better info section in the side bar.
 
+  * Paperless no longer logs to the database. Instead, logs are written to rotating log files. This solves many "database is locked"
+    issues on Raspberry Pi, especially when SQLite is used.
+
+  * By default, log files are written to ``PAPERLESS_DATA_DIR/log/``. Logging settings can be adjusted with
+    ``PAPERLESS_LOGGING_DIR``, ``PAPERLESS_LOGROTATE_MAX_SIZE`` and
+    ``PAPERLESS_LOGROTATE_MAX_BACKUPS``.
+
 paperless-ng 1.0.0
 ##################
 
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 36b124350..a307cc25a 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -72,13 +72,13 @@ PAPERLESS_CONSUMPTION_DIR=<path>
     container. Change the local consumption directory in the docker-compose.yml
     file instead.
 
-    Defaults to "../consume", relative to the "src" directory.
+    Defaults to "../consume/", relative to the "src" directory.
 
 PAPERLESS_DATA_DIR=<path>
     This is where paperless stores all its data (search index, SQLite database,
     classification model, etc).
 
-    Defaults to "../data", relative to the "src" directory.
+    Defaults to "../data/", relative to the "src" directory.
 
 PAPERLESS_MEDIA_ROOT=<path>
     This is where your documents and thumbnails are stored.
@@ -86,7 +86,7 @@ PAPERLESS_MEDIA_ROOT=<path>
     You can set this and PAPERLESS_DATA_DIR to the same folder to have paperless
     store all its data within the same volume.
 
-    Defaults to "../media", relative to the "src" directory.
+    Defaults to "../media/", relative to the "src" directory.
 
 PAPERLESS_STATICDIR=<path>
     Override the default STATIC_ROOT here.  This is where all static files
@@ -94,7 +94,7 @@ PAPERLESS_STATICDIR=<path>
 
     Unless you're doing something fancy, there is no need to override this.
 
-    Defaults to "../static", relative to the "src" directory.
+    Defaults to "../static/", relative to the "src" directory.
 
 PAPERLESS_FILENAME_FORMAT=<format>
     Changes the filenames paperless uses to store documents in the media directory.
@@ -102,6 +102,25 @@ PAPERLESS_FILENAME_FORMAT=<format>
 
     Default is none, which disables this feature.
 
+PAPERLESS_LOGGING_DIR=<path>
+    This is where paperless will store log files.
+
+    Defaults to "``PAPERLESS_DATA_DIR``/log/".
+
+
+Logging
+#######
+
+PAPERLESS_LOGROTATE_MAX_SIZE=<num>
+    Maximum file size for log files before they are rotated, in bytes.
+
+    Defaults to 1 MiB.
+
+PAPERLESS_LOGROTATE_MAX_BACKUPS=<num>
+    Number of rotated log files to keep.
+
+    Defaults to 20.
+
 Hosting & Security
 ##################
 

From d09ea8408c74f7d35a0fb71c56a5ac1b4eea6339 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 17:36:31 +0100
Subject: [PATCH 1119/1300] keep numpy below 1.20, since that breaks python 3.6

---
 Pipfile      |  2 ++
 Pipfile.lock | 66 ++++++++++++++++++++++++++++++----------------------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/Pipfile b/Pipfile
index 43b9afd3f..504b267c4 100644
--- a/Pipfile
+++ b/Pipfile
@@ -21,6 +21,8 @@ fuzzywuzzy = {extras = ["speedup"], version = "*"}
 gunicorn = "*"
 imap-tools = "*"
 langdetect = "*"
+# numpy 1.20.0 drops python 3.6 support
+numpy = "~=1.19.5"
 pdftotext = "*"
 pathvalidate = "*"
 # pinned to 8.1.0, since aarch64 wheels might not be available beyond that https://github.com/python-pillow/Pillow/issues/5202
diff --git a/Pipfile.lock b/Pipfile.lock
index 4da3d625d..fafec4310 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "70117fd0d9bc10ab46b05ec2c58b59ca0e52b32a3c3e4e130c83bcfb70b51d5f"
+            "sha256": "aec5aa96fc4cad6d06f00d0ada0f8bd193f42874f476d39e76fc69d05c78f9f6"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -550,34 +550,44 @@
         },
         "numpy": {
             "hashes": [
-                "sha256:0d28a54afcf46f1f9ebd163e49ad6b49087f22986fefd01a23ca0c1cdda25ca6",
-                "sha256:1264c66129f5ef63187649dd43f1ca59532e8c098723643336a85131c0dcce3f",
-                "sha256:1abc02e30e3efd81a4571e00f8e62bf42e343c76698e0a3e11d9c2b3ee0d77a7",
-                "sha256:2445a96fbae23a4109c61be0f0af0f3bc273905dc5687a710850c1dfde0fc994",
-                "sha256:2bf0e68c92ef077fe766e53f8937d8ac341bdbca68ec128ae049b7d5c34e3206",
-                "sha256:33edfc0eb229f86f539493917b34035054313a11afbed48404aaf9f86bf4b0f6",
-                "sha256:3d8233c03f116d068d5365fed4477f2947c7229582dad81e5953088989294cec",
-                "sha256:4d592264d2a4f368afbb4288b5ceb646d4cbaf559c0249c096fbb0a149806b90",
-                "sha256:5ae765dd29c71a555f8102281f6fb15a3f4dbd35f6e7daf36af9df6d9dd716a5",
-                "sha256:894aaee60043a98b03f0ad992c810f62e3a15f98a701e1c0f58a4f4a0df13429",
-                "sha256:89bd70c9ad540febe6c28451ba225eb4e49d27f64728357f512c808002325dfa",
-                "sha256:93c2abea7bb69f47029b84ceac30ab46dfcfdb99b671ad850a333ff794a765e4",
-                "sha256:abdfa075e293d73638ece434708aa60b510dc6e70d805f57f481a0f550b25a9e",
-                "sha256:afeee581b50df20ef07b736e62ca612858f1fcdba96651d26ab44e3d567a4e6e",
-                "sha256:b51b9ef0624f4b01b846c981034c10d2e30db33f9f8be71e992f3900741f6f77",
-                "sha256:b66a6c15d793eda7cdad986e737775aa31b9306d588c14dd0277d2dda5546150",
-                "sha256:bd08254aac78b363b14acac456038ce6438bad848e02b275837930115e41ea21",
-                "sha256:cb257bb0c0a3176c32782a63cfab2eace7eabfa2a3b2dfd85a13700617ccaf28",
-                "sha256:cf5d9dcbdbe523fa665c5309cce5f144648d94a7fddbf5a40f8e0d5c9f5b596d",
-                "sha256:d1bc331e1706fd1809a1bc8a31205329e5b30cf5ba50461c624da267e99f6ae6",
-                "sha256:db5e69d08756a2fa75a42b4e433880b6187768fe1bc73d21819def893e5128c6",
-                "sha256:e3db646af9f6a145f0c57202f4b55d4a33f975e395e78fb7b394644c17c1a3a6",
-                "sha256:e9c5fd330d2fedf06051bafb996252de9b032fcb2ec03eefc9a543e56efa66d4",
-                "sha256:eee454d3aa3955d0c0069a0f265fea47f1e1384c35a110a95efed358eb6e1562",
-                "sha256:f1e9424e9aa3834ea27cc12f9c6ea8ace5da18ee60a720bb3a85b2f733f41782"
+                "sha256:012426a41bc9ab63bb158635aecccc7610e3eff5d31d1eb43bc099debc979d94",
+                "sha256:06fab248a088e439402141ea04f0fffb203723148f6ee791e9c75b3e9e82f080",
+                "sha256:0eef32ca3132a48e43f6a0f5a82cb508f22ce5a3d6f67a8329c81c8e226d3f6e",
+                "sha256:1ded4fce9cfaaf24e7a0ab51b7a87be9038ea1ace7f34b841fe3b6894c721d1c",
+                "sha256:2e55195bc1c6b705bfd8ad6f288b38b11b1af32f3c8289d6c50d47f950c12e76",
+                "sha256:2ea52bd92ab9f768cc64a4c3ef8f4b2580a17af0a5436f6126b08efbd1838371",
+                "sha256:36674959eed6957e61f11c912f71e78857a8d0604171dfd9ce9ad5cbf41c511c",
+                "sha256:384ec0463d1c2671170901994aeb6dce126de0a95ccc3976c43b0038a37329c2",
+                "sha256:39b70c19ec771805081578cc936bbe95336798b7edf4732ed102e7a43ec5c07a",
+                "sha256:400580cbd3cff6ffa6293df2278c75aef2d58d8d93d3c5614cd67981dae68ceb",
+                "sha256:43d4c81d5ffdff6bae58d66a3cd7f54a7acd9a0e7b18d97abb255defc09e3140",
+                "sha256:50a4a0ad0111cc1b71fa32dedd05fa239f7fb5a43a40663269bb5dc7877cfd28",
+                "sha256:603aa0706be710eea8884af807b1b3bc9fb2e49b9f4da439e76000f3b3c6ff0f",
+                "sha256:6149a185cece5ee78d1d196938b2a8f9d09f5a5ebfbba66969302a778d5ddd1d",
+                "sha256:6373751c4b6fd325606d29dd98dc2bf7092485ad20aafbfc6a177acd3b89059e",
+                "sha256:759e4095edc3c1b3ac031f34d9459fa781777a93ccc633a472a5468587a190ff",
+                "sha256:7fb43004bce0ca31d8f13a6eb5e943fa73371381e53f7074ed21a4cb786c32f8",
+                "sha256:811daee36a58dc79cf3d8bdd4a490e4277d0e4b7d103a001a4e73ddb48e7e6aa",
+                "sha256:8b5e972b43c8fc27d56550b4120fe6257fdc15f9301914380b27f74856299fea",
+                "sha256:99abf4f353c3d1a0c7a5f27699482c987cf663b1eac20db59b8c7b061eabd7fc",
+                "sha256:a0d53e51a6cb6f0d9082decb7a4cb6dfb33055308c4c44f53103c073f649af73",
+                "sha256:a12ff4c8ddfee61f90a1633a4c4afd3f7bcb32b11c52026c92a12e1325922d0d",
+                "sha256:a4646724fba402aa7504cd48b4b50e783296b5e10a524c7a6da62e4a8ac9698d",
+                "sha256:a76f502430dd98d7546e1ea2250a7360c065a5fdea52b2dffe8ae7180909b6f4",
+                "sha256:a9d17f2be3b427fbb2bce61e596cf555d6f8a56c222bd2ca148baeeb5e5c783c",
+                "sha256:ab83f24d5c52d60dbc8cd0528759532736b56db58adaa7b5f1f76ad551416a1e",
+                "sha256:aeb9ed923be74e659984e321f609b9ba54a48354bfd168d21a2b072ed1e833ea",
+                "sha256:c843b3f50d1ab7361ca4f0b3639bf691569493a56808a0b0c54a051d260b7dbd",
+                "sha256:cae865b1cae1ec2663d8ea56ef6ff185bad091a5e33ebbadd98de2cfa3fa668f",
+                "sha256:cc6bd4fd593cb261332568485e20a0712883cf631f6f5e8e86a52caa8b2b50ff",
+                "sha256:cf2402002d3d9f91c8b01e66fbb436a4ed01c6498fffed0e4c7566da1d40ee1e",
+                "sha256:d051ec1c64b85ecc69531e1137bb9751c6830772ee5c1c426dbcfe98ef5788d7",
+                "sha256:d6631f2e867676b13026e2846180e2c13c1e11289d67da08d71cacb2cd93d4aa",
+                "sha256:dbd18bcf4889b720ba13a27ec2f2aac1981bd41203b3a3b27ba7a33f88ae4827",
+                "sha256:df609c82f18c5b9f6cb97271f03315ff0dbe481a2a02e56aeb1b1a985ce38e60"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==1.20.0"
+            "index": "pypi",
+            "version": "==1.19.5"
         },
         "ocrmypdf": {
             "hashes": [

From d2c34fb9c7e7426479e439a7be392115136d00f0 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 17:37:47 +0100
Subject: [PATCH 1120/1300] update requirements.txt

---
 requirements.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index e1b76a4a0..7986f92fe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ arrow==0.17.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2,
 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==20.12.3; python_version >= '3.6'
+autobahn==21.1.1; python_version >= '3.6'
 automat==20.2.0
 blessed==1.17.12
 certifi==2020.12.5
@@ -22,6 +22,7 @@ channels==3.0.3
 chardet==4.0.0; python_version >= '3.1'
 click==7.1.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 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.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
 daphne==3.0.1; python_version >= '3.6'
@@ -44,7 +45,6 @@ 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.37.0
 img2pdf==0.4.0
-importlib-metadata==3.4.0; python_version < '3.8'
 incremental==17.5.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
@@ -52,7 +52,7 @@ joblib==1.0.0; 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'
 msgpack==1.0.2
-numpy==1.19.5; python_version >= '3.6'
+numpy==1.19.5
 ocrmypdf==11.6.0
 pathvalidate==2.3.2
 pdfminer.six==20201018; python_version >= '3.4'
@@ -60,6 +60,7 @@ pdftotext==2.1.5
 pikepdf==2.5.2
 pillow==8.1.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'
 psycopg2-binary==2.8.6
 pyasn1-modules==0.2.8
 pyasn1==0.4.8
@@ -88,7 +89,6 @@ tika==1.24
 tqdm==4.56.0
 twisted[tls]==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 txaio==20.12.1; python_version >= '3.6'
-typing-extensions==3.7.4.3; python_version < '3.8'
 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'
 uvicorn[standard]==0.13.3
@@ -99,5 +99,4 @@ wcwidth==0.2.5
 websockets==8.1
 whitenoise==5.2.0
 whoosh==2.7.4
-zipp==3.4.0; python_version >= '3.6'
 zope.interface==5.2.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'

From 0e764416843c3788862b2b9f267bf8d370f42438 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 18:51:31 +0100
Subject: [PATCH 1121/1300] fix log viewer for empty logs

---
 src-ui/src/app/components/manage/logs/logs.component.html | 2 +-
 src-ui/src/app/components/manage/logs/logs.component.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/manage/logs/logs.component.html b/src-ui/src/app/components/manage/logs/logs.component.html
index 8a2a28ef8..56ffd25bb 100644
--- a/src-ui/src/app/components/manage/logs/logs.component.html
+++ b/src-ui/src/app/components/manage/logs/logs.component.html
@@ -11,7 +11,7 @@
 
 <div [ngbNavOutlet]="nav" class="mt-2"></div>
 
-<div #logContainer class="bg-dark p-3 mb-3 text-light text-monospace log-container">
+<div class="bg-dark p-3 mb-3 text-light text-monospace log-container">
   <p
     class="m-0 p-0 log-entry-{{getLogLevel(log)}}"
     *ngFor="let log of logs" style="white-space: pre;">{{log}}</p>
diff --git a/src-ui/src/app/components/manage/logs/logs.component.ts b/src-ui/src/app/components/manage/logs/logs.component.ts
index 0754e4253..d77fcde4a 100644
--- a/src-ui/src/app/components/manage/logs/logs.component.ts
+++ b/src-ui/src/app/components/manage/logs/logs.component.ts
@@ -10,8 +10,6 @@ export class LogsComponent implements OnInit {
 
   constructor(private logService: LogService) { }
 
-  @ViewChild('logContainer') private logContainer: ElementRef
-
   logs: string[] = []
 
   logFiles: string[] = []
@@ -31,6 +29,8 @@ export class LogsComponent implements OnInit {
   reloadLogs() {
     this.logService.get(this.activeLog).subscribe(result => {
       this.logs = result
+    }, error => {
+      this.logs = []
     })
   }
 

From fd8c40fee7f8ad9a8fb717661b93ea763bdcad19 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 18:51:53 +0100
Subject: [PATCH 1122/1300] increase worker timeout

---
 gunicorn.conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gunicorn.conf.py b/gunicorn.conf.py
index f80be548d..6fcbe6b0e 100644
--- a/gunicorn.conf.py
+++ b/gunicorn.conf.py
@@ -1,7 +1,7 @@
 bind = '0.0.0.0:8000'
 workers = 2
 worker_class = 'uvicorn.workers.UvicornWorker'
-timeout = 60
+timeout = 120
 
 def pre_fork(server, worker):
     pass

From ed39e9e15f0ce8edefe5e23794b966c15e1c5caa Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 20:48:23 +0100
Subject: [PATCH 1123/1300] update copyright #506

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index b2442ddc9..71abe2079 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -28,7 +28,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Paperless-ng'
-copyright = u'2015, Daniel Quinn'
+copyright = u'2021, Daniel Quinn, Jonas Winkler'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

From 0024c2aae49b10f3d121db031d621ce8bf2c8ee2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 20:51:04 +0100
Subject: [PATCH 1124/1300] caching

---
 Pipfile                   |  1 +
 Pipfile.lock              | 11 ++++++++++-
 src/paperless/settings.py | 12 +++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Pipfile b/Pipfile
index 504b267c4..7fcf3de26 100644
--- a/Pipfile
+++ b/Pipfile
@@ -51,6 +51,7 @@ channels = "~=3.0"
 channels-redis = "*"
 uvicorn = {extras = ["standard"], version = "*"}
 concurrent-log-handler = "*"
+django-redis = "*"
 
 [dev-packages]
 coveralls = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index fafec4310..c3d57fc7d 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "aec5aa96fc4cad6d06f00d0ada0f8bd193f42874f476d39e76fc69d05c78f9f6"
+            "sha256": "0c2003b9d3d95d1af594f749a2740b55079551ea0ae512177ee9524bb327281e"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -273,6 +273,15 @@
             "index": "pypi",
             "version": "==1.3.4"
         },
+        "django-redis": {
+            "hashes": [
+                "sha256:1133b26b75baa3664164c3f44b9d5d133d1b8de45d94d79f38d1adc5b1d502e5",
+                "sha256:306589c7021e6468b2656edc89f62b8ba67e8d5a1c8877e2688042263daa7a63",
+                "sha256:f2b25b62cc95b63b7059aaf8e81710e7eea94678e545d31c46e47a6f4af99e56"
+            ],
+            "index": "pypi",
+            "version": "==4.12.1"
+        },
         "djangorestframework": {
             "hashes": [
                 "sha256:0209bafcb7b5010fdfec784034f059d512256424de2a0f084cb82b096d6dd6a7",
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 718738f71..60e7b45bd 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -169,6 +169,16 @@ CHANNEL_LAYERS = {
     },
 }
 
+CACHES = {
+    "default": {
+        "BACKEND": "django_redis.cache.RedisCache",
+        "LOCATION": os.getenv("PAPERLESS_REDIS", "redis://localhost:6379"),
+        "OPTIONS": {
+            "CLIENT_CLASS": "django_redis.client.DefaultClient",
+        }
+    }
+}
+
 ###############################################################################
 # Security                                                                    #
 ###############################################################################
@@ -398,7 +408,7 @@ Q_CLUSTER = {
     'name': 'paperless',
     'catch_up': False,
     'workers': TASK_WORKERS,
-    'redis': os.getenv("PAPERLESS_REDIS", "redis://localhost:6379")
+    'django_redis': 'default'
 }
 
 

From ffe96c8fffa8ca22c5911ad82aea48aa77d13cc1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 20:54:58 +0100
Subject: [PATCH 1125/1300] classifier caching

---
 src/documents/classifier.py            | 76 ++++++++++++--------------
 src/documents/tasks.py                 |  2 +-
 src/documents/tests/test_classifier.py | 63 ++++++++++-----------
 src/documents/tests/test_tasks.py      |  3 +-
 4 files changed, 68 insertions(+), 76 deletions(-)

diff --git a/src/documents/classifier.py b/src/documents/classifier.py
index 2acebe04a..5151d453c 100755
--- a/src/documents/classifier.py
+++ b/src/documents/classifier.py
@@ -5,6 +5,7 @@ import pickle
 import re
 
 from django.conf import settings
+from django.core.cache import cache
 
 from documents.models import Document, MatchingModel
 
@@ -30,22 +31,28 @@ def load_classifier():
         )
         return None
 
-    try:
+    version = os.stat(settings.MODEL_FILE).st_mtime
+
+    classifier = cache.get("paperless-classifier", version=version)
+
+    if not classifier:
         classifier = DocumentClassifier()
-        classifier.reload()
-    except (EOFError, IncompatibleClassifierVersionError) as e:
-        # there's something wrong with the model file.
-        logger.error(
-            f"Unrecoverable error while loading document "
-            f"classification model: {str(e)}, deleting model file."
-        )
-        os.unlink(settings.MODEL_FILE)
-        classifier = None
-    except OSError as e:
-        logger.error(
-            f"Error while loading document classification model: {str(e)}"
-        )
-        classifier = None
+        try:
+            classifier.load()
+            cache.set("paperless-classifier", classifier, version=version)
+        except (EOFError, IncompatibleClassifierVersionError) as e:
+            # there's something wrong with the model file.
+            logger.error(
+                f"Unrecoverable error while loading document "
+                f"classification model: {str(e)}, deleting model file."
+            )
+            os.unlink(settings.MODEL_FILE)
+            classifier = None
+        except OSError as e:
+            logger.error(
+                f"Error while loading document classification model: {str(e)}"
+            )
+            classifier = None
 
     return classifier
 
@@ -55,10 +62,6 @@ class DocumentClassifier(object):
     FORMAT_VERSION = 6
 
     def __init__(self):
-        # mtime of the model file on disk. used to prevent reloading when
-        # nothing has changed.
-        self.classifier_version = 0
-
         # hash of the training data. used to prevent re-training when the
         # training data has not changed.
         self.data_hash = None
@@ -69,30 +72,23 @@ class DocumentClassifier(object):
         self.correspondent_classifier = None
         self.document_type_classifier = None
 
-    def reload(self):
-        if os.path.getmtime(settings.MODEL_FILE) > self.classifier_version:
-            with open(settings.MODEL_FILE, "rb") as f:
-                schema_version = pickle.load(f)
+    def load(self):
+        with open(settings.MODEL_FILE, "rb") as f:
+            schema_version = pickle.load(f)
 
-                if schema_version != self.FORMAT_VERSION:
-                    raise IncompatibleClassifierVersionError(
-                        "Cannor load classifier, incompatible versions.")
-                else:
-                    if self.classifier_version > 0:
-                        # Don't be confused by this check. It's simply here
-                        # so that we wont log anything on initial reload.
-                        logger.info("Classifier updated on disk, "
-                                    "reloading classifier models")
-                    self.data_hash = pickle.load(f)
-                    self.data_vectorizer = pickle.load(f)
-                    self.tags_binarizer = pickle.load(f)
+            if schema_version != self.FORMAT_VERSION:
+                raise IncompatibleClassifierVersionError(
+                    "Cannor load classifier, incompatible versions.")
+            else:
+                self.data_hash = pickle.load(f)
+                self.data_vectorizer = pickle.load(f)
+                self.tags_binarizer = pickle.load(f)
 
-                    self.tags_classifier = pickle.load(f)
-                    self.correspondent_classifier = pickle.load(f)
-                    self.document_type_classifier = pickle.load(f)
-            self.classifier_version = os.path.getmtime(settings.MODEL_FILE)
+                self.tags_classifier = pickle.load(f)
+                self.correspondent_classifier = pickle.load(f)
+                self.document_type_classifier = pickle.load(f)
 
-    def save_classifier(self):
+    def save(self):
         with open(settings.MODEL_FILE, "wb") as f:
             pickle.dump(self.FORMAT_VERSION, f)
             pickle.dump(self.data_hash, f)
diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index 8c7d91585..f74a3d420 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -52,7 +52,7 @@ def train_classifier():
                 "Saving updated classifier model to {}...".format(
                     settings.MODEL_FILE)
             )
-            classifier.save_classifier()
+            classifier.save()
         else:
             logger.debug(
                 "Training data unchanged."
diff --git a/src/documents/tests/test_classifier.py b/src/documents/tests/test_classifier.py
index 14673ae65..1efe564d1 100644
--- a/src/documents/tests/test_classifier.py
+++ b/src/documents/tests/test_classifier.py
@@ -1,7 +1,6 @@
 import os
 import tempfile
 from pathlib import Path
-from time import sleep
 from unittest import mock
 
 from django.conf import settings
@@ -85,37 +84,19 @@ class TestClassifier(DirectoriesMixin, TestCase):
         self.assertTrue(self.classifier.train())
         self.assertFalse(self.classifier.train())
 
-        self.classifier.save_classifier()
+        self.classifier.save()
 
         classifier2 = DocumentClassifier()
 
         current_ver = DocumentClassifier.FORMAT_VERSION
         with mock.patch("documents.classifier.DocumentClassifier.FORMAT_VERSION", current_ver+1):
             # assure that we won't load old classifiers.
-            self.assertRaises(IncompatibleClassifierVersionError, classifier2.reload)
+            self.assertRaises(IncompatibleClassifierVersionError, classifier2.load)
 
-            self.classifier.save_classifier()
+            self.classifier.save()
 
             # assure that we can load the classifier after saving it.
-            classifier2.reload()
-
-    def testReload(self):
-
-        self.generate_test_data()
-        self.assertTrue(self.classifier.train())
-        self.classifier.save_classifier()
-
-        classifier2 = DocumentClassifier()
-        classifier2.reload()
-        v1 = classifier2.classifier_version
-
-        # change the classifier after some time.
-        sleep(1)
-        self.classifier.save_classifier()
-
-        classifier2.reload()
-        v2 = classifier2.classifier_version
-        self.assertNotEqual(v1, v2)
+            classifier2.load()
 
     @override_settings(DATA_DIR=tempfile.mkdtemp())
     def testSaveClassifier(self):
@@ -124,10 +105,10 @@ class TestClassifier(DirectoriesMixin, TestCase):
 
         self.classifier.train()
 
-        self.classifier.save_classifier()
+        self.classifier.save()
 
         new_classifier = DocumentClassifier()
-        new_classifier.reload()
+        new_classifier.load()
         self.assertFalse(new_classifier.train())
 
     @override_settings(MODEL_FILE=os.path.join(os.path.dirname(__file__), "data", "model.pickle"))
@@ -135,7 +116,7 @@ class TestClassifier(DirectoriesMixin, TestCase):
         self.generate_test_data()
 
         new_classifier = DocumentClassifier()
-        new_classifier.reload()
+        new_classifier.load()
 
         self.assertCountEqual(new_classifier.predict_tags(self.doc2.content), [45, 12])
 
@@ -252,25 +233,39 @@ class TestClassifier(DirectoriesMixin, TestCase):
         self.assertFalse(os.path.exists(settings.MODEL_FILE))
         self.assertIsNone(load_classifier())
 
-    @mock.patch("documents.classifier.DocumentClassifier.reload")
-    def test_load_classifier(self, reload):
+    @override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}})
+    @mock.patch("documents.classifier.DocumentClassifier.load")
+    def test_load_classifier(self, load):
         Path(settings.MODEL_FILE).touch()
         self.assertIsNotNone(load_classifier())
+        load.assert_called_once()
 
-    @mock.patch("documents.classifier.DocumentClassifier.reload")
-    def test_load_classifier_incompatible_version(self, reload):
+    @override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'}})
+    @override_settings(MODEL_FILE=os.path.join(os.path.dirname(__file__), "data", "model.pickle"))
+    def test_load_classifier_cached(self):
+        classifier = load_classifier()
+        self.assertIsNotNone(classifier)
+
+        with mock.patch("documents.classifier.DocumentClassifier.load") as load:
+            classifier2 = load_classifier()
+            load.assert_not_called()
+
+    @override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}})
+    @mock.patch("documents.classifier.DocumentClassifier.load")
+    def test_load_classifier_incompatible_version(self, load):
         Path(settings.MODEL_FILE).touch()
         self.assertTrue(os.path.exists(settings.MODEL_FILE))
 
-        reload.side_effect = IncompatibleClassifierVersionError()
+        load.side_effect = IncompatibleClassifierVersionError()
         self.assertIsNone(load_classifier())
         self.assertFalse(os.path.exists(settings.MODEL_FILE))
 
-    @mock.patch("documents.classifier.DocumentClassifier.reload")
-    def test_load_classifier_os_error(self, reload):
+    @override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}})
+    @mock.patch("documents.classifier.DocumentClassifier.load")
+    def test_load_classifier_os_error(self, load):
         Path(settings.MODEL_FILE).touch()
         self.assertTrue(os.path.exists(settings.MODEL_FILE))
 
-        reload.side_effect = OSError()
+        load.side_effect = OSError()
         self.assertIsNone(load_classifier())
         self.assertTrue(os.path.exists(settings.MODEL_FILE))
diff --git a/src/documents/tests/test_tasks.py b/src/documents/tests/test_tasks.py
index d008f995a..ed280441f 100644
--- a/src/documents/tests/test_tasks.py
+++ b/src/documents/tests/test_tasks.py
@@ -2,7 +2,7 @@ import os
 from unittest import mock
 
 from django.conf import settings
-from django.test import TestCase
+from django.test import TestCase, override_settings
 from django.utils import timezone
 
 from documents import tasks
@@ -52,6 +52,7 @@ class TestTasks(DirectoriesMixin, TestCase):
         load_classifier.assert_called_once()
         self.assertFalse(os.path.isfile(settings.MODEL_FILE))
 
+    @override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}})
     def test_train_classifier(self):
         c = Correspondent.objects.create(matching_algorithm=Tag.MATCH_AUTO, name="test")
         doc = Document.objects.create(correspondent=c, content="test", title="test")

From 7702f5012b5eb2ed311d8abcb5d38b5ed8be1c85 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 21:03:32 +0100
Subject: [PATCH 1126/1300] classifier cache timeout

---
 src/documents/classifier.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/documents/classifier.py b/src/documents/classifier.py
index 5151d453c..81f860314 100755
--- a/src/documents/classifier.py
+++ b/src/documents/classifier.py
@@ -39,7 +39,8 @@ def load_classifier():
         classifier = DocumentClassifier()
         try:
             classifier.load()
-            cache.set("paperless-classifier", classifier, version=version)
+            cache.set("paperless-classifier", classifier,
+                      version=version, timeout=86400)
         except (EOFError, IncompatibleClassifierVersionError) as e:
             # there's something wrong with the model file.
             logger.error(

From 656b4708ac448de629a439e26199960234c16f4a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 6 Feb 2021 21:16:06 +0100
Subject: [PATCH 1127/1300] update requirements.txt

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 7986f92fe..5379725b5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,6 +32,7 @@ django-extensions==3.1.0
 django-filter==2.4.0
 django-picklefield==3.0.1; python_version >= '3'
 django-q==1.3.4
+django-redis==4.12.1
 django==3.1.6
 djangorestframework==3.12.2
 filelock==3.0.12

From 40f3e8e45af8c6548c94a14ce5d8df599542cc70 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sat, 6 Feb 2021 23:26:44 +0100
Subject: [PATCH 1128/1300] Update README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 80b9c85fe..7ef647561 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,6 @@
 
 Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. 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.
 
-# Survey
-
-If you already used Paperless-ng for a bit, would like to give some anonymous feedback, and help me decide on what to focus on next: I've created a survey, [see here](https://github.com/jonaswinkler/paperless-ng/issues/402). Thank you!
-
 # How it Works
 
 Paperless does not control your scanner, it only helps you deal with what your scanner produces.

From bcee17c3ac342341dafd76733a1d8009bf7645e6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 7 Feb 2021 00:14:24 +0100
Subject: [PATCH 1129/1300] github actions: build release tags

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5eaca123a..08630e176 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,6 +2,7 @@ name: ci
 
 on:
   push:
+    tags: ng-*
     branches-ignore:
       - 'translations**'
   pull_request:

From f555bb95aef3dd42c66091797643851c0d02a6ce Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 7 Feb 2021 00:49:53 +0100
Subject: [PATCH 1130/1300] possible fix for the ansible roles

---
 ansible/molecule/default/verify.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/molecule/default/verify.yml b/ansible/molecule/default/verify.yml
index 185840783..7646b223e 100644
--- a/ansible/molecule/default/verify.yml
+++ b/ansible/molecule/default/verify.yml
@@ -38,7 +38,7 @@
 
     - name: verify uploaded document has been accepted
       uri:
-        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/"
+        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/paperless/"
         headers:
           Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
         return_content: yes
@@ -51,7 +51,7 @@
 
     - name: verify uploaded document has been consumed
       uri:
-        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/"
+        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/paperless/"
         headers:
           Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
         return_content: yes

From 731418349ff5b812bf5fc67b7ac0a63a6058ab1f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 7 Feb 2021 18:23:54 +0100
Subject: [PATCH 1131/1300] added a test case that replicates #511

---
 src/documents/sanity_checker.py        |  12 ++++++---
 src/documents/tests/samples/simple.png | Bin 0 -> 7913 bytes
 src/documents/tests/test_consumer.py   |  35 +++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 src/documents/tests/samples/simple.png

diff --git a/src/documents/sanity_checker.py b/src/documents/sanity_checker.py
index bc0b689d4..b8fd73f98 100644
--- a/src/documents/sanity_checker.py
+++ b/src/documents/sanity_checker.py
@@ -56,7 +56,8 @@ def check_sanity():
             messages.append(SanityError(
                 f"Thumbnail of document {doc.pk} does not exist."))
         else:
-            present_files.remove(os.path.normpath(doc.thumbnail_path))
+            if os.path.normpath(doc.thumbnail_path) in present_files:
+                present_files.remove(os.path.normpath(doc.thumbnail_path))
             try:
                 with doc.thumbnail_file as f:
                     f.read()
@@ -71,7 +72,8 @@ def check_sanity():
             messages.append(SanityError(
                 f"Original of document {doc.pk} does not exist."))
         else:
-            present_files.remove(os.path.normpath(doc.source_path))
+            if os.path.normpath(doc.source_path) in present_files:
+                present_files.remove(os.path.normpath(doc.source_path))
             try:
                 with doc.source_file as f:
                     checksum = hashlib.md5(f.read()).hexdigest()
@@ -92,7 +94,8 @@ def check_sanity():
                     f"Archived version of document {doc.pk} does not exist."
                 ))
             else:
-                present_files.remove(os.path.normpath(doc.archive_path))
+                if os.path.normpath(doc.archive_path) in present_files:
+                    present_files.remove(os.path.normpath(doc.archive_path))
                 try:
                     with doc.archive_file as f:
                         checksum = hashlib.md5(f.read()).hexdigest()
@@ -103,7 +106,8 @@ def check_sanity():
                 else:
                     if not checksum == doc.archive_checksum:
                         messages.append(SanityError(
-                            f"Checksum mismatch of archive {doc.pk}. "
+                            f"Checksum mismatch of archived document "
+                            f"{doc.pk}. "
                             f"Stored: {doc.checksum}, actual: {checksum}."
                         ))
 
diff --git a/src/documents/tests/samples/simple.png b/src/documents/tests/samples/simple.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3a76840103812c371dd78f2e8bc704ea3eec1ba
GIT binary patch
literal 7913
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
Ruvbl>s;I6|ENAlKe*j2SP+b53

literal 0
HcmV?d00001

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index a6f0cc55a..8ead1ea41 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -5,12 +5,14 @@ import tempfile
 from unittest import mock
 from unittest.mock import MagicMock
 
+from django.conf import settings
 from django.test import TestCase, override_settings
 
 from .utils import DirectoriesMixin
 from ..consumer import Consumer, ConsumerError
 from ..models import FileInfo, Tag, Correspondent, DocumentType, Document
 from ..parsers import DocumentParser, ParseError
+from ..tasks import sanity_check
 
 
 class TestAttributes(TestCase):
@@ -181,6 +183,24 @@ class DummyParser(DocumentParser):
         self.text = "The Text"
 
 
+class CopyParser(DocumentParser):
+
+    def get_thumbnail(self, document_path, mime_type):
+        return self.fake_thumb
+
+    def get_optimised_thumbnail(self, document_path, mime_type):
+        return self.fake_thumb
+
+    def __init__(self, logging_group, progress_callback=None):
+        super(CopyParser, self).__init__(logging_group, progress_callback)
+        _, self.fake_thumb = tempfile.mkstemp(suffix=".png", dir=self.tempdir)
+
+    def parse(self, document_path, mime_type, file_name=None):
+        self.text = "The text"
+        self.archive_path = os.path.join(self.tempdir, "archive.pdf")
+        shutil.copy(document_path, self.archive_path)
+
+
 class FaultyParser(DocumentParser):
 
     def get_thumbnail(self, document_path, mime_type):
@@ -203,6 +223,8 @@ def fake_magic_from_file(file, mime=False):
     if mime:
         if os.path.splitext(file)[1] == ".pdf":
             return "application/pdf"
+        elif os.path.splitext(file)[1] == ".png":
+            return "image/png"
         else:
             return "unknown"
     else:
@@ -516,6 +538,19 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self._assert_first_last_send_progress(last_status="FAILED")
 
+    @mock.patch("documents.parsers.document_consumer_declaration.send")
+    def test_similar_filenames(self, m):
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), os.path.join(settings.CONSUMPTION_DIR, "simple.pdf"))
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.png"), os.path.join(settings.CONSUMPTION_DIR, "simple.png"))
+        m.return_value = [(None, {
+            "parser": CopyParser,
+            "mime_types": {"application/pdf": ".pdf", "image/png": ".zip"},
+            "weight": 0
+        })]
+        doc1 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.png"))
+        doc2 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.pdf"))
+
+        sanity_check()
 
 class PreConsumeTestCase(TestCase):
 

From 9b64eebd108b1e27238895353298d97425d1fc88 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 7 Feb 2021 18:26:03 +0100
Subject: [PATCH 1132/1300] revert commit

---
 src/documents/sanity_checker.py        |  12 +++------
 src/documents/tests/samples/simple.png | Bin 7913 -> 0 bytes
 src/documents/tests/test_consumer.py   |  35 -------------------------
 3 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 src/documents/tests/samples/simple.png

diff --git a/src/documents/sanity_checker.py b/src/documents/sanity_checker.py
index b8fd73f98..bc0b689d4 100644
--- a/src/documents/sanity_checker.py
+++ b/src/documents/sanity_checker.py
@@ -56,8 +56,7 @@ def check_sanity():
             messages.append(SanityError(
                 f"Thumbnail of document {doc.pk} does not exist."))
         else:
-            if os.path.normpath(doc.thumbnail_path) in present_files:
-                present_files.remove(os.path.normpath(doc.thumbnail_path))
+            present_files.remove(os.path.normpath(doc.thumbnail_path))
             try:
                 with doc.thumbnail_file as f:
                     f.read()
@@ -72,8 +71,7 @@ def check_sanity():
             messages.append(SanityError(
                 f"Original of document {doc.pk} does not exist."))
         else:
-            if os.path.normpath(doc.source_path) in present_files:
-                present_files.remove(os.path.normpath(doc.source_path))
+            present_files.remove(os.path.normpath(doc.source_path))
             try:
                 with doc.source_file as f:
                     checksum = hashlib.md5(f.read()).hexdigest()
@@ -94,8 +92,7 @@ def check_sanity():
                     f"Archived version of document {doc.pk} does not exist."
                 ))
             else:
-                if os.path.normpath(doc.archive_path) in present_files:
-                    present_files.remove(os.path.normpath(doc.archive_path))
+                present_files.remove(os.path.normpath(doc.archive_path))
                 try:
                     with doc.archive_file as f:
                         checksum = hashlib.md5(f.read()).hexdigest()
@@ -106,8 +103,7 @@ def check_sanity():
                 else:
                     if not checksum == doc.archive_checksum:
                         messages.append(SanityError(
-                            f"Checksum mismatch of archived document "
-                            f"{doc.pk}. "
+                            f"Checksum mismatch of archive {doc.pk}. "
                             f"Stored: {doc.checksum}, actual: {checksum}."
                         ))
 
diff --git a/src/documents/tests/samples/simple.png b/src/documents/tests/samples/simple.png
deleted file mode 100644
index a3a76840103812c371dd78f2e8bc704ea3eec1ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7913
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
Ruvbl>s;I6|ENAlKe*j2SP+b53

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 8ead1ea41..a6f0cc55a 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -5,14 +5,12 @@ import tempfile
 from unittest import mock
 from unittest.mock import MagicMock
 
-from django.conf import settings
 from django.test import TestCase, override_settings
 
 from .utils import DirectoriesMixin
 from ..consumer import Consumer, ConsumerError
 from ..models import FileInfo, Tag, Correspondent, DocumentType, Document
 from ..parsers import DocumentParser, ParseError
-from ..tasks import sanity_check
 
 
 class TestAttributes(TestCase):
@@ -183,24 +181,6 @@ class DummyParser(DocumentParser):
         self.text = "The Text"
 
 
-class CopyParser(DocumentParser):
-
-    def get_thumbnail(self, document_path, mime_type):
-        return self.fake_thumb
-
-    def get_optimised_thumbnail(self, document_path, mime_type):
-        return self.fake_thumb
-
-    def __init__(self, logging_group, progress_callback=None):
-        super(CopyParser, self).__init__(logging_group, progress_callback)
-        _, self.fake_thumb = tempfile.mkstemp(suffix=".png", dir=self.tempdir)
-
-    def parse(self, document_path, mime_type, file_name=None):
-        self.text = "The text"
-        self.archive_path = os.path.join(self.tempdir, "archive.pdf")
-        shutil.copy(document_path, self.archive_path)
-
-
 class FaultyParser(DocumentParser):
 
     def get_thumbnail(self, document_path, mime_type):
@@ -223,8 +203,6 @@ def fake_magic_from_file(file, mime=False):
     if mime:
         if os.path.splitext(file)[1] == ".pdf":
             return "application/pdf"
-        elif os.path.splitext(file)[1] == ".png":
-            return "image/png"
         else:
             return "unknown"
     else:
@@ -538,19 +516,6 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self._assert_first_last_send_progress(last_status="FAILED")
 
-    @mock.patch("documents.parsers.document_consumer_declaration.send")
-    def test_similar_filenames(self, m):
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), os.path.join(settings.CONSUMPTION_DIR, "simple.pdf"))
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.png"), os.path.join(settings.CONSUMPTION_DIR, "simple.png"))
-        m.return_value = [(None, {
-            "parser": CopyParser,
-            "mime_types": {"application/pdf": ".pdf", "image/png": ".zip"},
-            "weight": 0
-        })]
-        doc1 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.png"))
-        doc2 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.pdf"))
-
-        sanity_check()
 
 class PreConsumeTestCase(TestCase):
 

From 61143b3ad1adc65845e7f316e5a7253fb0bffafc Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 7 Feb 2021 19:53:08 +0100
Subject: [PATCH 1133/1300] make the test case fail

---
 src/documents/tests/test_consumer.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 8ead1ea41..280124f48 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -538,6 +538,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self._assert_first_last_send_progress(last_status="FAILED")
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
     @mock.patch("documents.parsers.document_consumer_declaration.send")
     def test_similar_filenames(self, m):
         shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), os.path.join(settings.CONSUMPTION_DIR, "simple.pdf"))

From 40106f6fccd85ee7ba1eb24765d9beb3305cf6cd Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 8 Feb 2021 00:10:52 +0100
Subject: [PATCH 1134/1300] updated documentation regarding execution of
 management commands with docker fixes #509

---
 docs/administration.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/administration.rst b/docs/administration.rst
index c54323e6e..03a9610d1 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -180,7 +180,7 @@ tasks on your paperless instance. You can invoke these commands either by
 .. code:: shell-session
 
     $ cd /path/to/paperless
-    $ docker-compose run --rm webserver <command> <arguments>
+    $ docker-compose exec -u paperless webserver python3 manage.py <command> <arguments>
 
 or
 

From 816c95a4ae443f552ea793b94b72dc2594d04e83 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 8 Feb 2021 13:18:08 +0100
Subject: [PATCH 1135/1300] code style

---
 src/documents/tests/test_date_parsing.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/documents/tests/test_date_parsing.py b/src/documents/tests/test_date_parsing.py
index 9cbb19c2b..50543ee75 100644
--- a/src/documents/tests/test_date_parsing.py
+++ b/src/documents/tests/test_date_parsing.py
@@ -1,7 +1,6 @@
 import datetime
 import os
 import shutil
-from unittest import mock
 from uuid import uuid4
 
 from dateutil import tz
@@ -9,7 +8,6 @@ from django.conf import settings
 from django.test import TestCase, override_settings
 
 from documents.parsers import parse_date
-from paperless_tesseract.parsers import RasterisedDocumentParser
 
 
 class TestDate(TestCase):
@@ -152,4 +150,4 @@ class TestDate(TestCase):
                 2018, 2, 13, 0, 0,
                 tzinfo=tz.gettz(settings.TIME_ZONE)
             )
-        )
\ No newline at end of file
+        )

From 302ebf737e7df91a93b20fc9764346e7c681e073 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 8 Feb 2021 13:18:39 +0100
Subject: [PATCH 1136/1300] refactor migration test case

---
 ...rations.py => test_migration_mime_type.py} | 45 +------------------
 src/documents/tests/utils.py                  | 40 ++++++++++++++++-
 2 files changed, 41 insertions(+), 44 deletions(-)
 rename src/documents/tests/{test_migrations.py => test_migration_mime_type.py} (66%)

diff --git a/src/documents/tests/test_migrations.py b/src/documents/tests/test_migration_mime_type.py
similarity index 66%
rename from src/documents/tests/test_migrations.py
rename to src/documents/tests/test_migration_mime_type.py
index ee7180c63..5e825e89d 100644
--- a/src/documents/tests/test_migrations.py
+++ b/src/documents/tests/test_migration_mime_type.py
@@ -1,52 +1,11 @@
 import os
 import shutil
-from pathlib import Path
 
-from django.apps import apps
 from django.conf import settings
-from django.db import connection
-from django.db.migrations.executor import MigrationExecutor
-from django.test import TestCase, TransactionTestCase, override_settings
+from django.test import override_settings
 
-from documents.models import Document
 from documents.parsers import get_default_file_extension
-from documents.tests.utils import DirectoriesMixin
-
-
-class TestMigrations(TransactionTestCase):
-
-    @property
-    def app(self):
-        return apps.get_containing_app_config(type(self).__module__).name
-
-    migrate_from = None
-    migrate_to = None
-
-    def setUp(self):
-        super(TestMigrations, self).setUp()
-
-        assert self.migrate_from and self.migrate_to, \
-            "TestCase '{}' must define migrate_from and migrate_to     properties".format(type(self).__name__)
-        self.migrate_from = [(self.app, self.migrate_from)]
-        self.migrate_to = [(self.app, self.migrate_to)]
-        executor = MigrationExecutor(connection)
-        old_apps = executor.loader.project_state(self.migrate_from).apps
-
-        # Reverse to the original migration
-        executor.migrate(self.migrate_from)
-
-        self.setUpBeforeMigration(old_apps)
-
-        # Run the migration to test
-        executor = MigrationExecutor(connection)
-        executor.loader.build_graph()  # reload.
-        executor.migrate(self.migrate_to)
-
-        self.apps = executor.loader.project_state(self.migrate_to).apps
-
-    def setUpBeforeMigration(self, apps):
-        pass
-
+from documents.tests.utils import DirectoriesMixin, TestMigrations
 
 STORAGE_TYPE_UNENCRYPTED = "unencrypted"
 STORAGE_TYPE_GPG = "gpg"
diff --git a/src/documents/tests/utils.py b/src/documents/tests/utils.py
index ebf79f6c5..b9be25d70 100644
--- a/src/documents/tests/utils.py
+++ b/src/documents/tests/utils.py
@@ -4,7 +4,10 @@ import tempfile
 from collections import namedtuple
 from contextlib import contextmanager
 
-from django.test import override_settings
+from django.apps import apps
+from django.db import connection
+from django.db.migrations.executor import MigrationExecutor
+from django.test import override_settings, TransactionTestCase
 
 
 def setup_directories():
@@ -79,3 +82,38 @@ class DirectoriesMixin:
     def tearDown(self) -> None:
         super(DirectoriesMixin, self).tearDown()
         remove_dirs(self.dirs)
+
+
+class TestMigrations(TransactionTestCase):
+
+    @property
+    def app(self):
+        return apps.get_containing_app_config(type(self).__module__).name
+
+    migrate_from = None
+    migrate_to = None
+
+    def setUp(self):
+        super(TestMigrations, self).setUp()
+
+        assert self.migrate_from and self.migrate_to, \
+            "TestCase '{}' must define migrate_from and migrate_to     properties".format(type(self).__name__)
+        self.migrate_from = [(self.app, self.migrate_from)]
+        self.migrate_to = [(self.app, self.migrate_to)]
+        executor = MigrationExecutor(connection)
+        old_apps = executor.loader.project_state(self.migrate_from).apps
+
+        # Reverse to the original migration
+        executor.migrate(self.migrate_from)
+
+        self.setUpBeforeMigration(old_apps)
+
+        # Run the migration to test
+        executor = MigrationExecutor(connection)
+        executor.loader.build_graph()  # reload.
+        executor.migrate(self.migrate_to)
+
+        self.apps = executor.loader.project_state(self.migrate_to).apps
+
+    def setUpBeforeMigration(self, apps):
+        pass

From c2d8bda83c8bdc214565351329a4643eb6ba998a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 8 Feb 2021 19:59:14 +0100
Subject: [PATCH 1137/1300] fix for #511

---
 src/documents/file_handling.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index 6ee97f5c3..64858de78 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -161,5 +161,8 @@ def generate_filename(doc, counter=0, append_gpg=True):
 
 
 def archive_name_from_filename(filename):
-
-    return os.path.splitext(filename)[0] + ".pdf"
+    name, ext = os.path.splitext(filename)
+    if ext == ".pdf":
+        return filename
+    else:
+        return filename + ".pdf"

From 0c676b90f24ded60ddee4a95d43658496e99076f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 8 Feb 2021 20:59:14 +0100
Subject: [PATCH 1138/1300] migration for #511

---
 .../migrations/1012_fix_archive_files.py      | 181 ++++++++++++++++++
 src/documents/tests/samples/simple.jpg        | Bin 0 -> 17740 bytes
 src/documents/tests/samples/simple.txt        |   1 +
 .../tests/test_migration_archive_files.py     | 175 +++++++++++++++++
 4 files changed, 357 insertions(+)
 create mode 100644 src/documents/migrations/1012_fix_archive_files.py
 create mode 100644 src/documents/tests/samples/simple.jpg
 create mode 100644 src/documents/tests/samples/simple.txt
 create mode 100644 src/documents/tests/test_migration_archive_files.py

diff --git a/src/documents/migrations/1012_fix_archive_files.py b/src/documents/migrations/1012_fix_archive_files.py
new file mode 100644
index 000000000..e95715265
--- /dev/null
+++ b/src/documents/migrations/1012_fix_archive_files.py
@@ -0,0 +1,181 @@
+# Generated by Django 3.1.6 on 2021-02-07 22:26
+import hashlib
+import logging
+import os
+import shutil
+
+from django.conf import settings
+from django.db import migrations
+
+
+logger = logging.getLogger("paperless.migrations")
+
+
+def archive_name_from_filename_old(filename):
+    return os.path.splitext(filename)[0] + ".pdf"
+
+
+def archive_path_old(doc):
+    if doc.filename:
+        fname = archive_name_from_filename_old(doc.filename)
+    else:
+        fname = "{:07}.pdf".format(doc.pk)
+
+    return os.path.join(
+        settings.ARCHIVE_DIR,
+        fname
+    )
+
+
+def archive_name_from_filename_new(filename):
+    name, ext = os.path.splitext(filename)
+    if ext == ".pdf":
+        return filename
+    else:
+        return filename + ".pdf"
+
+
+def archive_path_new(doc):
+    if doc.filename:
+        fname = archive_name_from_filename_new(doc.filename)
+    else:
+        fname = "{:07}.pdf".format(doc.pk)
+
+    return os.path.join(
+        settings.ARCHIVE_DIR,
+        fname
+    )
+
+
+STORAGE_TYPE_GPG = "gpg"
+
+
+def source_path(doc):
+    if doc.filename:
+        fname = str(doc.filename)
+    else:
+        fname = "{:07}{}".format(doc.pk, doc.file_type)
+        if doc.storage_type == STORAGE_TYPE_GPG:
+            fname += ".gpg"  # pragma: no cover
+
+    return os.path.join(
+        settings.ORIGINALS_DIR,
+        fname
+    )
+
+
+def move_old_to_new_locations(apps, schema_editor):
+    Document = apps.get_model("documents", "Document")
+
+    affected_document_ids = set()
+
+    old_archive_path_to_id = {}
+
+    # check for documents that have incorrect archive versions
+    for doc in Document.objects.filter(archive_checksum__isnull=False):
+        old_path = archive_path_old(doc)
+
+        if not os.path.isfile(old_path):
+            raise ValueError(
+                f"Archived document of {doc.filename} does not exist at: "
+                f"{old_path}")
+
+        if old_path in old_archive_path_to_id:
+            affected_document_ids.add(doc.id)
+            affected_document_ids.add(old_archive_path_to_id[old_path])
+        else:
+            old_archive_path_to_id[old_path] = doc.id
+
+    # check that we can regenerate these archive versions
+    for doc_id in affected_document_ids:
+        from documents.parsers import get_parser_class_for_mime_type
+
+        doc = Document.objects.get(id=doc_id)
+        parser_class = get_parser_class_for_mime_type(doc.mime_type)
+        if not parser_class:
+            raise Exception(
+                f"document {doc.filename} has an invalid archived document, "
+                f"but no parsers are available. Cannot migrate.")
+
+    # move files
+    for doc in Document.objects.filter(archive_checksum__isnull=False):
+        old_path = archive_path_old(doc)
+        new_path = archive_path_new(doc)
+
+        if old_path != new_path and not os.path.isfile(new_path):
+            logger.debug(
+                f"Moving {old_path} to {new_path}"
+            )
+            shutil.move(old_path, new_path)
+
+    # regenerate archive documents
+    for doc_id in affected_document_ids:
+        from documents.parsers import get_parser_class_for_mime_type, \
+            DocumentParser, \
+            ParseError
+
+        doc = Document.objects.get(id=doc_id)
+        logger.info(
+            f"Regenerating archive document for {doc.filename}"
+        )
+        parser_class = get_parser_class_for_mime_type(doc.mime_type)
+        parser: DocumentParser = parser_class(None, None)
+        try:
+            parser.parse(source_path(doc), doc.mime_type, os.path.basename(doc.filename))
+            doc.content = parser.get_text()
+            if parser.archive_path and os.path.isfile(parser.archive_path):
+                with open(parser.archive_path, "rb") as f:
+                    doc.archive_checksum = hashlib.md5(f.read()).hexdigest()
+                shutil.copy2(parser.archive_path, archive_path_new(doc))
+            else:
+                doc.archive_checksum = None
+                if os.path.isfile(archive_path_new(doc)):
+                    os.unlink(archive_path_new(doc))
+            doc.save()
+        except ParseError:
+            logger.exception(
+                f"Unable to regenerate archive document for {doc.filename}"
+            )
+        finally:
+            parser.cleanup()
+
+
+def move_new_to_old_locations(apps, schema_editor):
+    Document = apps.get_model("documents", "Document")
+
+    old_archive_paths = set()
+
+    for doc in Document.objects.filter(archive_checksum__isnull=False):
+        new_archive_path = archive_path_new(doc)
+        old_archive_path = archive_path_old(doc)
+        if old_archive_path in old_archive_paths:
+            raise ValueError(
+                f"Cannot migrate: Archive file name {old_archive_path} of "
+                f"document {doc.filename} would clash with another archive "
+                f"filename.")
+        old_archive_paths.add(old_archive_path)
+        if new_archive_path != old_archive_path and os.path.isfile(old_archive_path):
+            raise ValueError(
+                f"Cannot migrate: Cannot move {new_archive_path} to "
+                f"{old_archive_path}: file already exists."
+            )
+
+    for doc in Document.objects.filter(archive_checksum__isnull=False):
+        new_archive_path = archive_path_new(doc)
+        old_archive_path = archive_path_old(doc)
+        shutil.move(new_archive_path, old_archive_path)
+        logger.debug(f"Moving {new_archive_path} to {old_archive_path}")
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '1011_auto_20210101_2340'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            move_old_to_new_locations,
+            move_new_to_old_locations
+        )
+    ]
diff --git a/src/documents/tests/samples/simple.jpg b/src/documents/tests/samples/simple.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a8c58af0df6e4b4e6b72179b92aa9df4e2bbd8d8
GIT binary patch
literal 17740
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

literal 0
HcmV?d00001

diff --git a/src/documents/tests/samples/simple.txt b/src/documents/tests/samples/simple.txt
new file mode 100644
index 000000000..6de7b8c69
--- /dev/null
+++ b/src/documents/tests/samples/simple.txt
@@ -0,0 +1 @@
+This is a test file.
diff --git a/src/documents/tests/test_migration_archive_files.py b/src/documents/tests/test_migration_archive_files.py
new file mode 100644
index 000000000..534a5b499
--- /dev/null
+++ b/src/documents/tests/test_migration_archive_files.py
@@ -0,0 +1,175 @@
+import hashlib
+import os
+import shutil
+from pathlib import Path
+
+from django.conf import settings
+from django.test import override_settings
+
+from documents.sanity_checker import SanityFailedError
+from documents.tasks import sanity_check
+from documents.tests.utils import DirectoriesMixin, TestMigrations
+
+
+STORAGE_TYPE_GPG = "gpg"
+
+
+def archive_name_from_filename_old(filename):
+    return os.path.splitext(filename)[0] + ".pdf"
+
+
+def archive_path_old(self):
+    if self.filename:
+        fname = archive_name_from_filename_old(self.filename)
+    else:
+        fname = "{:07}.pdf".format(self.pk)
+
+    return os.path.join(
+        settings.ARCHIVE_DIR,
+        fname
+    )
+
+
+def archive_name_from_filename_new(filename):
+    name, ext = os.path.splitext(filename)
+    if ext == ".pdf":
+        return filename
+    else:
+        return filename + ".pdf"
+
+
+def archive_path_new(self):
+    if self.filename:
+        fname = archive_name_from_filename_new(self.filename)
+    else:
+        fname = "{:07}.pdf".format(self.pk)
+
+    return os.path.join(
+        settings.ARCHIVE_DIR,
+        fname
+    )
+
+
+def source_path(doc):
+    if doc.filename:
+        fname = str(doc.filename)
+    else:
+        fname = "{:07}{}".format(doc.pk, doc.file_type)
+        if doc.storage_type == STORAGE_TYPE_GPG:
+            fname += ".gpg"  # pragma: no cover
+
+    return os.path.join(
+        settings.ORIGINALS_DIR,
+        fname
+    )
+
+
+def thumbnail_path(doc):
+    file_name = "{:07}.png".format(doc.pk)
+    if doc.storage_type == STORAGE_TYPE_GPG:
+        file_name += ".gpg"
+
+    return os.path.join(
+        settings.THUMBNAIL_DIR,
+        file_name
+    )
+
+
+def make_test_document(document_class, title: str, filename: str, mime_type: str, original: str, archive: str = None, new: bool = False):
+    doc = document_class()
+    doc.filename = filename
+    doc.title = title
+    doc.mime_type = mime_type
+    doc.content = "the content, does not matter for this test"
+
+    shutil.copy2(original, source_path(doc))
+    with open(original, "rb") as f:
+        doc.checksum = hashlib.md5(f.read()).hexdigest()
+
+    if archive:
+        if new:
+            shutil.copy2(archive, archive_path_new(doc))
+        else:
+            shutil.copy2(archive, archive_path_old(doc))
+        with open(archive, "rb") as f:
+            doc.archive_checksum = hashlib.md5(f.read()).hexdigest()
+
+    doc.save()
+
+    Path(thumbnail_path(doc)).touch()
+
+    return doc
+
+
+@override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations):
+
+    migrate_from = '1011_auto_20210101_2340'
+    migrate_to = '1012_fix_archive_files'
+
+    def setUpBeforeMigration(self, apps):
+        simple_jpg = os.path.join(os.path.dirname(__file__), "samples", "simple.jpg")
+        simple_pdf = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
+        simple_pdf2 = os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf")
+        simple_txt = os.path.join(os.path.dirname(__file__), "samples", "simple.txt")
+
+        Document = apps.get_model("documents", "Document")
+
+        self.doc_unrelated = make_test_document(Document, "unrelated", "unrelated.txt", "application/pdf", simple_pdf2, simple_pdf2)
+        self.doc_no_archive = make_test_document(Document, "no_archive", "no_archive.txt", "text/plain", simple_txt)
+        self.clashA = make_test_document(Document, "clash", "clash.pdf", "application/pdf", simple_pdf, simple_pdf)
+        self.clashB = make_test_document(Document, "clash", "clash.jpg", "image/jpeg", simple_jpg, simple_pdf)
+
+        self.assertEqual(archive_path_old(self.clashA), archive_path_old(self.clashB))
+        self.assertRaises(SanityFailedError, sanity_check)
+
+    def testArchiveFilesMigrated(self):
+        Document = self.apps.get_model('documents', 'Document')
+
+        for doc in Document.objects.all():
+            self.assertTrue(os.path.isfile(archive_path_new(self.clashB)))
+            with open(source_path(doc), "rb") as f:
+                original_checksum = hashlib.md5(f.read()).hexdigest()
+            self.assertEqual(original_checksum, doc.checksum)
+
+            if doc.archive_checksum:
+                self.assertTrue(os.path.isfile(archive_path_new(doc)))
+                with open(archive_path_new(doc), "rb") as f:
+                    archive_checksum = hashlib.md5(f.read()).hexdigest()
+                self.assertEqual(archive_checksum, doc.archive_checksum)
+
+        # this will raise errors when any inconsistencies remain after migration
+        sanity_check()
+
+
+class TestMigrateArchiveFilesBackwards(DirectoriesMixin, TestMigrations):
+
+    migrate_from = '1012_fix_archive_files'
+    migrate_to = '1011_auto_20210101_2340'
+
+    def setUpBeforeMigration(self, apps):
+        simple_jpg = os.path.join(os.path.dirname(__file__), "samples", "simple.jpg")
+        simple_pdf = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
+        simple_pdf2 = os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf")
+        simple_txt = os.path.join(os.path.dirname(__file__), "samples", "simple.txt")
+
+        Document = apps.get_model("documents", "Document")
+
+        self.doc_unrelated = make_test_document(Document, "unrelated", "unrelated.txt", "application/pdf", simple_pdf2, simple_pdf2, new=True)
+        self.doc_no_archive = make_test_document(Document, "no_archive", "no_archive.txt", "text/plain", simple_txt, new=True)
+        self.clashB = make_test_document(Document, "clash", "clash.jpg", "image/jpeg", simple_jpg, simple_pdf, new=True)
+
+    def testArchiveFilesReverted(self):
+        Document = self.apps.get_model('documents', 'Document')
+
+        for doc in Document.objects.all():
+            self.assertTrue(os.path.isfile(archive_path_old(self.clashB)))
+            with open(source_path(doc), "rb") as f:
+                original_checksum = hashlib.md5(f.read()).hexdigest()
+            self.assertEqual(original_checksum, doc.checksum)
+
+            if doc.archive_checksum:
+                self.assertTrue(os.path.isfile(archive_path_old(doc)))
+                with open(archive_path_old(doc), "rb") as f:
+                    archive_checksum = hashlib.md5(f.read()).hexdigest()
+                self.assertEqual(archive_checksum, doc.archive_checksum)

From d90080f325f0217d2f63ff6b58f4d7a80de448c5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 8 Feb 2021 22:49:01 +0100
Subject: [PATCH 1139/1300] only move files if necessary

---
 src/documents/migrations/1012_fix_archive_files.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/documents/migrations/1012_fix_archive_files.py b/src/documents/migrations/1012_fix_archive_files.py
index e95715265..98794aad0 100644
--- a/src/documents/migrations/1012_fix_archive_files.py
+++ b/src/documents/migrations/1012_fix_archive_files.py
@@ -163,8 +163,9 @@ def move_new_to_old_locations(apps, schema_editor):
     for doc in Document.objects.filter(archive_checksum__isnull=False):
         new_archive_path = archive_path_new(doc)
         old_archive_path = archive_path_old(doc)
-        shutil.move(new_archive_path, old_archive_path)
-        logger.debug(f"Moving {new_archive_path} to {old_archive_path}")
+        if new_archive_path != old_archive_path:
+            logger.debug(f"Moving {new_archive_path} to {old_archive_path}")
+            shutil.move(new_archive_path, old_archive_path)
 
 
 class Migration(migrations.Migration):

From 7621e10840b3cb5ae914e68ceeec5cfa4f9aa1e3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 8 Feb 2021 23:54:07 +0100
Subject: [PATCH 1140/1300] only move unaffected files, regenerate affected
 files

---
 .../migrations/1012_fix_archive_files.py         | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/documents/migrations/1012_fix_archive_files.py b/src/documents/migrations/1012_fix_archive_files.py
index 98794aad0..ab7e88a6a 100644
--- a/src/documents/migrations/1012_fix_archive_files.py
+++ b/src/documents/migrations/1012_fix_archive_files.py
@@ -102,11 +102,17 @@ def move_old_to_new_locations(apps, schema_editor):
         old_path = archive_path_old(doc)
         new_path = archive_path_new(doc)
 
-        if old_path != new_path and not os.path.isfile(new_path):
-            logger.debug(
-                f"Moving {old_path} to {new_path}"
-            )
-            shutil.move(old_path, new_path)
+        if doc.id in affected_document_ids:
+            # remove affected archive versions
+            if os.path.isfile(old_path):
+                os.unlink(old_path)
+        else:
+            # move unaffected archive versions
+            if old_path != new_path and os.path.isfile(old_path) and not os.path.isfile(new_path):
+                logger.debug(
+                    f"Moving {old_path} to {new_path}"
+                )
+                shutil.move(old_path, new_path)
 
     # regenerate archive documents
     for doc_id in affected_document_ids:

From e05735bc0faab955f18c26a6ede763abc4ab15a9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 00:00:46 +0100
Subject: [PATCH 1141/1300] fix some test cases

---
 src/documents/tests/test_api.py           | 1 +
 src/documents/tests/test_file_handling.py | 1 +
 src/documents/tests/test_management.py    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 54d2b292d..c4cca8fdc 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -146,6 +146,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.content, content_thumbnail)
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="")
     def test_download_with_archive(self):
 
         _, filename = tempfile.mkstemp(dir=self.dirs.originals_dir)
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index b24f52aa2..ae25c0f12 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -558,6 +558,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(os.path.isfile(doc.archive_path))
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="")
     def test_archive_deleted(self):
         original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py
index a71baa8ba..ac119a431 100644
--- a/src/documents/tests/test_management.py
+++ b/src/documents/tests/test_management.py
@@ -106,6 +106,7 @@ class TestMakeIndex(TestCase):
 
 class TestRenamer(DirectoriesMixin, TestCase):
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="")
     def test_rename(self):
         doc = Document.objects.create(title="test", mime_type="application/pdf")
         doc.filename = generate_filename(doc)

From 1e5a4181913b7a65a3b59bc0a0f0735988850071 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 00:01:11 +0100
Subject: [PATCH 1142/1300] more testing #511

---
 src/documents/tests/samples/simple-noalpha.png   | Bin 0 -> 6414 bytes
 .../tests/test_migration_archive_files.py        |   3 +++
 2 files changed, 3 insertions(+)
 create mode 100644 src/documents/tests/samples/simple-noalpha.png

diff --git a/src/documents/tests/samples/simple-noalpha.png b/src/documents/tests/samples/simple-noalpha.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a76e76a0b0f7dc86408dcc09b809f3130201f56
GIT binary patch
literal 6414
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

literal 0
HcmV?d00001

diff --git a/src/documents/tests/test_migration_archive_files.py b/src/documents/tests/test_migration_archive_files.py
index 534a5b499..5970a83eb 100644
--- a/src/documents/tests/test_migration_archive_files.py
+++ b/src/documents/tests/test_migration_archive_files.py
@@ -112,6 +112,7 @@ class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations):
         simple_pdf = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
         simple_pdf2 = os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf")
         simple_txt = os.path.join(os.path.dirname(__file__), "samples", "simple.txt")
+        simple_png = os.path.join(os.path.dirname(__file__), "samples", "simple-noalpha.png")
 
         Document = apps.get_model("documents", "Document")
 
@@ -119,8 +120,10 @@ class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations):
         self.doc_no_archive = make_test_document(Document, "no_archive", "no_archive.txt", "text/plain", simple_txt)
         self.clashA = make_test_document(Document, "clash", "clash.pdf", "application/pdf", simple_pdf, simple_pdf)
         self.clashB = make_test_document(Document, "clash", "clash.jpg", "image/jpeg", simple_jpg, simple_pdf)
+        self.clashC = make_test_document(Document, "clash", "clash.png", "image/png", simple_png, simple_pdf)
 
         self.assertEqual(archive_path_old(self.clashA), archive_path_old(self.clashB))
+        self.assertEqual(archive_path_old(self.clashA), archive_path_old(self.clashC))
         self.assertRaises(SanityFailedError, sanity_check)
 
     def testArchiveFilesMigrated(self):

From 0ed001c56ee51c9309e886abb0e739725b490ebe Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 00:13:13 +0100
Subject: [PATCH 1143/1300] validate move before migration

---
 src/documents/migrations/1012_fix_archive_files.py  | 6 ++++++
 src/documents/tests/test_migration_archive_files.py | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/documents/migrations/1012_fix_archive_files.py b/src/documents/migrations/1012_fix_archive_files.py
index ab7e88a6a..f75ae431d 100644
--- a/src/documents/migrations/1012_fix_archive_files.py
+++ b/src/documents/migrations/1012_fix_archive_files.py
@@ -74,12 +74,18 @@ def move_old_to_new_locations(apps, schema_editor):
     # check for documents that have incorrect archive versions
     for doc in Document.objects.filter(archive_checksum__isnull=False):
         old_path = archive_path_old(doc)
+        new_path = archive_path_new(doc)
 
         if not os.path.isfile(old_path):
             raise ValueError(
                 f"Archived document of {doc.filename} does not exist at: "
                 f"{old_path}")
 
+        if old_path != new_path and os.path.isfile(new_path):
+            raise ValueError(
+                f"Need to move {old_path} to {new_path}, but target file "
+                f"already exists")
+
         if old_path in old_archive_path_to_id:
             affected_document_ids.add(doc.id)
             affected_document_ids.add(old_archive_path_to_id[old_path])
diff --git a/src/documents/tests/test_migration_archive_files.py b/src/documents/tests/test_migration_archive_files.py
index 5970a83eb..69c1b51eb 100644
--- a/src/documents/tests/test_migration_archive_files.py
+++ b/src/documents/tests/test_migration_archive_files.py
@@ -141,6 +141,8 @@ class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations):
                     archive_checksum = hashlib.md5(f.read()).hexdigest()
                 self.assertEqual(archive_checksum, doc.archive_checksum)
 
+        self.assertEqual(Document.objects.filter(archive_checksum__isnull=False).count(), 4)
+
         # this will raise errors when any inconsistencies remain after migration
         sanity_check()
 

From c9511680b338500efdbb2f248ad2e7824de4d770 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 01:36:39 +0100
Subject: [PATCH 1144/1300] version push

---
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 4e38813b5..95cd94d29 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,7 +2,7 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "1.1.0",
+  version: "1.1.1",
   webSocketHost: window.location.host,
   webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:")
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 37a1329f2..ae805838c 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (1, 1, 0)
+__version__ = (1, 1, 1)

From 05f59e7d5e982c3d5f7facde4f7d68637a3f3e84 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 02:13:25 +0100
Subject: [PATCH 1145/1300] another way to make the test case fail

---
 src/documents/tests/test_consumer.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 280124f48..b96e4844b 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -543,13 +543,15 @@ class TestConsumer(DirectoriesMixin, TestCase):
     def test_similar_filenames(self, m):
         shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), os.path.join(settings.CONSUMPTION_DIR, "simple.pdf"))
         shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.png"), os.path.join(settings.CONSUMPTION_DIR, "simple.png"))
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple-noalpha.png"), os.path.join(settings.CONSUMPTION_DIR, "simple.png.pdf"))
         m.return_value = [(None, {
             "parser": CopyParser,
-            "mime_types": {"application/pdf": ".pdf", "image/png": ".zip"},
+            "mime_types": {"application/pdf": ".pdf", "image/png": ".png"},
             "weight": 0
         })]
         doc1 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.png"))
         doc2 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.pdf"))
+        doc3 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.png.pdf"))
 
         sanity_check()
 

From fca8576d80cc99312b15b4d512cd528e618039d5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 19:46:19 +0100
Subject: [PATCH 1146/1300] archive filenames are now stored in the database
 and checked for collisions just as original filenames as well, unified method
 for archive version checking

---
 src/documents/consumer.py                     |   7 +-
 src/documents/file_handling.py                |  31 +--
 .../management/commands/document_archiver.py  |  14 +-
 .../management/commands/document_exporter.py  |   2 +-
 .../migrations/1012_fix_archive_files.py      | 177 +++++++++++++-----
 src/documents/models.py                       |  33 +++-
 src/documents/sanity_checker.py               |   2 +-
 src/documents/signals/handlers.py             |  56 +++---
 src/documents/views.py                        |  12 +-
 9 files changed, 229 insertions(+), 105 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 3baedb5c3..acb3ad33f 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -292,8 +292,7 @@ class Consumer(LoggingMixin):
                 # After everything is in the database, copy the files into
                 # place. If this fails, we'll also rollback the transaction.
                 with FileLock(settings.MEDIA_LOCK):
-                    document.filename = generate_unique_filename(
-                        document, settings.ORIGINALS_DIR)
+                    document.filename = generate_unique_filename(document)
                     create_source_path_directory(document.source_path)
 
                     self._write(document.storage_type,
@@ -303,6 +302,10 @@ class Consumer(LoggingMixin):
                                 thumbnail, document.thumbnail_path)
 
                     if archive_path and os.path.isfile(archive_path):
+                        document.archive_filename = generate_unique_filename(
+                            document,
+                            archive_filename=True
+                        )
                         create_source_path_directory(document.archive_path)
                         self._write(document.storage_type,
                                     archive_path, document.archive_path)
diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index 64858de78..535aa3d2c 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -79,12 +79,20 @@ def many_to_dictionary(field):
     return mydictionary
 
 
-def generate_unique_filename(doc, root):
+def generate_unique_filename(doc, archive_filename=False):
+    if archive_filename:
+        old_filename = doc.archive_filename
+        root = settings.ARCHIVE_DIR
+    else:
+        old_filename = doc.filename
+        root = settings.ORIGINALS_DIR
+
     counter = 0
 
     while True:
-        new_filename = generate_filename(doc, counter)
-        if new_filename == doc.filename:
+        new_filename = generate_filename(
+            doc, counter, archive_filename=archive_filename)
+        if new_filename == old_filename:
             # still the same as before.
             return new_filename
 
@@ -94,7 +102,7 @@ def generate_unique_filename(doc, root):
             return new_filename
 
 
-def generate_filename(doc, counter=0, append_gpg=True):
+def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
     path = ""
 
     try:
@@ -148,21 +156,16 @@ def generate_filename(doc, counter=0, append_gpg=True):
             f"{settings.PAPERLESS_FILENAME_FORMAT}, falling back to default")
 
     counter_str = f"_{counter:02}" if counter else ""
+
+    filetype_str = ".pdf" if archive_filename else doc.file_type
+
     if len(path) > 0:
-        filename = f"{path}{counter_str}{doc.file_type}"
+        filename = f"{path}{counter_str}{filetype_str}"
     else:
-        filename = f"{doc.pk:07}{counter_str}{doc.file_type}"
+        filename = f"{doc.pk:07}{counter_str}{filetype_str}"
 
     # Append .gpg for encrypted files
     if append_gpg and doc.storage_type == doc.STORAGE_TYPE_GPG:
         filename += ".gpg"
 
     return filename
-
-
-def archive_name_from_filename(filename):
-    name, ext = os.path.splitext(filename)
-    if ext == ".pdf":
-        return filename
-    else:
-        return filename + ".pdf"
diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index d2ff9c8c2..fe8c8b530 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -16,7 +16,8 @@ from whoosh.writing import AsyncWriter
 
 from documents.models import Document
 from ... import index
-from ...file_handling import create_source_path_directory
+from ...file_handling import create_source_path_directory, \
+    generate_unique_filename
 from ...parsers import get_parser_class_for_mime_type
 
 
@@ -39,13 +40,16 @@ def handle_document(document_id):
             with transaction.atomic():
                 with open(parser.get_archive_path(), 'rb') as f:
                     checksum = hashlib.md5(f.read()).hexdigest()
-                # i'm going to save first so that in case the file move
+                # I'm going to save first so that in case the file move
                 # fails, the database is rolled back.
-                # we also don't use save() since that triggers the filehandling
+                # We also don't use save() since that triggers the filehandling
                 # logic, and we don't want that yet (file not yet in place)
+                document.archive_filename = generate_unique_filename(
+                    document, archive_filename=True)
                 Document.objects.filter(pk=document.pk).update(
                     archive_checksum=checksum,
-                    content=parser.get_text()
+                    content=parser.get_text(),
+                    archive_filename=document.archive_filename
                 )
                 with FileLock(settings.MEDIA_LOCK):
                     create_source_path_directory(document.archive_path)
@@ -101,7 +105,7 @@ class Command(BaseCommand):
         document_ids = list(map(
             lambda doc: doc.id,
             filter(
-                lambda d: overwrite or not d.archive_checksum,
+                lambda d: overwrite or not d.has_archive_version,
                 documents
             )
         ))
diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py
index 1505b0856..d8f5861a5 100644
--- a/src/documents/management/commands/document_exporter.py
+++ b/src/documents/management/commands/document_exporter.py
@@ -139,7 +139,7 @@ class Command(BaseCommand):
             thumbnail_target = os.path.join(self.target, thumbnail_name)
             document_dict[EXPORTER_THUMBNAIL_NAME] = thumbnail_name
 
-            if os.path.exists(document.archive_path):
+            if document.has_archive_version:
                 archive_name = base_name + "-archive.pdf"
                 archive_target = os.path.join(self.target, archive_name)
                 document_dict[EXPORTER_ARCHIVE_NAME] = archive_name
diff --git a/src/documents/migrations/1012_fix_archive_files.py b/src/documents/migrations/1012_fix_archive_files.py
index f75ae431d..5db503391 100644
--- a/src/documents/migrations/1012_fix_archive_files.py
+++ b/src/documents/migrations/1012_fix_archive_files.py
@@ -1,43 +1,27 @@
 # Generated by Django 3.1.6 on 2021-02-07 22:26
+import datetime
 import hashlib
 import logging
 import os
 import shutil
 
+import pathvalidate
 from django.conf import settings
-from django.db import migrations
+from django.db import migrations, models
+from django.template.defaultfilters import slugify
 
+from documents.file_handling import defaultdictNoStr, many_to_dictionary
 
 logger = logging.getLogger("paperless.migrations")
 
 
-def archive_name_from_filename_old(filename):
+def archive_name_from_filename(filename):
     return os.path.splitext(filename)[0] + ".pdf"
 
 
 def archive_path_old(doc):
     if doc.filename:
-        fname = archive_name_from_filename_old(doc.filename)
-    else:
-        fname = "{:07}.pdf".format(doc.pk)
-
-    return os.path.join(
-        settings.ARCHIVE_DIR,
-        fname
-    )
-
-
-def archive_name_from_filename_new(filename):
-    name, ext = os.path.splitext(filename)
-    if ext == ".pdf":
-        return filename
-    else:
-        return filename + ".pdf"
-
-
-def archive_path_new(doc):
-    if doc.filename:
-        fname = archive_name_from_filename_new(doc.filename)
+        fname = archive_name_from_filename(doc.filename)
     else:
         fname = "{:07}.pdf".format(doc.pk)
 
@@ -50,6 +34,16 @@ def archive_path_new(doc):
 STORAGE_TYPE_GPG = "gpg"
 
 
+def archive_path_new(doc):
+    if doc.archive_filename is not None:
+        return os.path.join(
+            settings.ARCHIVE_DIR,
+            str(doc.archive_filename)
+        )
+    else:
+        return None
+
+
 def source_path(doc):
     if doc.filename:
         fname = str(doc.filename)
@@ -64,6 +58,98 @@ def source_path(doc):
     )
 
 
+def generate_unique_filename(doc, archive_filename=False):
+    if archive_filename:
+        old_filename = doc.archive_filename
+        root = settings.ARCHIVE_DIR
+    else:
+        old_filename = doc.filename
+        root = settings.ORIGINALS_DIR
+
+    counter = 0
+
+    while True:
+        new_filename = generate_filename(
+            doc, counter, archive_filename=archive_filename)
+        if new_filename == old_filename:
+            # still the same as before.
+            return new_filename
+
+        if os.path.exists(os.path.join(root, new_filename)):
+            counter += 1
+        else:
+            return new_filename
+
+
+def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
+    path = ""
+
+    try:
+        if settings.PAPERLESS_FILENAME_FORMAT is not None:
+            tags = defaultdictNoStr(lambda: slugify(None),
+                                    many_to_dictionary(doc.tags))
+
+            tag_list = pathvalidate.sanitize_filename(
+                ",".join(sorted(
+                    [tag.name for tag in doc.tags.all()]
+                )),
+                replacement_text="-"
+            )
+
+            if doc.correspondent:
+                correspondent = pathvalidate.sanitize_filename(
+                    doc.correspondent.name, replacement_text="-"
+                )
+            else:
+                correspondent = "none"
+
+            if doc.document_type:
+                document_type = pathvalidate.sanitize_filename(
+                    doc.document_type.name, replacement_text="-"
+                )
+            else:
+                document_type = "none"
+
+            path = settings.PAPERLESS_FILENAME_FORMAT.format(
+                title=pathvalidate.sanitize_filename(
+                    doc.title, replacement_text="-"),
+                correspondent=correspondent,
+                document_type=document_type,
+                created=datetime.date.isoformat(doc.created),
+                created_year=doc.created.year if doc.created else "none",
+                created_month=f"{doc.created.month:02}" if doc.created else "none",  # NOQA: E501
+                created_day=f"{doc.created.day:02}" if doc.created else "none",
+                added=datetime.date.isoformat(doc.added),
+                added_year=doc.added.year if doc.added else "none",
+                added_month=f"{doc.added.month:02}" if doc.added else "none",
+                added_day=f"{doc.added.day:02}" if doc.added else "none",
+                tags=tags,
+                tag_list=tag_list
+            ).strip()
+
+            path = path.strip(os.sep)
+
+    except (ValueError, KeyError, IndexError):
+        logger.warning(
+            f"Invalid PAPERLESS_FILENAME_FORMAT: "
+            f"{settings.PAPERLESS_FILENAME_FORMAT}, falling back to default")
+
+    counter_str = f"_{counter:02}" if counter else ""
+
+    filetype_str = ".pdf" if archive_filename else doc.file_type
+
+    if len(path) > 0:
+        filename = f"{path}{counter_str}{filetype_str}"
+    else:
+        filename = f"{doc.pk:07}{counter_str}{filetype_str}"
+
+    # Append .gpg for encrypted files
+    if append_gpg and doc.storage_type == STORAGE_TYPE_GPG:
+        filename += ".gpg"
+
+    return filename
+
+
 def move_old_to_new_locations(apps, schema_editor):
     Document = apps.get_model("documents", "Document")
 
@@ -74,18 +160,12 @@ def move_old_to_new_locations(apps, schema_editor):
     # check for documents that have incorrect archive versions
     for doc in Document.objects.filter(archive_checksum__isnull=False):
         old_path = archive_path_old(doc)
-        new_path = archive_path_new(doc)
 
         if not os.path.isfile(old_path):
             raise ValueError(
                 f"Archived document of {doc.filename} does not exist at: "
                 f"{old_path}")
 
-        if old_path != new_path and os.path.isfile(new_path):
-            raise ValueError(
-                f"Need to move {old_path} to {new_path}, but target file "
-                f"already exists")
-
         if old_path in old_archive_path_to_id:
             affected_document_ids.add(doc.id)
             affected_document_ids.add(old_archive_path_to_id[old_path])
@@ -103,22 +183,19 @@ def move_old_to_new_locations(apps, schema_editor):
                 f"document {doc.filename} has an invalid archived document, "
                 f"but no parsers are available. Cannot migrate.")
 
-    # move files
     for doc in Document.objects.filter(archive_checksum__isnull=False):
-        old_path = archive_path_old(doc)
-        new_path = archive_path_new(doc)
 
         if doc.id in affected_document_ids:
+            old_path = archive_path_old(doc)
             # remove affected archive versions
             if os.path.isfile(old_path):
                 os.unlink(old_path)
         else:
-            # move unaffected archive versions
-            if old_path != new_path and os.path.isfile(old_path) and not os.path.isfile(new_path):
-                logger.debug(
-                    f"Moving {old_path} to {new_path}"
-                )
-                shutil.move(old_path, new_path)
+            # Set archive path for unaffected files
+            doc.archive_filename = archive_path_old(doc)
+            Document.objects.filter(id=doc.id).update(
+                archive_filename=doc.archive_filename
+            )
 
     # regenerate archive documents
     for doc_id in affected_document_ids:
@@ -135,14 +212,16 @@ def move_old_to_new_locations(apps, schema_editor):
         try:
             parser.parse(source_path(doc), doc.mime_type, os.path.basename(doc.filename))
             doc.content = parser.get_text()
-            if parser.archive_path and os.path.isfile(parser.archive_path):
-                with open(parser.archive_path, "rb") as f:
+
+            if parser.get_archive_path() and os.path.isfile(parser.get_archive_path()):
+                doc.archive_filename = generate_unique_filename(
+                    doc, archive_filename=True)
+                with open(parser.get_archive_path(), "rb") as f:
                     doc.archive_checksum = hashlib.md5(f.read()).hexdigest()
-                shutil.copy2(parser.archive_path, archive_path_new(doc))
+                os.makedirs(os.path.dirname(archive_path_new(doc)), exist_ok=True)
+                shutil.copy2(parser.get_archive_path(), archive_path_new(doc))
             else:
                 doc.archive_checksum = None
-                if os.path.isfile(archive_path_new(doc)):
-                    os.unlink(archive_path_new(doc))
             doc.save()
         except ParseError:
             logger.exception(
@@ -187,8 +266,18 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.AddField(
+            model_name='document',
+            name='archive_filename',
+            field=models.FilePathField(default=None, editable=False, help_text='Current archive filename in storage', max_length=1024, null=True, unique=True, verbose_name='archive filename'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='filename',
+            field=models.FilePathField(default=None, editable=False, help_text='Current filename in storage', max_length=1024, null=True, unique=True, verbose_name='filename'),
+        ),
         migrations.RunPython(
             move_old_to_new_locations,
             move_new_to_old_locations
-        )
+        ),
     ]
diff --git a/src/documents/models.py b/src/documents/models.py
index 86878dd7e..47433724a 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -16,7 +16,6 @@ from django.utils.timezone import is_aware
 
 from django.utils.translation import gettext_lazy as _
 
-from documents.file_handling import archive_name_from_filename
 from documents.parsers import get_default_file_extension
 
 
@@ -208,10 +207,21 @@ class Document(models.Model):
         max_length=1024,
         editable=False,
         default=None,
+        unique=True,
         null=True,
         help_text=_("Current filename in storage")
     )
 
+    archive_filename = models.FilePathField(
+        _("archive filename"),
+        max_length=1024,
+        editable=False,
+        default=None,
+        unique=True,
+        null=True,
+        help_text=_("Current archive filename in storage")
+    )
+
     archive_serial_number = models.IntegerField(
         _("archive serial number"),
         blank=True,
@@ -256,16 +266,19 @@ class Document(models.Model):
         return open(self.source_path, "rb")
 
     @property
-    def archive_path(self):
-        if self.filename:
-            fname = archive_name_from_filename(self.filename)
-        else:
-            fname = "{:07}.pdf".format(self.pk)
+    def has_archive_version(self):
+        return self.archive_filename is not None
+
+    @property
+    def archive_path(self):
+        if self.has_archive_version:
+            return os.path.join(
+                settings.ARCHIVE_DIR,
+                str(self.archive_filename)
+            )
+        else:
+            return None
 
-        return os.path.join(
-            settings.ARCHIVE_DIR,
-            fname
-        )
 
     @property
     def archive_file(self):
diff --git a/src/documents/sanity_checker.py b/src/documents/sanity_checker.py
index b8fd73f98..0b385e81b 100644
--- a/src/documents/sanity_checker.py
+++ b/src/documents/sanity_checker.py
@@ -88,7 +88,7 @@ def check_sanity():
                     ))
 
         # Check sanity of the archive file.
-        if doc.archive_checksum:
+        if doc.has_archive_version:
             if not os.path.isfile(doc.archive_path):
                 messages.append(SanityError(
                     f"Archived version of document {doc.pk} does not exist."
diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 848bcb900..5d46dc431 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -14,7 +14,7 @@ from filelock import FileLock
 
 from .. import index, matching
 from ..file_handling import delete_empty_directories, \
-    create_source_path_directory, archive_name_from_filename, \
+    create_source_path_directory, \
     generate_unique_filename
 from ..models import Document, Tag
 
@@ -148,18 +148,18 @@ def set_tags(sender,
 @receiver(models.signals.post_delete, sender=Document)
 def cleanup_document_deletion(sender, instance, using, **kwargs):
     with FileLock(settings.MEDIA_LOCK):
-        for f in (instance.source_path,
-                  instance.archive_path,
-                  instance.thumbnail_path):
-            if os.path.isfile(f):
+        for filename in (instance.source_path,
+                         instance.archive_path,
+                         instance.thumbnail_path):
+            if filename and os.path.isfile(filename):
                 try:
-                    os.unlink(f)
+                    os.unlink(filename)
                     logger.debug(
-                        f"Deleted file {f}.")
+                        f"Deleted file {filename}.")
                 except OSError as e:
                     logger.warning(
                         f"While deleting document {str(instance)}, the file "
-                        f"{f} could not be deleted: {e}"
+                        f"{filename} could not be deleted: {e}"
                     )
 
         delete_empty_directories(
@@ -167,10 +167,11 @@ def cleanup_document_deletion(sender, instance, using, **kwargs):
             root=settings.ORIGINALS_DIR
         )
 
-        delete_empty_directories(
-            os.path.dirname(instance.archive_path),
-            root=settings.ARCHIVE_DIR
-        )
+        if instance.has_archive_version:
+            delete_empty_directories(
+                os.path.dirname(instance.archive_path),
+                root=settings.ARCHIVE_DIR
+            )
 
 
 def validate_move(instance, old_path, new_path):
@@ -207,8 +208,7 @@ def update_filename_and_move_files(sender, instance, **kwargs):
 
     with FileLock(settings.MEDIA_LOCK):
         old_filename = instance.filename
-        new_filename = generate_unique_filename(
-            instance, settings.ORIGINALS_DIR)
+        new_filename = generate_unique_filename(instance)
 
         if new_filename == instance.filename:
             # Don't do anything if its the same.
@@ -222,8 +222,11 @@ def update_filename_and_move_files(sender, instance, **kwargs):
 
         # archive files are optional, archive checksum tells us if we have one,
         # since this is None for documents without archived files.
-        if instance.archive_checksum:
-            new_archive_filename = archive_name_from_filename(new_filename)
+        if instance.has_archive_version:
+            old_archive_filename = instance.archive_filename
+            new_archive_filename = generate_unique_filename(
+                instance, archive_filename=True
+            )
             old_archive_path = instance.archive_path
             new_archive_path = os.path.join(settings.ARCHIVE_DIR,
                                             new_archive_filename)
@@ -233,6 +236,8 @@ def update_filename_and_move_files(sender, instance, **kwargs):
 
             create_source_path_directory(new_archive_path)
         else:
+            old_archive_filename = None
+            new_archive_filename = None
             old_archive_path = None
             new_archive_path = None
 
@@ -240,22 +245,28 @@ def update_filename_and_move_files(sender, instance, **kwargs):
 
         try:
             os.rename(old_source_path, new_source_path)
-            if instance.archive_checksum:
-                os.rename(old_archive_path, new_archive_path)
             instance.filename = new_filename
 
+            if instance.has_archive_version:
+                os.rename(old_archive_path, new_archive_path)
+                instance.archive_filename = new_archive_filename
+
             # Don't save() here to prevent infinite recursion.
             Document.objects.filter(pk=instance.pk).update(
-                filename=new_filename)
+                filename=instance.filename,
+                archive_filename=instance.archive_filename,
+            )
 
         except OSError as e:
             instance.filename = old_filename
+            instance.archive_filename = old_archive_filename
             # this happens when we can't move a file. If that's the case for
             # the archive file, we try our best to revert the changes.
             # no need to save the instance, the update() has not happened yet.
             try:
                 os.rename(new_source_path, old_source_path)
-                os.rename(new_archive_path, old_archive_path)
+                if instance.has_archive_version:
+                    os.rename(new_archive_path, old_archive_path)
             except Exception as e:
                 # This is fine, since:
                 # A: if we managed to move source from A to B, we will also
@@ -271,9 +282,10 @@ def update_filename_and_move_files(sender, instance, **kwargs):
             # since moving them once succeeded, it's very likely going to
             # succeed again.
             os.rename(new_source_path, old_source_path)
-            if instance.archive_checksum:
+            if instance.has_archive_version:
                 os.rename(new_archive_path, old_archive_path)
             instance.filename = old_filename
+            instance.archive_filename = old_archive_filename
             # again, no need to save the instance, since the actual update()
             # operation failed.
 
@@ -283,7 +295,7 @@ def update_filename_and_move_files(sender, instance, **kwargs):
             delete_empty_directories(os.path.dirname(old_source_path),
                                      root=settings.ORIGINALS_DIR)
 
-        if old_archive_path and not os.path.isfile(old_archive_path):
+        if instance.has_archive_version and not os.path.isfile(old_archive_path):  # NOQA: E501
             delete_empty_directories(os.path.dirname(old_archive_path),
                                      root=settings.ARCHIVE_DIR)
 
diff --git a/src/documents/views.py b/src/documents/views.py
index 5ab4ca9df..3a840567d 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -192,7 +192,7 @@ class DocumentViewSet(RetrieveModelMixin,
 
     def file_response(self, pk, request, disposition):
         doc = Document.objects.get(id=pk)
-        if not self.original_requested(request) and os.path.isfile(doc.archive_path):  # NOQA: E501
+        if not self.original_requested(request) and doc.has_archive_version:  # NOQA: E501
             file_handle = doc.archive_file
             filename = doc.get_public_filename(archive=True)
             mime_type = 'application/pdf'
@@ -237,18 +237,18 @@ class DocumentViewSet(RetrieveModelMixin,
             "original_size": os.stat(doc.source_path).st_size,
             "original_mime_type": doc.mime_type,
             "media_filename": doc.filename,
-            "has_archive_version": os.path.isfile(doc.archive_path),
+            "has_archive_version": doc.has_archive_version,
             "original_metadata": self.get_metadata(
-                doc.source_path, doc.mime_type)
+                doc.source_path, doc.mime_type),
+            "archive_checksum": doc.archive_checksum,
+            "archive_media_filename": doc.archive_filename
         }
 
-        if doc.archive_checksum and os.path.isfile(doc.archive_path):
-            meta['archive_checksum'] = doc.archive_checksum
+        if doc.has_archive_version:
             meta['archive_size'] = os.stat(doc.archive_path).st_size,
             meta['archive_metadata'] = self.get_metadata(
                 doc.archive_path, "application/pdf")
         else:
-            meta['archive_checksum'] = None
             meta['archive_size'] = None
             meta['archive_metadata'] = None
 

From a9f1766d1c36240ca8c59bc62d70baa137d6a634 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 19:46:32 +0100
Subject: [PATCH 1147/1300] todo note

---
 src/documents/management/commands/document_importer.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py
index 7e5d32085..9347b0d4c 100644
--- a/src/documents/management/commands/document_importer.py
+++ b/src/documents/management/commands/document_importer.py
@@ -151,6 +151,9 @@ class Command(BaseCommand):
                 shutil.copy2(thumbnail_path, document.thumbnail_path)
                 if archive_path:
                     create_source_path_directory(document.archive_path)
+                    # TODO: this assumes that the export is valid and
+                    #  archive_filename is present on all documents with
+                    #  archived files
                     shutil.copy2(archive_path, document.archive_path)
 
             document.save()

From 2b7424c42a6a1c1f7b7ae4d3c4b0eb38eb3c5cc5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 19:46:42 +0100
Subject: [PATCH 1148/1300] imports

---
 src/documents/signals/handlers.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 5d46dc431..17260fa8a 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -1,6 +1,5 @@
 import logging
 import os
-from subprocess import Popen
 
 from django.conf import settings
 from django.contrib.admin.models import ADDITION, LogEntry

From 0c40a28ad368b98bfdce33365f1328347f1683b4 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 19:46:59 +0100
Subject: [PATCH 1149/1300] more sanity checks regarding archive versions

---
 src/documents/sanity_checker.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/documents/sanity_checker.py b/src/documents/sanity_checker.py
index 0b385e81b..61e927c82 100644
--- a/src/documents/sanity_checker.py
+++ b/src/documents/sanity_checker.py
@@ -87,6 +87,18 @@ def check_sanity():
                         f"Stored: {doc.checksum}, actual: {checksum}."
                     ))
 
+        if doc.archive_checksum and not doc.archive_filename:
+            messages.append(SanityError(
+                f"Document {doc.pk} has an archive file checksum, but no "
+                f"archive filename."
+            ))
+
+        if not doc.archive_checksum and doc.archive_filename:
+            messages.append(SanityError(
+                f"Document {doc.pk} has an archive file, but its checksum is "
+                f"missing."
+            ))
+
         # Check sanity of the archive file.
         if doc.has_archive_version:
             if not os.path.isfile(doc.archive_path):

From 1ba89ddd09158c0f079b44bc503b2e80136de695 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 19:47:50 +0100
Subject: [PATCH 1150/1300] refactor migration tests to allow testing for
 exceptions while migrating

---
 src/documents/tests/utils.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/documents/tests/utils.py b/src/documents/tests/utils.py
index b9be25d70..da8d3d429 100644
--- a/src/documents/tests/utils.py
+++ b/src/documents/tests/utils.py
@@ -92,6 +92,7 @@ class TestMigrations(TransactionTestCase):
 
     migrate_from = None
     migrate_to = None
+    auto_migrate = True
 
     def setUp(self):
         super(TestMigrations, self).setUp()
@@ -108,6 +109,12 @@ class TestMigrations(TransactionTestCase):
 
         self.setUpBeforeMigration(old_apps)
 
+        self.apps = old_apps
+
+        if self.auto_migrate:
+            self.performMigration()
+
+    def performMigration(self):
         # Run the migration to test
         executor = MigrationExecutor(connection)
         executor.loader.build_graph()  # reload.

From 69d7f8c180ee8ef420599a676a4538ecdf25723f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 19:49:29 +0100
Subject: [PATCH 1151/1300] testing the updated migration

---
 .../tests/test_migration_archive_files.py     | 132 +++++++++++-------
 1 file changed, 81 insertions(+), 51 deletions(-)

diff --git a/src/documents/tests/test_migration_archive_files.py b/src/documents/tests/test_migration_archive_files.py
index 69c1b51eb..5ae317e37 100644
--- a/src/documents/tests/test_migration_archive_files.py
+++ b/src/documents/tests/test_migration_archive_files.py
@@ -6,21 +6,19 @@ from pathlib import Path
 from django.conf import settings
 from django.test import override_settings
 
-from documents.sanity_checker import SanityFailedError
-from documents.tasks import sanity_check
 from documents.tests.utils import DirectoriesMixin, TestMigrations
 
 
 STORAGE_TYPE_GPG = "gpg"
 
 
-def archive_name_from_filename_old(filename):
+def archive_name_from_filename(filename):
     return os.path.splitext(filename)[0] + ".pdf"
 
 
 def archive_path_old(self):
     if self.filename:
-        fname = archive_name_from_filename_old(self.filename)
+        fname = archive_name_from_filename(self.filename)
     else:
         fname = "{:07}.pdf".format(self.pk)
 
@@ -30,24 +28,14 @@ def archive_path_old(self):
     )
 
 
-def archive_name_from_filename_new(filename):
-    name, ext = os.path.splitext(filename)
-    if ext == ".pdf":
-        return filename
-    else:
-        return filename + ".pdf"
-
-
-def archive_path_new(self):
-    if self.filename:
-        fname = archive_name_from_filename_new(self.filename)
-    else:
-        fname = "{:07}.pdf".format(self.pk)
-
-    return os.path.join(
-        settings.ARCHIVE_DIR,
-        fname
-    )
+def archive_path_new(doc):
+        if doc.archive_filename is not None:
+            return os.path.join(
+                settings.ARCHIVE_DIR,
+                str(doc.archive_filename)
+            )
+        else:
+            return None
 
 
 def source_path(doc):
@@ -75,22 +63,25 @@ def thumbnail_path(doc):
     )
 
 
-def make_test_document(document_class, title: str, filename: str, mime_type: str, original: str, archive: str = None, new: bool = False):
+def make_test_document(document_class, title: str, mime_type: str, original: str, original_filename: str, archive: str = None, archive_filename: str = None):
     doc = document_class()
-    doc.filename = filename
+    doc.filename = original_filename
     doc.title = title
     doc.mime_type = mime_type
     doc.content = "the content, does not matter for this test"
+    doc.save()
 
     shutil.copy2(original, source_path(doc))
     with open(original, "rb") as f:
         doc.checksum = hashlib.md5(f.read()).hexdigest()
 
     if archive:
-        if new:
+        if archive_filename:
+            doc.archive_filename = archive_filename
             shutil.copy2(archive, archive_path_new(doc))
         else:
             shutil.copy2(archive, archive_path_old(doc))
+
         with open(archive, "rb") as f:
             doc.archive_checksum = hashlib.md5(f.read()).hexdigest()
 
@@ -101,36 +92,42 @@ def make_test_document(document_class, title: str, filename: str, mime_type: str
     return doc
 
 
-@override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+simple_jpg = os.path.join(os.path.dirname(__file__), "samples", "simple.jpg")
+simple_pdf = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
+simple_pdf2 = os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf")
+simple_txt = os.path.join(os.path.dirname(__file__), "samples", "simple.txt")
+simple_png = os.path.join(os.path.dirname(__file__), "samples", "simple-noalpha.png")
+
+
+@override_settings(PAPERLESS_FILENAME_FORMAT="")
 class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations):
 
     migrate_from = '1011_auto_20210101_2340'
     migrate_to = '1012_fix_archive_files'
 
     def setUpBeforeMigration(self, apps):
-        simple_jpg = os.path.join(os.path.dirname(__file__), "samples", "simple.jpg")
-        simple_pdf = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
-        simple_pdf2 = os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf")
-        simple_txt = os.path.join(os.path.dirname(__file__), "samples", "simple.txt")
-        simple_png = os.path.join(os.path.dirname(__file__), "samples", "simple-noalpha.png")
-
         Document = apps.get_model("documents", "Document")
 
-        self.doc_unrelated = make_test_document(Document, "unrelated", "unrelated.txt", "application/pdf", simple_pdf2, simple_pdf2)
-        self.doc_no_archive = make_test_document(Document, "no_archive", "no_archive.txt", "text/plain", simple_txt)
-        self.clashA = make_test_document(Document, "clash", "clash.pdf", "application/pdf", simple_pdf, simple_pdf)
-        self.clashB = make_test_document(Document, "clash", "clash.jpg", "image/jpeg", simple_jpg, simple_pdf)
-        self.clashC = make_test_document(Document, "clash", "clash.png", "image/png", simple_png, simple_pdf)
+        doc_no_archive = make_test_document(Document, "no_archive", "text/plain", simple_txt, "no_archive.txt")
+        clash1 = make_test_document(Document, "clash", "application/pdf", simple_pdf, "clash.pdf", simple_pdf)
+        clash2 = make_test_document(Document, "clash", "image/jpeg", simple_jpg, "clash.jpg", simple_pdf)
+        clash3 = make_test_document(Document, "clash", "image/png", simple_png, "clash.png", simple_pdf)
+        clash4 = make_test_document(Document, "clash.png", "application/pdf", simple_pdf2, "clash.png.pdf", simple_pdf2)
 
-        self.assertEqual(archive_path_old(self.clashA), archive_path_old(self.clashB))
-        self.assertEqual(archive_path_old(self.clashA), archive_path_old(self.clashC))
-        self.assertRaises(SanityFailedError, sanity_check)
+        self.assertEqual(archive_path_old(clash1), archive_path_old(clash2))
+        self.assertEqual(archive_path_old(clash1), archive_path_old(clash3))
+        self.assertNotEqual(archive_path_old(clash1), archive_path_old(clash4))
 
     def testArchiveFilesMigrated(self):
         Document = self.apps.get_model('documents', 'Document')
 
         for doc in Document.objects.all():
-            self.assertTrue(os.path.isfile(archive_path_new(self.clashB)))
+            if doc.archive_checksum:
+                self.assertIsNotNone(doc.archive_filename)
+                self.assertTrue(os.path.isfile(archive_path_new(doc)))
+            else:
+                self.assertIsNone(doc.archive_filename)
+
             with open(source_path(doc), "rb") as f:
                 original_checksum = hashlib.md5(f.read()).hexdigest()
             self.assertEqual(original_checksum, doc.checksum)
@@ -143,32 +140,32 @@ class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations):
 
         self.assertEqual(Document.objects.filter(archive_checksum__isnull=False).count(), 4)
 
-        # this will raise errors when any inconsistencies remain after migration
-        sanity_check()
+
+@override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+class TestMigrateArchiveFilesWithFilenameFormat(TestMigrateArchiveFiles):
+    pass
 
 
+@override_settings(PAPERLESS_FILENAME_FORMAT="")
 class TestMigrateArchiveFilesBackwards(DirectoriesMixin, TestMigrations):
 
     migrate_from = '1012_fix_archive_files'
     migrate_to = '1011_auto_20210101_2340'
 
     def setUpBeforeMigration(self, apps):
-        simple_jpg = os.path.join(os.path.dirname(__file__), "samples", "simple.jpg")
-        simple_pdf = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
-        simple_pdf2 = os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf")
-        simple_txt = os.path.join(os.path.dirname(__file__), "samples", "simple.txt")
 
         Document = apps.get_model("documents", "Document")
 
-        self.doc_unrelated = make_test_document(Document, "unrelated", "unrelated.txt", "application/pdf", simple_pdf2, simple_pdf2, new=True)
-        self.doc_no_archive = make_test_document(Document, "no_archive", "no_archive.txt", "text/plain", simple_txt, new=True)
-        self.clashB = make_test_document(Document, "clash", "clash.jpg", "image/jpeg", simple_jpg, simple_pdf, new=True)
+        doc_unrelated = make_test_document(Document, "unrelated", "application/pdf", simple_pdf2, "unrelated.txt", simple_pdf2, "unrelated.pdf")
+        doc_no_archive = make_test_document(Document, "no_archive", "text/plain", simple_txt, "no_archive.txt")
+        clashB = make_test_document(Document, "clash", "image/jpeg", simple_jpg, "clash.jpg", simple_pdf, "clash_02.pdf")
 
     def testArchiveFilesReverted(self):
         Document = self.apps.get_model('documents', 'Document')
 
         for doc in Document.objects.all():
-            self.assertTrue(os.path.isfile(archive_path_old(self.clashB)))
+            if doc.archive_checksum:
+                self.assertTrue(os.path.isfile(archive_path_old(doc)))
             with open(source_path(doc), "rb") as f:
                 original_checksum = hashlib.md5(f.read()).hexdigest()
             self.assertEqual(original_checksum, doc.checksum)
@@ -178,3 +175,36 @@ class TestMigrateArchiveFilesBackwards(DirectoriesMixin, TestMigrations):
                 with open(archive_path_old(doc), "rb") as f:
                     archive_checksum = hashlib.md5(f.read()).hexdigest()
                 self.assertEqual(archive_checksum, doc.archive_checksum)
+
+        self.assertEqual(Document.objects.filter(archive_checksum__isnull=False).count(), 2)
+
+
+@override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+class TestMigrateArchiveFilesBackwardsWithFilenameFormat(TestMigrateArchiveFilesBackwards):
+    pass
+
+
+@override_settings(PAPERLESS_FILENAME_FORMAT="")
+class TestMigrateArchiveFilesBackwardsErrors(DirectoriesMixin, TestMigrations):
+
+    migrate_from = '1012_fix_archive_files'
+    migrate_to = '1011_auto_20210101_2340'
+    auto_migrate = False
+
+    def test_filename_clash(self):
+
+        Document = self.apps.get_model("documents", "Document")
+
+        self.clashA = make_test_document(Document, "clash", "application/pdf", simple_pdf, "clash.pdf", simple_pdf, "clash_02.pdf")
+        self.clashB = make_test_document(Document, "clash", "image/jpeg", simple_jpg, "clash.jpg", simple_pdf, "clash_01.pdf")
+
+        self.assertRaisesMessage(ValueError, "would clash with another archive filename", self.performMigration)
+
+    def test_filename_exists(self):
+
+        Document = self.apps.get_model("documents", "Document")
+
+        self.clashA = make_test_document(Document, "clash", "application/pdf", simple_pdf, "clash.pdf", simple_pdf, "clash.pdf")
+        self.clashB = make_test_document(Document, "clash", "image/jpeg", simple_jpg, "clash.jpg", simple_pdf, "clash_01.pdf")
+
+        self.assertRaisesMessage(ValueError, "file already exists.", self.performMigration)

From d13e86a8924f5e3a5a9b8cbbb66c1258bcb27226 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 19:51:16 +0100
Subject: [PATCH 1152/1300] update all test cases to address the archive
 filename changes

---
 src/documents/tests/test_api.py               | 18 +++----
 src/documents/tests/test_consumer.py          | 13 ++++-
 src/documents/tests/test_file_handling.py     | 52 ++++++++++++++-----
 src/documents/tests/test_management.py        |  2 +
 .../tests/test_management_exporter.py         |  2 +-
 src/documents/tests/test_sanity_check.py      |  2 +-
 6 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index c4cca8fdc..84b3bc185 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -149,19 +149,16 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
     @override_settings(PAPERLESS_FILENAME_FORMAT="")
     def test_download_with_archive(self):
 
-        _, filename = tempfile.mkstemp(dir=self.dirs.originals_dir)
-
         content = b"This is a test"
         content_archive = b"This is the same test but archived"
 
-        with open(filename, "wb") as f:
-            f.write(content)
-
-        filename = os.path.basename(filename)
-
-        doc = Document.objects.create(title="none", filename=filename,
+        doc = Document.objects.create(title="none", filename="my_document.pdf",
+                                      archive_filename="archived.pdf",
                                       mime_type="application/pdf")
 
+        with open(doc.source_path, "wb") as f:
+            f.write(content)
+
         with open(doc.archive_path, "wb") as f:
             f.write(content_archive)
 
@@ -578,7 +575,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         async_task.assert_not_called()
 
     def test_get_metadata(self):
-        doc = Document.objects.create(title="test", filename="file.pdf", mime_type="image/png", archive_checksum="A")
+        doc = Document.objects.create(title="test", filename="file.pdf", mime_type="image/png", archive_checksum="A", archive_filename="archive.pdf")
 
         shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), doc.source_path)
         shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), doc.archive_path)
@@ -592,6 +589,8 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertTrue(meta['has_archive_version'])
         self.assertEqual(len(meta['original_metadata']), 0)
         self.assertGreater(len(meta['archive_metadata']), 0)
+        self.assertEqual(meta['media_filename'], "file.pdf")
+        self.assertEqual(meta['archive_media_filename'], "archive.pdf")
 
     def test_get_metadata_invalid_doc(self):
         response = self.client.get(f"/api/documents/34576/metadata/")
@@ -611,6 +610,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertFalse(meta['has_archive_version'])
         self.assertGreater(len(meta['original_metadata']), 0)
         self.assertIsNone(meta['archive_metadata'])
+        self.assertIsNone(meta['archive_media_filename'])
 
     def test_get_empty_suggestions(self):
         doc = Document.objects.create(title="test", mime_type="application/pdf")
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index b96e4844b..1ed041187 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -296,6 +296,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
         self.assertIsNone(document.correspondent)
         self.assertIsNone(document.document_type)
         self.assertEqual(document.filename, "0000001.pdf")
+        self.assertEqual(document.archive_filename, "0000001.pdf")
 
         self.assertTrue(os.path.isfile(
             document.source_path
@@ -454,6 +455,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self.assertEqual(document.title, "new docs")
         self.assertEqual(document.filename, "none/new docs.pdf")
+        self.assertEqual(document.archive_filename, "none/new docs.pdf")
 
         self._assert_first_last_send_progress()
 
@@ -468,7 +470,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
             filenames.insert(0, f)
             return f
 
-        m.side_effect = lambda f, root: get_filename()
+        m.side_effect = lambda f, archive_filename = False: get_filename()
 
         filename = self.get_test_file()
 
@@ -479,6 +481,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
         self.assertEqual(document.title, "new docs")
         self.assertIsNotNone(os.path.isfile(document.title))
         self.assertTrue(os.path.isfile(document.source_path))
+        self.assertTrue(os.path.isfile(document.archive_path))
 
         self._assert_first_last_send_progress()
 
@@ -553,8 +556,16 @@ class TestConsumer(DirectoriesMixin, TestCase):
         doc2 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.pdf"))
         doc3 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.png.pdf"))
 
+        self.assertEqual(doc1.filename, "simple.png")
+        self.assertEqual(doc1.archive_filename, "simple.pdf")
+        self.assertEqual(doc2.filename, "simple.pdf")
+        self.assertEqual(doc2.archive_filename, "simple_01.pdf")
+        self.assertEqual(doc3.filename, "simple.png.pdf")
+        self.assertEqual(doc3.archive_filename, "simple.png.pdf")
+
         sanity_check()
 
+
 class PreConsumeTestCase(TestCase):
 
     @mock.patch("documents.consumer.Popen")
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index ae25c0f12..fd74aad7d 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -448,7 +448,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
         Path(original).touch()
         Path(archive).touch()
-        doc = Document.objects.create(mime_type="application/pdf", filename="0000001.pdf", checksum="A", archive_checksum="B")
+        doc = Document.objects.create(mime_type="application/pdf", filename="0000001.pdf", checksum="A", archive_filename="0000001.pdf", archive_checksum="B")
 
         self.assertTrue(os.path.isfile(original))
         self.assertTrue(os.path.isfile(archive))
@@ -461,7 +461,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
         Path(original).touch()
         Path(archive).touch()
-        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B")
+        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B", archive_filename="0000001.pdf")
 
         self.assertFalse(os.path.isfile(original))
         self.assertFalse(os.path.isfile(archive))
@@ -475,7 +475,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
         Path(original).touch()
-        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B")
+        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B", archive_filename="0000001.pdf")
 
         self.assertTrue(os.path.isfile(original))
         self.assertFalse(os.path.isfile(archive))
@@ -486,16 +486,19 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
     def test_move_archive_exists(self):
         original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
+        existing_archive_file = os.path.join(settings.ARCHIVE_DIR, "none", "my_doc.pdf")
         Path(original).touch()
         Path(archive).touch()
         os.makedirs(os.path.join(settings.ARCHIVE_DIR, "none"))
-        Path(os.path.join(settings.ARCHIVE_DIR, "none", "my_doc.pdf")).touch()
-        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B")
+        Path(existing_archive_file).touch()
+        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B", archive_filename="0000001.pdf")
 
-        self.assertTrue(os.path.isfile(original))
-        self.assertTrue(os.path.isfile(archive))
+        self.assertFalse(os.path.isfile(original))
+        self.assertFalse(os.path.isfile(archive))
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(os.path.isfile(doc.archive_path))
+        self.assertTrue(os.path.isfile(existing_archive_file))
+        self.assertEqual(doc.archive_filename, "none/my_doc_01.pdf")
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
     @mock.patch("documents.signals.handlers.os.rename")
@@ -514,7 +517,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
         Path(original).touch()
         Path(archive).touch()
-        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B")
+        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B", archive_filename="0000001.pdf")
 
         self.assertTrue(os.path.isfile(original))
         self.assertTrue(os.path.isfile(archive))
@@ -527,7 +530,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
         #Path(original).touch()
         Path(archive).touch()
-        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B")
+        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", archive_filename="0000001.pdf", checksum="A", archive_checksum="B")
 
         self.assertFalse(os.path.isfile(original))
         self.assertTrue(os.path.isfile(archive))
@@ -551,7 +554,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
         Path(original).touch()
         Path(archive).touch()
-        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B")
+        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", archive_filename="0000001.pdf", checksum="A", archive_checksum="B")
 
         self.assertTrue(os.path.isfile(original))
         self.assertTrue(os.path.isfile(archive))
@@ -564,7 +567,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
         Path(original).touch()
         Path(archive).touch()
-        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B")
+        doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B", archive_filename="0000001.pdf")
 
         self.assertTrue(os.path.isfile(original))
         self.assertTrue(os.path.isfile(archive))
@@ -578,6 +581,28 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertFalse(os.path.isfile(doc.source_path))
         self.assertFalse(os.path.isfile(doc.archive_path))
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    def test_archive_deleted2(self):
+        original = os.path.join(settings.ORIGINALS_DIR, "document.png")
+        original2 = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
+        archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
+        Path(original).touch()
+        Path(original2).touch()
+        Path(archive).touch()
+
+        doc1 = Document.objects.create(mime_type="image/png", title="document", filename="document.png", checksum="A", archive_checksum="B", archive_filename="0000001.pdf")
+        doc2 = Document.objects.create(mime_type="application/pdf", title="0000001", filename="0000001.pdf", checksum="C")
+
+        self.assertTrue(os.path.isfile(doc1.source_path))
+        self.assertTrue(os.path.isfile(doc1.archive_path))
+        self.assertTrue(os.path.isfile(doc2.source_path))
+
+        doc2.delete()
+
+        self.assertTrue(os.path.isfile(doc1.source_path))
+        self.assertTrue(os.path.isfile(doc1.archive_path))
+        self.assertFalse(os.path.isfile(doc2.source_path))
+
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
     def test_database_error(self):
 
@@ -585,7 +610,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
         Path(original).touch()
         Path(archive).touch()
-        doc = Document(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B")
+        doc = Document(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_filename="0000001.pdf", archive_checksum="B")
         with mock.patch("documents.signals.handlers.Document.objects.filter") as m:
             m.side_effect = DatabaseError()
             doc.save()
@@ -595,6 +620,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(os.path.isfile(doc.archive_path))
 
+
 class TestFilenameGeneration(TestCase):
 
     @override_settings(
@@ -618,7 +644,7 @@ class TestFilenameGeneration(TestCase):
 
 def run():
     doc = Document.objects.create(checksum=str(uuid.uuid4()), title=str(uuid.uuid4()), content="wow")
-    doc.filename = generate_unique_filename(doc, settings.ORIGINALS_DIR)
+    doc.filename = generate_unique_filename(doc)
     Path(doc.thumbnail_path).touch()
     with open(doc.source_path, "w") as f:
         f.write(str(uuid.uuid4()))
diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py
index ac119a431..38425a0aa 100644
--- a/src/documents/tests/test_management.py
+++ b/src/documents/tests/test_management.py
@@ -20,6 +20,7 @@ from documents.tests.utils import DirectoriesMixin
 sample_file = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
 
 
+@override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
 class TestArchiver(DirectoriesMixin, TestCase):
 
     def make_models(self):
@@ -45,6 +46,7 @@ class TestArchiver(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(doc.archive_path))
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(filecmp.cmp(sample_file, doc.source_path))
+        self.assertEqual(doc.archive_filename, "none/A.pdf")
 
 
 class TestDecryptDocuments(TestCase):
diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index 986e458b9..cdc745305 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -22,7 +22,7 @@ class TestExportImport(DirectoriesMixin, TestCase):
         self.target = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, self.target)
 
-        self.d1 = Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow1", filename="0000001.pdf", mime_type="application/pdf")
+        self.d1 = Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow1", filename="0000001.pdf", mime_type="application/pdf", archive_filename="0000001.pdf")
         self.d2 = Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow2", filename="0000002.pdf", mime_type="application/pdf")
         self.d3 = Document.objects.create(content="Content", checksum="d38d7ed02e988e072caf924e0f3fcb76", title="wow2", filename="0000003.pdf", mime_type="application/pdf")
         self.d4 = Document.objects.create(content="Content", checksum="82186aaa94f0b98697d704b90fd1c072", title="wow_dec", filename="0000004.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG)
diff --git a/src/documents/tests/test_sanity_check.py b/src/documents/tests/test_sanity_check.py
index 0554cd7cd..d7ab1e07f 100644
--- a/src/documents/tests/test_sanity_check.py
+++ b/src/documents/tests/test_sanity_check.py
@@ -21,7 +21,7 @@ class TestSanityCheck(DirectoriesMixin, TestCase):
             shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "archive", "0000001.pdf"), os.path.join(self.dirs.archive_dir, "0000001.pdf"))
             shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), os.path.join(self.dirs.thumbnail_dir, "0000001.png"))
 
-        return Document.objects.create(title="test", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", content="test", pk=1, filename="0000001.pdf", mime_type="application/pdf")
+        return Document.objects.create(title="test", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", content="test", pk=1, filename="0000001.pdf", mime_type="application/pdf", archive_filename="0000001.pdf")
 
     def test_no_docs(self):
         self.assertEqual(len(check_sanity()), 0)

From 9df332b61435f93409b806e8463571190cbf8550 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 19:51:25 +0100
Subject: [PATCH 1153/1300] test resources

---
 src/clash.pdf | Bin 0 -> 10862 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/clash.pdf

diff --git a/src/clash.pdf b/src/clash.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..304fbe71785e0320b55414484ff07b4ebe558dd7
GIT binary patch
literal 10862
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

literal 0
HcmV?d00001


From ee9a73aa9544ca7e8571c2ea5a6e9527d6d284e6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 20:46:41 +0100
Subject: [PATCH 1154/1300] codestyle

---
 src/documents/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/documents/models.py b/src/documents/models.py
index 47433724a..1b94b3cc9 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -279,7 +279,6 @@ class Document(models.Model):
         else:
             return None
 
-
     @property
     def archive_file(self):
         return open(self.archive_path, "rb")

From a1293c77b9717e16c95b44902355f544d2dfd64e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 20:54:02 +0100
Subject: [PATCH 1155/1300] fix migration and more tests

---
 .../migrations/1012_fix_archive_files.py      |  2 +-
 .../tests/test_migration_archive_files.py     | 33 ++++++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/documents/migrations/1012_fix_archive_files.py b/src/documents/migrations/1012_fix_archive_files.py
index 5db503391..5102522ba 100644
--- a/src/documents/migrations/1012_fix_archive_files.py
+++ b/src/documents/migrations/1012_fix_archive_files.py
@@ -192,7 +192,7 @@ def move_old_to_new_locations(apps, schema_editor):
                 os.unlink(old_path)
         else:
             # Set archive path for unaffected files
-            doc.archive_filename = archive_path_old(doc)
+            doc.archive_filename = archive_name_from_filename(doc.filename)
             Document.objects.filter(id=doc.id).update(
                 archive_filename=doc.archive_filename
             )
diff --git a/src/documents/tests/test_migration_archive_files.py b/src/documents/tests/test_migration_archive_files.py
index 5ae317e37..c4421e8e5 100644
--- a/src/documents/tests/test_migration_archive_files.py
+++ b/src/documents/tests/test_migration_archive_files.py
@@ -108,15 +108,15 @@ class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations):
     def setUpBeforeMigration(self, apps):
         Document = apps.get_model("documents", "Document")
 
-        doc_no_archive = make_test_document(Document, "no_archive", "text/plain", simple_txt, "no_archive.txt")
-        clash1 = make_test_document(Document, "clash", "application/pdf", simple_pdf, "clash.pdf", simple_pdf)
-        clash2 = make_test_document(Document, "clash", "image/jpeg", simple_jpg, "clash.jpg", simple_pdf)
-        clash3 = make_test_document(Document, "clash", "image/png", simple_png, "clash.png", simple_pdf)
-        clash4 = make_test_document(Document, "clash.png", "application/pdf", simple_pdf2, "clash.png.pdf", simple_pdf2)
+        self.doc_no_archive = make_test_document(Document, "no_archive", "text/plain", simple_txt, "no_archive.txt")
+        self.clash1 = make_test_document(Document, "clash", "application/pdf", simple_pdf, "clash.pdf", simple_pdf)
+        self.clash2 = make_test_document(Document, "clash", "image/jpeg", simple_jpg, "clash.jpg", simple_pdf)
+        self.clash3 = make_test_document(Document, "clash", "image/png", simple_png, "clash.png", simple_pdf)
+        self.clash4 = make_test_document(Document, "clash.png", "application/pdf", simple_pdf2, "clash.png.pdf", simple_pdf2)
 
-        self.assertEqual(archive_path_old(clash1), archive_path_old(clash2))
-        self.assertEqual(archive_path_old(clash1), archive_path_old(clash3))
-        self.assertNotEqual(archive_path_old(clash1), archive_path_old(clash4))
+        self.assertEqual(archive_path_old(self.clash1), archive_path_old(self.clash2))
+        self.assertEqual(archive_path_old(self.clash1), archive_path_old(self.clash3))
+        self.assertNotEqual(archive_path_old(self.clash1), archive_path_old(self.clash4))
 
     def testArchiveFilesMigrated(self):
         Document = self.apps.get_model('documents', 'Document')
@@ -140,10 +140,25 @@ class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations):
 
         self.assertEqual(Document.objects.filter(archive_checksum__isnull=False).count(), 4)
 
+    def test_filenames(self):
+        Document = self.apps.get_model('documents', 'Document')
+        self.assertEqual(Document.objects.get(id=self.doc_no_archive.id).archive_filename, None)
+        self.assertEqual(Document.objects.get(id=self.clash1.id).archive_filename, f"{self.clash1.id:07}.pdf")
+        self.assertEqual(Document.objects.get(id=self.clash2.id).archive_filename, f"{self.clash2.id:07}.pdf")
+        self.assertEqual(Document.objects.get(id=self.clash3.id).archive_filename, f"{self.clash3.id:07}.pdf")
+        self.assertEqual(Document.objects.get(id=self.clash4.id).archive_filename, "clash.png.pdf")
+
 
 @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
 class TestMigrateArchiveFilesWithFilenameFormat(TestMigrateArchiveFiles):
-    pass
+
+    def test_filenames(self):
+        Document = self.apps.get_model('documents', 'Document')
+        self.assertEqual(Document.objects.get(id=self.doc_no_archive.id).archive_filename, None)
+        self.assertEqual(Document.objects.get(id=self.clash1.id).archive_filename, "none/clash.pdf")
+        self.assertEqual(Document.objects.get(id=self.clash2.id).archive_filename, "none/clash_01.pdf")
+        self.assertEqual(Document.objects.get(id=self.clash3.id).archive_filename, "none/clash_02.pdf")
+        self.assertEqual(Document.objects.get(id=self.clash4.id).archive_filename, "clash.png.pdf")
 
 
 @override_settings(PAPERLESS_FILENAME_FORMAT="")

From 887dd122febbb8506eda7877b8e8ca07f3c3a3c2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 21:00:04 +0100
Subject: [PATCH 1156/1300] more info in the admin

---
 src/documents/admin.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/documents/admin.py b/src/documents/admin.py
index 266422d51..7cc33dc20 100755
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -50,7 +50,11 @@ class DocumentAdmin(admin.ModelAdmin):
         "modified",
         "mime_type",
         "storage_type",
-        "filename")
+        "filename",
+        "checksum",
+        "archive_filename",
+        "archive_checksum"
+    )
 
     list_display_links = ("title",)
 

From 7d677665088d225fcb3e971702b90eca75da92b3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 21:53:10 +0100
Subject: [PATCH 1157/1300] todo note #520

---
 src/documents/views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/documents/views.py b/src/documents/views.py
index 3a840567d..9d1d87235 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -291,6 +291,8 @@ class DocumentViewSet(RetrieveModelMixin,
                 handle = GnuPG.decrypted(doc.thumbnail_file)
             else:
                 handle = doc.thumbnail_file
+            # TODO: Send ETag information and use that to send new thumbnails
+            #  if available
             return HttpResponse(handle,
                                 content_type='image/png')
         except (FileNotFoundError, Document.DoesNotExist):

From 8d6071e977c023c0f2515f6cea6929633dd86d3d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 22:12:43 +0100
Subject: [PATCH 1158/1300] fix a bug with thumbnail generation when TIKA was
 enabled

---
 src/documents/consumer.py                            |  2 +-
 .../management/commands/document_thumbnails.py       |  5 ++++-
 src/documents/parsers.py                             |  9 ++++++---
 src/documents/tests/test_consumer.py                 | 12 ++++++------
 src/documents/tests/test_parsers.py                  |  8 ++++----
 src/paperless_tesseract/parsers.py                   |  2 +-
 src/paperless_text/parsers.py                        |  2 +-
 src/paperless_tika/parsers.py                        |  4 ++--
 8 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index acb3ad33f..3fd62fabc 100755
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -241,7 +241,7 @@ class Consumer(LoggingMixin):
             self._send_progress(70, 100, 'WORKING',
                                 MESSAGE_GENERATING_THUMBNAIL)
             thumbnail = document_parser.get_optimised_thumbnail(
-                self.path, mime_type)
+                self.path, mime_type, self.filename)
 
             text = document_parser.get_text()
             date = document_parser.get_date()
diff --git a/src/documents/management/commands/document_thumbnails.py b/src/documents/management/commands/document_thumbnails.py
index cf2cbeb77..b7f935e3b 100644
--- a/src/documents/management/commands/document_thumbnails.py
+++ b/src/documents/management/commands/document_thumbnails.py
@@ -22,7 +22,10 @@ def _process_document(doc_in):
 
     try:
         thumb = parser.get_optimised_thumbnail(
-            document.source_path, document.mime_type)
+            document.source_path,
+            document.mime_type,
+            document.get_public_filename()
+        )
 
         shutil.move(thumb, document.thumbnail_path)
     finally:
diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index 98af4f080..1ed5deb3c 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -288,14 +288,17 @@ class DocumentParser(LoggingMixin):
     def get_archive_path(self):
         return self.archive_path
 
-    def get_thumbnail(self, document_path, mime_type):
+    def get_thumbnail(self, document_path, mime_type, file_name=None):
         """
         Returns the path to a file we can use as a thumbnail for this document.
         """
         raise NotImplementedError()
 
-    def get_optimised_thumbnail(self, document_path, mime_type):
-        thumbnail = self.get_thumbnail(document_path, mime_type)
+    def get_optimised_thumbnail(self,
+                                document_path,
+                                mime_type,
+                                file_name=None):
+        thumbnail = self.get_thumbnail(document_path, mime_type, file_name)
         if settings.OPTIMIZE_THUMBNAILS:
             out_path = os.path.join(self.tempdir, "thumb_optipng.png")
 
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 1ed041187..44effd39e 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -167,7 +167,7 @@ class TestFieldPermutations(TestCase):
 
 class DummyParser(DocumentParser):
 
-    def get_thumbnail(self, document_path, mime_type):
+    def get_thumbnail(self, document_path, mime_type, file_name=None):
         # not important during tests
         raise NotImplementedError()
 
@@ -176,7 +176,7 @@ class DummyParser(DocumentParser):
         _, self.fake_thumb = tempfile.mkstemp(suffix=".png", dir=scratch_dir)
         self.archive_path = archive_path
 
-    def get_optimised_thumbnail(self, document_path, mime_type):
+    def get_optimised_thumbnail(self, document_path, mime_type, file_name=None):
         return self.fake_thumb
 
     def parse(self, document_path, mime_type, file_name=None):
@@ -185,10 +185,10 @@ class DummyParser(DocumentParser):
 
 class CopyParser(DocumentParser):
 
-    def get_thumbnail(self, document_path, mime_type):
+    def get_thumbnail(self, document_path, mime_type, file_name=None):
         return self.fake_thumb
 
-    def get_optimised_thumbnail(self, document_path, mime_type):
+    def get_optimised_thumbnail(self, document_path, mime_type, file_name=None):
         return self.fake_thumb
 
     def __init__(self, logging_group, progress_callback=None):
@@ -203,7 +203,7 @@ class CopyParser(DocumentParser):
 
 class FaultyParser(DocumentParser):
 
-    def get_thumbnail(self, document_path, mime_type):
+    def get_thumbnail(self, document_path, mime_type, file_name=None):
         # not important during tests
         raise NotImplementedError()
 
@@ -211,7 +211,7 @@ class FaultyParser(DocumentParser):
         super(FaultyParser, self).__init__(logging_group)
         _, self.fake_thumb = tempfile.mkstemp(suffix=".png", dir=scratch_dir)
 
-    def get_optimised_thumbnail(self, document_path, mime_type):
+    def get_optimised_thumbnail(self, document_path, mime_type, file_name=None):
         return self.fake_thumb
 
     def parse(self, document_path, mime_type, file_name=None):
diff --git a/src/documents/tests/test_parsers.py b/src/documents/tests/test_parsers.py
index 8da6470a4..9dd74313f 100644
--- a/src/documents/tests/test_parsers.py
+++ b/src/documents/tests/test_parsers.py
@@ -68,7 +68,7 @@ class TestParserDiscovery(TestCase):
             )
 
 
-def fake_get_thumbnail(self, path, mimetype):
+def fake_get_thumbnail(self, path, mimetype, file_name):
     return os.path.join(os.path.dirname(__file__), "examples", "no-text.png")
 
 
@@ -89,15 +89,15 @@ class TestBaseParser(TestCase):
     def test_get_optimised_thumbnail(self):
         parser = DocumentParser(None)
 
-        parser.get_optimised_thumbnail("any", "not important")
+        parser.get_optimised_thumbnail("any", "not important", "document.pdf")
 
     @mock.patch("documents.parsers.DocumentParser.get_thumbnail", fake_get_thumbnail)
     @override_settings(OPTIMIZE_THUMBNAILS=False)
     def test_get_optimised_thumb_disabled(self):
         parser = DocumentParser(None)
 
-        path = parser.get_optimised_thumbnail("any", "not important")
-        self.assertEqual(path, fake_get_thumbnail(None, None, None))
+        path = parser.get_optimised_thumbnail("any", "not important", "document.pdf")
+        self.assertEqual(path, fake_get_thumbnail(None, None, None, None))
 
 
 class TestParserAvailability(TestCase):
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 0a976b569..271a840df 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -48,7 +48,7 @@ class RasterisedDocumentParser(DocumentParser):
                     )
         return result
 
-    def get_thumbnail(self, document_path, mime_type):
+    def get_thumbnail(self, document_path, mime_type, file_name=None):
         return make_thumbnail_from_pdf(
             document_path, self.tempdir, self.logging_group)
 
diff --git a/src/paperless_text/parsers.py b/src/paperless_text/parsers.py
index c307bf10b..837f05c9f 100644
--- a/src/paperless_text/parsers.py
+++ b/src/paperless_text/parsers.py
@@ -13,7 +13,7 @@ class TextDocumentParser(DocumentParser):
 
     logging_name = "paperless.parsing.text"
 
-    def get_thumbnail(self, document_path, mime_type):
+    def get_thumbnail(self, document_path, mime_type, file_name=None):
 
         def read_text():
             with open(document_path, 'r') as src:
diff --git a/src/paperless_tika/parsers.py b/src/paperless_tika/parsers.py
index b888af820..6b0f62ada 100644
--- a/src/paperless_tika/parsers.py
+++ b/src/paperless_tika/parsers.py
@@ -16,9 +16,9 @@ class TikaDocumentParser(DocumentParser):
 
     logging_name = "paperless.parsing.tika"
 
-    def get_thumbnail(self, document_path, mime_type):
+    def get_thumbnail(self, document_path, mime_type, file_name=None):
         if not self.archive_path:
-            self.archive_path = self.convert_to_pdf(document_path)
+            self.archive_path = self.convert_to_pdf(document_path, file_name)
 
         return make_thumbnail_from_pdf(
             self.archive_path, self.tempdir, self.logging_group)

From 1d002149dc9b9b021dcb7d667839b22e2fe39467 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 23:03:07 +0100
Subject: [PATCH 1159/1300] added ASN to filename format #519

---
 docs/advanced_usage.rst                   | 1 +
 src/documents/file_handling.py            | 6 ++++++
 src/documents/tests/test_file_handling.py | 7 +++++++
 3 files changed, 14 insertions(+)

diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst
index 8f6b91b4c..c64df4317 100644
--- a/docs/advanced_usage.rst
+++ b/docs/advanced_usage.rst
@@ -217,6 +217,7 @@ will create a directory structure as follows:
 
 Paperless provides the following placeholders withing filenames:
 
+* ``{asn}``: The archive serial number of the document, or "none".
 * ``{correspondent}``: The name of the correspondent, or "none".
 * ``{document_type}``: The name of the document type, or "none".
 * ``{tag_list}``: A comma separated list of all tags assigned to the document.
diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index 535aa3d2c..8c0e2148b 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -131,6 +131,11 @@ def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
             else:
                 document_type = "none"
 
+            if doc.archive_serial_number:
+                asn = str(doc.archive_serial_number)
+            else:
+                asn = "none"
+
             path = settings.PAPERLESS_FILENAME_FORMAT.format(
                 title=pathvalidate.sanitize_filename(
                     doc.title, replacement_text="-"),
@@ -144,6 +149,7 @@ def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
                 added_year=doc.added.year if doc.added else "none",
                 added_month=f"{doc.added.month:02}" if doc.added else "none",
                 added_day=f"{doc.added.day:02}" if doc.added else "none",
+                asn=asn,
                 tags=tags,
                 tag_list=tag_list
             ).strip()
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index fd74aad7d..927c865c6 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -201,6 +201,13 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         self.assertEqual(generate_filename(d), "my_doc_type - the_doc.pdf")
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{asn} - {title}")
+    def test_asn(self):
+        d1 = Document.objects.create(title="the_doc", mime_type="application/pdf", archive_serial_number=652, checksum="A")
+        d2 = Document.objects.create(title="the_doc", mime_type="application/pdf", archive_serial_number=None, checksum="B")
+        self.assertEqual(generate_filename(d1), "652 - the_doc.pdf")
+        self.assertEqual(generate_filename(d2), "none - the_doc.pdf")
+
     @override_settings(PAPERLESS_FILENAME_FORMAT="{tags[type]}")
     def test_tags_with_underscore(self):
         document = Document()

From 8330b3598cddd09ea84f55087ed1ac102ae8cc89 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 9 Feb 2021 23:23:11 +0100
Subject: [PATCH 1160/1300] changelog

---
 docs/changelog.rst | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 537e898c7..9ab83bc1a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,22 @@
 Changelog
 *********
 
+paperless-ng 1.1.1
+##################
+
+* Fixed a bug in the sanity checker that would cause it to display "x not in list" errors instead of actual issues.
+
+* Fixed a bug with filename generation for archive filenames that would cause the archive files of two documents to overlap.
+
+  * This happened when ``PAPERLESS_FILENAME_FORMAT`` is used and the filename for two documents is the same, except for the file extension.
+  * Paperless will now store the archive filename in the database as well instead of deriving it from the original filename, and use the
+    same logic for detecting and avoiding filename clashes that's also used for original filenames.
+  * The migrations will repair any missing archive files. If you're using tika, ensure that tika is running while performing the migration. Docker will take care of that.
+
+* Fixed a bug with thumbnail regeneration when TIKA integration was used.
+
+* Added ASN as a placeholder field to the filename format.
+
 paperless-ng 1.1.0
 ##################
 
@@ -17,7 +33,7 @@ paperless-ng 1.1.0
       or added with one of the mobile apps.
     * Documents are successfully added to paperless.
     * Document consumption failed (with error messages)
-  
+
   * Configuration options to enable/disable individual notifications.
 
 * Live updates to document lists and saved views when new documents are added.

From 92464116101b833517b6d1c5ad125784e59c86b5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 00:52:01 +0100
Subject: [PATCH 1161/1300] better logging for the migration

---
 src/documents/migrations/1012_fix_archive_files.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/documents/migrations/1012_fix_archive_files.py b/src/documents/migrations/1012_fix_archive_files.py
index 5102522ba..04670829f 100644
--- a/src/documents/migrations/1012_fix_archive_files.py
+++ b/src/documents/migrations/1012_fix_archive_files.py
@@ -163,7 +163,7 @@ def move_old_to_new_locations(apps, schema_editor):
 
         if not os.path.isfile(old_path):
             raise ValueError(
-                f"Archived document of {doc.filename} does not exist at: "
+                f"Archived document ID:{doc.id} does not exist at: "
                 f"{old_path}")
 
         if old_path in old_archive_path_to_id:
@@ -180,7 +180,7 @@ def move_old_to_new_locations(apps, schema_editor):
         parser_class = get_parser_class_for_mime_type(doc.mime_type)
         if not parser_class:
             raise Exception(
-                f"document {doc.filename} has an invalid archived document, "
+                f"Document ID:{doc.id} has an invalid archived document, "
                 f"but no parsers are available. Cannot migrate.")
 
     for doc in Document.objects.filter(archive_checksum__isnull=False):
@@ -205,7 +205,7 @@ def move_old_to_new_locations(apps, schema_editor):
 
         doc = Document.objects.get(id=doc_id)
         logger.info(
-            f"Regenerating archive document for {doc.filename}"
+            f"Regenerating archive document for document ID:{doc.id}"
         )
         parser_class = get_parser_class_for_mime_type(doc.mime_type)
         parser: DocumentParser = parser_class(None, None)
@@ -222,10 +222,16 @@ def move_old_to_new_locations(apps, schema_editor):
                 shutil.copy2(parser.get_archive_path(), archive_path_new(doc))
             else:
                 doc.archive_checksum = None
+                logger.error(
+                    f"Parser did not return an archive document for document "
+                    f"ID:{doc.id}. Removing archive document."
+                )
             doc.save()
         except ParseError:
             logger.exception(
-                f"Unable to regenerate archive document for {doc.filename}"
+                f"Unable to regenerate archive document for ID:{doc.id}. You "
+                f"need to invoke the document_archiver management command "
+                f"manually for that document."
             )
         finally:
             parser.cleanup()

From 34e84cc75732321ede7d7649767a2bf568857049 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 00:52:18 +0100
Subject: [PATCH 1162/1300] sanity checker testing

---
 src/documents/sanity_checker.py          |  8 +++-----
 src/documents/tests/test_sanity_check.py | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/documents/sanity_checker.py b/src/documents/sanity_checker.py
index 61e927c82..2d30a59d7 100644
--- a/src/documents/sanity_checker.py
+++ b/src/documents/sanity_checker.py
@@ -87,20 +87,18 @@ def check_sanity():
                         f"Stored: {doc.checksum}, actual: {checksum}."
                     ))
 
+        # Check sanity of the archive file.
         if doc.archive_checksum and not doc.archive_filename:
             messages.append(SanityError(
                 f"Document {doc.pk} has an archive file checksum, but no "
                 f"archive filename."
             ))
-
-        if not doc.archive_checksum and doc.archive_filename:
+        elif not doc.archive_checksum and doc.archive_filename:
             messages.append(SanityError(
                 f"Document {doc.pk} has an archive file, but its checksum is "
                 f"missing."
             ))
-
-        # Check sanity of the archive file.
-        if doc.has_archive_version:
+        elif doc.has_archive_version:
             if not os.path.isfile(doc.archive_path):
                 messages.append(SanityError(
                     f"Archived version of document {doc.pk} does not exist."
diff --git a/src/documents/tests/test_sanity_check.py b/src/documents/tests/test_sanity_check.py
index d7ab1e07f..fae18aaca 100644
--- a/src/documents/tests/test_sanity_check.py
+++ b/src/documents/tests/test_sanity_check.py
@@ -86,6 +86,19 @@ class TestSanityCheck(DirectoriesMixin, TestCase):
         Path(self.dirs.originals_dir, "orphaned").touch()
         self.assertEqual(len(check_sanity()), 1)
 
-    def test_all(self):
-        Document.objects.create(title="test", checksum="dgfhj", archive_checksum="dfhg", content="", pk=1, filename="0000001.pdf")
+    def test_error_tostring(self):
+        Document.objects.create(title="test", checksum="dgfhj", archive_checksum="dfhg", content="", pk=1, filename="0000001.pdf", archive_filename="0000001.pdf")
         string = str(SanityFailedError(check_sanity()))
+        self.assertIsNotNone(string)
+
+    def test_archive_filename_no_checksum(self):
+        doc = self.make_test_data()
+        doc.archive_checksum = None
+        doc.save()
+        self.assertEqual(len(check_sanity()), 2)
+
+    def test_archive_checksum_no_filename(self):
+        doc = self.make_test_data()
+        doc.archive_filename = None
+        doc.save()
+        self.assertEqual(len(check_sanity()), 2)

From 7082cb9c3626084fdda52394ec2c7f2ad1479a2b Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 01:12:45 +0100
Subject: [PATCH 1163/1300] document renamer testing

---
 src/documents/tests/test_management.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py
index 38425a0aa..978dff8b3 100644
--- a/src/documents/tests/test_management.py
+++ b/src/documents/tests/test_management.py
@@ -110,23 +110,25 @@ class TestRenamer(DirectoriesMixin, TestCase):
 
     @override_settings(PAPERLESS_FILENAME_FORMAT="")
     def test_rename(self):
-        doc = Document.objects.create(title="test", mime_type="application/pdf")
+        doc = Document.objects.create(title="test", mime_type="image/jpeg")
         doc.filename = generate_filename(doc)
+        doc.archive_filename = generate_filename(doc, archive_filename=True)
         doc.save()
 
         Path(doc.source_path).touch()
+        Path(doc.archive_path).touch()
 
-        old_source_path = doc.source_path
-
-        with override_settings(PAPERLESS_FILENAME_FORMAT="{title}"):
+        with override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}"):
             call_command("document_renamer")
 
         doc2 = Document.objects.get(id=doc.id)
 
-        self.assertEqual(doc2.filename, "test.pdf")
-        self.assertFalse(os.path.isfile(old_source_path))
+        self.assertEqual(doc2.filename, "none/test.jpg")
+        self.assertEqual(doc2.archive_filename, "none/test.pdf")
         self.assertFalse(os.path.isfile(doc.source_path))
+        self.assertFalse(os.path.isfile(doc.archive_path))
         self.assertTrue(os.path.isfile(doc2.source_path))
+        self.assertTrue(os.path.isfile(doc2.archive_path))
 
 
 class TestCreateClassifier(TestCase):

From 77d745381f8382295203039a8e82167f49fc4916 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 01:31:15 +0100
Subject: [PATCH 1164/1300] more testing

---
 .../tests/test_migration_archive_files.py     | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/documents/tests/test_migration_archive_files.py b/src/documents/tests/test_migration_archive_files.py
index c4421e8e5..637aaeee0 100644
--- a/src/documents/tests/test_migration_archive_files.py
+++ b/src/documents/tests/test_migration_archive_files.py
@@ -95,8 +95,10 @@ def make_test_document(document_class, title: str, mime_type: str, original: str
 simple_jpg = os.path.join(os.path.dirname(__file__), "samples", "simple.jpg")
 simple_pdf = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
 simple_pdf2 = os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf")
+simple_pdf3 = os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000003.pdf")
 simple_txt = os.path.join(os.path.dirname(__file__), "samples", "simple.txt")
 simple_png = os.path.join(os.path.dirname(__file__), "samples", "simple-noalpha.png")
+simple_png2 = os.path.join(os.path.dirname(__file__), "examples", "no-text.png")
 
 
 @override_settings(PAPERLESS_FILENAME_FORMAT="")
@@ -108,6 +110,8 @@ class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations):
     def setUpBeforeMigration(self, apps):
         Document = apps.get_model("documents", "Document")
 
+        self.unrelated = make_test_document(Document, "unrelated", "application/pdf", simple_pdf3, "unrelated.pdf", simple_pdf)
+        self.no_text = make_test_document(Document, "no-text", "image/png", simple_png2, "no-text.png", simple_pdf)
         self.doc_no_archive = make_test_document(Document, "no_archive", "text/plain", simple_txt, "no_archive.txt")
         self.clash1 = make_test_document(Document, "clash", "application/pdf", simple_pdf, "clash.pdf", simple_pdf)
         self.clash2 = make_test_document(Document, "clash", "image/jpeg", simple_jpg, "clash.jpg", simple_pdf)
@@ -138,10 +142,12 @@ class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations):
                     archive_checksum = hashlib.md5(f.read()).hexdigest()
                 self.assertEqual(archive_checksum, doc.archive_checksum)
 
-        self.assertEqual(Document.objects.filter(archive_checksum__isnull=False).count(), 4)
+        self.assertEqual(Document.objects.filter(archive_checksum__isnull=False).count(), 6)
 
     def test_filenames(self):
         Document = self.apps.get_model('documents', 'Document')
+        self.assertEqual(Document.objects.get(id=self.unrelated.id).archive_filename, "unrelated.pdf")
+        self.assertEqual(Document.objects.get(id=self.no_text.id).archive_filename, "no-text.pdf")
         self.assertEqual(Document.objects.get(id=self.doc_no_archive.id).archive_filename, None)
         self.assertEqual(Document.objects.get(id=self.clash1.id).archive_filename, f"{self.clash1.id:07}.pdf")
         self.assertEqual(Document.objects.get(id=self.clash2.id).archive_filename, f"{self.clash2.id:07}.pdf")
@@ -154,6 +160,8 @@ class TestMigrateArchiveFilesWithFilenameFormat(TestMigrateArchiveFiles):
 
     def test_filenames(self):
         Document = self.apps.get_model('documents', 'Document')
+        self.assertEqual(Document.objects.get(id=self.unrelated.id).archive_filename, "unrelated.pdf")
+        self.assertEqual(Document.objects.get(id=self.no_text.id).archive_filename, "no-text.pdf")
         self.assertEqual(Document.objects.get(id=self.doc_no_archive.id).archive_filename, None)
         self.assertEqual(Document.objects.get(id=self.clash1.id).archive_filename, "none/clash.pdf")
         self.assertEqual(Document.objects.get(id=self.clash2.id).archive_filename, "none/clash_01.pdf")
@@ -161,6 +169,23 @@ class TestMigrateArchiveFilesWithFilenameFormat(TestMigrateArchiveFiles):
         self.assertEqual(Document.objects.get(id=self.clash4.id).archive_filename, "clash.png.pdf")
 
 
+@override_settings(PAPERLESS_FILENAME_FORMAT="")
+class TestMigrateArchiveFilesErrors(DirectoriesMixin, TestMigrations):
+
+    migrate_from = '1011_auto_20210101_2340'
+    migrate_to = '1012_fix_archive_files'
+    auto_migrate = False
+
+    def test_archive_missing(self):
+
+        Document = self.apps.get_model("documents", "Document")
+
+        doc = make_test_document(Document, "clash", "application/pdf", simple_pdf, "clash.pdf", simple_pdf)
+        os.unlink(archive_path_old(doc))
+
+        self.assertRaisesMessage(ValueError, "does not exist at: ", self.performMigration)
+
+
 @override_settings(PAPERLESS_FILENAME_FORMAT="")
 class TestMigrateArchiveFilesBackwards(DirectoriesMixin, TestMigrations):
 

From 1bc961f0c0455b415c343a499ee39f3e54cf1ccc Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 11:50:57 +0100
Subject: [PATCH 1165/1300] update dependencies

---
 Pipfile.lock     | 80 ++++++++++++++++++++++--------------------------
 requirements.txt | 10 +++---
 2 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index c3d57fc7d..f6a672b1b 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -190,24 +190,16 @@
         },
         "cryptography": {
             "hashes": [
-                "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d",
-                "sha256:0e85aaae861d0485eb5a79d33226dd6248d2a9f133b81532c8f5aae37de10ff7",
-                "sha256:594a1db4511bc4d960571536abe21b4e5c3003e8750ab8365fafce71c5d86901",
-                "sha256:69e836c9e5ff4373ce6d3ab311c1a2eed274793083858d3cd4c7d12ce20d5f9c",
-                "sha256:788a3c9942df5e4371c199d10383f44a105d67d401fb4304178020142f020244",
-                "sha256:7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6",
-                "sha256:83d9d2dfec70364a74f4e7c70ad04d3ca2e6a08b703606993407bf46b97868c5",
-                "sha256:84ef7a0c10c24a7773163f917f1cb6b4444597efd505a8aed0a22e8c4780f27e",
-                "sha256:982f661bffc7a24b6d4f8ebe3291f17cf3833a0941c6f4d9d55c790b9aa2cdb3",
-                "sha256:9e21301f7a1e7c03dbea73e8602905a4ebba641547a462b26dd03451e5769e7c",
-                "sha256:9f6b0492d111b43de5f70052e24c1f0951cb9e6022188ebcb1cc3a3d301469b0",
-                "sha256:a69bd3c68b98298f490e84519b954335154917eaab52cf582fa2c5c7efc6e812",
-                "sha256:b4890d5fb9b7a23e3bf8abf5a8a7da8e228f1e97dc96b30b95685df840b6914a",
-                "sha256:c366df0401d1ec4e548bebe8f91d55ebcc0ec3137900d214dd7aac8427ef3030",
-                "sha256:dc42f645f8f3a489c3dd416730a514e7a91a59510ddaadc09d04224c098d3302"
+                "sha256:287032b6a7d86abc98e8e977b20138c53fea40e5b24e29090d5a675a973dcd10",
+                "sha256:288c65eea20bd89b11102c47b118bc1e0749386b0a0dfebba414076c5d4c8188",
+                "sha256:7eed937ad9b53280a5f53570d3a7dc93cb4412b6a3d58d4c6bb78cc26319c729",
+                "sha256:dab437c2e84628703e3358f0f06555a6259bc5039209d51aa3b05af667ff4fd0",
+                "sha256:ee5e19f0856b6fbbdbab15c2787ca65d203801d2d65d0b8de6218f424206c848",
+                "sha256:f21be9ec6b44c223b2024bbe59d394fadc7be320d18a8d595419afadb6cd5620",
+                "sha256:f6ea140d2736b7e1f0de4f988c43f76b0b3f3d365080e091715429ba218dce28"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
-            "version": "==3.3.1"
+            "markers": "python_version >= '3.6'",
+            "version": "==3.4.4"
         },
         "daphne": {
             "hashes": [
@@ -243,11 +235,11 @@
         },
         "django-extensions": {
             "hashes": [
-                "sha256:7cd002495ff0a0e5eb6cdd6be759600905b4e4079232ea27618fc46bdd853651",
-                "sha256:c7f88625a53f631745d4f2bef9ec4dcb999ed59476393bdbbe99db8596778846"
+                "sha256:674ad4c3b1587a884881824f40212d51829e662e52f85b012cd83d83fe1271d9",
+                "sha256:9507f8761ee760748938fd8af766d0608fb2738cf368adfa1b2451f61c15ae35"
             ],
             "index": "pypi",
-            "version": "==3.1.0"
+            "version": "==3.1.1"
         },
         "django-filter": {
             "hashes": [
@@ -462,11 +454,11 @@
         },
         "joblib": {
             "hashes": [
-                "sha256:75ead23f13484a2a414874779d69ade40d4fa1abe62b222a23cd50d4bc822f6f",
-                "sha256:7ad866067ac1fdec27d51c8678ea760601b70e32ff1881d4dc8e1171f2b64b24"
+                "sha256:9c17567692206d2f3fb9ecf5e991084254fe631665c450b443761c4186a613f7",
+                "sha256:feeb1ec69c4d45129954f1b7034954241eedfd6ba39b5e9e4b6883be3332d5e5"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==1.0.0"
+            "version": "==1.0.1"
         },
         "langdetect": {
             "hashes": [
@@ -1113,11 +1105,11 @@
         },
         "tqdm": {
             "hashes": [
-                "sha256:4621f6823bab46a9cc33d48105753ccbea671b68bab2c50a9f0be23d4065cb5a",
-                "sha256:fe3d08dd00a526850568d542ff9de9bbc2a09a791da3c334f3213d8d0bbbca65"
+                "sha256:2874fa525c051177583ec59c0fb4583e91f28ccd3f217ffad2acdb32d2c789ac",
+                "sha256:ab9b659241d82b8b51b2269ee243ec95286046bf06015c4e15a947cc15914211"
             ],
             "index": "pypi",
-            "version": "==4.56.0"
+            "version": "==4.56.1"
         },
         "twisted": {
             "extras": [
@@ -1189,19 +1181,19 @@
         },
         "uvloop": {
             "hashes": [
-                "sha256:08b109f0213af392150e2fe6f81d33261bb5ce968a288eb698aad4f46eb711bd",
-                "sha256:123ac9c0c7dd71464f58f1b4ee0bbd81285d96cdda8bc3519281b8973e3a461e",
-                "sha256:2e57a28567d874afd803b6d8a7aeee7bfa0a34994f1b237837e6d7e525cea9a4",
-                "sha256:4315d2ec3ca393dd5bc0b0089d23101276778c304d42faff5dc4579cb6caef09",
-                "sha256:4544dcf77d74f3a84f03dd6278174575c44c67d7165d4c42c71db3fdc3860726",
-                "sha256:63c0bd965e73a4e8dde6a15635262ec38036d83327230552ada21298ee5fa3b7",
-                "sha256:afd5513c0ae414ec71d24f6f123614a80f3d27ca655a4fcf6cabe50994cc1891",
-                "sha256:b4f591aa4b3fa7f32fb51e2ee9fea1b495eb75b0b3c8d0ca52514ad675ae63f7",
-                "sha256:bcac356d62edd330080aed082e78d4b580ff260a677508718f88016333e2c9c5",
-                "sha256:e7514d7a48c063226b7d06617cbb12a14278d4323a065a8d46a7962686ce2e95",
-                "sha256:f07909cd9fc08c52d294b1570bba92186181ca01fe3dc9ffba68955273dd7362"
+                "sha256:08547ec0d40005da5c5f969f406cc90e6d589b41388958e326d78ea63fb5d2f9",
+                "sha256:1a503d5b49da6e3dd5607d6e533a5315b1caedbf629901807c65a23a09cad065",
+                "sha256:1c114eafd3c53cab74024d122742ed9001611e8f341421dba84a8ea7d886cc2f",
+                "sha256:2d76da5529025f9771855505cfde7bf16b9b0001e2fe05b0abf3e4fc01a5dfdb",
+                "sha256:9900020313c158cbc7befdd5ad60eb7b5443d7d1e83ad57c310e330fe7b2d858",
+                "sha256:9ae0b0e86ffcfe11c208fdb1552894911aa0915280e904a3757ebd4505792568",
+                "sha256:ad5391ce33ac1c745dec6f8a394387b3247c374e93b12a1f0403791f6be4bb8a",
+                "sha256:aecae1a9edd2fb727277f159fb74abab1f426442ae3c03b3b9e9817c7ffcafd2",
+                "sha256:cb121716f4ff5c01dd9b9a12b2193e59383243c21d14c916f588fd626bd3c74b",
+                "sha256:e17cc3f32288daf8476368ddb60cad0f00ab13c979f6f4003ee773f1d90cab58",
+                "sha256:fab95c88d0c3694089c93a8c46fdab30117c4ce0d1afa2ab7d6f4d0607495857"
             ],
-            "version": "==0.14.0"
+            "version": "==0.15.0"
         },
         "watchdog": {
             "hashes": [
@@ -1506,11 +1498,11 @@
         },
         "faker": {
             "hashes": [
-                "sha256:190f0d3ce037866b5d230f0b9fd0f513f07c25dc326dcad6ee019849c68d441c",
-                "sha256:db7adc3b4755005fc960cf96fb4ed46b54b6eb21413741ab3f31a9595f379905"
+                "sha256:bf2a9b3f8d00a5dada61fc4a3f80fe0d6795c7f02a138a7d2ef2db5817c7d017",
+                "sha256:d4aecdb877519d06c2fdc01ffc5ecf70658981acf5e13cd07ded9892994ef5c6"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==6.0.0"
+            "version": "==6.1.1"
         },
         "filelock": {
             "hashes": [
@@ -1713,11 +1705,11 @@
         },
         "pytest-xdist": {
             "hashes": [
-                "sha256:1d8edbb1a45e8e1f8e44b1260583107fc23f8bc8da6d18cb331ff61d41258ecf",
-                "sha256:f127e11e84ad37cc1de1088cb2990f3c354630d428af3f71282de589c5bb779b"
+                "sha256:2447a1592ab41745955fb870ac7023026f20a5f0bfccf1b52a879bd193d46450",
+                "sha256:718887296892f92683f6a51f25a3ae584993b06f7076ce1e1fd482e59a8220a2"
             ],
             "index": "pypi",
-            "version": "==2.2.0"
+            "version": "==2.2.1"
         },
         "python-dateutil": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index 5379725b5..29fe08569 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,11 +24,11 @@ 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.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+cryptography==3.4.4; python_version >= '3.6'
 daphne==3.0.1; python_version >= '3.6'
 dateparser==0.7.6
 django-cors-headers==3.7.0
-django-extensions==3.1.0
+django-extensions==3.1.1
 django-filter==2.4.0
 django-picklefield==3.0.1; python_version >= '3'
 django-q==1.3.4
@@ -49,7 +49,7 @@ img2pdf==0.4.0
 incremental==17.5.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.0; python_version >= '3.6'
+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'
 msgpack==1.0.2
@@ -87,13 +87,13 @@ 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.56.0
+tqdm==4.56.1
 twisted[tls]==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 txaio==20.12.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'
 uvicorn[standard]==0.13.3
-uvloop==0.14.0
+uvloop==0.15.0
 watchdog==1.0.2
 watchgod==0.6
 wcwidth==0.2.5

From ed84cf26e7ccdff4e6b1e23008278df1d7ffa27e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 14:31:17 +0100
Subject: [PATCH 1166/1300] update dependencies

---
 Pipfile          |  2 ++
 Pipfile.lock     | 27 ++++++++++++++-------------
 requirements.txt |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Pipfile b/Pipfile
index 7fcf3de26..d9940d371 100644
--- a/Pipfile
+++ b/Pipfile
@@ -52,6 +52,8 @@ channels-redis = "*"
 uvicorn = {extras = ["standard"], version = "*"}
 concurrent-log-handler = "*"
 django-redis = "*"
+# uvloop 0.15+ incompatible with python 3.6
+uvloop = "~=0.14.0"
 
 [dev-packages]
 coveralls = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index f6a672b1b..c05610316 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "0c2003b9d3d95d1af594f749a2740b55079551ea0ae512177ee9524bb327281e"
+            "sha256": "d5459c3ca4499fcab45844d273d1da636fedd28e6108cb620b982175e81fdce5"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -1181,19 +1181,20 @@
         },
         "uvloop": {
             "hashes": [
-                "sha256:08547ec0d40005da5c5f969f406cc90e6d589b41388958e326d78ea63fb5d2f9",
-                "sha256:1a503d5b49da6e3dd5607d6e533a5315b1caedbf629901807c65a23a09cad065",
-                "sha256:1c114eafd3c53cab74024d122742ed9001611e8f341421dba84a8ea7d886cc2f",
-                "sha256:2d76da5529025f9771855505cfde7bf16b9b0001e2fe05b0abf3e4fc01a5dfdb",
-                "sha256:9900020313c158cbc7befdd5ad60eb7b5443d7d1e83ad57c310e330fe7b2d858",
-                "sha256:9ae0b0e86ffcfe11c208fdb1552894911aa0915280e904a3757ebd4505792568",
-                "sha256:ad5391ce33ac1c745dec6f8a394387b3247c374e93b12a1f0403791f6be4bb8a",
-                "sha256:aecae1a9edd2fb727277f159fb74abab1f426442ae3c03b3b9e9817c7ffcafd2",
-                "sha256:cb121716f4ff5c01dd9b9a12b2193e59383243c21d14c916f588fd626bd3c74b",
-                "sha256:e17cc3f32288daf8476368ddb60cad0f00ab13c979f6f4003ee773f1d90cab58",
-                "sha256:fab95c88d0c3694089c93a8c46fdab30117c4ce0d1afa2ab7d6f4d0607495857"
+                "sha256:08b109f0213af392150e2fe6f81d33261bb5ce968a288eb698aad4f46eb711bd",
+                "sha256:123ac9c0c7dd71464f58f1b4ee0bbd81285d96cdda8bc3519281b8973e3a461e",
+                "sha256:2e57a28567d874afd803b6d8a7aeee7bfa0a34994f1b237837e6d7e525cea9a4",
+                "sha256:4315d2ec3ca393dd5bc0b0089d23101276778c304d42faff5dc4579cb6caef09",
+                "sha256:4544dcf77d74f3a84f03dd6278174575c44c67d7165d4c42c71db3fdc3860726",
+                "sha256:63c0bd965e73a4e8dde6a15635262ec38036d83327230552ada21298ee5fa3b7",
+                "sha256:afd5513c0ae414ec71d24f6f123614a80f3d27ca655a4fcf6cabe50994cc1891",
+                "sha256:b4f591aa4b3fa7f32fb51e2ee9fea1b495eb75b0b3c8d0ca52514ad675ae63f7",
+                "sha256:bcac356d62edd330080aed082e78d4b580ff260a677508718f88016333e2c9c5",
+                "sha256:e7514d7a48c063226b7d06617cbb12a14278d4323a065a8d46a7962686ce2e95",
+                "sha256:f07909cd9fc08c52d294b1570bba92186181ca01fe3dc9ffba68955273dd7362"
             ],
-            "version": "==0.15.0"
+            "index": "pypi",
+            "version": "==0.14.0"
         },
         "watchdog": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index 29fe08569..097cef78e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -93,7 +93,7 @@ txaio==20.12.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'
 uvicorn[standard]==0.13.3
-uvloop==0.15.0
+uvloop==0.14.0
 watchdog==1.0.2
 watchgod==0.6
 wcwidth==0.2.5

From 6c8f010f7a8df84c281c7219ecb4c7c630a9c6f9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 14:50:20 +0100
Subject: [PATCH 1167/1300] retries for archive generation

---
 .../migrations/1012_fix_archive_files.py      | 100 ++++++++++++------
 1 file changed, 66 insertions(+), 34 deletions(-)

diff --git a/src/documents/migrations/1012_fix_archive_files.py b/src/documents/migrations/1012_fix_archive_files.py
index 04670829f..4fa258b8a 100644
--- a/src/documents/migrations/1012_fix_archive_files.py
+++ b/src/documents/migrations/1012_fix_archive_files.py
@@ -4,6 +4,7 @@ import hashlib
 import logging
 import os
 import shutil
+from time import sleep
 
 import pathvalidate
 from django.conf import settings
@@ -12,8 +13,12 @@ from django.template.defaultfilters import slugify
 
 from documents.file_handling import defaultdictNoStr, many_to_dictionary
 
+
 logger = logging.getLogger("paperless.migrations")
 
+###############################################################################
+# This is code copied straight paperless before the change.
+###############################################################################
 
 def archive_name_from_filename(filename):
     return os.path.splitext(filename)[0] + ".pdf"
@@ -150,6 +155,65 @@ def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
     return filename
 
 
+###############################################################################
+# This code performs bidirection archive file transformation.
+###############################################################################
+
+
+def create_archive_version(doc, retry_count=4):
+    from documents.parsers import get_parser_class_for_mime_type, \
+        DocumentParser, \
+        ParseError
+
+    logger.info(
+        f"Regenerating archive document for document ID:{doc.id}"
+    )
+    parser_class = get_parser_class_for_mime_type(doc.mime_type)
+    for try_num in range(retry_count):
+        parser: DocumentParser = parser_class(None, None)
+        try:
+            parser.parse(source_path(doc), doc.mime_type,
+                         os.path.basename(doc.filename))
+            doc.content = parser.get_text()
+
+            if parser.get_archive_path() and os.path.isfile(
+                parser.get_archive_path()):
+                doc.archive_filename = generate_unique_filename(
+                    doc, archive_filename=True)
+                with open(parser.get_archive_path(), "rb") as f:
+                    doc.archive_checksum = hashlib.md5(f.read()).hexdigest()
+                os.makedirs(os.path.dirname(archive_path_new(doc)),
+                            exist_ok=True)
+                shutil.copy2(parser.get_archive_path(), archive_path_new(doc))
+            else:
+                doc.archive_checksum = None
+                logger.error(
+                    f"Parser did not return an archive document for document "
+                    f"ID:{doc.id}. Removing archive document."
+                )
+            doc.save()
+            return
+        except ParseError:
+            if try_num + 1 == retry_count:
+                logger.exception(
+                    f"Unable to regenerate archive document for ID:{doc.id}. You "
+                    f"need to invoke the document_archiver management command "
+                    f"manually for that document."
+                )
+                doc.archive_checksum = None
+                doc.save()
+                return
+            else:
+                # This is mostly here for the tika parser in docker
+                # environemnts. The servers for parsing need to come up first,
+                # and the docker setup doesn't ensure that tika is running
+                # before attempting migrations.
+                logger.error("Parse error, will try again in 5 seconds...")
+                sleep(5)
+        finally:
+            parser.cleanup()
+
+
 def move_old_to_new_locations(apps, schema_editor):
     Document = apps.get_model("documents", "Document")
 
@@ -199,42 +263,10 @@ def move_old_to_new_locations(apps, schema_editor):
 
     # regenerate archive documents
     for doc_id in affected_document_ids:
-        from documents.parsers import get_parser_class_for_mime_type, \
-            DocumentParser, \
-            ParseError
-
         doc = Document.objects.get(id=doc_id)
-        logger.info(
-            f"Regenerating archive document for document ID:{doc.id}"
-        )
-        parser_class = get_parser_class_for_mime_type(doc.mime_type)
-        parser: DocumentParser = parser_class(None, None)
-        try:
-            parser.parse(source_path(doc), doc.mime_type, os.path.basename(doc.filename))
-            doc.content = parser.get_text()
+        create_archive_version(doc)
+
 
-            if parser.get_archive_path() and os.path.isfile(parser.get_archive_path()):
-                doc.archive_filename = generate_unique_filename(
-                    doc, archive_filename=True)
-                with open(parser.get_archive_path(), "rb") as f:
-                    doc.archive_checksum = hashlib.md5(f.read()).hexdigest()
-                os.makedirs(os.path.dirname(archive_path_new(doc)), exist_ok=True)
-                shutil.copy2(parser.get_archive_path(), archive_path_new(doc))
-            else:
-                doc.archive_checksum = None
-                logger.error(
-                    f"Parser did not return an archive document for document "
-                    f"ID:{doc.id}. Removing archive document."
-                )
-            doc.save()
-        except ParseError:
-            logger.exception(
-                f"Unable to regenerate archive document for ID:{doc.id}. You "
-                f"need to invoke the document_archiver management command "
-                f"manually for that document."
-            )
-        finally:
-            parser.cleanup()
 
 
 def move_new_to_old_locations(apps, schema_editor):

From 04519ee6232d34ac1fbf7e2ad07030c073fb35c2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 16:58:55 +0100
Subject: [PATCH 1168/1300] more testing of the migration

---
 .../migrations/1012_fix_archive_files.py      | 33 ++++++---
 .../tests/test_migration_archive_files.py     | 74 +++++++++++++++++++
 2 files changed, 95 insertions(+), 12 deletions(-)

diff --git a/src/documents/migrations/1012_fix_archive_files.py b/src/documents/migrations/1012_fix_archive_files.py
index 4fa258b8a..5f5064396 100644
--- a/src/documents/migrations/1012_fix_archive_files.py
+++ b/src/documents/migrations/1012_fix_archive_files.py
@@ -160,7 +160,12 @@ def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
 ###############################################################################
 
 
-def create_archive_version(doc, retry_count=4):
+def parse_wrapper(parser, path, mime_type, file_name):
+    # this is here so that I can mock this out for testing.
+    parser.parse(path, mime_type, file_name)
+
+
+def create_archive_version(doc, retry_count=3):
     from documents.parsers import get_parser_class_for_mime_type, \
         DocumentParser, \
         ParseError
@@ -172,8 +177,8 @@ def create_archive_version(doc, retry_count=4):
     for try_num in range(retry_count):
         parser: DocumentParser = parser_class(None, None)
         try:
-            parser.parse(source_path(doc), doc.mime_type,
-                         os.path.basename(doc.filename))
+            parse_wrapper(parser, source_path(doc), doc.mime_type,
+                          os.path.basename(doc.filename))
             doc.content = parser.get_text()
 
             if parser.get_archive_path() and os.path.isfile(
@@ -225,25 +230,28 @@ def move_old_to_new_locations(apps, schema_editor):
     for doc in Document.objects.filter(archive_checksum__isnull=False):
         old_path = archive_path_old(doc)
 
-        if not os.path.isfile(old_path):
-            raise ValueError(
-                f"Archived document ID:{doc.id} does not exist at: "
-                f"{old_path}")
-
         if old_path in old_archive_path_to_id:
             affected_document_ids.add(doc.id)
             affected_document_ids.add(old_archive_path_to_id[old_path])
         else:
             old_archive_path_to_id[old_path] = doc.id
 
-    # check that we can regenerate these archive versions
+    # check that archive files of all unaffected documents are in place
+    for doc in Document.objects.filter(archive_checksum__isnull=False):
+        old_path = archive_path_old(doc)
+        if doc.id not in affected_document_ids and not os.path.isfile(old_path):
+            raise ValueError(
+                f"Archived document ID:{doc.id} does not exist at: "
+                f"{old_path}")
+
+    # check that we can regenerate affected archive versions
     for doc_id in affected_document_ids:
         from documents.parsers import get_parser_class_for_mime_type
 
         doc = Document.objects.get(id=doc_id)
         parser_class = get_parser_class_for_mime_type(doc.mime_type)
         if not parser_class:
-            raise Exception(
+            raise ValueError(
                 f"Document ID:{doc.id} has an invalid archived document, "
                 f"but no parsers are available. Cannot migrate.")
 
@@ -253,6 +261,9 @@ def move_old_to_new_locations(apps, schema_editor):
             old_path = archive_path_old(doc)
             # remove affected archive versions
             if os.path.isfile(old_path):
+                logger.debug(
+                    f"Removing {old_path}"
+                )
                 os.unlink(old_path)
         else:
             # Set archive path for unaffected files
@@ -267,8 +278,6 @@ def move_old_to_new_locations(apps, schema_editor):
         create_archive_version(doc)
 
 
-
-
 def move_new_to_old_locations(apps, schema_editor):
     Document = apps.get_model("documents", "Document")
 
diff --git a/src/documents/tests/test_migration_archive_files.py b/src/documents/tests/test_migration_archive_files.py
index 637aaeee0..b3f2e916c 100644
--- a/src/documents/tests/test_migration_archive_files.py
+++ b/src/documents/tests/test_migration_archive_files.py
@@ -2,10 +2,12 @@ import hashlib
 import os
 import shutil
 from pathlib import Path
+from unittest import mock
 
 from django.conf import settings
 from django.test import override_settings
 
+from documents.parsers import ParseError
 from documents.tests.utils import DirectoriesMixin, TestMigrations
 
 
@@ -169,6 +171,11 @@ class TestMigrateArchiveFilesWithFilenameFormat(TestMigrateArchiveFiles):
         self.assertEqual(Document.objects.get(id=self.clash4.id).archive_filename, "clash.png.pdf")
 
 
+def fake_parse_wrapper(parser, path, mime_type, file_name):
+    parser.archive_path = None
+    parser.text = "the text"
+
+
 @override_settings(PAPERLESS_FILENAME_FORMAT="")
 class TestMigrateArchiveFilesErrors(DirectoriesMixin, TestMigrations):
 
@@ -185,6 +192,73 @@ class TestMigrateArchiveFilesErrors(DirectoriesMixin, TestMigrations):
 
         self.assertRaisesMessage(ValueError, "does not exist at: ", self.performMigration)
 
+    def test_parser_missing(self):
+        Document = self.apps.get_model("documents", "Document")
+
+        doc1 = make_test_document(Document, "document", "invalid/typesss768", simple_png, "document.png", simple_pdf)
+        doc2 = make_test_document(Document, "document", "invalid/typesss768", simple_jpg, "document.jpg", simple_pdf)
+
+        self.assertRaisesMessage(ValueError, "no parsers are available", self.performMigration)
+
+    @mock.patch("documents.migrations.1012_fix_archive_files.parse_wrapper")
+    def test_parser_error(self, m):
+        m.side_effect = ParseError()
+        Document = self.apps.get_model("documents", "Document")
+
+        doc1 = make_test_document(Document, "document", "image/png", simple_png, "document.png", simple_pdf)
+        doc2 = make_test_document(Document, "document", "application/pdf", simple_jpg, "document.jpg", simple_pdf)
+
+        self.assertIsNotNone(doc1.archive_checksum)
+        self.assertIsNotNone(doc2.archive_checksum)
+
+        with self.assertLogs() as capture:
+            self.performMigration()
+
+        self.assertEqual(m.call_count, 6)
+
+        self.assertEqual(
+            len(list(filter(lambda log: "Parse error, will try again in 5 seconds" in log, capture.output))),
+            4)
+
+        self.assertEqual(
+            len(list(filter(lambda log: "Unable to regenerate archive document for ID:" in log, capture.output))),
+            2)
+
+        Document = self.apps.get_model("documents", "Document")
+
+        doc1 = Document.objects.get(id=doc1.id)
+        doc2 = Document.objects.get(id=doc2.id)
+
+        self.assertIsNone(doc1.archive_checksum)
+        self.assertIsNone(doc2.archive_checksum)
+        self.assertIsNone(doc1.archive_filename)
+        self.assertIsNone(doc2.archive_filename)
+
+    @mock.patch("documents.migrations.1012_fix_archive_files.parse_wrapper")
+    def test_parser_no_archive(self, m):
+        m.side_effect = fake_parse_wrapper
+
+        Document = self.apps.get_model("documents", "Document")
+
+        doc1 = make_test_document(Document, "document", "image/png", simple_png, "document.png", simple_pdf)
+        doc2 = make_test_document(Document, "document", "application/pdf", simple_jpg, "document.jpg", simple_pdf)
+
+        with self.assertLogs() as capture:
+            self.performMigration()
+
+        self.assertEqual(
+            len(list(filter(lambda log: "Parser did not return an archive document for document" in log, capture.output))),
+            2)
+
+        Document = self.apps.get_model("documents", "Document")
+
+        doc1 = Document.objects.get(id=doc1.id)
+        doc2 = Document.objects.get(id=doc2.id)
+
+        self.assertIsNone(doc1.archive_checksum)
+        self.assertIsNone(doc2.archive_checksum)
+        self.assertIsNone(doc1.archive_filename)
+        self.assertIsNone(doc2.archive_filename)
 
 @override_settings(PAPERLESS_FILENAME_FORMAT="")
 class TestMigrateArchiveFilesBackwards(DirectoriesMixin, TestMigrations):

From e4fe5bebabb3b6b64912334a75ef7bbb5b5680a9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 17:09:22 +0100
Subject: [PATCH 1169/1300] requirements

---
 Pipfile          |  2 ++
 Pipfile.lock     | 28 ++++++++++++++++++----------
 requirements.txt |  2 +-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Pipfile b/Pipfile
index d9940d371..aae5f1506 100644
--- a/Pipfile
+++ b/Pipfile
@@ -54,6 +54,8 @@ concurrent-log-handler = "*"
 django-redis = "*"
 # 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.3.2"
 
 [dev-packages]
 coveralls = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index c05610316..9d1a75b88 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "d5459c3ca4499fcab45844d273d1da636fedd28e6108cb620b982175e81fdce5"
+            "sha256": "b3bed0a6b8981e8fffc1b6aa3bc35a0b1472f28e6f745c62469eb8045740e57b"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -190,16 +190,24 @@
         },
         "cryptography": {
             "hashes": [
-                "sha256:287032b6a7d86abc98e8e977b20138c53fea40e5b24e29090d5a675a973dcd10",
-                "sha256:288c65eea20bd89b11102c47b118bc1e0749386b0a0dfebba414076c5d4c8188",
-                "sha256:7eed937ad9b53280a5f53570d3a7dc93cb4412b6a3d58d4c6bb78cc26319c729",
-                "sha256:dab437c2e84628703e3358f0f06555a6259bc5039209d51aa3b05af667ff4fd0",
-                "sha256:ee5e19f0856b6fbbdbab15c2787ca65d203801d2d65d0b8de6218f424206c848",
-                "sha256:f21be9ec6b44c223b2024bbe59d394fadc7be320d18a8d595419afadb6cd5620",
-                "sha256:f6ea140d2736b7e1f0de4f988c43f76b0b3f3d365080e091715429ba218dce28"
+                "sha256:0d7b69674b738068fa6ffade5c962ecd14969690585aaca0a1b1fc9058938a72",
+                "sha256:1bd0ccb0a1ed775cd7e2144fe46df9dc03eefd722bbcf587b3e0616ea4a81eff",
+                "sha256:3c284fc1e504e88e51c428db9c9274f2da9f73fdf5d7e13a36b8ecb039af6e6c",
+                "sha256:49570438e60f19243e7e0d504527dd5fe9b4b967b5a1ff21cc12b57602dd85d3",
+                "sha256:541dd758ad49b45920dda3b5b48c968f8b2533d8981bcdb43002798d8f7a89ed",
+                "sha256:5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed",
+                "sha256:7951a966613c4211b6612b0352f5bf29989955ee592c4a885d8c7d0f830d0433",
+                "sha256:922f9602d67c15ade470c11d616f2b2364950602e370c76f0c94c94ae672742e",
+                "sha256:a0f0b96c572fc9f25c3f4ddbf4688b9b38c69836713fb255f4a2715d93cbaf44",
+                "sha256:a777c096a49d80f9d2979695b835b0f9c9edab73b59e4ceb51f19724dda887ed",
+                "sha256:a9a4ac9648d39ce71c2f63fe7dc6db144b9fa567ddfc48b9fde1b54483d26042",
+                "sha256:aa4969f24d536ae2268c902b2c3d62ab464b5a66bcb247630d208a79a8098e9b",
+                "sha256:c7390f9b2119b2b43160abb34f63277a638504ef8df99f11cb52c1fda66a2e6f",
+                "sha256:ddd06e71c449a4fe10d0c60846280ee35d69ce49e3e413ce46d5f129e1468083",
+                "sha256:e18e6ab84dfb0ab997faf8cca25a86ff15dfea4027b986322026cc99e0a892da"
             ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.4.4"
+            "index": "pypi",
+            "version": "==3.3.2"
         },
         "daphne": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index 097cef78e..cf63b4660 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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.4; python_version >= '3.6'
+cryptography==3.3.2
 daphne==3.0.1; python_version >= '3.6'
 dateparser==0.7.6
 django-cors-headers==3.7.0

From 45dfbf37473afec20cb715317657f784e8c8179a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 18:27:41 +0100
Subject: [PATCH 1170/1300] downgrades

---
 docs/administration.rst | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/docs/administration.rst b/docs/administration.rst
index c54323e6e..98548efd4 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -171,6 +171,35 @@ Most of the update process is automated when using the ansible role.
         $ ansible-playbook playbook.yml
 
 
+Downgrading Paperless
+#####################
+
+Downgrades are possible. However, some updates also contain database migrations (these change the layout of the database and may move data).
+In order to move back from a version that applied database migrations, you'll have to revert the database migration *before* downgrading,
+and then downgrade paperless.
+
+This table lists the most recent database migrations for each versions:
+
++---------+-------------------------+
+| Version | Latest migration number |
++---------+-------------------------+
+| 1.0.0   | 1011                    |
++---------+-------------------------+
+| 1.1.0   | 1011                    |
++---------+-------------------------+
+| 1.1.1   | 1012                    |
++---------+-------------------------+
+
+Execute the following management command to migrate your database:
+
+.. code:: shell-session
+
+    $ python3 manage.py migrate documents <migration number>
+
+.. note::
+
+    Some migrations cannot be undone. The command will issue errors if that happens.
+
 Management utilities
 ####################
 

From 252d4cb513e5281a1a986faf4ed30b40dfe7bb8f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 18:55:39 +0100
Subject: [PATCH 1171/1300] update document admin

---
 src/documents/admin.py | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/documents/admin.py b/src/documents/admin.py
index 7cc33dc20..5447b6ef2 100755
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -59,16 +59,19 @@ class DocumentAdmin(admin.ModelAdmin):
     list_display_links = ("title",)
 
     list_display = (
-        "correspondent",
-        "title",
-        "tags_",
         "created",
+        "added",
+        "archive_serial_number",
+        "title",
+        "mime_type",
+        "filename",
+        "archive_filename"
     )
 
     list_filter = (
-        "document_type",
-        "tags",
-        "correspondent"
+        ("mime_type"),
+        ("archive_serial_number", admin.EmptyFieldListFilter),
+        ("archive_filename", admin.EmptyFieldListFilter),
     )
 
     filter_horizontal = ("tags",)
@@ -99,26 +102,6 @@ class DocumentAdmin(admin.ModelAdmin):
         index.add_or_update_document(obj)
         super(DocumentAdmin, self).save_model(request, obj, form, change)
 
-    @mark_safe
-    def tags_(self, obj):
-        r = ""
-        for tag in obj.tags.all():
-            r += self._html_tag(
-                "span",
-                tag.name + ", "
-            )
-        return r
-
-    @staticmethod
-    def _html_tag(kind, inside=None, **kwargs):
-        attributes = format_html_join(' ', '{}="{}"', kwargs.items())
-
-        if inside is not None:
-            return format_html("<{kind} {attributes}>{inside}</{kind}>",
-                               kind=kind, attributes=attributes, inside=inside)
-
-        return format_html("<{} {}/>", kind, attributes)
-
 
 class RuleInline(admin.TabularInline):
     model = SavedViewFilterRule

From 658fb2f2084b915265794c7793ef80b19e9a7b04 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 20:01:35 +0100
Subject: [PATCH 1172/1300] remove invalid test cases

---
 src/documents/tests/test_admin.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/documents/tests/test_admin.py b/src/documents/tests/test_admin.py
index 6915f595d..840747d68 100644
--- a/src/documents/tests/test_admin.py
+++ b/src/documents/tests/test_admin.py
@@ -23,18 +23,6 @@ class TestDocumentAdmin(DirectoriesMixin, TestCase):
         self.assertEqual(Document.objects.get(id=doc.id).title, "new title")
         m.assert_called_once()
 
-    def test_tags(self):
-        doc = Document.objects.create(title="test")
-        doc.tags.create(name="t1")
-        doc.tags.create(name="t2")
-
-        self.assertEqual(self.doc_admin.tags_(doc), "<span >t1, </span><span >t2, </span>")
-
-    def test_tags_empty(self):
-        doc = Document.objects.create(title="test")
-
-        self.assertEqual(self.doc_admin.tags_(doc), "")
-
     @mock.patch("documents.admin.index.remove_document")
     def test_delete_model(self, m):
         doc = Document.objects.create(title="test")

From 21740a9d87e9e5639c0d5ee59680c7a4a6ae8873 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 20:05:02 +0100
Subject: [PATCH 1173/1300] changelog

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9ab83bc1a..a0ca5e5c9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,8 @@ Changelog
 paperless-ng 1.1.1
 ##################
 
+This release contains new database migrations.
+
 * Fixed a bug in the sanity checker that would cause it to display "x not in list" errors instead of actual issues.
 
 * Fixed a bug with filename generation for archive filenames that would cause the archive files of two documents to overlap.

From dd19ea46fe8dd0b413d9eacca13148b323acba42 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 20:14:55 +0100
Subject: [PATCH 1174/1300] backup documentation

---
 docs/administration.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/administration.rst b/docs/administration.rst
index f2c84016e..21b6ebcea 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -23,6 +23,12 @@ Options available to any installation of paperless:
 *   The document exporter is also able to update an already existing export.
     Therefore, incremental backups with ``rsync`` are entirely possible.
 
+.. caution::
+
+    You cannot import the export generated with one version of paperless in a
+    different version of paperless. The export contains an exact image of the
+    database, and migrations may change the database layout.
+
 Options available to docker installations:
 
 *   Backup the docker volumes. These usually reside within

From 857fe3a55c0e24d748544358a8a4acc70f1361af Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 21:34:39 +0100
Subject: [PATCH 1175/1300] fix one incorrect use of archive_version

---
 src/documents/serialisers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index fb0962902..b01f82805 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -129,7 +129,7 @@ class DocumentSerializer(DynamicFieldsModelSerializer):
         return obj.get_public_filename()
 
     def get_archived_file_name(self, obj):
-        if obj.archive_checksum:
+        if obj.has_archive_version:
             return obj.get_public_filename(archive=True)
         else:
             return None

From 3fa7dcb0cbfed934e35bd7fce995427ed1861098 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 21:34:50 +0100
Subject: [PATCH 1176/1300] changes to the admin document list

---
 src/documents/admin.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/documents/admin.py b/src/documents/admin.py
index 5447b6ef2..f87ab1ec5 100755
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -59,9 +59,7 @@ class DocumentAdmin(admin.ModelAdmin):
     list_display_links = ("title",)
 
     list_display = (
-        "created",
-        "added",
-        "archive_serial_number",
+        "id",
         "title",
         "mime_type",
         "filename",
@@ -76,7 +74,7 @@ class DocumentAdmin(admin.ModelAdmin):
 
     filter_horizontal = ("tags",)
 
-    ordering = ["-created"]
+    ordering = ["-id"]
 
     date_hierarchy = "created"
 

From 2f8546110908f70dcb34f971a5c291896ccad6c8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 10 Feb 2021 23:53:48 +0100
Subject: [PATCH 1177/1300] added some test cases that I still need to address

---
 src/documents/tests/test_file_handling.py | 32 +++++++++++++++++++++++
 src/documents/tests/test_management.py    | 16 ++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index 927c865c6..a806e1025 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -507,6 +507,38 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(existing_archive_file))
         self.assertEqual(doc.archive_filename, "none/my_doc_01.pdf")
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    def test_move_original_only(self):
+        original = os.path.join(settings.ORIGINALS_DIR, "document_01.pdf")
+        archive = os.path.join(settings.ARCHIVE_DIR, "document.pdf")
+        Path(original).touch()
+        Path(archive).touch()
+
+        doc = Document.objects.create(mime_type="application/pdf", title="document", filename="document_01.pdf", checksum="A",
+                                      archive_checksum="B", archive_filename="document.pdf")
+
+        self.assertEqual(doc.filename, "document.pdf")
+        self.assertEqual(doc.archive_filename, "document.pdf")
+
+        self.assertTrue(os.path.isfile(doc.source_path))
+        self.assertTrue(os.path.isfile(doc.archive_path))
+
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    def test_move_archive_only(self):
+        original = os.path.join(settings.ORIGINALS_DIR, "document.pdf")
+        archive = os.path.join(settings.ARCHIVE_DIR, "document_01.pdf")
+        Path(original).touch()
+        Path(archive).touch()
+
+        doc = Document.objects.create(mime_type="application/pdf", title="document", filename="document.pdf", checksum="A",
+                                      archive_checksum="B", archive_filename="document_01.pdf")
+
+        self.assertEqual(doc.filename, "document.pdf")
+        self.assertEqual(doc.archive_filename, "document.pdf")
+
+        self.assertTrue(os.path.isfile(doc.source_path))
+        self.assertTrue(os.path.isfile(doc.archive_path))
+
     @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
     @mock.patch("documents.signals.handlers.os.rename")
     def test_move_archive_error(self, m):
diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py
index 978dff8b3..1a550a4b4 100644
--- a/src/documents/tests/test_management.py
+++ b/src/documents/tests/test_management.py
@@ -43,11 +43,27 @@ class TestArchiver(DirectoriesMixin, TestCase):
         doc = Document.objects.get(id=doc.id)
 
         self.assertIsNotNone(doc.checksum)
+        self.assertIsNotNone(doc.archive_checksum)
         self.assertTrue(os.path.isfile(doc.archive_path))
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(filecmp.cmp(sample_file, doc.source_path))
         self.assertEqual(doc.archive_filename, "none/A.pdf")
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    def test_naming_priorities(self):
+        doc1 = Document.objects.create(checksum="A", title="document", content="first document", mime_type="application/pdf", filename="document.pdf")
+        doc2 = Document.objects.create(checksum="B", title="document", content="second document", mime_type="application/pdf", filename="document_01.pdf")
+        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, f"document.pdf"))
+        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, f"document_01.pdf"))
+
+        handle_document(doc2.pk)
+        handle_document(doc1.pk)
+
+        doc1 = Document.objects.get(id=doc1.id)
+        doc2 = Document.objects.get(id=doc2.id)
+
+        self.assertEqual(doc1.archive_filename, "document.pdf")
+        self.assertEqual(doc2.archive_filename, "document_01.pdf")
 
 class TestDecryptDocuments(TestCase):
 

From 421115352784e0078c44fda56d7858d65e8b307d Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 11 Feb 2021 13:47:17 +0100
Subject: [PATCH 1178/1300] update file renaming logic

---
 src/documents/signals/handlers.py             | 69 +++++++++----------
 src/documents/tests/test_file_handling.py     | 14 ++++
 .../tests/test_migration_archive_files.py     |  1 +
 3 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 17260fa8a..c5e213949 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -208,21 +208,16 @@ def update_filename_and_move_files(sender, instance, **kwargs):
     with FileLock(settings.MEDIA_LOCK):
         old_filename = instance.filename
         new_filename = generate_unique_filename(instance)
-
-        if new_filename == instance.filename:
-            # Don't do anything if its the same.
-            return
-
+        move_original = old_filename != new_filename
         old_source_path = instance.source_path
         new_source_path = os.path.join(settings.ORIGINALS_DIR, new_filename)
 
-        if not validate_move(instance, old_source_path, new_source_path):
+        if move_original and not validate_move(instance, old_source_path, new_source_path):
             return
 
-        # archive files are optional, archive checksum tells us if we have one,
-        # since this is None for documents without archived files.
+        old_archive_filename = instance.archive_filename
+
         if instance.has_archive_version:
-            old_archive_filename = instance.archive_filename
             new_archive_filename = generate_unique_filename(
                 instance, archive_filename=True
             )
@@ -230,25 +225,26 @@ def update_filename_and_move_files(sender, instance, **kwargs):
             new_archive_path = os.path.join(settings.ARCHIVE_DIR,
                                             new_archive_filename)
 
-            if not validate_move(instance, old_archive_path, new_archive_path):
+            move_archive = old_archive_filename != new_archive_filename
+            if move_archive and not validate_move(instance, old_archive_path, new_archive_path):
                 return
-
-            create_source_path_directory(new_archive_path)
         else:
-            old_archive_filename = None
-            new_archive_filename = None
-            old_archive_path = None
-            new_archive_path = None
+            move_archive = False
 
-        create_source_path_directory(new_source_path)
+        if not move_original and not move_archive:
+            # Don't do anything if filenames did not change.
+            return
 
         try:
-            os.rename(old_source_path, new_source_path)
-            instance.filename = new_filename
+            if move_original:
+                instance.filename = new_filename
+                create_source_path_directory(new_source_path)
+                os.rename(old_source_path, new_source_path)
 
-            if instance.has_archive_version:
-                os.rename(old_archive_path, new_archive_path)
+            if move_archive:
                 instance.archive_filename = new_archive_filename
+                create_source_path_directory(new_archive_path)
+                os.rename(old_archive_path, new_archive_path)
 
             # Don't save() here to prevent infinite recursion.
             Document.objects.filter(pk=instance.pk).update(
@@ -256,16 +252,24 @@ def update_filename_and_move_files(sender, instance, **kwargs):
                 archive_filename=instance.archive_filename,
             )
 
-        except OSError as e:
+        except Exception as e:
+            # This happens when either:
+            #  - moving the files failed due to file system errors
+            #  - saving to the database failed due to database errors
+            # In both cases, we need to revert to the original state.
+
+            # restore old values on the instance
             instance.filename = old_filename
             instance.archive_filename = old_archive_filename
-            # this happens when we can't move a file. If that's the case for
-            # the archive file, we try our best to revert the changes.
-            # no need to save the instance, the update() has not happened yet.
+
+            # Try to move files to their original location.
             try:
-                os.rename(new_source_path, old_source_path)
-                if instance.has_archive_version:
+                if move_original and os.path.isfile(new_source_path):
+                    os.rename(new_source_path, old_source_path)
+
+                if move_archive and os.path.isfile(new_archive_path):
                     os.rename(new_archive_path, old_archive_path)
+
             except Exception as e:
                 # This is fine, since:
                 # A: if we managed to move source from A to B, we will also
@@ -276,17 +280,6 @@ def update_filename_and_move_files(sender, instance, **kwargs):
                 # B: if moving the orignal file failed, nothing has changed
                 #  anyway.
                 pass
-        except DatabaseError as e:
-            # this happens after moving files, so move them back into place.
-            # since moving them once succeeded, it's very likely going to
-            # succeed again.
-            os.rename(new_source_path, old_source_path)
-            if instance.has_archive_version:
-                os.rename(new_archive_path, old_archive_path)
-            instance.filename = old_filename
-            instance.archive_filename = old_archive_filename
-            # again, no need to save the instance, since the actual update()
-            # operation failed.
 
         # finally, remove any empty sub folders. This will do nothing if
         # something has failed above.
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index a806e1025..59af7e317 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -446,6 +446,18 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         self.assertEqual(document2.filename, "qwe.pdf")
 
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    @mock.patch("documents.signals.handlers.Document.objects.filter")
+    def test_no_update_without_change(self, m):
+        doc = Document.objects.create(title="document", filename="document.pdf", archive_filename="document.pdf", checksum="A", archive_checksum="B", mime_type="application/pdf")
+        Path(doc.source_path).touch()
+        Path(doc.archive_path).touch()
+
+        doc.save()
+
+        m.assert_not_called()
+
+
 
 class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
 
@@ -558,6 +570,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         Path(archive).touch()
         doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B", archive_filename="0000001.pdf")
 
+        m.assert_called()
         self.assertTrue(os.path.isfile(original))
         self.assertTrue(os.path.isfile(archive))
         self.assertTrue(os.path.isfile(doc.source_path))
@@ -595,6 +608,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         Path(archive).touch()
         doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", archive_filename="0000001.pdf", checksum="A", archive_checksum="B")
 
+        m.assert_called()
         self.assertTrue(os.path.isfile(original))
         self.assertTrue(os.path.isfile(archive))
         self.assertTrue(os.path.isfile(doc.source_path))
diff --git a/src/documents/tests/test_migration_archive_files.py b/src/documents/tests/test_migration_archive_files.py
index b3f2e916c..6217ae05f 100644
--- a/src/documents/tests/test_migration_archive_files.py
+++ b/src/documents/tests/test_migration_archive_files.py
@@ -260,6 +260,7 @@ class TestMigrateArchiveFilesErrors(DirectoriesMixin, TestMigrations):
         self.assertIsNone(doc1.archive_filename)
         self.assertIsNone(doc2.archive_filename)
 
+
 @override_settings(PAPERLESS_FILENAME_FORMAT="")
 class TestMigrateArchiveFilesBackwards(DirectoriesMixin, TestMigrations):
 

From ed0b1fe1151b1f4ec446dacd67c43ebd7e2ab62a Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Thu, 11 Feb 2021 22:16:41 +0100
Subject: [PATCH 1179/1300] better exception logging

---
 src/documents/classifier.py                            | 4 ++--
 src/documents/index.py                                 | 4 ++--
 src/documents/management/commands/document_archiver.py | 2 +-
 src/documents/management/commands/document_consumer.py | 6 ++----
 src/paperless_mail/tasks.py                            | 7 ++-----
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/documents/classifier.py b/src/documents/classifier.py
index 81f860314..c880e50d6 100755
--- a/src/documents/classifier.py
+++ b/src/documents/classifier.py
@@ -43,9 +43,9 @@ def load_classifier():
                       version=version, timeout=86400)
         except (EOFError, IncompatibleClassifierVersionError) as e:
             # there's something wrong with the model file.
-            logger.error(
+            logger.exception(
                 f"Unrecoverable error while loading document "
-                f"classification model: {str(e)}, deleting model file."
+                f"classification model, deleting model file."
             )
             os.unlink(settings.MODEL_FILE)
             classifier = None
diff --git a/src/documents/index.py b/src/documents/index.py
index bc17daeb1..ea788f4b3 100644
--- a/src/documents/index.py
+++ b/src/documents/index.py
@@ -78,8 +78,8 @@ def open_index(recreate=False):
     try:
         if exists_in(settings.INDEX_DIR) and not recreate:
             return open_dir(settings.INDEX_DIR, schema=get_schema())
-    except Exception as e:
-        logger.error(f"Error while opening the index: {e}, recreating.")
+    except Exception:
+        logger.exception(f"Error while opening the index, recreating.")
 
     if not os.path.isdir(settings.INDEX_DIR):
         os.makedirs(settings.INDEX_DIR, exist_ok=True)
diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index fe8c8b530..297c95121 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -60,7 +60,7 @@ def handle_document(document_id):
             index.update_document(writer, document)
 
     except Exception as e:
-        logger.error(f"Error while parsing document {document}: {str(e)}")
+        logger.exception(f"Error while parsing document {document}")
     finally:
         parser.cleanup()
 
diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index c01743628..aaa644891 100644
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -54,8 +54,7 @@ def _consume(filepath):
         if settings.CONSUMER_SUBDIRS_AS_TAGS:
             tag_ids = _tags_from_path(filepath)
     except Exception as e:
-        logger.error(
-            "Error creating tags from path: {}".format(e))
+        logger.exception("Error creating tags from path")
 
     try:
         async_task("documents.tasks.consume_file",
@@ -66,8 +65,7 @@ def _consume(filepath):
         # Catch all so that the consumer won't crash.
         # This is also what the test case is listening for to check for
         # errors.
-        logger.error(
-            "Error while consuming document: {}".format(e))
+        logger.exception("Error while consuming document")
 
 
 def _consume_wait_unmodified(file, num_tries=20, wait_time=1):
diff --git a/src/paperless_mail/tasks.py b/src/paperless_mail/tasks.py
index 086edef7b..c591f04b9 100644
--- a/src/paperless_mail/tasks.py
+++ b/src/paperless_mail/tasks.py
@@ -13,11 +13,8 @@ def process_mail_accounts():
         try:
             total_new_documents += MailAccountHandler().handle_mail_account(
                 account)
-        except MailError as e:
-            logger.error(
-                f"Error while processing mail account {account}: {e}",
-                exc_info=True
-            )
+        except MailError:
+            logger.exception(f"Error while processing mail account {account}")
 
     if total_new_documents > 0:
         return f"Added {total_new_documents} document(s)."

From 5b56fad9c7ff3561cfd272dad9483cfea6cae040 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 12 Feb 2021 01:31:50 +0100
Subject: [PATCH 1180/1300] fix test case

---
 src/documents/file_handling.py    | 22 +++++++-
 src/documents/signals/handlers.py | 93 +++++++++++++++----------------
 2 files changed, 66 insertions(+), 49 deletions(-)

diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index 8c0e2148b..d7a42db24 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -79,7 +79,19 @@ def many_to_dictionary(field):
     return mydictionary
 
 
-def generate_unique_filename(doc, archive_filename=False):
+def generate_unique_filename(doc,
+                             archive_filename=False):
+    """
+    Generates a unique filename for doc in settings.ORIGINALS_DIR.
+
+    The returned filename is guaranteed to be either the current filename
+    of the document if unchanged, or a new filename that does not correspondent
+    to any existing files. The function will append _01, _02, etc to the
+    filename before the extension to avoid conflicts.
+
+    If archive_filename is True, return a unique archive filename instead.
+
+    """
     if archive_filename:
         old_filename = doc.archive_filename
         root = settings.ARCHIVE_DIR
@@ -87,6 +99,14 @@ def generate_unique_filename(doc, archive_filename=False):
         old_filename = doc.filename
         root = settings.ORIGINALS_DIR
 
+    # If generating archive filenames, try to make a name that is similar to
+    # the original filename first.
+
+    if archive_filename and doc.filename:
+        new_filename = os.path.splitext(doc.filename)[0] + ".pdf"
+        if new_filename == old_filename or not os.path.exists(os.path.join(root, new_filename)):  # NOQA: E501
+            return new_filename
+
     counter = 0
 
     while True:
diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index c5e213949..eb981661c 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -173,21 +173,23 @@ def cleanup_document_deletion(sender, instance, using, **kwargs):
             )
 
 
+class CannotMoveFilesException(Exception):
+    pass
+
+
 def validate_move(instance, old_path, new_path):
     if not os.path.isfile(old_path):
         # Can't do anything if the old file does not exist anymore.
         logger.fatal(
             f"Document {str(instance)}: File {old_path} has gone.")
-        return False
+        raise CannotMoveFilesException()
 
     if os.path.isfile(new_path):
         # Can't do anything if the new file already exists. Skip updating file.
         logger.warning(
             f"Document {str(instance)}: Cannot rename file "
             f"since target path {new_path} already exists.")
-        return False
-
-    return True
+        raise CannotMoveFilesException()
 
 
 @receiver(models.signals.m2m_changed, sender=Document.tags.through)
@@ -206,45 +208,40 @@ def update_filename_and_move_files(sender, instance, **kwargs):
         return
 
     with FileLock(settings.MEDIA_LOCK):
-        old_filename = instance.filename
-        new_filename = generate_unique_filename(instance)
-        move_original = old_filename != new_filename
-        old_source_path = instance.source_path
-        new_source_path = os.path.join(settings.ORIGINALS_DIR, new_filename)
-
-        if move_original and not validate_move(instance, old_source_path, new_source_path):
-            return
-
-        old_archive_filename = instance.archive_filename
-
-        if instance.has_archive_version:
-            new_archive_filename = generate_unique_filename(
-                instance, archive_filename=True
-            )
-            old_archive_path = instance.archive_path
-            new_archive_path = os.path.join(settings.ARCHIVE_DIR,
-                                            new_archive_filename)
-
-            move_archive = old_archive_filename != new_archive_filename
-            if move_archive and not validate_move(instance, old_archive_path, new_archive_path):
-                return
-        else:
-            move_archive = False
-
-        if not move_original and not move_archive:
-            # Don't do anything if filenames did not change.
-            return
-
         try:
+            old_filename = instance.filename
+            old_source_path = instance.source_path
+
+            instance.filename = generate_unique_filename(instance)
+            move_original = old_filename != instance.filename
+
+            old_archive_filename = instance.archive_filename
+            old_archive_path = instance.archive_path
+
+            if instance.has_archive_version:
+
+                instance.archive_filename = generate_unique_filename(
+                    instance, archive_filename=True
+                )
+
+                move_archive = old_archive_filename != instance.archive_filename  # NOQA: E501
+            else:
+                move_archive = False
+
+            if not move_original and not move_archive:
+                # Don't do anything if filenames did not change.
+                return
+
             if move_original:
-                instance.filename = new_filename
-                create_source_path_directory(new_source_path)
-                os.rename(old_source_path, new_source_path)
+                validate_move(instance, old_source_path, instance.source_path)
+                create_source_path_directory(instance.source_path)
+                os.rename(old_source_path, instance.source_path)
 
             if move_archive:
-                instance.archive_filename = new_archive_filename
-                create_source_path_directory(new_archive_path)
-                os.rename(old_archive_path, new_archive_path)
+                validate_move(
+                    instance, old_archive_path, instance.archive_path)
+                create_source_path_directory(instance.archive_path)
+                os.rename(old_archive_path, instance.archive_path)
 
             # Don't save() here to prevent infinite recursion.
             Document.objects.filter(pk=instance.pk).update(
@@ -252,23 +249,19 @@ def update_filename_and_move_files(sender, instance, **kwargs):
                 archive_filename=instance.archive_filename,
             )
 
-        except Exception as e:
+        except (OSError, DatabaseError, CannotMoveFilesException):
             # This happens when either:
             #  - moving the files failed due to file system errors
             #  - saving to the database failed due to database errors
             # In both cases, we need to revert to the original state.
 
-            # restore old values on the instance
-            instance.filename = old_filename
-            instance.archive_filename = old_archive_filename
-
             # Try to move files to their original location.
             try:
-                if move_original and os.path.isfile(new_source_path):
-                    os.rename(new_source_path, old_source_path)
+                if move_original and os.path.isfile(instance.source_path):
+                    os.rename(instance.source_path, old_source_path)
 
-                if move_archive and os.path.isfile(new_archive_path):
-                    os.rename(new_archive_path, old_archive_path)
+                if move_archive and os.path.isfile(instance.archive_path):
+                    os.rename(instance.archive_path, old_archive_path)
 
             except Exception as e:
                 # This is fine, since:
@@ -281,6 +274,10 @@ def update_filename_and_move_files(sender, instance, **kwargs):
                 #  anyway.
                 pass
 
+            # restore old values on the instance
+            instance.filename = old_filename
+            instance.archive_filename = old_archive_filename
+
         # finally, remove any empty sub folders. This will do nothing if
         # something has failed above.
         if not os.path.isfile(old_source_path):

From d6c34719091351e0606acd34fd9524bce52346be Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 12 Feb 2021 16:53:51 +0100
Subject: [PATCH 1181/1300] reprganized docker file, less layers, new shortcuts
 for management commands

---
 Dockerfile                            | 59 +++++++++++++--------------
 docker/install_management_commands.sh |  6 +++
 docker/management_script.sh           | 15 +++++++
 3 files changed, 50 insertions(+), 30 deletions(-)
 create mode 100755 docker/install_management_commands.sh
 create mode 100644 docker/management_script.sh

diff --git a/Dockerfile b/Dockerfile
index 6247ef009..57f96c39f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,10 +10,6 @@ RUN ./configure && make
 
 FROM python:3.7-slim
 
-WORKDIR /usr/src/paperless/
-
-COPY requirements.txt ./
-
 # Binary dependencies
 RUN apt-get update \
   && apt-get -y --no-install-recommends install \
@@ -49,16 +45,24 @@ RUN apt-get update \
 		tesseract-ocr-spa \
 		unpaper \
 		zlib1g \
-		&& rm -rf /var/lib/apt/lists/*
 
 # This pulls in updated dependencies from bullseye to fix some issues with file type detection.
 # TODO: Remove this once bullseye releases.
-RUN echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list \
+  && 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
 
+# copy jbig2enc
+COPY --from=jbig2enc /usr/src/jbig2enc/src/.libs/libjbig2enc* /usr/local/lib/
+COPY --from=jbig2enc /usr/src/jbig2enc/src/jbig2 /usr/local/bin/
+COPY --from=jbig2enc /usr/src/jbig2enc/src/*.h /usr/local/include/
+
+WORKDIR /usr/src/paperless/src/
+
+COPY requirements.txt ../
+
 # Python dependencies
 RUN apt-get update \
   && apt-get -y --no-install-recommends install \
@@ -67,41 +71,36 @@ RUN apt-get update \
 		libpq-dev \
 		libqpdf-dev \
 	&& python3 -m pip install --upgrade --no-cache-dir supervisor \
-  && python3 -m pip install --no-cache-dir -r requirements.txt \
+  && python3 -m pip install --no-cache-dir -r ../requirements.txt \
 	&& apt-get -y purge build-essential libqpdf-dev \
 	&& apt-get -y autoremove --purge \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& mkdir /var/log/supervisord /var/run/supervisord
+	&& rm -rf /var/lib/apt/lists/*
 
+# setup docker-specific things
+COPY docker/ ./docker/
 
-# copy scripts
-# this fixes issues with imagemagick and PDF
-COPY docker/imagemagick-policy.xml /etc/ImageMagick-6/policy.xml
-
-COPY gunicorn.conf.py ./
-COPY docker/supervisord.conf /etc/supervisord.conf
-COPY docker/docker-entrypoint.sh /sbin/docker-entrypoint.sh
-
-# copy jbig2enc
-COPY --from=jbig2enc /usr/src/jbig2enc/src/.libs/libjbig2enc* /usr/local/lib/
-COPY --from=jbig2enc /usr/src/jbig2enc/src/jbig2 /usr/local/bin/
-COPY --from=jbig2enc /usr/src/jbig2enc/src/*.h /usr/local/include/
+RUN cd docker \
+  && cp imagemagick-policy.xml /etc/ImageMagick-6/policy.xml \
+	&& mkdir /var/log/supervisord /var/run/supervisord \
+	&& cp supervisord.conf /etc/supervisord.conf \
+	&& cp docker-entrypoint.sh /sbin/docker-entrypoint.sh \
+	&& chmod 755 /sbin/docker-entrypoint.sh \
+	&& chmod +x install_management_commands.sh \
+	&& ./install_management_commands.sh \
+	&& cd .. \
+	&& rm docker -rf
 
+COPY gunicorn.conf.py ../
 
 # copy app
-COPY src/ ./src/
+COPY src/ ./
 
 # add users, setup scripts
 RUN addgroup --gid 1000 paperless \
 	&& useradd --uid 1000 --gid paperless --home-dir /usr/src/paperless paperless \
-	&& chown -R paperless:paperless . \
-	&& chmod 755 /sbin/docker-entrypoint.sh
-
-WORKDIR /usr/src/paperless/src/
-
-RUN sudo -HEu paperless python3 manage.py collectstatic --clear --no-input
-
-RUN sudo -HEu paperless python3 manage.py compilemessages
+	&& chown -R paperless:paperless ../ \
+	&& sudo -HEu paperless python3 manage.py collectstatic --clear --no-input \
+	&& sudo -HEu paperless python3 manage.py compilemessages
 
 VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/usr/src/paperless/consume", "/usr/src/paperless/export"]
 ENTRYPOINT ["/sbin/docker-entrypoint.sh"]
diff --git a/docker/install_management_commands.sh b/docker/install_management_commands.sh
new file mode 100755
index 000000000..6aeca635d
--- /dev/null
+++ b/docker/install_management_commands.sh
@@ -0,0 +1,6 @@
+for command in document_archiver document_exporter document_importer mail_fetcher document_create_classifier document_index document_renamer document_retagger document_thumbnails;
+do
+	echo "installing $command..."
+	sed "s/management_command/$command/g" management_script.sh > /usr/local/bin/$command
+	chmod +x /usr/local/bin/$command
+done
diff --git a/docker/management_script.sh b/docker/management_script.sh
new file mode 100644
index 000000000..bffa26e98
--- /dev/null
+++ b/docker/management_script.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+cd /usr/src/paperless/src/
+
+if [[ $(id -u) == 0 ]] ;
+then
+  sudo -HEu paperless python3 manage.py management_command "$@"
+elif [[ $(id -un) == "paperless" ]] ;
+then
+  python3 manage.py management_command "$@"
+else
+  echo "Unknown user."
+fi

From 6ac90181cbc8bf56ac9c9060117c750399a1fda9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 12 Feb 2021 16:54:00 +0100
Subject: [PATCH 1182/1300] documentation and changelog

---
 docs/administration.rst | 18 +++++++++++++-----
 docs/changelog.rst      |  3 +++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/docs/administration.rst b/docs/administration.rst
index 21b6ebcea..5773a80cc 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -206,26 +206,34 @@ Execute the following management command to migrate your database:
 
     Some migrations cannot be undone. The command will issue errors if that happens.
 
+.. _utilities-management-commands:
+
 Management utilities
 ####################
 
 Paperless comes with some management commands that perform various maintenance
-tasks on your paperless instance. You can invoke these commands either by
+tasks on your paperless instance. You can invoke these commands in the following way:
+
+With docker-compose, while paperless is running:
 
 .. code:: shell-session
 
     $ cd /path/to/paperless
-    $ docker-compose exec -u paperless webserver python3 manage.py <command> <arguments>
+    $ docker-compose exec webserver <command> <arguments>
 
-or
+With docker, while paperless is running:
+
+.. code:: shell-session
+
+    $ docker exec -it <container-name> <command> <arguments>
+
+Bare metal:
 
 .. code:: shell-session
 
     $ cd /path/to/paperless/src
     $ python3 manage.py <command> <arguments>
 
-depending on whether you use docker or not.
-
 All commands have built-in help, which can be accessed by executing them with
 the argument ``--help``.
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a0ca5e5c9..bf07a3c6a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -23,6 +23,9 @@ This release contains new database migrations.
 
 * Added ASN as a placeholder field to the filename format.
 
+* The docker image now comes with built-in shortcuts for most management commands. These are now the recommended way to execute management commands, since these
+  also ensure that they're always executed as the paperless user and you're less likely to run into permission issues. See :ref:`utilities-management-commands`.
+
 paperless-ng 1.1.0
 ##################
 

From 13e91d8c95879b010c080065bf4ddb5f4387e277 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 12 Feb 2021 18:04:15 +0100
Subject: [PATCH 1183/1300] changelog

---
 docs/changelog.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index bf07a3c6a..d0d38cce4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,10 +14,10 @@ This release contains new database migrations.
 
 * Fixed a bug with filename generation for archive filenames that would cause the archive files of two documents to overlap.
 
-  * This happened when ``PAPERLESS_FILENAME_FORMAT`` is used and the filename for two documents is the same, except for the file extension.
+  * This happened when ``PAPERLESS_FILENAME_FORMAT`` is used and the filenames of two or more documents are the same, except for the file extension.
   * Paperless will now store the archive filename in the database as well instead of deriving it from the original filename, and use the
     same logic for detecting and avoiding filename clashes that's also used for original filenames.
-  * The migrations will repair any missing archive files. If you're using tika, ensure that tika is running while performing the migration. Docker will take care of that.
+  * The migrations will repair any missing archive files. If you're using tika, ensure that tika is running while performing the migration. Docker-compose will take care of that.
 
 * Fixed a bug with thumbnail regeneration when TIKA integration was used.
 

From ed478a1d739bc1714817d02dd0a8eeb8d1e046a5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Fri, 12 Feb 2021 18:20:17 +0100
Subject: [PATCH 1184/1300] change thumbnail display for extra wide images #433

---
 docs/changelog.rst                                           | 5 +++++
 .../document-card-large/document-card-large.component.scss   | 2 +-
 .../document-card-small/document-card-small.component.scss   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d0d38cce4..47dd1bc02 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,11 @@
 Changelog
 *********
 
+paperless-ng 1.1.2
+##################
+
+* Always show top left corner of thumbnails, even for extra wide documents.
+
 paperless-ng 1.1.1
 ##################
 
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
index a549b6f53..c49de93b5 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
@@ -6,7 +6,7 @@
 
 .doc-img {
   object-fit: cover;
-  object-position: top;
+  object-position: top left;
   height: 100%;
   position: absolute;
   mix-blend-mode: multiply;
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
index a4af1bb11..cbe8fa6f6 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
@@ -2,7 +2,7 @@
 
 .doc-img {
   object-fit: cover;
-  object-position: top;
+  object-position: top left;
   height: 200px;
   mix-blend-mode: multiply;
 }

From 8b2965d55b160d5fe2b889ddc0f5b8591e39230c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 13 Feb 2021 16:39:29 +0100
Subject: [PATCH 1185/1300] added sanity checker management command for manual
 execution #534

---
 docker/install_management_commands.sh         |  2 +-
 docs/administration.rst                       | 28 +++++++++++++++
 docs/changelog.rst                            |  2 ++
 .../commands/document_sanity_checker.py       | 27 ++++++++++++++
 src/documents/sanity_checker.py               | 10 ++++--
 src/documents/tests/test_management.py        | 35 +++++++++++++++++++
 6 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100644 src/documents/management/commands/document_sanity_checker.py

diff --git a/docker/install_management_commands.sh b/docker/install_management_commands.sh
index 6aeca635d..17fb8f277 100755
--- a/docker/install_management_commands.sh
+++ b/docker/install_management_commands.sh
@@ -1,4 +1,4 @@
-for command in document_archiver document_exporter document_importer mail_fetcher document_create_classifier document_index document_renamer document_retagger document_thumbnails;
+for command in document_archiver document_exporter document_importer mail_fetcher document_create_classifier document_index document_renamer document_retagger document_thumbnails document_sanity_checker;
 do
 	echo "installing $command..."
 	sed "s/management_command/$command/g" management_script.sh > /usr/local/bin/$command
diff --git a/docs/administration.rst b/docs/administration.rst
index 5773a80cc..c91f501bd 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -410,6 +410,34 @@ the naming scheme.
 The command takes no arguments and processes all your documents at once.
 
 
+.. _utilities-sanity-checker:
+
+Sanity checker
+==============
+
+Paperless has a built-in sanity checker that inspects your document collection for issues.
+
+The issues detected by the sanity checker are as follows:
+
+* Missing original files.
+* Missing archive files.
+* Inaccessible original files due to improper permissions.
+* Inaccessible archive files due to improper permissions.
+* Corrupted original documents by comparing their checksum against what is stored in the database.
+* Corrupted archive documents by comparing their checksum against what is stored in the database.
+* Missing thumbnails.
+* Inaccessible thumbnails due to improper permissions.
+* Documents without any content (warning).
+* Orphaned files in the media directory (warning). These are files that are not referenced by any document im paperless.
+
+
+.. code::
+
+    document_sanity_checker
+
+The command takes no arguments. Depending on the size of your document archive, this may take some time.
+
+
 Fetching e-mail
 ===============
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 47dd1bc02..f15c73605 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,8 @@ paperless-ng 1.1.2
 
 * Always show top left corner of thumbnails, even for extra wide documents.
 
+* Added a management command for executing the sanity checker directly. See :ref:`utilities-sanity-checker`.
+
 paperless-ng 1.1.1
 ##################
 
diff --git a/src/documents/management/commands/document_sanity_checker.py b/src/documents/management/commands/document_sanity_checker.py
new file mode 100644
index 000000000..b5982ed90
--- /dev/null
+++ b/src/documents/management/commands/document_sanity_checker.py
@@ -0,0 +1,27 @@
+import logging
+from django.core.management.base import BaseCommand
+from documents.sanity_checker import check_sanity, SanityError, SanityWarning
+
+logger = logging.getLogger("paperless.management.sanity_checker")
+
+
+class Command(BaseCommand):
+
+    help = """
+        This command checks your document archive for issues.
+    """.replace("    ", "")
+
+    def handle(self, *args, **options):
+
+        messages = check_sanity(progress=True)
+
+        if len(messages) == 0:
+            logger.info("No issues found.")
+        else:
+            for msg in messages:
+                if type(msg) == SanityError:
+                    logger.error(str(msg))
+                elif type(msg) == SanityWarning:
+                    logger.warning(str(msg))
+                else:
+                    logger.info((str(msg)))
diff --git a/src/documents/sanity_checker.py b/src/documents/sanity_checker.py
index 2d30a59d7..f42062154 100644
--- a/src/documents/sanity_checker.py
+++ b/src/documents/sanity_checker.py
@@ -2,6 +2,7 @@ import hashlib
 import os
 
 from django.conf import settings
+from tqdm import tqdm
 
 from documents.models import Document
 
@@ -38,7 +39,7 @@ class SanityFailedError(Exception):
             f"{message_string}\n\n===============\n\n")
 
 
-def check_sanity():
+def check_sanity(progress=False):
     messages = []
 
     present_files = []
@@ -50,7 +51,12 @@ def check_sanity():
     if lockfile in present_files:
         present_files.remove(lockfile)
 
-    for doc in Document.objects.all():
+    if progress:
+        docs = tqdm(Document.objects.all())
+    else:
+        docs = Document.objects.all()
+
+    for doc in docs:
         # Check sanity of the thumbnail
         if not os.path.isfile(doc.thumbnail_path):
             messages.append(SanityError(
diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py
index 1a550a4b4..56710c6e5 100644
--- a/src/documents/tests/test_management.py
+++ b/src/documents/tests/test_management.py
@@ -65,6 +65,7 @@ class TestArchiver(DirectoriesMixin, TestCase):
         self.assertEqual(doc1.archive_filename, "document.pdf")
         self.assertEqual(doc2.archive_filename, "document_01.pdf")
 
+
 class TestDecryptDocuments(TestCase):
 
     @override_settings(
@@ -154,3 +155,37 @@ class TestCreateClassifier(TestCase):
         call_command("document_create_classifier")
 
         m.assert_called_once()
+
+
+class TestSanityChecker(DirectoriesMixin, TestCase):
+
+    def test_no_errors(self):
+        with self.assertLogs() as capture:
+            call_command("document_sanity_checker")
+
+        self.assertEqual(len(capture.output), 1)
+        self.assertIn("No issues found.", capture.output[0])
+
+    @mock.patch("documents.management.commands.document_sanity_checker.logger.warning")
+    @mock.patch("documents.management.commands.document_sanity_checker.logger.error")
+    def test_warnings(self, error, warning):
+        doc = Document.objects.create(title="test", filename="test.pdf", checksum="d41d8cd98f00b204e9800998ecf8427e")
+        Path(doc.source_path).touch()
+        Path(doc.thumbnail_path).touch()
+
+        call_command("document_sanity_checker")
+
+        error.assert_not_called()
+        warning.assert_called()
+
+    @mock.patch("documents.management.commands.document_sanity_checker.logger.warning")
+    @mock.patch("documents.management.commands.document_sanity_checker.logger.error")
+    def test_errors(self, error, warning):
+        doc = Document.objects.create(title="test", content="test", filename="test.pdf", checksum="abc")
+        Path(doc.source_path).touch()
+        Path(doc.thumbnail_path).touch()
+
+        call_command("document_sanity_checker")
+
+        warning.assert_not_called()
+        error.assert_called()

From 5f0e800f6ed41703b01f31f3b402cefb40a46305 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 13 Feb 2021 16:41:03 +0100
Subject: [PATCH 1186/1300] metadata tab not showing anything if files are
 missing #534

---
 docs/changelog.rst              |  2 ++
 src/documents/tests/test_api.py | 24 ++++++++++++++++++++++--
 src/documents/views.py          | 10 ++++++++--
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f15c73605..4c40a71ab 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,8 @@ paperless-ng 1.1.2
 * Always show top left corner of thumbnails, even for extra wide documents.
 
 * Added a management command for executing the sanity checker directly. See :ref:`utilities-sanity-checker`.
+  
+* Fixed an issue with the metadata tab not reporting anything in case of missing files.
 
 paperless-ng 1.1.1
 ##################
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 84b3bc185..20eba6628 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -577,8 +577,11 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
     def test_get_metadata(self):
         doc = Document.objects.create(title="test", filename="file.pdf", mime_type="image/png", archive_checksum="A", archive_filename="archive.pdf")
 
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), doc.source_path)
-        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), doc.archive_path)
+        source_file = os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png")
+        archive_file = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
+
+        shutil.copy(source_file, doc.source_path)
+        shutil.copy(archive_file, doc.archive_path)
 
         response = self.client.get(f"/api/documents/{doc.pk}/metadata/")
         self.assertEqual(response.status_code, 200)
@@ -591,6 +594,8 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertGreater(len(meta['archive_metadata']), 0)
         self.assertEqual(meta['media_filename'], "file.pdf")
         self.assertEqual(meta['archive_media_filename'], "archive.pdf")
+        self.assertEqual(meta['original_size'], os.stat(source_file).st_size)
+        self.assertEqual(meta['archive_size'], os.stat(archive_file).st_size)
 
     def test_get_metadata_invalid_doc(self):
         response = self.client.get(f"/api/documents/34576/metadata/")
@@ -612,6 +617,21 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertIsNone(meta['archive_metadata'])
         self.assertIsNone(meta['archive_media_filename'])
 
+    def test_get_metadata_missing_files(self):
+        doc = Document.objects.create(title="test", filename="file.pdf", mime_type="application/pdf", archive_filename="file.pdf", archive_checksum="B", checksum="A")
+
+        response = self.client.get(f"/api/documents/{doc.pk}/metadata/")
+        self.assertEqual(response.status_code, 200)
+
+        meta = response.data
+
+        self.assertTrue(meta['has_archive_version'])
+        self.assertIsNone(meta['original_metadata'])
+        self.assertIsNone(meta['original_size'])
+        self.assertIsNone(meta['archive_metadata'])
+        self.assertIsNone(meta['archive_size'])
+
+
     def test_get_empty_suggestions(self):
         doc = Document.objects.create(title="test", mime_type="application/pdf")
 
diff --git a/src/documents/views.py b/src/documents/views.py
index 9d1d87235..b2e5b4cd3 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -225,6 +225,12 @@ class DocumentViewSet(RetrieveModelMixin,
         else:
             return []
 
+    def get_filesize(self, filename):
+        if os.path.isfile(filename):
+            return os.stat(filename).st_size
+        else:
+            return None
+
     @action(methods=['get'], detail=True)
     def metadata(self, request, pk=None):
         try:
@@ -234,7 +240,7 @@ class DocumentViewSet(RetrieveModelMixin,
 
         meta = {
             "original_checksum": doc.checksum,
-            "original_size": os.stat(doc.source_path).st_size,
+            "original_size": self.get_filesize(doc.source_path),
             "original_mime_type": doc.mime_type,
             "media_filename": doc.filename,
             "has_archive_version": doc.has_archive_version,
@@ -245,7 +251,7 @@ class DocumentViewSet(RetrieveModelMixin,
         }
 
         if doc.has_archive_version:
-            meta['archive_size'] = os.stat(doc.archive_path).st_size,
+            meta['archive_size'] = self.get_filesize(doc.archive_path)
             meta['archive_metadata'] = self.get_metadata(
                 doc.archive_path, "application/pdf")
         else:

From 64d61ae2fa6fef6ab7f64402d3e95ffcc81d240c Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 13 Feb 2021 18:01:19 +0100
Subject: [PATCH 1187/1300] version bump

---
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 95cd94d29..e2c66690e 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,7 +2,7 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "1.1.1",
+  version: "1.1.2",
   webSocketHost: window.location.host,
   webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:")
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index ae805838c..728d237e2 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (1, 1, 1)
+__version__ = (1, 1, 2)

From 0a1f264c71f463c19c05a3433a25e25477558a88 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 13 Feb 2021 18:09:00 +0100
Subject: [PATCH 1188/1300] Gotenberg troubleshooting

---
 docs/troubleshooting.rst | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index ae7fe14c7..d2a76e7b3 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -94,6 +94,30 @@ If you want to get rid of the warning or actually experience issues with automat
 the file ``classification_model.pickle`` in the data directory and let paperless recreate it.
 
 
+504 Server Error: Gateway Timeout when adding Office documents
+##############################################################
+
+You may experience these errors when using the optional TIKA integration:
+
+.. code::
+
+    requests.exceptions.HTTPError: 504 Server Error: Gateway Timeout for url: http://gotenberg:3000/convert/office
+
+Gotenberg is a server that converts Office documents into PDF documents and has a default timeout of 10 seconds.
+When conversion takes longer, Gotenberg raises this error.
+
+You can increase the timeout by configuring an environment variable for gotenberg (see also `here <https://thecodingmachine.github.io/gotenberg/#environment_variables.default_wait_timeout>`__).
+If using docker-compose, this is achieved by the following configuration change in the ``docker-compose.yml`` file:
+
+.. code:: yaml
+
+    gotenberg:
+        image: thecodingmachine/gotenberg
+        restart: unless-stopped
+        environment:
+            DISABLE_GOOGLE_CHROME: 1
+            DEFAULT_WAIT_TIMEOUT: 30
+
 Permission denied errors in the consumption directory
 #####################################################
 

From b48e67d71452ac7f04f004ee0af74735eb4b1f8e Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 13 Feb 2021 19:51:04 +0100
Subject: [PATCH 1189/1300] revert a faulty change that caused memory usage to
 explode #537

---
 src/documents/classifier.py            | 39 +++++++++++---------------
 src/documents/tests/test_classifier.py |  5 ++--
 src/documents/tests/test_tasks.py      |  1 -
 src/paperless/settings.py              | 10 -------
 4 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/src/documents/classifier.py b/src/documents/classifier.py
index c880e50d6..b577997e3 100755
--- a/src/documents/classifier.py
+++ b/src/documents/classifier.py
@@ -5,7 +5,6 @@ import pickle
 import re
 
 from django.conf import settings
-from django.core.cache import cache
 
 from documents.models import Document, MatchingModel
 
@@ -31,29 +30,23 @@ def load_classifier():
         )
         return None
 
-    version = os.stat(settings.MODEL_FILE).st_mtime
+    classifier = DocumentClassifier()
+    try:
+        classifier.load()
 
-    classifier = cache.get("paperless-classifier", version=version)
-
-    if not classifier:
-        classifier = DocumentClassifier()
-        try:
-            classifier.load()
-            cache.set("paperless-classifier", classifier,
-                      version=version, timeout=86400)
-        except (EOFError, IncompatibleClassifierVersionError) as e:
-            # there's something wrong with the model file.
-            logger.exception(
-                f"Unrecoverable error while loading document "
-                f"classification model, deleting model file."
-            )
-            os.unlink(settings.MODEL_FILE)
-            classifier = None
-        except OSError as e:
-            logger.error(
-                f"Error while loading document classification model: {str(e)}"
-            )
-            classifier = None
+    except (EOFError, IncompatibleClassifierVersionError) as e:
+        # there's something wrong with the model file.
+        logger.exception(
+            f"Unrecoverable error while loading document "
+            f"classification model, deleting model file."
+        )
+        os.unlink(settings.MODEL_FILE)
+        classifier = None
+    except OSError as e:
+        logger.error(
+            f"Error while loading document classification model: {str(e)}"
+        )
+        classifier = None
 
     return classifier
 
diff --git a/src/documents/tests/test_classifier.py b/src/documents/tests/test_classifier.py
index 1efe564d1..fcc08f842 100644
--- a/src/documents/tests/test_classifier.py
+++ b/src/documents/tests/test_classifier.py
@@ -3,6 +3,7 @@ import tempfile
 from pathlib import Path
 from unittest import mock
 
+import pytest
 from django.conf import settings
 from django.test import TestCase, override_settings
 
@@ -233,7 +234,6 @@ class TestClassifier(DirectoriesMixin, TestCase):
         self.assertFalse(os.path.exists(settings.MODEL_FILE))
         self.assertIsNone(load_classifier())
 
-    @override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}})
     @mock.patch("documents.classifier.DocumentClassifier.load")
     def test_load_classifier(self, load):
         Path(settings.MODEL_FILE).touch()
@@ -242,6 +242,7 @@ class TestClassifier(DirectoriesMixin, TestCase):
 
     @override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'}})
     @override_settings(MODEL_FILE=os.path.join(os.path.dirname(__file__), "data", "model.pickle"))
+    @pytest.mark.skip(reason="Disabled caching due to high memory usage - need to investigate.")
     def test_load_classifier_cached(self):
         classifier = load_classifier()
         self.assertIsNotNone(classifier)
@@ -250,7 +251,6 @@ class TestClassifier(DirectoriesMixin, TestCase):
             classifier2 = load_classifier()
             load.assert_not_called()
 
-    @override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}})
     @mock.patch("documents.classifier.DocumentClassifier.load")
     def test_load_classifier_incompatible_version(self, load):
         Path(settings.MODEL_FILE).touch()
@@ -260,7 +260,6 @@ class TestClassifier(DirectoriesMixin, TestCase):
         self.assertIsNone(load_classifier())
         self.assertFalse(os.path.exists(settings.MODEL_FILE))
 
-    @override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}})
     @mock.patch("documents.classifier.DocumentClassifier.load")
     def test_load_classifier_os_error(self, load):
         Path(settings.MODEL_FILE).touch()
diff --git a/src/documents/tests/test_tasks.py b/src/documents/tests/test_tasks.py
index ed280441f..8c5a1b5df 100644
--- a/src/documents/tests/test_tasks.py
+++ b/src/documents/tests/test_tasks.py
@@ -52,7 +52,6 @@ class TestTasks(DirectoriesMixin, TestCase):
         load_classifier.assert_called_once()
         self.assertFalse(os.path.isfile(settings.MODEL_FILE))
 
-    @override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}})
     def test_train_classifier(self):
         c = Correspondent.objects.create(matching_algorithm=Tag.MATCH_AUTO, name="test")
         doc = Document.objects.create(correspondent=c, content="test", title="test")
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 60e7b45bd..150709bb1 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -169,16 +169,6 @@ CHANNEL_LAYERS = {
     },
 }
 
-CACHES = {
-    "default": {
-        "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": os.getenv("PAPERLESS_REDIS", "redis://localhost:6379"),
-        "OPTIONS": {
-            "CLIENT_CLASS": "django_redis.client.DefaultClient",
-        }
-    }
-}
-
 ###############################################################################
 # Security                                                                    #
 ###############################################################################

From 12836d4c68b7738ccb4080e7012e363b2efcd385 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sat, 13 Feb 2021 20:25:52 +0100
Subject: [PATCH 1190/1300] revert django-q configuration

---
 docs/changelog.rst        | 2 ++
 src/paperless/settings.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4c40a71ab..52b53dca8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,6 +14,8 @@ paperless-ng 1.1.2
   
 * Fixed an issue with the metadata tab not reporting anything in case of missing files.
 
+* Reverted a change from 1.1.0 that caused huge memory usage due to redis caching.
+
 paperless-ng 1.1.1
 ##################
 
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 150709bb1..718738f71 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -398,7 +398,7 @@ Q_CLUSTER = {
     'name': 'paperless',
     'catch_up': False,
     'workers': TASK_WORKERS,
-    'django_redis': 'default'
+    'redis': os.getenv("PAPERLESS_REDIS", "redis://localhost:6379")
 }
 
 

From 62caeed283a03035f175b1cd6e25c9048883c707 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 14 Feb 2021 07:05:05 +0000
Subject: [PATCH 1191/1300] Apply translations in cs

translation completed for the source file '/src/locale/en-us/LC_MESSAGES/django.po'
on the 'cs' language.
---
 src/locale/cs/LC_MESSAGES/django.po | 650 ++++++++++++++++++++++++++++
 1 file changed, 650 insertions(+)
 create mode 100644 src/locale/cs/LC_MESSAGES/django.po

diff --git a/src/locale/cs/LC_MESSAGES/django.po b/src/locale/cs/LC_MESSAGES/django.po
new file mode 100644
index 000000000..959246aab
--- /dev/null
+++ b/src/locale/cs/LC_MESSAGES/django.po
@@ -0,0 +1,650 @@
+# 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"
+"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"
+"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"
+
+#: documents/apps.py:10
+msgid "Documents"
+msgstr "Dokumenty"
+
+#: documents/models.py:33
+msgid "Any word"
+msgstr "Jakékoliv slovo"
+
+#: documents/models.py:34
+msgid "All words"
+msgstr "Všechna slova"
+
+#: documents/models.py:35
+msgid "Exact match"
+msgstr "Přesná shoda"
+
+#: documents/models.py:36
+msgid "Regular expression"
+msgstr "Regulární výraz"
+
+#: documents/models.py:37
+msgid "Fuzzy word"
+msgstr "Fuzzy slovo"
+
+#: documents/models.py:38
+msgid "Automatic"
+msgstr "Automatický"
+
+#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
+#: paperless_mail/models.py:109
+msgid "name"
+msgstr "název"
+
+#: documents/models.py:46
+msgid "match"
+msgstr "shoda"
+
+#: documents/models.py:50
+msgid "matching algorithm"
+msgstr "algoritmus pro shodu"
+
+#: documents/models.py:56
+msgid "is insensitive"
+msgstr "je ignorováno"
+
+#: documents/models.py:75 documents/models.py:135
+msgid "correspondent"
+msgstr "korespondent"
+
+#: documents/models.py:76
+msgid "correspondents"
+msgstr "korespondenti"
+
+#: documents/models.py:98
+msgid "color"
+msgstr "barva"
+
+#: documents/models.py:102
+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:109
+msgid "tag"
+msgstr "tag"
+
+#: documents/models.py:110 documents/models.py:166
+msgid "tags"
+msgstr "tagy"
+
+#: documents/models.py:116 documents/models.py:148
+msgid "document type"
+msgstr "typ dokumentu"
+
+#: documents/models.py:117
+msgid "document types"
+msgstr "typy dokumentu"
+
+#: documents/models.py:125
+msgid "Unencrypted"
+msgstr "Nešifrované"
+
+#: documents/models.py:126
+msgid "Encrypted with GNU Privacy Guard"
+msgstr "Šifrované pomocí GNU Privacy Guard"
+
+#: documents/models.py:139
+msgid "title"
+msgstr "titulek"
+
+#: documents/models.py:152
+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:159
+msgid "mime type"
+msgstr "mime typ"
+
+#: documents/models.py:170
+msgid "checksum"
+msgstr "kontrolní součet"
+
+#: documents/models.py:174
+msgid "The checksum of the original document."
+msgstr "Kontrolní součet původního dokumentu"
+
+#: documents/models.py:178
+msgid "archive checksum"
+msgstr "kontrolní součet archivu"
+
+#: documents/models.py:183
+msgid "The checksum of the archived document."
+msgstr "Kontrolní součet archivovaného dokumentu."
+
+#: documents/models.py:187 documents/models.py:330
+msgid "created"
+msgstr "vytvořeno"
+
+#: documents/models.py:191
+msgid "modified"
+msgstr "upraveno"
+
+#: documents/models.py:195
+msgid "storage type"
+msgstr "typ úložiště"
+
+#: documents/models.py:203
+msgid "added"
+msgstr "přidáno"
+
+#: documents/models.py:207
+msgid "filename"
+msgstr "název souboru"
+
+#: documents/models.py:212
+msgid "Current filename in storage"
+msgstr "Aktuální název souboru v úložišti"
+
+#: documents/models.py:216
+msgid "archive serial number"
+msgstr "sériové číslo archivu"
+
+#: documents/models.py:221
+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
+msgid "document"
+msgstr "dokument"
+
+#: documents/models.py:228
+msgid "documents"
+msgstr "dokumenty"
+
+#: documents/models.py:313
+msgid "debug"
+msgstr "debug"
+
+#: documents/models.py:314
+msgid "information"
+msgstr "informace"
+
+#: documents/models.py:315
+msgid "warning"
+msgstr "varování"
+
+#: documents/models.py:316
+msgid "error"
+msgstr "chyba"
+
+#: documents/models.py:317
+msgid "critical"
+msgstr "kritická"
+
+#: documents/models.py:321
+msgid "group"
+msgstr "skupina"
+
+#: documents/models.py:324
+msgid "message"
+msgstr "zpráva"
+
+#: documents/models.py:327
+msgid "level"
+msgstr "úroveň"
+
+#: documents/models.py:334
+msgid "log"
+msgstr "záznam"
+
+#: documents/models.py:335
+msgid "logs"
+msgstr "záznamy"
+
+#: documents/models.py:346 documents/models.py:396
+msgid "saved view"
+msgstr "uložený pohled"
+
+#: documents/models.py:347
+msgid "saved views"
+msgstr "uložené pohledy"
+
+#: documents/models.py:350
+msgid "user"
+msgstr "uživatel"
+
+#: documents/models.py:356
+msgid "show on dashboard"
+msgstr "zobrazit v dashboardu"
+
+#: documents/models.py:359
+msgid "show in sidebar"
+msgstr "zobrazit v postranním menu"
+
+#: documents/models.py:363
+msgid "sort field"
+msgstr "pole na řazení"
+
+#: documents/models.py:366
+msgid "sort reverse"
+msgstr "třídit opačně"
+
+#: documents/models.py:372
+msgid "title contains"
+msgstr "titulek obsahuje"
+
+#: documents/models.py:373
+msgid "content contains"
+msgstr "obsah obsahuje"
+
+#: documents/models.py:374
+msgid "ASN is"
+msgstr "ASN je"
+
+#: documents/models.py:375
+msgid "correspondent is"
+msgstr "korespondent je"
+
+#: documents/models.py:376
+msgid "document type is"
+msgstr "typ dokumentu je"
+
+#: documents/models.py:377
+msgid "is in inbox"
+msgstr "je v příchozích"
+
+#: documents/models.py:378
+msgid "has tag"
+msgstr "má tag"
+
+#: documents/models.py:379
+msgid "has any tag"
+msgstr "má jakýkoliv tag"
+
+#: documents/models.py:380
+msgid "created before"
+msgstr "vytvořeno před"
+
+#: documents/models.py:381
+msgid "created after"
+msgstr "vytvořeno po"
+
+#: documents/models.py:382
+msgid "created year is"
+msgstr "rok vytvoření je"
+
+#: documents/models.py:383
+msgid "created month is"
+msgstr "měsíc vytvoření je"
+
+#: documents/models.py:384
+msgid "created day is"
+msgstr "den vytvoření je"
+
+#: documents/models.py:385
+msgid "added before"
+msgstr "přidáno před"
+
+#: documents/models.py:386
+msgid "added after"
+msgstr "přidáno po"
+
+#: documents/models.py:387
+msgid "modified before"
+msgstr "upraveno před"
+
+#: documents/models.py:388
+msgid "modified after"
+msgstr "upraveno po"
+
+#: documents/models.py:389
+msgid "does not have tag"
+msgstr "nemá tag"
+
+#: documents/models.py:400
+msgid "rule type"
+msgstr "typ pravidla"
+
+#: documents/models.py:404
+msgid "value"
+msgstr "hodnota"
+
+#: documents/models.py:410
+msgid "filter rule"
+msgstr "filtrovací pravidlo"
+
+#: documents/models.py:411
+msgid "filter rules"
+msgstr "filtrovací pravidla"
+
+#: documents/serialisers.py:383
+#, python-format
+msgid "File type %(type)s not supported"
+msgstr "Typ souboru %(type)s není podporován"
+
+#: documents/templates/index.html:20
+msgid "Paperless-ng is loading..."
+msgstr "Paperless-ng se načítá..."
+
+#: documents/templates/registration/logged_out.html:13
+msgid "Paperless-ng signed out"
+msgstr "Odhlášeno od Paperless-ng"
+
+#: documents/templates/registration/logged_out.html:41
+msgid "You have been successfully logged out. Bye!"
+msgstr "Byli jste úspěšně odhlášeni. Nashledanou!"
+
+#: documents/templates/registration/logged_out.html:42
+msgid "Sign in again"
+msgstr "Přihlašte se znovu"
+
+#: documents/templates/registration/login.html:13
+msgid "Paperless-ng sign in"
+msgstr "Paperless-ng přihlášení"
+
+#: documents/templates/registration/login.html:42
+msgid "Please sign in."
+msgstr "Prosím přihlaste se."
+
+#: documents/templates/registration/login.html:45
+msgid "Your username and password didn't match. Please try again."
+msgstr "Vaše uživatelské jméno a heslo se neshodují. Prosím, zkuste to znovu."
+
+#: documents/templates/registration/login.html:48
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+#: documents/templates/registration/login.html:49
+msgid "Password"
+msgstr "Heslo"
+
+#: documents/templates/registration/login.html:54
+msgid "Sign in"
+msgstr "Přihlásit se"
+
+#: paperless/settings.py:286
+msgid "English"
+msgstr "Angličtina"
+
+#: paperless/settings.py:287
+msgid "German"
+msgstr "Němčina"
+
+#: paperless/settings.py:288
+msgid "Dutch"
+msgstr "Holandština"
+
+#: paperless/settings.py:289
+msgid "French"
+msgstr "Francouzština"
+
+#: paperless/urls.py:114
+msgid "Paperless-ng administration"
+msgstr "Správa Paperless-ng"
+
+#: paperless_mail/admin.py:25
+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."
+
+#: 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."
+
+#: 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."
+
+#: paperless_mail/apps.py:9
+msgid "Paperless mail"
+msgstr "Paperless pošta"
+
+#: paperless_mail/models.py:11
+msgid "mail account"
+msgstr "emailový účet"
+
+#: paperless_mail/models.py:12
+msgid "mail accounts"
+msgstr "emailové účty"
+
+#: paperless_mail/models.py:19
+msgid "No encryption"
+msgstr "Žádné šifrování"
+
+#: paperless_mail/models.py:20
+msgid "Use SSL"
+msgstr "Používat SSL"
+
+#: paperless_mail/models.py:21
+msgid "Use STARTTLS"
+msgstr "Používat STARTTLS"
+
+#: paperless_mail/models.py:29
+msgid "IMAP server"
+msgstr "IMAP server"
+
+#: paperless_mail/models.py:33
+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í."
+
+#: paperless_mail/models.py:40
+msgid "IMAP security"
+msgstr "IMAP bezpečnost"
+
+#: paperless_mail/models.py:46
+msgid "username"
+msgstr "uživatelské jméno"
+
+#: paperless_mail/models.py:50
+msgid "password"
+msgstr "heslo"
+
+#: paperless_mail/models.py:60
+msgid "mail rule"
+msgstr "mailové pravidlo"
+
+#: paperless_mail/models.py:61
+msgid "mail rules"
+msgstr "mailová pravidla"
+
+#: paperless_mail/models.py:67
+msgid "Only process attachments."
+msgstr "Zpracovávat jen přílohy"
+
+#: paperless_mail/models.py:68
+msgid "Process all files, including 'inline' attachments."
+msgstr "Zpracovat všechny soubory, včetně vložených příloh"
+
+#: paperless_mail/models.py:78
+msgid "Mark as read, don't process read mails"
+msgstr "Označit jako přečtené, nezpracovávat přečtené emaily"
+
+#: paperless_mail/models.py:79
+msgid "Flag the mail, don't process flagged mails"
+msgstr "Označit email, nezpracovávat označené emaily"
+
+#: paperless_mail/models.py:80
+msgid "Move to specified folder"
+msgstr "Přesunout do specifikované složky"
+
+#: paperless_mail/models.py:81
+msgid "Delete"
+msgstr "Odstranit"
+
+#: paperless_mail/models.py:88
+msgid "Use subject as title"
+msgstr "Použít předmět jako titulek"
+
+#: paperless_mail/models.py:89
+msgid "Use attachment filename as title"
+msgstr "Použít název souboru u přílohy jako titulek"
+
+#: paperless_mail/models.py:99
+msgid "Do not assign a correspondent"
+msgstr "Nepřiřazovat korespondenta"
+
+#: paperless_mail/models.py:101
+msgid "Use mail address"
+msgstr "Použít emailovou adresu"
+
+#: paperless_mail/models.py:103
+msgid "Use name (or mail address if not available)"
+msgstr "Použít jméno (nebo emailovou adresu pokud jméno není dostupné)"
+
+#: paperless_mail/models.py:105
+msgid "Use correspondent selected below"
+msgstr "Použít korespondenta vybraného níže"
+
+#: paperless_mail/models.py:113
+msgid "order"
+msgstr "pořadí"
+
+#: paperless_mail/models.py:120
+msgid "account"
+msgstr "účet"
+
+#: paperless_mail/models.py:124
+msgid "folder"
+msgstr "složka"
+
+#: paperless_mail/models.py:128
+msgid "filter from"
+msgstr "filtrovat z"
+
+#: paperless_mail/models.py:131
+msgid "filter subject"
+msgstr "název filtru"
+
+#: paperless_mail/models.py:134
+msgid "filter body"
+msgstr "tělo filtru"
+
+#: paperless_mail/models.py:138
+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."
+
+#: paperless_mail/models.py:146
+msgid "maximum age"
+msgstr "maximální stáří"
+
+#: paperless_mail/models.py:148
+msgid "Specified in days."
+msgstr "Specifikováno ve dnech."
+
+#: paperless_mail/models.py:151
+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"
+
+#: paperless_mail/models.py:159
+msgid "action"
+msgstr "akce"
+
+#: paperless_mail/models.py:165
+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."
+
+#: paperless_mail/models.py:173
+msgid "assign title from"
+msgstr "nastavit titulek z"
+
+#: paperless_mail/models.py:183
+msgid "assign this tag"
+msgstr "přiřadit tento tag"
+
+#: paperless_mail/models.py:191
+msgid "assign this document type"
+msgstr "přiřadit tento typ dokumentu"
+
+#: paperless_mail/models.py:195
+msgid "assign correspondent from"
+msgstr "přiřadit korespondenta z"
+
+#: paperless_mail/models.py:205
+msgid "assign this correspondent"
+msgstr "přiřadit tohoto korespondenta"

From 43c729568b434c7aae22c76f4cc335d86275ba19 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 14 Feb 2021 12:29:55 +0100
Subject: [PATCH 1192/1300] release worker memory after tasks are done.

---
 src/paperless/settings.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 718738f71..59133dd45 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -397,6 +397,7 @@ TASK_WORKERS = int(os.getenv("PAPERLESS_TASK_WORKERS", default_task_workers()))
 Q_CLUSTER = {
     'name': 'paperless',
     'catch_up': False,
+    'recycle': 1,
     'workers': TASK_WORKERS,
     'redis': os.getenv("PAPERLESS_REDIS", "redis://localhost:6379")
 }

From 3d0a52c25f2811f07b8987f43ee5b7cfb6c423a6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 14 Feb 2021 12:50:30 +0100
Subject: [PATCH 1193/1300] only load channels app if DEBUG is enabled; its
 only purpose is to monkey-patch the runserver command.

---
 src/paperless/settings.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 59133dd45..8d14262d1 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -102,10 +102,11 @@ INSTALLED_APPS = [
 
     "django_q",
 
-    "channels",
-
 ] + env_apps
 
+if DEBUG:
+    INSTALLED_APPS.append("channels")
+
 REST_FRAMEWORK = {
     'DEFAULT_AUTHENTICATION_CLASSES': [
         'rest_framework.authentication.BasicAuthentication',

From 6e48da41e59ce1346c9ea253de28f17c1bba62eb Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 14 Feb 2021 14:05:42 +0100
Subject: [PATCH 1194/1300] changelog

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 52b53dca8..fcd14c59d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -16,6 +16,8 @@ paperless-ng 1.1.2
 
 * Reverted a change from 1.1.0 that caused huge memory usage due to redis caching.
 
+* Some memory usage optimizations.
+
 paperless-ng 1.1.1
 ##################
 

From df6c59bc4f7ca10f23632dda0f1785e6eadf7791 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 14 Feb 2021 15:38:47 +0100
Subject: [PATCH 1195/1300] update dependencies

---
 Pipfile          |   3 +-
 Pipfile.lock     | 109 ++++++++++++++++++++++-------------------------
 requirements.txt |   7 ++-
 3 files changed, 54 insertions(+), 65 deletions(-)

diff --git a/Pipfile b/Pipfile
index aae5f1506..8bacba7a4 100644
--- a/Pipfile
+++ b/Pipfile
@@ -39,7 +39,7 @@ scikit-learn="==0.24.0"
 # Prevent scipy updates because 1.6 is incompatible with python 3.6
 scipy="~=1.5.4"
 whitenoise = "~=5.2.0"
-watchdog = "*"
+watchdog = "~=1.0.0"
 whoosh="~=2.7.4"
 inotifyrecursive = "~=0.3.4"
 ocrmypdf = "~=11.6"
@@ -51,7 +51,6 @@ channels = "~=3.0"
 channels-redis = "*"
 uvicorn = {extras = ["standard"], version = "*"}
 concurrent-log-handler = "*"
-django-redis = "*"
 # 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/)
diff --git a/Pipfile.lock b/Pipfile.lock
index 9d1a75b88..fee6359da 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "b3bed0a6b8981e8fffc1b6aa3bc35a0b1472f28e6f745c62469eb8045740e57b"
+            "sha256": "bd8b69979d91f4d8c52cac127c891d750c52959807220a98dcf74fed126bfa26"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -60,11 +60,11 @@
         },
         "autobahn": {
             "hashes": [
-                "sha256:93df8fc9d1821c9dabff9fed52181a9ad6eea5e9989d53102c391607d7c1666e",
-                "sha256:cceed2121b7a93024daa93c91fae33007f8346f0e522796421f36a6183abea99"
+                "sha256:41a3a3f89cde48643baf4e105d9491c566295f9abee951379e59121784044b8b",
+                "sha256:7e6b1bf95196b733978bab2d54a7ab8899c16ce11be369dc58422c07b7eea726"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==21.1.1"
+            "version": "==21.2.1"
         },
         "automat": {
             "hashes": [
@@ -90,47 +90,47 @@
         },
         "cffi": {
             "hashes": [
-                "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e",
-                "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d",
-                "sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a",
-                "sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec",
-                "sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362",
-                "sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668",
-                "sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c",
-                "sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b",
-                "sha256:23f318bf74b170c6e9adb390e8bd282457f6de46c19d03b52f3fd042b5e19654",
-                "sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06",
-                "sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698",
-                "sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2",
-                "sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c",
-                "sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7",
-                "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009",
-                "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03",
-                "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b",
-                "sha256:7ef7d4ced6b325e92eb4d3502946c78c5367bc416398d387b39591532536734e",
-                "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909",
-                "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53",
-                "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35",
-                "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26",
-                "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b",
-                "sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01",
-                "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb",
-                "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293",
-                "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd",
-                "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d",
-                "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3",
-                "sha256:be8661bcee1bc2fc4b033a6ab65bd1f87ce5008492601695d0b9a4e820c3bde5",
-                "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d",
-                "sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e",
-                "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca",
-                "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d",
-                "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775",
-                "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375",
-                "sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b",
-                "sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b",
-                "sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f"
+                "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813",
+                "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06",
+                "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea",
+                "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee",
+                "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396",
+                "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73",
+                "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315",
+                "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1",
+                "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49",
+                "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892",
+                "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482",
+                "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058",
+                "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5",
+                "sha256:5560dbf8deedbffb638d8a2da31da91094db361cc07f8a501a339b2daae2cbcc",
+                "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53",
+                "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045",
+                "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3",
+                "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5",
+                "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e",
+                "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c",
+                "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369",
+                "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827",
+                "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053",
+                "sha256:9338beed13d880320450d95c9e07ccf839faa3ea7b75d788f4ed46d845044a71",
+                "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa",
+                "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4",
+                "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322",
+                "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132",
+                "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62",
+                "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa",
+                "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0",
+                "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396",
+                "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e",
+                "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991",
+                "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6",
+                "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1",
+                "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406",
+                "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d",
+                "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"
             ],
-            "version": "==1.14.4"
+            "version": "==1.14.5"
         },
         "channels": {
             "hashes": [
@@ -273,15 +273,6 @@
             "index": "pypi",
             "version": "==1.3.4"
         },
-        "django-redis": {
-            "hashes": [
-                "sha256:1133b26b75baa3664164c3f44b9d5d133d1b8de45d94d79f38d1adc5b1d502e5",
-                "sha256:306589c7021e6468b2656edc89f62b8ba67e8d5a1c8877e2688042263daa7a63",
-                "sha256:f2b25b62cc95b63b7059aaf8e81710e7eea94678e545d31c46e47a6f4af99e56"
-            ],
-            "index": "pypi",
-            "version": "==4.12.1"
-        },
         "djangorestframework": {
             "hashes": [
                 "sha256:0209bafcb7b5010fdfec784034f059d512256424de2a0f084cb82b096d6dd6a7",
@@ -1113,11 +1104,11 @@
         },
         "tqdm": {
             "hashes": [
-                "sha256:2874fa525c051177583ec59c0fb4583e91f28ccd3f217ffad2acdb32d2c789ac",
-                "sha256:ab9b659241d82b8b51b2269ee243ec95286046bf06015c4e15a947cc15914211"
+                "sha256:11d544652edbdfc9cc41aa4c8a5c166513e279f3f2d9f1a9e1c89935b51de6ff",
+                "sha256:a89be573bfddb81bb0b395a416d5e55e3ecc73ce95a368a4f6360bedea33195e"
             ],
             "index": "pypi",
-            "version": "==4.56.1"
+            "version": "==4.56.2"
         },
         "twisted": {
             "extras": [
@@ -1649,11 +1640,11 @@
         },
         "pygments": {
             "hashes": [
-                "sha256:bc9591213a8f0e0ca1a5e68a479b4887fdc3e75d0774e5c71c31920c427de435",
-                "sha256:df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337"
+                "sha256:37a13ba168a02ac54cc5891a42b1caec333e59b66addb7fa633ea8a6d73445c0",
+                "sha256:b21b072d0ccdf29297a82a2363359d99623597b8a265b8081760e4d0f7153c88"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==2.7.4"
+            "version": "==2.8.0"
         },
         "pyparsing": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index cf63b4660..0a0ae75c0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,11 +12,11 @@ arrow==0.17.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2,
 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.1.1; python_version >= '3.6'
+autobahn==21.2.1; python_version >= '3.6'
 automat==20.2.0
 blessed==1.17.12
 certifi==2020.12.5
-cffi==1.14.4
+cffi==1.14.5
 channels-redis==3.2.0
 channels==3.0.3
 chardet==4.0.0; python_version >= '3.1'
@@ -32,7 +32,6 @@ django-extensions==3.1.1
 django-filter==2.4.0
 django-picklefield==3.0.1; python_version >= '3'
 django-q==1.3.4
-django-redis==4.12.1
 django==3.1.6
 djangorestframework==3.12.2
 filelock==3.0.12
@@ -87,7 +86,7 @@ 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.56.1
+tqdm==4.56.2
 twisted[tls]==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 txaio==20.12.1; python_version >= '3.6'
 tzlocal==2.1

From 98b147b62249d9fbb96764785740869cb48cfe62 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 14 Feb 2021 17:08:29 +0100
Subject: [PATCH 1196/1300] better sanity checker that logs messages in the log
 files and does not fail on warnings.

---
 docs/changelog.rst                            |   6 +-
 .../commands/document_sanity_checker.py       |  16 +--
 src/documents/sanity_checker.py               | 116 ++++++++---------
 src/documents/tasks.py                        |  14 ++-
 src/documents/tests/test_management.py        |  27 ++--
 src/documents/tests/test_sanity_check.py      | 119 +++++++++++++++---
 src/documents/tests/test_tasks.py             |  36 ++++--
 7 files changed, 212 insertions(+), 122 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index fcd14c59d..e5048a097 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,8 +10,10 @@ paperless-ng 1.1.2
 
 * Always show top left corner of thumbnails, even for extra wide documents.
 
-* Added a management command for executing the sanity checker directly. See :ref:`utilities-sanity-checker`.
-  
+* Added a management command for executing the sanity checker directly.
+  See :ref:`utilities-sanity-checker`.
+  The sanity checker will also report errors in the log files.
+
 * Fixed an issue with the metadata tab not reporting anything in case of missing files.
 
 * Reverted a change from 1.1.0 that caused huge memory usage due to redis caching.
diff --git a/src/documents/management/commands/document_sanity_checker.py b/src/documents/management/commands/document_sanity_checker.py
index b5982ed90..c04a5efef 100644
--- a/src/documents/management/commands/document_sanity_checker.py
+++ b/src/documents/management/commands/document_sanity_checker.py
@@ -1,8 +1,5 @@
-import logging
 from django.core.management.base import BaseCommand
-from documents.sanity_checker import check_sanity, SanityError, SanityWarning
-
-logger = logging.getLogger("paperless.management.sanity_checker")
+from documents.sanity_checker import check_sanity
 
 
 class Command(BaseCommand):
@@ -15,13 +12,4 @@ class Command(BaseCommand):
 
         messages = check_sanity(progress=True)
 
-        if len(messages) == 0:
-            logger.info("No issues found.")
-        else:
-            for msg in messages:
-                if type(msg) == SanityError:
-                    logger.error(str(msg))
-                elif type(msg) == SanityWarning:
-                    logger.warning(str(msg))
-                else:
-                    logger.info((str(msg)))
+        messages.log_messages()
diff --git a/src/documents/sanity_checker.py b/src/documents/sanity_checker.py
index f42062154..2e1777841 100644
--- a/src/documents/sanity_checker.py
+++ b/src/documents/sanity_checker.py
@@ -1,4 +1,5 @@
 import hashlib
+import logging
 import os
 
 from django.conf import settings
@@ -7,40 +8,48 @@ from tqdm import tqdm
 from documents.models import Document
 
 
-class SanityMessage:
-    message = None
+class SanityCheckMessages:
+
+    def __init__(self):
+        self._messages = []
+
+    def error(self, message):
+        self._messages.append({"level": logging.ERROR, "message": message})
+
+    def warning(self, message):
+        self._messages.append({"level": logging.WARNING, "message": message})
+
+    def info(self, message):
+        self._messages.append({"level": logging.INFO, "message": message})
+
+    def log_messages(self):
+        logger = logging.getLogger("paperless.sanity_checker")
+
+        if len(self._messages) == 0:
+            logger.info("Sanity checker detected no issues.")
+        else:
+            for msg in self._messages:
+                logger.log(msg['level'], msg['message'])
+
+    def __len__(self):
+        return len(self._messages)
+
+    def __getitem__(self, item):
+        return self._messages[item]
+
+    def has_error(self):
+        return any([msg['level'] == logging.ERROR for msg in self._messages])
+
+    def has_warning(self):
+        return any([msg['level'] == logging.WARNING for msg in self._messages])
 
 
-class SanityWarning(SanityMessage):
-    def __init__(self, message):
-        self.message = message
-
-    def __str__(self):
-        return f"Warning: {self.message}"
-
-
-class SanityError(SanityMessage):
-    def __init__(self, message):
-        self.message = message
-
-    def __str__(self):
-        return f"ERROR: {self.message}"
-
-
-class SanityFailedError(Exception):
-
-    def __init__(self, messages):
-        self.messages = messages
-
-    def __str__(self):
-        message_string = "\n".join([str(m) for m in self.messages])
-        return (
-            f"The following issuse were found by the sanity checker:\n"
-            f"{message_string}\n\n===============\n\n")
+class SanityCheckFailedException(Exception):
+    pass
 
 
 def check_sanity(progress=False):
-    messages = []
+    messages = SanityCheckMessages()
 
     present_files = []
     for root, subdirs, files in os.walk(settings.MEDIA_ROOT):
@@ -59,8 +68,7 @@ def check_sanity(progress=False):
     for doc in docs:
         # Check sanity of the thumbnail
         if not os.path.isfile(doc.thumbnail_path):
-            messages.append(SanityError(
-                f"Thumbnail of document {doc.pk} does not exist."))
+            messages.error(f"Thumbnail of document {doc.pk} does not exist.")
         else:
             if os.path.normpath(doc.thumbnail_path) in present_files:
                 present_files.remove(os.path.normpath(doc.thumbnail_path))
@@ -68,15 +76,14 @@ def check_sanity(progress=False):
                 with doc.thumbnail_file as f:
                     f.read()
             except OSError as e:
-                messages.append(SanityError(
+                messages.error(
                     f"Cannot read thumbnail file of document {doc.pk}: {e}"
-                ))
+                )
 
         # Check sanity of the original file
         # TODO: extract method
         if not os.path.isfile(doc.source_path):
-            messages.append(SanityError(
-                f"Original of document {doc.pk} does not exist."))
+            messages.error(f"Original of document {doc.pk} does not exist.")
         else:
             if os.path.normpath(doc.source_path) in present_files:
                 present_files.remove(os.path.normpath(doc.source_path))
@@ -84,31 +91,31 @@ def check_sanity(progress=False):
                 with doc.source_file as f:
                     checksum = hashlib.md5(f.read()).hexdigest()
             except OSError as e:
-                messages.append(SanityError(
-                    f"Cannot read original file of document {doc.pk}: {e}"))
+                messages.error(
+                    f"Cannot read original file of document {doc.pk}: {e}")
             else:
                 if not checksum == doc.checksum:
-                    messages.append(SanityError(
+                    messages.error(
                         f"Checksum mismatch of document {doc.pk}. "
                         f"Stored: {doc.checksum}, actual: {checksum}."
-                    ))
+                    )
 
         # Check sanity of the archive file.
         if doc.archive_checksum and not doc.archive_filename:
-            messages.append(SanityError(
+            messages.error(
                 f"Document {doc.pk} has an archive file checksum, but no "
                 f"archive filename."
-            ))
+            )
         elif not doc.archive_checksum and doc.archive_filename:
-            messages.append(SanityError(
+            messages.error(
                 f"Document {doc.pk} has an archive file, but its checksum is "
                 f"missing."
-            ))
+            )
         elif doc.has_archive_version:
             if not os.path.isfile(doc.archive_path):
-                messages.append(SanityError(
+                messages.error(
                     f"Archived version of document {doc.pk} does not exist."
-                ))
+                )
             else:
                 if os.path.normpath(doc.archive_path) in present_files:
                     present_files.remove(os.path.normpath(doc.archive_path))
@@ -116,26 +123,23 @@ def check_sanity(progress=False):
                     with doc.archive_file as f:
                         checksum = hashlib.md5(f.read()).hexdigest()
                 except OSError as e:
-                    messages.append(SanityError(
+                    messages.error(
                         f"Cannot read archive file of document {doc.pk}: {e}"
-                    ))
+                    )
                 else:
                     if not checksum == doc.archive_checksum:
-                        messages.append(SanityError(
+                        messages.error(
                             f"Checksum mismatch of archived document "
                             f"{doc.pk}. "
-                            f"Stored: {doc.checksum}, actual: {checksum}."
-                        ))
+                            f"Stored: {doc.archive_checksum}, "
+                            f"actual: {checksum}."
+                        )
 
         # other document checks
         if not doc.content:
-            messages.append(SanityWarning(
-                f"Document {doc.pk} has no content."
-            ))
+            messages.info(f"Document {doc.pk} has no content.")
 
     for extra_file in present_files:
-        messages.append(SanityWarning(
-            f"Orphaned file in media dir: {extra_file}"
-        ))
+        messages.warning(f"Orphaned file in media dir: {extra_file}")
 
     return messages
diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index f74a3d420..ddfd2eac3 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -9,8 +9,7 @@ from documents import index, sanity_checker
 from documents.classifier import DocumentClassifier, load_classifier
 from documents.consumer import Consumer, ConsumerError
 from documents.models import Document, Tag, DocumentType, Correspondent
-from documents.sanity_checker import SanityFailedError
-
+from documents.sanity_checker import SanityCheckFailedException
 
 logger = logging.getLogger("paperless.tasks")
 
@@ -94,8 +93,15 @@ def consume_file(path,
 def sanity_check():
     messages = sanity_checker.check_sanity()
 
-    if len(messages) > 0:
-        raise SanityFailedError(messages)
+    messages.log_messages()
+
+    if messages.has_error():
+        raise SanityCheckFailedException(
+            "Sanity check failed with errors. See log.")
+    elif messages.has_warning():
+        return "Sanity check exited with warnings. See log."
+    elif len(messages) > 0:
+        return "Sanity check exited with infos. See log."
     else:
         return "No issues detected."
 
diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py
index 56710c6e5..40eaaf277 100644
--- a/src/documents/tests/test_management.py
+++ b/src/documents/tests/test_management.py
@@ -159,33 +159,20 @@ class TestCreateClassifier(TestCase):
 
 class TestSanityChecker(DirectoriesMixin, TestCase):
 
-    def test_no_errors(self):
+    def test_no_issues(self):
         with self.assertLogs() as capture:
             call_command("document_sanity_checker")
 
         self.assertEqual(len(capture.output), 1)
-        self.assertIn("No issues found.", capture.output[0])
+        self.assertIn("Sanity checker detected no issues.", capture.output[0])
 
-    @mock.patch("documents.management.commands.document_sanity_checker.logger.warning")
-    @mock.patch("documents.management.commands.document_sanity_checker.logger.error")
-    def test_warnings(self, error, warning):
-        doc = Document.objects.create(title="test", filename="test.pdf", checksum="d41d8cd98f00b204e9800998ecf8427e")
-        Path(doc.source_path).touch()
-        Path(doc.thumbnail_path).touch()
-
-        call_command("document_sanity_checker")
-
-        error.assert_not_called()
-        warning.assert_called()
-
-    @mock.patch("documents.management.commands.document_sanity_checker.logger.warning")
-    @mock.patch("documents.management.commands.document_sanity_checker.logger.error")
-    def test_errors(self, error, warning):
+    def test_errors(self):
         doc = Document.objects.create(title="test", content="test", filename="test.pdf", checksum="abc")
         Path(doc.source_path).touch()
         Path(doc.thumbnail_path).touch()
 
-        call_command("document_sanity_checker")
+        with self.assertLogs() as capture:
+            call_command("document_sanity_checker")
 
-        warning.assert_not_called()
-        error.assert_called()
+        self.assertEqual(len(capture.output), 1)
+        self.assertIn("Checksum mismatch of document", capture.output[0])
diff --git a/src/documents/tests/test_sanity_check.py b/src/documents/tests/test_sanity_check.py
index fae18aaca..6f73e4962 100644
--- a/src/documents/tests/test_sanity_check.py
+++ b/src/documents/tests/test_sanity_check.py
@@ -1,3 +1,4 @@
+import logging
 import os
 import shutil
 from pathlib import Path
@@ -7,10 +8,59 @@ from django.conf import settings
 from django.test import TestCase
 
 from documents.models import Document
-from documents.sanity_checker import check_sanity, SanityFailedError
+from documents.sanity_checker import check_sanity, SanityCheckMessages
 from documents.tests.utils import DirectoriesMixin
 
 
+class TestSanityCheckMessages(TestCase):
+
+    def test_no_messages(self):
+        messages = SanityCheckMessages()
+        self.assertEqual(len(messages), 0)
+        self.assertFalse(messages.has_error())
+        self.assertFalse(messages.has_warning())
+        with self.assertLogs() as capture:
+            messages.log_messages()
+            self.assertEqual(len(capture.output), 1)
+            self.assertEqual(capture.records[0].levelno, logging.INFO)
+            self.assertEqual(capture.records[0].message, "Sanity checker detected no issues.")
+
+    def test_info(self):
+        messages = SanityCheckMessages()
+        messages.info("Something might be wrong")
+        self.assertEqual(len(messages), 1)
+        self.assertFalse(messages.has_error())
+        self.assertFalse(messages.has_warning())
+        with self.assertLogs() as capture:
+            messages.log_messages()
+            self.assertEqual(len(capture.output), 1)
+            self.assertEqual(capture.records[0].levelno, logging.INFO)
+            self.assertEqual(capture.records[0].message, "Something might be wrong")
+
+    def test_warning(self):
+        messages = SanityCheckMessages()
+        messages.warning("Something is wrong")
+        self.assertEqual(len(messages), 1)
+        self.assertFalse(messages.has_error())
+        self.assertTrue(messages.has_warning())
+        with self.assertLogs() as capture:
+            messages.log_messages()
+            self.assertEqual(len(capture.output), 1)
+            self.assertEqual(capture.records[0].levelno, logging.WARNING)
+            self.assertEqual(capture.records[0].message, "Something is wrong")
+
+    def test_error(self):
+        messages = SanityCheckMessages()
+        messages.error("Something is seriously wrong")
+        self.assertEqual(len(messages), 1)
+        self.assertTrue(messages.has_error())
+        self.assertFalse(messages.has_warning())
+        with self.assertLogs() as capture:
+            messages.log_messages()
+            self.assertEqual(len(capture.output), 1)
+            self.assertEqual(capture.records[0].levelno, logging.ERROR)
+            self.assertEqual(capture.records[0].message, "Something is seriously wrong")
+
 class TestSanityCheck(DirectoriesMixin, TestCase):
 
     def make_test_data(self):
@@ -33,72 +83,105 @@ class TestSanityCheck(DirectoriesMixin, TestCase):
     def test_no_thumbnail(self):
         doc = self.make_test_data()
         os.remove(doc.thumbnail_path)
-        self.assertEqual(len(check_sanity()), 1)
+        messages = check_sanity()
+        self.assertTrue(messages.has_error())
+        self.assertEqual(len(messages), 1)
+        self.assertRegex(messages[0]['message'], "Thumbnail of document .* does not exist")
 
     def test_thumbnail_no_access(self):
         doc = self.make_test_data()
         os.chmod(doc.thumbnail_path, 0o000)
-        self.assertEqual(len(check_sanity()), 1)
+        messages = check_sanity()
+        self.assertTrue(messages.has_error())
+        self.assertEqual(len(messages), 1)
+        self.assertRegex(messages[0]['message'], "Cannot read thumbnail file of document")
         os.chmod(doc.thumbnail_path, 0o777)
 
     def test_no_original(self):
         doc = self.make_test_data()
         os.remove(doc.source_path)
-        self.assertEqual(len(check_sanity()), 1)
+        messages = check_sanity()
+        self.assertTrue(messages.has_error())
+        self.assertEqual(len(messages), 1)
+        self.assertRegex(messages[0]['message'], "Original of document .* does not exist.")
 
     def test_original_no_access(self):
         doc = self.make_test_data()
         os.chmod(doc.source_path, 0o000)
-        self.assertEqual(len(check_sanity()), 1)
+        messages = check_sanity()
+        self.assertTrue(messages.has_error())
+        self.assertEqual(len(messages), 1)
+        self.assertRegex(messages[0]['message'], "Cannot read original file of document")
         os.chmod(doc.source_path, 0o777)
 
     def test_original_checksum_mismatch(self):
         doc = self.make_test_data()
         doc.checksum = "WOW"
         doc.save()
-        self.assertEqual(len(check_sanity()), 1)
+        messages = check_sanity()
+        self.assertTrue(messages.has_error())
+        self.assertEqual(len(messages), 1)
+        self.assertRegex(messages[0]['message'], "Checksum mismatch of document")
 
     def test_no_archive(self):
         doc = self.make_test_data()
         os.remove(doc.archive_path)
-        self.assertEqual(len(check_sanity()), 1)
+        messages = check_sanity()
+        self.assertTrue(messages.has_error())
+        self.assertEqual(len(messages), 1)
+        self.assertRegex(messages[0]['message'], "Archived version of document .* does not exist.")
 
     def test_archive_no_access(self):
         doc = self.make_test_data()
         os.chmod(doc.archive_path, 0o000)
-        self.assertEqual(len(check_sanity()), 1)
+        messages = check_sanity()
+        self.assertTrue(messages.has_error())
+        self.assertEqual(len(messages), 1)
+        self.assertRegex(messages[0]['message'], "Cannot read archive file of document")
         os.chmod(doc.archive_path, 0o777)
 
     def test_archive_checksum_mismatch(self):
         doc = self.make_test_data()
         doc.archive_checksum = "WOW"
         doc.save()
-        self.assertEqual(len(check_sanity()), 1)
+        messages = check_sanity()
+        self.assertTrue(messages.has_error())
+        self.assertEqual(len(messages), 1)
+        self.assertRegex(messages[0]['message'], "Checksum mismatch of archived document")
 
     def test_empty_content(self):
         doc = self.make_test_data()
         doc.content = ""
         doc.save()
-        self.assertEqual(len(check_sanity()), 1)
+        messages = check_sanity()
+        self.assertFalse(messages.has_error())
+        self.assertFalse(messages.has_warning())
+        self.assertEqual(len(messages), 1)
+        self.assertRegex(messages[0]['message'], "Document .* has no content.")
 
     def test_orphaned_file(self):
         doc = self.make_test_data()
         Path(self.dirs.originals_dir, "orphaned").touch()
-        self.assertEqual(len(check_sanity()), 1)
-
-    def test_error_tostring(self):
-        Document.objects.create(title="test", checksum="dgfhj", archive_checksum="dfhg", content="", pk=1, filename="0000001.pdf", archive_filename="0000001.pdf")
-        string = str(SanityFailedError(check_sanity()))
-        self.assertIsNotNone(string)
+        messages = check_sanity()
+        self.assertFalse(messages.has_error())
+        self.assertTrue(messages.has_warning())
+        self.assertEqual(len(messages), 1)
+        self.assertRegex(messages[0]['message'], "Orphaned file in media dir")
 
     def test_archive_filename_no_checksum(self):
         doc = self.make_test_data()
         doc.archive_checksum = None
         doc.save()
-        self.assertEqual(len(check_sanity()), 2)
+        messages = check_sanity()
+        self.assertTrue(messages.has_error())
+        self.assertEqual(len(messages), 2)
+        self.assertRegex(messages[0]['message'], "has an archive file, but its checksum is missing.")
 
     def test_archive_checksum_no_filename(self):
         doc = self.make_test_data()
         doc.archive_filename = None
         doc.save()
-        self.assertEqual(len(check_sanity()), 2)
+        messages = check_sanity()
+        self.assertTrue(messages.has_error())
+        self.assertEqual(len(messages), 2)
+        self.assertRegex(messages[0]['message'], "has an archive file checksum, but no archive filename.")
diff --git a/src/documents/tests/test_tasks.py b/src/documents/tests/test_tasks.py
index 8c5a1b5df..dab8ebfb9 100644
--- a/src/documents/tests/test_tasks.py
+++ b/src/documents/tests/test_tasks.py
@@ -2,12 +2,12 @@ import os
 from unittest import mock
 
 from django.conf import settings
-from django.test import TestCase, override_settings
+from django.test import TestCase
 from django.utils import timezone
 
 from documents import tasks
 from documents.models import Document, Tag, Correspondent, DocumentType
-from documents.sanity_checker import SanityError, SanityFailedError
+from documents.sanity_checker import SanityCheckMessages, SanityCheckFailedException
 from documents.tests.utils import DirectoriesMixin
 
 
@@ -74,13 +74,33 @@ class TestTasks(DirectoriesMixin, TestCase):
         self.assertNotEqual(mtime2, mtime3)
 
     @mock.patch("documents.tasks.sanity_checker.check_sanity")
-    def test_sanity_check(self, m):
-        m.return_value = []
-        tasks.sanity_check()
+    def test_sanity_check_success(self, m):
+        m.return_value = SanityCheckMessages()
+        self.assertEqual(tasks.sanity_check(), "No issues detected.")
         m.assert_called_once()
-        m.reset_mock()
-        m.return_value = [SanityError("")]
-        self.assertRaises(SanityFailedError, tasks.sanity_check)
+
+    @mock.patch("documents.tasks.sanity_checker.check_sanity")
+    def test_sanity_check_error(self, m):
+        messages = SanityCheckMessages()
+        messages.error("Some error")
+        m.return_value = messages
+        self.assertRaises(SanityCheckFailedException, tasks.sanity_check)
+        m.assert_called_once()
+
+    @mock.patch("documents.tasks.sanity_checker.check_sanity")
+    def test_sanity_check_warning(self, m):
+        messages = SanityCheckMessages()
+        messages.warning("Some warning")
+        m.return_value = messages
+        self.assertEqual(tasks.sanity_check(), "Sanity check exited with warnings. See log.")
+        m.assert_called_once()
+
+    @mock.patch("documents.tasks.sanity_checker.check_sanity")
+    def test_sanity_check_info(self, m):
+        messages = SanityCheckMessages()
+        messages.info("Some info")
+        m.return_value = messages
+        self.assertEqual(tasks.sanity_check(), "Sanity check exited with infos. See log.")
         m.assert_called_once()
 
     def test_bulk_update_documents(self):

From 5e669534f2301e3467f1a954c946a68b48a5cd96 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Sun, 14 Feb 2021 17:24:31 +0100
Subject: [PATCH 1197/1300] reorganized test case

---
 docs/changelog.rst                       |  3 +-
 src/documents/tests/test_sanity_check.py | 55 +++++++-----------------
 2 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e5048a097..f51360258 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,7 +12,8 @@ paperless-ng 1.1.2
 
 * Added a management command for executing the sanity checker directly.
   See :ref:`utilities-sanity-checker`.
-  The sanity checker will also report errors in the log files.
+
+* The weekly sanity check now reports messages in the log files.
 
 * Fixed an issue with the metadata tab not reporting anything in case of missing files.
 
diff --git a/src/documents/tests/test_sanity_check.py b/src/documents/tests/test_sanity_check.py
index 6f73e4962..b07ba930a 100644
--- a/src/documents/tests/test_sanity_check.py
+++ b/src/documents/tests/test_sanity_check.py
@@ -73,6 +73,11 @@ class TestSanityCheck(DirectoriesMixin, TestCase):
 
         return Document.objects.create(title="test", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", content="test", pk=1, filename="0000001.pdf", mime_type="application/pdf", archive_filename="0000001.pdf")
 
+    def assertSanityError(self, messageRegex):
+        messages = check_sanity()
+        self.assertTrue(messages.has_error())
+        self.assertRegex(messages[0]['message'], messageRegex)
+
     def test_no_docs(self):
         self.assertEqual(len(check_sanity()), 0)
 
@@ -83,71 +88,47 @@ class TestSanityCheck(DirectoriesMixin, TestCase):
     def test_no_thumbnail(self):
         doc = self.make_test_data()
         os.remove(doc.thumbnail_path)
-        messages = check_sanity()
-        self.assertTrue(messages.has_error())
-        self.assertEqual(len(messages), 1)
-        self.assertRegex(messages[0]['message'], "Thumbnail of document .* does not exist")
+        self.assertSanityError("Thumbnail of document .* does not exist")
 
     def test_thumbnail_no_access(self):
         doc = self.make_test_data()
         os.chmod(doc.thumbnail_path, 0o000)
-        messages = check_sanity()
-        self.assertTrue(messages.has_error())
-        self.assertEqual(len(messages), 1)
-        self.assertRegex(messages[0]['message'], "Cannot read thumbnail file of document")
+        self.assertSanityError("Cannot read thumbnail file of document")
         os.chmod(doc.thumbnail_path, 0o777)
 
     def test_no_original(self):
         doc = self.make_test_data()
         os.remove(doc.source_path)
-        messages = check_sanity()
-        self.assertTrue(messages.has_error())
-        self.assertEqual(len(messages), 1)
-        self.assertRegex(messages[0]['message'], "Original of document .* does not exist.")
+        self.assertSanityError("Original of document .* does not exist.")
 
     def test_original_no_access(self):
         doc = self.make_test_data()
         os.chmod(doc.source_path, 0o000)
-        messages = check_sanity()
-        self.assertTrue(messages.has_error())
-        self.assertEqual(len(messages), 1)
-        self.assertRegex(messages[0]['message'], "Cannot read original file of document")
+        self.assertSanityError("Cannot read original file of document")
         os.chmod(doc.source_path, 0o777)
 
     def test_original_checksum_mismatch(self):
         doc = self.make_test_data()
         doc.checksum = "WOW"
         doc.save()
-        messages = check_sanity()
-        self.assertTrue(messages.has_error())
-        self.assertEqual(len(messages), 1)
-        self.assertRegex(messages[0]['message'], "Checksum mismatch of document")
+        self.assertSanityError("Checksum mismatch of document")
 
     def test_no_archive(self):
         doc = self.make_test_data()
         os.remove(doc.archive_path)
-        messages = check_sanity()
-        self.assertTrue(messages.has_error())
-        self.assertEqual(len(messages), 1)
-        self.assertRegex(messages[0]['message'], "Archived version of document .* does not exist.")
+        self.assertSanityError("Archived version of document .* does not exist.")
 
     def test_archive_no_access(self):
         doc = self.make_test_data()
         os.chmod(doc.archive_path, 0o000)
-        messages = check_sanity()
-        self.assertTrue(messages.has_error())
-        self.assertEqual(len(messages), 1)
-        self.assertRegex(messages[0]['message'], "Cannot read archive file of document")
+        self.assertSanityError("Cannot read archive file of document")
         os.chmod(doc.archive_path, 0o777)
 
     def test_archive_checksum_mismatch(self):
         doc = self.make_test_data()
         doc.archive_checksum = "WOW"
         doc.save()
-        messages = check_sanity()
-        self.assertTrue(messages.has_error())
-        self.assertEqual(len(messages), 1)
-        self.assertRegex(messages[0]['message'], "Checksum mismatch of archived document")
+        self.assertSanityError("Checksum mismatch of archived document")
 
     def test_empty_content(self):
         doc = self.make_test_data()
@@ -172,16 +153,10 @@ class TestSanityCheck(DirectoriesMixin, TestCase):
         doc = self.make_test_data()
         doc.archive_checksum = None
         doc.save()
-        messages = check_sanity()
-        self.assertTrue(messages.has_error())
-        self.assertEqual(len(messages), 2)
-        self.assertRegex(messages[0]['message'], "has an archive file, but its checksum is missing.")
+        self.assertSanityError("has an archive file, but its checksum is missing.")
 
     def test_archive_checksum_no_filename(self):
         doc = self.make_test_data()
         doc.archive_filename = None
         doc.save()
-        messages = check_sanity()
-        self.assertTrue(messages.has_error())
-        self.assertEqual(len(messages), 2)
-        self.assertRegex(messages[0]['message'], "has an archive file checksum, but no archive filename.")
+        self.assertSanityError("has an archive file checksum, but no archive filename.")

From 7e88085377ec68edced2ce528eb0b347059abab6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 15 Feb 2021 11:25:25 +0100
Subject: [PATCH 1198/1300] load sklearn modules only when training data has
 changed

---
 src/documents/classifier.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/documents/classifier.py b/src/documents/classifier.py
index b577997e3..47dd7dfc7 100755
--- a/src/documents/classifier.py
+++ b/src/documents/classifier.py
@@ -95,9 +95,6 @@ class DocumentClassifier(object):
             pickle.dump(self.document_type_classifier, f)
 
     def train(self):
-        from sklearn.feature_extraction.text import CountVectorizer
-        from sklearn.neural_network import MLPClassifier
-        from sklearn.preprocessing import MultiLabelBinarizer, LabelBinarizer
 
         data = list()
         labels_tags = list()
@@ -162,6 +159,10 @@ class DocumentClassifier(object):
             )
         )
 
+        from sklearn.feature_extraction.text import CountVectorizer
+        from sklearn.neural_network import MLPClassifier
+        from sklearn.preprocessing import MultiLabelBinarizer, LabelBinarizer
+
         # Step 2: vectorize data
         logger.debug("Vectorizing data...")
         self.data_vectorizer = CountVectorizer(

From c330cca2c9cdcd4328415504cfcee974b831e9cd Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 15 Feb 2021 11:26:13 +0100
Subject: [PATCH 1199/1300] remove unused imports

---
 src/documents/admin.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/documents/admin.py b/src/documents/admin.py
index f87ab1ec5..47e6c7f89 100755
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -1,10 +1,8 @@
 from django.contrib import admin
-from django.utils.html import format_html, format_html_join
-from django.utils.safestring import mark_safe
 from whoosh.writing import AsyncWriter
 
 from . import index
-from .models import Correspondent, Document, DocumentType, Log, Tag, \
+from .models import Correspondent, Document, DocumentType, Tag, \
     SavedView, SavedViewFilterRule
 
 

From 416101d557797517da202c405ca6b4b99f9e9955 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 15 Feb 2021 11:52:46 +0100
Subject: [PATCH 1200/1300] only import dateparser when required

---
 src/documents/parsers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index 1ed5deb3c..b2714f6a3 100644
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -6,7 +6,6 @@ import shutil
 import subprocess
 import tempfile
 
-import dateparser
 import magic
 from django.conf import settings
 from django.utils import timezone
@@ -200,6 +199,8 @@ def parse_date(filename, text):
         """
         Call dateparser.parse with a particular date ordering
         """
+        import dateparser
+
         return dateparser.parse(
             ds,
             settings={

From 56bd966c02a4347bf764215d33897583fd5d5111 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 15 Feb 2021 12:18:10 +0100
Subject: [PATCH 1201/1300] local import of ocrmypdf so that the webserver does
 not load that

---
 src/paperless_tesseract/parsers.py           | 10 ++++++----
 src/paperless_tesseract/tests/test_parser.py | 11 +++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 271a840df..78c335ac3 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -2,12 +2,8 @@ import json
 import os
 import re
 
-import ocrmypdf
-import pdftotext
-import pikepdf
 from PIL import Image
 from django.conf import settings
-from ocrmypdf import InputFileError, EncryptedPdfError
 
 from documents.parsers import DocumentParser, ParseError, \
     make_thumbnail_from_pdf
@@ -22,6 +18,8 @@ class RasterisedDocumentParser(DocumentParser):
     logging_name = "paperless.parsing.tesseract"
 
     def extract_metadata(self, document_path, mime_type):
+        import pikepdf
+
         namespace_pattern = re.compile(r"\{(.*)\}(.*)")
 
         result = []
@@ -91,6 +89,9 @@ class RasterisedDocumentParser(DocumentParser):
             return None
 
     def parse(self, document_path, mime_type, file_name=None):
+        import ocrmypdf
+        from ocrmypdf import InputFileError, EncryptedPdfError
+
         mode = settings.OCR_MODE
 
         text_original = get_text_from_pdf(document_path)
@@ -223,6 +224,7 @@ def strip_excess_whitespace(text):
 
 
 def get_text_from_pdf(pdf_file):
+    import pdftotext
 
     if not os.path.isfile(pdf_file):
         return None
diff --git a/src/paperless_tesseract/tests/test_parser.py b/src/paperless_tesseract/tests/test_parser.py
index 644587de0..4fd314667 100644
--- a/src/paperless_tesseract/tests/test_parser.py
+++ b/src/paperless_tesseract/tests/test_parser.py
@@ -164,17 +164,12 @@ class TestParser(DirectoriesMixin, TestCase):
 
         self.assertRaises(ParseError, f)
 
-    @mock.patch("paperless_tesseract.parsers.ocrmypdf.ocr")
-    def test_image_calc_a4_dpi(self, m):
+    def test_image_calc_a4_dpi(self):
         parser = RasterisedDocumentParser(None)
 
-        parser.parse(os.path.join(self.SAMPLE_FILES, "simple-no-dpi.png"), "image/png")
+        dpi = parser.calculate_a4_dpi(os.path.join(self.SAMPLE_FILES, "simple-no-dpi.png"))
 
-        m.assert_called_once()
-
-        args, kwargs = m.call_args
-
-        self.assertEqual(kwargs['image_dpi'], 62)
+        self.assertEqual(dpi, 62)
 
     @mock.patch("paperless_tesseract.parsers.RasterisedDocumentParser.calculate_a4_dpi")
     def test_image_dpi_fail(self, m):

From 8bf4241b1656a8f55a84362985ad7b56335e0839 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 15 Feb 2021 13:26:36 +0100
Subject: [PATCH 1202/1300] some search index optimizations

---
 src/documents/admin.py            | 10 ++++----
 src/documents/bulk_edit.py        |  7 +++---
 src/documents/index.py            | 22 +++++++++++++----
 src/documents/signals/handlers.py |  4 +++-
 src/documents/tests/test_admin.py | 40 +++++++++++++++++++++----------
 src/documents/views.py            | 22 ++++++++---------
 6 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/src/documents/admin.py b/src/documents/admin.py
index 47e6c7f89..aee45b49d 100755
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -1,7 +1,5 @@
 from django.contrib import admin
-from whoosh.writing import AsyncWriter
 
-from . import index
 from .models import Correspondent, Document, DocumentType, Tag, \
     SavedView, SavedViewFilterRule
 
@@ -84,17 +82,21 @@ class DocumentAdmin(admin.ModelAdmin):
     created_.short_description = "Created"
 
     def delete_queryset(self, request, queryset):
-        ix = index.open_index()
-        with AsyncWriter(ix) as writer:
+        from documents import index
+
+        with index.open_index_writer() as writer:
             for o in queryset:
                 index.remove_document(writer, o)
+
         super(DocumentAdmin, self).delete_queryset(request, queryset)
 
     def delete_model(self, request, obj):
+        from documents import index
         index.remove_document_from_index(obj)
         super(DocumentAdmin, self).delete_model(request, obj)
 
     def save_model(self, request, obj, form, change):
+        from documents import index
         index.add_or_update_document(obj)
         super(DocumentAdmin, self).save_model(request, obj, form, change)
 
diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index c0c80a795..7503eafc5 100644
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -2,9 +2,7 @@ import itertools
 
 from django.db.models import Q
 from django_q.tasks import async_task
-from whoosh.writing import AsyncWriter
 
-from documents import index
 from documents.models import Document, Correspondent, DocumentType
 
 
@@ -99,8 +97,9 @@ def modify_tags(doc_ids, add_tags, remove_tags):
 def delete(doc_ids):
     Document.objects.filter(id__in=doc_ids).delete()
 
-    ix = index.open_index()
-    with AsyncWriter(ix) as writer:
+    from documents import index
+
+    with index.open_index_writer() as writer:
         for id in doc_ids:
             index.remove_document_by_id(writer, id)
 
diff --git a/src/documents/index.py b/src/documents/index.py
index ea788f4b3..89e56e930 100644
--- a/src/documents/index.py
+++ b/src/documents/index.py
@@ -86,6 +86,22 @@ def open_index(recreate=False):
     return create_in(settings.INDEX_DIR, get_schema())
 
 
+@contextmanager
+def open_index_writer(ix=None, optimize=False):
+    if ix:
+        writer = AsyncWriter(ix)
+    else:
+        writer = AsyncWriter(open_index())
+
+    try:
+        yield writer
+    except Exception as e:
+        logger.exception(str(e))
+        writer.cancel()
+    finally:
+        writer.commit(optimize=optimize)
+
+
 def update_document(writer, doc):
     tags = ",".join([t.name for t in doc.tags.all()])
     writer.update_document(
@@ -110,14 +126,12 @@ def remove_document_by_id(writer, doc_id):
 
 
 def add_or_update_document(document):
-    ix = open_index()
-    with AsyncWriter(ix) as writer:
+    with open_index_writer() as writer:
         update_document(writer, document)
 
 
 def remove_document_from_index(document):
-    ix = open_index()
-    with AsyncWriter(ix) as writer:
+    with open_index_writer() as writer:
         remove_document(writer, document)
 
 
diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index eb981661c..ad63bf301 100755
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -11,7 +11,7 @@ from django.dispatch import receiver
 from django.utils import timezone
 from filelock import FileLock
 
-from .. import index, matching
+from .. import matching
 from ..file_handling import delete_empty_directories, \
     create_source_path_directory, \
     generate_unique_filename
@@ -305,4 +305,6 @@ def set_log_entry(sender, document=None, logging_group=None, **kwargs):
 
 
 def add_to_index(sender, document, **kwargs):
+    from documents import index
+
     index.add_or_update_document(document)
diff --git a/src/documents/tests/test_admin.py b/src/documents/tests/test_admin.py
index 840747d68..ce00a0698 100644
--- a/src/documents/tests/test_admin.py
+++ b/src/documents/tests/test_admin.py
@@ -4,6 +4,7 @@ from django.contrib.admin.sites import AdminSite
 from django.test import TestCase
 from django.utils import timezone
 
+from documents import index
 from documents.admin import DocumentAdmin
 from documents.models import Document
 from documents.tests.utils import DirectoriesMixin
@@ -11,37 +12,52 @@ from documents.tests.utils import DirectoriesMixin
 
 class TestDocumentAdmin(DirectoriesMixin, TestCase):
 
+    def get_document_from_index(self, doc):
+        ix = index.open_index()
+        with ix.searcher() as searcher:
+            return searcher.document(id=doc.id)
+
     def setUp(self) -> None:
         super(TestDocumentAdmin, self).setUp()
         self.doc_admin = DocumentAdmin(model=Document, admin_site=AdminSite())
 
-    @mock.patch("documents.admin.index.add_or_update_document")
-    def test_save_model(self, m):
+    def test_save_model(self):
         doc = Document.objects.create(title="test")
+
         doc.title = "new title"
         self.doc_admin.save_model(None, doc, None, None)
         self.assertEqual(Document.objects.get(id=doc.id).title, "new title")
-        m.assert_called_once()
+        self.assertEqual(self.get_document_from_index(doc)['title'], "new title")
 
-    @mock.patch("documents.admin.index.remove_document")
-    def test_delete_model(self, m):
+    def test_delete_model(self):
         doc = Document.objects.create(title="test")
-        self.doc_admin.delete_model(None, doc)
-        self.assertRaises(Document.DoesNotExist, Document.objects.get, id=doc.id)
-        m.assert_called_once()
+        index.add_or_update_document(doc)
+        self.assertIsNotNone(self.get_document_from_index(doc))
 
-    @mock.patch("documents.admin.index.remove_document")
-    def test_delete_queryset(self, m):
+        self.doc_admin.delete_model(None, doc)
+
+        self.assertRaises(Document.DoesNotExist, Document.objects.get, id=doc.id)
+        self.assertIsNone(self.get_document_from_index(doc))
+
+    def test_delete_queryset(self):
+        docs = []
         for i in range(42):
-            Document.objects.create(title="Many documents with the same title", checksum=f"{i:02}")
+            doc = Document.objects.create(title="Many documents with the same title", checksum=f"{i:02}")
+            docs.append(doc)
+            index.add_or_update_document(doc)
 
         self.assertEqual(Document.objects.count(), 42)
 
+        for doc in docs:
+            self.assertIsNotNone(self.get_document_from_index(doc))
+
         self.doc_admin.delete_queryset(None, Document.objects.all())
 
-        self.assertEqual(m.call_count, 42)
         self.assertEqual(Document.objects.count(), 0)
 
+        for doc in docs:
+            self.assertIsNone(self.get_document_from_index(doc))
+
     def test_created(self):
         doc = Document.objects.create(title="test", created=timezone.datetime(2020, 4, 12))
         self.assertEqual(self.doc_admin.created_(doc), "2020-04-12")
diff --git a/src/documents/views.py b/src/documents/views.py
index b2e5b4cd3..9d7b04508 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -32,7 +32,6 @@ from rest_framework.viewsets import (
     ViewSet
 )
 
-import documents.index as index
 from paperless.db import GnuPG
 from paperless.views import StandardPagination
 from .classifier import load_classifier
@@ -176,10 +175,12 @@ class DocumentViewSet(RetrieveModelMixin,
     def update(self, request, *args, **kwargs):
         response = super(DocumentViewSet, self).update(
             request, *args, **kwargs)
+        from documents import index
         index.add_or_update_document(self.get_object())
         return response
 
     def destroy(self, request, *args, **kwargs):
+        from documents import index
         index.remove_document_from_index(self.get_object())
         return super(DocumentViewSet, self).destroy(request, *args, **kwargs)
 
@@ -501,10 +502,6 @@ class SearchView(APIView):
 
     permission_classes = (IsAuthenticated,)
 
-    def __init__(self, *args, **kwargs):
-        super(SearchView, self).__init__(*args, **kwargs)
-        self.ix = index.open_index()
-
     def add_infos_to_hit(self, r):
         try:
             doc = Document.objects.get(id=r['id'])
@@ -525,6 +522,7 @@ class SearchView(APIView):
                 }
 
     def get(self, request, format=None):
+        from documents import index
 
         if 'query' in request.query_params:
             query = request.query_params['query']
@@ -554,8 +552,10 @@ class SearchView(APIView):
         if page < 1:
             page = 1
 
+        ix = index.open_index()
+
         try:
-            with index.query_page(self.ix, page, query, more_like_id, more_like_content) as (result_page, corrected_query):  # NOQA: E501
+            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,
@@ -570,10 +570,6 @@ class SearchAutoCompleteView(APIView):
 
     permission_classes = (IsAuthenticated,)
 
-    def __init__(self, *args, **kwargs):
-        super(SearchAutoCompleteView, self).__init__(*args, **kwargs)
-        self.ix = index.open_index()
-
     def get(self, request, format=None):
         if 'term' in request.query_params:
             term = request.query_params['term']
@@ -587,7 +583,11 @@ class SearchAutoCompleteView(APIView):
         else:
             limit = 10
 
-        return Response(index.autocomplete(self.ix, term, limit))
+        from documents import index
+
+        ix = index.open_index()
+
+        return Response(index.autocomplete(ix, term, limit))
 
 
 class StatisticsView(APIView):

From 2fcf4842299afa54f46257866554fe10f63b2818 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 15 Feb 2021 14:52:47 +0100
Subject: [PATCH 1203/1300] bugfix dismissing wrong status messages

---
 src-ui/src/app/services/consumer-status.service.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index 23df0871f..e03282175 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -169,7 +169,12 @@ export class ConsumerStatusService {
   }
 
   dismiss(status: FileStatus) {
-    let index = this.consumerStatus.findIndex(s => s.filename == status.filename)
+    let index
+    if (status.taskId != null) {
+      index = this.consumerStatus.findIndex(s => s.taskId == status.taskId)
+    } else {
+      index = this.consumerStatus.findIndex(s => s.filename == status.filename)
+    }
 
     if (index > -1) {
       this.consumerStatus.splice(index, 1)

From f07a6b45869431cae3730b7caf5cbc87acc0cfc5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 15 Feb 2021 16:27:35 +0100
Subject: [PATCH 1204/1300] PAPERLESS_WEBSERVER_WORKERS option

---
 docs/changelog.rst     |  8 ++++++
 docs/configuration.rst | 62 ++++++++++++++++++++++++++++++++++++++++++
 docs/setup.rst         |  5 +++-
 gunicorn.conf.py       |  4 ++-
 4 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f51360258..1b3434117 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,14 @@
 Changelog
 *********
 
+paperless-ng 1.1.3
+##################
+
+* Added a docker-specific configuration option to adjust the number of
+  worker processes of the web server. See :ref:`configuration-docker`.
+
+* Some more memory usage optimizations.
+
 paperless-ng 1.1.2
 ##################
 
diff --git a/docs/configuration.rst b/docs/configuration.rst
index a307cc25a..95914e836 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -555,3 +555,65 @@ PAPERLESS_GS_BINARY=<path>
 
 PAPERLESS_OPTIPNG_BINARY=<path>
     Defaults to "/usr/bin/optipng".
+
+
+.. _configuration-docker:
+
+Docker-specific options
+#######################
+
+These options don't have any effect in ``paperless.conf``. These options adjust
+the behavior of the docker container. Configure these in `docker-compose.env`.
+
+PAPERLESS_WEBSERVER_WORKERS=<num>
+    The number of worker processes the webserver should spawn. More worker processes
+    usually result in the front end to load data much quicker. However, each worker process
+    also loads the entire application into memory separately, so increasing this value
+    will increase RAM usage.
+
+    Consider configuring this to 1 on low power devices with limited amount of RAM.
+
+    Defaults to 2.
+
+USERMAP_UID=<uid>
+    The ID of the paperless user in the container. Set this to your actual user ID on the
+    host system, which you can get by executing
+
+    .. code:: shell-session
+
+        $ id -u
+    
+    Paperless will change ownership on its folders to this user, so you need to get this right
+    in order to be able to write to the consumption directory.
+    
+    Defaults to 1000.
+
+USERMAP_GID=<gid>
+    The ID of the paperless Group in the container. Set this to your actual group ID on the
+    host system, which you can get by executing
+
+    .. code:: shell-session
+
+        $ id -g
+    
+    Paperless will change ownership on its folders to this group, so you need to get this right
+    in order to be able to write to the consumption directory.
+    
+    Defaults to 1000.
+
+PAPERLESS_OCR_LANGUAGES=<list>
+    Additional OCR languages to install. By default, paperless comes with
+    English, German, Italian, Spanish and French. If your language is not in this list, install
+    additional languages with this configuration option:
+
+    .. code:: bash
+
+        PAPERLESS_OCR_LANGUAGES=tur ces
+
+    To actually use these languages, also set the default OCR language of paperless:
+
+    .. code:: bash
+
+        PAPERLESS_OCR_LANGUAGE=tur
+
+    Defaults to none, which does not install any additional languages.
diff --git a/docs/setup.rst b/docs/setup.rst
index 4025b6721..8ebb6f83c 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -763,7 +763,8 @@ configuring some options in paperless can help improve performance immensely:
 
 *   Stick with SQLite to save some resources.
 *   Consider setting ``PAPERLESS_OCR_PAGES`` to 1, so that paperless will only OCR
-    the first page of your documents.
+    the first page of your documents. In most cases, this page contains enough
+    information to be able to find it.
 *   ``PAPERLESS_TASK_WORKERS`` and ``PAPERLESS_THREADS_PER_WORKER`` are configured
     to use all cores. The Raspberry Pi models 3 and up have 4 cores, meaning that
     paperless will use 2 workers and 2 threads per worker. This may result in
@@ -776,6 +777,8 @@ configuring some options in paperless can help improve performance immensely:
     file generation for already ocr'ed documents entirely.
 *   Set ``PAPERLESS_OPTIMIZE_THUMBNAILS`` to 'false' if you want faster consumption
     times. Thumbnails will be about 20% larger.
+*   If using docker, consider setting ``PAPERLESS_WEBSERVER_WORKERS`` to
+    1. This will save some memory.
 
 For details, refer to :ref:`configuration`.
 
diff --git a/gunicorn.conf.py b/gunicorn.conf.py
index 6fcbe6b0e..995b4fb9d 100644
--- a/gunicorn.conf.py
+++ b/gunicorn.conf.py
@@ -1,5 +1,7 @@
+import os
+
 bind = '0.0.0.0:8000'
-workers = 2
+workers = int(os.getenv("PAPERLESS_WEBSERVER_WORKERS", 2))
 worker_class = 'uvicorn.workers.UvicornWorker'
 timeout = 120
 

From 43fdf634f26703525f1ab77a2082cc972bc287f1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 15 Feb 2021 16:37:44 +0100
Subject: [PATCH 1205/1300] added a note regarding python 3.6

---
 docs/changelog.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1b3434117..978a2e966 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,16 @@ paperless-ng 1.1.3
 
 * Some more memory usage optimizations.
 
+.. note::
+
+  Many packages that paperless depends on are slowly dropping Python 3.6
+  support one after another, including the web server.
+  
+  At some point, paperless will drop Python 3.6 support. If using a bare
+  metal installation upgrade to python 3.7 or newer if you're still on 3.6.
+
+  If using docker, this does not affect you.
+
 paperless-ng 1.1.2
 ##################
 

From 831db6ab878dc9cbe712faa959cae6b9765a0b52 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 15 Feb 2021 16:46:06 +0100
Subject: [PATCH 1206/1300] note regarding Python 3.6

---
 docs/changelog.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 978a2e966..fa1be64fd 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -15,11 +15,12 @@ paperless-ng 1.1.3
 
 .. note::
 
-  Many packages that paperless depends on are slowly dropping Python 3.6
-  support one after another, including the web server.
+  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 upgrade to python 3.7 or newer if you're still on 3.6.
+  metal installation and you're still on Python 3.6, upgrade to 3.7 or newer.
 
   If using docker, this does not affect you.
 

From 3f03d51b244c457912e4fbf0cbd6f859c85ab863 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 15 Feb 2021 16:52:45 +0100
Subject: [PATCH 1207/1300] version bump

---
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index e2c66690e..b2ffebc09 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,7 +2,7 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "1.1.2",
+  version: "1.1.3",
   webSocketHost: window.location.host,
   webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:")
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 728d237e2..08f427169 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (1, 1, 2)
+__version__ = (1, 1, 3)

From cb308fae7b8ae1ff2763c09a0ecf942acede99fc Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 15 Feb 2021 23:14:54 +0100
Subject: [PATCH 1208/1300] only show inbox statistics if inbox tags are
 defined

---
 .../statistics-widget.component.html                 |  4 ++--
 src/documents/tests/test_api.py                      |  7 +++++++
 src/documents/views.py                               | 12 +++++++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html
index 6ab996675..a29b50f78 100644
--- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html
@@ -1,6 +1,6 @@
 <app-widget-frame title="Statistics" i18n-title>
   <ng-container content>
-    <p class="card-text" i18n>Documents in inbox: {{statistics.documents_inbox}}</p>
-    <p class="card-text" i18n>Total documents: {{statistics.documents_total}}</p>
+    <p class="card-text" i18n *ngIf="statistics?.documents_inbox != null">Documents in inbox: {{statistics?.documents_inbox}}</p>
+    <p class="card-text" i18n>Total documents: {{statistics?.documents_total}}</p>
   </ng-container>
 </app-widget-frame>
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 20eba6628..01e7210a5 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -442,6 +442,13 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.data['documents_total'], 3)
         self.assertEqual(response.data['documents_inbox'], 1)
 
+    def test_statistics_no_inbox_tag(self):
+        Document.objects.create(title="none1", checksum="A")
+
+        response = self.client.get("/api/statistics/")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['documents_inbox'], None)
+
     @mock.patch("documents.views.async_task")
     def test_upload(self, m):
 
diff --git a/src/documents/views.py b/src/documents/views.py
index 9d7b04508..68d6e3c77 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -595,8 +595,14 @@ class StatisticsView(APIView):
     permission_classes = (IsAuthenticated,)
 
     def get(self, request, format=None):
-        return Response({
-            'documents_total': Document.objects.all().count(),
-            'documents_inbox': Document.objects.filter(
+        documents_total = Document.objects.all().count()
+        if Tag.objects.filter(is_inbox_tag=True).exists():
+            documents_inbox = Document.objects.filter(
                 tags__is_inbox_tag=True).distinct().count()
+        else:
+            documents_inbox = None
+
+        return Response({
+            'documents_total': documents_total,
+            'documents_inbox': documents_inbox,
         })

From 2c4e34dd0cc0e21478304a99e6344f1564fdd2ec Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Mon, 15 Feb 2021 23:44:48 +0100
Subject: [PATCH 1209/1300] changelog

---
 docs/changelog.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index fa1be64fd..8b87e642e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,12 +13,14 @@ paperless-ng 1.1.3
 
 * Some more memory usage optimizations.
 
+* Don't show inbox statistics if no inbox tag is defined.
+
 .. 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.
 

From 1e4ec7e29ef746febf958da7b0e2881b83dbbacf Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 16 Feb 2021 14:54:18 +0100
Subject: [PATCH 1210/1300] added en-GB language

---
 src-ui/angular.json                           |   3 +-
 src-ui/src/app/app.module.ts                  |   2 +
 .../manage/settings/settings.component.html   |   2 +-
 src-ui/src/app/services/settings.service.ts   |   1 +
 src-ui/src/locale/messages.en_GB.xlf          |   2 +-
 src/locale/en_GB/LC_MESSAGES/django.po        |   6 +-
 .../{en-us => en_US}/LC_MESSAGES/django.po    | 178 ++++++++++--------
 src/paperless/settings.py                     |   3 +-
 8 files changed, 107 insertions(+), 90 deletions(-)
 rename src/locale/{en-us => en_US}/LC_MESSAGES/django.po (81%)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index 829a482af..a26dd8713 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -18,7 +18,8 @@
 				"locales": {
 					"de": "src/locale/messages.de.xlf",
 					"nl-NL": "src/locale/messages.nl_NL.xlf",
-					"fr": "src/locale/messages.fr.xlf"
+					"fr": "src/locale/messages.fr.xlf",
+					"en-GB": "src/locale/messages.en_GB.xlf"
 				}
 			},
 			"architect": {
diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 49e937c0b..54c19a216 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -64,10 +64,12 @@ import { CustomDatePipe } from './pipes/custom-date.pipe';
 import localeFr from '@angular/common/locales/fr';
 import localeNl from '@angular/common/locales/nl';
 import localeDe from '@angular/common/locales/de';
+import localeEnGb from '@angular/common/locales/en-GB';
 
 registerLocaleData(localeFr)
 registerLocaleData(localeNl)
 registerLocaleData(localeDe)
+registerLocaleData(localeEnGb)
 
 @NgModule({
   declarations: [
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index affe2f0b0..aa7ea05d3 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -167,7 +167,7 @@
     </li>
   </ul>
 
-  <div [ngbNavOutlet]="nav" class="border-left border-right border-bottom p-3 mb-3 shadow"></div>
+  <div [ngbNavOutlet]="nav" class="border-left border-right border-bottom p-3 mb-3 shadow-sm"></div>
 
   <button type="submit" class="btn btn-primary" i18n>Save</button>
 </form>
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index f3e437ada..a145ae5a7 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -80,6 +80,7 @@ export class SettingsService {
   getLanguageOptions(): LanguageOption[] {
     return [
       {code: "en-US", name: $localize`English (US)`, englishName: "English (US)"},
+      {code: "en-GB", name: $localize`English (GB)`, englishName: "English (GB)"},
       {code: "de", name: $localize`German`, englishName: "German"},
       {code: "nl", name: $localize`Dutch`, englishName: "Dutch"},
       {code: "fr", name: $localize`French`, englishName: "French"}
diff --git a/src-ui/src/locale/messages.en_GB.xlf b/src-ui/src/locale/messages.en_GB.xlf
index 4df278c69..49baa77ed 100644
--- a/src-ui/src/locale/messages.en_GB.xlf
+++ b/src-ui/src/locale/messages.en_GB.xlf
@@ -515,7 +515,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
         <source>Color</source>
-        <target>Color</target>
+        <target>Colour</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
           <context context-type="linenumber">20</context>
diff --git a/src/locale/en_GB/LC_MESSAGES/django.po b/src/locale/en_GB/LC_MESSAGES/django.po
index 5f6901f7f..de13e5d34 100644
--- a/src/locale/en_GB/LC_MESSAGES/django.po
+++ b/src/locale/en_GB/LC_MESSAGES/django.po
@@ -2,10 +2,10 @@
 # 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 <xadium@gmail.com>, 2021
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -76,7 +76,7 @@ msgstr "correspondents"
 
 #: documents/models.py:98
 msgid "color"
-msgstr "color"
+msgstr "colour"
 
 #: documents/models.py:102
 msgid "is inbox tag"
diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po
similarity index 81%
rename from src/locale/en-us/LC_MESSAGES/django.po
rename to src/locale/en_US/LC_MESSAGES/django.po
index fdf3fd809..cb31bbc8c 100644
--- a/src/locale/en-us/LC_MESSAGES/django.po
+++ b/src/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-28 22:02+0100\n"
+"POT-Creation-Date: 2021-02-16 14:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,144 +21,144 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#: documents/models.py:33
+#: documents/models.py:32
 msgid "Any word"
 msgstr ""
 
-#: documents/models.py:34
+#: documents/models.py:33
 msgid "All words"
 msgstr ""
 
-#: documents/models.py:35
+#: documents/models.py:34
 msgid "Exact match"
 msgstr ""
 
-#: documents/models.py:36
+#: documents/models.py:35
 msgid "Regular expression"
 msgstr ""
 
-#: documents/models.py:37
+#: documents/models.py:36
 msgid "Fuzzy word"
 msgstr ""
 
-#: documents/models.py:38
+#: documents/models.py:37
 msgid "Automatic"
 msgstr ""
 
-#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
+#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25
 #: paperless_mail/models.py:109
 msgid "name"
 msgstr ""
 
-#: documents/models.py:46
+#: documents/models.py:45
 msgid "match"
 msgstr ""
 
-#: documents/models.py:50
+#: documents/models.py:49
 msgid "matching algorithm"
 msgstr ""
 
-#: documents/models.py:56
+#: documents/models.py:55
 msgid "is insensitive"
 msgstr ""
 
-#: documents/models.py:75 documents/models.py:135
+#: documents/models.py:74 documents/models.py:134
 msgid "correspondent"
 msgstr ""
 
-#: documents/models.py:76
+#: documents/models.py:75
 msgid "correspondents"
 msgstr ""
 
-#: documents/models.py:98
+#: documents/models.py:97
 msgid "color"
 msgstr ""
 
-#: documents/models.py:102
+#: documents/models.py:101
 msgid "is inbox tag"
 msgstr ""
 
-#: documents/models.py:104
+#: documents/models.py:103
 msgid ""
 "Marks this tag as an inbox tag: All newly consumed documents will be tagged "
 "with inbox tags."
 msgstr ""
 
-#: documents/models.py:109
+#: documents/models.py:108
 msgid "tag"
 msgstr ""
 
-#: documents/models.py:110 documents/models.py:166
+#: documents/models.py:109 documents/models.py:165
 msgid "tags"
 msgstr ""
 
-#: documents/models.py:116 documents/models.py:148
+#: documents/models.py:115 documents/models.py:147
 msgid "document type"
 msgstr ""
 
-#: documents/models.py:117
+#: documents/models.py:116
 msgid "document types"
 msgstr ""
 
-#: documents/models.py:125
+#: documents/models.py:124
 msgid "Unencrypted"
 msgstr ""
 
-#: documents/models.py:126
+#: documents/models.py:125
 msgid "Encrypted with GNU Privacy Guard"
 msgstr ""
 
-#: documents/models.py:139
+#: documents/models.py:138
 msgid "title"
 msgstr ""
 
-#: documents/models.py:152
+#: documents/models.py:151
 msgid "content"
 msgstr ""
 
-#: documents/models.py:154
+#: documents/models.py:153
 msgid ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
 msgstr ""
 
-#: documents/models.py:159
+#: documents/models.py:158
 msgid "mime type"
 msgstr ""
 
-#: documents/models.py:170
+#: documents/models.py:169
 msgid "checksum"
 msgstr ""
 
-#: documents/models.py:174
+#: documents/models.py:173
 msgid "The checksum of the original document."
 msgstr ""
 
-#: documents/models.py:178
+#: documents/models.py:177
 msgid "archive checksum"
 msgstr ""
 
-#: documents/models.py:183
+#: documents/models.py:182
 msgid "The checksum of the archived document."
 msgstr ""
 
-#: documents/models.py:187 documents/models.py:330
+#: documents/models.py:186 documents/models.py:342
 msgid "created"
 msgstr ""
 
-#: documents/models.py:191
+#: documents/models.py:190
 msgid "modified"
 msgstr ""
 
-#: documents/models.py:195
+#: documents/models.py:194
 msgid "storage type"
 msgstr ""
 
-#: documents/models.py:203
+#: documents/models.py:202
 msgid "added"
 msgstr ""
 
-#: documents/models.py:207
+#: documents/models.py:206
 msgid "filename"
 msgstr ""
 
@@ -167,178 +167,186 @@ msgid "Current filename in storage"
 msgstr ""
 
 #: documents/models.py:216
+msgid "archive filename"
+msgstr ""
+
+#: documents/models.py:222
+msgid "Current archive filename in storage"
+msgstr ""
+
+#: documents/models.py:226
 msgid "archive serial number"
 msgstr ""
 
-#: documents/models.py:221
+#: documents/models.py:231
 msgid "The position of this document in your physical document archive."
 msgstr ""
 
-#: documents/models.py:227
+#: documents/models.py:237
 msgid "document"
 msgstr ""
 
-#: documents/models.py:228
+#: documents/models.py:238
 msgid "documents"
 msgstr ""
 
-#: documents/models.py:313
+#: documents/models.py:325
 msgid "debug"
 msgstr ""
 
-#: documents/models.py:314
+#: documents/models.py:326
 msgid "information"
 msgstr ""
 
-#: documents/models.py:315
+#: documents/models.py:327
 msgid "warning"
 msgstr ""
 
-#: documents/models.py:316
+#: documents/models.py:328
 msgid "error"
 msgstr ""
 
-#: documents/models.py:317
+#: documents/models.py:329
 msgid "critical"
 msgstr ""
 
-#: documents/models.py:321
+#: documents/models.py:333
 msgid "group"
 msgstr ""
 
-#: documents/models.py:324
+#: documents/models.py:336
 msgid "message"
 msgstr ""
 
-#: documents/models.py:327
+#: documents/models.py:339
 msgid "level"
 msgstr ""
 
-#: documents/models.py:334
+#: documents/models.py:346
 msgid "log"
 msgstr ""
 
-#: documents/models.py:335
+#: documents/models.py:347
 msgid "logs"
 msgstr ""
 
-#: documents/models.py:346 documents/models.py:396
+#: documents/models.py:358 documents/models.py:408
 msgid "saved view"
 msgstr ""
 
-#: documents/models.py:347
+#: documents/models.py:359
 msgid "saved views"
 msgstr ""
 
-#: documents/models.py:350
+#: documents/models.py:362
 msgid "user"
 msgstr ""
 
-#: documents/models.py:356
+#: documents/models.py:368
 msgid "show on dashboard"
 msgstr ""
 
-#: documents/models.py:359
+#: documents/models.py:371
 msgid "show in sidebar"
 msgstr ""
 
-#: documents/models.py:363
+#: documents/models.py:375
 msgid "sort field"
 msgstr ""
 
-#: documents/models.py:366
+#: documents/models.py:378
 msgid "sort reverse"
 msgstr ""
 
-#: documents/models.py:372
+#: documents/models.py:384
 msgid "title contains"
 msgstr ""
 
-#: documents/models.py:373
+#: documents/models.py:385
 msgid "content contains"
 msgstr ""
 
-#: documents/models.py:374
+#: documents/models.py:386
 msgid "ASN is"
 msgstr ""
 
-#: documents/models.py:375
+#: documents/models.py:387
 msgid "correspondent is"
 msgstr ""
 
-#: documents/models.py:376
+#: documents/models.py:388
 msgid "document type is"
 msgstr ""
 
-#: documents/models.py:377
+#: documents/models.py:389
 msgid "is in inbox"
 msgstr ""
 
-#: documents/models.py:378
+#: documents/models.py:390
 msgid "has tag"
 msgstr ""
 
-#: documents/models.py:379
+#: documents/models.py:391
 msgid "has any tag"
 msgstr ""
 
-#: documents/models.py:380
+#: documents/models.py:392
 msgid "created before"
 msgstr ""
 
-#: documents/models.py:381
+#: documents/models.py:393
 msgid "created after"
 msgstr ""
 
-#: documents/models.py:382
+#: documents/models.py:394
 msgid "created year is"
 msgstr ""
 
-#: documents/models.py:383
+#: documents/models.py:395
 msgid "created month is"
 msgstr ""
 
-#: documents/models.py:384
+#: documents/models.py:396
 msgid "created day is"
 msgstr ""
 
-#: documents/models.py:385
+#: documents/models.py:397
 msgid "added before"
 msgstr ""
 
-#: documents/models.py:386
+#: documents/models.py:398
 msgid "added after"
 msgstr ""
 
-#: documents/models.py:387
+#: documents/models.py:399
 msgid "modified before"
 msgstr ""
 
-#: documents/models.py:388
+#: documents/models.py:400
 msgid "modified after"
 msgstr ""
 
-#: documents/models.py:389
+#: documents/models.py:401
 msgid "does not have tag"
 msgstr ""
 
-#: documents/models.py:400
+#: documents/models.py:412
 msgid "rule type"
 msgstr ""
 
-#: documents/models.py:404
+#: documents/models.py:416
 msgid "value"
 msgstr ""
 
-#: documents/models.py:410
+#: documents/models.py:422
 msgid "filter rule"
 msgstr ""
 
-#: documents/models.py:411
+#: documents/models.py:423
 msgid "filter rules"
 msgstr ""
 
-#: documents/serialisers.py:383
+#: documents/serialisers.py:370
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr ""
@@ -383,19 +391,23 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
-#: paperless/settings.py:286
-msgid "English"
+#: paperless/settings.py:291
+msgid "English (US)"
 msgstr ""
 
-#: paperless/settings.py:287
+#: paperless/settings.py:292
+msgid "English (GB)"
+msgstr ""
+
+#: paperless/settings.py:293
 msgid "German"
 msgstr ""
 
-#: paperless/settings.py:288
+#: paperless/settings.py:294
 msgid "Dutch"
 msgstr ""
 
-#: paperless/settings.py:289
+#: paperless/settings.py:295
 msgid "French"
 msgstr ""
 
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 8d14262d1..42ddec88d 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -288,7 +288,8 @@ if os.getenv("PAPERLESS_DBHOST"):
 LANGUAGE_CODE = 'en-us'
 
 LANGUAGES = [
-    ("en-us", _("English")),
+    ("en-us", _("English (US)")),
+    ("en-gb", _("English (GB)")),
     ("de", _("German")),
     ("nl-nl", _("Dutch")),
     ("fr", _("French"))

From 1c81d8801355e149b1b6631e93ea7107f66561ed Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 17 Feb 2021 12:15:22 +0100
Subject: [PATCH 1211/1300] add support for iso 8601 date display

---
 .../manage/settings/settings.component.html     |  2 +-
 .../manage/settings/settings.component.ts       |  7 +++++--
 src-ui/src/app/pipes/custom-date.pipe.ts        | 17 ++++++++++++++---
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index aa7ea05d3..3674bbcb9 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -34,7 +34,7 @@
           <div class="col">
 
             <select class="form-control" formControlName="dateLocale">
-              <option *ngFor="let lang of dateLocaleOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code"> - {{today | date:'shortDate':null:lang.code}}</span></option>
+              <option *ngFor="let lang of dateLocaleOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code"> - {{today | customDate:'shortDate':null:lang.code}}</span></option>
             </select>
 
           </div>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 47c7b8d7b..15cfb8a19 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -35,7 +35,7 @@ export class SettingsComponent implements OnInit {
   savedViews: PaperlessSavedView[]
 
   get computedDateLocale(): string {
-    return this.settingsForm.value.dateLocale || this.settingsForm.value.displayLanguage
+    return this.settingsForm.value.dateLocale || this.settingsForm.value.displayLanguage || this.currentLocale
   }
 
   constructor(
@@ -92,7 +92,10 @@ export class SettingsComponent implements OnInit {
   }
 
   get dateLocaleOptions(): LanguageOption[] {
-    return [{code: "", name: $localize`Use date format of display language`}].concat(this.settings.getLanguageOptions())
+    return [
+      {code: "", name: $localize`Use date format of display language`},
+      {code: "iso-8601", name: $localize`ISO 8601`}
+    ].concat(this.settings.getLanguageOptions())
   }
 
   get today() {
diff --git a/src-ui/src/app/pipes/custom-date.pipe.ts b/src-ui/src/app/pipes/custom-date.pipe.ts
index 19989fbdd..cf5a931cb 100644
--- a/src-ui/src/app/pipes/custom-date.pipe.ts
+++ b/src-ui/src/app/pipes/custom-date.pipe.ts
@@ -2,18 +2,29 @@ import { DatePipe } from '@angular/common';
 import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core';
 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"
+}
+
 @Pipe({
   name: 'customDate'
 })
 export class CustomDatePipe extends DatePipe implements PipeTransform {
 
   constructor(@Inject(LOCALE_ID) locale: string, private settings: SettingsService) {
-    super(settings.get(SETTINGS_KEYS.DATE_LOCALE) || locale)
-
+    super(locale)
   }
 
   transform(value: any, format?: string, timezone?: string, locale?: string): string | null {
-    return super.transform(value, format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT), timezone, locale)
+    let l = locale || this.settings.get(SETTINGS_KEYS.DATE_LOCALE)
+    let f = format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT)
+    if (l == "iso-8601") {
+      return super.transform(value, FORMAT_TO_ISO_FORMAT[f], timezone)
+    } else {
+      return super.transform(value, format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT), timezone, locale)
+    }
   }
 
 }

From a1162d6d5ab8caaf9cc8d7318c40e4cdc08c3e4f Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 17 Feb 2021 12:25:34 +0100
Subject: [PATCH 1212/1300] update requirements

---
 Pipfile.lock     | 18 +++++++++---------
 requirements.txt |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index fee6359da..f75949d20 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -591,11 +591,11 @@
         },
         "ocrmypdf": {
             "hashes": [
-                "sha256:a54634d017a2f44aa2115b0b6ae5aa41a7cec018f5c53d16ad3abec1e70b3db7",
-                "sha256:d0e2da48d4abd90f48f0937b2cd4ba57503b56c603f5e3aa91e20e3b21a036cd"
+                "sha256:0f624456a50be0b0bc8c0b59704d159f637616c093a1cabe8bb383706561bcf7",
+                "sha256:b829ad640a6160423162012e094ee2f7cd074ec99efadd7f7486954ec9182985"
             ],
             "index": "pypi",
-            "version": "==11.6.0"
+            "version": "==11.6.2"
         },
         "pathvalidate": {
             "hashes": [
@@ -841,11 +841,11 @@
         },
         "python-magic": {
             "hashes": [
-                "sha256:356efa93c8899047d1eb7d3eb91e871ba2f5b1376edbaf4cc305e3c872207355",
-                "sha256:b757db2a5289ea3f1ced9e60f072965243ea43a2221430048fd8cacab17be0ce"
+                "sha256:8551e804c09a3398790bd9e392acb26554ae2609f29c72abb0b9dee9a5571eae",
+                "sha256:ca884349f2c92ce830e3f498c5b7c7051fe2942c3ee4332f65213b8ebff15a62"
             ],
             "index": "pypi",
-            "version": "==0.4.18"
+            "version": "==0.4.22"
         },
         "pytz": {
             "hashes": [
@@ -1837,11 +1837,11 @@
         },
         "tox": {
             "hashes": [
-                "sha256:65d0e90ceb816638a50d64f4b47b11da767b284c0addda2294cb3cd69bd72425",
-                "sha256:cf7fef81a3a2434df4d7af2a6d1bf606d2970220addfbe7dea2615bd4bb2c252"
+                "sha256:89afa9c59c04beb55eda789c7a65feb1a70fde117f85f1bd1c27c66758456e60",
+                "sha256:ed1e650cf6368bcbc4a071eeeba363c480920e0ed8a9ad1793c7caaa5ad33d49"
             ],
             "index": "pypi",
-            "version": "==3.21.4"
+            "version": "==3.22.0"
         },
         "urllib3": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index 0a0ae75c0..7100ba953 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -53,7 +53,7 @@ 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'
 msgpack==1.0.2
 numpy==1.19.5
-ocrmypdf==11.6.0
+ocrmypdf==11.6.2
 pathvalidate==2.3.2
 pdfminer.six==20201018; python_version >= '3.4'
 pdftotext==2.1.5
@@ -71,7 +71,7 @@ python-dateutil==2.8.1
 python-dotenv==0.15.0
 python-gnupg==0.4.6
 python-levenshtein==0.12.2
-python-magic==0.4.18
+python-magic==0.4.22
 pytz==2021.1
 pyyaml==5.4.1
 redis==3.5.3

From 08a44cf468631c029c5469205f860adc89139e40 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 17 Feb 2021 12:31:19 +0100
Subject: [PATCH 1213/1300] changelog and version

---
 docs/changelog.rst                          | 19 +++++++++++++------
 src-ui/src/environments/environment.prod.ts |  2 +-
 src/paperless/version.py                    |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8b87e642e..ad45becab 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,15 +5,12 @@
 Changelog
 *********
 
-paperless-ng 1.1.3
+paperless-ng 1.1.4
 ##################
 
-* Added a docker-specific configuration option to adjust the number of
-  worker processes of the web server. See :ref:`configuration-docker`.
+* Added English (GB) locale.
 
-* Some more memory usage optimizations.
-
-* Don't show inbox statistics if no inbox tag is defined.
+* Added ISO-8601 date display option.
 
 .. note::
 
@@ -26,6 +23,16 @@ paperless-ng 1.1.3
 
   If using docker, this does not affect you.
 
+paperless-ng 1.1.3
+##################
+
+* Added a docker-specific configuration option to adjust the number of
+  worker processes of the web server. See :ref:`configuration-docker`.
+
+* Some more memory usage optimizations.
+
+* Don't show inbox statistics if no inbox tag is defined.
+
 paperless-ng 1.1.2
 ##################
 
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index b2ffebc09..6df8ec565 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,7 +2,7 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "1.1.3",
+  version: "1.1.4",
   webSocketHost: window.location.host,
   webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:")
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 08f427169..f336d581e 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (1, 1, 3)
+__version__ = (1, 1, 4)

From b7f1b9f8ad0f3a6e8ee11cbe4a20732353913245 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 17 Feb 2021 11:50:01 +0000
Subject: [PATCH 1214/1300] Apply translations in de

translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po'
on the 'de' language.
---
 src/locale/de/LC_MESSAGES/django.po | 182 +++++++++++++++-------------
 1 file changed, 97 insertions(+), 85 deletions(-)

diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po
index c53985275..358c9b721 100644
--- a/src/locale/de/LC_MESSAGES/django.po
+++ b/src/locale/de/LC_MESSAGES/django.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\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"
+"POT-Creation-Date: 2021-02-16 14:52+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"
 "MIME-Version: 1.0\n"
@@ -25,64 +25,64 @@ msgstr ""
 msgid "Documents"
 msgstr "Dokumente"
 
-#: documents/models.py:33
+#: documents/models.py:32
 msgid "Any word"
 msgstr "Irgendein Wort"
 
-#: documents/models.py:34
+#: documents/models.py:33
 msgid "All words"
 msgstr "Alle Wörter"
 
-#: documents/models.py:35
+#: documents/models.py:34
 msgid "Exact match"
 msgstr "Exakte Übereinstimmung"
 
-#: documents/models.py:36
+#: documents/models.py:35
 msgid "Regular expression"
 msgstr "Regulärer Ausdruck"
 
-#: documents/models.py:37
+#: documents/models.py:36
 msgid "Fuzzy word"
 msgstr "Ungenaues Wort"
 
-#: documents/models.py:38
+#: documents/models.py:37
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
+#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25
 #: paperless_mail/models.py:109
 msgid "name"
 msgstr "Name"
 
-#: documents/models.py:46
+#: documents/models.py:45
 msgid "match"
 msgstr "Zuweisungsmuster"
 
-#: documents/models.py:50
+#: documents/models.py:49
 msgid "matching algorithm"
 msgstr "Zuweisungsalgorithmus"
 
-#: documents/models.py:56
+#: documents/models.py:55
 msgid "is insensitive"
 msgstr "Groß-/Kleinschreibung irrelevant"
 
-#: documents/models.py:75 documents/models.py:135
+#: documents/models.py:74 documents/models.py:134
 msgid "correspondent"
 msgstr "Korrespondent"
 
-#: documents/models.py:76
+#: documents/models.py:75
 msgid "correspondents"
 msgstr "Korrespondenten"
 
-#: documents/models.py:98
+#: documents/models.py:97
 msgid "color"
 msgstr "Farbe"
 
-#: documents/models.py:102
+#: documents/models.py:101
 msgid "is inbox tag"
 msgstr "Posteingangs-Tag"
 
-#: documents/models.py:104
+#: documents/models.py:103
 msgid ""
 "Marks this tag as an inbox tag: All newly consumed documents will be tagged "
 "with inbox tags."
@@ -90,39 +90,39 @@ msgstr ""
 "Markiert das Tag als Posteingangs-Tag. Neue Dokumente werden immer mit "
 "diesem Tag versehen."
 
-#: documents/models.py:109
+#: documents/models.py:108
 msgid "tag"
 msgstr "Tag"
 
-#: documents/models.py:110 documents/models.py:166
+#: documents/models.py:109 documents/models.py:165
 msgid "tags"
 msgstr "Tags"
 
-#: documents/models.py:116 documents/models.py:148
+#: documents/models.py:115 documents/models.py:147
 msgid "document type"
 msgstr "Dokumenttyp"
 
-#: documents/models.py:117
+#: documents/models.py:116
 msgid "document types"
 msgstr "Dokumenttypen"
 
-#: documents/models.py:125
+#: documents/models.py:124
 msgid "Unencrypted"
 msgstr "Nicht verschlüsselt"
 
-#: documents/models.py:126
+#: documents/models.py:125
 msgid "Encrypted with GNU Privacy Guard"
 msgstr "Verschlüsselt mit GNU Privacy Guard"
 
-#: documents/models.py:139
+#: documents/models.py:138
 msgid "title"
 msgstr "Titel"
 
-#: documents/models.py:152
+#: documents/models.py:151
 msgid "content"
 msgstr "Inhalt"
 
-#: documents/models.py:154
+#: documents/models.py:153
 msgid ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
@@ -130,43 +130,43 @@ msgstr ""
 "Der Inhalt des Dokuments in Textform. Dieses Feld wird primär für die Suche "
 "verwendet."
 
-#: documents/models.py:159
+#: documents/models.py:158
 msgid "mime type"
 msgstr "MIME-Typ"
 
-#: documents/models.py:170
+#: documents/models.py:169
 msgid "checksum"
 msgstr "Prüfsumme"
 
-#: documents/models.py:174
+#: documents/models.py:173
 msgid "The checksum of the original document."
 msgstr "Die Prüfsumme des originalen Dokuments."
 
-#: documents/models.py:178
+#: documents/models.py:177
 msgid "archive checksum"
 msgstr "Archiv-Prüfsumme"
 
-#: documents/models.py:183
+#: documents/models.py:182
 msgid "The checksum of the archived document."
 msgstr "Die Prüfsumme des archivierten Dokuments."
 
-#: documents/models.py:187 documents/models.py:330
+#: documents/models.py:186 documents/models.py:342
 msgid "created"
 msgstr "Ausgestellt"
 
-#: documents/models.py:191
+#: documents/models.py:190
 msgid "modified"
 msgstr "Geändert"
 
-#: documents/models.py:195
+#: documents/models.py:194
 msgid "storage type"
 msgstr "Speichertyp"
 
-#: documents/models.py:203
+#: documents/models.py:202
 msgid "added"
 msgstr "Hinzugefügt"
 
-#: documents/models.py:207
+#: documents/models.py:206
 msgid "filename"
 msgstr "Dateiname"
 
@@ -175,178 +175,186 @@ msgid "Current filename in storage"
 msgstr "Aktueller Dateiname im Datenspeicher"
 
 #: documents/models.py:216
+msgid "archive filename"
+msgstr "Archiv-Dateiname"
+
+#: documents/models.py:222
+msgid "Current archive filename in storage"
+msgstr "Aktueller Dateiname im Archiv"
+
+#: documents/models.py:226
 msgid "archive serial number"
 msgstr "Archiv-Seriennummer"
 
-#: documents/models.py:221
+#: documents/models.py:231
 msgid "The position of this document in your physical document archive."
 msgstr "Die Position dieses Dokuments in Ihrem physischen Dokumentenarchiv."
 
-#: documents/models.py:227
+#: documents/models.py:237
 msgid "document"
 msgstr "Dokument"
 
-#: documents/models.py:228
+#: documents/models.py:238
 msgid "documents"
 msgstr "Dokumente"
 
-#: documents/models.py:313
+#: documents/models.py:325
 msgid "debug"
 msgstr "Debug"
 
-#: documents/models.py:314
+#: documents/models.py:326
 msgid "information"
 msgstr "Information"
 
-#: documents/models.py:315
+#: documents/models.py:327
 msgid "warning"
 msgstr "Warnung"
 
-#: documents/models.py:316
+#: documents/models.py:328
 msgid "error"
 msgstr "Fehler"
 
-#: documents/models.py:317
+#: documents/models.py:329
 msgid "critical"
 msgstr "Kritisch"
 
-#: documents/models.py:321
+#: documents/models.py:333
 msgid "group"
 msgstr "Gruppe"
 
-#: documents/models.py:324
+#: documents/models.py:336
 msgid "message"
 msgstr "Nachricht"
 
-#: documents/models.py:327
+#: documents/models.py:339
 msgid "level"
 msgstr "Level"
 
-#: documents/models.py:334
+#: documents/models.py:346
 msgid "log"
 msgstr "Protokoll"
 
-#: documents/models.py:335
+#: documents/models.py:347
 msgid "logs"
 msgstr "Protokoll"
 
-#: documents/models.py:346 documents/models.py:396
+#: documents/models.py:358 documents/models.py:408
 msgid "saved view"
 msgstr "Gespeicherte Ansicht"
 
-#: documents/models.py:347
+#: documents/models.py:359
 msgid "saved views"
 msgstr "Gespeicherte Ansichten"
 
-#: documents/models.py:350
+#: documents/models.py:362
 msgid "user"
 msgstr "Benutzer"
 
-#: documents/models.py:356
+#: documents/models.py:368
 msgid "show on dashboard"
 msgstr "Auf Startseite zeigen"
 
-#: documents/models.py:359
+#: documents/models.py:371
 msgid "show in sidebar"
 msgstr "In Seitenleiste zeigen"
 
-#: documents/models.py:363
+#: documents/models.py:375
 msgid "sort field"
 msgstr "Sortierfeld"
 
-#: documents/models.py:366
+#: documents/models.py:378
 msgid "sort reverse"
 msgstr "Umgekehrte Sortierung"
 
-#: documents/models.py:372
+#: documents/models.py:384
 msgid "title contains"
 msgstr "Titel enthält"
 
-#: documents/models.py:373
+#: documents/models.py:385
 msgid "content contains"
 msgstr "Inhalt enthält"
 
-#: documents/models.py:374
+#: documents/models.py:386
 msgid "ASN is"
 msgstr "ASN ist"
 
-#: documents/models.py:375
+#: documents/models.py:387
 msgid "correspondent is"
 msgstr "Korrespondent ist"
 
-#: documents/models.py:376
+#: documents/models.py:388
 msgid "document type is"
 msgstr "Dokumenttyp ist"
 
-#: documents/models.py:377
+#: documents/models.py:389
 msgid "is in inbox"
 msgstr "Ist im Posteingang"
 
-#: documents/models.py:378
+#: documents/models.py:390
 msgid "has tag"
 msgstr "Hat Tag"
 
-#: documents/models.py:379
+#: documents/models.py:391
 msgid "has any tag"
 msgstr "Hat irgendein Tag"
 
-#: documents/models.py:380
+#: documents/models.py:392
 msgid "created before"
 msgstr "Ausgestellt vor"
 
-#: documents/models.py:381
+#: documents/models.py:393
 msgid "created after"
 msgstr "Ausgestellt nach"
 
-#: documents/models.py:382
+#: documents/models.py:394
 msgid "created year is"
 msgstr "Ausgestellt im Jahr"
 
-#: documents/models.py:383
+#: documents/models.py:395
 msgid "created month is"
 msgstr "Ausgestellt im Monat"
 
-#: documents/models.py:384
+#: documents/models.py:396
 msgid "created day is"
 msgstr "Ausgestellt am Tag"
 
-#: documents/models.py:385
+#: documents/models.py:397
 msgid "added before"
 msgstr "Hinzugefügt vor"
 
-#: documents/models.py:386
+#: documents/models.py:398
 msgid "added after"
 msgstr "Hinzugefügt nach"
 
-#: documents/models.py:387
+#: documents/models.py:399
 msgid "modified before"
 msgstr "Geändert vor"
 
-#: documents/models.py:388
+#: documents/models.py:400
 msgid "modified after"
 msgstr "Geändert nach"
 
-#: documents/models.py:389
+#: documents/models.py:401
 msgid "does not have tag"
 msgstr "Hat nicht folgendes Tag"
 
-#: documents/models.py:400
+#: documents/models.py:412
 msgid "rule type"
 msgstr "Regeltyp"
 
-#: documents/models.py:404
+#: documents/models.py:416
 msgid "value"
 msgstr "Wert"
 
-#: documents/models.py:410
+#: documents/models.py:422
 msgid "filter rule"
 msgstr "Filterregel"
 
-#: documents/models.py:411
+#: documents/models.py:423
 msgid "filter rules"
 msgstr "Filterregeln"
 
-#: documents/serialisers.py:383
+#: documents/serialisers.py:370
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr "Dateityp %(type)s nicht unterstützt"
@@ -393,19 +401,23 @@ msgstr "Passwort"
 msgid "Sign in"
 msgstr "Anmelden"
 
-#: paperless/settings.py:286
-msgid "English"
-msgstr "Englisch"
+#: paperless/settings.py:291
+msgid "English (US)"
+msgstr "Englisch (US)"
 
-#: paperless/settings.py:287
+#: paperless/settings.py:292
+msgid "English (GB)"
+msgstr "Englisch (UK)"
+
+#: paperless/settings.py:293
 msgid "German"
 msgstr "Deutsch"
 
-#: paperless/settings.py:288
+#: paperless/settings.py:294
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: paperless/settings.py:289
+#: paperless/settings.py:295
 msgid "French"
 msgstr "Französisch"
 

From 6ff99945f3de64859517c204f13fc0409cf69020 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 17 Feb 2021 13:18:19 +0100
Subject: [PATCH 1215/1300] Update Crowdin configuration file

---
 crowdin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crowdin.yml b/crowdin.yml
index f5a7765dd..a121e80b8 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,5 +1,5 @@
 files:
-  - source: /src/locale/en-us/LC_MESSAGES/django.po
+  - source: /src/locale/en_US/LC_MESSAGES/django.po
     translation: /src/locale/%two_letters_code%/LC_MESSAGES/django.po
   - source: /src-ui/messages.xlf
     translation: /src-ui/src/locale/messages.%two_letters_code%.xlf

From 4e4d6e806cad6cd871ab732d9c50396f0aa3b567 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 17 Feb 2021 13:22:45 +0100
Subject: [PATCH 1216/1300] Update Crowdin configuration file

---
 crowdin.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crowdin.yml b/crowdin.yml
index a121e80b8..0e6a46a31 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,5 +1,5 @@
 files:
   - source: /src/locale/en_US/LC_MESSAGES/django.po
-    translation: /src/locale/%two_letters_code%/LC_MESSAGES/django.po
+    translation: /src/locale/%locale_with_underscore%/LC_MESSAGES/django.po
   - source: /src-ui/messages.xlf
-    translation: /src-ui/src/locale/messages.%two_letters_code%.xlf
+    translation: /src-ui/src/locale/messages.%locale_with_underscore%.xlf

From 58df3d5767105944937eb0792b72204cd137805e Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 17 Feb 2021 12:57:48 +0000
Subject: [PATCH 1217/1300] Apply translations in nl_NL

translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po'
on the 'nl_NL' language.
---
 src/locale/nl_NL/LC_MESSAGES/django.po | 186 +++++++++++++------------
 1 file changed, 99 insertions(+), 87 deletions(-)

diff --git a/src/locale/nl_NL/LC_MESSAGES/django.po b/src/locale/nl_NL/LC_MESSAGES/django.po
index 63391da15..eefba7fbb 100644
--- a/src/locale/nl_NL/LC_MESSAGES/django.po
+++ b/src/locale/nl_NL/LC_MESSAGES/django.po
@@ -4,17 +4,17 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
+# Jonas Winkler, 2021
 # Jo Vandeginste <jo.vandeginste@gmail.com>, 2021
-# Ben <bzweekhorst@gmail.com>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\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: Ben <bzweekhorst@gmail.com>, 2021\n"
+"POT-Creation-Date: 2021-02-16 14:52+0100\n"
+"PO-Revision-Date: 2021-02-16 18:37+0000\n"
+"Last-Translator: Jo Vandeginste <jo.vandeginste@gmail.com>, 2021\n"
 "Language-Team: Dutch (Netherlands) (https://www.transifex.com/paperless/teams/115905/nl_NL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,64 +26,64 @@ msgstr ""
 msgid "Documents"
 msgstr "Documenten"
 
-#: documents/models.py:33
+#: documents/models.py:32
 msgid "Any word"
 msgstr "Eender welk woord"
 
-#: documents/models.py:34
+#: documents/models.py:33
 msgid "All words"
 msgstr "Alle woorden"
 
-#: documents/models.py:35
+#: documents/models.py:34
 msgid "Exact match"
 msgstr "Exacte overeenkomst"
 
-#: documents/models.py:36
+#: documents/models.py:35
 msgid "Regular expression"
 msgstr "Reguliere expressie"
 
-#: documents/models.py:37
+#: documents/models.py:36
 msgid "Fuzzy word"
 msgstr "Gelijkaardig woord"
 
-#: documents/models.py:38
+#: documents/models.py:37
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
+#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25
 #: paperless_mail/models.py:109
 msgid "name"
 msgstr "naam"
 
-#: documents/models.py:46
+#: documents/models.py:45
 msgid "match"
 msgstr "Overeenkomst"
 
-#: documents/models.py:50
+#: documents/models.py:49
 msgid "matching algorithm"
 msgstr "Algoritme voor het bepalen van de overeenkomst"
 
-#: documents/models.py:56
+#: documents/models.py:55
 msgid "is insensitive"
 msgstr "is niet hoofdlettergevoelig"
 
-#: documents/models.py:75 documents/models.py:135
+#: documents/models.py:74 documents/models.py:134
 msgid "correspondent"
 msgstr "correspondent"
 
-#: documents/models.py:76
+#: documents/models.py:75
 msgid "correspondents"
 msgstr "correspondenten"
 
-#: documents/models.py:98
+#: documents/models.py:97
 msgid "color"
 msgstr "Kleur"
 
-#: documents/models.py:102
+#: documents/models.py:101
 msgid "is inbox tag"
 msgstr "is \"Postvak in\"-etiket"
 
-#: documents/models.py:104
+#: documents/models.py:103
 msgid ""
 "Marks this tag as an inbox tag: All newly consumed documents will be tagged "
 "with inbox tags."
@@ -91,39 +91,39 @@ msgstr ""
 "Markeer dit etiket als een \"Postvak in\"-etiket: alle nieuw verwerkte "
 "documenten krijgen de \"Postvak in\"-etiketten."
 
-#: documents/models.py:109
+#: documents/models.py:108
 msgid "tag"
 msgstr "etiket"
 
-#: documents/models.py:110 documents/models.py:166
+#: documents/models.py:109 documents/models.py:165
 msgid "tags"
 msgstr "etiketten"
 
-#: documents/models.py:116 documents/models.py:148
+#: documents/models.py:115 documents/models.py:147
 msgid "document type"
 msgstr "documenttype"
 
-#: documents/models.py:117
+#: documents/models.py:116
 msgid "document types"
 msgstr "documenttypen"
 
-#: documents/models.py:125
+#: documents/models.py:124
 msgid "Unencrypted"
 msgstr "Niet versleuteld"
 
-#: documents/models.py:126
+#: documents/models.py:125
 msgid "Encrypted with GNU Privacy Guard"
 msgstr "Versleuteld met GNU Privacy Guard"
 
-#: documents/models.py:139
+#: documents/models.py:138
 msgid "title"
 msgstr "titel"
 
-#: documents/models.py:152
+#: documents/models.py:151
 msgid "content"
 msgstr "inhoud"
 
-#: documents/models.py:154
+#: documents/models.py:153
 msgid ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
@@ -131,43 +131,43 @@ msgstr ""
 "De onbewerkte gegevens van het document. Dit veld wordt voornamelijk "
 "gebruikt om te zoeken."
 
-#: documents/models.py:159
+#: documents/models.py:158
 msgid "mime type"
 msgstr "mimetype"
 
-#: documents/models.py:170
+#: documents/models.py:169
 msgid "checksum"
 msgstr "checksum"
 
-#: documents/models.py:174
+#: documents/models.py:173
 msgid "The checksum of the original document."
 msgstr "Het controlecijfer van het originele document."
 
-#: documents/models.py:178
+#: documents/models.py:177
 msgid "archive checksum"
 msgstr "archief checksum"
 
-#: documents/models.py:183
+#: documents/models.py:182
 msgid "The checksum of the archived document."
 msgstr "De checksum van het gearchiveerde document."
 
-#: documents/models.py:187 documents/models.py:330
+#: documents/models.py:186 documents/models.py:342
 msgid "created"
 msgstr "aangemaakt"
 
-#: documents/models.py:191
+#: documents/models.py:190
 msgid "modified"
 msgstr "gewijzigd"
 
-#: documents/models.py:195
+#: documents/models.py:194
 msgid "storage type"
 msgstr "type opslag"
 
-#: documents/models.py:203
+#: documents/models.py:202
 msgid "added"
 msgstr "toegevoegd"
 
-#: documents/models.py:207
+#: documents/models.py:206
 msgid "filename"
 msgstr "bestandsnaam"
 
@@ -176,178 +176,186 @@ msgid "Current filename in storage"
 msgstr "Huidige bestandsnaam in opslag"
 
 #: documents/models.py:216
+msgid "archive filename"
+msgstr "Bestandsnaam in archief"
+
+#: documents/models.py:222
+msgid "Current archive filename in storage"
+msgstr "Huidige bestandsnaam in archief"
+
+#: documents/models.py:226
 msgid "archive serial number"
 msgstr "serienummer in archief"
 
-#: documents/models.py:221
+#: documents/models.py:231
 msgid "The position of this document in your physical document archive."
 msgstr "De positie van dit document in je fysieke documentenarchief."
 
-#: documents/models.py:227
+#: documents/models.py:237
 msgid "document"
 msgstr "document"
 
-#: documents/models.py:228
+#: documents/models.py:238
 msgid "documents"
 msgstr "documenten"
 
-#: documents/models.py:313
+#: documents/models.py:325
 msgid "debug"
 msgstr "debug"
 
-#: documents/models.py:314
+#: documents/models.py:326
 msgid "information"
 msgstr "informatie"
 
-#: documents/models.py:315
+#: documents/models.py:327
 msgid "warning"
 msgstr "waarschuwing"
 
-#: documents/models.py:316
+#: documents/models.py:328
 msgid "error"
 msgstr "fout"
 
-#: documents/models.py:317
+#: documents/models.py:329
 msgid "critical"
 msgstr "kritisch"
 
-#: documents/models.py:321
+#: documents/models.py:333
 msgid "group"
 msgstr "groep"
 
-#: documents/models.py:324
+#: documents/models.py:336
 msgid "message"
 msgstr "bericht"
 
-#: documents/models.py:327
+#: documents/models.py:339
 msgid "level"
 msgstr "niveau"
 
-#: documents/models.py:334
+#: documents/models.py:346
 msgid "log"
 msgstr "bericht"
 
-#: documents/models.py:335
+#: documents/models.py:347
 msgid "logs"
 msgstr "berichten"
 
-#: documents/models.py:346 documents/models.py:396
+#: documents/models.py:358 documents/models.py:408
 msgid "saved view"
 msgstr "opgeslagen view"
 
-#: documents/models.py:347
+#: documents/models.py:359
 msgid "saved views"
 msgstr "opgeslagen views"
 
-#: documents/models.py:350
+#: documents/models.py:362
 msgid "user"
 msgstr "gebruiker"
 
-#: documents/models.py:356
+#: documents/models.py:368
 msgid "show on dashboard"
 msgstr "weergeven op dashboard"
 
-#: documents/models.py:359
+#: documents/models.py:371
 msgid "show in sidebar"
 msgstr "weergeven in zijbalk"
 
-#: documents/models.py:363
+#: documents/models.py:375
 msgid "sort field"
 msgstr "sorteerveld"
 
-#: documents/models.py:366
+#: documents/models.py:378
 msgid "sort reverse"
 msgstr "omgekeerd sorteren"
 
-#: documents/models.py:372
+#: documents/models.py:384
 msgid "title contains"
 msgstr "titel bevat"
 
-#: documents/models.py:373
+#: documents/models.py:385
 msgid "content contains"
 msgstr "inhoud bevat"
 
-#: documents/models.py:374
+#: documents/models.py:386
 msgid "ASN is"
 msgstr "ASN is"
 
-#: documents/models.py:375
+#: documents/models.py:387
 msgid "correspondent is"
 msgstr "correspondent is"
 
-#: documents/models.py:376
+#: documents/models.py:388
 msgid "document type is"
 msgstr "documenttype is"
 
-#: documents/models.py:377
+#: documents/models.py:389
 msgid "is in inbox"
 msgstr "zit in \"Postvak in\""
 
-#: documents/models.py:378
+#: documents/models.py:390
 msgid "has tag"
 msgstr "heeft etiket"
 
-#: documents/models.py:379
+#: documents/models.py:391
 msgid "has any tag"
 msgstr "heeft één van de etiketten"
 
-#: documents/models.py:380
+#: documents/models.py:392
 msgid "created before"
 msgstr "aangemaakt voor"
 
-#: documents/models.py:381
+#: documents/models.py:393
 msgid "created after"
 msgstr "aangemaakt na"
 
-#: documents/models.py:382
+#: documents/models.py:394
 msgid "created year is"
 msgstr "aangemaakt jaar is"
 
-#: documents/models.py:383
+#: documents/models.py:395
 msgid "created month is"
 msgstr "aangemaakte maand is"
 
-#: documents/models.py:384
+#: documents/models.py:396
 msgid "created day is"
 msgstr "aangemaakte dag is"
 
-#: documents/models.py:385
+#: documents/models.py:397
 msgid "added before"
 msgstr "toegevoegd voor"
 
-#: documents/models.py:386
+#: documents/models.py:398
 msgid "added after"
 msgstr "toegevoegd na"
 
-#: documents/models.py:387
+#: documents/models.py:399
 msgid "modified before"
 msgstr "gewijzigd voor"
 
-#: documents/models.py:388
+#: documents/models.py:400
 msgid "modified after"
 msgstr "gewijzigd na"
 
-#: documents/models.py:389
+#: documents/models.py:401
 msgid "does not have tag"
 msgstr "heeft geen etiket"
 
-#: documents/models.py:400
+#: documents/models.py:412
 msgid "rule type"
 msgstr "type regel"
 
-#: documents/models.py:404
+#: documents/models.py:416
 msgid "value"
 msgstr "waarde"
 
-#: documents/models.py:410
+#: documents/models.py:422
 msgid "filter rule"
 msgstr "filterregel"
 
-#: documents/models.py:411
+#: documents/models.py:423
 msgid "filter rules"
 msgstr "filterregels"
 
-#: documents/serialisers.py:383
+#: documents/serialisers.py:370
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr "Bestandstype %(type)s niet ondersteund"
@@ -392,19 +400,23 @@ msgstr "Wachtwoord"
 msgid "Sign in"
 msgstr "Aanmelden"
 
-#: paperless/settings.py:286
-msgid "English"
-msgstr "Engels"
+#: paperless/settings.py:291
+msgid "English (US)"
+msgstr "Engels (US)"
 
-#: paperless/settings.py:287
+#: paperless/settings.py:292
+msgid "English (GB)"
+msgstr "Engels (Brits)"
+
+#: paperless/settings.py:293
 msgid "German"
 msgstr "Duits"
 
-#: paperless/settings.py:288
+#: paperless/settings.py:294
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: paperless/settings.py:289
+#: paperless/settings.py:295
 msgid "French"
 msgstr "Frans"
 

From 0d78e58d77907ec9037bd459608602f787fddcda Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Wed, 17 Feb 2021 14:26:06 +0100
Subject: [PATCH 1218/1300] fixed paperless not properly selecting en-gb

---
 src-ui/src/app/services/settings.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index a145ae5a7..d511fa65f 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -79,8 +79,8 @@ export class SettingsService {
 
   getLanguageOptions(): LanguageOption[] {
     return [
-      {code: "en-US", name: $localize`English (US)`, englishName: "English (US)"},
-      {code: "en-GB", name: $localize`English (GB)`, englishName: "English (GB)"},
+      {code: "en-us", name: $localize`English (US)`, englishName: "English (US)"},
+      {code: "en-gb", name: $localize`English (GB)`, englishName: "English (GB)"},
       {code: "de", name: $localize`German`, englishName: "German"},
       {code: "nl", name: $localize`Dutch`, englishName: "Dutch"},
       {code: "fr", name: $localize`French`, englishName: "French"}

From 7bc557a9999e86e6fdcb0627372b50721325f28a Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 17 Feb 2021 13:36:15 +0000
Subject: [PATCH 1219/1300] Apply translations in en_GB

translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po'
on the 'en_GB' language.
---
 src/locale/en_GB/LC_MESSAGES/django.po | 191 +++++++++++++------------
 1 file changed, 102 insertions(+), 89 deletions(-)

diff --git a/src/locale/en_GB/LC_MESSAGES/django.po b/src/locale/en_GB/LC_MESSAGES/django.po
index de13e5d34..f0c5b0381 100644
--- a/src/locale/en_GB/LC_MESSAGES/django.po
+++ b/src/locale/en_GB/LC_MESSAGES/django.po
@@ -2,18 +2,19 @@
 # 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 <xadium@gmail.com>, 2021
-#
+# Ali Bates, 2021
+# Jonas Winkler, 2021
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\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: Ali Bates <xadium@gmail.com>, 2021\n"
+"POT-Creation-Date: 2021-02-16 14:52+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,64 +26,64 @@ msgstr ""
 msgid "Documents"
 msgstr "Documents"
 
-#: documents/models.py:33
+#: documents/models.py:32
 msgid "Any word"
 msgstr "Any word"
 
-#: documents/models.py:34
+#: documents/models.py:33
 msgid "All words"
 msgstr "All words"
 
-#: documents/models.py:35
+#: documents/models.py:34
 msgid "Exact match"
 msgstr "Exact match"
 
-#: documents/models.py:36
+#: documents/models.py:35
 msgid "Regular expression"
 msgstr "Regular expression"
 
-#: documents/models.py:37
+#: documents/models.py:36
 msgid "Fuzzy word"
 msgstr "Fuzzy word"
 
-#: documents/models.py:38
+#: documents/models.py:37
 msgid "Automatic"
 msgstr "Automatic"
 
-#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
+#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25
 #: paperless_mail/models.py:109
 msgid "name"
 msgstr "name"
 
-#: documents/models.py:46
+#: documents/models.py:45
 msgid "match"
 msgstr "match"
 
-#: documents/models.py:50
+#: documents/models.py:49
 msgid "matching algorithm"
 msgstr "matching algorithm"
 
-#: documents/models.py:56
+#: documents/models.py:55
 msgid "is insensitive"
 msgstr "is insensitive"
 
-#: documents/models.py:75 documents/models.py:135
+#: documents/models.py:74 documents/models.py:134
 msgid "correspondent"
 msgstr "correspondent"
 
-#: documents/models.py:76
+#: documents/models.py:75
 msgid "correspondents"
 msgstr "correspondents"
 
-#: documents/models.py:98
+#: documents/models.py:97
 msgid "color"
 msgstr "colour"
 
-#: documents/models.py:102
+#: documents/models.py:101
 msgid "is inbox tag"
 msgstr "is inbox tag"
 
-#: documents/models.py:104
+#: documents/models.py:103
 msgid ""
 "Marks this tag as an inbox tag: All newly consumed documents will be tagged "
 "with inbox tags."
@@ -90,39 +91,39 @@ msgstr ""
 "Marks this tag as an inbox tag: All newly consumed documents will be tagged "
 "with inbox tags."
 
-#: documents/models.py:109
+#: documents/models.py:108
 msgid "tag"
 msgstr "tag"
 
-#: documents/models.py:110 documents/models.py:166
+#: documents/models.py:109 documents/models.py:165
 msgid "tags"
 msgstr "tags"
 
-#: documents/models.py:116 documents/models.py:148
+#: documents/models.py:115 documents/models.py:147
 msgid "document type"
 msgstr "document type"
 
-#: documents/models.py:117
+#: documents/models.py:116
 msgid "document types"
 msgstr "document types"
 
-#: documents/models.py:125
+#: documents/models.py:124
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: documents/models.py:126
+#: documents/models.py:125
 msgid "Encrypted with GNU Privacy Guard"
 msgstr "Encrypted with GNU Privacy Guard"
 
-#: documents/models.py:139
+#: documents/models.py:138
 msgid "title"
 msgstr "title"
 
-#: documents/models.py:152
+#: documents/models.py:151
 msgid "content"
 msgstr "content"
 
-#: documents/models.py:154
+#: documents/models.py:153
 msgid ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
@@ -130,43 +131,43 @@ msgstr ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
 
-#: documents/models.py:159
+#: documents/models.py:158
 msgid "mime type"
 msgstr "mime type"
 
-#: documents/models.py:170
+#: documents/models.py:169
 msgid "checksum"
 msgstr "checksum"
 
-#: documents/models.py:174
+#: documents/models.py:173
 msgid "The checksum of the original document."
 msgstr "The checksum of the original document."
 
-#: documents/models.py:178
+#: documents/models.py:177
 msgid "archive checksum"
 msgstr "archive checksum"
 
-#: documents/models.py:183
+#: documents/models.py:182
 msgid "The checksum of the archived document."
 msgstr "The checksum of the archived document."
 
-#: documents/models.py:187 documents/models.py:330
+#: documents/models.py:186 documents/models.py:342
 msgid "created"
 msgstr "created"
 
-#: documents/models.py:191
+#: documents/models.py:190
 msgid "modified"
 msgstr "modified"
 
-#: documents/models.py:195
+#: documents/models.py:194
 msgid "storage type"
 msgstr "storage type"
 
-#: documents/models.py:203
+#: documents/models.py:202
 msgid "added"
 msgstr "added"
 
-#: documents/models.py:207
+#: documents/models.py:206
 msgid "filename"
 msgstr "filename"
 
@@ -175,178 +176,186 @@ msgid "Current filename in storage"
 msgstr "Current filename in storage"
 
 #: documents/models.py:216
+msgid "archive filename"
+msgstr "archive filename"
+
+#: documents/models.py:222
+msgid "Current archive filename in storage"
+msgstr "Current archive filename in storage"
+
+#: documents/models.py:226
 msgid "archive serial number"
 msgstr "archive serial number"
 
-#: documents/models.py:221
+#: documents/models.py:231
 msgid "The position of this document in your physical document archive."
 msgstr "The position of this document in your physical document archive."
 
-#: documents/models.py:227
+#: documents/models.py:237
 msgid "document"
 msgstr "document"
 
-#: documents/models.py:228
+#: documents/models.py:238
 msgid "documents"
 msgstr "documents"
 
-#: documents/models.py:313
+#: documents/models.py:325
 msgid "debug"
 msgstr "debug"
 
-#: documents/models.py:314
+#: documents/models.py:326
 msgid "information"
 msgstr "information"
 
-#: documents/models.py:315
+#: documents/models.py:327
 msgid "warning"
 msgstr "warning"
 
-#: documents/models.py:316
+#: documents/models.py:328
 msgid "error"
 msgstr "error"
 
-#: documents/models.py:317
+#: documents/models.py:329
 msgid "critical"
 msgstr "critical"
 
-#: documents/models.py:321
+#: documents/models.py:333
 msgid "group"
 msgstr "group"
 
-#: documents/models.py:324
+#: documents/models.py:336
 msgid "message"
 msgstr "message"
 
-#: documents/models.py:327
+#: documents/models.py:339
 msgid "level"
 msgstr "level"
 
-#: documents/models.py:334
+#: documents/models.py:346
 msgid "log"
 msgstr "log"
 
-#: documents/models.py:335
+#: documents/models.py:347
 msgid "logs"
 msgstr "logs"
 
-#: documents/models.py:346 documents/models.py:396
+#: documents/models.py:358 documents/models.py:408
 msgid "saved view"
 msgstr "saved view"
 
-#: documents/models.py:347
+#: documents/models.py:359
 msgid "saved views"
 msgstr "saved views"
 
-#: documents/models.py:350
+#: documents/models.py:362
 msgid "user"
 msgstr "user"
 
-#: documents/models.py:356
+#: documents/models.py:368
 msgid "show on dashboard"
 msgstr "show on dashboard"
 
-#: documents/models.py:359
+#: documents/models.py:371
 msgid "show in sidebar"
 msgstr "show in sidebar"
 
-#: documents/models.py:363
+#: documents/models.py:375
 msgid "sort field"
 msgstr "sort field"
 
-#: documents/models.py:366
+#: documents/models.py:378
 msgid "sort reverse"
 msgstr "sort reverse"
 
-#: documents/models.py:372
+#: documents/models.py:384
 msgid "title contains"
 msgstr "title contains"
 
-#: documents/models.py:373
+#: documents/models.py:385
 msgid "content contains"
 msgstr "content contains"
 
-#: documents/models.py:374
+#: documents/models.py:386
 msgid "ASN is"
 msgstr "ASN is"
 
-#: documents/models.py:375
+#: documents/models.py:387
 msgid "correspondent is"
 msgstr "correspondent is"
 
-#: documents/models.py:376
+#: documents/models.py:388
 msgid "document type is"
 msgstr "document type is"
 
-#: documents/models.py:377
+#: documents/models.py:389
 msgid "is in inbox"
 msgstr "is in inbox"
 
-#: documents/models.py:378
+#: documents/models.py:390
 msgid "has tag"
 msgstr "has tag"
 
-#: documents/models.py:379
+#: documents/models.py:391
 msgid "has any tag"
 msgstr "has any tag"
 
-#: documents/models.py:380
+#: documents/models.py:392
 msgid "created before"
 msgstr "created before"
 
-#: documents/models.py:381
+#: documents/models.py:393
 msgid "created after"
 msgstr "created after"
 
-#: documents/models.py:382
+#: documents/models.py:394
 msgid "created year is"
 msgstr "created year is"
 
-#: documents/models.py:383
+#: documents/models.py:395
 msgid "created month is"
 msgstr "created month is"
 
-#: documents/models.py:384
+#: documents/models.py:396
 msgid "created day is"
 msgstr "created day is"
 
-#: documents/models.py:385
+#: documents/models.py:397
 msgid "added before"
 msgstr "added before"
 
-#: documents/models.py:386
+#: documents/models.py:398
 msgid "added after"
 msgstr "added after"
 
-#: documents/models.py:387
+#: documents/models.py:399
 msgid "modified before"
 msgstr "modified before"
 
-#: documents/models.py:388
+#: documents/models.py:400
 msgid "modified after"
 msgstr "modified after"
 
-#: documents/models.py:389
+#: documents/models.py:401
 msgid "does not have tag"
 msgstr "does not have tag"
 
-#: documents/models.py:400
+#: documents/models.py:412
 msgid "rule type"
 msgstr "rule type"
 
-#: documents/models.py:404
+#: documents/models.py:416
 msgid "value"
 msgstr "value"
 
-#: documents/models.py:410
+#: documents/models.py:422
 msgid "filter rule"
 msgstr "filter rule"
 
-#: documents/models.py:411
+#: documents/models.py:423
 msgid "filter rules"
 msgstr "filter rules"
 
-#: documents/serialisers.py:383
+#: documents/serialisers.py:370
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr "File type %(type)s not supported"
@@ -391,19 +400,23 @@ msgstr "Password"
 msgid "Sign in"
 msgstr "Sign in"
 
-#: paperless/settings.py:286
-msgid "English"
-msgstr "English"
+#: paperless/settings.py:291
+msgid "English (US)"
+msgstr "English (US)"
 
-#: paperless/settings.py:287
+#: paperless/settings.py:292
+msgid "English (GB)"
+msgstr "English (GB)"
+
+#: paperless/settings.py:293
 msgid "German"
 msgstr "German"
 
-#: paperless/settings.py:288
+#: paperless/settings.py:294
 msgid "Dutch"
 msgstr "Dutch"
 
-#: paperless/settings.py:289
+#: paperless/settings.py:295
 msgid "French"
 msgstr "French"
 

From 0e237fa45908f2e60d9801422b06a40f3475946e Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Thu, 18 Feb 2021 17:11:47 +0100
Subject: [PATCH 1220/1300] messages

---
 src-ui/messages.xlf                           | 66 +++++++++++--------
 .../filter-editor/filter-editor.component.ts  |  4 +-
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index a80bd082f..731fdff7f 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -52,17 +52,17 @@
         </context-group>
       </trans-unit>
       <trans-unit id="2155249406916744630" datatype="html">
-        <source>View &quot;<x id="PH" equiv-text="this.list.savedView.name"/>&quot; saved successfully.</source>
+        <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">109</context>
+          <context context-type="linenumber">115</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">130</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9ca82952a6bc860b5391d5975322d8af8ceddfa4" datatype="html">
@@ -114,8 +114,8 @@
           <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="72e7d343f9165602cce1ca7faffbc565fd31ef92" datatype="html">
-        <source>Save &quot;<x id="INTERPOLATION" equiv-text="{{list.savedViewTitle}}"/>&quot;</source>
+      <trans-unit id="5f5ce787c428d917c30c9bd70789a618e09743a7" datatype="html">
+        <source>Save &quot;<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>&quot;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">71</context>
@@ -513,13 +513,6 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5ca707824ab93066c7d9b44e1b8bf216725c2c22" datatype="html">
-        <source>Filter</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="5610279464668232148" datatype="html">
         <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/>&quot; deleted.</source>
         <context-group purpose="location">
@@ -545,14 +538,21 @@
         <source>Use date format of display language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">96</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/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8488620293789898901" datatype="html">
         <source>Error while storing settings on server: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
@@ -1081,6 +1081,13 @@
           <context context-type="linenumber">46</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">50</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="02d184c288f567825a1fcbf83bcd3099a10853d5" datatype="html">
         <source>Filter tags</source>
         <context-group purpose="location">
@@ -1414,20 +1421,20 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="46c8fe557cf52c9389783627d4f85453f4ddb459" datatype="html">
-        <source>Documents in inbox: <x id="INTERPOLATION" equiv-text="{{statistics.documents_inbox}}"/></source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438" datatype="html">
-        <source>Total documents: <x id="INTERPOLATION" equiv-text="{{statistics.documents_total}}"/></source>
+      <trans-unit id="c0d907c2687c09612395aee6ef7c04ca8e5e5e0a" datatype="html">
+        <source>Total documents: <x id="INTERPOLATION" equiv-text="{{statistics?.documents_total}}"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="13e8d49dbcad9f9d71e66a9a56d6f328cff430c9" datatype="html">
+        <source>Documents in inbox: <x id="INTERPOLATION" equiv-text="{{statistics?.documents_inbox}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="6443586946875325554" datatype="html">
         <source>Processing: <x id="PH" equiv-text="countUploadingAndProcessing"/></source>
         <context-group purpose="location">
@@ -1619,25 +1626,32 @@
           <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="6987083569809053351" datatype="html">
+        <source>English (GB)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="1858110241312746425" datatype="html">
         <source>German</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3071065188816255493" datatype="html">
         <source>Dutch</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7633754075223722162" datatype="html">
         <source>French</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2119857572761283468" datatype="html">
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index a9111bc9f..a6506efde 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -46,6 +46,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
             return $localize`Without any tag`
           }
 
+        case FILTER_TITLE:
+          return $localize`Title: ${rule.value}`
       }
     }
 
@@ -117,7 +119,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     })
   }
 
-  get filterRules() {
+  get filterRules(): FilterRule[] {
     let filterRules: FilterRule[] = []
     if (this._titleFilter) {
       filterRules.push({rule_type: FILTER_TITLE, value: this._titleFilter})

From 0f80eee54e7b7e3a29f9f03be6e8330f12a5eed8 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Thu, 18 Feb 2021 17:29:21 +0100
Subject: [PATCH 1221/1300] refactored most of the list view; fixes #147, much
 snappier UX when switching between views

---
 .../saved-view-widget.component.ts            |   2 +-
 .../document-detail.component.ts              |   4 +-
 .../bulk-editor/bulk-editor.component.ts      |   2 +-
 .../document-list.component.html              |   6 +-
 .../document-list/document-list.component.ts  |  38 +--
 .../services/document-list-view.service.ts    | 236 ++++++++++--------
 6 files changed, 163 insertions(+), 125 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
index 36feeea1e..20bc26cdc 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
@@ -48,7 +48,7 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy {
     if (this.savedView.show_in_sidebar) {
       this.router.navigate(['view', this.savedView.id])
     } else {
-      this.list.load(this.savedView)
+      this.list.loadSavedView(this.savedView, true)
       this.router.navigate(["documents"])
     }
   }
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 071c8e249..af98a6f7f 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -191,8 +191,8 @@ export class DocumentDetailComponent implements OnInit {
 
   close() {
     this.openDocumentService.closeDocument(this.document)
-    if (this.documentListViewService.savedViewId) {
-      this.router.navigate(['view', this.documentListViewService.savedViewId])
+    if (this.documentListViewService.activeSavedViewId) {
+      this.router.navigate(['view', this.documentListViewService.activeSavedViewId])
     } else {
       this.router.navigate(['documents'])
     }
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 04fc2a978..ebc7a8c11 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -137,7 +137,7 @@ export class BulkEditorComponent {
       } else {
         modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} and remove the tags ${this._localizeList(changedTags.itemsToRemove)} on ${this.list.selected.size} selected document(s).`
       }
-      
+
       modal.componentInstance.btnClass = "btn-warning"
       modal.componentInstance.btnCaption = $localize`Confirm`
       modal.componentInstance.confirmClicked.subscribe(() => {
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index cfc2e655d..75a9804a2 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -63,12 +63,12 @@
   <div class="btn-group ml-2 flex-fill" ngbDropdown role="group">
     <button class="btn btn-sm btn-outline-primary dropdown-toggle flex-fill" ngbDropdownToggle i18n>Views</button>
     <div class="dropdown-menu shadow dropdown-menu-right" ngbDropdownMenu>
-      <ng-container *ngIf="!list.savedViewId">
+      <ng-container *ngIf="!list.activeSavedViewId">
         <button ngbDropdownItem *ngFor="let view of savedViewService.allViews" (click)="loadViewConfig(view)">{{view.name}}</button>
         <div class="dropdown-divider" *ngIf="savedViewService.allViews.length > 0"></div>
       </ng-container>
 
-      <button ngbDropdownItem (click)="saveViewConfig()" *ngIf="list.savedViewId" i18n>Save "{{list.savedViewTitle}}"</button>
+      <button ngbDropdownItem (click)="saveViewConfig()" *ngIf="list.activeSavedViewId" i18n>Save "{{list.activeSavedViewTitle}}"</button>
       <button ngbDropdownItem (click)="saveViewConfigAs()" i18n>Save as...</button>
     </div>
   </div>
@@ -86,7 +86,7 @@
     <span i18n *ngIf="list.selected.size == 0">{list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}}</span>&nbsp;<span i18n *ngIf="isFiltered">(filtered)</span>
   </p>
   <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
-  [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
+  [rotate]="true" aria-label="Default pagination"></ngb-pagination>
 </div>
 
 <div *ngIf="displayMode == 'largeCards'">
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 0d1562c24..cf7afb845 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, OnDestroy, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
+import { Component, OnDestroy, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Subscription } from 'rxjs';
@@ -9,7 +9,7 @@ import { ConsumerStatusService } from 'src/app/services/consumer-status.service'
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
-import { Toast, ToastService } from 'src/app/services/toast.service';
+import { ToastService } from 'src/app/services/toast.service';
 import { FilterEditorComponent } from './filter-editor/filter-editor.component';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
 
@@ -46,7 +46,7 @@ export class DocumentListComponent implements OnInit, OnDestroy {
   }
 
   getTitle() {
-    return this.list.savedViewTitle || $localize`Documents`
+    return this.list.activeSavedViewTitle || $localize`Documents`
   }
 
   getSortFields() {
@@ -73,19 +73,18 @@ export class DocumentListComponent implements OnInit, OnDestroy {
       this.list.reload()
     })
     this.route.paramMap.subscribe(params => {
-      this.list.clear()
       if (params.has('id')) {
         this.savedViewService.getCached(+params.get('id')).subscribe(view => {
           if (!view) {
             this.router.navigate(["404"])
             return
           }
-          this.list.savedView = view
+          this.list.activateSavedView(view)
           this.list.reload()
           this.rulesChanged()
         })
       } else {
-        this.list.savedView = null
+        this.list.activateSavedView(null)
         this.list.reload()
         this.rulesChanged()
       }
@@ -99,16 +98,23 @@ export class DocumentListComponent implements OnInit, OnDestroy {
   }
 
   loadViewConfig(view: PaperlessSavedView) {
-    this.list.load(view)
+    this.list.loadSavedView(view)
     this.list.reload()
     this.rulesChanged()
   }
 
   saveViewConfig() {
-    this.savedViewService.update(this.list.savedView).subscribe(result => {
-      this.toastService.showInfo($localize`View "${this.list.savedView.name}" saved successfully.`)
-    })
-
+    if (this.list.activeSavedViewId != null) {
+      let savedView: PaperlessSavedView = {
+        id: this.list.activeSavedViewId,
+        filter_rules: this.list.filterRules,
+        sort_field: this.list.sortField,
+        sort_reverse: this.list.sortReverse
+      }
+      this.savedViewService.patch(savedView).subscribe(result => {
+        this.toastService.showInfo($localize`View "${this.list.activeSavedViewTitle}" saved successfully.`)
+      })
+    }
   }
 
   saveViewConfigAs() {
@@ -116,7 +122,7 @@ export class DocumentListComponent implements OnInit, OnDestroy {
     modal.componentInstance.defaultName = this.filterEditor.generateFilterName()
     modal.componentInstance.saveClicked.subscribe(formValue => {
       modal.componentInstance.buttonsEnabled = false
-      let savedView = {
+      let savedView: PaperlessSavedView = {
         name: formValue.name,
         show_on_dashboard: formValue.showOnDashboard,
         show_in_sidebar: formValue.showInSideBar,
@@ -137,8 +143,8 @@ export class DocumentListComponent implements OnInit, OnDestroy {
 
   resetFilters(): void {
     this.filterRulesModified = false
-    if (this.list.savedViewId) {
-      this.savedViewService.getCached(this.list.savedViewId).subscribe(viewUntouched => {
+    if (this.list.activeSavedViewId) {
+      this.savedViewService.getCached(this.list.activeSavedViewId).subscribe(viewUntouched => {
         this.list.filterRules = viewUntouched.filter_rules
         this.list.reload()
       })
@@ -150,11 +156,11 @@ export class DocumentListComponent implements OnInit, OnDestroy {
 
   rulesChanged() {
     let modified = false
-    if (this.list.savedView == null) {
+    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.savedViewId).subscribe(view => {
+      this.savedViewService.getCached(this.list.activeSavedViewId).subscribe(view => {
         let filterRulesInitial = view.filter_rules
 
         if (this.list.filterRules.length !== filterRulesInitial.length) modified = true
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 4eb0c276c..334706a3c 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -8,6 +8,23 @@ import { DOCUMENT_LIST_SERVICE } from '../data/storage-keys';
 import { DocumentService } from './rest/document.service';
 import { SettingsService, SETTINGS_KEYS } from './settings.service';
 
+interface ListViewState {
+
+  title?: string
+
+  documents?: PaperlessDocument[]
+
+  currentPage: number
+  collectionSize: number
+
+  sortField: string
+  sortReverse: boolean
+
+  filterRules: FilterRule[]
+
+  selected?: Set<number>
+
+}
 
 /**
  * This service manages the document list which is displayed using the document list view.
@@ -20,156 +37,174 @@ import { SettingsService, SETTINGS_KEYS } from './settings.service';
 })
 export class DocumentListViewService {
 
-  static DEFAULT_SORT_FIELD = 'created'
-
   isReloading: boolean = false
-  documents: PaperlessDocument[] = []
-  currentPage = 1
-  currentPageSize: number = this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)
-  collectionSize: number
+
   rangeSelectionAnchorIndex: number
   lastRangeSelectionToIndex: number
 
-  /**
-   * This is the current config for the document list. The service will always remember the last settings used for the document list.
-   */
-  private _documentListViewConfig: PaperlessSavedView
-  /**
-   * Optionally, this is the currently selected saved view, which might be null.
-   */
-  private _savedViewConfig: PaperlessSavedView
+  currentPageSize: number = this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)
 
-  get savedView(): PaperlessSavedView {
-    return this._savedViewConfig
+  private listViewStates: Map<number, ListViewState> = new Map()
+
+  private _activeSavedViewId: number = null
+
+  get activeSavedViewId() {
+    return this._activeSavedViewId
   }
 
-  set savedView(value: PaperlessSavedView) {
-    if (value && !this._savedViewConfig || value && value.id != this._savedViewConfig.id) {
-      //saved view inactive and should be active now, or saved view active, but a different view is requested
-      //this is here so that we don't modify value, which might be the actual instance of the saved view.
-      this.selectNone()
-      this._savedViewConfig = Object.assign({}, value)
-    } else if (this._savedViewConfig && !value) {
-      //saved view active, but document list requested
-      this.selectNone()
-      this._savedViewConfig = null
+  get activeSavedViewTitle() {
+    return this.activeListViewState.title
+  }
+
+  private defaultListViewState(): ListViewState {
+    return {
+      title: null,
+      documents: [],
+      currentPage: 1,
+      collectionSize: null,
+      sortField: "created",
+      sortReverse: true,
+      filterRules: [],
+      selected: new Set<number>()
     }
   }
 
-  get savedViewId() {
-    return this.savedView?.id
+  private get activeListViewState() {
+    if (!this.listViewStates.has(this._activeSavedViewId)) {
+      this.listViewStates.set(this._activeSavedViewId, this.defaultListViewState())
+    }
+    return this.listViewStates.get(this._activeSavedViewId)
   }
 
-  get savedViewTitle() {
-    return this.savedView?.name
-  }
-
-  get documentListView() {
-    return this._documentListViewConfig
-  }
-
-  set documentListView(value) {
-    if (value) {
-      this._documentListViewConfig = Object.assign({}, value)
-      this.saveDocumentListView()
+  activateSavedView(view: PaperlessSavedView) {
+    this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null
+    if (view) {
+      this._activeSavedViewId = view.id
+      this.loadSavedView(view)
+    } else {
+      this._activeSavedViewId = null
     }
   }
 
-  /**
-   * This is what switches between the saved views and the document list view. Everything on the document list uses
-   * this property to determine the settings for the currently displayed document list.
-   */
-  get view() {
-    return this.savedView || this.documentListView
-  }
-
-  load(view: PaperlessSavedView) {
-    this.documentListView.filter_rules = cloneFilterRules(view.filter_rules)
-    this.documentListView.sort_reverse = view.sort_reverse
-    this.documentListView.sort_field = view.sort_field
-    this.saveDocumentListView()
-  }
-
-  clear() {
-    this.collectionSize = null
-    this.documents = []
-    this.currentPage = 1
+  loadSavedView(view: PaperlessSavedView, closeCurrentView: boolean = false) {
+    if (closeCurrentView) {
+      this._activeSavedViewId = null
+    }
+    this.activeListViewState.filterRules = cloneFilterRules(view.filter_rules)
+    this.activeListViewState.sortField = view.sort_field
+    this.activeListViewState.sortReverse = view.sort_reverse
+    if (this._activeSavedViewId) {
+      this.activeListViewState.title = view.name
+    }
+    this.reduceSelectionToFilter()
   }
 
   reload(onFinish?) {
     this.isReloading = true
+    let activeListViewState = this.activeListViewState
+
     this.documentService.listFiltered(
-      this.currentPage,
+      activeListViewState.currentPage,
       this.currentPageSize,
-      this.view.sort_field,
-      this.view.sort_reverse,
-      this.view.filter_rules).subscribe(
+      activeListViewState.sortField,
+      activeListViewState.sortReverse,
+      activeListViewState.filterRules).subscribe(
         result => {
-          this.collectionSize = result.count
-          this.documents = result.results
+          this.isReloading = false
+          activeListViewState.collectionSize = result.count
+          activeListViewState.documents = result.results
           if (onFinish) {
             onFinish()
           }
           this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null
-          this.isReloading = false
         },
         error => {
-          if (this.currentPage != 1 && error.status == 404) {
+          this.isReloading = false
+          if (activeListViewState.currentPage != 1 && error.status == 404) {
             // this happens when applying a filter: the current page might not be available anymore due to the reduced result set.
-            this.currentPage = 1
+            activeListViewState.currentPage = 1
             this.reload()
           }
-          this.isReloading = false
         })
   }
 
   set filterRules(filterRules: FilterRule[]) {
-    //we're going to clone the filterRules object, since we don't
-    //want changes in the filter editor to propagate into here right away.
-    this.view.filter_rules = filterRules
+    this.activeListViewState.filterRules = filterRules
     this.reload()
     this.reduceSelectionToFilter()
     this.saveDocumentListView()
   }
 
   get filterRules(): FilterRule[] {
-    return this.view.filter_rules
+    return this.activeListViewState.filterRules
   }
 
   set sortField(field: string) {
-    this.view.sort_field = field
-    this.saveDocumentListView()
+    this.activeListViewState.sortField = field
     this.reload()
+    this.saveDocumentListView()
   }
 
   get sortField(): string {
-    return this.view.sort_field
+    return this.activeListViewState.sortField
   }
 
   set sortReverse(reverse: boolean) {
-    this.view.sort_reverse = reverse
-    this.saveDocumentListView()
+    this.activeListViewState.sortReverse = reverse
     this.reload()
+    this.saveDocumentListView()
   }
 
   get sortReverse(): boolean {
-    return this.view.sort_reverse
+    return this.activeListViewState.sortReverse
+  }
+
+  get collectionSize(): number {
+    return this.activeListViewState.collectionSize
+  }
+
+  get currentPage(): number {
+    return this.activeListViewState.currentPage
+  }
+
+  set currentPage(page: number) {
+    this.activeListViewState.currentPage = page
+    this.reload()
+    this.saveDocumentListView()
+  }
+
+  get documents(): PaperlessDocument[] {
+    return this.activeListViewState.documents
+  }
+
+  get selected(): Set<number> {
+    return this.activeListViewState.selected
   }
 
   setSort(field: string, reverse: boolean) {
-    this.view.sort_field = field
-    this.view.sort_reverse = reverse
-    this.saveDocumentListView()
+    this.activeListViewState.sortField = field
+    this.activeListViewState.sortReverse = reverse
     this.reload()
+    this.saveDocumentListView()
   }
 
   private saveDocumentListView() {
-    sessionStorage.setItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG, JSON.stringify(this.documentListView))
+    if (this._activeSavedViewId == null) {
+      let savedState: ListViewState = {
+        collectionSize: this.activeListViewState.collectionSize,
+        currentPage: this.activeListViewState.currentPage,
+        filterRules: this.activeListViewState.filterRules,
+        sortField: this.activeListViewState.sortField,
+        sortReverse: this.activeListViewState.sortReverse
+      }
+      sessionStorage.setItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG, JSON.stringify(savedState))
+    }
   }
 
   quickFilter(filterRules: FilterRule[]) {
-    this.savedView = null
-    this.view.filter_rules = filterRules
+    this._activeSavedViewId = null
+    this.activeListViewState.filterRules = filterRules
+    this.activeListViewState.currentPage = 1
     this.reduceSelectionToFilter()
     this.saveDocumentListView()
     this.router.navigate(["documents"])
@@ -217,8 +252,6 @@ export class DocumentListViewService {
     }
   }
 
-  selected = new Set<number>()
-
   selectNone() {
     this.selected.clear()
     this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null
@@ -227,13 +260,11 @@ export class DocumentListViewService {
   reduceSelectionToFilter() {
     if (this.selected.size > 0) {
       this.documentService.listAllFilteredIds(this.filterRules).subscribe(ids => {
-        let subset = new Set<number>()
-        for (let id of ids) {
-          if (this.selected.has(id)) {
-            subset.add(id)
+        for (let id of this.selected) {
+          if (!ids.includes(id)) {
+            this.selected.delete(id)
           }
         }
-        this.selected = subset
       })
     }
   }
@@ -287,20 +318,21 @@ export class DocumentListViewService {
   }
 
   constructor(private documentService: DocumentService, private settings: SettingsService, private router: Router) {
-    let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
+     let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
     if (documentListViewConfigJson) {
       try {
-        this.documentListView = JSON.parse(documentListViewConfigJson)
+        let savedState: ListViewState = JSON.parse(documentListViewConfigJson)
+        // Remove null elements from the restored state
+        Object.keys(savedState).forEach(k => {
+          if (savedState[k] == null) {
+            delete savedState[k]
+          }
+        })
+        //only use restored state attributes instead of defaults if they are not null
+        let newState = Object.assign(this.defaultListViewState(), savedState)
+        this.listViewStates.set(null, newState)
       } catch (e) {
         sessionStorage.removeItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
-        this.documentListView = null
-      }
-    }
-    if (!this.documentListView || this.documentListView.filter_rules == null || this.documentListView.sort_reverse == null || this.documentListView.sort_field == null) {
-      this.documentListView = {
-        filter_rules: [],
-        sort_reverse: true,
-        sort_field: 'created'
       }
     }
   }

From b5a8106a6ab1da778e0f2a0bf09e7f0257224bce Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Thu, 18 Feb 2021 16:43:41 +0000
Subject: [PATCH 1222/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 78 +++++++++++++++++++------------
 1 file changed, 47 insertions(+), 31 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index cc5e1d68a..aa57afdab 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -58,11 +58,11 @@
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
-        <source>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; saved successfully.</source>
-        <target>Ansicht &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; erfolgreich gespeichert.</target>
+        <source>View &quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&quot; saved successfully.</source>
+        <target>Ansicht &quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&quot; erfolgreich gespeichert.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">109</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
@@ -70,7 +70,7 @@
         <target>Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; erfolgreich erstellt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">130</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
@@ -129,9 +129,9 @@
           <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="72e7d343f9165602cce1ca7faffbc565fd31ef92">
-        <source>Save &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
-        <target>&quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot; speichern</target>
+      <trans-unit datatype="html" id="5f5ce787c428d917c30c9bd70789a618e09743a7">
+        <source>Save &quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
+        <target>&quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&quot; speichern</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">71</context>
@@ -585,14 +585,6 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5ca707824ab93066c7d9b44e1b8bf216725c2c22">
-        <source>Filter</source>
-        <target>Filtern</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="5610279464668232148">
         <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
         <target>Gespeicherte Ansicht &quot;<x equiv-text="savedView.name" id="PH"/>&quot; gelöscht.</target>
@@ -622,7 +614,15 @@
         <target>Benutze Datumsformat der Anzeigesprache</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">96</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4912706592792948707">
+        <source>ISO 8601</source>
+        <target>ISO 8601</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -630,7 +630,7 @@
         <target>Fehler beim Speichern der Einstellungen auf dem Server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -1234,6 +1234,14 @@
           <context context-type="linenumber">46</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="6523384805359286307">
+        <source>Title: <x equiv-text="rule.value" id="PH"/></source>
+        <target>Titel: <x equiv-text="rule.value" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
         <source>Filter tags</source>
         <target>Tags filtern</target>
@@ -1614,22 +1622,22 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="46c8fe557cf52c9389783627d4f85453f4ddb459">
-        <source>Documents in inbox: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></source>
-        <target>Dokumente im Posteingang: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438">
-        <source>Total documents: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></source>
-        <target>Anzahl Dokumente gesamt: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="c0d907c2687c09612395aee6ef7c04ca8e5e5e0a">
+        <source>Total documents: <x equiv-text="{{statistics?.documents_total}}" id="INTERPOLATION"/></source>
+        <target>Anzahl Dokumente gesamt: <x equiv-text="{{statistics?.documents_total}}" id="INTERPOLATION"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="13e8d49dbcad9f9d71e66a9a56d6f328cff430c9">
+        <source>Documents in inbox: <x equiv-text="{{statistics?.documents_inbox}}" id="INTERPOLATION"/></source>
+        <target>Dokumente im Posteingang: <x equiv-text="{{statistics?.documents_inbox}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="6443586946875325554">
         <source>Processing: <x equiv-text="countUploadingAndProcessing" id="PH"/></source>
         <target>Verarbeite: <x equiv-text="countUploadingAndProcessing" id="PH"/></target>
@@ -1848,12 +1856,20 @@
           <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="6987083569809053351">
+        <source>English (GB)</source>
+        <target>Englisch (UK)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
         <source>German</source>
         <target>Deutsch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1861,7 +1877,7 @@
         <target>Niederländisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1869,7 +1885,7 @@
         <target>Französisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2119857572761283468">

From efb49af7ac44285fe260d698652f1af817dd5ce2 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Thu, 18 Feb 2021 16:44:55 +0000
Subject: [PATCH 1223/1300] Translate /src-ui/messages.xlf in en_GB

translation completed for the source file '/src-ui/messages.xlf'
on the 'en_GB' language.
---
 src-ui/src/locale/messages.en_GB.xlf | 78 +++++++++++++++++-----------
 1 file changed, 47 insertions(+), 31 deletions(-)

diff --git a/src-ui/src/locale/messages.en_GB.xlf b/src-ui/src/locale/messages.en_GB.xlf
index 49baa77ed..14ab56659 100644
--- a/src-ui/src/locale/messages.en_GB.xlf
+++ b/src-ui/src/locale/messages.en_GB.xlf
@@ -58,11 +58,11 @@
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
-        <source>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; saved successfully.</source>
-        <target>View &amp;quot;<x equiv-text="this.list.savedView.name" id="PH"/>&amp;quot; saved successfully.</target>
+        <source>View &quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&quot; saved successfully.</source>
+        <target>View &amp;quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&amp;quot; saved successfully.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">109</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
@@ -70,7 +70,7 @@
         <target>View &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; created successfully.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">130</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
@@ -129,9 +129,9 @@
           <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="72e7d343f9165602cce1ca7faffbc565fd31ef92">
-        <source>Save &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
-        <target>Save &amp;quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&amp;quot;</target>
+      <trans-unit datatype="html" id="5f5ce787c428d917c30c9bd70789a618e09743a7">
+        <source>Save &quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
+        <target>Save &amp;quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&amp;quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">71</context>
@@ -585,14 +585,6 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5ca707824ab93066c7d9b44e1b8bf216725c2c22">
-        <source>Filter</source>
-        <target>Filter</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="5610279464668232148">
         <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
         <target>Saved view &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; deleted.</target>
@@ -622,7 +614,15 @@
         <target>Use date format of display language</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">96</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4912706592792948707">
+        <source>ISO 8601</source>
+        <target>ISO 8601</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -630,7 +630,7 @@
         <target>Error while storing settings on server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -1234,6 +1234,14 @@
           <context context-type="linenumber">46</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="6523384805359286307">
+        <source>Title: <x equiv-text="rule.value" id="PH"/></source>
+        <target>Title: <x equiv-text="rule.value" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
         <source>Filter tags</source>
         <target>Filter tags</target>
@@ -1614,22 +1622,22 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="46c8fe557cf52c9389783627d4f85453f4ddb459">
-        <source>Documents in inbox: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></source>
-        <target>Documents in inbox: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438">
-        <source>Total documents: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></source>
-        <target>Total documents: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="c0d907c2687c09612395aee6ef7c04ca8e5e5e0a">
+        <source>Total documents: <x equiv-text="{{statistics?.documents_total}}" id="INTERPOLATION"/></source>
+        <target>Total documents: <x equiv-text="{{statistics?.documents_total}}" id="INTERPOLATION"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="13e8d49dbcad9f9d71e66a9a56d6f328cff430c9">
+        <source>Documents in inbox: <x equiv-text="{{statistics?.documents_inbox}}" id="INTERPOLATION"/></source>
+        <target>Documents in inbox: <x equiv-text="{{statistics?.documents_inbox}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="6443586946875325554">
         <source>Processing: <x equiv-text="countUploadingAndProcessing" id="PH"/></source>
         <target>Processing: <x equiv-text="countUploadingAndProcessing" id="PH"/></target>
@@ -1848,12 +1856,20 @@
           <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="6987083569809053351">
+        <source>English (GB)</source>
+        <target>English (GB)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
         <source>German</source>
         <target>German</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1861,7 +1877,7 @@
         <target>Dutch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1869,7 +1885,7 @@
         <target>French</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2119857572761283468">

From 1140a878b47066107436e0996f8966a3bc258ee7 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Fri, 19 Feb 2021 11:22:43 +0100
Subject: [PATCH 1224/1300] Update README.md

---
 README.md | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index c90be0912..ea47248dc 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,16 @@
 
 # Paperless-ng
 
-[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and contributors that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents.
+[Paperless (click me)](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and contributors that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents.
 
-Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. 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.
+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.
+* 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, depending on the configuration. It still runs on 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.
 
 # How it Works
 
@@ -32,8 +39,8 @@ Here's what you get:
 * Performs OCR on your documents, adds selectable text to image only documents and adds tags, correspondents and document types to your documents.
 * Supports PDF documents, images, plain text files, and Office documents (Word, Excel, Powerpoint, and LibreOffice equivalents).
 	* Office document support is optional and provided by Apache Tika (see [configuration](https://paperless-ng.readthedocs.io/en/latest/configuration.html#tika-settings))
-* Paperless stores your documents plain on disk. Filenames and folders are managed by paperless and can be configured freely.
-* Single page application front end. Should be pretty snappy. Will be mobile friendly in the future.
+* Paperless stores your documents plain on disk. Filenames and folders are managed by paperless and their format can be configured freely.
+* Single page application front end.
 	* Includes a dashboard that shows basic statistics and has document upload.
 	* Filtering by tags, correspondents, types, and more.
 	* Customizable views can be saved and displayed on the dashboard.
@@ -44,14 +51,13 @@ Here's what you get:
 	* Searching for similar documents ("More like this")
 * Email processing: Paperless adds documents from your email accounts.
 	* Configure multiple accounts and filters for each account.
-	* When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them or delete them.
+	* When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them as important or delete them.
 * Machine learning powered document matching.
 	* Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless.
-* A task processor that processes documents in parallel and also tells you when something goes wrong. On modern multi core systems, consumption is blazing fast.
+* 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). However, some parts of the UI have changed since I took these.
-
-For a complete list of changes from paperless, check out the [changelog](https://paperless-ng.readthedocs.io/en/latest/changelog.html)
+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
 
@@ -103,4 +109,4 @@ These projects also exist, but their status and compatibility with paperless-ng
 
 # Important Note
 
-Document scanners are typically used to scan sensitive documents.  Things like your social insurance number, tax records, invoices, etc.  Everything is stored in the clear without encryption by default (it needs to be searchable, so if someone has ideas on how to do that on encrypted data, I'm all ears).  This means that Paperless should never be run on an untrusted host.  Instead, I recommend that if you do want to use it, run it locally on a server in your own home.
+Document scanners are typically used to scan sensitive documents.  Things like your social insurance number, tax records, invoices, etc.  Everything is stored in the clear without encryption. This means that Paperless should never be run on an untrusted host.  Instead, I recommend that if you do want to use it, run it locally on a server in your own home.

From 44936dc5f0663d086dfc45d0d3caa8ad3c0f4e05 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Fri, 19 Feb 2021 11:24:21 +0100
Subject: [PATCH 1225/1300] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ea47248dc..745c3b8f9 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Paperless-ng is a fork of the original project, adding a new interface and many
 
 * 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.
 * 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, depending on the configuration. 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. It still runs on 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.

From 950bb468278856afd51c18d18f7f4c8cbf6a331b Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Fri, 19 Feb 2021 11:31:14 +0100
Subject: [PATCH 1226/1300] version bump

---
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 6df8ec565..51beb3fba 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,7 +2,7 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "1.1.4",
+  version: "1.1.5",
   webSocketHost: window.location.host,
   webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:")
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index f336d581e..b21fef930 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (1, 1, 4)
+__version__ = (1, 1, 5)

From 4de4789605469dfbf01fd5c274e4cb1e8e900185 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Fri, 19 Feb 2021 11:34:51 +0100
Subject: [PATCH 1227/1300] this took way too much time

---
 resources/logo.txt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 resources/logo.txt

diff --git a/resources/logo.txt b/resources/logo.txt
new file mode 100644
index 000000000..75a1d2c75
--- /dev/null
+++ b/resources/logo.txt
@@ -0,0 +1,16 @@
+                         9w
+                       {@@N
+                     Q@@@@H
+                  G@@@@@@@\
+               SilN@@@@@@@
+            *Q  *@@@@@@@@S        /= = = = = = = = = = = = = = = = = =\
+          *@   B@@@@@@@@N        ||                                   ||
+ N       R$  A@@@@@@@@@@         ||           PAPERLESS-NG            ||
+x@@     $U  B@@@@@@@@@R          ||                                   ||
+N@@N^   @  N@@@@@@@@@*            \= = = = = = = = = = = = = = = = = =/
+|@@@u   @ E@@@@@@@@l
+ Q@@@ \ Px@@@@@@P
+  1@@S`  @@@o'
+    z$  ;
+       v
+      /

From 0ae9aecdef1cd0c40a10f83ca02e3afb3d8b37f2 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Fri, 19 Feb 2021 11:51:59 +0100
Subject: [PATCH 1228/1300] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 745c3b8f9..83ef1c1ed 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Paperless-ng is a fork of the original project, adding a new interface and many
 
 * 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.
 * 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. 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 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.

From 31f03ef1d301a6e23c276408e88d53aadf6886f2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sat, 20 Feb 2021 16:09:29 +0100
Subject: [PATCH 1229/1300] API support for downloading compressed archives of
 multiple documents

---
 src/documents/bulk_download.py  |  60 +++++++++++++++++
 src/documents/serialisers.py    |  65 ++++++++++++-------
 src/documents/tests/test_api.py | 111 ++++++++++++++++++++++++++++++++
 src/documents/views.py          |  58 ++++++++++++++++-
 src/paperless/urls.py           |   6 +-
 5 files changed, 274 insertions(+), 26 deletions(-)
 create mode 100644 src/documents/bulk_download.py

diff --git a/src/documents/bulk_download.py b/src/documents/bulk_download.py
new file mode 100644
index 000000000..8c675b4b5
--- /dev/null
+++ b/src/documents/bulk_download.py
@@ -0,0 +1,60 @@
+from zipfile import ZipFile
+
+from documents.models import Document
+
+
+class BulkArchiveStrategy:
+
+    def __init__(self, zipf: ZipFile):
+        self.zipf = zipf
+
+    def make_unique_filename(self,
+                             doc: Document,
+                             archive: bool = False,
+                             folder: str = ""):
+        counter = 0
+        while True:
+            filename = folder + doc.get_public_filename(archive, counter)
+            if filename in self.zipf.namelist():
+                counter += 1
+            else:
+                return filename
+
+    def add_document(self, doc: Document):
+        raise NotImplementedError()  # pragma: no cover
+
+
+class OriginalsOnlyStrategy(BulkArchiveStrategy):
+
+    def add_document(self, doc: Document):
+        self.zipf.write(doc.source_path, self.make_unique_filename(doc))
+
+
+class ArchiveOnlyStrategy(BulkArchiveStrategy):
+
+    def __init__(self, zipf):
+        super(ArchiveOnlyStrategy, self).__init__(zipf)
+
+    def add_document(self, doc: Document):
+        if doc.has_archive_version:
+            self.zipf.write(doc.archive_path,
+                            self.make_unique_filename(doc, archive=True))
+        else:
+            self.zipf.write(doc.source_path,
+                            self.make_unique_filename(doc))
+
+
+class OriginalAndArchiveStrategy(BulkArchiveStrategy):
+
+    def add_document(self, doc: Document):
+        if doc.has_archive_version:
+            self.zipf.write(
+                doc.archive_path, self.make_unique_filename(
+                    doc, archive=True, folder="archive/"
+                )
+            )
+
+        self.zipf.write(
+            doc.source_path,
+            self.make_unique_filename(doc, folder="originals/")
+        )
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index b01f82805..66736bdbf 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -192,14 +192,34 @@ class SavedViewSerializer(serializers.ModelSerializer):
         return saved_view
 
 
-class BulkEditSerializer(serializers.Serializer):
+class DocumentListSerializer(serializers.Serializer):
 
     documents = serializers.ListField(
-        child=serializers.IntegerField(),
+        required=True,
         label="Documents",
-        write_only=True
+        write_only=True,
+        child=serializers.IntegerField()
     )
 
+    def _validate_document_id_list(self, documents, name="documents"):
+        if not type(documents) == list:
+            raise serializers.ValidationError(f"{name} must be a list")
+        if not all([type(i) == int for i in documents]):
+            raise serializers.ValidationError(
+                f"{name} must be a list of integers")
+        count = Document.objects.filter(id__in=documents).count()
+        if not count == len(documents):
+            raise serializers.ValidationError(
+                f"Some documents in {name} don't exist or were "
+                f"specified twice.")
+
+    def validate_documents(self, documents):
+        self._validate_document_id_list(documents)
+        return documents
+
+
+class BulkEditSerializer(DocumentListSerializer):
+
     method = serializers.ChoiceField(
         choices=[
             "set_correspondent",
@@ -215,18 +235,6 @@ class BulkEditSerializer(serializers.Serializer):
 
     parameters = serializers.DictField(allow_empty=True)
 
-    def _validate_document_id_list(self, documents, name="documents"):
-        if not type(documents) == list:
-            raise serializers.ValidationError(f"{name} must be a list")
-        if not all([type(i) == int for i in documents]):
-            raise serializers.ValidationError(
-                f"{name} must be a list of integers")
-        count = Document.objects.filter(id__in=documents).count()
-        if not count == len(documents):
-            raise serializers.ValidationError(
-                f"Some documents in {name} don't exist or were "
-                f"specified twice.")
-
     def _validate_tag_id_list(self, tags, name="tags"):
         if not type(tags) == list:
             raise serializers.ValidationError(f"{name} must be a list")
@@ -238,10 +246,6 @@ class BulkEditSerializer(serializers.Serializer):
             raise serializers.ValidationError(
                 f"Some tags in {name} don't exist or were specified twice.")
 
-    def validate_documents(self, documents):
-        self._validate_document_id_list(documents)
-        return documents
-
     def validate_method(self, method):
         if method == "set_correspondent":
             return bulk_edit.set_correspondent
@@ -392,9 +396,24 @@ class PostDocumentSerializer(serializers.Serializer):
             return None
 
 
-class SelectionDataSerializer(serializers.Serializer):
+class BulkDownloadSerializer(DocumentListSerializer):
 
-    documents = serializers.ListField(
-        required=True,
-        child=serializers.IntegerField()
+    content = serializers.ChoiceField(
+        choices=["archive", "originals", "both"],
+        default="archive"
     )
+
+    compression = serializers.ChoiceField(
+        choices=["none", "deflated", "bzip2", "lzma"],
+        default="none"
+    )
+
+    def validate_compression(self, compression):
+        import zipfile
+
+        return {
+            "none": zipfile.ZIP_STORED,
+            "deflated": zipfile.ZIP_DEFLATED,
+            "bzip2": zipfile.ZIP_BZIP2,
+            "lzma": zipfile.ZIP_LZMA
+        }[compression]
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 01e7210a5..7486154e1 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -1,7 +1,10 @@
+import datetime
+import io
 import json
 import os
 import shutil
 import tempfile
+import zipfile
 from unittest import mock
 
 from django.conf import settings
@@ -1123,6 +1126,113 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         self.assertCountEqual(response.data['selected_document_types'], [{"id": self.c1.id, "document_count": 1}, {"id": self.c2.id, "document_count": 0}])
 
 
+class TestBulkDownload(DirectoriesMixin, APITestCase):
+
+    def setUp(self):
+        super(TestBulkDownload, self).setUp()
+
+        user = User.objects.create_superuser(username="temp_admin")
+        self.client.force_login(user=user)
+
+        self.doc1 = Document.objects.create(title="unrelated", checksum="A")
+        self.doc2 = Document.objects.create(title="document A", filename="docA.pdf", mime_type="application/pdf", checksum="B", created=datetime.datetime(2021, 1, 1))
+        self.doc2b = Document.objects.create(title="document A", filename="docA2.pdf", mime_type="application/pdf", checksum="D", created=datetime.datetime(2021, 1, 1))
+        self.doc3 = Document.objects.create(title="document B", filename="docB.jpg", mime_type="image/jpeg", checksum="C", created=datetime.datetime(2020, 3, 21), archive_filename="docB.pdf", archive_checksum="D")
+
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), self.doc2.source_path)
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.png"), self.doc2b.source_path)
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.jpg"), self.doc3.source_path)
+        shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "test_with_bom.pdf"), self.doc3.archive_path)
+
+    def test_download_originals(self):
+        response = self.client.post("/api/documents/bulk_download/", json.dumps({
+            "documents": [self.doc2.id, self.doc3.id],
+            "content": "originals"
+        }), content_type='application/json')
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response['Content-Type'], 'application/zip')
+
+        with zipfile.ZipFile(io.BytesIO(response.content)) as zipf:
+            self.assertEqual(len(zipf.filelist), 2)
+            self.assertIn("2021-01-01 document A.pdf", zipf.namelist())
+            self.assertIn("2020-03-21 document B.jpg", zipf.namelist())
+
+            with self.doc2.source_file as f:
+                self.assertEqual(f.read(), zipf.read("2021-01-01 document A.pdf"))
+
+            with self.doc3.source_file as f:
+                self.assertEqual(f.read(), zipf.read("2020-03-21 document B.jpg"))
+
+    def test_download_default(self):
+        response = self.client.post("/api/documents/bulk_download/", json.dumps({
+            "documents": [self.doc2.id, self.doc3.id]
+        }), content_type='application/json')
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response['Content-Type'], 'application/zip')
+
+        with zipfile.ZipFile(io.BytesIO(response.content)) as zipf:
+            self.assertEqual(len(zipf.filelist), 2)
+            self.assertIn("2021-01-01 document A.pdf", zipf.namelist())
+            self.assertIn("2020-03-21 document B.pdf", zipf.namelist())
+
+            with self.doc2.source_file as f:
+                self.assertEqual(f.read(), zipf.read("2021-01-01 document A.pdf"))
+
+            with self.doc3.archive_file as f:
+                self.assertEqual(f.read(), zipf.read("2020-03-21 document B.pdf"))
+
+    def test_download_both(self):
+        response = self.client.post("/api/documents/bulk_download/", json.dumps({
+            "documents": [self.doc2.id, self.doc3.id],
+            "content": "both"
+        }), content_type='application/json')
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response['Content-Type'], 'application/zip')
+
+        with zipfile.ZipFile(io.BytesIO(response.content)) as zipf:
+            self.assertEqual(len(zipf.filelist), 3)
+            self.assertIn("originals/2021-01-01 document A.pdf", zipf.namelist())
+            self.assertIn("archive/2020-03-21 document B.pdf", zipf.namelist())
+            self.assertIn("originals/2020-03-21 document B.jpg", zipf.namelist())
+
+            with self.doc2.source_file as f:
+                self.assertEqual(f.read(), zipf.read("originals/2021-01-01 document A.pdf"))
+
+            with self.doc3.archive_file as f:
+                self.assertEqual(f.read(), zipf.read("archive/2020-03-21 document B.pdf"))
+
+            with self.doc3.source_file as f:
+                self.assertEqual(f.read(), zipf.read("originals/2020-03-21 document B.jpg"))
+
+    def test_filename_clashes(self):
+        response = self.client.post("/api/documents/bulk_download/", json.dumps({
+            "documents": [self.doc2.id, self.doc2b.id]
+        }), content_type='application/json')
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response['Content-Type'], 'application/zip')
+
+        with zipfile.ZipFile(io.BytesIO(response.content)) as zipf:
+            self.assertEqual(len(zipf.filelist), 2)
+
+            self.assertIn("2021-01-01 document A.pdf", zipf.namelist())
+            self.assertIn("2021-01-01 document A_01.pdf", zipf.namelist())
+
+            with self.doc2.source_file as f:
+                self.assertEqual(f.read(), zipf.read("2021-01-01 document A.pdf"))
+
+            with self.doc2b.source_file as f:
+                self.assertEqual(f.read(), zipf.read("2021-01-01 document A_01.pdf"))
+
+    def test_compression(self):
+        response = self.client.post("/api/documents/bulk_download/", json.dumps({
+            "documents": [self.doc2.id, self.doc2b.id],
+            "compression": "lzma"
+        }), content_type='application/json')
+
 class TestApiAuth(APITestCase):
 
     def test_auth_required(self):
@@ -1146,4 +1256,5 @@ class TestApiAuth(APITestCase):
         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/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)
diff --git a/src/documents/views.py b/src/documents/views.py
index 68d6e3c77..d886324ae 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -2,6 +2,7 @@ import logging
 import os
 import tempfile
 import uuid
+import zipfile
 from datetime import datetime
 from time import mktime
 
@@ -34,6 +35,8 @@ from rest_framework.viewsets import (
 
 from paperless.db import GnuPG
 from paperless.views import StandardPagination
+from .bulk_download import OriginalAndArchiveStrategy, OriginalsOnlyStrategy, \
+    ArchiveOnlyStrategy
 from .classifier import load_classifier
 from .filters import (
     CorrespondentFilterSet,
@@ -51,7 +54,9 @@ from .serialisers import (
     DocumentTypeSerializer,
     PostDocumentSerializer,
     SavedViewSerializer,
-    BulkEditSerializer, SelectionDataSerializer
+    BulkEditSerializer,
+    DocumentListSerializer,
+    BulkDownloadSerializer
 )
 
 
@@ -444,7 +449,7 @@ class PostDocumentView(APIView):
 class SelectionDataView(APIView):
 
     permission_classes = (IsAuthenticated,)
-    serializer_class = SelectionDataSerializer
+    serializer_class = DocumentListSerializer
     parser_classes = (parsers.MultiPartParser, parsers.JSONParser)
 
     def get_serializer_context(self):
@@ -606,3 +611,52 @@ class StatisticsView(APIView):
             'documents_total': documents_total,
             'documents_inbox': documents_inbox,
         })
+
+
+class BulkDownloadView(APIView):
+
+    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)
+
+        ids = serializer.validated_data.get('documents')
+        compression = serializer.validated_data.get('compression')
+        content = serializer.validated_data.get('content')
+
+        os.makedirs(settings.SCRATCH_DIR, exist_ok=True)
+        temp = tempfile.NamedTemporaryFile(dir=settings.SCRATCH_DIR, suffix="-compressed-archive", delete=False)
+
+        if content == 'both':
+            strategy_class = OriginalAndArchiveStrategy
+        elif content == 'originals':
+            strategy_class = OriginalsOnlyStrategy
+        else:
+            strategy_class = ArchiveOnlyStrategy
+
+        with zipfile.ZipFile(temp.name, "w", compression) as zipf:
+            strategy = strategy_class(zipf)
+            for id in ids:
+                doc = Document.objects.get(id=id)
+                strategy.add_document(doc)
+
+        with open(temp.name, "rb") as f:
+            response = HttpResponse(f, content_type="application/zip")
+            response["Content-Disposition"] = '{}; filename="{}"'.format(
+                "attachment", "documents.zip")
+
+            return response
diff --git a/src/paperless/urls.py b/src/paperless/urls.py
index 40f4bd754..4e0b8f191 100755
--- a/src/paperless/urls.py
+++ b/src/paperless/urls.py
@@ -23,7 +23,8 @@ from documents.views import (
     PostDocumentView,
     SavedViewViewSet,
     BulkEditView,
-    SelectionDataView
+    SelectionDataView,
+    BulkDownloadView
 )
 from paperless.views import FaviconView
 
@@ -63,6 +64,9 @@ urlpatterns = [
         re_path(r"^documents/selection_data/", SelectionDataView.as_view(),
                 name="selection_data"),
 
+        re_path(r"^documents/bulk_download/", BulkDownloadView.as_view(),
+                name="bulk_download"),
+
         path('token/', views.obtain_auth_token)
 
     ] + api_router.urls)),

From 203bc162cd8807968f964bb35f75747397b8856c Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sat, 20 Feb 2021 16:10:50 +0100
Subject: [PATCH 1230/1300] front end support for downloading multiple
 documents

---
 src-ui/messages.xlf                           | 49 +++++++++++--------
 src-ui/package-lock.json                      |  5 ++
 src-ui/package.json                           |  1 +
 .../bulk-editor/bulk-editor.component.html    | 14 ++++++
 .../bulk-editor/bulk-editor.component.ts      |  7 +++
 .../src/app/services/rest/document.service.ts |  4 ++
 6 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 731fdff7f..95e0fad15 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -1226,21 +1226,21 @@
         <source>Error executing bulk operation: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">74</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7894972847287473517" datatype="html">
         <source>&quot;<x id="PH" equiv-text="items[0].name"/>&quot;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">112</context>
+          <context context-type="linenumber">113</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8639884465898458690" datatype="html">
         <source>&quot;<x id="PH" equiv-text="items[0].name"/>&quot; and &quot;<x id="PH_1" equiv-text="items[1].name"/>&quot;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">115</context>
         </context-group>
         <note priority="1" from="description">This is for messages like &apos;modify &quot;tag1&quot; and &quot;tag2&quot;&apos;</note>
       </trans-unit>
@@ -1248,7 +1248,7 @@
         <source>, </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">117</context>
         </context-group>
         <note priority="1" from="description">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
       </trans-unit>
@@ -1256,7 +1256,7 @@
         <source><x id="PH" equiv-text="list"/> and &quot;<x id="PH_1" equiv-text="items[items.length - 1].name"/>&quot;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="linenumber">118</context>
         </context-group>
         <note priority="1" from="description">this is for messages like &apos;modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;&apos;</note>
       </trans-unit>
@@ -1264,112 +1264,112 @@
         <source>Confirm tags assignment</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">127</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6619516195038467207" datatype="html">
         <source>This operation will add the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">129</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1894412783609570695" datatype="html">
         <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToAdd)"/> to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">131</context>
+          <context context-type="linenumber">132</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7181166515756808573" datatype="html">
         <source>This operation will remove the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3819792277998068944" datatype="html">
         <source>This operation will remove the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToRemove)"/> from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">136</context>
+          <context context-type="linenumber">137</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2739066218579571288" datatype="html">
         <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList(changedTags.itemsToAdd)"/> and remove the tags <x id="PH_1" equiv-text="this._localizeList(changedTags.itemsToRemove)"/> on <x id="PH_2" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">138</context>
+          <context context-type="linenumber">139</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2996713129519325161" datatype="html">
         <source>Confirm correspondent assignment</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">158</context>
+          <context context-type="linenumber">159</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6900893559485781849" datatype="html">
         <source>This operation will assign the correspondent &quot;<x id="PH" equiv-text="correspondent.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">161</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1257522660364398440" datatype="html">
         <source>This operation will remove the correspondent from <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">162</context>
+          <context context-type="linenumber">163</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5393409374423140648" datatype="html">
         <source>Confirm document type assignment</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">181</context>
+          <context context-type="linenumber">182</context>
         </context-group>
       </trans-unit>
       <trans-unit id="332180123895325027" datatype="html">
         <source>This operation will assign the document type &quot;<x id="PH" equiv-text="documentType.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">183</context>
+          <context context-type="linenumber">184</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2236642492594872779" datatype="html">
         <source>This operation will remove the document type from <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">185</context>
+          <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit>
       <trans-unit id="749430623564850405" datatype="html">
         <source>Delete confirm</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4303174930844518780" datatype="html">
         <source>This operation will permanently delete <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">201</context>
+          <context context-type="linenumber">202</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5641451190833696892" datatype="html">
         <source>This operation cannot be undone.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">202</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6734339521247847366" datatype="html">
         <source>Delete document(s)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">204</context>
+          <context context-type="linenumber">205</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8b0609df23817024b3bed12beb9b64fc1009f588" datatype="html">
@@ -1393,6 +1393,13 @@
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="fc2de37422d7c4af6686842283cc2afd781b6848" datatype="html">
+        <source>Download originals</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">68</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="a1e6c11f20d4bf6e8e6b43e3c6d2561b2080645e" datatype="html">
         <source>Suggestions:</source>
         <context-group purpose="location">
diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json
index c3827f80c..148bc72eb 100644
--- a/src-ui/package-lock.json
+++ b/src-ui/package-lock.json
@@ -5545,6 +5545,11 @@
         "schema-utils": "^2.6.5"
       }
     },
+    "file-saver": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+    },
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
diff --git a/src-ui/package.json b/src-ui/package.json
index 14d828483..d6082c6b9 100644
--- a/src-ui/package.json
+++ b/src-ui/package.json
@@ -23,6 +23,7 @@
     "@ng-bootstrap/ng-bootstrap": "^8.0.0",
     "@ng-select/ng-select": "^5.0.9",
     "bootstrap": "^4.5.0",
+    "file-saver": "^2.0.5",
     "ng-bootstrap": "^1.6.3",
     "ng2-pdf-viewer": "^6.3.2",
     "ngx-cookie-service": "^10.1.1",
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 053126445..98716e2f9 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -56,6 +56,20 @@
     </div>
   </div>
   <div class="col-auto ml-auto mb-2 mb-xl-0 d-flex">
+    <div class="btn-group btn-group-sm mr-2">
+      <button type="button" class="btn btn-outline-primary btn-sm" (click)="downloadSelected()">
+        <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
+          <use xlink:href="assets/bootstrap-icons.svg#download" />
+        </svg>&nbsp;<ng-container i18n>Download</ng-container>
+      </button>
+      <div class="btn-group" ngbDropdown role="group" aria-label="Button group with nested dropdown">
+        <button class="btn btn-outline-primary btn-sm dropdown-toggle-split" ngbDropdownToggle></button>
+        <div class="dropdown-menu" ngbDropdownMenu>
+          <button ngbDropdownItem i18n (click)="downloadSelected('originals')">Download originals</button>
+        </div>
+      </div>
+    </div>
+
     <button type="button" class="btn btn-sm btn-outline-danger" (click)="applyDelete()">
       <svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
         <use xlink:href="assets/bootstrap-icons.svg#trash" />
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index ebc7a8c11..310290291 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -15,6 +15,7 @@ import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable
 import { MatchingModel } from 'src/app/data/matching-model';
 import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service';
 import { ToastService } from 'src/app/services/toast.service';
+import { saveAs } from 'file-saver';
 
 @Component({
   selector: 'app-bulk-editor',
@@ -207,4 +208,10 @@ export class BulkEditorComponent {
       this.executeBulkOperation(modal, "delete", {})
     })
   }
+
+  downloadSelected(content = "archive") {
+    this.documentService.bulkDownload(Array.from(this.list.selected), content).subscribe((result: any) => {
+      saveAs(result, 'documents.zip');
+    })
+  }
 }
diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index 19b18cfeb..40dbc64f7 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -134,4 +134,8 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     return this.http.get<PaperlessDocumentSuggestions>(this.getResourceUrl(id, 'suggestions'))
   }
 
+  bulkDownload(ids: number[], content="both") {
+    return this.http.post(this.getResourceUrl(null, 'bulk_download'), {"documents": ids, "content": content}, { responseType: 'blob' })
+  }
+
 }

From ccfd009c1a8f1f3c696b067356d8fa7da9e59191 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sat, 20 Feb 2021 15:44:19 +0000
Subject: [PATCH 1231/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 50 ++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index aa57afdab..6802f8dce 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -1400,7 +1400,7 @@
         <target>Fehler beim Ausführung der Massenverarbeitung: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">74</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7894972847287473517">
@@ -1408,7 +1408,7 @@
         <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">112</context>
+          <context context-type="linenumber">113</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
@@ -1416,7 +1416,7 @@
         <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; und &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">115</context>
         </context-group>
         <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
       </trans-unit>
@@ -1425,7 +1425,7 @@
         <target>, </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">117</context>
         </context-group>
         <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
       </trans-unit>
@@ -1434,7 +1434,7 @@
         <target><x equiv-text="list" id="PH"/> und &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="linenumber">118</context>
         </context-group>
         <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
       </trans-unit>
@@ -1443,7 +1443,7 @@
         <target>Tag-Zuweisung bestätigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">127</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6619516195038467207">
@@ -1451,7 +1451,7 @@
         <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten das Tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; hinzufügen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">129</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1894412783609570695">
@@ -1459,7 +1459,7 @@
         <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten die Tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> hinzufügen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">131</context>
+          <context context-type="linenumber">132</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7181166515756808573">
@@ -1467,7 +1467,7 @@
         <target>Diese Aktion wird das Tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; von <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3819792277998068944">
@@ -1475,7 +1475,7 @@
         <target>Diese Aktion wird die Tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> von <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">136</context>
+          <context context-type="linenumber">137</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2739066218579571288">
@@ -1483,7 +1483,7 @@
         <target>Diese Aktion wird die Tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> den <x equiv-text="this.list.selected.size" id="PH_2"/> ausgewählten Dokumenten hinzufügen und die Tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">138</context>
+          <context context-type="linenumber">139</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2996713129519325161">
@@ -1491,7 +1491,7 @@
         <target>Korrespondent-Zuweisung bestätigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">158</context>
+          <context context-type="linenumber">159</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6900893559485781849">
@@ -1499,7 +1499,7 @@
         <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten den Korrespondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; zuweisen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">161</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1257522660364398440">
@@ -1507,7 +1507,7 @@
         <target>Diese Aktion wird bei <x equiv-text="this.list.selected.size" id="PH"/> ausgewählten Dokumenten den Korrespondent entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">162</context>
+          <context context-type="linenumber">163</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5393409374423140648">
@@ -1515,7 +1515,7 @@
         <target>Dokumenttyp-Zuweisung bestätigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">181</context>
+          <context context-type="linenumber">182</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="332180123895325027">
@@ -1523,7 +1523,7 @@
         <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH_1"/> ausgewählten Dokumenten den Dokumenttyp &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; zuweisen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">183</context>
+          <context context-type="linenumber">184</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2236642492594872779">
@@ -1531,7 +1531,7 @@
         <target>Diese Aktion wird bei <x equiv-text="this.list.selected.size" id="PH"/> ausgewählten Dokumenten den Dokumenttyp entfernen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">185</context>
+          <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="749430623564850405">
@@ -1539,7 +1539,7 @@
         <target>Löschen bestätigen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4303174930844518780">
@@ -1547,7 +1547,7 @@
         <target>Diese Aktion wird <x equiv-text="this.list.selected.size" id="PH"/> ausgewählte Dokumente unwiderruflich löschen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">201</context>
+          <context context-type="linenumber">202</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5641451190833696892">
@@ -1555,7 +1555,7 @@
         <target>Diese Aktion kann nicht rückgängig gemacht werden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">202</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6734339521247847366">
@@ -1563,7 +1563,7 @@
         <target>Dokument(e) löschen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">204</context>
+          <context context-type="linenumber">205</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
@@ -1590,6 +1590,14 @@
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="fc2de37422d7c4af6686842283cc2afd781b6848">
+        <source>Download originals</source>
+        <target>Originale herunterladen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">68</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="a1e6c11f20d4bf6e8e6b43e3c6d2561b2080645e">
         <source>Suggestions:</source>
         <target>Vorschläge:</target>

From a9a8189d4b8be8c87330f6279467c62c8a93597f Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sat, 20 Feb 2021 17:45:27 +0000
Subject: [PATCH 1232/1300] Translate /src-ui/messages.xlf in nl_NL

translation completed for the source file '/src-ui/messages.xlf'
on the 'nl_NL' language.
---
 src-ui/src/locale/messages.nl_NL.xlf | 128 ++++++++++++++++-----------
 1 file changed, 76 insertions(+), 52 deletions(-)

diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf
index becc0e797..fa997d375 100644
--- a/src-ui/src/locale/messages.nl_NL.xlf
+++ b/src-ui/src/locale/messages.nl_NL.xlf
@@ -58,11 +58,11 @@
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
-        <source>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; saved successfully.</source>
-        <target>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; met succes opgeslagen.</target>
+        <source>View &quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&quot; saved successfully.</source>
+        <target>View &quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&quot; met succes opgeslagen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">109</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
@@ -70,7 +70,7 @@
         <target>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; met succes gemaakt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">130</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
@@ -129,9 +129,9 @@
           <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="72e7d343f9165602cce1ca7faffbc565fd31ef92">
-        <source>Save &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
-        <target>Opslaan &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</target>
+      <trans-unit datatype="html" id="5f5ce787c428d917c30c9bd70789a618e09743a7">
+        <source>Save &quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
+        <target>Opslaan &quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">71</context>
@@ -585,14 +585,6 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5ca707824ab93066c7d9b44e1b8bf216725c2c22">
-        <source>Filter</source>
-        <target>Filter</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="5610279464668232148">
         <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
         <target>Opgeslagen view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; verwijderd.</target>
@@ -622,7 +614,15 @@
         <target>Datumopmaak van weergavetaal gebruiken</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">96</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4912706592792948707">
+        <source>ISO 8601</source>
+        <target>ISO 8601</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -630,7 +630,7 @@
         <target>Fout bij het opslaan van de instellingen: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -1234,6 +1234,14 @@
           <context context-type="linenumber">46</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="6523384805359286307">
+        <source>Title: <x equiv-text="rule.value" id="PH"/></source>
+        <target>Titel: <x equiv-text="rule.value" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
         <source>Filter tags</source>
         <target>Etiketten filteren</target>
@@ -1392,7 +1400,7 @@
         <target>Fout bij het uitvoeren van een massabewerking: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">74</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7894972847287473517">
@@ -1400,7 +1408,7 @@
         <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">112</context>
+          <context context-type="linenumber">113</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
@@ -1408,7 +1416,7 @@
         <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; en &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">115</context>
         </context-group>
         <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
       </trans-unit>
@@ -1417,7 +1425,7 @@
         <target>, </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">117</context>
         </context-group>
         <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
       </trans-unit>
@@ -1426,7 +1434,7 @@
         <target><x equiv-text="list" id="PH"/> en &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="linenumber">118</context>
         </context-group>
         <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
       </trans-unit>
@@ -1435,7 +1443,7 @@
         <target>Bevestig toewijzen van etiketten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">127</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6619516195038467207">
@@ -1443,7 +1451,7 @@
         <target>Het etiket &quot;<x equiv-text="tag.name" id="PH"/>&quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">129</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1894412783609570695">
@@ -1451,7 +1459,7 @@
         <target>De etiketten <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> zullen aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">131</context>
+          <context context-type="linenumber">132</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7181166515756808573">
@@ -1459,7 +1467,7 @@
         <target>Het etiket &quot;<x equiv-text="tag.name" id="PH"/>&quot; zal verwijderd worden van <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3819792277998068944">
@@ -1467,7 +1475,7 @@
         <target>De etiketten <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> zullen verwijderd worden van <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">136</context>
+          <context context-type="linenumber">137</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2739066218579571288">
@@ -1475,7 +1483,7 @@
         <target>De etiketten <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> zullen toegevoegd worden aan, en de etiketten <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> zullen verwijderd worden van <x equiv-text="this.list.selected.size" id="PH_2"/> geselecteerd(e) document(en).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">138</context>
+          <context context-type="linenumber">139</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2996713129519325161">
@@ -1483,7 +1491,7 @@
         <target>Bevestig toewijzen van correspondent</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">158</context>
+          <context context-type="linenumber">159</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6900893559485781849">
@@ -1491,7 +1499,7 @@
         <target>De correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">161</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1257522660364398440">
@@ -1499,7 +1507,7 @@
         <target>De correspondent zal verwijderd worden van <x equiv-text="this.list.selected.size" id="PH"/> geselecteerd(e) document(en).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">162</context>
+          <context context-type="linenumber">163</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5393409374423140648">
@@ -1507,7 +1515,7 @@
         <target>Bevestig toewijzen van documenttype</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">181</context>
+          <context context-type="linenumber">182</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="332180123895325027">
@@ -1515,7 +1523,7 @@
         <target>Het documenttype &quot;<x equiv-text="documentType.name" id="PH"/>&quot; zal aan <x equiv-text="this.list.selected.size" id="PH_1"/> geselecteerd(e) document(en) worden toegewezen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">183</context>
+          <context context-type="linenumber">184</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2236642492594872779">
@@ -1523,7 +1531,7 @@
         <target>Het documenttype zal verwijderd worden van <x equiv-text="this.list.selected.size" id="PH"/> geselecteerd(e) document(en).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">185</context>
+          <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="749430623564850405">
@@ -1531,7 +1539,7 @@
         <target>Bevestig verwijderen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4303174930844518780">
@@ -1539,7 +1547,7 @@
         <target><x equiv-text="this.list.selected.size" id="PH"/> geselecteerd(e) document(en) zullen permanent worden verwijderd.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">201</context>
+          <context context-type="linenumber">202</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5641451190833696892">
@@ -1547,7 +1555,7 @@
         <target>Deze actie kan niet ongedaan worden gemaakt.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">202</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6734339521247847366">
@@ -1555,7 +1563,7 @@
         <target>Verwijder document(en)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">204</context>
+          <context context-type="linenumber">205</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
@@ -1582,6 +1590,14 @@
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="fc2de37422d7c4af6686842283cc2afd781b6848">
+        <source>Download originals</source>
+        <target>Originelen downloaden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">68</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="a1e6c11f20d4bf6e8e6b43e3c6d2561b2080645e">
         <source>Suggestions:</source>
         <target>Suggesties:</target>
@@ -1614,22 +1630,22 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="46c8fe557cf52c9389783627d4f85453f4ddb459">
-        <source>Documents in inbox: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></source>
-        <target>Documenten in &quot;Postvak in&quot;: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438">
-        <source>Total documents: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></source>
-        <target>Totaal aantal documenten: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="c0d907c2687c09612395aee6ef7c04ca8e5e5e0a">
+        <source>Total documents: <x equiv-text="{{statistics?.documents_total}}" id="INTERPOLATION"/></source>
+        <target>Totaal aantal documenten: <x equiv-text="{{statistics?.documents_total}}" id="INTERPOLATION"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="13e8d49dbcad9f9d71e66a9a56d6f328cff430c9">
+        <source>Documents in inbox: <x equiv-text="{{statistics?.documents_inbox}}" id="INTERPOLATION"/></source>
+        <target>Documenten in &quot;Postvak in&quot;: <x equiv-text="{{statistics?.documents_inbox}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="6443586946875325554">
         <source>Processing: <x equiv-text="countUploadingAndProcessing" id="PH"/></source>
         <target>Bezig met verwerken: <x equiv-text="countUploadingAndProcessing" id="PH"/></target>
@@ -1848,12 +1864,20 @@
           <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="6987083569809053351">
+        <source>English (GB)</source>
+        <target>Engels (Brits)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
         <source>German</source>
         <target>Duits</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1861,7 +1885,7 @@
         <target>Nederlands</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1869,7 +1893,7 @@
         <target>Frans</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2119857572761283468">

From 9cbb1c57260799f31396cdb7cf092ac079b60206 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 00:13:08 +0100
Subject: [PATCH 1233/1300] add some test files

---
 .../tests/samples/encrypted.pdf               | Bin 0 -> 81455 bytes
 .../tests/samples/rotated.pdf                 | Bin 0 -> 1322136 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/paperless_tesseract/tests/samples/encrypted.pdf
 create mode 100644 src/paperless_tesseract/tests/samples/rotated.pdf

diff --git a/src/paperless_tesseract/tests/samples/encrypted.pdf b/src/paperless_tesseract/tests/samples/encrypted.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5996edeea62b1509a42a7087d75f3770f4be4beb
GIT binary patch
literal 81455
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
bdG(8uBBP=sHN7|rW+<_EojUFvJc|E6HwKH>

literal 0
HcmV?d00001

diff --git a/src/paperless_tesseract/tests/samples/rotated.pdf b/src/paperless_tesseract/tests/samples/rotated.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..8b79a9082dd19d5846238dc2f2b0481fa215cb49
GIT binary patch
literal 1322136
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%0A7Uk;j5-V@*}G=qkA=3=yRzR!rNxs+wA<>C
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
X^~L=-6+jWyG>;wQmzOuRGUERaKW&U>

literal 0
HcmV?d00001


From ce121a261d3c4f88b829002106d172e9c892f8f5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 00:16:57 +0100
Subject: [PATCH 1234/1300] completely reworked the OCRmyPDF parser.

---
 paperless.conf.example             |   4 +
 src/paperless/settings.py          |   8 +
 src/paperless_tesseract/parsers.py | 294 +++++++++++++++++------------
 3 files changed, 190 insertions(+), 116 deletions(-)

diff --git a/paperless.conf.example b/paperless.conf.example
index 652a741b0..9c799b083 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -41,6 +41,10 @@
 #PAPERLESS_OCR_OUTPUT_TYPE=pdfa
 #PAPERLESS_OCR_PAGES=1
 #PAPERLESS_OCR_IMAGE_DPI=300
+#PAPERLESS_OCR_CLEAN=clean
+#PAPERLESS_OCR_DESKEW=false
+#PAPERLESS_OCR_ROTATE_PAGES=false
+#PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD=10
 #PAPERLESS_OCR_USER_ARGS={}
 #PAPERLESS_CONVERT_MEMORY_LIMIT=0
 #PAPERLESS_CONVERT_TMPDIR=/var/tmp/paperless
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 42ddec88d..abfb1afba 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -449,6 +449,14 @@ OCR_MODE = os.getenv("PAPERLESS_OCR_MODE", "skip")
 
 OCR_IMAGE_DPI = os.getenv("PAPERLESS_OCR_IMAGE_DPI")
 
+OCR_CLEAN = os.getenv("PAPERLESS_OCR_CLEAN", "clean")
+
+OCR_DESKEW = __get_boolean("PAPERLESS_OCR_DESKEW")
+
+OCR_ROTATE_PAGES = __get_boolean("PAPERLESS_OCR_ROTATE_PAGES")
+
+OCR_ROTATE_PAGES_THRESHOLD = float(os.getenv("PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD", 10.0))
+
 OCR_USER_ARGS = os.getenv("PAPERLESS_OCR_USER_ARGS", "{}")
 
 # GNUPG needs a home directory for some reason
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 78c335ac3..dac364447 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -9,6 +9,10 @@ from documents.parsers import DocumentParser, ParseError, \
     make_thumbnail_from_pdf
 
 
+class NoTextFoundException(Exception):
+    pass
+
+
 class RasterisedDocumentParser(DocumentParser):
     """
     This parser uses Tesseract to try and get some text out of a rasterised
@@ -18,12 +22,13 @@ class RasterisedDocumentParser(DocumentParser):
     logging_name = "paperless.parsing.tesseract"
 
     def extract_metadata(self, document_path, mime_type):
-        import pikepdf
-
-        namespace_pattern = re.compile(r"\{(.*)\}(.*)")
 
         result = []
         if mime_type == 'application/pdf':
+            import pikepdf
+
+            namespace_pattern = re.compile(r"\{(.*)\}(.*)")
+
             pdf = pikepdf.open(document_path)
             meta = pdf.open_metadata()
             for key, value in meta.items():
@@ -88,125 +93,199 @@ class RasterisedDocumentParser(DocumentParser):
                 f"Error while calculating DPI for image {image}: {e}")
             return None
 
+    def extract_text(self, sidecar_file, pdf_file):
+        if sidecar_file and os.path.isfile(sidecar_file):
+            with open(sidecar_file, "r") as f:
+                text = f.read()
+
+            if "[OCR skipped on page" not in text:
+                # This happens when there's already text in the input file.
+                # The sidecar file will only contain text for OCR'ed pages.
+                self.log("debug", "Using text from sidecar file")
+                return text
+            else:
+                self.log("debug", "Incomplete sidecar file: discarding.")
+
+        # no success with the sidecar file, try PDF
+
+        if not os.path.isfile(pdf_file):
+            return None
+
+        from pdfminer.high_level import extract_text
+        from pdfminer.pdftypes import PDFException
+
+        try:
+            text = extract_text(pdf_file)
+            stripped = strip_excess_whitespace(text)
+            self.log("debug", f"Extracted text from PDF file {pdf_file}")
+            return stripped
+        except PDFException:
+            # probably not a PDF file.
+            return None
+
+    def construct_ocrmypdf_parameters(self,
+                                      input_file,
+                                      mime_type,
+                                      output_file,
+                                      sidecar_file,
+                                      safe_fallback=False):
+        ocrmypdf_args = {
+            'input_file': input_file,
+            'output_file': output_file,
+            # need to use threads, since this will be run in daemonized
+            # processes by django-q.
+            'use_threads': True,
+            'jobs': settings.THREADS_PER_WORKER,
+            'language': settings.OCR_LANGUAGE,
+            'output_type': settings.OCR_OUTPUT_TYPE,
+            'progress_bar': False
+        }
+
+        if settings.OCR_MODE == 'force' or safe_fallback:
+            ocrmypdf_args['force_ocr'] = True
+        elif settings.OCR_MODE in ['skip', 'skip_noarchive']:
+            ocrmypdf_args['skip_text'] = True
+        elif settings.OCR_MODE == 'redo':
+            ocrmypdf_args['redo_ocr'] = True
+        else:
+            raise ParseError(
+                f"Invalid ocr mode: {settings.OCR_MODE}")
+
+        if settings.OCR_CLEAN == 'clean':
+            ocrmypdf_args['clean'] = True
+        elif settings.OCR_CLEAN == 'clean-final':
+            ocrmypdf_args['clean_final'] = True
+
+        if settings.OCR_DESKEW:
+            ocrmypdf_args['deskew'] = True
+
+        if settings.OCR_ROTATE_PAGES:
+            ocrmypdf_args['rotate_pages'] = True
+            ocrmypdf_args['rotate_pages_threshold'] = settings.OCR_ROTATE_PAGES_THRESHOLD  # NOQA: E501
+
+        if settings.OCR_PAGES > 0:
+            ocrmypdf_args['pages'] = f"1-{settings.OCR_PAGES}"
+        else:
+            # sidecar is incompatible with pages
+            ocrmypdf_args['sidecar'] = sidecar_file
+
+        if self.is_image(mime_type):
+            dpi = self.get_dpi(input_file)
+            a4_dpi = self.calculate_a4_dpi(input_file)
+            if dpi:
+                self.log(
+                    "debug",
+                    f"Detected DPI for image {input_file}: {dpi}"
+                )
+                ocrmypdf_args['image_dpi'] = dpi
+            elif settings.OCR_IMAGE_DPI:
+                ocrmypdf_args['image_dpi'] = settings.OCR_IMAGE_DPI
+            elif a4_dpi:
+                ocrmypdf_args['image_dpi'] = a4_dpi
+            else:
+                raise ParseError(
+                    f"Cannot produce archive PDF for image {input_file}, "
+                    f"no DPI information is present in this image and "
+                    f"OCR_IMAGE_DPI is not set.")
+
+        if settings.OCR_USER_ARGS and not safe_fallback:
+            try:
+                user_args = json.loads(settings.OCR_USER_ARGS)
+                ocrmypdf_args = {**ocrmypdf_args, **user_args}
+            except Exception as e:
+                self.log(
+                    "warning",
+                    f"There is an issue with PAPERLESS_OCR_USER_ARGS, so "
+                    f"they will not be used. Error: {e}")
+
+        return ocrmypdf_args
+
     def parse(self, document_path, mime_type, file_name=None):
-        import ocrmypdf
-        from ocrmypdf import InputFileError, EncryptedPdfError
+        # This forces tesseract to use one core per page.
+        os.environ['OMP_THREAD_LIMIT'] = "1"
 
-        mode = settings.OCR_MODE
+        text_original = self.extract_text(None, document_path)
+        original_has_text = text_original and len(text_original) > 50
 
-        text_original = get_text_from_pdf(document_path)
-        has_text = text_original and len(text_original) > 50
-
-        if mode == "skip_noarchive" and has_text:
+        if settings.OCR_MODE == "skip_noarchive" and original_has_text:
             self.log("debug",
                      "Document has text, skipping OCRmyPDF entirely.")
             self.text = text_original
             return
 
-        if mode in ['skip', 'skip_noarchive'] and not has_text:
-            # upgrade to redo, since there appears to be no text in the
-            # document. This happens to some weird encrypted documents or
-            # documents with failed OCR attempts for which OCRmyPDF will
-            # still report that there actually is text in them.
-            self.log("debug",
-                     "No text was found in the document and skip is "
-                     "specified. Upgrading OCR mode to redo.")
-            mode = "redo"
+        import ocrmypdf
+        from ocrmypdf import InputFileError, EncryptedPdfError
 
         archive_path = os.path.join(self.tempdir, "archive.pdf")
+        sidecar_file = os.path.join(self.tempdir, "sidecar.txt")
 
-        ocr_args = {
-            'input_file': document_path,
-            'output_file': archive_path,
-            'use_threads': True,
-            'jobs': settings.THREADS_PER_WORKER,
-            'language': settings.OCR_LANGUAGE,
-            'output_type': settings.OCR_OUTPUT_TYPE,
-            'progress_bar': False,
-            'clean': True
-        }
-
-        if settings.OCR_PAGES > 0:
-            ocr_args['pages'] = f"1-{settings.OCR_PAGES}"
-
-        # Mode selection.
-
-        if mode in ['skip', 'skip_noarchive']:
-            ocr_args['skip_text'] = True
-        elif mode == 'redo':
-            ocr_args['redo_ocr'] = True
-        elif mode == 'force':
-            ocr_args['force_ocr'] = True
-        else:
-            raise ParseError(
-                f"Invalid ocr mode: {mode}")
-
-        if self.is_image(mime_type):
-            dpi = self.get_dpi(document_path)
-            a4_dpi = self.calculate_a4_dpi(document_path)
-            if dpi:
-                self.log(
-                    "debug",
-                    f"Detected DPI for image {document_path}: {dpi}"
-                )
-                ocr_args['image_dpi'] = dpi
-            elif settings.OCR_IMAGE_DPI:
-                ocr_args['image_dpi'] = settings.OCR_IMAGE_DPI
-            elif a4_dpi:
-                ocr_args['image_dpi'] = a4_dpi
-            else:
-                raise ParseError(
-                    f"Cannot produce archive PDF for image {document_path}, "
-                    f"no DPI information is present in this image and "
-                    f"OCR_IMAGE_DPI is not set.")
-
-        if settings.OCR_USER_ARGS:
-            try:
-                user_args = json.loads(settings.OCR_USER_ARGS)
-                ocr_args = {**ocr_args, **user_args}
-            except Exception as e:
-                self.log(
-                    "warning",
-                    f"There is an issue with PAPERLESS_OCR_USER_ARGS, so "
-                    f"they will not be used: {e}")
-
-        # This forces tesseract to use one core per page.
-        os.environ['OMP_THREAD_LIMIT'] = "1"
+        args = self.construct_ocrmypdf_parameters(
+            document_path, mime_type, archive_path, sidecar_file)
 
         try:
-            self.log("debug",
-                     f"Calling OCRmyPDF with {str(ocr_args)}")
-            ocrmypdf.ocr(**ocr_args)
-            # success! announce results
+            self.log("debug", f"Calling OCRmyPDF with args: {args}")
+            ocrmypdf.ocr(**args)
+
             self.archive_path = archive_path
-            self.text = get_text_from_pdf(archive_path)
+            self.text = self.extract_text(sidecar_file, archive_path)
 
-        except (InputFileError, EncryptedPdfError) as e:
-
-            self.log("debug",
-                     f"Encountered an error: {e}. Trying to use text from "
-                     f"original.")
-            # This happens with some PDFs when used with the redo_ocr option.
-            # This is not the end of the world, we'll just use what we already
-            # have in the document.
-            self.text = text_original
-            # Also, no archived file.
             if not self.text:
-                # However, if we don't have anything, fail:
+                raise NoTextFoundException(
+                    "No text was found in the original document")
+        except EncryptedPdfError:
+            self.log("warning",
+                     "This file is encrypted, OCR is impossible. Using "
+                     "any text present in the original file.")
+            if original_has_text:
+                self.text = text_original
+        except (NoTextFoundException, InputFileError) as e:
+            self.log("exception",
+                     f"Encountered the following error while running OCR, "
+                     f"attempting force OCR to get the text.")
+
+            archive_path_fallback = os.path.join(
+                self.tempdir, "archive-fallback.pdf")
+            sidecar_file_fallback = os.path.join(
+                self.tempdir, "sidecar-fallback.txt")
+
+            # Attempt to run OCR with safe settings.
+
+            args = self.construct_ocrmypdf_parameters(
+                document_path, mime_type,
+                archive_path_fallback, sidecar_file_fallback,
+                safe_fallback=True
+            )
+
+            try:
+                self.log("debug",
+                         f"Fallback: Calling OCRmyPDF with args: {args}")
+                ocrmypdf.ocr(**args)
+
+                # Don't return the archived file here, since this file
+                # is bigger and blurry due to --force-ocr.
+
+                self.text = self.extract_text(
+                    sidecar_file_fallback, archive_path_fallback)
+
+            except Exception as e:
+                # If this fails, we have a serious issue at hand.
                 raise ParseError(f"{e.__class__.__name__}: {str(e)}")
 
         except Exception as e:
             # Anything else is probably serious.
             raise ParseError(f"{e.__class__.__name__}: {str(e)}")
 
+        # As a last resort, if we still don't have any text for any reason,
+        # try to extract the text from the original document.
         if not self.text:
-            # This may happen for files that don't have any text.
-            self.log(
-                'warning',
-                f"Document {document_path} does not have any text. "
-                f"This is probably an error or you tried to add an image "
-                f"without text, or something is wrong with this document.")
-            self.text = ""
+            if original_has_text:
+                self.text = text_original
+            else:
+                self.log(
+                    "warning",
+                    f"No text was found in {document_path}, the content will "
+                    f"be empty."
+                )
 
 
 def strip_excess_whitespace(text):
@@ -222,20 +301,3 @@ def strip_excess_whitespace(text):
     # TODO: this needs a rework
     return no_trailing_whitespace.strip()
 
-
-def get_text_from_pdf(pdf_file):
-    import pdftotext
-
-    if not os.path.isfile(pdf_file):
-        return None
-
-    with open(pdf_file, "rb") as f:
-        try:
-            pdf = pdftotext.PDF(f)
-        except pdftotext.Error:
-            # might not be a PDF file
-            return None
-
-    text = "\n".join(pdf)
-
-    return strip_excess_whitespace(text)

From fdb310c497c2b466bc0a2f7de8102fe68898b513 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 00:17:12 +0100
Subject: [PATCH 1235/1300] changelog

---
 docs/changelog.rst | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ad45becab..37bea9f49 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,20 @@
 Changelog
 *********
 
+paperless-ng 1.2.0
+##################
+
+* Changes to the OCRmyPDF integration
+
+  * Added support for deskewing and automatic rotation of incorrectly rotated pages.
+  * Better support for encrypted files.
+  * Better support for various other PDF files: Paperless will now attempt to force OCR with safe options when OCR fails with the configured options.
+  * Added an explicit option to skip cleaning with ``unpaper``.
+
+* Download multiple selected document.
+
+* Paperless no longer depends on ``libpoppler-cpp-dev``.
+
 paperless-ng 1.1.4
 ##################
 

From 50c1978d36de46cc0a23f01316f22b9aef4422cc Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 00:18:34 +0100
Subject: [PATCH 1236/1300] tests

---
 .../tests/samples/multi-page-mixed.pdf        | Bin 0 -> 160736 bytes
 src/paperless_tesseract/tests/test_parser.py  |  64 +++++++++++++++---
 2 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 src/paperless_tesseract/tests/samples/multi-page-mixed.pdf

diff --git a/src/paperless_tesseract/tests/samples/multi-page-mixed.pdf b/src/paperless_tesseract/tests/samples/multi-page-mixed.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..cca8db4194d87b305497cd214b9c4f6afbf64ee6
GIT binary patch
literal 160736
zcmeF%c{r49|2Y1u>|08f5GF)r8T-y8*;2Qpj9o&EH4Mf&MV1If5@jhwge+rU$}UN^
zne1jHTbPk$V$A$>-}iGo&*$@ezrW-6&*%9ZzvH;B=D6mXYtHjJ-|yF)=XotUef6S&
zjJ&KO>*>~=S5#Jch#bV{mOHDK76f|L(bdHtqHwV18U%Vh_>Kz%s^^Gw^z?Cs=;*Mz
zcsu_t`1|XBRM7JY@J2#ZAW##8vp>WJqWEW3r9aoof38*jT&w=MR{L{p_m4yW)!IJ~
z{JZi$5A2O}@kaVX)c>plz2f4GaJ=AyI%q@g;GeR(lB~R{lB%+*f|>$ERYgr!T~R?!
zQB6%z8FFy^tB!sLmH&~*H5Y%M06(XL%zo!+X?n}u#R>V>wj4zM_u;M`r1$#;z2<{-
zM7kX8fnN7Rc>RBF?=Py~`TUF1Z-swLNB%eW0q*}?K7ajs{{#8_{yqOapTB<b|G|9z
z>P-Iw`TXvg|DMlZy%uWd=M!+}&px7O4uM{D2}C%#Tr<1?ff_@QegOyL;$ZJ}KSyu>
zJHNY{Q}Ca?=fC}^D)I+iQ(fWztwYNHH9Vl^2M2XR{?%>$590cJ@cp+Q^?MZkd&GZ@
zt^eJK<^L}c{~q!G9`RrE!2fQ<3jddgf6q7nh}Zz(iFEOUKn*+(CWVVGPCm{DKm27E
zZ&#!nL|O6oQ1?grxj1^UqFzXSQ@|(<Dk`bUAIwRWa@XX53;v31+9pn7bWUt+PUi27
z{AAN3?%#_v(Sbww03ek0<nQ_P@A`kwtbfi$|7iRI0_lI%#ZS-2>yD52@7YZ4U^4dc
z^zk#l<LGn{$6tNY(9bdW_xA7D4!V!mUvr#UfTJe@84OXA`?FvEBae%E*Z+})kqg4r
z?O=vfkUQvX<^i{me@^zsUcaZXzdPSQCQ2wA;e3#=yz1|we`l|xuBfi|F95W!v<W~D
zV5DbYWT0ncWME`sVq|7L%F4>Z!pePwll>?k_lXmH+`PO3LZ?Lp1jSDB@<OB`ViJ;P
z&z<ELk&%-*BX|1D*)z2F02?#&GsgTwhmHZX4nPC|4lx}1a{>Nd4jraDXoQKGg_Z4~
z0Olxg_z)f4VR||S273B~(%}c+1N6rjxK7FIG9EW`WD@n|R=D^0C9~LtiVr;328rT|
zxBMbmSb6zQ@C%%lkUVqtoRYGNs+zin-bH-_LnGr$=GSjnz%8w;ot#~6ySgFV{gDBI
zL8#!6sQb||v2hRLQ&OL#Jxza>k@+ewzu<LY(VODRs%lJ4ZC!msTYE=mS9eeE$D!eo
zQ7rE3*f^dr_ig_B!s600Y2)YS*7gqh*Dh@wU_NvR0ARrG>-aOTz!xY03V;Hj04M+o
zfC8WZC;$q80{>Bgb7gOetP$1$o!fc7LYS-uzNd&IJlsJN^&(`O2!IB>Y&4_+@9!B>
zWLg3Am#I7&FnhiTlN=u*JTzet%rMoNRIV^F=3rwW9toE`!O_q-{)xofT!8ZVLv?p`
zlb6@AjsLY*N!=z-1V5KsisdscZ#pTuN4ksp#`-SqEuw>)3Hv&I<|AIEWm`-etG6B#
zhgDxu14{I{&3?aly2t|r-i+D3J*jZ-fon$Vk|u7lV)vDN#E|?`-Sc*7@DZq2^@L!;
z#IL#9>RLVV%APw#xy~u>LVOnQa7sPOLZWL@jr=iAnPO?)zVM>I?zxJ`6Z^)-dNpiJ
zkv)pv-X99wb-uTYgUv!uBJ5S7%)(E3KU&(6z~W^^H^!WWM@I(#j^=kjpFCP%#Mk#i
zup!vi!mpF%mJ3hL7Hzi1O>>NT&tZlsW_gpgt!x5z65n^(aqvGYT6o3O7tAcDXL_aW
zSMO}=Mhw&YF`|NylT3Qn*Z)lOuVnuNYo3I;D~vF16#V+2M8?acUB>8qvy|LDxFV@#
zoLT1xs^Vsh+K8pj;anb*?ZDa?hsX#%F8$-*Szz}?ez|Wgv<g<A(K>}6h#5yJ@YPh4
zn8QD4#5~Sl)WJ-7panKd8F#0(J=&+w3~&B&KE`3N{)gQA6EvX7f7c?mtKX#ELWfIc
zF7e3DjW6_Z8_F$1Vqtjyy-x4_l9$*pvsWni2eXyh&oWAGxruqKFQRWAK3BBfbK<QH
zI_@*Hx=tC!f=azoJF;LB8v6Vh{*2Hr%i*3&5u%ODKSkm)%cH$0{&=;p8~DAkEfy#*
zhs2)yv!}P6yEVJRn{}7$R1+zPLevF8Xic}je{i_!V}uJrBtvO^@m0y9j;coT1M>?b
zVcKsOccUhnM{aL9%J;-yR}oe};mmsy?r0m+I(L1j$w)~`hRGVMe9E)-vb0lzvu~9`
z;(&PEq0=0i@3XaswVYH6JX{%8pXR;p5pAq$juWqt-vS;P&e_>y6&umdB6+@lp*RkS
zk1Bh~D4B8@7cbpsOE@E~^-FzoV=Q*%#wILroUt%Cys$r?9N%YIz4E%RP;;_w+h`{O
z<JvC5r&Q|HIY{>2F~lLY|8R!-2$y(#<BxsUTbh85<5fWY3KP-Ed1JjiKxb<(lz&_D
zA^NC`|I(6i8AbQq7m8gzIrQ4_mRebWRoHXmZ3D;0b!#GGMXR=)t7bF+vQAF}zD97a
zSknNJ2#5m;YBW4M<h9N)zcp#b_9WKt+=6s&cG-EYP@M5wR6On)(cn$cTa<&X#!V~H
zhN}8VrL<QpPs3m9KIv{YAtvp#@5Z+8%dULb_Oo*PL!6grq~kInCgqw+IlohubFCre
z^GBOFFIgx*<3%~I>6t4XoY*Fu33;G!#rph6m^vQKv%J0ck+-Je+99D}sGURm`pLy<
zjiLFbLFZ>mT)}YO9hOQrk-f6!5?ORyD@krtrh0&toP7O?%I(PSp_Yy;%^~+^&ZScr
zyvWclYt@HZ3Ypu<cdp!<Jo!;Y$t5I4sKT~0z0*zE#wJUzJ)55-jLEY}w`jq{KvKMx
zZ^0ki(SUQ!#FB156b-o2goV804Uv1&?lyEu0HLx^SXMKA?H(CsQ_-BXyV6b-!D0Gk
zJEtUDE8@kDN#XitL=PGcwC5rTXAqhX<1D|dF?1%r*AzSfiHc<Yp}T6G((|Zm=+cK{
zy3(KS07Cu2YiXoQ9KnU@ZP@}O#>T?-Q*kpkhU|Chg~F<&<E-mN##|_0DWPW#<64@f
zPRtaOh8hJO;w>65onMHxv0DR2t*v`*J>BS1yMH?NYNB{TE3tH)4%KHw%Fa^8CjFF}
zxOB6=rtV?4a#K{XhHy;9bAn6OG$y=&?5aOX(bJ9!4pR6keTz9~FUD9%*Qda^Ak3hq
zb#SY3=7)?oOSS7*sH>7M%ka0EI!;A;ubom6R`TcJP93(Wjs~H$t^T)r9ap{dGivJf
zKHO~9UB96vMB+3h#XNZ9Zq1wX=99Fn0M^DeN%=`nE*AhzqGIk9QV>JRi5%;jLUf%P
zHNEUtcwRsId?U6bd;pt%k&Me-3DKKEXgI{Jmy7zydTHRU1iMDJj(7LK){AlEAd=!G
z5@tKEP}iksDYGUgx!Q91Sg>F2R@ap)Wt0n*!<0*5>IH~~r;TOe7p%OhH<OQ^U33m|
zx$)UBVoNeAEc`XO$UP7nxP#qo$qckx!kNV_Jlvks{3G1o@+piD+1NE&`lA|pe9B$J
zxkbM}pI6v3eqZC|*$HfQ)1lvO=Vum_VzTobi<k0LHNt=B*!Gfd*Ud16-560u$5Caf
z!uf2n+diAv7|GzP8CH|mwYt-@6?`W*%ROJUgzQ(helsA_fc@xn8lbNolq1}vnzx+8
z)}*h!l~|wsdr(Mhbdjg7KhoWY3G|V5=lDHaU8kfvT26aB=&V+dYDiXqU(Cq+Lo=Jf
z!#>QSYRDToPlCpV>AtjfKhAurp(RN~T76N(`Jp+9XArf}Wo;T+z38JHlaWa<^YQZW
zIhgP^gyZ5hGUv1$NRbZg);2W-v;861&|Z3#9QROU^yDU|XwL-fm|a;TA;E!#Y_jLt
zxzT=GG%<{H#4fCza(1eI$@Wt#uV?iyr3DgS?A9u4`_+IXwu!}8#~8gMuT;vLb~Q^>
zQgrjWOP6SXQ(Z%IP3`SZkwgA$Ms<*vF25pQ&;S;u=_b?duwgGHbV4il=Dx}?hOBC$
zA-5CxyaN2of8ZqeUz&ikkS3@`I|=BOwo7??YUo}rV(tE&R2pE=>_-EtcXnrDbGGH$
z;jJEKIg#VZnErYi&=Xk_G1$7{4To)g?mH-HXvdk@#6{I1!wMJQO|jYJR85%DcQ`X$
zJTdUyBNan_Oc-Et*RW3`xt_1x<N4I<!&~Ks&r=ALZf?D_6G9vqm!ulD-iK|=b<==6
z$FlS}=siq1m))Yk`u%dRRm}boc*>Nwfzu;7AnKQePh`vK<slSyqAllWn3hs_gxlEL
zwNv55$wN5dEKdJnOejNe3Tm1LSdqThzam3*E9&ZoBK3>hRd*!lj|6!oUdU5KYT?9)
zZqp*ktz4}b-YFlg611ERm(xC)b*F(ibDsum+-c>3txo*9hTJcwwusPxu{RO2=-&5X
zXJM<8=u-w2G(a-^CHiaA%r5sx7?K90bQ1lkZG0l1SsljnsJhcEG~gXY1e-iwLOtJd
z<lw`mNDr<UwMV_^aO~hzqq1-?0+jF2fXW5Rqa1b`FoC0{nb;SF2#}y(_o&8)X#kEw
z1NLOh$=+?l+t0|U>`Y$iV@}yuLs&SU`tM?pEv%%j<~a|Oev=O&M^e3Bg%`{vt(Y~S
zrsuoi8*>lmNXi}5{_*P#xc37BOJ`P2;&yhh#i6G{QNz2~<PWBT<77C#wB}yP(s=83
z*JGK^5}R?vPutRtNVr<!+_l&;jZyR=l#dP3=LcynSlP(B?^;vj?!H&!d-ju@<$V?{
zhdBAWi3#V0MWWhe3ZJCqsha;GF8=w~6h_`I=za2GcL&ZeXc591Gg{EzAGTwbaIN#0
z)m5)wcVX=oXg9VDuLurQv5o%&j`H-!i=T_p7u?bJo)Ra*P7yP0?p0Ki^I_|9lQVCW
z=V$<jYvu&LuxqT;_;`1Ck;0ycOvw-pxQ)t7m`#oedwI84F~`p}Rr$kWx~c%WJ2|1R
zAmzdm<C0-M;Y`oIaasDdN&IQDCPLg2Dl@rymIinP!rGcSJF&bq)4ZfBpN@)}1~@5R
zp7lRvX~|CI>5S+T+0fI{rfv;TpBP)tR3=mIYB?Q@WsYuY<dd9=9ZIT@3AJ5SWS9PW
zPSp<O$@)WwZGMM+eqUp}H_T(^#NMJ=&b~xh=<G;~WI6%XX;pn@)3r{ct1qgksrVy(
z>V39%!cr|n*LzwfPNXO}sjN{a>G84(o7*-PD(0Bp*B-VETgX|lL|4sFo}eGXwolT4
z@zf!*rU((6t-VF<t)&59WERQCX~5~IIg$PQHxE7+mixVG3Er=!0e{c1@ZU3Rpgn}_
zO5o%fPlR<+HR>COPDIHR#AFE-W+i>vdq${kfuN%F$xgH3I^!~ut9O(hf3-yPJ~Ucb
zE3?t^wYS;3IzV_s<+p~#c_M8zo!*?kU~Olj^>W*IMSyj=)onts4ocx9)SXi0%@!Wz
z^>}8!UfJ~cQ0>h8+t$R|WRl7GVJ#@0L-TrFUFNR(LPOo~LT&sgx7_LRi}t}wCVMvo
z6I%{d-|gy^eV6-Spy$)!=&4_sljN+~gKIF<UYn{0&myt3+OH>t#VLC>?VSI##?}?C
zX%B6Iw(&JxnGQL_lVuu;3_#AO8{@>BNQVvE2-$;CGXmS?PFoxK&)!yW!+A)C=W!Hs
z{KV>U!yJ>^s+M~%GfiHe3K-Z4B>fsi-=F3uF-0}0I_56dYS{HhKe_z4*Rzs^McO87
zGDta#6#717Cb4Xj?)CK2_S4-f%MQ@&vQKNxb*ttSJL2uexpn&2(LC7aw}-h?2ynQk
z!VA213&xZHz1MVQP9)YB<yf}qajW-e=AFuHr<(?Y<Rh5EH)Nkqcs9qdv<yZ@qt9ws
z7V?y3Q0QgaEn7!idB2stIMFno5+Iw3m}6@`g43^TOxm_Yj;4L9M}Fq>pS!gY;*2ZC
zJ*8YGs>X#m5PUe6d4n3RU|OOgYTrqhh-u|>t9jnhS@lAt8;}C9Z(h3ZO1vzvnXziu
z;tQ;06SMhTd18P*?0vFqm2}gwvSk`@w7Qjt-1YPFRDP#;phbvZ{drr*tc+g+U*H9}
zN6E2NIpTUUW<T_UM$1F#t$KQ#MZ*gPm2Uodm1D~xqXYC59bA|yNyLV9`g6Hck>T5X
z4?lKB$!k&kR~4j2L^S`H^zP;_mnE9srRe8|8Im|3l&vE(USU556T2$uPB^R`-*;Cb
ziaZ$TB+WU7=H0XkPx$dQeJx}Gn@<`zs6!Bm%N8P?E?7&Yw-#*FWiL6U5JTOD6-ai#
zV#lckbKxRgI!8yPJp&r0{Jo@u+y>Z-{Fes&cW*$s!n8=~aa#KLD?w(sYJ^X<W^C5Y
zq|Zip&(-zj=VW&p(Ajzz72ECbwZg`J$s%w!;9F2`L(iwRyh5S+5)mE>Q!$wad>9XZ
zZa?;QB~bN2D0dJ4OZIvpjh#}qQpIk8^!v&}nl~DVa}LuNx93+08KM`R&zVXaYYj(m
zqRin$*nMe=_M1sdI~%J9T5n26+iRBie=+SZuMOxqs8BzliO-Uw>xejt*!PLmRR4(E
z(}E9)Sq<=FiV7Lk!kcW>G`fz)D6hJk%f1Ynzi%->JR`)HYTJ4@LKwC19y{!&AsMHn
zi*MKL=l(fve0tKck)h`jI!a5(m)QPZSgHz#DMDA=R^^M?9<%d4H635S`_S2`*$;Lk
zjGtu9Nx$UOuA@{jtQ4E@xw@wAU1I*R*3WEQi370G02l{Fm+-t?n4FAX?>PG-;C8I(
zo>4>XLxXa`v}+G@kGwJ+%ECJUsGs=FAOW8!<>n(h=MmOMGF#7FenJMW3g}>#8`wkM
zYPicb`@069dxNU)y-Z%DQxw5wl`mN|e18yL;Lg%Aw80yB<FmqBIgh?D{@K>JY?k3+
zy+P%5&gn%n#qjJa23RMpGr?WQ?kc||*5W@G;#stey^3cnm#w|40#1+IyX73#dNuUA
zJr5E7P>aFEKaXr^Ht2&ClQKaF7gs*;s`WERqQhKqj5QGgWIF0G<A6ld8!gmP(vd3F
ztni@uxG%e+P#69(r;B8N!ulb1z7^t%<&dCW<CB5?jJNuyEKh8GCB2v{oVUN1XX$~n
z*55CGSXSMa-k`^q{(7RxDDHa9{8+;A%%AJA4xAM9Y=X!SZOsmAzHNHH#<rhUy)tbv
z>fO^fN}<u&^d!E!(#k8A>(z~<@SxK_u4yzJ69eSPtKIHF9|jJiqVNl`<<%KJ$i~I_
zOp~Jg8;_aOA|I;mX$5{y#TVYC=;2{}<Q#Z&(@@zd+*;=dsiTrHF6I$lkp|dl4kMw5
z$SHjU>dQHglKxXqsiU5+YZ6^P=5GAD7D`=jE!8WbsFD~{=O$<X4@Da*?Ik%9yBiRb
zcf9Gi>P}@W1c$)KX*ryPE1)vh^)hcgixkqCw)~=6qS$!+7yK--`+dmH{U$ge3x2g}
zXbpl}>;Kk!xJN+ZQ!HEdjJ9ffHXZ56!9;06Dwz77vh-%6;4PLUouO}b;$!N}PJsQy
zdmS0#PKW8S6)M-Ll4*s<+mwML1@vWubpun(A2qXI*SZoH;%5jQ8b2aLrSL9M9!tUA
z4vzd2!(~T2TFOt8=ZOpU<i}nvPKYAJQw!dzglL3V;FFpmP2Wje-Xd&5bgZ@ZbGEnQ
z#&ZbXcfB$58&wg->LY>*92##UTe@5D83%i4%Fe@Ww?q>CA~eWBa|0qM^F76macY#0
zxW725Ao^{Lipzkk<w9$LKB=bfI!>9B4#At5TS<zY;Fzio>=|&U56iHXqXKFxBctIS
z7s(TOOYqDGr0vJZnnz9Fj~8}4Z!0s^x#8Ja&`lbceVy!Ia=dW)c&b157uOxdu61Gj
zFOkof>MJlpbCa*NyT;7@*Y_AXmMXIr(0=y@741{4#=nlX^uXS=v~Ook?pH;8Lcb3#
zhZ50un_Thb{N#j=vuOO%H=MYY<b%9t%%q&gUpr;b3FWa(HwX^w<JM$TI{}IORO!^q
zl^TqfPZqf>ly8&`wW+_XtW8?>(LpBOn4d`e!6cJ3_Ga;a`+s+oylD^cb&|H=GeP*Z
zvuIuvXATccQM5H}OOCCgXbvAq_bAie&iJnN>a5p|6N*98oV5iZ3_N=FL(*HT0zWT}
z5Po`=&B<TN=(>*MDL@_X(2#h}_&guAL6y;%qQ5G>&HK|RPK~W834P2)hn1+4g+J@F
zHk)~Hp1Uz}Qv3T$6#n~jp+j0g-WT{^4?+LS1&J*>v5C!#U}tWEg^WOzO8qZSZQD%P
z<=>sUF?x@^Wi+D%MQ24~$g?D;b~PkUXFx<fY)mXmweb7c0EUVm96<sWIf#73(}svF
zR-3U2g9<$^r2a|Z+|+-$wfiqk{__zoSOydT1wa8%02BZPKmkwy6aWQ40Z;%G00lq+
zPyiGF1wa8%02BZPKmkwy6aWQ40Z;%G00lq+PyiGF1wa8%02BZPKmkwy6aWQ40Z;%G
z00lq+PyiGF1wa8%02BZPKmkwy6aWQ40Z;%G00lq+PyiGF1wa8%02BZPKmkwy6aWQ4
z0Z;%G00lq+PyiGF1wa8%02BZPKmkwy6aWQ40Z;%G00lq+PyiGF1wa8%02BZPKmkwy
z6aWQ40Z;%G00lq+PyiGF1wa8%02BZPKmkwy6aWQ40Z;%G00lq+PyiGF1wa8%02BZP
zKmkwy6aWQ40Z;%G00lq+PyiGF1wa8%02BZPKmkwy6aWSOMZkeJ#_Hnj?2q(warFAV
z<#WrORbCz<2l>6Br3HZ+AUu&Seh2TKj!2h_E>1qqE)eKt7jIXj8$?+VqNBt5cV*NI
zsc#Axr9nj{Re4oq)k?W*a=-<DMK)~{CowuFHZ~{ocSe4)=@IwuMVjcqA$$N3%6jtu
z(73|CG=2er^uOxjr|08!$H&{n8wpW^K=ph)ef-StI657~anU6Z;pAfI=NSBZ`*&<t
z9sRugA-@AR3vl#AAcG-latA^FGmndU*Z+})kqg4r4GB?DkduQz%>!;BgYO(1)7Z<=
z_2BLLpC2quZ@IfTAt6vW!ucR!dDY)V|IS`XT}kC%0cc-o6M!DTNYB8?K+nj?z{teJ
z$jo|_m6e5smHP-M`%ymb6DRn%d3gndPKyW#ik;-;g-AohBqYzCJIgO3BPVl4?(~_n
zXK3#MHfH8$jQNKS9Rp|`fCvB_VmS2Y0{p!kI!t%a2op04E89T<%u(R*Av(Il^mGgi
z^z;X%!w<d(=#MdQos!pOJZ|R5B<jnpaPRR;X0ZzuA9$_}62%p7`9-p@^75VF7dR~;
zdFJdnC1n*=HFXWWi~0tJM#h)SuivnMTUuE=IlJ6;bwjxOBLf11P{AQl_oHKC;~vDP
zq&`V|n*J;!^HpAc!Rx}JH^r4z)tH*vy84E;_Kwc3?w;O{L&GDZSlrjKaXew}+x+*1
z#ieD^#?Q^I?H%&3UD`OneCQAWz<}M?@n>FvFHis!00lq+PyiGF1wa8%02BZP{-Xlt
z%H9-NBdh~DxAT03Fj)<JPZ39WxPv6>MaVW001bHAXh;Lz-!r7hv;ycaQ+YIC_Iwd0
zIX*&oXu=?vVX8B!Tw!9&!Nx#55-xdyqoHy96N$IE0Oj+C>h9_$FRx=8|7)+3x=o%4
zelE8Z%V%2NbW(JWbQkrF^<CUsL<ct$_I3KqN4!eQwwN|nZ#^astG=QJl<5C;yUx=^
z9w6{$%<k<;g?kTNGg_B4ag!ChujC_!<e%!Ew@ZVMK)tFb1QRBH&DB=d>WNqO+$qX+
zPH`9Fvv`M7>QNRFU6X3$k8#QrOY`=H7yWh5RXm>9H#XL*VPlHyQT+D)P~fify<Hq^
z7J3q4uM%Yze#-mN(vAccFDtq+<}5rqGWd5i2Ql${@@Rn(U*8MChG1I@zfP80E<8C~
zwAmUr%`xgdhZ&}r<xSeQvI*EpeBWiq!GBleNhH9y-6Bpzo(<D2u|f=fG<rDs@p!P1
zZ#G8nJUI#vJ8GXGBhn!dK8jyD+!qVeSCeS?k9L8BJJC+k>nM?UEvaI+)XQJG!|5&z
zo$0+AUXnqc@uC-D(z1M~chX&2<j_^tf;~-}cIXEf+XK-DKk0MYI4PKrpEHT$+`>nR
z3+-MS{A?4}sQWszS$al8ND=EbOlx9@MO3(tFb2QQjo1yVWRA%TDm-zM9X+kSFQqqk
zy8vGz!oo}HiVZDZJbW=&U<Prl<xc%Rp*CXl%ZkpKK`p7-qOFMq-b|&d27}RmTzGeg
z=X%gLb_<!-4p+W$TY;SWO~$V$mi-HwoBKcAd2(c*{+{z`*fG1U;N*@g@U|MNI`M_h
zIpY40-TUbYjH%(6%O;8nPFZs;)47{vIo-la!%e3c(kGni>zi7h_f%I^Cx6Ne+BCaS
zEh3m@*zxA2yN)mx8LqoJy{s7W?%6l}bAp^FA1bgNk$P9A=Rhh(*ozDBJdG;#5O`E$
z^O{$_vr=s=!(buhB9Ic3HESxolr8`K8m208yU%Rc`Iz0<bO)E^v)#K!Vx+Rt&!ggp
z?`W|8bc>K%;&RWdd73HtKztP0#?bkMS2*m&Zm?(jR`IS#*D9TPQ_Jx8p)h@yx7Go}
zF2h-CwxQyot=3ie<b+I%3c?~qH8gLfLAX$XuQvGxW`n)`t24H<wS$dcE3Abx$8@AL
z!1Z347~-1Z@h(`LLjC4uJ}v_C)h$AHC`|heV)q4H<88~8{5>(bp2;B2$0LDdOxr~?
z;89Q{`Ui|@s}!BwdKB8kmyaMKRCXdacGu2Cf7Gkz@qc>N6b=#AUdhL5>3h6EiCu5R
zYC+3{<fI?lSxtTrxHL%Lr!x%s=rmnGHVnn@>*1;C0keDR($$h&Y$$ONh1JJtRlQV5
zD9-eaow2KnOovK3-@_=;6DsRIuL(>m_8tWk*Ws;Fh`Y{7Vr%?XX!tyvjpZ94sVTjz
z9KVx<^btb%O}kZI7GTjTNeI0^ro_3AvmZ@|bvTfpxj!9ujSe#`mUynH>#zM*?*4T1
z1)nq%>fss+-<*tKmoWd8P{TTj_iIO71O*hD^^SZkyVXai7AP(K{1QLFPENKSEbS|C
zux>wUtg<C9)l)_T((K7M=IXW3uctkZTC!=Mxa3%kIL)E-Jc1N(QgT>XS4ZaSba!|F
zo(6EPjDJtRwU#>bwewh9+RFU;<Aa79p)9E6%Ov}I9&g=(4ima&g%Teg)%`#p2-z+*
zb~bWCoW2>C`}DRNaO8W_&LwgIW7BXS-jo9sWjBm})ZtT_7o%pI)MEAYqKs|wk4ma%
zg!YrX4hQ?Rhd!gICA-A(PANNU!XnD1eRm;FM#fp*B-rWX1+MlYgB1N4vc=B5CYOBF
zz#o|_hQVp81#-3%wgyg_)4HQVoO+i1B!$oG)-6L6#aGMJQ`sMy8Z$h3<>^iL+r^V|
zYlrfOTEuJ|7I&xCw|Q&n#}$7xS7oZ*U)u1QWXgzC*~2DBhq)pMISd~Nc1J$$e#eFr
z&ZxZlG-3O4_MLt1PI2}Ta%>^F{o)8lhRt;3J1-xHhfGzsz(?n+EC63O+WP%4RcT3}
zD`sc+$UQ=qjdP4d{P1PhbM2!o3o8Z>NaecN&De$^Wb3gRdxI|Z>J>ZX`D|X1>Fyrb
zdhu6s5J~Y83A3G7sOwU+lv$ILTy430EZ8r1tLw^@GRlR@Vala2^#Vl0)5bFK3szp$
zo5@GdE;<Lf-1ux5u_YN57XF%C<Q|9(+`;a)WCq$T;mqO|9&XQR{t@nP`4q;7Z0s5>
z{ZS1)KIN|A+@jx~&nxU1zpwG~>;$&D>Co@C^D_%dG1+;J#Y=gr8sR^5Y<tPK>t>k3
zZj30S<ES!K;e0mPZJ$kSjAZcD46DiOTHWc{3ciz@<({uvLiVd$zZno|z<zW(4bayP
z$`Ni-&0Ef4Ytq-=O03WR{Lv;(Vxx;Zb^Vd<K1`sGtUJf=+3Gqa)zNa=<3VS&f>cAY
z0{mh|-XEIT3?BAj7F9#u$axYpHca=Wwfk}AQw=RiBGT%MBF+!ZNj!t7g)VE;$m&HO
z<(Q02f|-w(kB>-((uQzcyhi4nmIEo$f!*4sreL-|1RL5*uae^)ij1Dz<P`0hIG9n(
z8VLywEM${C*UpXh+oFkKq$74=?Ub`q^-H#&T6sOIe<>}H_+qzKS=+A$B(Y5_zB<O}
z9eJfv-n6S(;@uXS!^*uyY%n09q9t7X%C}QM+0x<2nX7zT<)`+`@$n+`Zo64Ex3D)y
zMNN$7)E*nd#W{Q64OaY#PZ(DYqh-QAp+iqnG0Ok)82_JV<^Q>zcXEVUza^t;sZHX=
zu&P+fV<;OM#{%2*z(My+(WT^I8sNmP9J-C+C(9J=*-qq8;?C8s3eo_Hd4C#U`=fQ!
zIp7O<;sbPUJ!&^1f#VCNeowoac-i1QQuiVCcD<&<17T@mU|zwJ122*dU19s_Dak`6
zNkCEZR^P;Cc~Cj~{wwsiP_o|dcF?;j0!tAJWI=1v>FIlA<V)Mr6AoYIgJrPaZmZJ)
z%&@fEWGRAusbr#8(^(Qzd%Gd-dt&Bi0^bbBdm-PYFFV?r@OSVG$;9=o9AS@4Xym4#
zU_#;<aqE~owBOD13xQup&MB(u_4~mX6Y=CdlGL7=7xw4J+Mf&+5-=RGJhYsHY)S(p
z*+}Npsn#?}({UQGaxmTPXQmStC@+}WQmIqj8{8fu8$siI`w9IASC3Z=yG?&dJ21h1
zobsj27VH<pz6s6d>~VhBciS&+{l+%CzQ?IcNen4WZvCcD64{UPMsJ$KIrn7Iy)49m
z{buyib<A??%W|&$g94AB`{)50P&o>V`5^;CBtMXQA2=5NRDGT)_t7s`SP9%@w)~{W
zv`Tf;NE2V~lFGQ`xV_pMMzAn(%{BlntM(ao+}8BRRDnrp7(1yfC8?qxjShD&tmLar
zgq6BcxJk|B(Gda@ZUQY?B{aYj!8K`(X?~rf{BhFgw13>R@|lpiQaF(>W~-HvIv}i?
zdOi9rMydx|j-6-%KD^(hU_54zl3t*hs}JGHS_<RA#@31fN`woS*Rv+fd2nIOM2Q08
zPTOuwT8W*ttrl(|-~>k6j3<q8<{2GD*>(GF{Zrg5F20~v?a}zJVBv?$g_{zEWPTrx
z+BOlEf;vG#(|A4VPmccGRC^c^8(i8V5ayLR@>nZqJPKN|G2RT_c8ynSVJ5qNJi(r-
zz9SK=Xe<1{-?xy0A~!WyiOW9neiHJB=)>fZ%q6sQ-7ANvniT!Wjj7K=Ioq{P6sa#1
zJ4X*Mybt%}hr{AK7K%!rnG|@U?+)N?;Xf*9fVg7&%(^WNSh|>&xOavI^w4#|w&f<#
zi)W4ZM9{tRBdtFaeQ7|hzVRLm-TMc*lLk1Z(SX5p?rh$<?PgMPOEf<X7;;}|;V>Zt
zM~G2wJim}^5E}K?vrZ%7<J(+gweyXK2#xEEsN)?quoKE?ft9MoCE>iAHOXGLHdOe-
znp8jMQG=<N*gb6;&}&F;KWJcJ|BW^@>L5A}#N3R-kLT$9!_&$4U>lY?@-*P90p~tz
z$j&*bg`5df>O~*UgIzZcx);ucz!?((A=woTQyk_>o;RP0Qy8~I42}nX{V`CVBxOQi
zic@lk(P0{1eKiz;qcawYj(PE{BPn8ezN(vNz7@kxJ(q(|%Ol5h>sQriJfS~bFjDnV
z#5ubnx2$A4v7#~Z;EstZ6?xnjfnPPdT_3HpC)ImYFq~@LN1i~@0PboI#Ww2EVT?(_
zgYvxW(2_)*P*kaz-eJ3Z{e|o&tr)YqiCIA-cF&X*R^}I!hwsnW&194gJecMr?Ibse
z`M<PJW}PsUegJu@zQ%H`P<yWY`k>7Bs=>E1W#70a_2_*+&gIEnWubJ+mcJQu8~5DV
z&H7|fW3g;+m9KVPc<XzJeQXd(urpBj9Em6YX|~9);HSarB^=iu`w_!(tJIHFn1khi
z`j1m}<?$Mft%RH-Gj5q$yLQc4n;h&zb}VdV=*HUQ&m|NI;y|315WbOv=|=s~ny2(D
z=Oh!CM@GiCCfDZb->xT2(_txILAgRIJEqmOLq6Ajg>4182CR0w=MdJTlxIXxr<Kl>
zRZplq%TMQOXmotCz_Pkkj6N2|LGU?2(M)LP2+FhJHM&0>{p6?MVU^_f0j1g|?b+v=
zh_^Ewy^5Bw)}J$c>EB(BTV*fdn)67i^Y)PH$YvoqBoz#KX*mYH9AB(~`%d>A$*gQj
zm(6Hf3-h!$y_~say)pA3n~}tsK)Hf%zVLa+xTf}t4|ba&&Dr%yWGqJ#(^P3W*W$En
z!>E#s!^IJ$lF$`3*T^+2-q|A<tH(c^{Os5~)+IesdCGynn@(swF^za${VYG}<G>&A
zGi(nPt6=K8teXuR#||zbx`c&D+pXm&N%&xNb}b}x8D}12@O4h>b(^-Sb^UBk?D%>N
zRcs|fynggY0Q1(9L~q@@9m`jp&N1qTL@gjD62HzV&rh=uMdGSC<EW=d%2R8pO4ehh
zIw!E_o!Iu<(4_{`bR>0hi<T!8>B$DI2!GDCKVZ8%lC6GFr%8`=yuC%dx_Rhkf?kl@
zsWfMat25KxoB8Be;-14ulTRMGyG@`VF{#$Y+p8dHl^>sWBwT$BeW`$88k?<vqv+wU
z1exKg5k8xmu~|2hJ{!ICTwM%OL~}ThYiCW5l2`V4r97t2eV+NFDQT0>ia%=vIajOf
zL}<Oc<sd@VG_CTO&=m6SB0+Cu&?%it7b~>idKvH<HFu2|lUL|oYk$&XuP1x5xyfAI
z=wY<+`~%5MpAYM-?o=jXbWSWrGl8wdLtZjXxuGs_N(=^}0nK(}iyq%+#*(SWj}dEy
z1!%ziu!-<WZ=X*S?Y`N^YcFj%#LRH=wGFPQW;U;HziuwQ<T4^lc^5xMWuSYt;qi>f
z)IM;MEP%CR(jzg(X{j$XRb0`|PqFI~tWn^~njK)W4U;1>#sAn^br<<zmDq`Iu7TUc
z1-&YZ$m2h;Zkybm!x&}}^+CguIFKlf>_0{LSt?T|Ery`?`5D=f=RdGwXWEWFih8}$
z-6BQ~C9#GIS-l*l4#}3z9V_XYzn*u7t|)c05CwlPtVIqN>Uuug@1xiJMZhA3E&Mir
zSdZceV{&OoS(I?ek<5g0+p#H!4ZBr{o6|1vse7x?WA{c`{VNBAb)-*qQ*>^c|HBe?
zfsGkP6qFztiQN3Mc_p-cr-A$OjBBbH=Gg$Nu<!kw9ByGUWdAqh3#ME)?zLErr_bL`
z83#ZtGen>x!lQiAVLWr3hpcQDsmDf;HdD+WhsF(y-@dZ(ntU=PGQ+?1p)@C^<=~0a
z{cCnk=A%BXm@vJ!{R<9uziuh%#3hUwcsv`_IZ1AOZymi$(ZDLjd|8`Uqye`*ju}}n
zY6oh$sxAG3=el79wy=-U9&=Kq3iE4^I_H;a*11G^PSpqA>iFKYhsPb9HAKjw-FuvW
zka(l_@0~0oHevlt?z~L$-AVH>!Monm(w}AH2*GNu%2FKcdPBLB%I+JzXV=m69nT{A
zzi)w%gYhe?5;pw`yXvkf%V&A)m>)+zRITNniOHrTao(rc5yI^^b}rS$IyCZ`cXRa!
zh_c7B<OFLDx!Kc^PN#S7>viGanR+t&#bZ~z1p3l+=Qr|q_Gi%6v2d~vfkU#pmMTRK
zeQP;x`i66Jg~LD+CE>H~azwXmxcw-qMXk)4q&yv~)G1G|5#Cgh>to>>D7jH)j!(Y3
zwa$Vn@6;%J8C)=_TR!!?H-+Jm(v^%OeA+D`KCxO%1R+hrcIli+WB=)4^I8+DQi7F2
z{44o1$=0>y=GwbqHu&|pY%v_=bg^5`Eu7WqY@tgmc6q)z4ac4YX<zXkzz^`WcE$yK
zrCfx!^)cdxHYQuz6l)7@PvXMuO-OzC&&?#!@sC}@SBItF%DD2e4jHVT^~w*Nt1mbF
zg09i8Li=QCO}fsj=(f$x1S$7YZWFnub%?74m}ug=k+-rb8`wa*k7f1CFoAEB0OERg
zwhpmy+w}ovpK;pgyYZX}n-#lfU$$+<0QyqGoY&JgW$wa^Lo&*`E_0kUf{kvgkF!UZ
ze<{>CQUG7vo8n#U15&NwP`UE)xmD36uT#OFBuyWvM%!kG6^|vDB+uo1xFWn@A!#}y
zDe?Vm?!cOB;<R@A1}w|NEfd`tiXv2x1hleTIm|9N?4tRZI#2iNcC$oND`EXE#e}f$
zpx;2Gwjv633sa$w13V=Sp2MV8AxTUpu~3Srh(PP&YeXygY%C2(#9bjVwNd48TE|`^
zs3Iijws#}jMO;w4^(md>oIC3LT65!#6U^UZK2B@CY5Fy!3{Uq~eRr}(^LF8X`V9Qv
zA32^YE94mMd{|*=CsWYJF1~v7(W$L*qkdl)tB&vhas9G}U0L1Exa+fxxB|@eoBcB=
zo$0hi?i(DTMpd|KkA5lhg#OCLhn?qK`OR%D(hg?u#Y|5D@5gg}<mwgVvGb{4ZTdwa
zv$7lN6n#&!)cf6_`vt9yksc-c@T+%rGNb2WGd+>?#KXzDc6R@Md*@44A<EP~2)F{Z
zjJn!1gy~ld8uRfAOrZ;aThJ@)S==t2<#6rbO>`od3M{LJINyCx>Lqil`e*Ep)d+9*
zJLO4)b@=PYudSDMk!O8ey#zYhjR(2!03}GX|HMt@zvlz)0R=z-PyiGF1wa8%02BZP
zKmkwy6aWQ40Z;%G00lq+PyiGF1wa8%02BZPKmkwy6aWQ40Z;%G00lq+PyiGF1wa8%
z02BZPKmkwy6aWQ40Z;%G00lq+PyiGF1wa8%02BZPKmkwy6aWQ40Z;%G00lq+PyiGF
z1wa8%02BZPKmkwy6aWQ40Z;%G00lq+PyiGF1wa8%02BZPKmkwy6aWQ40Z;%G00lq+
zPyiGF1wa8%02BZPKmkwy6aWQ40Z;%G00lq+PyiGF1wa8%02BZPKmkwy6aWQ40Z;%G
z00lq+PyiGF1wa8%02BZPKmkwy6aWQ40Z;%G00lq+PyiGF1wa8%02BZP{{Jh0rj4<>
zcsu(e{ahTqesB5Qa%YuSgvddDZ)j;jpauv}q>JCdyQd@4<)Vv|kFyH|dfCO>73l_1
zR)py2u>M^c^+M{K0!C?2QAt%^Rav!C?wTBM!C#S0+r&wX&WVl9$^4y>pKN->{d<un
zI&cUd0EDuh{693V^e>HHKp_3Ey7=k&c-`^wcJW3+)F4njA5R}Y^E-}C2XS0<2}C%#
z82UK||K9!`+f_$DFMr7Iz|8_2JrT%Yh??9%kpIl%qTcm?WMSljaCJjM6cps-AW-vw
zTgc!$2gfw_a&$d-yZ+|~OVeBKE>1`Y6pnB{NLXI=chSGIS5jA&Q~nnK+E>~Hpa(G0
zGcYpHGcqzTGBGhSvmRw-Wnp3EKEla<l#lzw2|jLKUIC%gA_9V9CwX}x(hxBT$+PFq
z@{7pG$()fpedg>L+IxVFnfV!G{-Hz109pqi0sw~?4*j_Re=mm)(;YOz#LU9Vc2EFw
z6gYf{j_xo$9RmYB{XyyQgYN<QV+>rU<aHU3n>jLx`f@AWd;F4F>_Wu{o@;|dam8DH
zku0pdd?)w?PD@ChIeSh?Sw&S%T|@7pzJZ~U@g?)?H!R?mR@P3=F1KCX5bplSfWRPB
za7fhs=$P2J2k|MXPtu;IKg-B`m6u=ey0GX?ab;CCrlz*8zM-wXqqD2Kr}yK~@W?0@
z_jPO>Pni2Q|9xR`X_>U~b8~BZhx}`oHV!Z!Is^bPVE1+WnOEQo6aWQ40Z;%G00lq+
zPyiGF1weuSsKB|hH$~P6>wwPfJYOM9Rs-Kt#1S6uAc=YrvP}d)170>7(t!8(3@I|L
z0Q$>R9u1g1UxZ1Hj}RW3FbHOt>P#wEm>6@gF%XZ0OP=6pXdM4U;%zQK`TU`}ySmBC
z>)6Ks+N-2)lP7|o%Pqz7nU*)56x}1;MSWv^7xxy?!Oetyoj&ssuhOzDrj6BGkBP&o
zuc!ef`hPuL;OQa{5O_0Y_x7a1y$7xttxKA?$%@@q@)1MwPj%1RrNKv_UeyzV2@}8O
zYO8DY#4CI56y-XnxC`-Fyu&H=C<}?MNj37vIAw~ZdHceP{<`NX9#0$|8|&2y9G+5O
z|0M_5wPZjdFau<^ZUJ~=?udhtO}<8WFQ(2UuBpa~2@{}X_IEf3LHP@;CsWSm+GDaY
z<xAVDQdsqQR(EYEK{YDCrfwBU1GwFG_@HfF>BjXfQOcu(ziT>?(>n!3Vr1rWIy6eN
zv$$j31s@z<*NMVbA)#^E$8hD?J|hxijz5Y9_#KkPp<lf?PKMw3XPbXn{12}!Ta>;y
zkqn~)u5ckTPps#<S?lwk<HY#G1XpvTW)~88nVk~#?>}R`djmQ)KFuG&Lbf&LHhm^e
zJ&K+$!DUmtzvL2QV|4@(UwZ7vhdWN~&@T%Zq~`A80!k?!L)C&SsI78NRG#VZ{G*G?
zg3W5}fD@H8uw*SFs0`(>BpcNxDQQl@&vS|OVE2p?e?||i^E7Uk#afXJ9^f4q49jNJ
zss~?1sysaB$8(ptIIk6QtHO&arq(hvJ3={4xS}#+o+Y!o=IwMpH)v6u?bKOv{Cdf!
z2vPSIo?6nteLM*syY4z7-ejrte6{$NRYvN`b)oGorUE2Yjr2MT&n(?CA=KYLzd5a6
zkd+_dJly&!zBHFSxvX>g3Y!^myDD#)(|gD4`RM&_(X&^-qP{skvh=l!_7k81iRPC`
zkS}kmg*+@rqARE5Dw1R#cYXS(s+9tvf1<R07`1bm^l&__^aWpyb<%T4{MzSjNJ>Zd
z$YEWP!~pNWH<07^zQCXBkz$Qfua8z&4{8}pl)OGFE1mo9=eLF7zS|<D@Gn$VH-W7A
z?HrX<f|Sgy;j-tlFV_9$#>A#}M|0T2Y=<z(e1`bODG|FbTk4ORn?g#<AKeyim#C4U
zLM(gd=80ju5d|J4S{%NDmmWXMmZ#{Z4HOngG?EzG^+<uK_*E0r5kmc_%Z8Wa7=Mhx
zTwPdF9_9`VV@Qc=I!*%|$*@unN;vsm_-wP7X_Rqo6JI*c_oD1Ip`MZ#m60L!0BPM$
zqJki0XYxUyV7dYyerM^PbNuq>@61CMaS~SB8I0z_ThKPm8O~)9&dtVhrm<d^muin}
zK0tn@dp<19HYL$bH-ukWHqkumeX6>y$(jG?huY9^)uS-$pLWnWot#nxof&Z<ngTDG
zSU+Pu-f2W1@U1xj&DrFihgvat`cpsU<`?66TboIV-dyxr!}i;HswfTUXun=FtR+Rz
zHd7kQWXo7}yf3k}d_1h!fyh%k+sf}YEl2$5F|PeVh3Ss}nXiLs%O?Um{dpaDa!0+q
z12~VMTsuOriQabByVw(v#<g!A*y{&Tig((|g?i`qReoAVzPDOzGv~-NK7+`g*hwhD
z>tqzOki5ILHCM_x$!L3=QX?NSo7#2e;l*+XXjuF~vtuZeju6-QO*T6xy*fT#Rp5u`
z&B!CnViimncN0-PL1QU;eflc-_dt;HLIb?>jPmzv2Ue6vhrn76dyH7P*Gc)dZvh*h
zDo?q8L%XE^bRzvI5Ek9teCrfZ(tYWNSHxNCWgMSg+q4KyOBdmBD&D5=1mWmYp$keW
zvNWKrwuxg-Myx9YiL=)HRPJ>)^7}YJ@g#QRNYP@5K$p*hr$Hg3+v)f$J~)Yen`3^m
z?`B1uD0+=wJb<AkO(KmXFiryuvFqq}m^z8U9GBG>gB_BlsS&eUpN`c|SBFW>X_|7A
zWjVPP1K~K8s`X>K7~b3C^PCKkTTIQ@i9sFOur2|Kf;Vo~5ruN^>O8ExvemHWqIZpe
z7R_BOV-Bg%2&<&p`UT0!y*wc<uVj(wq;4Txx&yOTGEEFQQk$=hO)VfN?QW>Z_ZM0(
zl}i)fQMYw;X+XF|cYEuDOn72BMo5EA#_;lJ^-t<!ry~9Nk5M>&WtBz}Yo96UEb)8V
z>t*Y;y2mUoHN!(%=L=sxo=StO3+;_$bC9;56JEZVu$q{$S>8pA1r^#Eh-E8IJX}@Z
z>c3@4u^U<!w5YB8(qtM?w3PCTPvwziaHZ7d^8G>|>medjN5528iu=<VY)E2E$?J!c
zOFQp=`Agz6=fZ?Y@T;R#F>+1+rk!^vo4Sk_q&DUYUk$A3r?5S$x7&ZHxibFO%JvWq
zcr4gX1Gae`_PMvF!$OGD$;Dx^B<>xo%J<NNVF7vGCpZ^yO_ynt;sM1oJ#?wu&q0=R
zk<-c~dB60OEo=4KaotW-TSM`b29vA@jO&NfJ6eQDjM0dq%aEAmUA3@x3%TJb@}?bd
z{ka@|gbwTQ%O<SAZI1`~&6wt<gBh<UMD)zE$3qgjizQ4R;XR%nrMzObE`D@8{LShR
zpZ^!F1TjyFeqh6TyiAxR9=e*t*T?ZJUioK-dcaRkVqxGyfxiO9s&e?-a88H42(DU+
zLl>(C^?4O{k-vdOrKb}nu$kG84O4b0A;(@EEoc0NOjSI8|8PP6)%=`0Og!HlFqJla
z`0yi|@{Jw+Z!Rj~Id^~jd=a5W@tFKU8ANc78!7$}zOCWit*rb%d@B6!XWlzGLapDD
zQMJ@2@nTq2Eafqj4UJ=gZF=CKd#318axe{WVpk5`#_*G6iuP<Lawu`<YF7nmfW*8%
z4Y2*uy6GJ7g*@>AI=3FR8<D{A1yjGLT}`}fa2~1qkb1jb)8T=zG%+x*V99|O$%d}5
z{q&UNp^_w^D0!=IVzWG`oPGZl`dcVj?{_=sT@`_)2nDjBHR<&9y)yEp?db`JFZ01N
z*l)Mh=>TR}+HJBF!M;>7(W~h!iK)Ha5cfSX^D}{OhU2}E@6wkYZB6()c!p%+`c{sx
zM<z6KQ&2D=@r<~2Odi_r=J|!duOsIaRrUJ)V2p`)@*YWQ&&&(^^JDE#h6)K7j#wUA
z&OtV%0g`MabLv!UnxyH$q_Bdg0sEQhgayhArnXe-RQCqAhsZ|IINyFk|G_2X6~k`R
zU(yatupg&<DYFIp#jtNevpIX5ANJk$i(9|3&93ip>QWLz3X@yE>61kEqrB0Z=5WqE
zS#&Q8abUk0y>uP39Q(4IYyY6YBj`SQfCf~KLSsJ3z!1p~<lYC4g+EoFXUcu_%N14v
zzcO2X(qmesx@n||FLz00TyorAZ4Dz>n7C#efR<JJ3_EUX`eUlVq%@43RF;xd(T_%l
zyBAjS)h5D9-6%Yy=JMzWfeAN(maGyQ;ECXxw8k`-<tTrgG&=1cH?4doWUdrW<cryA
zWuy)WtEOI$ev6UnftF(@nt%`QcPSW;*`uTvXy)oec(Rtlc(AdxVt^9i!sYd>33DD?
z7&B3#fVk7P8<SRIXKky68wfaokv8K=W1M+LM^Sd&zFYqkH;aoes8xG3{wrAc;d0@o
zL?M~qhoiPlgr%TPP|!49kNT6Ne>c@0M#Kh}wg`lIWsW@73L1}sR&0znL$_Vy)moUz
zt{+dZr>gHr1S{GKKk)Z0q@c)64OZf^kG!9R{2}@<c_ecQ?OgZDA*v=tKXPO0^H9!q
ztrJD+3&qaS!wc`jJ^A6V_>P65(q|?Gp6I&+cw6|73K}4;*gmsvO9PfJrX}v3p#eQ~
zU9fGrN%Z1b<2?~{ulz{s4@F-ZkgIRJ2SfM%LGC=bcu1oGgX!GaymQ;lq~w-pei|_3
zzR<#9LI{o!quh9YA=w}_>aAy;M#9IpxyEYe8xIj0*BMdAJ8EDjl+gk!Rf|i)c{gj4
zy>4x&@P{?2e$Jx?Q!%l7+BBfokbE#@Iu7i=(S}AHM8|=cn{oK@9KC;dI{6-K!%|0{
z27EQ(+-D8hIVZJ{Ghs@-=)-xi>&8L%!nqJQV<I3VyP{!=!(7Sp=2LMB<CciQ@!+pN
z2I`ZfObASIN)9nPOv9_Mh9You#zN6CFP?QIMJ&%(b@R-(V%VwYa`0(+<d|;#sv3<a
z^rs6(sy>Q1XIJEwm24+gG)5lWHc_P_kNYC<t7f<BqjmPAdXEZ*Q?2{R69*Ui+|?Y4
zZPcT~7?Xqt<$2kmC5bwrs8Tb%!*==l3)xRvF=llWvw}wKo+&G=%r7Vp-=DFY$tWFo
zFwIHYNp2GJe`%l0I$<dN0P<9QjpbUQ_FVb(L7DGWgKuTZzHv?J(ffX!%agmxLg_R?
zzOxm7n#$v&q9CCC^;Tija3+xk#AgG;IwB}{8qn23r?4b2{eov~+@Q|tOT!xjuBTh8
z_Vu%NUQNccQ+(E_`=)4wP&;I?;0YH@WAZ=zXR9(PLejl*a$$SzxJ0r}x{qr(ot{$q
zg$pY=YpZiVi)jE$lOlnW3FY0cJL-*We9m?zLo8*?nTyM^R<mx+LzA#`cdJ#<ZjtFq
z^YE(7=JSyj2W`8IsZihXLUQA5e^B={%N16sQkDMKXHR#Om3?(lZwn1~&*^ZWLp|?;
z9U&0g?G~|}DW{b1E?Qmh6Z42d9;Vlb3-RSz{I4x-+%*E8R=u{>l|C-2srUc1Yu8bA
zENg@C6D(-3;I^?K!QCae6WrZhHf{leTW|{&+}+(>f(HTw4eqW(&Ux>B?>*;!-^{Ev
zYyOzkdo32l)74#7zpC!ubU)NR4GZgKcqv0C6n>tn>xJM{Ic)81=O)_tA1+nhc_roK
z!+Cbi8F*N+Q*T>UTI$zKeOrXqo?f84+R9hAPFk0q<6X4+8mr@Mg0i{|eXlGndz#q8
z%4%g0RKKwzQ7_+);rwi_ZBWNucKY1sO1cH*=9FywGr~pnIw1GDypKJ_<lrq8X;t-9
z{1C)C;{N!Uw_ht=%O_9%lb|3^ukyWRxS4Z()6#*rO|{dj(RCc-R25N*vt_OntC!8I
z?ZLMzA#_e21n+r`Ni{#~F>=LW5BWyxWZo<|uRC*$y1DpyzFMP&T;mV+lyULM8O5wq
z91mpujNSG0!Y*U)L;c75=eq)er|Z1V_B^JK!5tg<U52hkY(F3530AN-iK|ObLSmCN
zs+r9J6jRBkA-uc!$G8lXM<UDH#E5er>}w&V%F5aO($SjArEDIitnqx_@g1cWiQ}_A
zji(pEo>XPKT$d5Fk3n{4C8*yA-_WMDzTUE3eZE9v-ovdC5%?JNT6^TGFYe4mFZ=D0
zGB-tjao#HNR6QmvUVnP=%KXyW!_=^Jewln<5oGd-X#>2sTtingj&GrZG7UaZ+3Sw*
zaYJ8BtPeE`LH%6FQ%QCvbIrRdqucR_Qhj`xZ?ErUZ9;aMSFiedF~@X+=&HDx7s+$+
z?)eJSWx$8I-mQBam1<ijGkTNiYQx;+yrWZmytuk{t-)(@rrP>AJy%;O-4w8rfU3#g
zkqOq3aU^_k?Y5o)sWF_n?G5_&Dv0MQfhxZyMyjFPx$nJV3(n8Is6fIOC)(+)r9uy3
zj14X9bwhjhug{gorwvI7_M)#He~yPvxKc<F;+*70Cg<?zIOW#%ezFEdJld(n*|<Ge
z7GB$~A-`F2z3TBn_9m7yEN0>ISrD0NF<^E5Q50wV!U@eg?g;)GvOfbkyJ5-`r*zw;
z2~u)W(6*$TJ{iXS<F|`)<q5+X{izR5d#T*Tk5a8UNQgcHI7yE+2R@Rub1YH^@8o4J
z6F=9WmD$JZ`|D`_9EZLaK9)^SAq**Z^}c!^lDdCt!B&m4Dm2Cr{<0J~p#8NIJ?!9`
zl(oujzrvJLY9U<?0y^pDt^dN;<8r?i{h#mNr4e;;MTU7~;b>@zUns{(SvSWdM;%3#
zAz9tC9>2OLiP^(VFZOyUUL!EE<+?o@M$I}G))`{f>I*sk)w>KaO+U9fTbaWa<U*Bk
z$E+6mzJhVDa-FkZZm1Pfv|_HTChSfZN83D+9vnzdFH`RtjZ%m-T#ZS=`fKHN8`1UC
zi%v}bd3TrK8v1?MO_zYJ>KM%cM8~L>Vhvpc9=J977iyNXl`G~hYqy6|^Epmn644j>
zCySBONB-&1&tJC2k#)_Pmdz8t4f7;^5HH#m4u7NH+K_k8a!eHLNwIc>zI&C}q};>x
zFyEBUks$C5#fU@tZg4sF{V`DpO&k3#AzM?+B#!NY%8;emtX2^+eLO|`;oa>tS9`Y)
zia8%|`-yJ%l0o03m$*;9ngt_wC$o<Sr2~?4I<|lBNv|VCNZC1O9#t^$)WK#1q<b}Y
zC4aob^8<oc<*rh_-c&PA2%~gsNZ$L)(w}L3zgi90H6ENzd2;^bN7-4ys<p+{UN)yo
zNo&#=wM83@Q$`Ihe7?!LC?B*yuB{+@3ZD?RuhJ?C-(fZl(j4!~OCI2bKTL#YH||<G
z`@D87eWVd8>t7>j!&GByOHA0jL``eu`nlD-d#W3$``YO!1anq}EhRA7Sl^PPK_!OW
zT*{iXo?z6S&;Ox{HucVPXKS6Gs_Hcs;ay{y+&cTmypyXSYuXa}fWTaRaAHDr)uFP}
z_=oE`iuLj!Z=RE@0RCzoneuJ6Q!yqvTs4gWLldpj%}9@1C0#tLS{X<AW437XA_RJD
zuZpEbF{|*)OtHcEZsebkk*zYSvo&%NO?>fg1sO!<SW@N)WBOd45-rplXPYV`8d^U1
zkML$!T$NnjS)A;QGB7@lJT@nXMA7$qn!;0$?-u(p^0G^>CCyOumQ$&gU9Knz&{=m_
zyIrTc(@7dnOybv&;Z}Agv^6wFO<Ax`n#HKOvz>&ZhgA93j-aon`Ze5l2q|a4*4*!1
zRGOkBBs9!tWZ&DwW)7T}`UEc{&p9DO@1#(4KNz`s?d!0rs=A&*P|2spX2=aSH^XiP
z4lQ#Rw%kmzswUd7SK!xio8<prz9avwIqI@}q?z9EN;PfT++jqr1C-Ci7YpK}_WbaC
zgyY9Y(p=hQ4Oa`MNvFZNwMu%UE3SOY@!M~dkvzn!=V~lR-zkQTRyBwBQk&u^YN^Ek
zltbB0vBI^9ULU@$*#n~r#LjDul7N2FopRobSY5yCxOMrI+urPFS^S_XZ+DdvupX3R
z1%^6?h!WJ+{`)_M_K$4GwDloQGW2Tx@-36Kqs%VfZLOVSAe~fIpqTDdOiF(unf72t
z7_Q0T?y|cZeGDnJrZuQJ3%XLD#_X?P{b8=*l^30-v2zQivNg5F?M0OM_Qvi-G5BAe
z3IDxSAOZ*g0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r
z03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@00;mAfB+x>
z2mk_r03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@00;mA
zfB+x>2mk_r03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@
z00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve
z0)PM@00;mAfB+x>2mk_q7w~!d4sUE@<Op^!*0=s$vNf=PXJiF2fPNQvctG@`=2l>1
zhv(l``e0*WV?$dbV-UTxv5hI%48+LE2IAv`|F6AWzbHq^AovNO1RmYJ+rlqkF5aW2
zLGXU>8)TLx1pYj-O+xnGr=1`I1hbVEb)}Du2)9f^y|u}CSr0u_hDI;Yfnp3p^&!a;
zBF&a-rPu9MtXa!DF4_l{^D{l^Y2`cIiG`}iNxrQh$~1ZNB;SM({&kpO4TzYZePM!C
zlbJn9<dweTyX_LRm1gP2Y!fh!bO^GQNN?zeN0s$klku$J8b^5gG1JjYQ6!W$1lu13
z1$U_=#TSaXgZo0(Zx>Pd6m0lD{s#=Uf5ou10Y8uWIidifmv^u=R5S*IG@pyYq9A%D
zV^=Up`!~ox9NGVM*Z-Ft703=|2!z*r>>mzbi4=VKeE)+Z$NwRW!~g9?6-qh6>O01s
zcC^;wFTt{mk(S_%d+WyVcDKk2$;?{a$DHU)C{8wqdPHEjC&M06nD(WF-Fh!b-CW*a
zBxb(j*LnMg1T~g%COk8L&P3?^c^Inyw5X&9{k`w}AvUT09V3p<?>}JtUPAvo!x%wK
z41X-C|6V$O1pZOsy}qNd=<k(B|6cI-=bf~<fw6-=*xc4e(b&P<<o8MH;0P8n(|342
z4E^t_!p4q<4(4`XTL%ym;~&SSm)8HUDojiudPOG#u$$fUnXKgCWUTaO$yV9M{EyT7
zxxya{{LlEGEvuRvfz2GB*E%~pJBW>u0mRC{0AhMBGjni)m{=J=EG*1_Z2L$2_qN~V
z-#@>%{k8miA68bjf5v}r|JRe}k8b}%K+w_9_<8&soQxoPA$>b>V{=n8Fo=`m`On`Y
z{k@HriIMG(tCXoDh~-a&_wQ|8pL<Np`rJG%GXpb-@pq?w@1^}`h39LVF%yW1`Oo40
z9;mFo^)t%<7qbLd-^$!j(8kot_&2m7*w|VH#PMAEZ>fKQ|CibP4f>C<{Qq50nVDGr
z?SiTuGj8M0fY^7$BNDlkMdJHj6OP!aCZ1zIs_*gz3nRfK?1#)(%ifhs)|0O@GuFq)
zf@HL2`WG%8?{~$PI%t}fagnE7&v1L7%UUCpNTkbuc?jF`*3g9tSyxLlBi0`DeGOi#
z|D0;l9z4?-j^!G>hGpAvbxEy4q>R3{we<rFQO}e(yXp;0)5Nbrr}2XqjLM~!=#vjE
zB|?K4KfUZhXrUOI-?DuNYjHg-%TX{C625X|48xY(Bub&tHG*%eF9eJHl!mMnVPu2P
z2poo5#FkNP6*s~;q6auF-<&4g1h*J^1-AS;gTLwc1)d{iz9>|y7U5%3JP1iXH{Ck^
z5D+u6Emrw-|7qkA-QY4q->3IcaX)+BC-ed1PR<c`+KYsP>Br7E^`|yBqFI5k{G0U+
z4}|uoKs*AKZ)Zr3$LYy`KllEa?*E0!VEnyYeoyXy-R#)e82){7Hr+iu@n+(Wd70gZ
z>&O<}=R<QpyseA9CSI(H<)D`{(sW)UOE|#JA?t~uy?I$jPR2>hgIkZHhh+ZV6-Lc&
zF)qrvTI6jFo?1fEoOAQisahuO1kEzE_rA^Gnu26=+<?cH#m0c|<Vt<}QM>JzWX^Gq
z@x649epwPW)VG{QF%`nt*a)H??4_0zpYG9#Kl4}ccUteV*a)~rqHJZn$`&%bdKz7p
zgN^1D3_cCX`sVL%;?NfQ`HTMhaF3wwPI<#of?#f)4#rtTQhmAIOth16R9!}%goZ8d
zDk3XVBhH`(TNWl1&(@pL+F)IO*HN|O6tirrSN_-8!H(;lmB&Pf9(<p!`BA<`h>@NM
z2mfdi5Wf(OCW;8iUOYPTK|N{xRMGz#=9*N86P8-|i@vc#fI{x9nWMuQ*j>n5FzcJ}
z<5S~?Sa5XBFgq$i$mFk>FkX?+0l4>=d~Yhl#-}d>#vgSxvLxFNNuxef44|IAZG3Ow
z8k`vZ87{|2cRWTlnp#JvD%CSX`XNMLE}D5jZWwyt!?#%a)|L$&hm?EQK^h$<(J~=T
zZ}H_%8mH(q@vt}8N*j9{BKQ}EIS1EOSxG#ehzfQLVYh5<9~&dA43~vAJ`L!92~Tek
zApGRT;Q;Z#Q?-54M~~=^(D*Wg*C=UUEJ^27CZk<s8lhdJ+y=Bbz&?P<l#+YG!ZTvQ
z;L|+NjXh;bHJYqXz4-lIG7;lQ05@u*KjJC@)Oi|bm(2}2>TP@5yiN>4@w~#<M<zN&
zIdI{4Qd5B3Jch84JJuF+O+aM8N>%4{Ly26SbeqKGRC$V!eUKGm?O@kk;hqBVjqD9+
z674?X`^EGnZ{4G^^g}w^Ut<J|+;!I0wr4eUEY0<>GO6s=KPuYnmljx&YFWp2i-zJi
zjdR~!Z@zBMoyeTq+_Ye|h*uy^tVH}QNeAaUOQt!5!z0)hk6fp!>`<Dpnou;PvWzb7
zAV?QNua2{_EGyy3FbLgXgwy7yz9FC>FxV+Y7EqH@K?&z>L;9Ukw$pJiqxSd*&ivA*
z(6u<i(XW_aR4x8pRZO89Bx`n=Ftw6336?VMm&kIpFcYFl-z-vYwkq<9Vn)nrU@cH3
z%Qmu^D;${RKdOIk@(v^}(z4e$uVKZObZ_=7rBw;))>Up~P42Ik$289qdW$hCK~4~Z
zhblu+Z_gZGtyrJ&E%s4BL^c>1`sy~u3dJdZezvesGbS)}gSw5pad+X0X4{QJeXzdf
z?Yo{2+)Y@&b{aUy$u@J{(^GE=1YNGri0E>m$V0y>J#mxxN#t?DE%61ps`Fy+6;dIO
zyX8SBb}}QxKJeuK$~SRv$opD~ZL@Z<ieieH-ZYwW{^L+?7qYuznZEIG=TICId~iaZ
ztbojpFAV=^xkj*8^1AzL_?28GTp+Z+KdLiF55o^<QP4v$8AY?F`4`fM+5V89CC3!W
z9|w|0?ZR70OqsgXm5`5<79$B)loV8&SbORXdTbHiQruNGmAygl-ivk1&>*;1YV)-O
z-xksYsaPXL*h#qIz`)g3VN}=%$5Zi&obt)Ek7?TbF$wX_4XiV)ag=&m3f$KF%=<yw
zVQ*iCf{FJ}$pbK<K4r#L&L-nhSU^E0RYYT^jO4^dy+v@lGH@2D)(~^|R1#5;!epb6
z&=Z)H<kH+}TGPmfpfyMDsl29JiS4OnU{@ShmunX1J*f}w$}=gcs+y(JHDfSGRugJC
zgyGDXiGFjRq|bkZaMxSa4O^O0J-K!~rSW}pZ+n%y$@y+pA}|MM&8}*4Rw{7SYxbN$
z?W2TpVdxp7%50RMJDD9Jl<SqK=iB&P>Xr*^J4p<Lxz^}2-*}^(Z{Zu%Wvo9)21Bl6
z1UC&hS?f(j6@w`wr+(NtT@&mS7sUv&QOJbjQZp7D;9%BK85LCUr7luQgy)LTxR3P*
zx$*OlkVBWtoy#C1M^wE*#C4=nZBEcr@9bhgeO1LAj6IT*-<3k}!w9bz>)WN&ye6}i
zjbyLOxpavC+2ltk+LaVC12}{|M3n`E9_UfSqs{Y%oE^XP6jUgCM&xp=SF81bdDnz1
zqSO%&8!&sdYg#uskX+7<#nhFxji#;*wU(kEH9ef~(x=xOk7u>p`f>D9AZ?yT;5Tm4
zH|(Y|l|*wwg;7_9h4BmVP%+}``KVBsBpR6{Gp{>vKyi6P6CV-3=ufhExqoHiiWb1$
z7?{K-CZ!chp_WO_VR0WtVKnj+r7M7{{oK95G>d~G5k<O5#nWHp`(?~mt70rug`GUZ
zcMzvmPew}m>!;6k$Fs{}idTo1X=9yB-z76RqBUD8v}n4MtbV9yG=5g2oVyFkhw!$q
zL`Bboc@jjs9!+}d&5ZkXK*Hj>g1c~YiKJB`hdp-(KDw+24H`Z3mTYS|6{-^A@*2N^
ztZ^+vE&u#iuk=l2q4ds5c~@}!noD=JD-7+Yh^|IY(cuEMY^tCFfzcu*3&>&<NN?8E
zag@AqxzkkXOy<rnaAPSy3*cTSXO2UOZ%{rIxuLgM`I!%erDRS)IS+|X#lCe-sv=R6
zVGu;Z0KIh$a-g7U4OC#GnQ)u55TnYDJ>8<>O-?2)?f8)9#x+5cW)kD@jm6X?@*QS*
zF|(?4)1~(NCkU~P=sb8xd-d(9pH&=pm)fgL8~%;oeioJ5vy`wN4?A_>;ls4G;8J(!
zv2_KqYhjgDuniMhRW3Z9q%5%GmQ;Bl=msDaV(BVdJh{f#3i8Omr0R)Xyt|f>f1i%_
zI;N}Z>yH*5r|1O}daBD?DRE+wEs}Enek&S1?8YAx2Z?+62Mne`>fGB00{aue1B~3l
z2PhT(bFcjfEcQFTcglVrNExw<zJQ;RUeM<XODFiEW+m~0Y~|bD+eFv~GwjnWR4=)w
z=~;m+2j+%dX;H9NxF~PC7M1TN((7Z&#izWTg+0T<VjEYZm53mPEXaBxg1a5Ni=v2?
zmd!3+5oKkOkv2tgEO=q@F|{JQRi&RdEV^xJW+#?A^Z|k~vDpmRBX3of)+uPV)n_TO
z&sx2+>H0I7T_3m%vv7<|%<g*-`$sy2M^PC3=MepHOh!MmbhC(XGH;Ixj4;SiQKrx~
z)`<3?oPVRF$;)`7c}}l?YW@O|ZqN<7y`?0}8wuuP>-M?Rd*xh^k_udkZEk2DvQWT&
z8VlXMed{*GFh+=_-CS4Dh~<8m5%~$i#cN}Id%A?4qM63mvsQI(4=UB^Gwu(Pvn-9c
zUyF$=a9fIfHIbr91KVaM8gZE}(WH^HIEN^bQo()`9U=(Bcv>d0#bsH`a5IRkb5<L}
z!`GYehFODFhRJg#j|*q5DMbsBmg(H9$Va7j%avKLz7*pbXt#1ZFE=)ayqY=amptWf
zsN9UU+>^qmg-qXzTJT}pI<I3nq$w-5X_LMm0UaO^RjF2wqrG!ZWXu}Oq^6Cx=j0S&
z!i;(tW*u(6$IR}mKx8(lz)QlP)dNvSNKgq8Mf7Z6pg$OKp2z#kzlPQFmFW11j?k)o
z6EOxpmLM%1Jcnly*O9zXjU2<>WfwwcnNIxX^t}Qm&P|U7JX5NUP`>QbFHEhBl6o^b
zyK@&=V~ub@qkClyVqgB@Qe&JM>2+zj(qPw6V4;ghb62+5HFSu0=p=g|F8AH&)N5U$
zSwyQ^Ej5&6M4gt0jt1M|&2R$ez)-xhawPt&va066#oVq6R|1Yh5p_|EcXL^nT8@0d
zOu&+NZ5w_fx8}lu>BXJ4T{6OKgI)lFG@X3IPerVjUw(7i$5(V5JANKo6GsroO_{yW
ztV(4Q&`el}<EBs<c7k2deh9l%cy1XDKdrGwnm`i$4TI3ci7dhzq8X?jz0mXxKg+f3
z!b7z;{gCK>GC7t=$uS)GeME3J-lEJ&Ir=c#ti=#Ag@B>%`EJH53b%u-P#{h=s(M!|
zGlt7zMYVo0cZs8zSX*fvt!X|Tb1`l@pDAsqWxjCRAvbM^hA&L7QhSqeC~T>CKjw1g
zq+o*UL)H3b!i|67@?w6Nre<n*ASu<Ab!%%IUQ`Ypx7`c)d4b;B+dg=g-8luJvor;B
z2V=`RqX|Nv!GN#50dgMg7;{6Mmv0!On*;b_GTy}&p3RtqwR9+b9PZ4CUHy=^m{H8W
zSz!N)K~__545AuyLi3|q#et?kg+K%}M<@j?O0B?0G*r=@K}2Y1x<D&)O9}<eL>=`A
z?R~s5E?kJFlGBg6I#31zxcTKo4{sY@=R8WyTq;f7v+DVOQFPw&|5`MDL|?R^vkV(B
z0&+qdptgc{|FJT?vG`soa^)7jTvsOeOT5QJ$%zwfOJ)E?jhzC5i}~tXTCy6H$u4->
zHx`0<z236qk>-`Tmc*IR<(N>kBNoJk0p_8*wE{H^av$P`F*Ow^6}WX3OtG$<&YSD<
z&J89>4d&8eqD<}Ox>|8PoZ|QQlFHe#v|<zUY4p^qMG~?{1vBC_2o5&`>G&CWrO_vh
zUQ$GO&@hKtGWOg=I5`=7+HA1Lz7BkAhoddJEFb*fR?3L1XPSA`gx4k0e%%|Ga>08q
z6HrOKHCA-WzC7==I)Pd59o8%BQA%2yCSyRvg#L<?2K*gdb?;d%VmM3lYxE|dfg4l9
zk+YnCPRT%7qxqgGH=P{YDXpWM4Ea+~A1>jRYf`T3$5+G%ecnDN;uZ7<y}brmv~K3D
z!MqJGgiK|Lpy6@6-5LwYT6;jPc@wR7We^zEw*#{jI`_SD<%CLKq~TsAO&|rmb-pdX
z|I+(az4_~D_0v7&MRK8+^3WPsV?M3gXRqO7Gn9S^{igm(oVo<3cO3lj=L-29a0&uO
zZ>rR6bbMoDPI#iGR4BrX<_|0XIoq;=iGfn%mhhPh+_4Vp<6F+wtg$_I8jmidDVv62
zq*xpA2I7rCZ5uOtp;kPVhO7xBCiaoWRVVh5rk4S73ahCJ@cHB+czpKV9!l2%xm{WG
z;op;J-I++^c<c8OAi@;kl>!|hv-79Mngce!#+S>#i=ECjoX#!4gRm*c>Qe8GY}~)A
zs&gMqX{dRiLycoIbnojp&(Yk=mAPE2EYLECOcW}Csq_dA%Bh{1s8HdeO`c1Me~T&A
zO?)_}hHsf^gS1rBOA5z*{UfT0SH|iNmto1}S5Lc_<t4>|Z(kZR@A<uAF5DgGW8Ic=
zdfl{kF<x25JwLy68sTEKt!oZ{$B*j+F)%x>6+5{o;r<f;EW@-$Mg8iDwe9j#fh>9<
z$Lz_CS#|}9f}?u>#YhiQ&}&_S=AAstp4yFGo&C;QBeLNERDBoJk7a7c(>PLAA`K>B
zkxLSuk~bKe8^2Op9zDGxTZS_XQ)&e#VW!wPO#CJAgso93eCJ?#U{X)W=QI0Yz95~m
zCFMI%*5p8%rpUj|!!+HpOXh3&CV-2;80-pWoW#au0DtL(#U>T=!Wm#Az}0Y6l^J!R
z_qfZaPYZ~iZtX_pXv10_$>3TYohz$W^?^N=<CjHp?)HyL=ka=f?u2)H`|@%F;(j;j
z4Hts3hJsQ~;*RwtMC+XHM^lUQB+8S|dDB=~5Qc}R%x~}G%!VJEK<7dRF$$9cA18Am
zV!n(lq)X&k8@a<cl`C~R2Htw|L?l>4n3um?fJHLq>2GnqXe|`7ZRNxLzyn1aGEJm#
zIhb0ud=Qn(ceNkr^T7M@yZtq~)QqVdrgG<a`pu%l79`|B1oyZ8e#Q*k{aHCUUG{-m
zVc8K(<@CAoN#+0@FlDRt8r^PgGv#5?*&D9_o2nh!bG2DIY9r?bBxJ=HcFQLj+rjU*
zI}hxof#dJ!v}NwvD%Pr065oKN+m@qm>f}u@VP+xjT#FtqbRSPu`F-|6%9lLXdwk1R
zSm12)5erxD=YF+69nfcZSR5|3dk}l|p{!S+uj`S#)F&0~BxBcq19nZ9-;oKh(of7_
z&Du<@=1tD$%OMcBHN@OTXRi`DyP`czEwj>;s^sH@e5hauCc@Nm=QnhjO<zdUxFfP%
zW@@ebN)dg#!R_PZS!3TzeLY%EKd+d<yC#j){wNe=R*ar{-~P39c%Z}%l8Un8`N2dS
zrg4Zhj`vIYDGZQ7mFoj;ETb-u=w7ekxddK|sXvz0$1q_Ne^KGXD#0!oV!Zt-!7!v<
z>xwQIm7%_wA)|6-t*r8SJ$oGb$?7}3m8ab>*PW|la*Ck@0)DlON5aG1r3j)PRUI$Z
zjSAnPzTR<tUAc^NUK%fo<*H*kd@|dgR}~@?XaOV?iOT#HL9`&5$$H8@{ym{Luj^*#
z>fN>I#+Mf^FEtYT{Vfe3iJ5{t(LbOfh`PpLZ{kLb6}+QUcn9HK%f-&0fuv`<clN6q
zSG%liJR{Yo2KzOJP!9H&-g%VOGy@JzL}W!tQ%05#w-CAQ(ji_-R@xeeG|IA;e4;b2
zKM-)|7F-%9K2GX(8(pTHs|#5~U`Qe7Ul?QPb<~2|vDHdApvMo}p2QxySMF3Se&Jzx
z-yTz4Bl6uJJ?X`+JZuGYU-`s1XyQG8K@JMVQ$VMGz&ETyduJ}Y?B_)i1x6UtN``;q
z*1^Oiny)%|Hs1orpMYx?4_^W64suVL>aHP#a2H@XTO__UPoWE}iQWp2hgtq<_Tp1S
zhrhqJ*KXHUa`p*PE@4bQhbz&LqV4+|{mZs-L$U8o2&y@A`!BVsB}QT+dOppfg^5_}
zsTZfzI-1-IM;cnzq5lZ)iJJIoeD`o|pNw@S#u|$&n*TCF^aGil07ufgUW)&VSHULx
zV9xS}waHPFK^O2XbBfJU$*}ZQTHvk450|*@pl|wWkVj8<%^7V^BTE`C%9~DmgiV?a
zUQg-6kR#bxgha*{<2+AMwkiTAQ<#fO%yUEwX8N*U#1E<_y!VAN(i3edM2w&tMa`J$
zbjv6Q$>9|=0zsx*Xx?exZA9xwOjNQ5qwXZq`J#pmXRLJ6MF%naAFQI~VR8_+hV+^c
zA&ft6ui5_UiQQQ{f}!KuYBG9<L11WCAMJfZ%+*%`ZWVupoXeNt^;k>vv?!+Qado)v
z(%>dmvwQ8Lw8F`Grd0Iwb6ftL{xHLDM|CCOh1DH-3ICwaG1krO^j+c2u(#)GTKoO#
z;JQ;`qM|MOtq)<+S9E$Wxyu8-rM?wZkK3bzr-{=cDXgcIlvB#kjWyjYW$cXe0C!2T
zqIj(~N~pwpxY+`;9_4#Fs(4g|0hSo}x=;IPGv7&b2;4Bl>q)#YmIGk9k1vVG!;Y+7
zkAz(*+R_Rf!)RpLKrJ!&AU>{J#|rdxLzVS$|NW8@S?3HZ*+a!2CD&S<W%p_`Ww(vH
z$h)=$PZHIlXOI@j$yS|?oDY!9-wdCY!#d9PS4d?x7W6#7Jq}}fb+UfK7T1tuqU@xp
zjA4XJ$Qmg{qoHWr;Db{^A-E}ndN)|R0SBiN{k|YUk982T9?DV=zXh#?d^pJz^NC%O
z^(+DER}72_d8b=W(h`{lJ^E9qcWA4YpFQuO8k~uEdU&E<LP_+DWCfyeAeowMsByh`
zh2Ol<N{k-)jj*$dpR!TzeGOFcAk)nvT8X|l`BN*D<sjFLCE6FE%c5GeFH&Vnrdva#
z7rUyOqJg4lq;r8nT9iq!4v^8?o$~_|c7B?i6`{q&g{7+tB+*&l80PRpL`W<349J*t
zO3mApN+S3Ah!^}rByIMt1uib5AMG>}_Tc(OVVb*z(6c+|6RrhZdEP|YEC0wvOI%9~
zFtkT4EG{c8YaVD(awZ#tZWN}$hL3_aRJD)p%yqV_Jf0BeL5(D~H~O+ydRVyC(kbl9
z(+S-#^rK9qcdWBB+LwX+^(Vs+5WE;#x7kiSdS$e$nUTO3TAkKy0TmW^wABZF8!?7x
z*nZOWLp}Uo?}wcu!o}9&fB3FO`|2MGFpLFsokVBZ8(k7@B<$J^Abq7@Uypv^*m$%f
zU*N??=noR>3u<WCuF4rD5A=uowo_?G!p4MxPrw^Yg%|c!g@0?iL)-wHf)Js<F>Mu6
z%f*O><MCm)h6+1XFr12=2{S_EQW39s4YJbC6`ukj(C>jXn-mV;ngbi*wO$W{6)B`W
zE-E4v7E+{Yt!xj;HwF!Nx5djaKQle9l#_vN?=R|cgvdccYvE>>kH?hMt3BD#1Il0d
z{iCsQaU~H|jn(<EapW>BJ|P6Y-{uf~$Hc(+b_=fi%K$bOez3@AECQsrc5#)i7j`75
z+DBkQ4!cY)%3PBd%!(1D-0h)>9N0)wH^Cv<;So0d=TTvWshKwzY1`kM()Pj)JbBFU
zDd3bGl7~u4%i{Ao7$SwyPj;^d%$&&BHulf0C}@p7A+Dx%+-ab_CGJ`!5atP<coFiM
zl2hD3$pX6&pKa=875s`*PT=&~Xf#_~D9Go{1?ObA9b#>d>E}p1;`JO{WYDOOa}C$0
zCh~U+h0f&fH9z>g5Sx#5e;61gOeE!vWAd|BnZ_qUHxoml(iF$9?V?2giiTg<bvGVy
z^6NVB17+Jlp-{8MN!gvkC_nolY-G<jaSBSY8gRIV55^=(!IkpKPkB1&YAi9?Bm-iu
zA`WMI$#Z!s`k6PR(V5i|iiO&`OokL=9KpAcEU`F)FS+W}P<Nt9VUeX6ThZ1DvN1mu
z==9ZdjNSJldb(Mk%kN!Iak|Ji1@}{pN4RR8z9XpCo(_do=vBiPkm_*@qQcKPLHuA{
z+1E!t>RrNh`0m##*-~a)qCHo?_n_p5e1*^}kXPSM%R0v^u>&bnx1AsO5sIHhdDC_n
zH{KTPznBy|`IT8S)W<-*(|DWf1pZhyq(8XM$VDgSymt4ZG!%ApvB8jY^rW{SXU{~w
zNHKC(6g5(wp2@!CYa=QzoT8KnrMRj$zeV_D<5V5e)GqAgkHB0lih@_kt^s6nBE{Kp
z3L+Zj+QECgG`;5z`{;}9;2tnkwWZ?7AZ0CkI_o7zEnCgDA=kp!=>itTh4l{$QDqt<
z<Dk-du&@xgridT)Ob|Eq6N}|1jW=Bx;J&F^48bM1l&EueNma)+glL4xYf-XR$^%Kb
z!34%8zCd$m(Lr|}HLh=5C;2I}`j<sGpJ%0OjjGRlN+}jFa#2Tgh$=-i`zHDhCU=Q+
zwVcq^_t;}Y2=@gS&D(<|FV>?;`n8$-8Z77zl51;B=`KjLBS?cO3V7{thb?xyQBJw-
z0}q6`!eRru%_bAIm@SSHykXHl>SL2Y_q={tg?=keZ$+Fc&{6-9hrKNo6>DXtB1HP@
zkGDCtqMoFa?0QEv>(y{avMo_-wB6jaAN<i|J-NwS;7=r{U2!r5Y@-)GDV?+;oj7~e
zOV}b$YMv}nuWF+9v%`HvLtd3Rcf&O5GEZuLL9hGb5CZ>})b$BAmWb#s>1Onv`p)po
z^jGp&)GeR;K55++>4X;)wS$h&vIn0XpS$;M%lqs*6o-NG&f~)$TzA~5V;7IZdAb)d
zj@#cGQyiBaW1rttZ2bCo@PJ`iwP)J+J>~oM{>J{hYRBrc>Y_o@NZ#)Ir779wL-V_-
z@CWd(9ija19od;4(~p$vUZCR_j{AZWyk<TVHz1Fv5R1DIw$z7ZkD&v{tC5xNFX~CW
zUUFrfXDr|@=PEeEhBKCCJs+zuROd`hF3*J%=e4B}7pS9b*L8N}(8UwyE@yp$MHhCn
zD9tEU{Px3Z>;BDesT8(+&dl6y*Yo;Yl@F#@%=Smr9!4!)e9LtUIvZ8z)Y?|%5c!?o
z14<uq-|_nLbuI_J_i&z@cd0L}!fH76*xar_gmx-Pvo_%V4(k!eJ4~&-q?6i;aKw4k
zl8D-}iyu`swY;-$G)^-DxBB{3WF2jjwF6%BO!d(6a@|;&WpzF0qK=J6{y{dIh%O#a
z_!Cc*+nBprXZ6qyDi2$bsd{tm+y>JnuE1Qe%Z@uvhj6oaxng~$A-IWeiI||6ROVAM
zi!c6IM`f}$F9rsIX&k~5fkeEE9GZ<x!ey{rmZgh=y=Bb#;qrRw%j>+S<7m<z?aAnp
zy%Tas^2bOc*q4G(Z&4=_N0NdUiJ~Z|x1ljGVC8<sDoHDW>~(o$$iqApP=h$?3OJPg
z;6H#OAo<=26QT+83LJRZlkf?fh-gSmM@n^n*gW@#Nbq`sB>pZn{`Z%`t`5c~@Xv`1
zEbt8f{D9b4S(#ZuCZK=DekVlz{(x-$JI2QHw-_Vqb0)!G>M^rDr*`}$#>)1b3-gy4
zJNt8<(O+Vmtbc2Rk&*d1m*C&)F)}}=WBfJ7!u;2LSs59a|JnvCBO}{$ddR;XkCB0a
zgXu5*dyaAbb!?2R3~X$F>C1DBllia5dyaAbrGJd9j7+T0DKP)mE-NGJ-`ahS{jGnj
zj2yo+u>O5tCWhay_5TuM`JF}cj~LiN|2f;k0rWekO~KaoIgRVjtPe$VcjM>z2hmFi
zgEV<KnVwrT(l=mdVAVHaU^6md=QLnoH)b|u(l=o@WH;gapV#;!iNz7D?*RT|aWS$n
PJWm=tIk||ODE$8bgkwAq

literal 0
HcmV?d00001

diff --git a/src/paperless_tesseract/tests/test_parser.py b/src/paperless_tesseract/tests/test_parser.py
index 4fd314667..b64abb382 100644
--- a/src/paperless_tesseract/tests/test_parser.py
+++ b/src/paperless_tesseract/tests/test_parser.py
@@ -7,7 +7,7 @@ from django.test import TestCase, override_settings
 
 from documents.parsers import ParseError, run_convert
 from documents.tests.utils import DirectoriesMixin
-from paperless_tesseract.parsers import RasterisedDocumentParser, get_text_from_pdf, strip_excess_whitespace
+from paperless_tesseract.parsers import RasterisedDocumentParser, strip_excess_whitespace
 
 image_to_string_calls = []
 
@@ -38,7 +38,12 @@ class TestParser(DirectoriesMixin, TestCase):
 
     def assertContainsStrings(self, content, strings):
         # Asserts that all strings appear in content, in the given order.
-        indices = [content.index(s) for s in strings]
+        indices = []
+        for s in strings:
+            if s in content:
+                indices.append(content.index(s))
+            else:
+                self.fail(f"'{s}' is not in '{content}'")
         self.assertListEqual(indices, sorted(indices))
 
     text_cases = [
@@ -69,7 +74,8 @@ class TestParser(DirectoriesMixin, TestCase):
     SAMPLE_FILES = os.path.join(os.path.dirname(__file__), "samples")
 
     def test_get_text_from_pdf(self):
-        text = get_text_from_pdf(os.path.join(self.SAMPLE_FILES, 'simple-digital.pdf'))
+        parser = RasterisedDocumentParser(uuid.uuid4())
+        text = parser.extract_text(None, os.path.join(self.SAMPLE_FILES, 'simple-digital.pdf'))
 
         self.assertContainsStrings(text.strip(), ["This is a test document."])
 
@@ -129,15 +135,21 @@ class TestParser(DirectoriesMixin, TestCase):
         self.assertIsNone(parser.archive_path)
         self.assertContainsStrings(parser.get_text(), ["Please enter your name in here:", "This is a PDF document with a form."])
 
-    @override_settings(OCR_MODE="redo")
-    @mock.patch("paperless_tesseract.parsers.get_text_from_pdf", lambda _: None)
-    def test_with_form_error_notext(self):
+    @override_settings(OCR_MODE="skip")
+    def test_encrypted(self):
         parser = RasterisedDocumentParser(None)
 
-        def f():
-            parser.parse(os.path.join(self.SAMPLE_FILES, "with-form.pdf"), "application/pdf")
+        parser.parse(os.path.join(self.SAMPLE_FILES, "encrypted.pdf"), "application/pdf")
 
-        self.assertRaises(ParseError, f)
+        self.assertIsNone(parser.archive_path)
+        self.assertContainsStrings(parser.get_text(), ["This is a digitally signed PDF, created with Acrobat Pro for the Paperless project to enable", "automated testing of signed/encrypted PDFs"])
+
+    @override_settings(OCR_MODE="redo")
+    def test_with_form_error_notext(self):
+        parser = RasterisedDocumentParser(None)
+        parser.parse(os.path.join(self.SAMPLE_FILES, "with-form.pdf"), "application/pdf")
+
+        self.assertContainsStrings(parser.get_text(), ["Please enter your name in here:", "This is a PDF document with a form."])
 
     @override_settings(OCR_MODE="force")
     def test_with_form_force(self):
@@ -253,9 +265,41 @@ class TestParser(DirectoriesMixin, TestCase):
     def test_skip_noarchive_notext(self):
         parser = RasterisedDocumentParser(None)
         parser.parse(os.path.join(self.SAMPLE_FILES, "multi-page-images.pdf"), "application/pdf")
-        self.assertTrue(os.path.join(parser.archive_path))
+        self.assertTrue(os.path.isfile(parser.archive_path))
         self.assertContainsStrings(parser.get_text().lower(), ["page 1", "page 2", "page 3"])
 
+    @override_settings(OCR_MODE="skip")
+    def test_multi_page_mixed(self):
+        parser = RasterisedDocumentParser(None)
+        parser.parse(os.path.join(self.SAMPLE_FILES, "multi-page-mixed.pdf"), "application/pdf")
+        self.assertTrue(os.path.isfile(parser.archive_path))
+        self.assertContainsStrings(parser.get_text().lower(), ["page 1", "page 2", "page 3", "page 4", "page 5", "page 6"])
+
+        with open(os.path.join(parser.tempdir, "sidecar.txt")) as f:
+            sidecar = f.read()
+
+        self.assertIn("[OCR skipped on page 4]", sidecar)
+        self.assertIn("[OCR skipped on page 5]", sidecar)
+        self.assertIn("[OCR skipped on page 6]", sidecar)
+
+    @override_settings(OCR_MODE="skip_noarchive")
+    def test_multi_page_mixed_no_archive(self):
+        parser = RasterisedDocumentParser(None)
+        parser.parse(os.path.join(self.SAMPLE_FILES, "multi-page-mixed.pdf"), "application/pdf")
+        self.assertIsNone(parser.archive_path)
+        self.assertContainsStrings(parser.get_text().lower(), ["page 4", "page 5", "page 6"])
+
+    @override_settings(OCR_MODE="skip", OCR_ROTATE_PAGES=True)
+    def test_rotate(self):
+        parser = RasterisedDocumentParser(None)
+        parser.parse(os.path.join(self.SAMPLE_FILES, "rotated.pdf"), "application/pdf")
+        self.assertContainsStrings(parser.get_text(), [
+            "This is the text that appears on the first page. It’s a lot of text.",
+            "Even if the pages are rotated, OCRmyPDF still gets the job done.",
+            "This is a really weird file with lots of nonsense text.",
+            "If you read this, it’s your own fault. Also check your screen orientation."
+        ])
+
 
 class TestParserFileTypes(DirectoriesMixin, TestCase):
 

From 6da237dd9e611e55640bb9e7eae626ab394e5844 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 00:21:43 +0100
Subject: [PATCH 1237/1300] pycodestyle

---
 src/documents/views.py             | 5 ++++-
 src/paperless_tesseract/parsers.py | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/documents/views.py b/src/documents/views.py
index d886324ae..f5ddd88ee 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -639,7 +639,10 @@ class BulkDownloadView(APIView):
         content = serializer.validated_data.get('content')
 
         os.makedirs(settings.SCRATCH_DIR, exist_ok=True)
-        temp = tempfile.NamedTemporaryFile(dir=settings.SCRATCH_DIR, suffix="-compressed-archive", delete=False)
+        temp = tempfile.NamedTemporaryFile(
+            dir=settings.SCRATCH_DIR,
+            suffix="-compressed-archive",
+            delete=False)
 
         if content == 'both':
             strategy_class = OriginalAndArchiveStrategy
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index dac364447..883402414 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -300,4 +300,3 @@ def strip_excess_whitespace(text):
 
     # TODO: this needs a rework
     return no_trailing_whitespace.strip()
-

From b978994525a7bf4308bf3a6a21cd05b20d75c4e3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 00:23:01 +0100
Subject: [PATCH 1238/1300] documentation for the new configuration options

---
 docs/configuration.rst | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 95914e836..f9c0877f7 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -202,7 +202,6 @@ Paperless uses `OCRmyPDF <https://ocrmypdf.readthedocs.io/en/latest/>`_ for
 performing OCR on documents and images. Paperless uses sensible defaults for
 most settings, but all of them can be configured to your needs.
 
-
 PAPERLESS_OCR_LANGUAGE=<lang>
     Customize the language that paperless will attempt to use when
     parsing documents.
@@ -245,6 +244,39 @@ PAPERLESS_OCR_MODE=<mode>
     The default is ``skip``, which only performs OCR when necessary and always
     creates archived documents.
 
+PAPERLESS_OCR_CLEAN=<mode>
+    Tells paperless to use ``unpaper`` to clean any input document before
+    sending it to tesseract. This uses more resources, but generally results
+    in better OCR results. The following modes are available:
+
+    *   ``clean``: Apply unpaper.
+    *   ``clean-final``: Apply unpaper, and use the cleaned images to build the
+        output file instead of the original images.
+    *   ``none``: Do not apply unpaper.
+
+    Defaults to ``clean``.
+
+PAPERLESS_OCR_DESKEW=<bool>
+    Tells paperless to correct skewing (slight rotation of input images Mostly
+    due to improper scanning)
+
+    Defaults to ``false``, which disables this feature.
+
+
+PAPERLESS_OCR_ROTATE_PAGES=<bool>
+    Tells paperless to correct page rotation (90°, 180° and 270° rotation).
+
+    Defaults to ``false``, which disables this feature.
+
+
+PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD=<num>
+    Adjust the threshold for automatic page rotation by ``PAPERLESS_OCR_ROTATE_PAGES``.
+    This is an arbitrary value reported by tesseract. "15" is a very conservative value,
+    whereas "2" is a very aggressive option and will often result correctly rotated pages
+    being rotated as well.
+
+    Defaults to "10".
+
 PAPERLESS_OCR_OUTPUT_TYPE=<type>
     Specify the the type of PDF documents that paperless should produce.
 
@@ -271,7 +303,6 @@ PAPERLESS_OCR_PAGES=<num>
 
     Defaults to 0, which disables this feature and always uses all pages.
 
-
 PAPERLESS_OCR_IMAGE_DPI=<num>
     Paperless will OCR any images you put into the system and convert them
     into PDF documents. This is useful if your scanner produces images.
@@ -282,8 +313,8 @@ PAPERLESS_OCR_IMAGE_DPI=<num>
 
     Set this to the DPI your scanner produces images at.
 
-    Default is none, which causes paperless to fail if no DPI information is
-    present in an image.
+    Default is none, which will automatically calculate image DPI so that
+    the produced PDF documents are A4 sized.
 
 
 PAPERLESS_OCR_USER_ARGS=<json>

From e2a932d7448e18fd75370976fb73e68729821e0d Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 00:24:33 +0100
Subject: [PATCH 1239/1300] update dependencies

---
 .github/workflows/ci.yml |  6 ++---
 Dockerfile               |  1 -
 Pipfile                  |  2 +-
 Pipfile.lock             | 48 +++++++++++++++++-----------------------
 ansible/tasks/main.yml   |  1 -
 docs/setup.rst           |  5 ++---
 requirements.txt         | 13 +++++------
 7 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 08630e176..87b527cad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,8 +35,6 @@ jobs:
       -
         name: Install dependencies
         run: |
-          sudo apt-get update -qq
-          sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev
           pip install --upgrade pipenv
           pipenv install --system --dev --ignore-pipfile
       -
@@ -81,7 +79,7 @@ jobs:
         name: Prepare tests
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+          sudo apt-get install -qq --no-install-recommends unpaper tesseract-ocr imagemagick ghostscript optipng
           pip install --upgrade pipenv
           pipenv install --system --dev --ignore-pipfile
       -
@@ -140,7 +138,7 @@ jobs:
         name: Install dependencies
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev gettext liblept5
+          sudo apt-get install -qq --no-install-recommends gettext liblept5
           pip3 install -r requirements.txt
       -
         name: Download frontend artifact
diff --git a/Dockerfile b/Dockerfile
index 57f96c39f..c94b7030f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -67,7 +67,6 @@ COPY requirements.txt ../
 RUN apt-get update \
   && apt-get -y --no-install-recommends install \
 		build-essential \
-		libpoppler-cpp-dev \
 		libpq-dev \
 		libqpdf-dev \
 	&& python3 -m pip install --upgrade --no-cache-dir supervisor \
diff --git a/Pipfile b/Pipfile
index 8bacba7a4..29a91ece3 100644
--- a/Pipfile
+++ b/Pipfile
@@ -23,7 +23,6 @@ imap-tools = "*"
 langdetect = "*"
 # numpy 1.20.0 drops python 3.6 support
 numpy = "~=1.19.5"
-pdftotext = "*"
 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"
@@ -55,6 +54,7 @@ concurrent-log-handler = "*"
 uvloop = "~=0.14.0"
 # TODO: keep an eye on piwheel builds and update this once available (https://www.piwheels.org/project/cryptography/)
 cryptography = "~=3.3.2"
+"pdfminer.six" = "*"
 
 [dev-packages]
 coveralls = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index f75949d20..eefaeeecd 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "bd8b69979d91f4d8c52cac127c891d750c52959807220a98dcf74fed126bfa26"
+            "sha256": "71959eb287fc97969263be5e3a1b1f4f369b7a5ace85bd1947a25b9b92e17e8a"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -227,11 +227,11 @@
         },
         "django": {
             "hashes": [
-                "sha256:169e2e7b4839a7910b393eec127fd7cbae62e80fa55f89c6510426abf673fe5f",
-                "sha256:c6c0462b8b361f8691171af1fb87eceb4442da28477e12200c40420176206ba7"
+                "sha256:32ce792ee9b6a0cbbec340123e229ac9f765dff8c2a4ae9247a14b2ba3a365a7",
+                "sha256:baf099db36ad31f970775d0be5587cc58a6256a6771a44eb795b554d45f211b8"
             ],
             "index": "pypi",
-            "version": "==3.1.6"
+            "version": "==3.1.7"
         },
         "django-cors-headers": {
             "hashes": [
@@ -610,15 +610,8 @@
                 "sha256:b9aac0ebeafb21c08bf65f2039f4b2c5f78a3449d0a41df711d72445649e952a",
                 "sha256:d78877ba8d8bf957f3bb636c4f73f4f6f30f56c461993877ac22c39c20837509"
             ],
-            "markers": "python_version >= '3.4'",
-            "version": "==20201018"
-        },
-        "pdftotext": {
-            "hashes": [
-                "sha256:98aeb8b07a4127e1a30223bd933ef080bbd29aa88f801717ca6c5618380b8aa6"
-            ],
             "index": "pypi",
-            "version": "==2.1.5"
+            "version": "==20201018"
         },
         "pikepdf": {
             "hashes": [
@@ -1104,11 +1097,11 @@
         },
         "tqdm": {
             "hashes": [
-                "sha256:11d544652edbdfc9cc41aa4c8a5c166513e279f3f2d9f1a9e1c89935b51de6ff",
-                "sha256:a89be573bfddb81bb0b395a416d5e55e3ecc73ce95a368a4f6360bedea33195e"
+                "sha256:65185676e9fdf20d154cffd1c5de8e39ef9696ff7e59fe0156b1b08e468736af",
+                "sha256:70657337ec104eb4f3fb229285358f23f045433f6aea26846cdd55f0fd68945c"
             ],
             "index": "pypi",
-            "version": "==4.56.2"
+            "version": "==4.57.0"
         },
         "twisted": {
             "extras": [
@@ -1146,11 +1139,11 @@
         },
         "txaio": {
             "hashes": [
-                "sha256:1488d31d564a116538cc1265ac3f7979fb6223bb5a9e9f1479436ee2c17d8549",
-                "sha256:a8676d6c68aea1f0e2548c4afdb8e6253873af3bc2659bb5bcd9f39dff7ff90f"
+                "sha256:7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8",
+                "sha256:c16b55f9a67b2419cfdf8846576e2ec9ba94fe6978a83080c352a80db31c93fb"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==20.12.1"
+            "version": "==21.2.1"
         },
         "tzlocal": {
             "hashes": [
@@ -1172,11 +1165,11 @@
                 "standard"
             ],
             "hashes": [
-                "sha256:1079c50a06f6338095b4f203e7861dbff318dde5f22f3a324fc6e94c7654164c",
-                "sha256:ef1e0bb5f7941c6fe324e06443ddac0331e1632a776175f87891c7bd02694355"
+                "sha256:3292251b3c7978e8e4a7868f4baf7f7f7bb7e40c759ecc125c37e99cdea34202",
+                "sha256:7587f7b08bd1efd2b9bad809a3d333e972f1d11af8a5e52a9371ee3a5de71524"
             ],
             "index": "pypi",
-            "version": "==0.13.3"
+            "version": "==0.13.4"
         },
         "uvloop": {
             "hashes": [
@@ -1220,11 +1213,10 @@
         },
         "watchgod": {
             "hashes": [
-                "sha256:59700dab7445aa8e6067a5b94f37bae90fc367554549b1ed2e9d0f4f38a90d2a",
-                "sha256:5fb60afa9558b79736395db1cb60ad3ed59df5c2f507a3ff729220cf1251ffdc",
-                "sha256:e9cca0ab9c63f17fc85df9fd8bd18156ff00aff04ebe5976cee473f4968c6858"
+                "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29",
+                "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7"
             ],
-            "version": "==0.6"
+            "version": "==0.7"
         },
         "wcwidth": {
             "hashes": [
@@ -1498,11 +1490,11 @@
         },
         "faker": {
             "hashes": [
-                "sha256:bf2a9b3f8d00a5dada61fc4a3f80fe0d6795c7f02a138a7d2ef2db5817c7d017",
-                "sha256:d4aecdb877519d06c2fdc01ffc5ecf70658981acf5e13cd07ded9892994ef5c6"
+                "sha256:31a58ec5a8f4672f24da3b5ddea02c82a712de1de3179b432948e5c34d787aca",
+                "sha256:aadfe0efe11ecbbbc5b3b0b0fab050c2acbd2d8e5201769546d43d236bfff663"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==6.1.1"
+            "version": "==6.4.1"
         },
         "filelock": {
             "hashes": [
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index 517831994..bfaf8df17 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -15,7 +15,6 @@
       - imagemagick
       - optipng
       - gnupg
-      - libpoppler-cpp-dev
       - libpq-dev
       - libmagic-dev
       - mime-support
diff --git a/docs/setup.rst b/docs/setup.rst
index 8ebb6f83c..f6d6b47bc 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -280,7 +280,6 @@ writing. Windows is not and will never be supported.
     *   ``imagemagick`` >= 6 for PDF conversion
     *   ``optipng`` for optimizing thumbnails
     *   ``gnupg`` for handling encrypted documents
-    *   ``libpoppler-cpp-dev`` for PDF to text conversion
     *   ``libpq-dev`` for PostgreSQL
     *   ``libmagic-dev`` for mime type detection
     *   ``mime-support`` for mime type detection
@@ -354,7 +353,7 @@ writing. Windows is not and will never be supported.
     .. code:: shell-session
 
         sudo -Hu paperless pip3 install -r requirements.txt
-    
+
     This will install all python dependencies in the home directory of
     the new paperless user.
 
@@ -803,7 +802,7 @@ Using nginx as a reverse proxy
 ##############################
 
 If you want to expose paperless to the internet, you should hide it behind a
-reverse proxy with SSL enabled. 
+reverse proxy with SSL enabled.
 
 In addition to the usual configuration for SSL,
 the following configuration is required for paperless to operate:
diff --git a/requirements.txt b/requirements.txt
index 7100ba953..2df1b29ae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,7 +32,7 @@ django-extensions==3.1.1
 django-filter==2.4.0
 django-picklefield==3.0.1; python_version >= '3'
 django-q==1.3.4
-django==3.1.6
+django==3.1.7
 djangorestframework==3.12.2
 filelock==3.0.12
 fuzzywuzzy[speedup]==0.18.0
@@ -55,8 +55,7 @@ msgpack==1.0.2
 numpy==1.19.5
 ocrmypdf==11.6.2
 pathvalidate==2.3.2
-pdfminer.six==20201018; python_version >= '3.4'
-pdftotext==2.1.5
+pdfminer.six==20201018
 pikepdf==2.5.2
 pillow==8.1.0
 pluggy==0.13.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
@@ -86,15 +85,15 @@ 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.56.2
+tqdm==4.57.0
 twisted[tls]==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-txaio==20.12.1; python_version >= '3.6'
+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'
-uvicorn[standard]==0.13.3
+uvicorn[standard]==0.13.4
 uvloop==0.14.0
 watchdog==1.0.2
-watchgod==0.6
+watchgod==0.7
 wcwidth==0.2.5
 websockets==8.1
 whitenoise==5.2.0

From 7b2c1f82f5a377d00ef1a51dc873cb22c4395700 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 01:29:55 +0100
Subject: [PATCH 1240/1300] documentation

---
 docs/configuration.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index f9c0877f7..a558ea79d 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -257,7 +257,7 @@ PAPERLESS_OCR_CLEAN=<mode>
     Defaults to ``clean``.
 
 PAPERLESS_OCR_DESKEW=<bool>
-    Tells paperless to correct skewing (slight rotation of input images Mostly
+    Tells paperless to correct skewing (slight rotation of input images mainly
     due to improper scanning)
 
     Defaults to ``false``, which disables this feature.

From 86d6316cc97dd84726c5cd2a927e6d8171fbb836 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 01:30:03 +0100
Subject: [PATCH 1241/1300] version bump

---
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 51beb3fba..d170a0f02 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,7 +2,7 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "1.1.5",
+  version: "1.2.0",
   webSocketHost: window.location.host,
   webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:")
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index b21fef930..09ac5f672 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (1, 1, 5)
+__version__ = (1, 2, 0)

From afc3e41f13a42f6a45f728c45fde592a290798a7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 01:48:14 +0100
Subject: [PATCH 1242/1300] changelog

---
 docs/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 37bea9f49..721997323 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -17,6 +17,10 @@ paperless-ng 1.2.0
 
 * Download multiple selected document.
 
+* The document list now remembers the current page.
+
+* Improved responsiveness when switching between saved views and the document list.
+
 * Paperless no longer depends on ``libpoppler-cpp-dev``.
 
 paperless-ng 1.1.4

From 0453787d38226dd91f4d800cfc8186946ef37354 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 12:14:54 +0100
Subject: [PATCH 1243/1300] increased default delay when waiting for file
 changes with polling

---
 docs/changelog.rst                             | 18 +++++++++++-------
 .../management/commands/document_consumer.py   |  6 +++---
 .../tests/test_management_consumer.py          |  7 +++----
 src/paperless/settings.py                      |  6 ++++++
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 721997323..f5a353adb 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -21,15 +21,12 @@ paperless-ng 1.2.0
 
 * Improved responsiveness when switching between saved views and the document list.
 
+* Increased the default wait time when observing files in the consumption folder
+  with polling from 1 to 5 seconds. This will decrease the likelihood of paperless
+  consuming partially written files.
+
 * Paperless no longer depends on ``libpoppler-cpp-dev``.
 
-paperless-ng 1.1.4
-##################
-
-* Added English (GB) locale.
-
-* Added ISO-8601 date display option.
-
 .. note::
 
   Some packages that paperless depends on are slowly dropping Python 3.6
@@ -41,6 +38,13 @@ paperless-ng 1.1.4
 
   If using docker, this does not affect you.
 
+paperless-ng 1.1.4
+##################
+
+* Added English (GB) locale.
+
+* Added ISO-8601 date display option.
+
 paperless-ng 1.1.3
 ##################
 
diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index aaa644891..b2549efbf 100644
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -68,10 +68,10 @@ def _consume(filepath):
         logger.exception("Error while consuming document")
 
 
-def _consume_wait_unmodified(file, num_tries=20, wait_time=1):
+def _consume_wait_unmodified(file):
     mtime = -1
     current_try = 0
-    while current_try < num_tries:
+    while current_try < settings.CONSUMER_POLLING_RETRY_COUNT:
         try:
             new_mtime = os.stat(file).st_mtime
         except FileNotFoundError:
@@ -82,7 +82,7 @@ def _consume_wait_unmodified(file, num_tries=20, wait_time=1):
             _consume(file)
             return
         mtime = new_mtime
-        sleep(wait_time)
+        sleep(settings.CONSUMER_POLLING_DELAY)
         current_try += 1
 
     logger.error(f"Timeout while waiting on file {file} to remain unmodified.")
diff --git a/src/documents/tests/test_management_consumer.py b/src/documents/tests/test_management_consumer.py
index b6a61a167..2111705e0 100644
--- a/src/documents/tests/test_management_consumer.py
+++ b/src/documents/tests/test_management_consumer.py
@@ -203,7 +203,7 @@ class TestConsumer(DirectoriesMixin, ConsumerMixin, TransactionTestCase):
         self.assertRaises(CommandError, call_command, 'document_consumer', '--oneshot')
 
 
-@override_settings(CONSUMER_POLLING=1)
+@override_settings(CONSUMER_POLLING=1, CONSUMER_POLLING_DELAY=1, CONSUMER_POLLING_RETRY_COUNT=20)
 class TestConsumerPolling(TestConsumer):
     # just do all the tests with polling
     pass
@@ -215,8 +215,7 @@ class TestConsumerRecursive(TestConsumer):
     pass
 
 
-@override_settings(CONSUMER_RECURSIVE=True)
-@override_settings(CONSUMER_POLLING=1)
+@override_settings(CONSUMER_RECURSIVE=True, CONSUMER_POLLING=1, CONSUMER_POLLING_DELAY=1, CONSUMER_POLLING_RETRY_COUNT=20)
 class TestConsumerRecursivePolling(TestConsumer):
     # just do all the tests with polling and recursive
     pass
@@ -257,6 +256,6 @@ class TestConsumerTags(DirectoriesMixin, ConsumerMixin, TransactionTestCase):
         # their order.
         self.assertCountEqual(kwargs["override_tag_ids"], tag_ids)
 
-    @override_settings(CONSUMER_POLLING=1)
+    @override_settings(CONSUMER_POLLING=1, CONSUMER_POLLING_DELAY=1, CONSUMER_POLLING_RETRY_COUNT=20)
     def test_consume_file_with_path_tags_polling(self):
         self.test_consume_file_with_path_tags()
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index abfb1afba..b0ce32305 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -425,6 +425,12 @@ THREADS_PER_WORKER = os.getenv("PAPERLESS_THREADS_PER_WORKER", default_threads_p
 
 CONSUMER_POLLING = int(os.getenv("PAPERLESS_CONSUMER_POLLING", 0))
 
+CONSUMER_POLLING_DELAY = int(os.getenv("PAPERLESS_CONSUMER_POLLING_DELAY", 5))
+
+CONSUMER_POLLING_RETRY_COUNT = int(
+    os.getenv("PAPERLESS_CONSUMER_POLLING_RETRY_COUNT", 30 / CONSUMER_POLLING_DELAY)
+)
+
 CONSUMER_DELETE_DUPLICATES = __get_boolean("PAPERLESS_CONSUMER_DELETE_DUPLICATES")
 
 CONSUMER_RECURSIVE = __get_boolean("PAPERLESS_CONSUMER_RECURSIVE")

From bac4a63cc81cd7c63e534c425030f749e6fee701 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 12:43:55 +0100
Subject: [PATCH 1244/1300] run the polling file change checks on individual
 threads to speed up queueing of new files

---
 .../management/commands/document_consumer.py          | 11 +++++++++--
 src/paperless/settings.py                             |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index b2549efbf..969941af9 100644
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -1,6 +1,7 @@
 import logging
 import os
 from pathlib import Path
+from threading import Thread
 from time import sleep
 
 from django.conf import settings
@@ -57,6 +58,7 @@ def _consume(filepath):
         logger.exception("Error creating tags from path")
 
     try:
+        logger.info(f"Adding {filepath} to the task queue.")
         async_task("documents.tasks.consume_file",
                    filepath,
                    override_tag_ids=tag_ids if tag_ids else None,
@@ -69,6 +71,7 @@ def _consume(filepath):
 
 
 def _consume_wait_unmodified(file):
+    logger.debug(f"Waiting for file {file} to remain unmodified")
     mtime = -1
     current_try = 0
     while current_try < settings.CONSUMER_POLLING_RETRY_COUNT:
@@ -91,10 +94,14 @@ def _consume_wait_unmodified(file):
 class Handler(FileSystemEventHandler):
 
     def on_created(self, event):
-        _consume_wait_unmodified(event.src_path)
+        Thread(
+            target=_consume_wait_unmodified, args=(event.src_path,)
+        ).start()
 
     def on_moved(self, event):
-        _consume_wait_unmodified(event.dest_path)
+        Thread(
+            target=_consume_wait_unmodified, args=(event.dest_path,)
+        ).start()
 
 
 class Command(BaseCommand):
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index b0ce32305..bf9fcd459 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -428,7 +428,7 @@ CONSUMER_POLLING = int(os.getenv("PAPERLESS_CONSUMER_POLLING", 0))
 CONSUMER_POLLING_DELAY = int(os.getenv("PAPERLESS_CONSUMER_POLLING_DELAY", 5))
 
 CONSUMER_POLLING_RETRY_COUNT = int(
-    os.getenv("PAPERLESS_CONSUMER_POLLING_RETRY_COUNT", 30 / CONSUMER_POLLING_DELAY)
+    os.getenv("PAPERLESS_CONSUMER_POLLING_RETRY_COUNT", 5)
 )
 
 CONSUMER_DELETE_DUPLICATES = __get_boolean("PAPERLESS_CONSUMER_DELETE_DUPLICATES")

From 0f9675f9d645bdaaa644a4363fa3096dfeaf99b4 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 21 Feb 2021 12:12:19 +0000
Subject: [PATCH 1245/1300] Translate /src-ui/messages.xlf in en_GB

translation completed for the source file '/src-ui/messages.xlf'
on the 'en_GB' language.
---
 src-ui/src/locale/messages.en_GB.xlf | 82 +++++++++++++++-------------
 1 file changed, 45 insertions(+), 37 deletions(-)

diff --git a/src-ui/src/locale/messages.en_GB.xlf b/src-ui/src/locale/messages.en_GB.xlf
index 14ab56659..f5e711c39 100644
--- a/src-ui/src/locale/messages.en_GB.xlf
+++ b/src-ui/src/locale/messages.en_GB.xlf
@@ -59,7 +59,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
         <source>View &quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&quot; saved successfully.</source>
-        <target>View &amp;quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&amp;quot; saved successfully.</target>
+        <target>View &quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&quot; saved successfully.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
           <context context-type="linenumber">115</context>
@@ -67,7 +67,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
         <source>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; created successfully.</source>
-        <target>View &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; created successfully.</target>
+        <target>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; created successfully.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
           <context context-type="linenumber">136</context>
@@ -131,7 +131,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="5f5ce787c428d917c30c9bd70789a618e09743a7">
         <source>Save &quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
-        <target>Save &amp;quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&amp;quot;</target>
+        <target>Save &quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">71</context>
@@ -219,7 +219,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
         <source>Do you really want to delete document &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</source>
-        <target>Do you really want to delete document &amp;quot;<x equiv-text="this.document.title" id="PH"/>&amp;quot;?</target>
+        <target>Do you really want to delete document &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
           <context context-type="linenumber">204</context>
@@ -475,7 +475,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="93754014749412887">
         <source>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Do you really want to delete the tag &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <target>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
           <context context-type="linenumber">30</context>
@@ -563,7 +563,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="4990731724078522539">
         <source>Do you really want to delete the document type &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Do you really want to delete the document type &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <target>Do you really want to delete the document type &quot;<x equiv-text="object.name" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
           <context context-type="linenumber">26</context>
@@ -587,7 +587,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="5610279464668232148">
         <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
-        <target>Saved view &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; deleted.</target>
+        <target>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
           <context context-type="linenumber">67</context>
@@ -907,7 +907,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7427874343955308724">
         <source>Do you really want to delete the correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Do you really want to delete the correspondent &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <target>Do you really want to delete the correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
           <context context-type="linenumber">26</context>
@@ -1075,7 +1075,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="afa760e48c97d64d19c1455d18b7834a2256e23f">
         <source>Did you mean &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</source>
-        <target>Did you mean &amp;quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&amp;quot;?</target>
+        <target>Did you mean &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/search/search.component.html</context>
           <context context-type="linenumber">13</context>
@@ -1400,23 +1400,23 @@
         <target>Error executing bulk operation: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">74</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7894972847287473517">
         <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</source>
-        <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot;</target>
+        <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">112</context>
+          <context context-type="linenumber">113</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
         <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
-        <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot; and &amp;quot;<x equiv-text="items[1].name" id="PH_1"/>&amp;quot;</target>
+        <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">115</context>
         </context-group>
         <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
       </trans-unit>
@@ -1425,16 +1425,16 @@
         <target>, </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">117</context>
         </context-group>
         <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
       </trans-unit>
       <trans-unit datatype="html" id="1822679894391095557">
         <source><x equiv-text="list" id="PH"/> and &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</source>
-        <target><x equiv-text="list" id="PH"/> and &amp;quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&amp;quot;</target>
+        <target><x equiv-text="list" id="PH"/> and &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="linenumber">118</context>
         </context-group>
         <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
       </trans-unit>
@@ -1443,15 +1443,15 @@
         <target>Confirm tags assignment</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">127</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6619516195038467207">
         <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>This operation will add the tag &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
+        <target>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">129</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1894412783609570695">
@@ -1459,15 +1459,15 @@
         <target>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">131</context>
+          <context context-type="linenumber">132</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7181166515756808573">
         <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>This operation will remove the tag &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
+        <target>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3819792277998068944">
@@ -1475,7 +1475,7 @@
         <target>This operation will remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">136</context>
+          <context context-type="linenumber">137</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2739066218579571288">
@@ -1483,7 +1483,7 @@
         <target>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> and remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> on <x equiv-text="this.list.selected.size" id="PH_2"/> selected document(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">138</context>
+          <context context-type="linenumber">139</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2996713129519325161">
@@ -1491,15 +1491,15 @@
         <target>Confirm correspondent assignment</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">158</context>
+          <context context-type="linenumber">159</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6900893559485781849">
         <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>This operation will assign the correspondent &amp;quot;<x equiv-text="correspondent.name" id="PH"/>&amp;quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
+        <target>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">161</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1257522660364398440">
@@ -1507,7 +1507,7 @@
         <target>This operation will remove the correspondent from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">162</context>
+          <context context-type="linenumber">163</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5393409374423140648">
@@ -1515,15 +1515,15 @@
         <target>Confirm document type assignment</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">181</context>
+          <context context-type="linenumber">182</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="332180123895325027">
         <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>This operation will assign the document type &amp;quot;<x equiv-text="documentType.name" id="PH"/>&amp;quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
+        <target>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">183</context>
+          <context context-type="linenumber">184</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2236642492594872779">
@@ -1531,7 +1531,7 @@
         <target>This operation will remove the document type from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">185</context>
+          <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="749430623564850405">
@@ -1539,7 +1539,7 @@
         <target>Delete confirm</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4303174930844518780">
@@ -1547,7 +1547,7 @@
         <target>This operation will permanently delete <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">201</context>
+          <context context-type="linenumber">202</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5641451190833696892">
@@ -1555,7 +1555,7 @@
         <target>This operation cannot be undone.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">202</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6734339521247847366">
@@ -1563,7 +1563,7 @@
         <target>Delete document(s)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">204</context>
+          <context context-type="linenumber">205</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
@@ -1590,6 +1590,14 @@
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="fc2de37422d7c4af6686842283cc2afd781b6848">
+        <source>Download originals</source>
+        <target>Download originals</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">68</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="a1e6c11f20d4bf6e8e6b43e3c6d2561b2080645e">
         <source>Suggestions:</source>
         <target>Suggestions:</target>

From ef4009e94f3c81867100fbb5653a1ddfbbac5fd7 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 13:35:47 +0100
Subject: [PATCH 1246/1300] documentation

---
 docs/changelog.rst     | 4 ++--
 docs/configuration.rst | 9 +++++++++
 docs/setup.rst         | 3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f5a353adb..57ffbc40d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,12 +10,12 @@ paperless-ng 1.2.0
 
 * Changes to the OCRmyPDF integration
 
-  * Added support for deskewing and automatic rotation of incorrectly rotated pages.
+  * Added support for deskewing and automatic rotation of incorrectly rotated pages. This is disabled by default, see :ref:`configuration-ocr`.
   * Better support for encrypted files.
   * Better support for various other PDF files: Paperless will now attempt to force OCR with safe options when OCR fails with the configured options.
   * Added an explicit option to skip cleaning with ``unpaper``.
 
-* Download multiple selected document.
+* Download multiple selected documents as a zip archive.
 
 * The document list now remembers the current page.
 
diff --git a/docs/configuration.rst b/docs/configuration.rst
index a558ea79d..1c1763392 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -244,6 +244,8 @@ PAPERLESS_OCR_MODE=<mode>
     The default is ``skip``, which only performs OCR when necessary and always
     creates archived documents.
 
+    Read more about this in the `OCRmyPDF documentation <https://ocrmypdf.readthedocs.io/en/latest/advanced.html#when-ocr-is-skipped>`_.
+
 PAPERLESS_OCR_CLEAN=<mode>
     Tells paperless to use ``unpaper`` to clean any input document before
     sending it to tesseract. This uses more resources, but generally results
@@ -256,12 +258,19 @@ PAPERLESS_OCR_CLEAN=<mode>
 
     Defaults to ``clean``.
 
+    .. note::
+
+        ``clean-final`` is incompatible with ocr mode ``redo``.
+
 PAPERLESS_OCR_DESKEW=<bool>
     Tells paperless to correct skewing (slight rotation of input images mainly
     due to improper scanning)
 
     Defaults to ``false``, which disables this feature.
 
+    .. note::
+
+        Deskewing is incompatible with ocr mode ``redo``.
 
 PAPERLESS_OCR_ROTATE_PAGES=<bool>
     Tells paperless to correct page rotation (90°, 180° and 270° rotation).
diff --git a/docs/setup.rst b/docs/setup.rst
index f6d6b47bc..69cb2bc97 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -774,6 +774,9 @@ configuring some options in paperless can help improve performance immensely:
     your documents before feeding them into paperless. Some scanners are able to
     do this! You might want to even specify ``skip_noarchive`` to skip archive
     file generation for already ocr'ed documents entirely.
+*   If you want to perform OCR on the the device, consider using ``PAPERLESS_OCR_CLEAN=none``.
+    This will speed up OCR times and use less memory at the expense of slightly worse
+    OCR results.
 *   Set ``PAPERLESS_OPTIMIZE_THUMBNAILS`` to 'false' if you want faster consumption
     times. Thumbnails will be about 20% larger.
 *   If using docker, consider setting ``PAPERLESS_WEBSERVER_WORKERS`` to

From ee7308be2da64e4899552002bbd753b9b34b9560 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 13:43:54 +0100
Subject: [PATCH 1247/1300] documentation on how to build the documentation

---
 docs/extending.rst | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/extending.rst b/docs/extending.rst
index b2ddf3d85..860106258 100644
--- a/docs/extending.rst
+++ b/docs/extending.rst
@@ -109,6 +109,30 @@ This will build the front end and put it in a location from which the Django ser
 it as static content. This way, you can verify that authentication is working.
 
 
+Building the documentation
+==========================
+
+The documentation is built using sphinx. I've configured ReadTheDocs to automatically build
+the documentation when changes are pushed. If you want to build the documentation locally,
+this is how you do it:
+
+1.  Install python dependencies.
+
+    .. code:: shell-session
+
+        $ cd /path/to/paperless
+        $ pipenv install --dev
+
+2.  Build the documentation
+
+    .. code:: shell-session
+
+        $ cd /path/to/paperless/docs
+        $ pipenv run make clean html
+
+This will build the HTML documentation, and put the resulting files in the ``_build/html``
+directory.
+
 Extending Paperless
 ===================
 

From 501d8d96833b8c6760408963efb38cd3ab30b9dc Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 21 Feb 2021 14:15:43 +0000
Subject: [PATCH 1248/1300] Apply translations in fr

translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po'
on the 'fr' language.
---
 src/locale/fr/LC_MESSAGES/django.po | 184 +++++++++++++++-------------
 1 file changed, 98 insertions(+), 86 deletions(-)

diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po
index e956642d4..244d45fb5 100644
--- a/src/locale/fr/LC_MESSAGES/django.po
+++ b/src/locale/fr/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Jonas Winkler, 2020
+# Jonas Winkler, 2021
 # Philmo67, 2021
 # 
 #, fuzzy
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\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"
+"POT-Creation-Date: 2021-02-16 14:52+0100\n"
+"PO-Revision-Date: 2021-02-16 18:37+0000\n"
 "Last-Translator: Philmo67, 2021\n"
 "Language-Team: French (https://www.transifex.com/paperless/teams/115905/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -26,64 +26,64 @@ msgstr ""
 msgid "Documents"
 msgstr "Documents"
 
-#: documents/models.py:33
+#: documents/models.py:32
 msgid "Any word"
 msgstr "Un des mots"
 
-#: documents/models.py:34
+#: documents/models.py:33
 msgid "All words"
 msgstr "Tous les mots"
 
-#: documents/models.py:35
+#: documents/models.py:34
 msgid "Exact match"
 msgstr "Concordance exacte"
 
-#: documents/models.py:36
+#: documents/models.py:35
 msgid "Regular expression"
 msgstr "Expression régulière"
 
-#: documents/models.py:37
+#: documents/models.py:36
 msgid "Fuzzy word"
 msgstr "Mot approximatif"
 
-#: documents/models.py:38
+#: documents/models.py:37
 msgid "Automatic"
 msgstr "Automatique"
 
-#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
+#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25
 #: paperless_mail/models.py:109
 msgid "name"
 msgstr "nom"
 
-#: documents/models.py:46
+#: documents/models.py:45
 msgid "match"
 msgstr "rapprochement"
 
-#: documents/models.py:50
+#: documents/models.py:49
 msgid "matching algorithm"
 msgstr "algorithme de rapprochement"
 
-#: documents/models.py:56
+#: documents/models.py:55
 msgid "is insensitive"
 msgstr "est insensible à la casse"
 
-#: documents/models.py:75 documents/models.py:135
+#: documents/models.py:74 documents/models.py:134
 msgid "correspondent"
 msgstr "correspondant"
 
-#: documents/models.py:76
+#: documents/models.py:75
 msgid "correspondents"
 msgstr "correspondants"
 
-#: documents/models.py:98
+#: documents/models.py:97
 msgid "color"
 msgstr "couleur"
 
-#: documents/models.py:102
+#: documents/models.py:101
 msgid "is inbox tag"
 msgstr "est une étiquette de boîte de réception"
 
-#: documents/models.py:104
+#: documents/models.py:103
 msgid ""
 "Marks this tag as an inbox tag: All newly consumed documents will be tagged "
 "with inbox tags."
@@ -91,39 +91,39 @@ msgstr ""
 "Marque cette étiquette comme étiquette de boîte de réception : ces "
 "étiquettes sont affectées à tous les documents nouvellement traités."
 
-#: documents/models.py:109
+#: documents/models.py:108
 msgid "tag"
 msgstr "étiquette"
 
-#: documents/models.py:110 documents/models.py:166
+#: documents/models.py:109 documents/models.py:165
 msgid "tags"
 msgstr "étiquettes"
 
-#: documents/models.py:116 documents/models.py:148
+#: documents/models.py:115 documents/models.py:147
 msgid "document type"
 msgstr "type de document"
 
-#: documents/models.py:117
+#: documents/models.py:116
 msgid "document types"
 msgstr "types de document"
 
-#: documents/models.py:125
+#: documents/models.py:124
 msgid "Unencrypted"
 msgstr "Non chiffré"
 
-#: documents/models.py:126
+#: documents/models.py:125
 msgid "Encrypted with GNU Privacy Guard"
 msgstr "Chiffré avec GNU Privacy Guard"
 
-#: documents/models.py:139
+#: documents/models.py:138
 msgid "title"
 msgstr "titre"
 
-#: documents/models.py:152
+#: documents/models.py:151
 msgid "content"
 msgstr "contenu"
 
-#: documents/models.py:154
+#: documents/models.py:153
 msgid ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
@@ -131,43 +131,43 @@ msgstr ""
 "Les données brutes du document, en format texte uniquement. Ce champ est "
 "principalement utilisé pour la recherche."
 
-#: documents/models.py:159
+#: documents/models.py:158
 msgid "mime type"
 msgstr "type mime"
 
-#: documents/models.py:170
+#: documents/models.py:169
 msgid "checksum"
 msgstr "somme de contrôle"
 
-#: documents/models.py:174
+#: documents/models.py:173
 msgid "The checksum of the original document."
 msgstr "La somme de contrôle du document original."
 
-#: documents/models.py:178
+#: documents/models.py:177
 msgid "archive checksum"
 msgstr "somme de contrôle de l'archive"
 
-#: documents/models.py:183
+#: documents/models.py:182
 msgid "The checksum of the archived document."
 msgstr "La somme de contrôle du document archivé."
 
-#: documents/models.py:187 documents/models.py:330
+#: documents/models.py:186 documents/models.py:342
 msgid "created"
 msgstr "créé le"
 
-#: documents/models.py:191
+#: documents/models.py:190
 msgid "modified"
 msgstr "modifié"
 
-#: documents/models.py:195
+#: documents/models.py:194
 msgid "storage type"
 msgstr "forme d'enregistrement :"
 
-#: documents/models.py:203
+#: documents/models.py:202
 msgid "added"
 msgstr "date d'ajout"
 
-#: documents/models.py:207
+#: documents/models.py:206
 msgid "filename"
 msgstr "nom du fichier"
 
@@ -176,179 +176,187 @@ msgid "Current filename in storage"
 msgstr "Nom du fichier courant en base de données"
 
 #: documents/models.py:216
+msgid "archive filename"
+msgstr "nom de fichier de l'archive"
+
+#: documents/models.py:222
+msgid "Current archive filename in storage"
+msgstr "Nom du fichier d'archive courant en base de données"
+
+#: documents/models.py:226
 msgid "archive serial number"
 msgstr "numéro de série de l'archive"
 
-#: documents/models.py:221
+#: documents/models.py:231
 msgid "The position of this document in your physical document archive."
 msgstr ""
 "Le classement de ce document dans votre archive de documents physiques."
 
-#: documents/models.py:227
+#: documents/models.py:237
 msgid "document"
 msgstr "document"
 
-#: documents/models.py:228
+#: documents/models.py:238
 msgid "documents"
 msgstr "documents"
 
-#: documents/models.py:313
+#: documents/models.py:325
 msgid "debug"
 msgstr "débogage"
 
-#: documents/models.py:314
+#: documents/models.py:326
 msgid "information"
 msgstr "information"
 
-#: documents/models.py:315
+#: documents/models.py:327
 msgid "warning"
 msgstr "avertissement"
 
-#: documents/models.py:316
+#: documents/models.py:328
 msgid "error"
 msgstr "erreur"
 
-#: documents/models.py:317
+#: documents/models.py:329
 msgid "critical"
 msgstr "critique"
 
-#: documents/models.py:321
+#: documents/models.py:333
 msgid "group"
 msgstr "groupe"
 
-#: documents/models.py:324
+#: documents/models.py:336
 msgid "message"
 msgstr "message"
 
-#: documents/models.py:327
+#: documents/models.py:339
 msgid "level"
 msgstr "niveau"
 
-#: documents/models.py:334
+#: documents/models.py:346
 msgid "log"
 msgstr "rapport"
 
-#: documents/models.py:335
+#: documents/models.py:347
 msgid "logs"
 msgstr "rapports"
 
-#: documents/models.py:346 documents/models.py:396
+#: documents/models.py:358 documents/models.py:408
 msgid "saved view"
 msgstr "vue enregistrée"
 
-#: documents/models.py:347
+#: documents/models.py:359
 msgid "saved views"
 msgstr "vues enregistrées"
 
-#: documents/models.py:350
+#: documents/models.py:362
 msgid "user"
 msgstr "utilisateur"
 
-#: documents/models.py:356
+#: documents/models.py:368
 msgid "show on dashboard"
 msgstr "montrer sur le tableau de bord"
 
-#: documents/models.py:359
+#: documents/models.py:371
 msgid "show in sidebar"
 msgstr "montrer dans la barre latérale"
 
-#: documents/models.py:363
+#: documents/models.py:375
 msgid "sort field"
 msgstr "champ de tri"
 
-#: documents/models.py:366
+#: documents/models.py:378
 msgid "sort reverse"
 msgstr "tri inverse"
 
-#: documents/models.py:372
+#: documents/models.py:384
 msgid "title contains"
 msgstr "le titre contient"
 
-#: documents/models.py:373
+#: documents/models.py:385
 msgid "content contains"
 msgstr "le contenu contient"
 
-#: documents/models.py:374
+#: documents/models.py:386
 msgid "ASN is"
 msgstr "le NSA est"
 
-#: documents/models.py:375
+#: documents/models.py:387
 msgid "correspondent is"
 msgstr "le correspondant est"
 
-#: documents/models.py:376
+#: documents/models.py:388
 msgid "document type is"
 msgstr "le type de document est"
 
-#: documents/models.py:377
+#: documents/models.py:389
 msgid "is in inbox"
 msgstr "est dans la boîte de réception"
 
-#: documents/models.py:378
+#: documents/models.py:390
 msgid "has tag"
 msgstr "porte l'étiquette"
 
-#: documents/models.py:379
+#: documents/models.py:391
 msgid "has any tag"
 msgstr "porte l'une des étiquettes"
 
-#: documents/models.py:380
+#: documents/models.py:392
 msgid "created before"
 msgstr "créé avant"
 
-#: documents/models.py:381
+#: documents/models.py:393
 msgid "created after"
 msgstr "créé après"
 
-#: documents/models.py:382
+#: documents/models.py:394
 msgid "created year is"
 msgstr "l'année de création est"
 
-#: documents/models.py:383
+#: documents/models.py:395
 msgid "created month is"
 msgstr "le mois de création est"
 
-#: documents/models.py:384
+#: documents/models.py:396
 msgid "created day is"
 msgstr "le jour de création est"
 
-#: documents/models.py:385
+#: documents/models.py:397
 msgid "added before"
 msgstr "ajouté avant"
 
-#: documents/models.py:386
+#: documents/models.py:398
 msgid "added after"
 msgstr "ajouté après"
 
-#: documents/models.py:387
+#: documents/models.py:399
 msgid "modified before"
 msgstr "modifié avant"
 
-#: documents/models.py:388
+#: documents/models.py:400
 msgid "modified after"
 msgstr "modifié après"
 
-#: documents/models.py:389
+#: documents/models.py:401
 msgid "does not have tag"
 msgstr "ne porte pas d'étiquette"
 
-#: documents/models.py:400
+#: documents/models.py:412
 msgid "rule type"
 msgstr "type de règle"
 
-#: documents/models.py:404
+#: documents/models.py:416
 msgid "value"
 msgstr "valeur"
 
-#: documents/models.py:410
+#: documents/models.py:422
 msgid "filter rule"
 msgstr "règle de filtrage"
 
-#: documents/models.py:411
+#: documents/models.py:423
 msgid "filter rules"
 msgstr "règles de filtrage"
 
-#: documents/serialisers.py:383
+#: documents/serialisers.py:370
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr "Type de fichier %(type)s non pris en charge"
@@ -395,19 +403,23 @@ msgstr "Mot de passe"
 msgid "Sign in"
 msgstr "S'identifier"
 
-#: paperless/settings.py:286
-msgid "English"
-msgstr "Anglais"
+#: paperless/settings.py:291
+msgid "English (US)"
+msgstr "Anglais (US)"
 
-#: paperless/settings.py:287
+#: paperless/settings.py:292
+msgid "English (GB)"
+msgstr "Anglais (GB)"
+
+#: paperless/settings.py:293
 msgid "German"
 msgstr "Allemand"
 
-#: paperless/settings.py:288
+#: paperless/settings.py:294
 msgid "Dutch"
 msgstr "Néerlandais"
 
-#: paperless/settings.py:289
+#: paperless/settings.py:295
 msgid "French"
 msgstr "Français"
 

From a21ec7699733d8f7cbff2b12a1c727e3d44bc043 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 21 Feb 2021 14:16:49 +0000
Subject: [PATCH 1249/1300] Translate /src-ui/messages.xlf in fr

translation completed for the source file '/src-ui/messages.xlf'
on the 'fr' language.
---
 src-ui/src/locale/messages.fr.xlf | 128 ++++++++++++++++++------------
 1 file changed, 76 insertions(+), 52 deletions(-)

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
index 0b7e86165..79045b3b4 100644
--- a/src-ui/src/locale/messages.fr.xlf
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -58,11 +58,11 @@
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
-        <source>View &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; saved successfully.</source>
-        <target>Vue &quot;<x equiv-text="this.list.savedView.name" id="PH"/>&quot; enregistrée avec succès.</target>
+        <source>View &quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&quot; saved successfully.</source>
+        <target>Vue &quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&quot; enregistrée avec succès.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">109</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
@@ -70,7 +70,7 @@
         <target>Vue &quot;<x equiv-text="savedView.name" id="PH"/>&quot; créée avec succès.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">130</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
@@ -129,9 +129,9 @@
           <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="72e7d343f9165602cce1ca7faffbc565fd31ef92">
-        <source>Save &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
-        <target>Enregistrer &quot;<x equiv-text="{{list.savedViewTitle}}" id="INTERPOLATION"/>&quot;</target>
+      <trans-unit datatype="html" id="5f5ce787c428d917c30c9bd70789a618e09743a7">
+        <source>Save &quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
+        <target>Enregistrer &quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">71</context>
@@ -585,14 +585,6 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="5ca707824ab93066c7d9b44e1b8bf216725c2c22">
-        <source>Filter</source>
-        <target>Filtrer</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
       <trans-unit datatype="html" id="5610279464668232148">
         <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
         <target>Vue &quot;<x equiv-text="savedView.name" id="PH"/>&quot; supprimée.</target>
@@ -622,7 +614,15 @@
         <target>Utiliser le format de date de la langue d'affichage</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">96</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4912706592792948707">
+        <source>ISO 8601</source>
+        <target>ISO 8601</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -630,7 +630,7 @@
         <target>Une erreur s'est produite lors de l'enregistrement des paramètres sur le serveur : <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -1234,6 +1234,14 @@
           <context context-type="linenumber">46</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="6523384805359286307">
+        <source>Title: <x equiv-text="rule.value" id="PH"/></source>
+        <target>Titre : <x equiv-text="rule.value" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
         <source>Filter tags</source>
         <target>Filtrer les étiquettes</target>
@@ -1392,7 +1400,7 @@
         <target>Une erreur s'est produite lors de l'exécution de l'opération de masse : <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">74</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7894972847287473517">
@@ -1400,7 +1408,7 @@
         <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">112</context>
+          <context context-type="linenumber">113</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
@@ -1408,7 +1416,7 @@
         <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; et &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">115</context>
         </context-group>
         <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
       </trans-unit>
@@ -1417,7 +1425,7 @@
         <target>, </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">117</context>
         </context-group>
         <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
       </trans-unit>
@@ -1426,7 +1434,7 @@
         <target><x equiv-text="list" id="PH"/> et &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="linenumber">118</context>
         </context-group>
         <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
       </trans-unit>
@@ -1435,7 +1443,7 @@
         <target>Confirmer l'affectation des étiquettes</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">127</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6619516195038467207">
@@ -1443,7 +1451,7 @@
         <target>Cette action affectera l'étiquette &quot;<x equiv-text="tag.name" id="PH"/>&quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">129</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1894412783609570695">
@@ -1451,7 +1459,7 @@
         <target>Cette action affectera les étiquettes <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">131</context>
+          <context context-type="linenumber">132</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7181166515756808573">
@@ -1459,7 +1467,7 @@
         <target>Cette action supprimera l'étiquette &quot;<x equiv-text="tag.name" id="PH"/>&quot; de(s) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3819792277998068944">
@@ -1467,7 +1475,7 @@
         <target>Cette action supprimera les étiquettes <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> de(s) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">136</context>
+          <context context-type="linenumber">137</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2739066218579571288">
@@ -1475,7 +1483,7 @@
         <target>Cette action affectera les étiquettes <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> et supprimera les étiquettes <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> de(s) <x equiv-text="this.list.selected.size" id="PH_2"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">138</context>
+          <context context-type="linenumber">139</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2996713129519325161">
@@ -1483,7 +1491,7 @@
         <target>Confirmer l'affectation du correspondant</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">158</context>
+          <context context-type="linenumber">159</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6900893559485781849">
@@ -1491,7 +1499,7 @@
         <target>Cette action affectera le correspondant &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/>document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">161</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1257522660364398440">
@@ -1499,7 +1507,7 @@
         <target>Cette action supprimera le correspondant de(s) <x equiv-text="this.list.selected.size" id="PH"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">162</context>
+          <context context-type="linenumber">163</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5393409374423140648">
@@ -1507,7 +1515,7 @@
         <target>Confirmer l'affectation du type de document</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">181</context>
+          <context context-type="linenumber">182</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="332180123895325027">
@@ -1515,7 +1523,7 @@
         <target>Cette action affectera le type de document &quot;<x equiv-text="documentType.name" id="PH"/>&quot; au(x) <x equiv-text="this.list.selected.size" id="PH_1"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">183</context>
+          <context context-type="linenumber">184</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2236642492594872779">
@@ -1523,7 +1531,7 @@
         <target>Cette action supprimera le type de document de(s) <x equiv-text="this.list.selected.size" id="PH"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">185</context>
+          <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="749430623564850405">
@@ -1531,7 +1539,7 @@
         <target>Confirmer la suppression</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="4303174930844518780">
@@ -1539,7 +1547,7 @@
         <target>Cette action supprimera définitivement <x equiv-text="this.list.selected.size" id="PH"/> document(s) sélectionné(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">201</context>
+          <context context-type="linenumber">202</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="5641451190833696892">
@@ -1547,7 +1555,7 @@
         <target>Cette action est irréversible.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">202</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6734339521247847366">
@@ -1555,7 +1563,7 @@
         <target>Supprimer le(s) document(s)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">204</context>
+          <context context-type="linenumber">205</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
@@ -1582,6 +1590,14 @@
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="fc2de37422d7c4af6686842283cc2afd781b6848">
+        <source>Download originals</source>
+        <target>Télécharger les originaux</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">68</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="a1e6c11f20d4bf6e8e6b43e3c6d2561b2080645e">
         <source>Suggestions:</source>
         <target>Suggestions : </target>
@@ -1614,22 +1630,22 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit datatype="html" id="46c8fe557cf52c9389783627d4f85453f4ddb459">
-        <source>Documents in inbox: <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></source>
-        <target>Documents dans la boîte de réception : <x equiv-text="{{statistics.documents_inbox}}" id="INTERPOLATION"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="c327c0e67bcac7494dcbaa9afb3b42d5008c6438">
-        <source>Total documents: <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></source>
-        <target>Nombre total de documents : <x equiv-text="{{statistics.documents_total}}" id="INTERPOLATION"/></target>
+      <trans-unit datatype="html" id="c0d907c2687c09612395aee6ef7c04ca8e5e5e0a">
+        <source>Total documents: <x equiv-text="{{statistics?.documents_total}}" id="INTERPOLATION"/></source>
+        <target>Nombre total de documents : <x equiv-text="{{statistics?.documents_total}}" id="INTERPOLATION"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="13e8d49dbcad9f9d71e66a9a56d6f328cff430c9">
+        <source>Documents in inbox: <x equiv-text="{{statistics?.documents_inbox}}" id="INTERPOLATION"/></source>
+        <target>Documents dans la boîte de réception : <x equiv-text="{{statistics?.documents_inbox}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="6443586946875325554">
         <source>Processing: <x equiv-text="countUploadingAndProcessing" id="PH"/></source>
         <target>Traitement : <x equiv-text="countUploadingAndProcessing" id="PH"/></target>
@@ -1848,12 +1864,20 @@
           <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="6987083569809053351">
+        <source>English (GB)</source>
+        <target>Anglais (GB)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
         <source>German</source>
         <target>Allemand</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1861,7 +1885,7 @@
         <target>Néerlandais</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1869,7 +1893,7 @@
         <target>Français</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2119857572761283468">

From dfc23a2b38385767aa529a394ce8173adbf65471 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 21:36:43 +0100
Subject: [PATCH 1250/1300] bugfix for tika parser

---
 src/documents/management/commands/document_archiver.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index 297c95121..12aaf1393 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -34,7 +34,10 @@ def handle_document(document_id):
     parser = parser_class(logging_group=uuid.uuid4())
 
     try:
-        parser.parse(document.source_path, mime_type)
+        parser.parse(
+            document.source_path,
+            mime_type,
+            document.get_public_filename())
 
         if parser.get_archive_path():
             with transaction.atomic():

From 14e2ad7bc4867b4a3c08ad26c3c83b0c045c8905 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 22:19:24 +0100
Subject: [PATCH 1251/1300] more parameter checking

---
 src/paperless_tesseract/parsers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 883402414..ba56a19b7 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -153,10 +153,10 @@ class RasterisedDocumentParser(DocumentParser):
 
         if settings.OCR_CLEAN == 'clean':
             ocrmypdf_args['clean'] = True
-        elif settings.OCR_CLEAN == 'clean-final':
+        elif settings.OCR_CLEAN == 'clean-final' and not settings.OCR_MODE == 'redo':  # NOQA: E501
             ocrmypdf_args['clean_final'] = True
 
-        if settings.OCR_DESKEW:
+        if settings.OCR_DESKEW and not settings.OCR_MODE == 'redo':
             ocrmypdf_args['deskew'] = True
 
         if settings.OCR_ROTATE_PAGES:

From 65b37f61ca2d2fc5e1ad8f9627b23994327fb842 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 23:29:52 +0100
Subject: [PATCH 1252/1300] update thumbnail in archiver, since page rotation
 might have changed

---
 src/documents/management/commands/document_archiver.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index 12aaf1393..0d3a5e82d 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -39,6 +39,12 @@ def handle_document(document_id):
             mime_type,
             document.get_public_filename())
 
+        thumbnail = parser.get_optimised_thumbnail(
+            document.source_path,
+            mime_type,
+            document.get_public_filename()
+        )
+
         if parser.get_archive_path():
             with transaction.atomic():
                 with open(parser.get_archive_path(), 'rb') as f:
@@ -58,6 +64,7 @@ def handle_document(document_id):
                     create_source_path_directory(document.archive_path)
                     shutil.move(parser.get_archive_path(),
                                 document.archive_path)
+                    shutil.move(thumbnail, document.thumbnail_path)
 
         with AsyncWriter(index.open_index()) as writer:
             index.update_document(writer, document)

From a13e9f23b1889bec297940c3e1ca54c5203a6373 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 23:30:14 +0100
Subject: [PATCH 1253/1300] use archived file for thumbnail, if available

---
 src/paperless_tesseract/parsers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index ba56a19b7..728c40a56 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -53,7 +53,9 @@ class RasterisedDocumentParser(DocumentParser):
 
     def get_thumbnail(self, document_path, mime_type, file_name=None):
         return make_thumbnail_from_pdf(
-            document_path, self.tempdir, self.logging_group)
+            self.archive_path or document_path,
+            self.tempdir,
+            self.logging_group)
 
     def is_image(self, mime_type):
         return mime_type in [

From 265432f2a57135fd47c40e008de84a858b370e62 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 23:39:19 +0100
Subject: [PATCH 1254/1300] fix up the ocrmypdf parameter construction for
 clean-final and redo

---
 src/paperless_tesseract/parsers.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 728c40a56..deadf2234 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -155,8 +155,11 @@ class RasterisedDocumentParser(DocumentParser):
 
         if settings.OCR_CLEAN == 'clean':
             ocrmypdf_args['clean'] = True
-        elif settings.OCR_CLEAN == 'clean-final' and not settings.OCR_MODE == 'redo':  # NOQA: E501
-            ocrmypdf_args['clean_final'] = True
+        elif settings.OCR_CLEAN == 'clean-final':
+            if settings.OCR_MODE == 'redo':
+                ocrmypdf_args['clean'] = True
+            else:
+                ocrmypdf_args['clean_final'] = True
 
         if settings.OCR_DESKEW and not settings.OCR_MODE == 'redo':
             ocrmypdf_args['deskew'] = True

From cb10617979ed9aedd69d17ad2a735d2b17b93b75 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 21 Feb 2021 23:40:26 +0100
Subject: [PATCH 1255/1300] enable deskewing and rotation by default

---
 docs/changelog.rst        |  2 +-
 docs/configuration.rst    | 26 ++++++++++++++++----------
 paperless.conf.example    |  6 +++---
 src/paperless/settings.py |  6 +++---
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 57ffbc40d..abe667400 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,7 +10,7 @@ paperless-ng 1.2.0
 
 * Changes to the OCRmyPDF integration
 
-  * Added support for deskewing and automatic rotation of incorrectly rotated pages. This is disabled by default, see :ref:`configuration-ocr`.
+  * Added support for deskewing and automatic rotation of incorrectly rotated pages. This is enabled by default, see :ref:`configuration-ocr`.
   * Better support for encrypted files.
   * Better support for various other PDF files: Paperless will now attempt to force OCR with safe options when OCR fails with the configured options.
   * Added an explicit option to skip cleaning with ``unpaper``.
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 1c1763392..56537035c 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -260,22 +260,28 @@ PAPERLESS_OCR_CLEAN=<mode>
 
     .. note::
 
-        ``clean-final`` is incompatible with ocr mode ``redo``.
+        ``clean-final`` is incompatible with ocr mode ``redo``. When both
+        ``clean-final`` and the ocr mode ``redo`` is configured, ``clean``
+        is used instead.
 
 PAPERLESS_OCR_DESKEW=<bool>
     Tells paperless to correct skewing (slight rotation of input images mainly
     due to improper scanning)
 
-    Defaults to ``false``, which disables this feature.
+    Defaults to ``true``, which enables this feature.
 
     .. note::
 
-        Deskewing is incompatible with ocr mode ``redo``.
+        Deskewing is incompatible with ocr mode ``redo``. Deskewing will get
+        disabled automatically if ``redo`` is used as the ocr mode.
 
 PAPERLESS_OCR_ROTATE_PAGES=<bool>
     Tells paperless to correct page rotation (90°, 180° and 270° rotation).
 
-    Defaults to ``false``, which disables this feature.
+    If you notice that paperless is not rotating pages incorrectly rotated
+    pages (or vice versa), try adjusting the threshold up or down (see below).
+
+    Defaults to ``true``, which enables this feature.
 
 
 PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD=<num>
@@ -284,7 +290,7 @@ PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD=<num>
     whereas "2" is a very aggressive option and will often result correctly rotated pages
     being rotated as well.
 
-    Defaults to "10".
+    Defaults to "12".
 
 PAPERLESS_OCR_OUTPUT_TYPE=<type>
     Specify the the type of PDF documents that paperless should produce.
@@ -392,7 +398,7 @@ requires are as follows:
                 PAPERLESS_TIKA_ENABLED: 1
                 PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
                 PAPERLESS_TIKA_ENDPOINT: http://tika:9998
-        
+
         # ...
 
         gotenberg:
@@ -622,10 +628,10 @@ USERMAP_UID=<uid>
     .. code:: shell-session
 
         $ id -u
-    
+
     Paperless will change ownership on its folders to this user, so you need to get this right
     in order to be able to write to the consumption directory.
-    
+
     Defaults to 1000.
 
 USERMAP_GID=<gid>
@@ -635,10 +641,10 @@ USERMAP_GID=<gid>
     .. code:: shell-session
 
         $ id -g
-    
+
     Paperless will change ownership on its folders to this group, so you need to get this right
     in order to be able to write to the consumption directory.
-    
+
     Defaults to 1000.
 
 PAPERLESS_OCR_LANGUAGES=<list>
diff --git a/paperless.conf.example b/paperless.conf.example
index 9c799b083..b1b63879d 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -42,9 +42,9 @@
 #PAPERLESS_OCR_PAGES=1
 #PAPERLESS_OCR_IMAGE_DPI=300
 #PAPERLESS_OCR_CLEAN=clean
-#PAPERLESS_OCR_DESKEW=false
-#PAPERLESS_OCR_ROTATE_PAGES=false
-#PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD=10
+#PAPERLESS_OCR_DESKEW=true
+#PAPERLESS_OCR_ROTATE_PAGES=true
+#PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD=12.0
 #PAPERLESS_OCR_USER_ARGS={}
 #PAPERLESS_CONVERT_MEMORY_LIMIT=0
 #PAPERLESS_CONVERT_TMPDIR=/var/tmp/paperless
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index bf9fcd459..7c4e36391 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -457,11 +457,11 @@ OCR_IMAGE_DPI = os.getenv("PAPERLESS_OCR_IMAGE_DPI")
 
 OCR_CLEAN = os.getenv("PAPERLESS_OCR_CLEAN", "clean")
 
-OCR_DESKEW = __get_boolean("PAPERLESS_OCR_DESKEW")
+OCR_DESKEW = __get_boolean("PAPERLESS_OCR_DESKEW", "true")
 
-OCR_ROTATE_PAGES = __get_boolean("PAPERLESS_OCR_ROTATE_PAGES")
+OCR_ROTATE_PAGES = __get_boolean("PAPERLESS_OCR_ROTATE_PAGES", "true")
 
-OCR_ROTATE_PAGES_THRESHOLD = float(os.getenv("PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD", 10.0))
+OCR_ROTATE_PAGES_THRESHOLD = float(os.getenv("PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD", 12.0))
 
 OCR_USER_ARGS = os.getenv("PAPERLESS_OCR_USER_ARGS", "{}")
 

From 30b0a30146471bd3fef02ab2dde24d1d1b4d8215 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Mon, 22 Feb 2021 00:04:44 +0100
Subject: [PATCH 1256/1300] dropdown menu shadows

---
 .../document-list/bulk-editor/bulk-editor.component.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 98716e2f9..90cda1224 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -64,7 +64,7 @@
       </button>
       <div class="btn-group" ngbDropdown role="group" aria-label="Button group with nested dropdown">
         <button class="btn btn-outline-primary btn-sm dropdown-toggle-split" ngbDropdownToggle></button>
-        <div class="dropdown-menu" ngbDropdownMenu>
+        <div class="dropdown-menu shadow" ngbDropdownMenu>
           <button ngbDropdownItem i18n (click)="downloadSelected('originals')">Download originals</button>
         </div>
       </div>

From 99a18516b283737cf81dbb28d69c07fca1694766 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Mon, 22 Feb 2021 00:17:16 +0100
Subject: [PATCH 1257/1300] tests

---
 src/paperless_tesseract/tests/test_parser.py | 41 ++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/paperless_tesseract/tests/test_parser.py b/src/paperless_tesseract/tests/test_parser.py
index b64abb382..c389d446f 100644
--- a/src/paperless_tesseract/tests/test_parser.py
+++ b/src/paperless_tesseract/tests/test_parser.py
@@ -300,6 +300,47 @@ class TestParser(DirectoriesMixin, TestCase):
             "If you read this, it’s your own fault. Also check your screen orientation."
         ])
 
+    def test_ocrmypdf_parameters(self):
+        parser = RasterisedDocumentParser(None)
+        params = parser.construct_ocrmypdf_parameters(input_file="input.pdf", output_file="output.pdf",
+                                                      sidecar_file="sidecar.txt", mime_type="application/pdf",
+                                                      safe_fallback=False)
+
+        self.assertEqual(params['input_file'], "input.pdf")
+        self.assertEqual(params['output_file'], "output.pdf")
+        self.assertEqual(params['sidecar'], "sidecar.txt")
+
+        with override_settings(OCR_CLEAN="none"):
+            params = parser.construct_ocrmypdf_parameters("", "", "", "")
+            self.assertNotIn("clean", params)
+            self.assertNotIn("clean_final", params)
+
+        with override_settings(OCR_CLEAN="clean"):
+            params = parser.construct_ocrmypdf_parameters("", "", "", "")
+            self.assertTrue(params['clean'])
+            self.assertNotIn("clean_final", params)
+
+        with override_settings(OCR_CLEAN="clean-final", OCR_MODE="skip"):
+            params = parser.construct_ocrmypdf_parameters("", "", "", "")
+            self.assertTrue(params['clean_final'])
+            self.assertNotIn("clean", params)
+
+        with override_settings(OCR_CLEAN="clean-final", OCR_MODE="redo"):
+            params = parser.construct_ocrmypdf_parameters("", "", "", "")
+            self.assertTrue(params['clean'])
+            self.assertNotIn("clean_final", params)
+
+        with override_settings(OCR_DESKEW=True, OCR_MODE="skip"):
+            params = parser.construct_ocrmypdf_parameters("", "", "", "")
+            self.assertTrue(params['deskew'])
+
+        with override_settings(OCR_DESKEW=True, OCR_MODE="redo"):
+            params = parser.construct_ocrmypdf_parameters("", "", "", "")
+            self.assertNotIn('deskew', params)
+
+        with override_settings(OCR_DESKEW=False, OCR_MODE="skip"):
+            params = parser.construct_ocrmypdf_parameters("", "", "", "")
+            self.assertNotIn('deskew', params)
 
 class TestParserFileTypes(DirectoriesMixin, TestCase):
 

From d64818b46cc29e08da16a84fd944bb323e498c58 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Mon, 22 Feb 2021 11:11:04 +0100
Subject: [PATCH 1258/1300] fixes #591

---
 .../management/commands/document_archiver.py      | 12 +++++++++---
 src/documents/tests/test_management.py            | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index 0d3a5e82d..6a6056ed7 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -31,6 +31,11 @@ def handle_document(document_id):
 
     parser_class = get_parser_class_for_mime_type(mime_type)
 
+    if not parser_class:
+        logger.error(f"No parser found for mime type {mime_type}, cannot "
+                     f"archive document {document} (ID: {document_id})")
+        return
+
     parser = parser_class(logging_group=uuid.uuid4())
 
     try:
@@ -66,11 +71,12 @@ def handle_document(document_id):
                                 document.archive_path)
                     shutil.move(thumbnail, document.thumbnail_path)
 
-        with AsyncWriter(index.open_index()) as writer:
-            index.update_document(writer, document)
+            with index.open_index_writer() as writer:
+                index.update_document(writer, document)
 
     except Exception as e:
-        logger.exception(f"Error while parsing document {document}")
+        logger.exception(f"Error while parsing document {document} "
+                         f"(ID: {document_id})")
     finally:
         parser.cleanup()
 
diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py
index 40eaaf277..f7beb8907 100644
--- a/src/documents/tests/test_management.py
+++ b/src/documents/tests/test_management.py
@@ -49,6 +49,21 @@ class TestArchiver(DirectoriesMixin, TestCase):
         self.assertTrue(filecmp.cmp(sample_file, doc.source_path))
         self.assertEqual(doc.archive_filename, "none/A.pdf")
 
+    def test_unknown_mime_type(self):
+        doc = self.make_models()
+        doc.mime_type = "sdgfh"
+        doc.save()
+        shutil.copy(sample_file, doc.source_path)
+
+        handle_document(doc.pk)
+
+        doc = Document.objects.get(id=doc.id)
+
+        self.assertIsNotNone(doc.checksum)
+        self.assertIsNone(doc.archive_checksum)
+        self.assertIsNone(doc.archive_filename)
+        self.assertTrue(os.path.isfile(doc.source_path))
+
     @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
     def test_naming_priorities(self):
         doc1 = Document.objects.create(checksum="A", title="document", content="first document", mime_type="application/pdf", filename="document.pdf")

From aa3d91a338a66b39774acdfdc092be5f1672ff61 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Mon, 22 Feb 2021 11:38:16 +0100
Subject: [PATCH 1259/1300] associate error messages with documents

---
 .../management/commands/document_archiver.py  | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index 6a6056ed7..497e8fe7e 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -4,7 +4,9 @@ import multiprocessing
 import logging
 import os
 import shutil
+import sys
 import uuid
+from io import TextIOBase
 
 import tqdm
 from django import db
@@ -12,7 +14,6 @@ from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db import transaction
 from filelock import FileLock
-from whoosh.writing import AsyncWriter
 
 from documents.models import Document
 from ... import index
@@ -24,11 +25,28 @@ from ...parsers import get_parser_class_for_mime_type
 logger = logging.getLogger("paperless.management.archiver")
 
 
+class LoggerWriter(TextIOBase):
+
+    def __init__(self, doc: Document):
+        self.doc = doc
+
+    def write(self, message):
+        # if statement reduces the amount of newlines that are
+        # printed to the logger
+        if message != '\n':
+            logger.error(
+                f"Document {self.doc} (ID: {self.doc.pk}): {message}"
+            )
+
+
 def handle_document(document_id):
     document = Document.objects.get(id=document_id)
 
     mime_type = document.mime_type
 
+    # redirect errors to the log and associate them with the current document
+    sys.stderr = LoggerWriter(document)
+
     parser_class = get_parser_class_for_mime_type(mime_type)
 
     if not parser_class:

From 6d934da5dd3e14d6cd6120574790cfbf75bdeb5a Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Mon, 22 Feb 2021 11:52:54 +0100
Subject: [PATCH 1260/1300] Revert "associate error messages with documents"

This reverts commit aa3d91a3
---
 .../management/commands/document_archiver.py  | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index 497e8fe7e..6a6056ed7 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -4,9 +4,7 @@ import multiprocessing
 import logging
 import os
 import shutil
-import sys
 import uuid
-from io import TextIOBase
 
 import tqdm
 from django import db
@@ -14,6 +12,7 @@ from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db import transaction
 from filelock import FileLock
+from whoosh.writing import AsyncWriter
 
 from documents.models import Document
 from ... import index
@@ -25,28 +24,11 @@ from ...parsers import get_parser_class_for_mime_type
 logger = logging.getLogger("paperless.management.archiver")
 
 
-class LoggerWriter(TextIOBase):
-
-    def __init__(self, doc: Document):
-        self.doc = doc
-
-    def write(self, message):
-        # if statement reduces the amount of newlines that are
-        # printed to the logger
-        if message != '\n':
-            logger.error(
-                f"Document {self.doc} (ID: {self.doc.pk}): {message}"
-            )
-
-
 def handle_document(document_id):
     document = Document.objects.get(id=document_id)
 
     mime_type = document.mime_type
 
-    # redirect errors to the log and associate them with the current document
-    sys.stderr = LoggerWriter(document)
-
     parser_class = get_parser_class_for_mime_type(mime_type)
 
     if not parser_class:

From 3b553f645523efdbfdf3ef879a7d3ad6bc64856e Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Mon, 22 Feb 2021 11:53:13 +0100
Subject: [PATCH 1261/1300] changelog

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index abe667400..b23ca5137 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -25,6 +25,8 @@ paperless-ng 1.2.0
   with polling from 1 to 5 seconds. This will decrease the likelihood of paperless
   consuming partially written files.
 
+* Fixed a crash of the document archiver management command when trying to process documents with unknown mime types.
+
 * Paperless no longer depends on ``libpoppler-cpp-dev``.
 
 .. note::

From 127d30918d5dcb04f7ac9877f893a2a26df0775c Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Mon, 22 Feb 2021 12:03:07 +0100
Subject: [PATCH 1262/1300] lets hope this works!

---
 .github/workflows/ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 87b527cad..d816687ca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -112,6 +112,13 @@ jobs:
       uses: actions/setup-node@v2
       with:
         node-version: '15'
+    -
+      name: Configure version on dev branches
+      if: startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev'
+      run: |
+        git_hash=$(git rev-parse --short "$GITHUB_SHA")
+        git_branch=${GITHUB_REF#refs/heads/}
+        sed -i -E 's/version: "(.*)"/version: "$git_branch $git_hash"/g' src-ui/src/environments/environment.prod.ts
     -
       name: Build frontend
       run: ./compile-frontend.sh

From 8da85d360955857d969df0afbc29b0a21d360a37 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Mon, 22 Feb 2021 13:25:21 +0100
Subject: [PATCH 1263/1300] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d816687ca..dbb718cc8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -118,7 +118,7 @@ jobs:
       run: |
         git_hash=$(git rev-parse --short "$GITHUB_SHA")
         git_branch=${GITHUB_REF#refs/heads/}
-        sed -i -E 's/version: "(.*)"/version: "$git_branch $git_hash"/g' src-ui/src/environments/environment.prod.ts
+        sed -i -E "s/version: \"(.*)\"/version: \"${git_branch} ${git_hash}\"/g" src-ui/src/environments/environment.prod.ts
     -
       name: Build frontend
       run: ./compile-frontend.sh

From 8797a58efc76fa3da7dc708fdd4899034d9abbf5 Mon Sep 17 00:00:00 2001
From: Joel Nordell <joelnordell@gmail.com>
Date: Mon, 22 Feb 2021 22:20:41 -0600
Subject: [PATCH 1264/1300] Add apple-touch-icon for iOS devices "Add to Home
 Screen"

---
 src-ui/angular.json             |   2 ++
 src-ui/src/apple-touch-icon.png | Bin 0 -> 6272 bytes
 src-ui/src/index.html           |   1 +
 3 files changed, 3 insertions(+)
 create mode 100644 src-ui/src/apple-touch-icon.png

diff --git a/src-ui/angular.json b/src-ui/angular.json
index a26dd8713..edf428fc7 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -36,6 +36,7 @@
 						"aot": true,
 						"assets": [
 							"src/favicon.ico",
+							"src/apple-touch-icon.png",
 							"src/assets",
 							"src/manifest.webmanifest", {
 								"glob": "pdf.worker.min.js",
@@ -112,6 +113,7 @@
 						"karmaConfig": "karma.conf.js",
 						"assets": [
 							"src/favicon.ico",
+							"src/apple-touch-icon.png",
 							"src/assets",
 							"src/manifest.webmanifest"
 						],
diff --git a/src-ui/src/apple-touch-icon.png b/src-ui/src/apple-touch-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..46388a873d15b42999b0a173c8d33a224b80ca51
GIT binary patch
literal 6272
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
F{{T>d$}<1}

literal 0
HcmV?d00001

diff --git a/src-ui/src/index.html b/src-ui/src/index.html
index b05f9123b..39ecd824c 100644
--- a/src-ui/src/index.html
+++ b/src-ui/src/index.html
@@ -9,6 +9,7 @@
   <meta name="theme-color" content="#17541f" />
   <link rel="manifest" href="manifest.webmanifest">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link ref="apple-touch-icon" href="apple-touch-icon.png">
 </head>
 <body class="color-scheme-system">
   <app-root></app-root>

From f397c5472c014dead0650aa82fd7df0fff18554b Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Tue, 23 Feb 2021 12:35:24 +0100
Subject: [PATCH 1265/1300] validation for regular expressions on matching
 models #605

---
 src/documents/serialisers.py           | 39 +++++++++++++-------------
 src/documents/tests/test_api.py        | 37 +++++++++++++++++++++++-
 src/locale/en_US/LC_MESSAGES/django.po | 10 +++++--
 3 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 66736bdbf..652e5fe30 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -1,11 +1,13 @@
+import re
+
 import magic
 from django.utils.text import slugify
 from rest_framework import serializers
 from rest_framework.fields import SerializerMethodField
 
 from . import bulk_edit
-from .models import Correspondent, Tag, Document, Log, DocumentType, \
-    SavedView, SavedViewFilterRule
+from .models import Correspondent, Tag, Document, DocumentType, \
+    SavedView, SavedViewFilterRule, MatchingModel
 from .parsers import is_mime_type_supported
 
 from django.utils.translation import gettext as _
@@ -33,16 +35,27 @@ class DynamicFieldsModelSerializer(serializers.ModelSerializer):
                 self.fields.pop(field_name)
 
 
-class CorrespondentSerializer(serializers.ModelSerializer):
+class MatchingModelSerializer(serializers.ModelSerializer):
 
     document_count = serializers.IntegerField(read_only=True)
 
-    last_correspondence = serializers.DateTimeField(read_only=True)
-
     def get_slug(self, obj):
         return slugify(obj.name)
     slug = SerializerMethodField()
 
+    def validate_match(self, match):
+        if 'matching_algorithm' in self.initial_data and self.initial_data['matching_algorithm'] == MatchingModel.MATCH_REGEX:  # NOQA: E501
+            try:
+                re.compile(match)
+            except Exception as e:
+                raise serializers.ValidationError(_("Invalid regular expresssion: ") + str(e))
+        return match
+
+
+class CorrespondentSerializer(MatchingModelSerializer):
+
+    last_correspondence = serializers.DateTimeField(read_only=True)
+
     class Meta:
         model = Correspondent
         fields = (
@@ -57,13 +70,7 @@ class CorrespondentSerializer(serializers.ModelSerializer):
         )
 
 
-class DocumentTypeSerializer(serializers.ModelSerializer):
-
-    document_count = serializers.IntegerField(read_only=True)
-
-    def get_slug(self, obj):
-        return slugify(obj.name)
-    slug = SerializerMethodField()
+class DocumentTypeSerializer(MatchingModelSerializer):
 
     class Meta:
         model = DocumentType
@@ -78,13 +85,7 @@ class DocumentTypeSerializer(serializers.ModelSerializer):
         )
 
 
-class TagSerializer(serializers.ModelSerializer):
-
-    document_count = serializers.IntegerField(read_only=True)
-
-    def get_slug(self, obj):
-        return slugify(obj.name)
-    slug = SerializerMethodField()
+class TagSerializer(MatchingModelSerializer):
 
     class Meta:
         model = Tag
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 7486154e1..cbd10ac71 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -14,7 +14,7 @@ from rest_framework.test import APITestCase
 from whoosh.writing import AsyncWriter
 
 from documents import index, bulk_edit
-from documents.models import Document, Correspondent, DocumentType, Tag, SavedView
+from documents.models import Document, Correspondent, DocumentType, Tag, SavedView, MatchingModel
 from documents.tests.utils import DirectoriesMixin
 
 
@@ -772,6 +772,41 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 200)
         self.assertListEqual(response.data, ["test", "test2"])
 
+    def test_invalid_regex_other_algorithm(self):
+        for endpoint in ['correspondents', 'tags', 'document_types']:
+            response = self.client.post(f"/api/{endpoint}/", {
+                "name": "test",
+                "matching_algorithm": MatchingModel.MATCH_ANY,
+                "match": "["
+            }, format='json')
+            self.assertEqual(response.status_code, 201, endpoint)
+
+    def test_invalid_regex(self):
+        for endpoint in ['correspondents', 'tags', 'document_types']:
+            response = self.client.post(f"/api/{endpoint}/", {
+                "name": "test",
+                "matching_algorithm": MatchingModel.MATCH_REGEX,
+                "match": "["
+            }, format='json')
+            self.assertEqual(response.status_code, 400, endpoint)
+
+    def test_valid_regex(self):
+        for endpoint in ['correspondents', 'tags', 'document_types']:
+            response = self.client.post(f"/api/{endpoint}/", {
+                "name": "test",
+                "matching_algorithm": MatchingModel.MATCH_REGEX,
+                "match": "[0-9]"
+            }, format='json')
+            self.assertEqual(response.status_code, 201, endpoint)
+
+    def test_regex_no_algorithm(self):
+        for endpoint in ['correspondents', 'tags', 'document_types']:
+            response = self.client.post(f"/api/{endpoint}/", {
+                "name": "test",
+                "match": "[0-9]"
+            }, format='json')
+            self.assertEqual(response.status_code, 201, endpoint)
+
 
 class TestBulkEdit(DirectoriesMixin, APITestCase):
 
diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po
index cb31bbc8c..c234d5c2a 100644
--- a/src/locale/en_US/LC_MESSAGES/django.po
+++ b/src/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-16 14:52+0100\n"
+"POT-Creation-Date: 2021-02-23 12:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -346,7 +346,11 @@ msgstr ""
 msgid "filter rules"
 msgstr ""
 
-#: documents/serialisers.py:370
+#: documents/serialisers.py:52
+msgid "Invalid regular expresssion: "
+msgstr ""
+
+#: documents/serialisers.py:376
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr ""
@@ -411,7 +415,7 @@ msgstr ""
 msgid "French"
 msgstr ""
 
-#: paperless/urls.py:114
+#: paperless/urls.py:118
 msgid "Paperless-ng administration"
 msgstr ""
 

From 25366af4bb29892bcd8804658170e80b075de542 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Tue, 23 Feb 2021 13:03:20 +0100
Subject: [PATCH 1266/1300] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a8fb1f8e9..0bbd6c8ea 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,11 +9,11 @@ If you want to implement something big: Please start a discussion about that in
 
 ## Python
 
-Use python 3.6 for development. Paperless supports python 3.6, 3.7 and 3.8.
+Paperless supports python 3.6, 3.7, 3.8 and 3.9.
 
 ## Branches
 
-master always reflects the latest release.
+master always reflects the latest release. Apart from changes to the documentation or readme, absolutely no functional changes on this branch in between releases.
 
 dev contains all changes that will be part of the next release. Use this branch to start making your changes.
 

From 5d94a983d2da4b1e180e91ae4c9290a7ebd91eb1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Tue, 23 Feb 2021 13:09:41 +0100
Subject: [PATCH 1267/1300] move codestyle checks into separate job

---
 .github/workflows/ci.yml | 44 ++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dbb718cc8..cb61b753b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
         name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.7
       -
         name: Get pip cache dir
         id: pip-cache
@@ -49,6 +49,39 @@ jobs:
           name: documentation
           path: docs/_build/html/
 
+  codestyle:
+    runs-on: ubuntu-20.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      -
+        name: Get pip cache dir
+        id: pip-cache
+        run: |
+          echo "::set-output name=dir::$(pip cache dir)"
+      -
+        name: Persistent Github pip cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key: ${{ runner.os }}-pip${{ matrix.python-version }}
+      -
+        name: Prepare tests
+        run: |
+          pip install --upgrade pipenv
+          pipenv install --system --dev --ignore-pipfile
+      -
+        name: Codestyle
+        run: |
+          cd src/
+          pycodestyle
+
   tests:
     runs-on: ubuntu-20.04
     strategy:
@@ -87,11 +120,6 @@ jobs:
         run: |
           cd src/
           pytest
-      -
-        name: Codestyle
-        run: |
-          cd src/
-          pycodestyle
       -
         name: Publish coverage results
         if: matrix.python-version == '3.8'
@@ -130,7 +158,7 @@ jobs:
         path: src/documents/static/frontend/
 
   build-release:
-    needs: [frontend, documentation, tests]
+    needs: [frontend, documentation, tests, codestyle]
     runs-on: ubuntu-20.04
     steps:
       -
@@ -240,7 +268,7 @@ jobs:
   build-docker-image:
     if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/ng-'))
     runs-on: ubuntu-latest
-    needs: [frontend, tests]
+    needs: [frontend, tests, codestyle]
     steps:
       -
         name: Prepare

From 5ce73574c8ba1cadcac0d4450fd58479bacb17a1 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 23 Feb 2021 12:12:00 +0000
Subject: [PATCH 1268/1300] Apply translations in de

translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po'
on the 'de' language.
---
 src/locale/de/LC_MESSAGES/django.po | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po
index 358c9b721..d1a07d18f 100644
--- a/src/locale/de/LC_MESSAGES/django.po
+++ b/src/locale/de/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-16 14:52+0100\n"
+"POT-Creation-Date: 2021-02-23 12:30+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"
@@ -354,7 +354,11 @@ msgstr "Filterregel"
 msgid "filter rules"
 msgstr "Filterregeln"
 
-#: documents/serialisers.py:370
+#: documents/serialisers.py:52
+msgid "Invalid regular expresssion: "
+msgstr "Ungültiger regulärer Ausdruck:"
+
+#: documents/serialisers.py:376
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr "Dateityp %(type)s nicht unterstützt"
@@ -421,7 +425,7 @@ msgstr "Niederländisch"
 msgid "French"
 msgstr "Französisch"
 
-#: paperless/urls.py:114
+#: paperless/urls.py:118
 msgid "Paperless-ng administration"
 msgstr "Paperless-ng Administration"
 

From 065ff6eaf5c212bc2a19adf1abb78e1c2aab8fc3 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Tue, 23 Feb 2021 13:13:12 +0100
Subject: [PATCH 1269/1300] rename some steps

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cb61b753b..85db2d482 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -72,7 +72,7 @@ jobs:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip${{ matrix.python-version }}
       -
-        name: Prepare tests
+        name: Install dependencies
         run: |
           pip install --upgrade pipenv
           pipenv install --system --dev --ignore-pipfile
@@ -109,7 +109,7 @@ jobs:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip${{ matrix.python-version }}
       -
-        name: Prepare tests
+        name: Install dependencies
         run: |
           sudo apt-get update -qq
           sudo apt-get install -qq --no-install-recommends unpaper tesseract-ocr imagemagick ghostscript optipng

From f888647b12deec0a63bd3b35a7bd3c288a10290e Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Tue, 23 Feb 2021 13:13:38 +0100
Subject: [PATCH 1270/1300] front end support for displaying error messages
 about regular expressions.

---
 .../correspondent-edit-dialog.component.html                    | 2 +-
 .../document-type-edit-dialog.component.html                    | 2 +-
 .../tag-list/tag-edit-dialog/tag-edit-dialog.component.html     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
index bbc2c8453..26a6dc219 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html
@@ -8,7 +8,7 @@
   <div class="modal-body">
     <app-input-text i18n-title title="Name" formControlName="name" [error]="error?.name"></app-input-text>
     <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-    <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match"></app-input-text>
+    <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></app-input-text>
     <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive" novalidate></app-input-check>
   </div>
   <div class="modal-footer">
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
index ed9f4f5af..55cd3de5b 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html
@@ -9,7 +9,7 @@
 
       <app-input-text i18n-title title="Name" formControlName="name" [error]="error?.name"></app-input-text>
       <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-      <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match"></app-input-text>
+      <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></app-input-text>
       <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive"></app-input-check>
 
     </div>
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
index fd4c3b7f0..418a5c281 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
+++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html
@@ -20,7 +20,7 @@
 
       <app-input-check i18n-title title="Inbox tag" formControlName="is_inbox_tag" i18n-hint hint="Inbox tags are automatically assigned to all consumed documents."></app-input-check>
       <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
-      <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match"></app-input-text>
+      <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></app-input-text>
       <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive"></app-input-check>
     </div>
     <div class="modal-footer">

From 49b23aafa34a821f04c936f6b70ff9dcbcd0efe6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Tue, 23 Feb 2021 13:16:56 +0100
Subject: [PATCH 1271/1300] documentation typos

---
 docs/configuration.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 56537035c..e26180382 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -278,7 +278,7 @@ PAPERLESS_OCR_DESKEW=<bool>
 PAPERLESS_OCR_ROTATE_PAGES=<bool>
     Tells paperless to correct page rotation (90°, 180° and 270° rotation).
 
-    If you notice that paperless is not rotating pages incorrectly rotated
+    If you notice that paperless is not rotating incorrectly rotated
     pages (or vice versa), try adjusting the threshold up or down (see below).
 
     Defaults to ``true``, which enables this feature.
@@ -287,7 +287,7 @@ PAPERLESS_OCR_ROTATE_PAGES=<bool>
 PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD=<num>
     Adjust the threshold for automatic page rotation by ``PAPERLESS_OCR_ROTATE_PAGES``.
     This is an arbitrary value reported by tesseract. "15" is a very conservative value,
-    whereas "2" is a very aggressive option and will often result correctly rotated pages
+    whereas "2" is a very aggressive option and will often result in correctly rotated pages
     being rotated as well.
 
     Defaults to "12".
@@ -338,7 +338,7 @@ PAPERLESS_OCR_USER_ARGS=<json>
     the API of OCRmyPDF, you have to specify these in a format that can be
     passed to the API. See `the API reference of OCRmyPDF <https://ocrmypdf.readthedocs.io/en/latest/api.html#reference>`_
     for valid parameters. All command line options are supported, but they
-    use underscores instead of dashed.
+    use underscores instead of dashes.
 
     .. caution::
 

From 7a73e1859660c68b3ca254cd879aa188e7d561c5 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Tue, 23 Feb 2021 13:21:11 +0100
Subject: [PATCH 1272/1300] fix pycodestyle and messages

---
 src/documents/serialisers.py           | 5 ++++-
 src/locale/en_US/LC_MESSAGES/django.po | 7 ++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 652e5fe30..adda7117e 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -48,7 +48,10 @@ class MatchingModelSerializer(serializers.ModelSerializer):
             try:
                 re.compile(match)
             except Exception as e:
-                raise serializers.ValidationError(_("Invalid regular expresssion: ") + str(e))
+                raise serializers.ValidationError(
+                    _("Invalid regular expresssion: %(error)s") %
+                    {'error': str(e)}
+                )
         return match
 
 
diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po
index c234d5c2a..27d628455 100644
--- a/src/locale/en_US/LC_MESSAGES/django.po
+++ b/src/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-23 12:30+0100\n"
+"POT-Creation-Date: 2021-02-23 13:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -347,10 +347,11 @@ msgid "filter rules"
 msgstr ""
 
 #: documents/serialisers.py:52
-msgid "Invalid regular expresssion: "
+#, python-format
+msgid "Invalid regular expresssion: %(error)s"
 msgstr ""
 
-#: documents/serialisers.py:376
+#: documents/serialisers.py:378
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr ""

From 3a46cc33eef5bd1cbcfd565b1fc228771ef5349d Mon Sep 17 00:00:00 2001
From: Bishop Clark <bishopolis@gmail.com>
Date: Tue, 23 Feb 2021 22:09:12 -0800
Subject: [PATCH 1273/1300] Update README.md

Like 'stuff' and 'traffic', 'mail' gets no 's'.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 83ef1c1ed..aebd774e0 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Here's what you get:
 	* Searching for similar documents ("More like this")
 * Email processing: Paperless adds documents from your email accounts.
 	* Configure multiple accounts and filters for each account.
-	* When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them as important or delete them.
+	* When adding documents from mail, paperless can move these mail to a new folder, mark them as read, flag them as important or delete them.
 * Machine learning powered document matching.
 	* Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless.
 * Optimized for multi core systems: Paperless-ng consumes multiple documents in parallel.

From 440abcda7c993806646020239509deff46e81d75 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 09:09:47 +0000
Subject: [PATCH 1274/1300] Apply translations in fr

translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po'
on the 'fr' language.
---
 src/locale/fr/LC_MESSAGES/django.po | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po
index 244d45fb5..6acd81649 100644
--- a/src/locale/fr/LC_MESSAGES/django.po
+++ b/src/locale/fr/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-16 14:52+0100\n"
+"POT-Creation-Date: 2021-02-23 13:20+0100\n"
 "PO-Revision-Date: 2021-02-16 18:37+0000\n"
 "Last-Translator: Philmo67, 2021\n"
 "Language-Team: French (https://www.transifex.com/paperless/teams/115905/fr/)\n"
@@ -356,7 +356,12 @@ msgstr "règle de filtrage"
 msgid "filter rules"
 msgstr "règles de filtrage"
 
-#: documents/serialisers.py:370
+#: documents/serialisers.py:52
+#, python-format
+msgid "Invalid regular expresssion: %(error)s"
+msgstr "Expression régulière incorrecte : %(error)s"
+
+#: documents/serialisers.py:378
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr "Type de fichier %(type)s non pris en charge"
@@ -423,7 +428,7 @@ msgstr "Néerlandais"
 msgid "French"
 msgstr "Français"
 
-#: paperless/urls.py:114
+#: paperless/urls.py:118
 msgid "Paperless-ng administration"
 msgstr "Administration de Paperless-ng"
 

From 1328fa9e5ec486ff92e5ea4885a5c89fe586f375 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 11:52:24 +0000
Subject: [PATCH 1275/1300] Apply translations in de

translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po'
on the 'de' language.
---
 src/locale/de/LC_MESSAGES/django.po | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po
index d1a07d18f..c031ebc85 100644
--- a/src/locale/de/LC_MESSAGES/django.po
+++ b/src/locale/de/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-23 12:30+0100\n"
+"POT-Creation-Date: 2021-02-23 13:20+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"
@@ -355,10 +355,11 @@ msgid "filter rules"
 msgstr "Filterregeln"
 
 #: documents/serialisers.py:52
-msgid "Invalid regular expresssion: "
-msgstr "Ungültiger regulärer Ausdruck:"
+#, python-format
+msgid "Invalid regular expresssion: %(error)s"
+msgstr "Ungültiger regulärer Ausdruck: %(error)s"
 
-#: documents/serialisers.py:376
+#: documents/serialisers.py:378
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr "Dateityp %(type)s nicht unterstützt"

From 39505c9764221b278c90d30c8b1ba5436a85b9d0 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 13:33:41 +0000
Subject: [PATCH 1276/1300] Translate /src-ui/messages.xlf in pt_BR

translation completed for the source file '/src-ui/messages.xlf'
on the 'pt_BR' language.
---
 src-ui/src/locale/messages.pt_BR.xlf | 2337 ++++++++++++++++++++++++++
 1 file changed, 2337 insertions(+)
 create mode 100644 src-ui/src/locale/messages.pt_BR.xlf

diff --git a/src-ui/src/locale/messages.pt_BR.xlf b/src-ui/src/locale/messages.pt_BR.xlf
new file mode 100644
index 000000000..ac3b557ad
--- /dev/null
+++ b/src-ui/src/locale/messages.pt_BR.xlf
@@ -0,0 +1,2337 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="plaintext" original="ng2.template" source-language="en-US" target-language="pt-BR">
+    <body>
+      <trans-unit datatype="html" id="9103526311244275943">
+        <source>Document added</source>
+        <target>Documento adicionado</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9204248378636247318">
+        <source>Document <x equiv-text="status.filename" id="PH"/> was added to paperless.</source>
+        <target>Documento <x equiv-text="status.filename" id="PH"/> foi adicionado ao paperless.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1931214133925051574">
+        <source>Open document</source>
+        <target>Abrir documento</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8582620835547864448">
+        <source>Could not add <x equiv-text="status.filename" id="PH"/>: <x equiv-text="status.message" id="PH_1"/></source>
+        <target>Não foi possível adicionar <x equiv-text="status.filename" id="PH"/>: <x equiv-text="status.message" id="PH_1"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1710712016675379662">
+        <source>New document detected</source>
+        <target>Novo documento detectado</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="587031278561344416">
+        <source>Document <x equiv-text="status.filename" id="PH"/> is being processed by paperless.</source>
+        <target>Documento <x equiv-text="status.filename" id="PH"/> está sendo processado pelo paperless.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4733307402565258070">
+        <source>Documents</source>
+        <target>Documentos</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2155249406916744630">
+        <source>View &quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&quot; saved successfully.</source>
+        <target>Visualização &amp;quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&amp;quot; salva com sucesso.</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6837554170707123455">
+        <source>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; created successfully.</source>
+        <target>Visualização &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; criada com sucesso.</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9ca82952a6bc860b5391d5975322d8af8ceddfa4">
+        <source>Select</source>
+        <target>Selecionar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7e1f9a7054aff842832620c03dedae894787ba41">
+        <source>Select none</source>
+        <target>Selecionar nenhum</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ed8a0c2ce4968f8614151eefed20a0aa3daeeb9">
+        <source>Select page</source>
+        <target>Selecionar página</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b463541a7e303aa4d0b1102eaff8afbaf34e7a74">
+        <source>Select all</source>
+        <target>Selecionar todos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5d43539fc358c3a548b9d487be821db73e2702ff">
+        <source>Sort</source>
+        <target>Ordenar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b7641aed03492978b4ec6843b1e53f30464294d9">
+        <source>Views</source>
+        <target>Visualizações</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b69d81ff62cdc22b6bf88fe0b72dc1f66ccfa44f">
+        <source>Save as...</source>
+        <target>Salvar como...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5f5ce787c428d917c30c9bd70789a618e09743a7">
+        <source>Save &quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
+        <target>Salvar &amp;quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="439e7cc3c1ecefded167ed4d37f7d22dad6a9159">
+        <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Selecionado <x id="INTERPOLATION"/> de um documento} other {Selecionado <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documentos}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb773fdeaad5e7fb8e6cd77e1cc558e1b194a0c9">
+        <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Um documento} other {<x id="INTERPOLATION"/> documentos}}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb91083b44e3f77dd68de773ceab467ca3d57507">
+        <source>(filtered)</source>
+        <target>(filtrado)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ca0b795795658155d44ddca02e95f1feeeb4a88f">
+        <source>ASN</source>
+        <target>NSA</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7b5c6286aaded63fb279d6deb8aa8c704e085ced">
+        <source>Correspondent</source>
+        <target>Correspondente</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
+        <source>Title</source>
+        <target>Título</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2bd5919e8098513664a89d5b7b52d61e3063950f">
+        <source>Document type</source>
+        <target>Tipo de Documento</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1b051734b0ee9021991c91b3ed4e81c244322462">
+        <source>Created</source>
+        <target>Criado</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="80e3b490720757978c99a7b5af3885faf202b955">
+        <source>Added</source>
+        <target>Adicionado</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9021887951960049161">
+        <source>Confirm delete</source>
+        <target>Confirmar exclusão</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5382975254277698192">
+        <source>Do you really want to delete document &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</source>
+        <target>Você realmente deseja excluir o documento &amp;quot;<x equiv-text="this.document.title" id="PH"/>&amp;quot;?</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6691075929777935948">
+        <source>The files for this document will be deleted permanently. This operation cannot be undone.</source>
+        <target>Os arquivos desse documento serão excluídos permanentemente. Essa operação não pode ser revertida.</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="719892092227206532">
+        <source>Delete document</source>
+        <target>Excluir documento</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1844801255494293730">
+        <source>Error deleting document: <x equiv-text="JSON.stringify(error)" id="PH"/></source>
+        <target>Erro ao excluir documento: <x equiv-text="JSON.stringify(error)" id="PH"/></target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
+        <source>Delete</source>
+        <target>Excluir</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dc75033a5238fdc4f462212c847a45ba8018a3fd">
+        <source>Download</source>
+        <target>Baixar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4ea3c236bca3528318e3b3a411a20909e5fa8be4">
+        <source>More like this</source>
+        <target>Mais como este</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f4e529ae5ffd73001d1ff4bbdeeb0a72e342e5c8">
+        <source>Close</source>
+        <target>Fechar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4f8b2bb476981727ab34ed40fde1218361f92c45">
+        <source>Details</source>
+        <target>Detalhes</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4ab4cb601522b9194922554d934c4c30bd93567d">
+        <source>Content</source>
+        <target>Conteúdo</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f721a500a68c357e8f2a01e60510f6a01e4ba529">
+        <source>Metadata</source>
+        <target>Metadados</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">81</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3f5a652a1f473f4e243e3c6805ef1b383e270bb7">
+        <source>Discard</source>
+        <target>Descartar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">130</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="52c9a103b812f258bcddc3d90a6e3f46871d25fe">
+        <source>Save</source>
+        <target>Salvar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">132</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8380d9eff8613c0bc58edc7cebc2aa72e17b11e3">
+        <source>Page</source>
+        <target>Página</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c972a8e7d09f86e0c408a80349990fb213b32c08">
+        <source>of <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></source>
+        <target>de <x equiv-text="{{previewNumPages}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a071e35fecc10753065b1cb5b38608be66da2c8b">
+        <source>Download original</source>
+        <target>Baixar original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9b3996b5ddcc628a999a7df72fbfc2a2eae8c8a5">
+        <source>Archive serial number</source>
+        <target>Número de série de arquivamento</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">60</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="30eebc2dd656dbcb259d8d5286d244ee397d63bd">
+        <source>Date created</source>
+        <target>Data de criação</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720">
+        <source>Date modified</source>
+        <target>Data de modificação</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c1ae0f9ac4efb2dcd43cd947ddba09d6c4328269">
+        <source>Date added</source>
+        <target>Data de adição</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c7ea641c3a61a12a3599ce5a75c6d0dbba409ad3">
+        <source>Media filename</source>
+        <target>Nome do arquivo</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="74a894d2a8ae24a1eed4bc56e9afdc27dc2c31c8">
+        <source>Original MD5 checksum</source>
+        <target>Soma de verificação MD5 original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">99</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e92ca184ea785769fb26138fc25ee9fa06fff6e5">
+        <source>Original file size</source>
+        <target>Tamanho do arquivo original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">103</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="b5e93f30cc3411f20bd62025a6cc7394568f1bfd">
+        <source>Original mime type</source>
+        <target>Tipo mime original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="edbf54e4117606b5dd87aaea3c14b21ebf398020">
+        <source>Archive MD5 checksum</source>
+        <target>Soma de verificação MD5 de arquivamento</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">111</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e6bf12eadecbfd80016eca15fa78651c6ca90c64">
+        <source>Archive file size</source>
+        <target>Tamanho arquivado</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="203c7adb5bd74ae18e84e1e3b66ddfe76bc0023f">
+        <source>Original document metadata</source>
+        <target>Metadados do documento original</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">121</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7174dcea4a3d0b743e7e4a78747e902230727f67">
+        <source>Archived document metadata</source>
+        <target>Metadados do documento arquivado</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">122</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3fb9f1a31c3798173b2fea72638732c783b152fe">
+        <source>Save &amp; next</source>
+        <target>Salvar &amp; próximo</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">131</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8765497970646365998">
+        <source>Hello <x equiv-text="this.displayName" id="PH"/>, welcome to Paperless-ng!</source>
+        <target>Olá <x equiv-text="this.displayName" id="PH"/>, bem-vindo ao Paperless-ng!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7016571167317583872">
+        <source>Welcome to Paperless-ng!</source>
+        <target>Bem-vindo ao Paperless-ng!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f65253954b66e929a8b4d5ecaf61f9129f8cec64">
+        <source>Dashboard</source>
+        <target>Painel de controle</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="93754014749412887">
+        <source>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Você realmente deseja excluir a etiqueta &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cafc87479686947e2590b9f588a88040aeaf660b">
+        <source>Tags</source>
+        <target>Etiquetas</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="70a67e04629f6d412db0a12d51820b480788d795">
+        <source>Create</source>
+        <target>Criar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ddb40946e790522301687ecddb9ce1cb8ad40dd1">
+        <source>Filter by:</source>
+        <target>Filtrar por:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cff1428d10d59d14e45edec3c735a27b5482db59">
+        <source>Name</source>
+        <target>Nome</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
+        <source>Color</source>
+        <target>Cor</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d0c4488f742efeba0915e90e285a022da813deff">
+        <source>Matching</source>
+        <target>Detecção</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9bcf8d20d23c111eca1431abd2d2ce0de324499c">
+        <source>Document count</source>
+        <target>Número de documentos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="030b4423b92167200e39519599f9b863b4f7c62c">
+        <source>Actions</source>
+        <target>Ações</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9d51b3c90afda70700229d1b8a55371c13cb3bce">
+        <source>Documents</source>
+        <target>Documentos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
+        <source>Edit</source>
+        <target>Editar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4990731724078522539">
+        <source>Do you really want to delete the document type &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Você realmente deseja excluir o tipo de documento &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bc000b39af12c0925c424f4cb85f0c31c0f8eca8">
+        <source>Document types</source>
+        <target>Tipos de documento</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="eb3d5aefff38a814b76da74371cbf02c0789a1ef">
+        <source>Logs</source>
+        <target>Logs</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5610279464668232148">
+        <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
+        <target>Visualização &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; excluída.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5647210819299459618">
+        <source>Settings saved successfully.</source>
+        <target>Configurações salvas com sucesso.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6839066544204061364">
+        <source>Use system language</source>
+        <target>Usar linguagem do sistema</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7729897675462249787">
+        <source>Use date format of display language</source>
+        <target>Usar formato de data da linguagem de exibição</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">96</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4912706592792948707">
+        <source>ISO 8601</source>
+        <target>ISO 8601</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">97</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8488620293789898901">
+        <source>Error while storing settings on server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Erro ao salvar configurações: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
+        <source>Settings</source>
+        <target>Configurações</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="11ebd254cc9294717105c5982eb0cd2af30a446d">
+        <source>General settings</source>
+        <target>Configurações gerais</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab">
+        <source>Notifications</source>
+        <target>Notificações</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="99dee94e92dbd9e21a008d4569f9719ed206ae37">
+        <source>Saved views</source>
+        <target>Visualizações</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">133</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13">
+        <source>Appearance</source>
+        <target>Aparência</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="75f8908d266f7cc9b9e68e0be906fd080a223606">
+        <source>Display language</source>
+        <target>Linguagem de exibição</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1284a077dc18a2d1ff1b744f16f1797eea28ae37">
+        <source>You need to reload the page after applying a new language.</source>
+        <target>Você precisar recarregar a página depois de escolher uma nova linguagem.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0cd55822928764cc82a62ee3e6f3adbc1c630479">
+        <source>Date display</source>
+        <target>Exibição de data</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7df4de0d0704a06a302d853e31f2580eba98f127">
+        <source>Date format</source>
+        <target>Formato de data</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="69852399a18b8ca4fca8c5bfddd3f00a6d137593">
+        <source>Short: <x equiv-text="{{today | customDate:'shortDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Curto: <x equiv-text="{{today | customDate:'shortDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d01a59285e711252b98c4f193394e4b854615c78">
+        <source>Medium: <x equiv-text="{{today | customDate:'mediumDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Médio: <x equiv-text="{{today | customDate:'mediumDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="00481629776699b1caebd12b3b1176e2e23740a8">
+        <source>Long: <x equiv-text="{{today | customDate:'longDate':null:computedDateLocale}}" id="INTERPOLATION"/></source>
+        <target>Longo: <x equiv-text="{{today | customDate:'longDate':null:computedDateLocale}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2045151788cbdda7512752e408da59a6b54a8ef0">
+        <source>Items per page</source>
+        <target>Itens por página</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c4435e56bf0289e78fedc462f1d21fb30b9de55d">
+        <source>Document editor</source>
+        <target>Editor de documentos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4903e521c9bfd11ce88e7a5575106ef638912e0d">
+        <source>Use PDF viewer provided by the browser</source>
+        <target>Usar visualizador de PDF do navegador</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d7db07023e53f8396d18d375c2b78c25fc81c197">
+        <source>This is usually faster for displaying large PDF documents, but it might not work on some browsers.</source>
+        <target>Isso é geralmente mais rápido para exibir grandes documentos PDF, mas poderá não funcionar em alguns navegadores.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9ee5d1cbfd6ee168dae37aaba2b59b50bcabb2ff">
+        <source>Dark mode</source>
+        <target>Modo noturno</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">94</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f8cb5506e70fd71fddc9bb71cee18bfff7b29637">
+        <source>Use system settings</source>
+        <target>Usar configurações do sistema</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">97</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8ee474504043fa89821d626e4f3413240fa91b53">
+        <source>Enable dark mode</source>
+        <target>Habilitar modo noturno</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3863a86cd9e69a61d143d3daf51df44203df4a82">
+        <source>Bulk editing</source>
+        <target>Edição em massa</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">102</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586">
+        <source>Show confirmation dialogs</source>
+        <target>Mostrar janelas de confirmação</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a">
+        <source>Deleting documents will always ask for confirmation.</source>
+        <target>Ao excluir um documento, sempre será pedido uma confirmação.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cfddc13e04f5545ac63f419ef363505d6f78c2e">
+        <source>Apply on close</source>
+        <target>Aplicar ao fechar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8680abbea249ebe9c2fe35556559c8e1a9eb5841">
+        <source>Document processing</source>
+        <target>Processamento de documentos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0">
+        <source>Show notifications when new documents are detected</source>
+        <target>Exibir notificações quando novos documentos forem detectados</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">122</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e775f4f7c40249d31426ae61a21616a0c9d8e84f">
+        <source>Show notifications when document processing completes successfully</source>
+        <target>Exibir notificações quando o processamento de um documento concluir com sucesso</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e3844dd174d8e817ddb551fae28f14ae80ca36b6">
+        <source>Show notifications when document processing fails</source>
+        <target>Exibir notificações quando o processamento de um documento falhar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">124</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af113f7c9f7e13145c3461f61a1aedf12d57bd71">
+        <source>Suppress notifications on dashboard</source>
+        <target>Não exibir notificações no painel de controle</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e27bd3804d2936a6897e81c2e52e294490e5e5a8">
+        <source>This will suppress all messages about document processing status on the dashboard.</source>
+        <target>Isso esconderá todas as mensagens sobre o status de processamento de documentos no painel de controle.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8cb90334f5dfd7fc67205085f59381e2a334ccfc">
+        <source>Appears on</source>
+        <target>Aparece em</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">145</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5">
+        <source>Show on dashboard</source>
+        <target>Exibir no painel de controle</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">148</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="541bfc5b123b3f8867fd681eaceefb663a811973">
+        <source>Show in sidebar</source>
+        <target>Mostrar na navegação lateral</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="abba764a7a595d04dc8c3b26e04b3780d4fdb540">
+        <source>No saved views defined.</source>
+        <target>Nenhuma visualização definida.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
+          <context context-type="linenumber">162</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ef60a738a565f498b858e903e42bc5ffc3cc1299">
+        <source>404 Not Found</source>
+        <target>404 Não Encontrado</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/not-found/not-found.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7427874343955308724">
+        <source>Do you really want to delete the correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
+        <target>Você realmente deseja excluir o correspondente &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c3f3334de899327bf3ec8999236e10798ff76e72">
+        <source>Correspondents</source>
+        <target>Correspondentes</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0488919cff4fcc2174d34e4a1167f1b3c586ca37">
+        <source>Last correspondence</source>
+        <target>Última correspondência</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.html</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1234709746630139322">
+        <source>Confirmation</source>
+        <target>Confirmação</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9178182467454450952">
+        <source>Confirm</source>
+        <target>Confirmar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d7b35c384aecd25a516200d6921836374613dfe7">
+        <source>Cancel</source>
+        <target>Cancelar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6457471243969293847">
+        <source>Create new correspondent</source>
+        <target>Criar novo correspondente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2059822531169388684">
+        <source>Edit correspondent</source>
+        <target>Editar correspondente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3d5caa52b0a51bfd2757215f7614183554d740f0">
+        <source>Matching algorithm</source>
+        <target>Algoritmo de detecção</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="eab7fc7cf2d663e54de934b779fce4275a303f0f">
+        <source>Matching pattern</source>
+        <target>Padrão de detecção</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="632e529f49cf3d367dfbd15bd055e9b53aef30fb">
+        <source>Case insensitive</source>
+        <target>Não diferenciar maiúsculas de minúsculas</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9153094873118985366">
+        <source>Create new tag</source>
+        <target>Criar nova etiqueta</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5872175735754226507">
+        <source>Edit tag</source>
+        <target>Editar etiqueta</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="f2a30b4e1a89a8a0db0bd147b54d6626b9a9bc42">
+        <source>Inbox tag</source>
+        <target>Etiqueta caixa de entrada</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5e2f1a4ea12a1b8606ee3f0548d0ba64bf266077">
+        <source>Inbox tags are automatically assigned to all consumed documents.</source>
+        <target>Etiquetas de caixa de entrada são atribuídas automaticamente para todos os documentos consumidos.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6672809941092516947">
+        <source>Create new document type</source>
+        <target>Criar novo tipo de documento</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="36335016091244220">
+        <source>Edit document type</source>
+        <target>Editar tipo de documento</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="49c9ede51100b454f7841b24cd02355c6622bf44">
+        <source>Search results</source>
+        <target>Resultados da busca</target>
+        <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 datatype="html" id="31976d04f98e8a38098f66ac3a83ad33b576e5db">
+        <source>Invalid search query: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></source>
+        <target>Termo de pesquisa inválido: <x equiv-text="{{errorMessage}}" id="INTERPOLATION"/></target>
+        <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 datatype="html" id="2abff6a01d9b342a5a14b7fb90309a95ce934f8e">
+        <source> Showing documents similar to <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></source>
+        <target>Exibindo documentos similares a <x equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}" id="START_LINK"/><x equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/></target>
+        <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 datatype="html" id="6e0b0a1ea16f18f2fb1586c53d99d2f22e1aee2e">
+        <source>Search query: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></source>
+        <target>Termo de pesquisa: <x equiv-text="&lt;i&gt;{{query}}" id="START_ITALIC_TEXT"/><x equiv-text="{{query}}&lt;/i&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/i&gt;" id="CLOSE_ITALIC_TEXT"/></target>
+        <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 datatype="html" id="afa760e48c97d64d19c1455d18b7834a2256e23f">
+        <source>Did you mean &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</source>
+        <target>Você quis dizer &amp;quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&amp;quot;?</target>
+        <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 datatype="html" id="fe6ced3fcc803bba5a2e6c1a067b9ce62542500e">
+        <source>{VAR_PLURAL, plural, =0 {No results} =1 {One result} other {<x id="INTERPOLATION"/> results}}</source>
+        <target>{VAR_PLURAL, plural, =0 {Sem resultados} =1 {Um resultado} other {<x id="INTERPOLATION"/> resultados}}</target>
+        <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 datatype="html" id="41147374f427980a9f1a8cd5e3f4b1666e6f2418">
+        <source>Paperless-ng</source>
+        <target>Paperless-ng</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+        <note from="description" priority="1">app title</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="069566c6ed4f051b5b5617ef1935837226585dad">
+        <source>Search documents</source>
+        <target>Procurar documentos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bb694b49d408265c91c62799c2b3a7e3151c824d">
+        <source>Logout</source>
+        <target>Encerrar sessão</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="68949525c4d9a901e0cd15a94e3fc8d2711e9918">
+        <source>Manage</source>
+        <target>Gerenciar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="408cb6073e60c5d966296a3207fc596adca75e01">
+        <source>Admin</source>
+        <target>Admin</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">149</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="321e4419a943044e674beb55b8039f42a9761ca5">
+        <source>Info</source>
+        <target>Informação</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">155</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7">
+        <source>Documentation</source>
+        <target>Documentação</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">162</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="355a222236bc01b9a8cd3cb9ecf76891125aed69">
+        <source>GitHub</source>
+        <target>GitHub</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">170</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ea3a452c5238897cabc5781308cceb2d37dcf258">
+        <source>Suggest an idea</source>
+        <target>Sugerir uma idéia</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">176</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="af665f8de8fabe306aaf27443957e69bcbbce63c">
+        <source>Logged in as <x equiv-text="{{displayName}}" id="INTERPOLATION"/></source>
+        <target>Sessão iniciada como <x equiv-text="{{displayName}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">34</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4f55b670f49d927c6026bb614c7c62b1f2a394c0">
+        <source>Open documents</source>
+        <target>Abrir documentos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dca5bf9344a759fa5a07f1b21f50286ec242ba44">
+        <source>Close all</source>
+        <target>Fechar todos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">101</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5195932016807797291">
+        <source>Correspondent: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></source>
+        <target>Correspondente: <x equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8170755470576301659">
+        <source>Without correspondent</source>
+        <target>Sem correspondente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8705701325879965907">
+        <source>Type: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></source>
+        <target>Tipo: <x equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4362173610367509215">
+        <source>Without document type</source>
+        <target>Sem tipo de documento</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8180755793012580465">
+        <source>Tag: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></source>
+        <target>Etiqueta: <x equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6494566478302448576">
+        <source>Without any tag</source>
+        <target>Sem etiquetas</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6523384805359286307">
+        <source>Title: <x equiv-text="rule.value" id="PH"/></source>
+        <target>Título: <x equiv-text="rule.value" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="02d184c288f567825a1fcbf83bcd3099a10853d5">
+        <source>Filter tags</source>
+        <target>Filtrar etiquetas</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4b089ca12c472cf0b46167bb5afe4b527b301bbc">
+        <source>Filter correspondents</source>
+        <target>Filtrar correspondentes</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="0ad509732aaf702b7ea8c771c7809fa84bc85908">
+        <source>Filter document types</source>
+        <target>Filtrar tipos de documento</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2d9d55f1b70142ff4597ba32179d16888fd9c6b2">
+        <source>Reset filters</source>
+        <target>Limpar filtros</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7593728289020204896">
+        <source>Not assigned</source>
+        <target>Não atribuído</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
+          <context context-type="linenumber">166</context>
+        </context-group>
+        <note from="description" priority="1">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="c2d0ac9f528bbd5f53fd34269fde8b59e029621b">
+        <source>Apply</source>
+        <target>Aplicar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4873149362496451858">
+        <source>Last 7 days</source>
+        <target>Últimos 7 dias</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4463380307954693363">
+        <source>Last month</source>
+        <target>Último mês</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8697368973702409683">
+        <source>Last 3 months</source>
+        <target>Últimos 3 meses</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3566342898065860218">
+        <source>Last year</source>
+        <target>Último ano</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="be2add3a3d9e4e2556b8f9048a15a9c0f00bf1ad">
+        <source>After</source>
+        <target>Antes</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8785188e6c678b842fcb93b7392faf86db7ec676">
+        <source>Before</source>
+        <target>Depois</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="99ee4faa69cd2ea8e3678c1f557c0ff1f05aae46">
+        <source>Clear</source>
+        <target>Limpar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6829218544e108e152f5fa72cb79c4ccb82e0d06">
+        <source>View</source>
+        <target>Ver</target>
+        <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 datatype="html" id="849b42384616374df49bd8b3711ec159cb10b845">
+        <source>Created: <x equiv-text="{{document.created | customDate}}" id="INTERPOLATION"/></source>
+        <target>Criado: <x equiv-text="{{document.created | customDate}}" id="INTERPOLATION"/></target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8">
+        <source>Filter by correspondent</source>
+        <target>Filtrar por correspondente</target>
+        <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">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bdb9a910523610254872e147222689e9a4115b84">
+        <source>Filter by tag</source>
+        <target>Filtrar por etiqueta</target>
+        <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">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9c5fdf21ec2cc7baa6f062f2dc417af45c8dbe60">
+        <source>Score:</source>
+        <target>Nota:</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2840db547019ce8c76b2cdbe3a1653c5b68b06af">
+        <source>View in browser</source>
+        <target>Visualizar no navegador</target>
+        <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-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7985804062689412812">
+        <source>Error executing bulk operation: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Erro ao executar operação em massa: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">74</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7894972847287473517">
+        <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</source>
+        <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">113</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8639884465898458690">
+        <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
+        <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot; e &amp;quot;<x equiv-text="items[1].name" id="PH_1"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+        <note from="description" priority="1">This is for messages like 'modify &quot;tag1&quot; and &quot;tag2&quot;'</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="760986369763309193">
+        <source>, </source>
+        <target>, </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">117</context>
+        </context-group>
+        <note from="description" priority="1">this is used to separate enumerations and should probably be a comma and a whitespace in most languages</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="1822679894391095557">
+        <source><x equiv-text="list" id="PH"/> and &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</source>
+        <target><x equiv-text="list" id="PH"/> e &amp;quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&amp;quot;</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+        <note from="description" priority="1">this is for messages like 'modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;'</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="4137232459980262849">
+        <source>Confirm tags assignment</source>
+        <target>Confirmar atribuição de etiqueta</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">127</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6619516195038467207">
+        <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Essa operação irá adicionar a etiqueta &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; em <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">130</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1894412783609570695">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Essa operação irá adicionar as etiquetas <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> em <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s). </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">132</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7181166515756808573">
+        <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Essa operação irá remover a etiqueta &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; de <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3819792277998068944">
+        <source>This operation will remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Essa operação irá remover as etiquetas <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH"/> de <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">137</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2739066218579571288">
+        <source>This operation will add the tags <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> and remove the tags <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> on <x equiv-text="this.list.selected.size" id="PH_2"/> selected document(s).</source>
+        <target>Essa operação irá adicionar as etiquetas <x equiv-text="this._localizeList(changedTags.itemsToAdd)" id="PH"/> e remover as etiquetas <x equiv-text="this._localizeList(changedTags.itemsToRemove)" id="PH_1"/> de <x equiv-text="this.list.selected.size" id="PH_2"/> documento(s) selecionado(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">139</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2996713129519325161">
+        <source>Confirm correspondent assignment</source>
+        <target>Confirmar atribuição de correspondente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">159</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6900893559485781849">
+        <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Essa operação irá atribuir o correspondente &amp;quot;<x equiv-text="correspondent.name" id="PH"/>&amp;quot; para <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1257522660364398440">
+        <source>This operation will remove the correspondent from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Essa operação irá remover o correspondente de <x equiv-text="this.list.selected.size" id="PH"/> documento(s) selecionado(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">163</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5393409374423140648">
+        <source>Confirm document type assignment</source>
+        <target>Confirmar atribuição de tipo de documento</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">182</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="332180123895325027">
+        <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
+        <target>Essa operação irá atribuir o tipo de documento &amp;quot;<x equiv-text="documentType.name" id="PH"/>&amp;quot; para <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">184</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2236642492594872779">
+        <source>This operation will remove the document type from <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Essa operação irá remover o tipo de documento de <x equiv-text="this.list.selected.size" id="PH"/> documento(s) selecionado(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">186</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="749430623564850405">
+        <source>Delete confirm</source>
+        <target>Confirmar exlcusão</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">201</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4303174930844518780">
+        <source>This operation will permanently delete <x equiv-text="this.list.selected.size" id="PH"/> selected document(s).</source>
+        <target>Essa operação irá excluir permanentemente <x equiv-text="this.list.selected.size" id="PH"/> documento(s) selecionado(s).</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">202</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5641451190833696892">
+        <source>This operation cannot be undone.</source>
+        <target>Essa operação não pode ser revertida.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">203</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6734339521247847366">
+        <source>Delete document(s)</source>
+        <target>Apagar documento(s)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">205</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8b0609df23817024b3bed12beb9b64fc1009f588">
+        <source>Select:</source>
+        <target>Selecionar:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="dfc3c34e182ea73c5d784ff7c8135f087992dac1">
+        <source>All</source>
+        <target>Todos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="907df6a2b68daecc3c399cf40a764b358bd9fd84">
+        <source>Edit:</source>
+        <target>Editar:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="fc2de37422d7c4af6686842283cc2afd781b6848">
+        <source>Download originals</source>
+        <target>Descarregar originais</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">68</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a1e6c11f20d4bf6e8e6b43e3c6d2561b2080645e">
+        <source>Suggestions:</source>
+        <target>Sugestões:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/input/select/select.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="27d158b47717ff9305d19866960418c603f19d55">
+        <source>Save current view</source>
+        <target>Salvar visualização atual</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4eb84de23219c85432e38fb4fbdeb6c0f103ff8b">
+        <source>Show all</source>
+        <target>Mostrar todos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="61e0f26d843eec0b33ff475e111b0c2f7a80b835">
+        <source>Statistics</source>
+        <target>Estatísticas</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="c0d907c2687c09612395aee6ef7c04ca8e5e5e0a">
+        <source>Total documents: <x equiv-text="{{statistics?.documents_total}}" id="INTERPOLATION"/></source>
+        <target>Total de documentos: <x equiv-text="{{statistics?.documents_total}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="13e8d49dbcad9f9d71e66a9a56d6f328cff430c9">
+        <source>Documents in inbox: <x equiv-text="{{statistics?.documents_inbox}}" id="INTERPOLATION"/></source>
+        <target>Documentos na caixa de entrada: <x equiv-text="{{statistics?.documents_inbox}}" id="INTERPOLATION"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6443586946875325554">
+        <source>Processing: <x equiv-text="countUploadingAndProcessing" id="PH"/></source>
+        <target>Processando: <x equiv-text="countUploadingAndProcessing" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9182918211699394982">
+        <source>Failed: <x equiv-text="countFailed" id="PH"/></source>
+        <target>Falha: <x equiv-text="countFailed" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="534116346205124059">
+        <source>Added: <x equiv-text="countSuccess" id="PH"/></source>
+        <target>Adicionado: <x equiv-text="countSuccess" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3852289441366561594">
+        <source>Connecting...</source>
+        <target>Conectando...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1245343823699368872">
+        <source>Uploading...</source>
+        <target>Enviando...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7446520539098045935">
+        <source>Upload complete, waiting...</source>
+        <target>Envio concluído, esperando...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">126</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1405142710727603568">
+        <source>HTTP error: <x equiv-text="error.status" id="PH"/> <x equiv-text="error.statusText" id="PH_1"/></source>
+        <target>Erro HTTP: <x equiv-text="error.status" id="PH"/> <x equiv-text="error.statusText" id="PH_1"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts</context>
+          <context context-type="linenumber">136</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="e022072b3e4dd77e3f09960817ef3359a49963b3">
+        <source>Upload new documents</source>
+        <target>Enviar novos documentos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="52d5d56b6667ba3f7c759cbc0d4c39d34a99701e">
+        <source>Drop documents here or</source>
+        <target>Solte documentos aqui ou</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="865c511f4a24558ed0e954f9bbbff557bbb8954d">
+        <source>Browse files</source>
+        <target>Navegar arquivos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="bd4a8607e4a002d939cffb347ec056664dfb2c73">
+        <source>Dismiss completed</source>
+        <target>Esconder completos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+        <note from="description" priority="1">This button dismisses all status messages about processed documents on the dashboard (failed and successful)</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="90917e1a0a7bb59e9d11bdde9183e9391963e17b">
+        <source>{VAR_PLURAL, plural, =1 {One more document} other {<x id="INTERPOLATION"/> more documents}}</source>
+        <target>{VAR_PLURAL, plural, =1 {Mais um documento} other {Mais <x id="INTERPOLATION"/> documentos}</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+        <note from="description" priority="1">This is shown as a summary line when there are more than 5 document in the processing pipeline.</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="710254a196a2649674438edf8a15b7ab1f48271b">
+        <source>Open document</source>
+        <target>Abrir documento</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="45854ddec74086b271e62be6a363f4fa5036f7fc">
+        <source>First steps</source>
+        <target>Primeiros passos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="a0dc8218a6fcc5d11a4723ed127bd6be9d6d3ef3">
+        <source>Paperless is running! :)</source>
+        <target>O Paperless está a correr! :)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="ea8d9a9486d5639d1c38c012900b8d34d5e4135d">
+        <source>You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message.</source>
+        <target>Pode começar a carregar documentos deixando-os na caixa de carregamento de ficheiros à direita, ou deixando-os na pasta de consumo pré-configurada, que eles depois aparecem na lista de documentos. Depois de ter adicionado alguns meta-dados aos seus documentos, utilize os mecanismos de filtragem do Paperless para criar visualizações personalizadas (tais como 'Adicionados recentemente', 'Etiquetados com PARAFAZER'). Posteriormente estes aparecerão no painel em vez desta mensagem.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">6,7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="cf5f85690feaba6e29343f9881e57a6c0ea6e82b">
+        <source>Paperless offers some more features that try to make your life easier:</source>
+        <target>O Paperless oferece algumas funcionalidades para tentar tornar a sua vida mais fácil:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="edb41dc36af2e70789d8e3422325d930e783253e">
+        <source>Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.</source>
+        <target>Assim que já tenha alguns documentos previamente adicionados com os respetivos meta-dados, o Paperless consegue adicionar automaticamente meta-dados aos novos documentos.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9dca488928c0b7af46c3866f86a6c2c8548399aa">
+        <source>You can configure paperless to read your mails and add documents from attached files.</source>
+        <target>Pode configurar o Paperless para ler os seus e-mails e adicionar os documentos em anexo à plataforma.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="d282f6277cbf6704f697170d2ad19ce500790e20">
+        <source>Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general.</source>
+        <target>Consulte a documentação para saber como utilizar estas funcionalidades. A secção sobre utilização básica têm informação para o ajudar a utilizar a plataforma de uma forma geral.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="218403386307979629">
+        <source>Metadata</source>
+        <target>Metadados</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3797570084942068182">
+        <source>Select</source>
+        <target>Selecione</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7103181924469214926">
+        <source>Please select an object</source>
+        <target>Por favor selecione um objeto</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/select-dialog/select-dialog.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2807800733729323332">
+        <source>Yes</source>
+        <target>Sim</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3542042671420335679">
+        <source>No</source>
+        <target>Não</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/yes-no.pipe.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7536524521722799066">
+        <source>(no title)</source>
+        <target>(sem título)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/document-title.pipe.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1206520795340730278">
+        <source>English (US)</source>
+        <target>Inglês (US)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">82</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="6987083569809053351">
+        <source>English (GB)</source>
+        <target>Inglês (GB)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1858110241312746425">
+        <source>German</source>
+        <target>Alemão</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3071065188816255493">
+        <source>Dutch</source>
+        <target>Holandês</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7633754075223722162">
+        <source>French</source>
+        <target>Francês</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2119857572761283468">
+        <source>Document already exists.</source>
+        <target>Documento já existente.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="148389968432135849">
+        <source>File not found.</source>
+        <target>Arquivo não encontrado.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1520671543092565667">
+        <source>Pre-consume script does not exist.</source>
+        <target>Script pré-consumo não existe.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+        <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="7742915911032564889">
+        <source>Error while executing pre-consume script.</source>
+        <target>Erro ao executar script pré-consumo.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+        <note from="description" priority="1">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="8995193730018060346">
+        <source>Post-consume script does not exist.</source>
+        <target>Script pós-consumo não existe.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+        <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="256773668518189604">
+        <source>Error while executing post-consume script.</source>
+        <target>Erro ao executar script pós-consumo.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+        <note from="description" priority="1">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
+      </trans-unit>
+      <trans-unit datatype="html" id="6252258095055634191">
+        <source>Received new file.</source>
+        <target>Novo arquivo recebido.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7337565919209746135">
+        <source>File type not supported.</source>
+        <target>Tipo de arquivo não suportado.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5002399167376099234">
+        <source>Processing document...</source>
+        <target>Processando documento...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1085975194762600381">
+        <source>Generating thumbnail...</source>
+        <target>Gerando imagem...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3280851677698431426">
+        <source>Retrieving date from document...</source>
+        <target>Buscando data do documento...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7162102384876037296">
+        <source>Saving document...</source>
+        <target>Salvando documento...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4550450765009165976">
+        <source>Finished.</source>
+        <target>Encerrado.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/consumer-status.service.ts</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1519954996184640001">
+        <source>Error</source>
+        <target>Erro</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5037437391296624618">
+        <source>Information</source>
+        <target>Informação</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/toast.service.ts</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7517688192215738656">
+        <source>ASN</source>
+        <target>NSA</target>
+        <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 datatype="html" id="2691296884221415710">
+        <source>Correspondent</source>
+        <target>Correspondente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5701618810648052610">
+        <source>Title</source>
+        <target>Título</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5066119607229701477">
+        <source>Document type</source>
+        <target>Tipo de Documento</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4207916966377787111">
+        <source>Created</source>
+        <target>Criado</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="231679111972850796">
+        <source>Added</source>
+        <target>Adicionado</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3553216189604488439">
+        <source>Modified</source>
+        <target>Modificado</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2056433880533904076">
+        <source>Light blue</source>
+        <target>Azul claro</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4082253113407591781">
+        <source>Blue</source>
+        <target>Azul</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1143414876575720034">
+        <source>Light green</source>
+        <target>Verde claro</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="119581980963263815">
+        <source>Green</source>
+        <target>Verde</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="3250646524116252719">
+        <source>Light red</source>
+        <target>Vermelho claro</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1628552745302385832">
+        <source>Red </source>
+        <target>Vermelho</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5479028842846122610">
+        <source>Light orange</source>
+        <target>Laranja claro</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8598918991528773310">
+        <source>Orange</source>
+        <target>Laranja</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1789283185177957430">
+        <source>Light violet</source>
+        <target>Violeta claro</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2682868487071320453">
+        <source>Violet</source>
+        <target>Violeta</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1449010446077321264">
+        <source>Brown</source>
+        <target>Marrom</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="30300572504753589">
+        <source>Black</source>
+        <target>Preto</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="461048771215121187">
+        <source>Light grey</source>
+        <target>Cinza claro</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/paperless-tag.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4561076822163447092">
+        <source>Create new item</source>
+        <target>Criar novo item</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5324147361912094446">
+        <source>Edit item</source>
+        <target>Editar item</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">54</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1699589597032579396">
+        <source>Could not save element: <x equiv-text="error" id="PH"/></source>
+        <target>Não podemos salvar elemento: <x equiv-text="error" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/edit-dialog.component.ts</context>
+          <context context-type="linenumber">58</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="810888510148304696">
+        <source>Automatic</source>
+        <target>Automático</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5044611416737085530">
+        <source>Do you really want to delete this element?</source>
+        <target>Você realmente quer excluir esse elemento?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">97</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8371896857609524947">
+        <source>Associated documents will not be deleted.</source>
+        <target>Documentos associados não serão excluidos.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">104</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7022070615528435141">
+        <source>Delete</source>
+        <target>Excluir</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5467489005440577210">
+        <source>Error while deleting element: <x equiv-text="JSON.stringify(error.error)" id="PH"/></source>
+        <target>Erro ao excluir elemento: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/generic-list/generic-list.component.ts</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="5851669019930456395">
+        <source>Any word</source>
+        <target>Qualquer palavra</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7517655726614958140">
+        <source>Any: Document contains any of these words (space separated)</source>
+        <target>Qualquer: Documento contém qualquer uma dessas palavras (separadas por espaço)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="700315718208181326">
+        <source>All words</source>
+        <target>Todas as palavras</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="111914402588955480">
+        <source>All: Document contains all of these words (space separated)</source>
+        <target>Todas: Documento contém todas essas palavras (separadas por espaço)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9180173992399180575">
+        <source>Exact match</source>
+        <target>Detecção exata</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7109184332944610787">
+        <source>Exact: Document contains this string</source>
+        <target>Exata: Documento contém essa palavra</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1338733395833138319">
+        <source>Regular expression</source>
+        <target>Expressão regular</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="7548151332424148033">
+        <source>Regular expression: Document matches this regular expression</source>
+        <target>Expressão regular: Documento condiz com essa expressão regular</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="1856513373880048959">
+        <source>Fuzzy word</source>
+        <target>Palavra difusa</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="8419167206585286450">
+        <source>Fuzzy: Document contains a word similar to this word</source>
+        <target>Fuzzy: Documento contém uma palavra similar à essa.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="2167862279705099846">
+        <source>Auto: Learn matching automatically</source>
+        <target>Auto: Aprender detecção automaticamente</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/data/matching-model.ts</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file

From c1ddff4ee5c2f817fb4fdcfade5c360f3993b5e6 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 15:00:14 +0000
Subject: [PATCH 1277/1300] Apply translations in pt_BR

translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po'
on the 'pt_BR' language.
---
 src/locale/pt_BR/LC_MESSAGES/django.po | 668 +++++++++++++++++++++++++
 1 file changed, 668 insertions(+)
 create mode 100644 src/locale/pt_BR/LC_MESSAGES/django.po

diff --git a/src/locale/pt_BR/LC_MESSAGES/django.po b/src/locale/pt_BR/LC_MESSAGES/django.po
new file mode 100644
index 000000000..e1a74b104
--- /dev/null
+++ b/src/locale/pt_BR/LC_MESSAGES/django.po
@@ -0,0 +1,668 @@
+# 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
+# Rodrigo A <rodrigo.avelino@meliuz.com.br>, 2021
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-23 13:20+0100\n"
+"PO-Revision-Date: 2021-02-16 18:37+0000\n"
+"Last-Translator: Rodrigo A <rodrigo.avelino@meliuz.com.br>, 2021\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/paperless/teams/115905/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: documents/apps.py:10
+msgid "Documents"
+msgstr "Documentos"
+
+#: documents/models.py:32
+msgid "Any word"
+msgstr "Qualquer palavra"
+
+#: documents/models.py:33
+msgid "All words"
+msgstr "Todas as palavras"
+
+#: documents/models.py:34
+msgid "Exact match"
+msgstr "Detecção exata"
+
+#: documents/models.py:35
+msgid "Regular expression"
+msgstr "Expressão regular"
+
+#: documents/models.py:36
+msgid "Fuzzy word"
+msgstr "Palavra difusa (fuzzy)"
+
+#: documents/models.py:37
+msgid "Automatic"
+msgstr "Automático"
+
+#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25
+#: paperless_mail/models.py:109
+msgid "name"
+msgstr "nome"
+
+#: documents/models.py:45
+msgid "match"
+msgstr "detecção"
+
+#: documents/models.py:49
+msgid "matching algorithm"
+msgstr "algoritmo de detecção"
+
+#: documents/models.py:55
+msgid "is insensitive"
+msgstr "diferencia maiúsculas de minúsculas"
+
+#: documents/models.py:74 documents/models.py:134
+msgid "correspondent"
+msgstr "correspondente"
+
+#: documents/models.py:75
+msgid "correspondents"
+msgstr "correspondentes"
+
+#: documents/models.py:97
+msgid "color"
+msgstr "cor"
+
+#: documents/models.py:101
+msgid "is inbox tag"
+msgstr "é etiqueta caixa de entrada"
+
+#: documents/models.py:103
+msgid ""
+"Marks this tag as an inbox tag: All newly consumed documents will be tagged "
+"with inbox tags."
+msgstr ""
+"Marca essa etiqueta como caixa de entrada: Todos os novos documentos "
+"consumidos terão as etiquetas de caixa de entrada."
+
+#: documents/models.py:108
+msgid "tag"
+msgstr "etiqueta"
+
+#: documents/models.py:109 documents/models.py:165
+msgid "tags"
+msgstr "etiquetas"
+
+#: documents/models.py:115 documents/models.py:147
+msgid "document type"
+msgstr "tipo de documento"
+
+#: documents/models.py:116
+msgid "document types"
+msgstr "tipos de documento"
+
+#: documents/models.py:124
+msgid "Unencrypted"
+msgstr "Não encriptado"
+
+#: documents/models.py:125
+msgid "Encrypted with GNU Privacy Guard"
+msgstr "Encriptado com GNU Privacy Guard"
+
+#: documents/models.py:138
+msgid "title"
+msgstr "título"
+
+#: documents/models.py:151
+msgid "content"
+msgstr "conteúdo"
+
+#: documents/models.py:153
+msgid ""
+"The raw, text-only data of the document. This field is primarily used for "
+"searching."
+msgstr ""
+"O conteúdo de texto bruto do documento. Esse campo é usado principalmente "
+"para busca."
+
+#: documents/models.py:158
+msgid "mime type"
+msgstr "tipo mime"
+
+#: documents/models.py:169
+msgid "checksum"
+msgstr "some de verificação"
+
+#: documents/models.py:173
+msgid "The checksum of the original document."
+msgstr "A soma de verificação original do documento."
+
+#: documents/models.py:177
+msgid "archive checksum"
+msgstr "Soma de verificação de arquivamento."
+
+#: documents/models.py:182
+msgid "The checksum of the archived document."
+msgstr "A soma de verificação do documento arquivado."
+
+#: documents/models.py:186 documents/models.py:342
+msgid "created"
+msgstr "criado"
+
+#: documents/models.py:190
+msgid "modified"
+msgstr "modificado"
+
+#: documents/models.py:194
+msgid "storage type"
+msgstr "tipo de armazenamento"
+
+#: documents/models.py:202
+msgid "added"
+msgstr "adicionado"
+
+#: documents/models.py:206
+msgid "filename"
+msgstr "nome do arquivo"
+
+#: documents/models.py:212
+msgid "Current filename in storage"
+msgstr "Nome do arquivo atual armazenado"
+
+#: documents/models.py:216
+msgid "archive filename"
+msgstr "nome do arquivo para arquivamento"
+
+#: documents/models.py:222
+msgid "Current archive filename in storage"
+msgstr "Nome do arquivo para arquivamento armazenado"
+
+#: documents/models.py:226
+msgid "archive serial number"
+msgstr "número de sério de arquivamento"
+
+#: documents/models.py:231
+msgid "The position of this document in your physical document archive."
+msgstr "A posição deste documento no seu arquivamento físico."
+
+#: documents/models.py:237
+msgid "document"
+msgstr "documento"
+
+#: documents/models.py:238
+msgid "documents"
+msgstr "documentos"
+
+#: documents/models.py:325
+msgid "debug"
+msgstr "debug"
+
+#: documents/models.py:326
+msgid "information"
+msgstr "informação"
+
+#: documents/models.py:327
+msgid "warning"
+msgstr "aviso"
+
+#: documents/models.py:328
+msgid "error"
+msgstr "erro"
+
+#: documents/models.py:329
+msgid "critical"
+msgstr "crítico"
+
+#: documents/models.py:333
+msgid "group"
+msgstr "grupo"
+
+#: documents/models.py:336
+msgid "message"
+msgstr "mensagem"
+
+#: documents/models.py:339
+msgid "level"
+msgstr "nível"
+
+#: documents/models.py:346
+msgid "log"
+msgstr "log"
+
+#: documents/models.py:347
+msgid "logs"
+msgstr "logs"
+
+#: documents/models.py:358 documents/models.py:408
+msgid "saved view"
+msgstr "visualização"
+
+#: documents/models.py:359
+msgid "saved views"
+msgstr "visualizações"
+
+#: documents/models.py:362
+msgid "user"
+msgstr "usuário"
+
+#: documents/models.py:368
+msgid "show on dashboard"
+msgstr "exibir no painel de controle"
+
+#: documents/models.py:371
+msgid "show in sidebar"
+msgstr "exibir no painel lateral"
+
+#: documents/models.py:375
+msgid "sort field"
+msgstr "ordenar campo"
+
+#: documents/models.py:378
+msgid "sort reverse"
+msgstr "odernar reverso"
+
+#: documents/models.py:384
+msgid "title contains"
+msgstr "título contém"
+
+#: documents/models.py:385
+msgid "content contains"
+msgstr "conteúdo contém"
+
+#: documents/models.py:386
+msgid "ASN is"
+msgstr "NSA é"
+
+#: documents/models.py:387
+msgid "correspondent is"
+msgstr "correspondente é"
+
+#: documents/models.py:388
+msgid "document type is"
+msgstr "tipo de documento é"
+
+#: documents/models.py:389
+msgid "is in inbox"
+msgstr "é caixa de entrada"
+
+#: documents/models.py:390
+msgid "has tag"
+msgstr "contém etiqueta"
+
+#: documents/models.py:391
+msgid "has any tag"
+msgstr "contém qualquer etiqueta"
+
+#: documents/models.py:392
+msgid "created before"
+msgstr "criado antes de"
+
+#: documents/models.py:393
+msgid "created after"
+msgstr "criado depois de"
+
+#: documents/models.py:394
+msgid "created year is"
+msgstr "ano de criação é"
+
+#: documents/models.py:395
+msgid "created month is"
+msgstr "mês de criação é"
+
+#: documents/models.py:396
+msgid "created day is"
+msgstr "dia de criação é"
+
+#: documents/models.py:397
+msgid "added before"
+msgstr "adicionado antes de"
+
+#: documents/models.py:398
+msgid "added after"
+msgstr "adicionado depois de"
+
+#: documents/models.py:399
+msgid "modified before"
+msgstr "modificado antes de"
+
+#: documents/models.py:400
+msgid "modified after"
+msgstr "modificado depois de"
+
+#: documents/models.py:401
+msgid "does not have tag"
+msgstr "não tem etiqueta"
+
+#: documents/models.py:412
+msgid "rule type"
+msgstr "tipo de regra"
+
+#: documents/models.py:416
+msgid "value"
+msgstr "valor"
+
+#: documents/models.py:422
+msgid "filter rule"
+msgstr "regra de filtragem"
+
+#: documents/models.py:423
+msgid "filter rules"
+msgstr "regras de filtragem"
+
+#: documents/serialisers.py:52
+#, python-format
+msgid "Invalid regular expresssion: %(error)s"
+msgstr "Expressão regular inválida: %(error)s"
+
+#: documents/serialisers.py:378
+#, python-format
+msgid "File type %(type)s not supported"
+msgstr "Tipo de arquivo %(type)s não suportado"
+
+#: documents/templates/index.html:20
+msgid "Paperless-ng is loading..."
+msgstr "Paperless-ng está carregando..."
+
+#: documents/templates/registration/logged_out.html:13
+msgid "Paperless-ng signed out"
+msgstr "Paperless-ng saiu"
+
+#: documents/templates/registration/logged_out.html:41
+msgid "You have been successfully logged out. Bye!"
+msgstr "Sua sessão foi encerrada com sucesso. Até mais!"
+
+#: documents/templates/registration/logged_out.html:42
+msgid "Sign in again"
+msgstr "Entre novamente"
+
+#: documents/templates/registration/login.html:13
+msgid "Paperless-ng sign in"
+msgstr "Entrar no Paperless-ng"
+
+#: documents/templates/registration/login.html:42
+msgid "Please sign in."
+msgstr "Por favor, entre na sua conta"
+
+#: documents/templates/registration/login.html:45
+msgid "Your username and password didn't match. Please try again."
+msgstr "Seu usuário e senha estão incorretos. Por favor, tente novamente."
+
+#: documents/templates/registration/login.html:48
+msgid "Username"
+msgstr "Usuário"
+
+#: documents/templates/registration/login.html:49
+msgid "Password"
+msgstr "Senha"
+
+#: documents/templates/registration/login.html:54
+msgid "Sign in"
+msgstr "Entrar"
+
+#: paperless/settings.py:291
+msgid "English (US)"
+msgstr "Inglês (EUA)"
+
+#: paperless/settings.py:292
+msgid "English (GB)"
+msgstr "Inglês (GB)"
+
+#: paperless/settings.py:293
+msgid "German"
+msgstr "Alemão"
+
+#: paperless/settings.py:294
+msgid "Dutch"
+msgstr "Holandês"
+
+#: paperless/settings.py:295
+msgid "French"
+msgstr "Francês"
+
+#: paperless/urls.py:118
+msgid "Paperless-ng administration"
+msgstr "Administração do Paperless-ng"
+
+#: paperless_mail/admin.py:25
+msgid "Filter"
+msgstr "Filtro"
+
+#: paperless_mail/admin.py:27
+msgid ""
+"Paperless will only process mails that match ALL of the filters given below."
+msgstr ""
+"Paperless processará somente e-mails que se encaixam em TODOS os filtros "
+"abaixo."
+
+#: paperless_mail/admin.py:37
+msgid "Actions"
+msgstr "Ações"
+
+#: 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 ""
+"A ação se aplica ao e-mail. Essa ação só é executada quando documentos foram"
+" consumidos do e-mail. E-mails sem anexos permanecerão intactos."
+
+#: paperless_mail/admin.py:46
+msgid "Metadata"
+msgstr "Metadados"
+
+#: 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 ""
+"Atribua metadados aos documentos consumidos por esta regra automaticamente. "
+"Se você não atribuir etiquetas, tipos ou correspondentes aqui, paperless "
+"ainda sim processará todas as regras de detecção que você definiu."
+
+#: paperless_mail/apps.py:9
+msgid "Paperless mail"
+msgstr "Paperless mail"
+
+#: paperless_mail/models.py:11
+msgid "mail account"
+msgstr "conta de e-mail"
+
+#: paperless_mail/models.py:12
+msgid "mail accounts"
+msgstr "contas de e-mail"
+
+#: paperless_mail/models.py:19
+msgid "No encryption"
+msgstr "Sem encriptação"
+
+#: paperless_mail/models.py:20
+msgid "Use SSL"
+msgstr "Usar SSL"
+
+#: paperless_mail/models.py:21
+msgid "Use STARTTLS"
+msgstr "Usar STARTTLS"
+
+#: paperless_mail/models.py:29
+msgid "IMAP server"
+msgstr "Servidor IMAP"
+
+#: paperless_mail/models.py:33
+msgid "IMAP port"
+msgstr "Porta IMAP"
+
+#: paperless_mail/models.py:36
+msgid ""
+"This is usually 143 for unencrypted and STARTTLS connections, and 993 for "
+"SSL connections."
+msgstr ""
+"É geralmente 143 para não encriptado e conexões STARTTLS, e 993 para "
+"conexões SSL."
+
+#: paperless_mail/models.py:40
+msgid "IMAP security"
+msgstr "segurança IMAP"
+
+#: paperless_mail/models.py:46
+msgid "username"
+msgstr "usuário"
+
+#: paperless_mail/models.py:50
+msgid "password"
+msgstr "senha"
+
+#: paperless_mail/models.py:60
+msgid "mail rule"
+msgstr "regra de e-mail"
+
+#: paperless_mail/models.py:61
+msgid "mail rules"
+msgstr "regras de e-mail"
+
+#: paperless_mail/models.py:67
+msgid "Only process attachments."
+msgstr "Processar somente anexos."
+
+#: paperless_mail/models.py:68
+msgid "Process all files, including 'inline' attachments."
+msgstr "Processar todos os arquivos, incluindo anexos 'inline'."
+
+#: paperless_mail/models.py:78
+msgid "Mark as read, don't process read mails"
+msgstr "Marcar como lido, não processar e-mails lidos"
+
+#: paperless_mail/models.py:79
+msgid "Flag the mail, don't process flagged mails"
+msgstr "Sinalizar o e-mail, não processar e-mails sinalizados"
+
+#: paperless_mail/models.py:80
+msgid "Move to specified folder"
+msgstr "Mover para pasta especificada"
+
+#: paperless_mail/models.py:81
+msgid "Delete"
+msgstr "Excluir"
+
+#: paperless_mail/models.py:88
+msgid "Use subject as title"
+msgstr "Usar assunto como título"
+
+#: paperless_mail/models.py:89
+msgid "Use attachment filename as title"
+msgstr "Usar nome do arquivo anexo como título"
+
+#: paperless_mail/models.py:99
+msgid "Do not assign a correspondent"
+msgstr "Não atribuir um correspondente"
+
+#: paperless_mail/models.py:101
+msgid "Use mail address"
+msgstr "Usar endereço de e-mail"
+
+#: paperless_mail/models.py:103
+msgid "Use name (or mail address if not available)"
+msgstr "Usar nome (ou endereço de e-mail se não disponível)"
+
+#: paperless_mail/models.py:105
+msgid "Use correspondent selected below"
+msgstr "Usar correspondente selecionado abaixo"
+
+#: paperless_mail/models.py:113
+msgid "order"
+msgstr "ordem"
+
+#: paperless_mail/models.py:120
+msgid "account"
+msgstr "conta"
+
+#: paperless_mail/models.py:124
+msgid "folder"
+msgstr "pasta"
+
+#: paperless_mail/models.py:128
+msgid "filter from"
+msgstr "filtrar de"
+
+#: paperless_mail/models.py:131
+msgid "filter subject"
+msgstr "filtrar assunto"
+
+#: paperless_mail/models.py:134
+msgid "filter body"
+msgstr "filtrar corpo"
+
+#: paperless_mail/models.py:138
+msgid "filter attachment filename"
+msgstr "filtrar nome do arquivo anexo"
+
+#: 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 ""
+"Consumir somente documentos que correspondem a este nome de arquivo se especificado.\n"
+"Curingas como *.pdf ou *invoice* são permitidos. Sem diferenciação de maiúsculas e minúsculas."
+
+#: paperless_mail/models.py:146
+msgid "maximum age"
+msgstr "idade máxima"
+
+#: paperless_mail/models.py:148
+msgid "Specified in days."
+msgstr "Especificada em dias."
+
+#: paperless_mail/models.py:151
+msgid "attachment type"
+msgstr "tipo de anexo"
+
+#: paperless_mail/models.py:154
+msgid ""
+"Inline attachments include embedded images, so it's best to combine this "
+"option with a filename filter."
+msgstr ""
+"Anexos inline incluem imagens inseridas, por isso é melhor combinar essa "
+"opção com um filtro de nome de arquivo."
+
+#: paperless_mail/models.py:159
+msgid "action"
+msgstr "ação"
+
+#: paperless_mail/models.py:165
+msgid "action parameter"
+msgstr "parâmetro da ação"
+
+#: 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 ""
+"Parâmetro adicional para a ação selecionada acima, por exemplo: a pasta de "
+"destino da ação de mover pasta."
+
+#: paperless_mail/models.py:173
+msgid "assign title from"
+msgstr "atribuir título de"
+
+#: paperless_mail/models.py:183
+msgid "assign this tag"
+msgstr "atribuir esta etiqueta"
+
+#: paperless_mail/models.py:191
+msgid "assign this document type"
+msgstr "atribuir este tipo de documento"
+
+#: paperless_mail/models.py:195
+msgid "assign correspondent from"
+msgstr "atribuir correspondente de"
+
+#: paperless_mail/models.py:205
+msgid "assign this correspondent"
+msgstr "atribuir este correspondente"

From 191d9a7b2b5bcdb91d1323275259e69b26c5abc1 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 16:39:41 +0100
Subject: [PATCH 1278/1300] add configuration for pt-br

---
 src-ui/angular.json                         | 3 ++-
 src-ui/src/app/app.module.ts                | 2 ++
 src-ui/src/app/services/settings.service.ts | 3 ++-
 src/paperless/settings.py                   | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index edf428fc7..2877408d2 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -19,7 +19,8 @@
 					"de": "src/locale/messages.de.xlf",
 					"nl-NL": "src/locale/messages.nl_NL.xlf",
 					"fr": "src/locale/messages.fr.xlf",
-					"en-GB": "src/locale/messages.en_GB.xlf"
+					"en-GB": "src/locale/messages.en_GB.xlf",
+					"pt-BR": "src/locale/messages.pt_BR.xlf"
 				}
 			},
 			"architect": {
diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 54c19a216..0773a9ace 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -64,11 +64,13 @@ import { CustomDatePipe } from './pipes/custom-date.pipe';
 import localeFr from '@angular/common/locales/fr';
 import localeNl from '@angular/common/locales/nl';
 import localeDe from '@angular/common/locales/de';
+import localePt from '@angular/common/locales/pt-PT';
 import localeEnGb from '@angular/common/locales/en-GB';
 
 registerLocaleData(localeFr)
 registerLocaleData(localeNl)
 registerLocaleData(localeDe)
+registerLocaleData(localePt, "pt-BR")
 registerLocaleData(localeEnGb)
 
 @NgModule({
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index d511fa65f..393417e31 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -83,7 +83,8 @@ export class SettingsService {
       {code: "en-gb", name: $localize`English (GB)`, englishName: "English (GB)"},
       {code: "de", name: $localize`German`, englishName: "German"},
       {code: "nl", name: $localize`Dutch`, englishName: "Dutch"},
-      {code: "fr", name: $localize`French`, englishName: "French"}
+      {code: "fr", name: $localize`French`, englishName: "French"},
+      {code: "pt-br", name: $localize`Portuguese (Brazil)`, englishName: "Portuguese (Brazil)"}
     ]
   }
 
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 7c4e36391..4c860351f 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -292,7 +292,8 @@ LANGUAGES = [
     ("en-gb", _("English (GB)")),
     ("de", _("German")),
     ("nl-nl", _("Dutch")),
-    ("fr", _("French"))
+    ("fr", _("French")),
+    ("pt-br", _("Portuguese (Brazil)"))
 ]
 
 LOCALE_PATHS = [

From d836756e1920b0279f479c006580fee481a04fb6 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 16:43:55 +0100
Subject: [PATCH 1279/1300] fix up quoting (hope this gets pushed into
 transifex

---
 src-ui/src/locale/messages.pt_BR.xlf | 32 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src-ui/src/locale/messages.pt_BR.xlf b/src-ui/src/locale/messages.pt_BR.xlf
index ac3b557ad..0efe12ad0 100644
--- a/src-ui/src/locale/messages.pt_BR.xlf
+++ b/src-ui/src/locale/messages.pt_BR.xlf
@@ -59,7 +59,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="2155249406916744630">
         <source>View &quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&quot; saved successfully.</source>
-        <target>Visualização &amp;quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&amp;quot; salva com sucesso.</target>
+        <target>Visualização &quot;<x equiv-text="this.list.activeSavedViewTitle" id="PH"/>&quot; salva com sucesso.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
           <context context-type="linenumber">115</context>
@@ -67,7 +67,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="6837554170707123455">
         <source>View &quot;<x equiv-text="savedView.name" id="PH"/>&quot; created successfully.</source>
-        <target>Visualização &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; criada com sucesso.</target>
+        <target>Visualização &quot;<x equiv-text="savedView.name" id="PH"/>&quot; criada com sucesso.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
           <context context-type="linenumber">136</context>
@@ -131,7 +131,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="5f5ce787c428d917c30c9bd70789a618e09743a7">
         <source>Save &quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&quot;</source>
-        <target>Salvar &amp;quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&amp;quot;</target>
+        <target>Salvar &quot;<x equiv-text="{{list.activeSavedViewTitle}}" id="INTERPOLATION"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
           <context context-type="linenumber">71</context>
@@ -219,7 +219,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="5382975254277698192">
         <source>Do you really want to delete document &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</source>
-        <target>Você realmente deseja excluir o documento &amp;quot;<x equiv-text="this.document.title" id="PH"/>&amp;quot;?</target>
+        <target>Você realmente deseja excluir o documento &quot;<x equiv-text="this.document.title" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
           <context context-type="linenumber">204</context>
@@ -475,7 +475,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="93754014749412887">
         <source>Do you really want to delete the tag &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Você realmente deseja excluir a etiqueta &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <target>Você realmente deseja excluir a etiqueta &quot;<x equiv-text="object.name" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context>
           <context context-type="linenumber">30</context>
@@ -563,7 +563,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="4990731724078522539">
         <source>Do you really want to delete the document type &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Você realmente deseja excluir o tipo de documento &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <target>Você realmente deseja excluir o tipo de documento &quot;<x equiv-text="object.name" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context>
           <context context-type="linenumber">26</context>
@@ -587,7 +587,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="5610279464668232148">
         <source>Saved view &quot;<x equiv-text="savedView.name" id="PH"/>&quot; deleted.</source>
-        <target>Visualização &amp;quot;<x equiv-text="savedView.name" id="PH"/>&amp;quot; excluída.</target>
+        <target>Visualização &quot;<x equiv-text="savedView.name" id="PH"/>&quot; excluída.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
           <context context-type="linenumber">67</context>
@@ -907,7 +907,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7427874343955308724">
         <source>Do you really want to delete the correspondent &quot;<x equiv-text="object.name" id="PH"/>&quot;?</source>
-        <target>Você realmente deseja excluir o correspondente &amp;quot;<x equiv-text="object.name" id="PH"/>&amp;quot;?</target>
+        <target>Você realmente deseja excluir o correspondente &quot;<x equiv-text="object.name" id="PH"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context>
           <context context-type="linenumber">26</context>
@@ -1075,7 +1075,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="afa760e48c97d64d19c1455d18b7834a2256e23f">
         <source>Did you mean &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</source>
-        <target>Você quis dizer &amp;quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&amp;quot;?</target>
+        <target>Você quis dizer &quot;<x equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}" id="START_LINK"/><x equiv-text="{{correctedQuery}}&lt;/a&gt;" id="INTERPOLATION"/><x equiv-text="&lt;/a&gt;" id="CLOSE_LINK"/>&quot;?</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/search/search.component.html</context>
           <context context-type="linenumber">13</context>
@@ -1405,7 +1405,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7894972847287473517">
         <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</source>
-        <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot;</target>
+        <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">113</context>
@@ -1413,7 +1413,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="8639884465898458690">
         <source>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; and &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</source>
-        <target>&amp;quot;<x equiv-text="items[0].name" id="PH"/>&amp;quot; e &amp;quot;<x equiv-text="items[1].name" id="PH_1"/>&amp;quot;</target>
+        <target>&quot;<x equiv-text="items[0].name" id="PH"/>&quot; e &quot;<x equiv-text="items[1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">115</context>
@@ -1431,7 +1431,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="1822679894391095557">
         <source><x equiv-text="list" id="PH"/> and &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</source>
-        <target><x equiv-text="list" id="PH"/> e &amp;quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&amp;quot;</target>
+        <target><x equiv-text="list" id="PH"/> e &quot;<x equiv-text="items[items.length - 1].name" id="PH_1"/>&quot;</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">118</context>
@@ -1448,7 +1448,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="6619516195038467207">
         <source>This operation will add the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Essa operação irá adicionar a etiqueta &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; em <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
+        <target>Essa operação irá adicionar a etiqueta &quot;<x equiv-text="tag.name" id="PH"/>&quot; em <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">130</context>
@@ -1464,7 +1464,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="7181166515756808573">
         <source>This operation will remove the tag &quot;<x equiv-text="tag.name" id="PH"/>&quot; from <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Essa operação irá remover a etiqueta &amp;quot;<x equiv-text="tag.name" id="PH"/>&amp;quot; de <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
+        <target>Essa operação irá remover a etiqueta &quot;<x equiv-text="tag.name" id="PH"/>&quot; de <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">135</context>
@@ -1496,7 +1496,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="6900893559485781849">
         <source>This operation will assign the correspondent &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Essa operação irá atribuir o correspondente &amp;quot;<x equiv-text="correspondent.name" id="PH"/>&amp;quot; para <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
+        <target>Essa operação irá atribuir o correspondente &quot;<x equiv-text="correspondent.name" id="PH"/>&quot; para <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">161</context>
@@ -1520,7 +1520,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="332180123895325027">
         <source>This operation will assign the document type &quot;<x equiv-text="documentType.name" id="PH"/>&quot; to <x equiv-text="this.list.selected.size" id="PH_1"/> selected document(s).</source>
-        <target>Essa operação irá atribuir o tipo de documento &amp;quot;<x equiv-text="documentType.name" id="PH"/>&amp;quot; para <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
+        <target>Essa operação irá atribuir o tipo de documento &quot;<x equiv-text="documentType.name" id="PH"/>&quot; para <x equiv-text="this.list.selected.size" id="PH_1"/> documento(s) selecionado(s).</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
           <context context-type="linenumber">184</context>

From 15861ea41a47e3bc89bf5276974f7cb59e2167da Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 16:50:05 +0100
Subject: [PATCH 1280/1300] add translation strings for portuguese

---
 src-ui/messages.xlf                    | 37 +++++++++++++++-----------
 src/locale/en_US/LC_MESSAGES/django.po |  6 ++++-
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 95e0fad15..e1747ba03 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -531,28 +531,21 @@
         <source>Use system language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7729897675462249787" datatype="html">
         <source>Use date format of display language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">96</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/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8488620293789898901" datatype="html">
         <source>Error while storing settings on server: <x id="PH" equiv-text="JSON.stringify(error.error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
@@ -1630,35 +1623,49 @@
         <source>English (US)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6987083569809053351" datatype="html">
         <source>English (GB)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1858110241312746425" datatype="html">
         <source>German</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3071065188816255493" datatype="html">
         <source>Dutch</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7633754075223722162" datatype="html">
         <source>French</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">88</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">89</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">95</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2119857572761283468" datatype="html">
diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po
index 27d628455..c4e8ee97b 100644
--- a/src/locale/en_US/LC_MESSAGES/django.po
+++ b/src/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-23 13:20+0100\n"
+"POT-Creation-Date: 2021-02-24 16:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -416,6 +416,10 @@ msgstr ""
 msgid "French"
 msgstr ""
 
+#: paperless/settings.py:296
+msgid "Portuguese (Brazil)"
+msgstr ""
+
 #: paperless/urls.py:118
 msgid "Paperless-ng administration"
 msgstr ""

From 6b20177b09745f3197017873727deaf1338ae3a9 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 17:41:32 +0100
Subject: [PATCH 1281/1300] update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 83ef1c1ed..c935d90a8 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ The documentation for Paperless-ng is available on [ReadTheDocs](https://paperle
 
 # Translation
 
-Paperless is currently available in English, German, Dutch and French. Translation is coordinated at transifex: https://www.transifex.com/paperless/paperless-ng
+Paperless is currently available in English, German, Dutch, French, and Portuguese. Translation is coordinated at transifex: https://www.transifex.com/paperless/paperless-ng
 
 If you want to see paperless in your own language, request that language at transifex and you can start translating after I approve the language.
 

From 035b0a449b240a2615cb0599ff242604a7864e83 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 18:00:26 +0100
Subject: [PATCH 1282/1300] use ng-bootstrap date selector, with proper
 formatting/parsing according to the current locale #177

---
 src-ui/src/app/app.module.ts                  | 14 +++--
 .../input/date-time/date-time.component.html  | 13 ----
 .../input/date-time/date-time.component.ts    | 61 -------------------
 .../common/input/date/date.component.html     | 15 +++++
 .../date.component.scss}                      |  0
 .../date.component.spec.ts}                   | 12 ++--
 .../common/input/date/date.component.ts       | 32 ++++++++++
 .../document-detail.component.html            |  2 +-
 .../manage/settings/settings.component.ts     |  9 +--
 src-ui/src/app/services/settings.service.ts   | 36 ++++++++---
 src-ui/src/app/utils/ngb-date-adapter.ts      | 23 +++++++
 .../app/utils/ngb-date-parser-formatter.ts    | 59 ++++++++++++++++++
 12 files changed, 176 insertions(+), 100 deletions(-)
 delete mode 100644 src-ui/src/app/components/common/input/date-time/date-time.component.html
 delete mode 100644 src-ui/src/app/components/common/input/date-time/date-time.component.ts
 create mode 100644 src-ui/src/app/components/common/input/date/date.component.html
 rename src-ui/src/app/components/common/input/{date-time/date-time.component.scss => date/date.component.scss} (100%)
 rename src-ui/src/app/components/common/input/{date-time/date-time.component.spec.ts => date/date.component.spec.ts} (55%)
 create mode 100644 src-ui/src/app/components/common/input/date/date.component.ts
 create mode 100644 src-ui/src/app/utils/ngb-date-adapter.ts
 create mode 100644 src-ui/src/app/utils/ngb-date-parser-formatter.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 0773a9ace..9e0dc56de 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbDateAdapter, NgbDateParserFormatter, NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { DocumentListComponent } from './components/document-list/document-list.component';
 import { DocumentDetailComponent } from './components/document-detail/document-detail.component';
@@ -39,7 +39,6 @@ import { SelectComponent } from './components/common/input/select/select.compone
 import { CheckComponent } from './components/common/input/check/check.component';
 import { SaveViewConfigDialogComponent } from './components/document-list/save-view-config-dialog/save-view-config-dialog.component';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
-import { DateTimeComponent } from './components/common/input/date-time/date-time.component';
 import { TagsComponent } from './components/common/input/tags/tags.component';
 import { SortableDirective } from './directives/sortable.directive';
 import { CookieService } from 'ngx-cookie-service';
@@ -60,6 +59,9 @@ import { NgSelectModule } from '@ng-select/ng-select';
 import { NumberComponent } from './components/common/input/number/number.component';
 import { SafePipe } from './pipes/safe.pipe';
 import { CustomDatePipe } from './pipes/custom-date.pipe';
+import { DateComponent } from './components/common/input/date/date.component';
+import { ISODateAdapter } from './utils/ngb-date-adapter';
+import { LocalizedDateParserFormatter } from './utils/ngb-date-parser-formatter';
 
 import localeFr from '@angular/common/locales/fr';
 import localeNl from '@angular/common/locales/nl';
@@ -106,7 +108,6 @@ registerLocaleData(localeEnGb)
     SelectComponent,
     CheckComponent,
     SaveViewConfigDialogComponent,
-    DateTimeComponent,
     TagsComponent,
     SortableDirective,
     SavedViewWidgetComponent,
@@ -122,7 +123,8 @@ registerLocaleData(localeEnGb)
     SelectDialogComponent,
     NumberComponent,
     SafePipe,
-    CustomDatePipe
+    CustomDatePipe,
+    DateComponent
   ],
   imports: [
     BrowserModule,
@@ -144,7 +146,9 @@ registerLocaleData(localeEnGb)
       multi: true
     },
     FilterPipe,
-    DocumentTitlePipe
+    DocumentTitlePipe,
+    {provide: NgbDateAdapter, useClass: ISODateAdapter},
+    {provide: NgbDateParserFormatter, useClass: LocalizedDateParserFormatter}
   ],
   bootstrap: [AppComponent]
 })
diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.html b/src-ui/src/app/components/common/input/date-time/date-time.component.html
deleted file mode 100644
index 7c002db1b..000000000
--- a/src-ui/src/app/components/common/input/date-time/date-time.component.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="form-row">
-  <div class="form-group col">
-      <label for="created_date">{{titleDate}}</label>
-      <input type="date" class="form-control" id="created_date" [(ngModel)]="dateValue" (change)="dateOrTimeChanged()">
-  </div>
-  <div class="form-group col" *ngIf="titleTime">
-      <label for="created_time">{{titleTime}}</label>
-      <input type="time" class="form-control" id="created_time" [(ngModel)]="timeValue" (change)="dateOrTimeChanged()">
-  </div>
-</div>
-
-
-<!-- <small *ngIf="hint" class="form-text text-muted">{{hint}}</small> -->
\ No newline at end of file
diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.ts b/src-ui/src/app/components/common/input/date-time/date-time.component.ts
deleted file mode 100644
index bce208ec8..000000000
--- a/src-ui/src/app/components/common/input/date-time/date-time.component.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { formatDate } from '@angular/common';
-import { Component, forwardRef, Input, OnInit } from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-
-@Component({
-  providers: [{
-    provide: NG_VALUE_ACCESSOR,
-    useExisting: forwardRef(() => DateTimeComponent),
-    multi: true
-  }],
-  selector: 'app-input-date-time',
-  templateUrl: './date-time.component.html',
-  styleUrls: ['./date-time.component.scss']
-})
-export class DateTimeComponent implements OnInit,ControlValueAccessor  {
-
-  constructor() {
-  }
-
-  onChange = (newValue: any) => {};
-  
-  onTouched = () => {};
-
-  writeValue(newValue: any): void {
-    this.dateValue = formatDate(newValue, 'yyyy-MM-dd', "en-US")
-    this.timeValue = formatDate(newValue, 'HH:mm:ss', 'en-US')
-  }
-  registerOnChange(fn: any): void {
-    this.onChange = fn;
-  }
-  registerOnTouched(fn: any): void {
-    this.onTouched = fn;
-  }
-  setDisabledState?(isDisabled: boolean): void {
-    this.disabled = isDisabled;
-  }
-
-  @Input()
-  titleDate: string = "Date"
-
-  @Input()
-  titleTime: string
-
-  @Input()
-  disabled: boolean = false
-
-  @Input()
-  hint: string
-
-  timeValue
-
-  dateValue
-
-  ngOnInit(): void {
-  }
-
-  dateOrTimeChanged() {
-    this.onChange(formatDate(this.dateValue + "T" + this.timeValue,"yyyy-MM-ddTHH:mm:ssZZZZZ", "en-us", "UTC"))
-  }
-
-}
diff --git a/src-ui/src/app/components/common/input/date/date.component.html b/src-ui/src/app/components/common/input/date/date.component.html
new file mode 100644
index 000000000..ca9ccc040
--- /dev/null
+++ b/src-ui/src/app/components/common/input/date/date.component.html
@@ -0,0 +1,15 @@
+<div class="form-group">
+  <label [for]="inputId">{{title}}</label>
+  <div class="input-group">
+    <input [class.is-invalid]="error" class="form-control" [placeholder]="placeholder" [id]="inputId" (dateSelect)="onChange(value)" (change)="onChange(value)"
+           name="dp" [(ngModel)]="value" ngbDatepicker #datePicker="ngbDatepicker" #datePickerContent="ngModel">
+    <div class="input-group-append">
+      <button class="btn btn-outline-secondary calendar" (click)="datePicker.toggle()" type="button">
+        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-calendar" viewBox="0 0 16 16">
+          <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>
+      </button>
+    </div>
+    <div class="invalid-feedback" *ngIf="error" i18n>Invalid date.</div>
+  </div>
+</div>
diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.scss b/src-ui/src/app/components/common/input/date/date.component.scss
similarity index 100%
rename from src-ui/src/app/components/common/input/date-time/date-time.component.scss
rename to src-ui/src/app/components/common/input/date/date.component.scss
diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts b/src-ui/src/app/components/common/input/date/date.component.spec.ts
similarity index 55%
rename from src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts
rename to src-ui/src/app/components/common/input/date/date.component.spec.ts
index 0657768bd..ea92c7b30 100644
--- a/src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts
+++ b/src-ui/src/app/components/common/input/date/date.component.spec.ts
@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { DateTimeComponent } from './date-time.component';
+import { DateComponent } from './date.component';
 
-describe('DateTimeComponent', () => {
-  let component: DateTimeComponent;
-  let fixture: ComponentFixture<DateTimeComponent>;
+describe('DateComponent', () => {
+  let component: DateComponent;
+  let fixture: ComponentFixture<DateComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ DateTimeComponent ]
+      declarations: [ DateComponent ]
     })
     .compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(DateTimeComponent);
+    fixture = TestBed.createComponent(DateComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src-ui/src/app/components/common/input/date/date.component.ts b/src-ui/src/app/components/common/input/date/date.component.ts
new file mode 100644
index 000000000..b3b863581
--- /dev/null
+++ b/src-ui/src/app/components/common/input/date/date.component.ts
@@ -0,0 +1,32 @@
+import { Component, forwardRef, Input, OnInit, ViewChild } from '@angular/core';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { NgbDateAdapter, NgbDateParserFormatter, NgbDatepickerContent } from '@ng-bootstrap/ng-bootstrap';
+import { SettingsService } from 'src/app/services/settings.service';
+import { v4 as uuidv4 } from 'uuid';
+import { AbstractInputComponent } from '../abstract-input';
+
+
+@Component({
+  providers: [{
+    provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => DateComponent),
+    multi: true
+  }],
+  selector: 'app-input-date',
+  templateUrl: './date.component.html',
+  styleUrls: ['./date.component.scss']
+})
+export class DateComponent extends AbstractInputComponent<string> implements OnInit {
+
+  constructor(private settings: SettingsService) {
+    super()
+  }
+
+  ngOnInit(): void {
+    super.ngOnInit()
+    this.placeholder = this.settings.getLocalizedDateInputFormat()
+  }
+
+  placeholder: string
+
+}
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 2814a1242..f9b87aee3 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -58,7 +58,7 @@
 
                         <app-input-text #inputTitle i18n-title title="Title" formControlName="title" [error]="error?.title"></app-input-text>
                         <app-input-number i18n-title title="Archive serial number" [error]="error?.archive_serial_number" formControlName='archive_serial_number'></app-input-number>
-                        <app-input-date-time i18n-titleDate titleDate="Date created" formControlName="created"></app-input-date-time>
+                        <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>
                         <app-input-select [items]="documentTypes" i18n-title title="Document type" formControlName="document_type" [allowNull]="true"
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 15cfb8a19..4ae4d9513 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -88,14 +88,15 @@ export class SettingsComponent implements OnInit {
   }
 
   get displayLanguageOptions(): LanguageOption[] {
-    return [{code: "", name: $localize`Use system language`}].concat(this.settings.getLanguageOptions())
+    return [
+      {code: "", name: $localize`Use system language`}
+    ].concat(this.settings.getLanguageOptions())
   }
 
   get dateLocaleOptions(): LanguageOption[] {
     return [
-      {code: "", name: $localize`Use date format of display language`},
-      {code: "iso-8601", name: $localize`ISO 8601`}
-    ].concat(this.settings.getLanguageOptions())
+      {code: "", name: $localize`Use date format of display language`}
+    ].concat(this.settings.getDateLocaleOptions())
   }
 
   get today() {
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index 393417e31..fca9262ab 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -1,5 +1,5 @@
 import { DOCUMENT } from '@angular/common';
-import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core';
+import { Inject, Injectable, LOCALE_ID, Renderer2, RendererFactory2 } from '@angular/core';
 import { Meta } from '@angular/platform-browser';
 import { CookieService } from 'ngx-cookie-service';
 
@@ -10,9 +10,14 @@ export interface PaperlessSettings {
 }
 
 export interface LanguageOption {
-  code: string,
-  name: string,
+  code: string
+  name: string
   englishName?: string
+
+  /**
+   * A date format string for use by the date selectors. MUST contain 'yyyy', 'mm' and 'dd'.
+   */
+  dateInputFormat?: string
 }
 
 export const SETTINGS_KEYS = {
@@ -56,7 +61,8 @@ export class SettingsService {
     private rendererFactory: RendererFactory2,
     @Inject(DOCUMENT) private document,
     private cookieService: CookieService,
-    private meta: Meta
+    private meta: Meta,
+    @Inject(LOCALE_ID) private localeId: string
   ) {
     this.renderer = rendererFactory.createRenderer(null, null);
 
@@ -79,15 +85,20 @@ export class SettingsService {
 
   getLanguageOptions(): LanguageOption[] {
     return [
-      {code: "en-us", name: $localize`English (US)`, englishName: "English (US)"},
-      {code: "en-gb", name: $localize`English (GB)`, englishName: "English (GB)"},
-      {code: "de", name: $localize`German`, englishName: "German"},
-      {code: "nl", name: $localize`Dutch`, englishName: "Dutch"},
-      {code: "fr", name: $localize`French`, englishName: "French"},
-      {code: "pt-br", name: $localize`Portuguese (Brazil)`, englishName: "Portuguese (Brazil)"}
+      {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: "pt-br", name: $localize`Portuguese (Brazil)`, englishName: "Portuguese (Brazil)", dateInputFormat: "dd/mm/yyyy"}
     ]
   }
 
+  getDateLocaleOptions(): LanguageOption[] {
+    let isoOption: LanguageOption = {code: "iso-8601", name: $localize`ISO 8601`, dateInputFormat: "yyyy-mm-dd"}
+    return [isoOption].concat(this.getLanguageOptions())
+  }
+
   private getLanguageCookieName() {
     let prefix = ""
     if (this.meta.getTag('name=cookie_prefix')) {
@@ -108,6 +119,11 @@ export class SettingsService {
     }
   }
 
+  getLocalizedDateInputFormat(): string {
+    let dateLocale = this.get(SETTINGS_KEYS.DATE_LOCALE) || this.getLanguage() || this.localeId.toLowerCase()
+    return this.getDateLocaleOptions().find(o => o.code == dateLocale)?.dateInputFormat || "yyyy-mm-dd"
+  }
+
   get(key: string): any {
     let setting = SETTINGS.find(s => s.key == key)
 
diff --git a/src-ui/src/app/utils/ngb-date-adapter.ts b/src-ui/src/app/utils/ngb-date-adapter.ts
new file mode 100644
index 000000000..19711319d
--- /dev/null
+++ b/src-ui/src/app/utils/ngb-date-adapter.ts
@@ -0,0 +1,23 @@
+import { Injectable } from "@angular/core";
+import { NgbDateAdapter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap";
+
+@Injectable()
+export class ISODateAdapter extends NgbDateAdapter<string> {
+
+  fromModel(value: string | null): NgbDateStruct | null {
+    if (value) {
+      let date = new Date(value)
+      return {
+        day : date.getDate(),
+        month : date.getMonth() + 1,
+        year : date.getFullYear()
+      }
+    } else {
+      return null
+    }
+  }
+
+  toModel(date: NgbDateStruct | null): string | null {
+    return date ? new Date(date.year, date.month - 1, date.day).toISOString() : null
+  }
+}
diff --git a/src-ui/src/app/utils/ngb-date-parser-formatter.ts b/src-ui/src/app/utils/ngb-date-parser-formatter.ts
new file mode 100644
index 000000000..7d819a6bf
--- /dev/null
+++ b/src-ui/src/app/utils/ngb-date-parser-formatter.ts
@@ -0,0 +1,59 @@
+import { Injectable } from "@angular/core"
+import { NgbDateParserFormatter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap"
+import { SettingsService } from "../services/settings.service"
+
+@Injectable()
+export class LocalizedDateParserFormatter extends NgbDateParserFormatter {
+
+  constructor(private settings: SettingsService) {
+    super()
+  }
+
+  private getDateInputFormat() {
+    return this.settings.getLocalizedDateInputFormat()
+  }
+
+  /**
+   * This constructs a regular expression from a date input format which is then
+   * used to parse dates.
+   */
+  private getDateParseRegex() {
+    return new RegExp(
+      "^" + this.getDateInputFormat()
+      .replace('dd', '(?<day>[0-9]+)')
+      .replace('mm', '(?<month>[0-9]+)')
+      .replace('yyyy', '(?<year>[0-9]+)')
+      .split('.').join('\\.\\s*') + "$" // allow whitespace(s) after dot (specific for German)
+      )
+  }
+
+  parse(value: string): NgbDateStruct | null {
+    let match = this.getDateParseRegex().exec(value)
+    if (match) {
+      let dateStruct = {
+        day: +match.groups.day,
+        month: +match.groups.month,
+        year: +match.groups.year
+      }
+      if (dateStruct.year <= (new Date().getFullYear() - 2000)) {
+        dateStruct.year += 2000
+      } else if (dateStruct.year < 100) {
+        dateStruct.year += 1900
+      }
+      return dateStruct
+    } else {
+      return null
+    }
+  }
+
+  format(date: NgbDateStruct | null): string {
+    if (date) {
+      return this.getDateInputFormat()
+      .replace('dd', date.day.toString().padStart(2, '0'))
+      .replace('mm', date.month.toString().padStart(2, '0'))
+      .replace('yyyy', date.year.toString().padStart(4, '0'))
+    } else {
+      return null
+    }
+  }
+}
\ No newline at end of file

From 96b8d35a000f0b1ebb32dbe045fbcc969704520c Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 18:00:35 +0100
Subject: [PATCH 1283/1300] update dependencies

---
 src-ui/package-lock.json | 6 +++---
 src-ui/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json
index 148bc72eb..fd6d69538 100644
--- a/src-ui/package-lock.json
+++ b/src-ui/package-lock.json
@@ -2055,9 +2055,9 @@
       }
     },
     "@ng-bootstrap/ng-bootstrap": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-8.0.0.tgz",
-      "integrity": "sha512-v77Gfd8xHH+exq0WqIqVRlxbUEHdA/2+RUJenUP2IDTQN9E1rWl7O461/kosr+0XPuxPArHQJxhh/WsCYckcNg==",
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-8.0.4.tgz",
+      "integrity": "sha512-EdxTwOPOtlvfnwrglPniulmzdnXdXH3lTGaGAY1HrYRvdtGg6wicRvl+BvwVE/3Qik5NPkOWMVghUHpv3evIYg==",
       "requires": {
         "tslib": "^2.0.0"
       }
diff --git a/src-ui/package.json b/src-ui/package.json
index d6082c6b9..a4d014284 100644
--- a/src-ui/package.json
+++ b/src-ui/package.json
@@ -20,7 +20,7 @@
     "@angular/platform-browser": "~10.1.5",
     "@angular/platform-browser-dynamic": "~10.1.5",
     "@angular/router": "~10.1.5",
-    "@ng-bootstrap/ng-bootstrap": "^8.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^8.0.4",
     "@ng-select/ng-select": "^5.0.9",
     "bootstrap": "^4.5.0",
     "file-saver": "^2.0.5",

From d2719b530992ad15e0fcdb8ed8015d6358715f68 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 18:08:55 +0100
Subject: [PATCH 1284/1300] added a missing string

---
 src-ui/messages.xlf | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index e1747ba03..d04d5a6f8 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -1598,6 +1598,13 @@
           <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="d6529debfc1613db22d6fa096ebfeb8a85fa739d" datatype="html">
+        <source>Invalid date.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/input/date/date.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="2807800733729323332" datatype="html">
         <source>Yes</source>
         <context-group purpose="location">
@@ -1623,49 +1630,49 @@
         <source>English (US)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6987083569809053351" datatype="html">
         <source>English (GB)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">89</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1858110241312746425" datatype="html">
         <source>German</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3071065188816255493" datatype="html">
         <source>Dutch</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7633754075223722162" datatype="html">
         <source>French</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">92</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">89</context>
+          <context context-type="linenumber">93</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">95</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2119857572761283468" datatype="html">

From fc75e88cb790b5eb48a76b38c59840a1bf7530b1 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 17:10:20 +0000
Subject: [PATCH 1285/1300] Apply translations in de

translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po'
on the 'de' language.
---
 src/locale/de/LC_MESSAGES/django.po | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po
index c031ebc85..0343c5a94 100644
--- a/src/locale/de/LC_MESSAGES/django.po
+++ b/src/locale/de/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-23 13:20+0100\n"
+"POT-Creation-Date: 2021-02-24 16:49+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"
@@ -426,6 +426,10 @@ msgstr "Niederländisch"
 msgid "French"
 msgstr "Französisch"
 
+#: paperless/settings.py:296
+msgid "Portuguese (Brazil)"
+msgstr "Portugiesisch (Brasilien)"
+
 #: paperless/urls.py:118
 msgid "Paperless-ng administration"
 msgstr "Paperless-ng Administration"

From 56204f8497539ca2a04297ddafd7fa1f60bb8bfe Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 17:10:24 +0000
Subject: [PATCH 1286/1300] Translate /src-ui/messages.xlf in de

translation completed for the source file '/src-ui/messages.xlf'
on the 'de' language.
---
 src-ui/src/locale/messages.de.xlf | 48 ++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf
index 6802f8dce..a9762c286 100644
--- a/src-ui/src/locale/messages.de.xlf
+++ b/src-ui/src/locale/messages.de.xlf
@@ -606,7 +606,7 @@
         <target>Benutze Systemsprache</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7729897675462249787">
@@ -614,15 +614,7 @@
         <target>Benutze Datumsformat der Anzeigesprache</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">96</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4912706592792948707">
-        <source>ISO 8601</source>
-        <target>ISO 8601</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -630,7 +622,7 @@
         <target>Fehler beim Speichern der Einstellungen auf dem Server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -1832,6 +1824,14 @@
           <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="d6529debfc1613db22d6fa096ebfeb8a85fa739d">
+        <source>Invalid date.</source>
+        <target>Ungültiges Datum.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/input/date/date.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="2807800733729323332">
         <source>Yes</source>
         <target>Ja</target>
@@ -1861,7 +1861,7 @@
         <target>Englisch (US)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6987083569809053351">
@@ -1869,7 +1869,7 @@
         <target>Englisch (UK)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">89</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
@@ -1877,7 +1877,7 @@
         <target>Deutsch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1885,7 +1885,7 @@
         <target>Niederländisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1893,7 +1893,23 @@
         <target>Französisch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">92</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9184513005098760425">
+        <source>Portuguese (Brazil)</source>
+        <target>Portugiesisch (Brasilien)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">93</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4912706592792948707">
+        <source>ISO 8601</source>
+        <target>ISO 8601</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2119857572761283468">

From 0db14d6f744f3045731996c3b2a42a4362ec7788 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 17:18:07 +0000
Subject: [PATCH 1287/1300] Apply translations in pt_BR

translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po'
on the 'pt_BR' language.
---
 src/locale/pt_BR/LC_MESSAGES/django.po | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/locale/pt_BR/LC_MESSAGES/django.po b/src/locale/pt_BR/LC_MESSAGES/django.po
index e1a74b104..7800b0c88 100644
--- a/src/locale/pt_BR/LC_MESSAGES/django.po
+++ b/src/locale/pt_BR/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-23 13:20+0100\n"
+"POT-Creation-Date: 2021-02-24 16:49+0100\n"
 "PO-Revision-Date: 2021-02-16 18:37+0000\n"
 "Last-Translator: Rodrigo A <rodrigo.avelino@meliuz.com.br>, 2021\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/paperless/teams/115905/pt_BR/)\n"
@@ -425,6 +425,10 @@ msgstr "Holandês"
 msgid "French"
 msgstr "Francês"
 
+#: paperless/settings.py:296
+msgid "Portuguese (Brazil)"
+msgstr "Português (Brasil)"
+
 #: paperless/urls.py:118
 msgid "Paperless-ng administration"
 msgstr "Administração do Paperless-ng"

From bec5365ac9378ac7e8309b48f0be85d84d2cfc33 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 17:18:26 +0000
Subject: [PATCH 1288/1300] Translate /src-ui/messages.xlf in pt_BR

translation completed for the source file '/src-ui/messages.xlf'
on the 'pt_BR' language.
---
 src-ui/src/locale/messages.pt_BR.xlf | 48 ++++++++++++++++++----------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/src-ui/src/locale/messages.pt_BR.xlf b/src-ui/src/locale/messages.pt_BR.xlf
index 0efe12ad0..ff438073d 100644
--- a/src-ui/src/locale/messages.pt_BR.xlf
+++ b/src-ui/src/locale/messages.pt_BR.xlf
@@ -606,7 +606,7 @@
         <target>Usar linguagem do sistema</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7729897675462249787">
@@ -614,15 +614,7 @@
         <target>Usar formato de data da linguagem de exibição</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">96</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4912706592792948707">
-        <source>ISO 8601</source>
-        <target>ISO 8601</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -630,7 +622,7 @@
         <target>Erro ao salvar configurações: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -1832,6 +1824,14 @@
           <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="d6529debfc1613db22d6fa096ebfeb8a85fa739d">
+        <source>Invalid date.</source>
+        <target>Data inválida.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/input/date/date.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="2807800733729323332">
         <source>Yes</source>
         <target>Sim</target>
@@ -1861,7 +1861,7 @@
         <target>Inglês (US)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6987083569809053351">
@@ -1869,7 +1869,7 @@
         <target>Inglês (GB)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">89</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
@@ -1877,7 +1877,7 @@
         <target>Alemão</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1885,7 +1885,7 @@
         <target>Holandês</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1893,7 +1893,23 @@
         <target>Francês</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">92</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9184513005098760425">
+        <source>Portuguese (Brazil)</source>
+        <target>Português (Brasil)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">93</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4912706592792948707">
+        <source>ISO 8601</source>
+        <target>ISO 8601</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2119857572761283468">

From 1896aa7da1fdc417b1b290db52ecfb2c3edd0570 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 18:45:05 +0100
Subject: [PATCH 1289/1300] use new date inputs for the date filter as well

---
 src-ui/src/app/app.module.ts                  |  4 +--
 .../date-dropdown.component.html              | 22 +++++++++++++--
 .../date-dropdown/date-dropdown.component.ts  | 16 +++++++++--
 src-ui/src/app/utils/ngb-iso-date-adapter.ts  | 27 +++++++++++++++++++
 ...dapter.ts => ngb-iso-date-time-adapter.ts} |  2 +-
 5 files changed, 64 insertions(+), 7 deletions(-)
 create mode 100644 src-ui/src/app/utils/ngb-iso-date-adapter.ts
 rename src-ui/src/app/utils/{ngb-date-adapter.ts => ngb-iso-date-time-adapter.ts} (89%)

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 9e0dc56de..46d8df9a1 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -60,7 +60,7 @@ import { NumberComponent } from './components/common/input/number/number.compone
 import { SafePipe } from './pipes/safe.pipe';
 import { CustomDatePipe } from './pipes/custom-date.pipe';
 import { DateComponent } from './components/common/input/date/date.component';
-import { ISODateAdapter } from './utils/ngb-date-adapter';
+import { ISODateTimeAdapter } from './utils/ngb-iso-date-time-adapter';
 import { LocalizedDateParserFormatter } from './utils/ngb-date-parser-formatter';
 
 import localeFr from '@angular/common/locales/fr';
@@ -147,7 +147,7 @@ registerLocaleData(localeEnGb)
     },
     FilterPipe,
     DocumentTitlePipe,
-    {provide: NgbDateAdapter, useClass: ISODateAdapter},
+    {provide: NgbDateAdapter, useClass: ISODateTimeAdapter},
     {provide: NgbDateParserFormatter, useClass: LocalizedDateParserFormatter}
   ],
   bootstrap: [AppComponent]
diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
index b70a04103..ee8e6e6f4 100644
--- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
+++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
@@ -20,8 +20,17 @@
           </div>
 
           <div class="input-group input-group-sm">
-            <input type="date" class="form-control" id="date_after" [(ngModel)]="dateAfter" (change)="onChangeDebounce()">
+            <input class="form-control" [placeholder]="datePlaceHolder" id="dateAfter" (dateSelect)="onChangeDebounce()" (change)="onChangeDebounce()"
+                    [(ngModel)]="dateAfter" ngbDatepicker #dateAfterPicker="ngbDatepicker">
+            <div class="input-group-append">
+              <button class="btn btn-outline-secondary" (click)="dateAfterPicker.toggle()" type="button">
+                <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" class="bi bi-calendar" viewBox="0 0 16 16">
+                  <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>
+              </button>
+            </div>
           </div>
+
         </div>
         <div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
 
@@ -36,8 +45,17 @@
           </div>
 
           <div class="input-group input-group-sm">
-            <input type="date" class="form-control" id="date_before" [(ngModel)]="dateBefore" (change)="onChangeDebounce()">
+            <input class="form-control" [placeholder]="datePlaceHolder" id="dateBefore" (dateSelect)="onChangeDebounce()" (change)="onChangeDebounce()"
+                    [(ngModel)]="dateBefore" ngbDatepicker #dateBeforePicker="ngbDatepicker">
+            <div class="input-group-append">
+              <button class="btn btn-outline-secondary" (click)="dateBeforePicker.toggle()" type="button">
+                <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" class="bi bi-calendar" viewBox="0 0 16 16">
+                  <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>
+              </button>
+            </div>
           </div>
+          
         </div>
     </div>
   </div>
diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
index 27472bdc7..e21b28312 100644
--- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
+++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
@@ -1,7 +1,10 @@
 import { formatDate } from '@angular/common';
 import { Component, EventEmitter, Input, Output, OnInit, OnDestroy } from '@angular/core';
+import { NgbDateAdapter } from '@ng-bootstrap/ng-bootstrap';
 import { Subject, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
+import { debounceTime } from 'rxjs/operators';
+import { SettingsService } from 'src/app/services/settings.service';
+import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter';
 
 export interface DateSelection {
   before?: string
@@ -16,10 +19,17 @@ const LAST_YEAR = 3
 @Component({
   selector: 'app-date-dropdown',
   templateUrl: './date-dropdown.component.html',
-  styleUrls: ['./date-dropdown.component.scss']
+  styleUrls: ['./date-dropdown.component.scss'],
+  providers: [
+    {provide: NgbDateAdapter, useClass: ISODateAdapter},
+  ]
 })
 export class DateDropdownComponent implements OnInit, OnDestroy {
 
+  constructor(settings: SettingsService) {
+    this.datePlaceHolder = settings.getLocalizedDateInputFormat()
+  }
+
   quickFilters = [
     {id: LAST_7_DAYS, name: $localize`Last 7 days`},
     {id: LAST_MONTH, name: $localize`Last month`},
@@ -27,6 +37,8 @@ export class DateDropdownComponent implements OnInit, OnDestroy {
     {id: LAST_YEAR, name: $localize`Last year`}
   ]
 
+  datePlaceHolder: string
+
   @Input()
   dateBefore: string
 
diff --git a/src-ui/src/app/utils/ngb-iso-date-adapter.ts b/src-ui/src/app/utils/ngb-iso-date-adapter.ts
new file mode 100644
index 000000000..e43602a16
--- /dev/null
+++ b/src-ui/src/app/utils/ngb-iso-date-adapter.ts
@@ -0,0 +1,27 @@
+import { Injectable } from "@angular/core";
+import { NgbDateAdapter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap";
+
+@Injectable()
+export class ISODateAdapter extends NgbDateAdapter<string> {
+
+  fromModel(value: string | null): NgbDateStruct | null {
+    if (value) {
+      let date = new Date(value)
+      return {
+        day : date.getDate(),
+        month : date.getMonth() + 1,
+        year : date.getFullYear()
+      }
+    } else {
+      return null
+    }
+  }
+
+  toModel(date: NgbDateStruct | null): string | null {
+    if (date) {
+      return date.year.toString().padStart(4, '0') + "-" + date.month.toString().padStart(2, '0') + "-" + date.day.toString().padStart(2, '0')
+    } else {
+      return null
+    }
+  }
+}
diff --git a/src-ui/src/app/utils/ngb-date-adapter.ts b/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts
similarity index 89%
rename from src-ui/src/app/utils/ngb-date-adapter.ts
rename to src-ui/src/app/utils/ngb-iso-date-time-adapter.ts
index 19711319d..21a97a19a 100644
--- a/src-ui/src/app/utils/ngb-date-adapter.ts
+++ b/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts
@@ -2,7 +2,7 @@ import { Injectable } from "@angular/core";
 import { NgbDateAdapter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap";
 
 @Injectable()
-export class ISODateAdapter extends NgbDateAdapter<string> {
+export class ISODateTimeAdapter extends NgbDateAdapter<string> {
 
   fromModel(value: string | null): NgbDateStruct | null {
     if (value) {

From a5ba14e4464dbbc9e4167c98f644a7a5b34721c2 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 19:03:03 +0100
Subject: [PATCH 1290/1300] version bump

---
 src-ui/src/environments/environment.prod.ts | 2 +-
 src/paperless/version.py                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index d170a0f02..6c97ac1cb 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,7 +2,7 @@ export const environment = {
   production: true,
   apiBaseUrl: "/api/",
   appTitle: "Paperless-ng",
-  version: "1.2.0",
+  version: "1.2.1",
   webSocketHost: window.location.host,
   webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:")
 };
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 09ac5f672..d93cd02b0 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (1, 2, 0)
+__version__ = (1, 2, 1)

From f038bb90bb2c936064f5997bf627997056f7405d Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 19:03:21 +0100
Subject: [PATCH 1291/1300] fixes for #600

---
 src-ui/src/index.html              | 2 +-
 src/documents/templates/index.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/index.html b/src-ui/src/index.html
index 39ecd824c..4308a6b16 100644
--- a/src-ui/src/index.html
+++ b/src-ui/src/index.html
@@ -9,7 +9,7 @@
   <meta name="theme-color" content="#17541f" />
   <link rel="manifest" href="manifest.webmanifest">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-  <link ref="apple-touch-icon" href="apple-touch-icon.png">
+  <link rel="apple-touch-icon" href="apple-touch-icon.png">
 </head>
 <body class="color-scheme-system">
   <app-root></app-root>
diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html
index 285e48d3f..b71aaaeb6 100644
--- a/src/documents/templates/index.html
+++ b/src/documents/templates/index.html
@@ -15,6 +15,7 @@
   <link rel="icon" type="image/x-icon" href="favicon.ico">
   <link rel="manifest" href="{% static webmanifest %}">
 	<link rel="stylesheet" href="{% static styles_css %}">
+	<link rel="apple-touch-icon" href="apple-touch-icon.png">
 </head>
 <body>
   <app-root>{% translate "Paperless-ng is loading..." %}</app-root>

From 6a64bf6fc16e5b806faf1aa5a91866913ecc6051 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 19:05:06 +0100
Subject: [PATCH 1292/1300] changelog

---
 docs/changelog.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b23ca5137..d2ec7ec69 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,17 @@
 Changelog
 *********
 
+paperless-ng 1.2.1
+##################
+
+* Added translation into Portuguese (Brazil).
+
+* The date input fields now respect the currently selected date format.
+
+* Added a fancy icon when adding paperless to the home screen on iOS devices.
+
+* When using regular expression matching, the regular expression is now validated before saving the tag/correspondent/type.
+
 paperless-ng 1.2.0
 ##################
 

From 6ae65e0ab43b90122b0d94871fc912f022693149 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 19:21:15 +0100
Subject: [PATCH 1293/1300] changelog

---
 docs/changelog.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d2ec7ec69..137fa2fd2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,11 +8,11 @@ Changelog
 paperless-ng 1.2.1
 ##################
 
-* Added translation into Portuguese (Brazil).
+* `Rodrigo Avelino <https://github.com/rodavelino>`_ translated Paperless into Portuguese (Brazil).
 
 * The date input fields now respect the currently selected date format.
 
-* Added a fancy icon when adding paperless to the home screen on iOS devices.
+* Added a fancy icon when adding paperless to the home screen on iOS devices. Thanks to `Joel Nordell <https://github.com/joelnordell>`_.
 
 * When using regular expression matching, the regular expression is now validated before saving the tag/correspondent/type.
 

From 8465b8cfca7ca8c36c02047166bd86e50e8feabc Mon Sep 17 00:00:00 2001
From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 19:27:16 +0100
Subject: [PATCH 1294/1300] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 01ac30fa1..b21173ba5 100644
--- a/README.md
+++ b/README.md
@@ -77,9 +77,9 @@ The documentation for Paperless-ng is available on [ReadTheDocs](https://paperle
 
 # Translation
 
-Paperless is currently available in English, German, Dutch, French, and Portuguese. Translation is coordinated at transifex: https://www.transifex.com/paperless/paperless-ng
+Paperless is currently available in English, German, Dutch, French, and Portuguese.
 
-If you want to see paperless in your own language, request that language at transifex and you can start translating after I approve the language.
+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.
 
 # Feature Requests
 

From c22af0a7825fad1db9bc23075e06449a182e63b8 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 18:43:39 +0000
Subject: [PATCH 1295/1300] Apply translations in en_GB

translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po'
on the 'en_GB' language.
---
 src/locale/en_GB/LC_MESSAGES/django.po | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/locale/en_GB/LC_MESSAGES/django.po b/src/locale/en_GB/LC_MESSAGES/django.po
index f0c5b0381..dbdd4b2a5 100644
--- a/src/locale/en_GB/LC_MESSAGES/django.po
+++ b/src/locale/en_GB/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-16 14:52+0100\n"
+"POT-Creation-Date: 2021-02-24 16:49+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"
@@ -355,7 +355,12 @@ msgstr "filter rule"
 msgid "filter rules"
 msgstr "filter rules"
 
-#: documents/serialisers.py:370
+#: documents/serialisers.py:52
+#, python-format
+msgid "Invalid regular expresssion: %(error)s"
+msgstr "Invalid regular expresssion: %(error)s"
+
+#: documents/serialisers.py:378
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr "File type %(type)s not supported"
@@ -420,7 +425,11 @@ msgstr "Dutch"
 msgid "French"
 msgstr "French"
 
-#: paperless/urls.py:114
+#: paperless/settings.py:296
+msgid "Portuguese (Brazil)"
+msgstr "Portuguese (Brazil)"
+
+#: paperless/urls.py:118
 msgid "Paperless-ng administration"
 msgstr "Paperless-ng administration"
 

From 800f4deb909ee2b661e234743d1fa2fbf1698c87 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 18:43:40 +0000
Subject: [PATCH 1296/1300] Translate /src-ui/messages.xlf in en_GB

translation completed for the source file '/src-ui/messages.xlf'
on the 'en_GB' language.
---
 src-ui/src/locale/messages.en_GB.xlf | 48 ++++++++++++++++++----------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/src-ui/src/locale/messages.en_GB.xlf b/src-ui/src/locale/messages.en_GB.xlf
index f5e711c39..b413a50a1 100644
--- a/src-ui/src/locale/messages.en_GB.xlf
+++ b/src-ui/src/locale/messages.en_GB.xlf
@@ -606,7 +606,7 @@
         <target>Use system language</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7729897675462249787">
@@ -614,15 +614,7 @@
         <target>Use date format of display language</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">96</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4912706592792948707">
-        <source>ISO 8601</source>
-        <target>ISO 8601</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -630,7 +622,7 @@
         <target>Error while storing settings on server: <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -1832,6 +1824,14 @@
           <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="d6529debfc1613db22d6fa096ebfeb8a85fa739d">
+        <source>Invalid date.</source>
+        <target>Invalid date.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/input/date/date.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="2807800733729323332">
         <source>Yes</source>
         <target>Yes</target>
@@ -1861,7 +1861,7 @@
         <target>English (US)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6987083569809053351">
@@ -1869,7 +1869,7 @@
         <target>English (GB)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">89</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
@@ -1877,7 +1877,7 @@
         <target>German</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1885,7 +1885,7 @@
         <target>Dutch</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1893,7 +1893,23 @@
         <target>French</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">92</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9184513005098760425">
+        <source>Portuguese (Brazil)</source>
+        <target>Portuguese (Brazil)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">93</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4912706592792948707">
+        <source>ISO 8601</source>
+        <target>ISO 8601</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2119857572761283468">

From 2f2b5b90ea0812e3d9212169f4847b53b93b5f2e Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 17 Jan 2021 19:46:44 +0100
Subject: [PATCH 1297/1300] Dark mode compatibility

---
 src-ui/src/theme_dark.scss | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index 4e850f017..751ff2b15 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -246,6 +246,16 @@ $border-color-dark-mode: #47494f;
     }
   }
 
+  .btn-light:not(:disabled):not(.disabled) {
+    background-color: $bg-dark-mode;
+    color: $text-color-dark-mode-accent;
+
+    &:hover {
+      background-color: $text-color-dark-mode;
+      color: $bg-dark-mode;
+    }
+  }
+
   .btn-link:not(:disabled):not(.disabled) {
     color: $primary-dark-mode;
   }
@@ -366,6 +376,12 @@ $border-color-dark-mode: #47494f;
   .progress-bar.bg-primary {
     background-color: darken($primary-dark-mode, 5%) !important;
   }
+
+  .ngb-dp-header,
+  .ngb-dp-weekdays,
+  .ngb-dp-month {
+    background-color: $bg-light-dark-mode;
+  }
 }
 
 body.color-scheme-dark {

From e43ab23a45e7065f8cb29417445ba00c5e33cfbd Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 19:29:33 +0000
Subject: [PATCH 1298/1300] Apply translations in fr

translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po'
on the 'fr' language.
---
 src/locale/fr/LC_MESSAGES/django.po | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po
index 6acd81649..3b4fbce3f 100644
--- a/src/locale/fr/LC_MESSAGES/django.po
+++ b/src/locale/fr/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-23 13:20+0100\n"
+"POT-Creation-Date: 2021-02-24 16:49+0100\n"
 "PO-Revision-Date: 2021-02-16 18:37+0000\n"
 "Last-Translator: Philmo67, 2021\n"
 "Language-Team: French (https://www.transifex.com/paperless/teams/115905/fr/)\n"
@@ -428,6 +428,10 @@ msgstr "Néerlandais"
 msgid "French"
 msgstr "Français"
 
+#: paperless/settings.py:296
+msgid "Portuguese (Brazil)"
+msgstr "Portugais (Brésil)"
+
 #: paperless/urls.py:118
 msgid "Paperless-ng administration"
 msgstr "Administration de Paperless-ng"

From d6cbea97f9b5993f12b1d1ea02fc99ca3a811587 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 19:30:01 +0000
Subject: [PATCH 1299/1300] Translate /src-ui/messages.xlf in fr

translation completed for the source file '/src-ui/messages.xlf'
on the 'fr' language.
---
 src-ui/src/locale/messages.fr.xlf | 50 ++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf
index 79045b3b4..05b9fdab7 100644
--- a/src-ui/src/locale/messages.fr.xlf
+++ b/src-ui/src/locale/messages.fr.xlf
@@ -606,7 +606,7 @@
         <target>Utiliser la langue du système</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7729897675462249787">
@@ -614,15 +614,7 @@
         <target>Utiliser le format de date de la langue d'affichage</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">96</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit datatype="html" id="4912706592792948707">
-        <source>ISO 8601</source>
-        <target>ISO 8601</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="8488620293789898901">
@@ -630,7 +622,7 @@
         <target>Une erreur s'est produite lors de l'enregistrement des paramètres sur le serveur : <x equiv-text="JSON.stringify(error.error)" id="PH"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="121cc5391cd2a5115bc2b3160379ee5b36cd7716">
@@ -819,7 +811,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="8680abbea249ebe9c2fe35556559c8e1a9eb5841">
         <source>Document processing</source>
-        <target>Traitement de document</target>
+        <target>Traitement de documents</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">118</context>
@@ -1832,6 +1824,14 @@
           <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="d6529debfc1613db22d6fa096ebfeb8a85fa739d">
+        <source>Invalid date.</source>
+        <target>Date incorrecte.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/input/date/date.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="2807800733729323332">
         <source>Yes</source>
         <target>Oui</target>
@@ -1861,7 +1861,7 @@
         <target>Anglais (US)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="6987083569809053351">
@@ -1869,7 +1869,7 @@
         <target>Anglais (GB)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">89</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="1858110241312746425">
@@ -1877,7 +1877,7 @@
         <target>Allemand</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="3071065188816255493">
@@ -1885,7 +1885,7 @@
         <target>Néerlandais</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="7633754075223722162">
@@ -1893,7 +1893,23 @@
         <target>Français</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">92</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="9184513005098760425">
+        <source>Portuguese (Brazil)</source>
+        <target>Portugais (Brésil)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">93</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4912706592792948707">
+        <source>ISO 8601</source>
+        <target>ISO 8601</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="2119857572761283468">

From 3d3300ac32b52b7f9d5733525c9b6cd39db1ac89 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Wed, 24 Feb 2021 22:27:43 +0100
Subject: [PATCH 1300/1300] add versioning support to the API

---
 src-ui/src/app/app.module.ts                  |  5 ++++
 .../api-version.interceptor.spec.ts           | 16 ++++++++++++
 .../interceptors/api-version.interceptor.ts   | 25 +++++++++++++++++++
 src-ui/src/app/services/auth.interceptor.ts   |  0
 src-ui/src/environments/environment.prod.ts   |  1 +
 src-ui/src/environments/environment.ts        |  1 +
 src/paperless/settings.py                     |  7 ++++--
 7 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 src-ui/src/app/interceptors/api-version.interceptor.spec.ts
 create mode 100644 src-ui/src/app/interceptors/api-version.interceptor.ts
 delete mode 100644 src-ui/src/app/services/auth.interceptor.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 46d8df9a1..0cc42292b 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -62,6 +62,7 @@ import { CustomDatePipe } from './pipes/custom-date.pipe';
 import { DateComponent } from './components/common/input/date/date.component';
 import { ISODateTimeAdapter } from './utils/ngb-iso-date-time-adapter';
 import { LocalizedDateParserFormatter } from './utils/ngb-date-parser-formatter';
+import { ApiVersionInterceptor } from './interceptors/api-version.interceptor';
 
 import localeFr from '@angular/common/locales/fr';
 import localeNl from '@angular/common/locales/nl';
@@ -144,6 +145,10 @@ registerLocaleData(localeEnGb)
       provide: HTTP_INTERCEPTORS,
       useClass: CsrfInterceptor,
       multi: true
+    },{
+      provide: HTTP_INTERCEPTORS,
+      useClass: ApiVersionInterceptor,
+      multi: true
     },
     FilterPipe,
     DocumentTitlePipe,
diff --git a/src-ui/src/app/interceptors/api-version.interceptor.spec.ts b/src-ui/src/app/interceptors/api-version.interceptor.spec.ts
new file mode 100644
index 000000000..7ad51f687
--- /dev/null
+++ b/src-ui/src/app/interceptors/api-version.interceptor.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ApiVersionInterceptor } from './api-version.interceptor';
+
+describe('ApiVersionInterceptor', () => {
+  beforeEach(() => TestBed.configureTestingModule({
+    providers: [
+      ApiVersionInterceptor
+      ]
+  }));
+
+  it('should be created', () => {
+    const interceptor: ApiVersionInterceptor = TestBed.inject(ApiVersionInterceptor);
+    expect(interceptor).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/interceptors/api-version.interceptor.ts b/src-ui/src/app/interceptors/api-version.interceptor.ts
new file mode 100644
index 000000000..95aa6ef16
--- /dev/null
+++ b/src-ui/src/app/interceptors/api-version.interceptor.ts
@@ -0,0 +1,25 @@
+import { Injectable } from '@angular/core';
+import {
+  HttpRequest,
+  HttpHandler,
+  HttpEvent,
+  HttpInterceptor
+} from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
+
+@Injectable()
+export class ApiVersionInterceptor implements HttpInterceptor {
+
+  constructor() {}
+
+  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
+    request = request.clone({
+        setHeaders: {
+          'Accept': `application/json; version=${environment.apiVersion}`
+        }
+      })
+ 
+    return next.handle(request);
+  }
+}
diff --git a/src-ui/src/app/services/auth.interceptor.ts b/src-ui/src/app/services/auth.interceptor.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 6c97ac1cb..50cf6d954 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -1,6 +1,7 @@
 export const environment = {
   production: true,
   apiBaseUrl: "/api/",
+  apiVersion: "1",
   appTitle: "Paperless-ng",
   version: "1.2.1",
   webSocketHost: window.location.host,
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts
index b2c40e261..b0ac843d5 100644
--- a/src-ui/src/environments/environment.ts
+++ b/src-ui/src/environments/environment.ts
@@ -5,6 +5,7 @@
 export const environment = {
   production: false,
   apiBaseUrl: "http://localhost:8000/api/",
+  apiVersion: "1",
   appTitle: "Paperless-ng",
   version: "DEVELOPMENT",
   webSocketHost: "localhost:8000",
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 4c860351f..48712954c 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -112,7 +112,10 @@ REST_FRAMEWORK = {
         'rest_framework.authentication.BasicAuthentication',
         'rest_framework.authentication.SessionAuthentication',
         'rest_framework.authentication.TokenAuthentication'
-    ]
+    ],
+    'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.AcceptHeaderVersioning',
+    'DEFAULT_VERSION': 'v1',
+    'ALLOWED_VERSIONS': ['1', '2']
 }
 
 if DEBUG:
@@ -142,7 +145,7 @@ ASGI_APPLICATION = "paperless.asgi.application"
 
 STATIC_URL = os.getenv("PAPERLESS_STATIC_URL", "/static/")
 
-# what is this used for?
+# TODO: what is this used for?
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',