[PR #95] [MERGED] Keep 1.4.x branch in sync with master (master -> 1.4.x) #548

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/95
Author: @ciur
Created: 8/22/2020
Status: ✅ Merged
Merged: 8/22/2020
Merged by: @ciur

Base: stable/1.4.x ← Head: master

📝 Commits (10+)

7bfa437 pull docker image from tag v1.4.0
ad945a6 Update consumption.rst
d3320c1 Merge pull request #74 from PhyberApex/patch-2
e0fa307 documentation, added a glossary of terms.
a1d9af0 Merge branch 'master' of github.com:ciur/papermerge
a08736b README updated
2237684 replace OCR term with references to OCR term in glossary
ce1f495 change log updated
3257e7b [Performance] Boost browse request performance by 50%.
982e064 typo... I need one UT for this.

📊 Changes

23 files changed (+1735 additions, -92 deletions)

View changed files

📝 README.md (+1 -2)
📝 changelog.md (+8 -0)
📝 docker/1.4/app.dockerfile (+1 -1)
📝 docker/1.4/docker-compose.yml (+2 -2)
📝 docker/1.4/worker.dockerfile (+1 -1)
📝 docs/source/automation.rst (+5 -1)
📝 docs/source/changelog.rst (+11 -3)
📝 docs/source/consumption.rst (+1 -1)
➕ docs/source/developers_guide/img/storage_structure/03.svg (+1036 -0)
📝 docs/source/file_formats.rst (+1 -5)
➕ docs/source/glossary.rst (+53 -0)
➕ docs/source/img/setup/01-active-venv.png (+0 -0)
➕ docs/source/img/setup/02-login-screen.png (+0 -0)
➕ docs/source/img/setup/03-main-browse-view.png (+0 -0)
📝 docs/source/index.rst (+3 -2)
📝 docs/source/requirements.rst (+1 -1)
📝 docs/source/settings.rst (+8 -8)
📝 docs/source/setup/manual_way.rst (+350 -31)
📝 papermerge/core/auth.py (+152 -16)
📝 papermerge/core/models/__init__.py (+15 -0)

...and 3 more files

📄 Description

This will allow to release intermediate releases, like 1.4.1, 1.4.2

_{🔄 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/95 **Author:** [@ciur](https://github.com/ciur) **Created:** 8/22/2020 **Status:** ✅ Merged **Merged:** 8/22/2020 **Merged by:** [@ciur](https://github.com/ciur) **Base:** `stable/1.4.x` ← **Head:** `master` --- ### 📝 Commits (10+) - [`7bfa437`](https://github.com/ciur/papermerge/commit/7bfa4373764814e4c7f69489b14ada05d717b2bf) pull docker image from tag v1.4.0 - [`ad945a6`](https://github.com/ciur/papermerge/commit/ad945a6d99a15451b99602d071846ab760a7f040) Update consumption.rst - [`d3320c1`](https://github.com/ciur/papermerge/commit/d3320c1df38e98b33b2bd46e96d8540cb56cbe1d) Merge pull request #74 from PhyberApex/patch-2 - [`e0fa307`](https://github.com/ciur/papermerge/commit/e0fa307505847c245b9b696fd0623cf05c91f2e0) documentation, added a glossary of terms. - [`a1d9af0`](https://github.com/ciur/papermerge/commit/a1d9af0b4e8ed8a8ce08064cc0bc14f2a7ce858c) Merge branch 'master' of github.com:ciur/papermerge - [`a08736b`](https://github.com/ciur/papermerge/commit/a08736b7c05ed03c43b0ac7ebf75ffc260957ce8) README updated - [`2237684`](https://github.com/ciur/papermerge/commit/2237684f95729f2515eb2b3cf47a50427ec62bcb) replace OCR term with references to OCR term in glossary - [`ce1f495`](https://github.com/ciur/papermerge/commit/ce1f4957931d843272209bcf1787baa8acac5cc3) change log updated - [`3257e7b`](https://github.com/ciur/papermerge/commit/3257e7bbbeb680df4867614ef9087e7027c34113) [Performance] Boost browse request performance by 50%. - [`982e064`](https://github.com/ciur/papermerge/commit/982e0646672846f904b07bf2f367c0955f74c864) typo... I need one UT for this. ### 📊 Changes **23 files changed** (+1735 additions, -92 deletions) <details> <summary>View changed files</summary> 📝 `README.md` (+1 -2) 📝 `changelog.md` (+8 -0) 📝 `docker/1.4/app.dockerfile` (+1 -1) 📝 `docker/1.4/docker-compose.yml` (+2 -2) 📝 `docker/1.4/worker.dockerfile` (+1 -1) 📝 `docs/source/automation.rst` (+5 -1) 📝 `docs/source/changelog.rst` (+11 -3) 📝 `docs/source/consumption.rst` (+1 -1) ➕ `docs/source/developers_guide/img/storage_structure/03.svg` (+1036 -0) 📝 `docs/source/file_formats.rst` (+1 -5) ➕ `docs/source/glossary.rst` (+53 -0) ➕ `docs/source/img/setup/01-active-venv.png` (+0 -0) ➕ `docs/source/img/setup/02-login-screen.png` (+0 -0) ➕ `docs/source/img/setup/03-main-browse-view.png` (+0 -0) 📝 `docs/source/index.rst` (+3 -2) 📝 `docs/source/requirements.rst` (+1 -1) 📝 `docs/source/settings.rst` (+8 -8) 📝 `docs/source/setup/manual_way.rst` (+350 -31) 📝 `papermerge/core/auth.py` (+152 -16) 📝 `papermerge/core/models/__init__.py` (+15 -0) _...and 3 more files_ </details> ### 📄 Description This will allow to release intermediate releases, like 1.4.1, 1.4.2 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>