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 01/11] 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 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 02/11] 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 b463428a408b789b04a8143a541ce434c9e1ea6f Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Fri, 8 Jan 2021 02:15:42 +0100 Subject: [PATCH 03/11] 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= Enable (or disable) the Tika parser. @@ -312,6 +309,40 @@ PAPERLESS_TIKA_GOTENBERG_ENDPOINT= 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 04/11] 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 fad6e7284af285188db58e90b8c0cd1e997aad62 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Fri, 8 Jan 2021 13:27:57 +0100 Subject: [PATCH 05/11] 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 Date: Fri, 8 Jan 2021 13:39:12 +0100 Subject: [PATCH 06/11] 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 07/11] 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 08/11] 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 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 09/11] 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 @@ -  Edit - +  View - +