[PR #112] [MERGED] sync 1.4 with master #553

New issue

Closed

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

kerem commented

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

Owner

📋 Pull Request Information

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

Base: stable/1.4.x ← Head: master

📝 Commits (7)

311dbef tag docker files with 1.4.2
577c2de improve backup script
b456175 backup-restore improvements
b002f5a improve backup_restore
8256fb1 I love UT! Fix failing tests.
0481721 improve backup_restore
b41ba01 fix failing UT

📊 Changes

9 files changed (+125 additions, -54 deletions)

View changed files

📝 docker/1.4/app.dockerfile (+1 -1)
📝 docker/1.4/worker.dockerfile (+1 -1)
📝 papermerge/core/backup_restore.py (+44 -34)
📝 papermerge/core/management/commands/restore.py (+1 -13)
📝 papermerge/core/models/document.py (+3 -1)
📝 papermerge/core/utils.py (+38 -0)
📝 papermerge/test/data/testdata.tar (+0 -0)
📝 papermerge/test/test_backup_restore.py (+3 -3)
📝 papermerge/test/test_utils.py (+34 -1)

📄 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/112 **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 (7) - [`311dbef`](https://github.com/ciur/papermerge/commit/311dbefb0590b2daa719579d484186d25433da4a) tag docker files with 1.4.2 - [`577c2de`](https://github.com/ciur/papermerge/commit/577c2debb726b83e03ce047e4c1a259f70634b22) improve backup script - [`b456175`](https://github.com/ciur/papermerge/commit/b4561759c63e92862429c6a7e96118cc93d67b2d) backup-restore improvements - [`b002f5a`](https://github.com/ciur/papermerge/commit/b002f5a2b2fbd61420621d9d4e3e74a4fe5889a6) improve backup_restore - [`8256fb1`](https://github.com/ciur/papermerge/commit/8256fb1b8792d067a8ce4a180fe74316be4375c8) I love UT! Fix failing tests. - [`0481721`](https://github.com/ciur/papermerge/commit/04817219d4697fb53e1e251c3ca4dd12d182162e) improve backup_restore - [`b41ba01`](https://github.com/ciur/papermerge/commit/b41ba019c5a6d85757833ed759755dd9e882fadb) fix failing UT ### 📊 Changes **9 files changed** (+125 additions, -54 deletions) <details> <summary>View changed files</summary> 📝 `docker/1.4/app.dockerfile` (+1 -1) 📝 `docker/1.4/worker.dockerfile` (+1 -1) 📝 `papermerge/core/backup_restore.py` (+44 -34) 📝 `papermerge/core/management/commands/restore.py` (+1 -13) 📝 `papermerge/core/models/document.py` (+3 -1) 📝 `papermerge/core/utils.py` (+38 -0) 📝 `papermerge/test/data/testdata.tar` (+0 -0) 📝 `papermerge/test/test_backup_restore.py` (+3 -3) 📝 `papermerge/test/test_utils.py` (+34 -1) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>