[PR #110] [MERGED] Sync 1.4.x with master #549

New issue

Closed

opened 2026-02-25 21:32:12 +03:00 by kerem · 0 comments

kerem commented

2026-02-25 21:32:12 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/ciur/papermerge/pull/110
Author: @ciur
Created: 9/6/2020
Status: ✅ Merged
Merged: 9/6/2020
Merged by: @ciur

Base: stable/1.4.x ← Head: master

📝 Commits (10+)

4cf4245 typo
7409d27 Update documentation. Comment out all values in papermerge.conf.py - as
9b52e0e typo
27d73ea performance boost. Less DB hits => better performance for large file
622f13f performance boost
29b2728 Show a meaningful error when user upload unsupported file type.
74e8702 Add Unit Test for random file type uploads
fad1d36 Unit test comments
ccc5535 Refactoring. Use json_response docorator
b6177ab use json_response decorator in core.views.nodes

📊 Changes

88 files changed (+38125 additions, -35587 deletions)

View changed files

📝 CONTRIBUTORS.md (+1 -3)
📝 README.md (+0 -4)
📝 changelog.md (+33 -0)
📝 config/settings/dev.py (+22 -32)
➖ config/templates/etc/gunicorn.conf.py (+0 -8)
➖ config/templates/etc/nginx.conf (+0 -37)
➖ config/templates/etc/papermerge.env (+0 -1)
➖ config/templates/etc/systemd/mg_nginx.service (+0 -8)
➖ config/templates/etc/systemd/papermerge.service (+0 -9)
➖ config/templates/etc/systemd/papermerge.target (+0 -7)
➖ config/templates/etc/systemd/worker.service (+0 -9)
📝 config/wsgi.py (+1 -1)
📝 docs/source/changelog.rst (+39 -0)
📝 docs/source/consumption.rst (+12 -12)
📝 docs/source/setup/index.rst (+1 -1)
📝 docs/source/setup/manual_way.rst (+46 -6)
➕ docs/source/setup/server_configurations.rst (+275 -0)
➖ docs/source/setup/systemd.rst (+0 -96)
📝 papermerge.conf.py.example (+32 -31)
📝 papermerge/__init__.py (+5 -0)

...and 68 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/ciur/papermerge/pull/110 **Author:** [@ciur](https://github.com/ciur) **Created:** 9/6/2020 **Status:** ✅ Merged **Merged:** 9/6/2020 **Merged by:** [@ciur](https://github.com/ciur) **Base:** `stable/1.4.x` ← **Head:** `master` --- ### 📝 Commits (10+) - [`4cf4245`](https://github.com/ciur/papermerge/commit/4cf4245bb1e59aad73e08ae750f3b62ecd21e0ed) typo - [`7409d27`](https://github.com/ciur/papermerge/commit/7409d2742bb2e4bd43bf643b55d08c9a32f36e43) Update documentation. Comment out all values in papermerge.conf.py - as - [`9b52e0e`](https://github.com/ciur/papermerge/commit/9b52e0e5517f7ec22a690d7687d0a59234ffa0c7) typo - [`27d73ea`](https://github.com/ciur/papermerge/commit/27d73ea7c944faa059f977d9209d6171c428812b) performance boost. Less DB hits => better performance for large file - [`622f13f`](https://github.com/ciur/papermerge/commit/622f13fba74d743d325d26f13e4764f272b0f97b) performance boost - [`29b2728`](https://github.com/ciur/papermerge/commit/29b272880ed8b841ae2349c1c8872dc8eb315f18) Show a meaningful error when user upload unsupported file type. - [`74e8702`](https://github.com/ciur/papermerge/commit/74e870270428710e58fd00993a9eb95ba8af9323) Add Unit Test for random file type uploads - [`fad1d36`](https://github.com/ciur/papermerge/commit/fad1d36205b191ed44c0654fbcb1aeb769236e2e) Unit test comments - [`ccc5535`](https://github.com/ciur/papermerge/commit/ccc5535fe965d993f6f8f04e7e0a951f243c279c) Refactoring. Use json_response docorator - [`b6177ab`](https://github.com/ciur/papermerge/commit/b6177abed22316a166bf998967565a0a49c9dc1b) use json_response decorator in core.views.nodes ### 📊 Changes **88 files changed** (+38125 additions, -35587 deletions) <details> <summary>View changed files</summary> 📝 `CONTRIBUTORS.md` (+1 -3) 📝 `README.md` (+0 -4) 📝 `changelog.md` (+33 -0) 📝 `config/settings/dev.py` (+22 -32) ➖ `config/templates/etc/gunicorn.conf.py` (+0 -8) ➖ `config/templates/etc/nginx.conf` (+0 -37) ➖ `config/templates/etc/papermerge.env` (+0 -1) ➖ `config/templates/etc/systemd/mg_nginx.service` (+0 -8) ➖ `config/templates/etc/systemd/papermerge.service` (+0 -9) ➖ `config/templates/etc/systemd/papermerge.target` (+0 -7) ➖ `config/templates/etc/systemd/worker.service` (+0 -9) 📝 `config/wsgi.py` (+1 -1) 📝 `docs/source/changelog.rst` (+39 -0) 📝 `docs/source/consumption.rst` (+12 -12) 📝 `docs/source/setup/index.rst` (+1 -1) 📝 `docs/source/setup/manual_way.rst` (+46 -6) ➕ `docs/source/setup/server_configurations.rst` (+275 -0) ➖ `docs/source/setup/systemd.rst` (+0 -96) 📝 `papermerge.conf.py.example` (+32 -31) 📝 `papermerge/__init__.py` (+5 -0) _...and 68 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>