[PR #1192] [MERGED] Merge master(fixes) to 2.x #1330

New issue

Closed

opened 2026-02-25 21:37:57 +03:00 by kerem · 0 comments

kerem commented

2026-02-25 21:37:57 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/cypht-org/cypht/pull/1192
Author: @Shadow243
Created: 8/22/2024
Status: ✅ Merged
Merged: 8/23/2024
Merged by: @kroky

Base: 2.x ← Head: merge-master-2-x

📝 Commits (10+)

174d6a2 Like Gmail, warn if you are about to reply to a new contact (and perhaps disclose sensitive data)
0977e5d [FIX] ensure the email address part is the only value captured when allowing the display of external resources from a particular sender
652e144 fix conversion from numeric to string IDs - special_imap_folders cleanup and custom_imap_sources conversion - makes upgrades from 1.x to 2.x seamless regarding sources in combined inbox
bfeb479 [FIX]Site Settings/General/:Warn for Unsaved Changes parameter once set cannot be unset
79fd6ed Update Cypht Docker version
e70db0e Merge pull request #1180 from Shadow243/update-cypht-docker-to-2-2-0
22da66e Merge pull request #1166 from jacob-js/fix-external-res
b7e2ffd Autocrypt messages encrept automatically
bd8a404 Define constant for theme path
bc9177b Merge pull request #1183 from David-Muhasa/encrypt-auto

📊 Changes

19 files changed (+178 additions, -38 deletions)

View changed files

📝 docker/docker-compose.yaml (+1 -1)
📝 index.php (+1 -0)
📝 lib/db.php (+1 -0)
📝 modules/contacts/modules.php (+52 -0)
📝 modules/contacts/setup.php (+8 -1)
📝 modules/contacts/site.js (+2 -3)
📝 modules/core/handler_modules.php (+1 -1)
📝 modules/core/site.js (+9 -1)
📝 modules/pgp/modules.php (+5 -2)
📝 modules/pgp/site.js (+1 -1)
📝 modules/profiles/functions.php (+2 -1)
📝 modules/sievefilters/functions.php (+9 -0)
📝 modules/sievefilters/site.js (+26 -15)
📝 modules/smtp/modules.php (+14 -4)
📝 modules/smtp/setup.php (+2 -1)
📝 modules/smtp/site.js (+39 -2)
📝 modules/themes/modules.php (+1 -1)
📝 tests/selenium/folder_list.py (+3 -3)
📝 tests/selenium/search.py (+1 -1)

📄 Description

According to https://github.com/cypht-org/cypht/pull/1182#issuecomment-2303375344 all fixes should be cherry-picked to 2.x and at the moment all commits missing are fixes. I then merged all to 2.x

_{🔄 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/cypht-org/cypht/pull/1192 **Author:** [@Shadow243](https://github.com/Shadow243) **Created:** 8/22/2024 **Status:** ✅ Merged **Merged:** 8/23/2024 **Merged by:** [@kroky](https://github.com/kroky) **Base:** `2.x` ← **Head:** `merge-master-2-x` --- ### 📝 Commits (10+) - [`174d6a2`](https://github.com/cypht-org/cypht/commit/174d6a2dbb3b2aad17170928cf6e16ce30ee4ac7) Like Gmail, warn if you are about to reply to a new contact (and perhaps disclose sensitive data) - [`0977e5d`](https://github.com/cypht-org/cypht/commit/0977e5d56c27bdffdede07db9a0931cdab2b4068) [FIX] ensure the email address part is the only value captured when allowing the display of external resources from a particular sender - [`652e144`](https://github.com/cypht-org/cypht/commit/652e144fd646b9b41728d6209debab65375441be) fix conversion from numeric to string IDs - special_imap_folders cleanup and custom_imap_sources conversion - makes upgrades from 1.x to 2.x seamless regarding sources in combined inbox - [`bfeb479`](https://github.com/cypht-org/cypht/commit/bfeb479ddbb2ed1c0e357484364533db49ee9f98) [FIX]Site Settings/General/:Warn for Unsaved Changes parameter once set cannot be unset - [`79fd6ed`](https://github.com/cypht-org/cypht/commit/79fd6ed948799358d90bec68ba23b169ca1ed87f) Update Cypht Docker version - [`e70db0e`](https://github.com/cypht-org/cypht/commit/e70db0ee833f27d9e009dc2d0e381f35b8792b8b) Merge pull request #1180 from Shadow243/update-cypht-docker-to-2-2-0 - [`22da66e`](https://github.com/cypht-org/cypht/commit/22da66eafa9d7a227fe401d3e41a5cc88eff8f95) Merge pull request #1166 from jacob-js/fix-external-res - [`b7e2ffd`](https://github.com/cypht-org/cypht/commit/b7e2ffd1ec9ee2aba3c01ccf29948c3b60e473fd) Autocrypt messages encrept automatically - [`bd8a404`](https://github.com/cypht-org/cypht/commit/bd8a40495c4e660707060170f67e80d8035abd93) Define constant for theme path - [`bc9177b`](https://github.com/cypht-org/cypht/commit/bc9177b755b7942bf543a59d7bc42544482e4e7c) Merge pull request #1183 from David-Muhasa/encrypt-auto ### 📊 Changes **19 files changed** (+178 additions, -38 deletions) <details> <summary>View changed files</summary> 📝 `docker/docker-compose.yaml` (+1 -1) 📝 `index.php` (+1 -0) 📝 `lib/db.php` (+1 -0) 📝 `modules/contacts/modules.php` (+52 -0) 📝 `modules/contacts/setup.php` (+8 -1) 📝 `modules/contacts/site.js` (+2 -3) 📝 `modules/core/handler_modules.php` (+1 -1) 📝 `modules/core/site.js` (+9 -1) 📝 `modules/pgp/modules.php` (+5 -2) 📝 `modules/pgp/site.js` (+1 -1) 📝 `modules/profiles/functions.php` (+2 -1) 📝 `modules/sievefilters/functions.php` (+9 -0) 📝 `modules/sievefilters/site.js` (+26 -15) 📝 `modules/smtp/modules.php` (+14 -4) 📝 `modules/smtp/setup.php` (+2 -1) 📝 `modules/smtp/site.js` (+39 -2) 📝 `modules/themes/modules.php` (+1 -1) 📝 `tests/selenium/folder_list.py` (+3 -3) 📝 `tests/selenium/search.py` (+1 -1) </details> ### 📄 Description According to [https://github.com/cypht-org/cypht/pull/1182#issuecomment-2303375344](https://github.com/cypht-org/cypht/pull/1182#issuecomment-2303375344) all fixes should be cherry-picked to 2.x and at the moment all commits missing are fixes. I then merged all to 2.x --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>