From 652294ac41f2961871151be309bb5f02fba308cb Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Thu, 15 May 2025 15:41:16 +0200 Subject: [PATCH 1/6] Updated composer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 11ffd68..1a11ebc 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "drupal/advancedqueue": "^1.0", "drupal/cache_control_override": "^1.1|^2.0", "drupal/clientside_validation": "^4.0", - "drupal/coc_forms_auto_export": "^2.0@alpha", + "drupal/coc_forms_auto_export": "^3.0@alpha", "drupal/config_entity_revisions": "dev-2.0.x", "drupal/diff": "^1.0", "drupal/embed": "^1.4", From 8d733cac49cddd1743e69ce69ba52e149e23643a Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Thu, 22 May 2025 11:25:34 +0200 Subject: [PATCH 2/6] Removed old patches --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 1a11ebc..cf5d781 100644 --- a/composer.json +++ b/composer.json @@ -103,8 +103,8 @@ }, "drupal/coc_forms_auto_export": { - "3240592 - Problem with phpseclib requirement in 2.x (https://www.drupal.org/project/coc_forms_auto_export/issues/3240592)": "https://www.drupal.org/files/issues/2021-10-04/requirement-namespace-3240592-1.patch", - "3286562 - Automated Drupal 10 compatibility fixes" : "https://www.drupal.org/files/issues/2022-06-15/coc_forms_auto_export.2.0.x-dev.rector.patch", + "#3240592 - Problem with phpseclib requirement in 2.x (https://www.drupal.org/project/coc_forms_auto_export/issues/3240592)": "https://www.drupal.org/files/issues/2021-10-04/requirement-namespace-3240592-1.patch", + "#3286562 - Automated Drupal 10 compatibility fixes" : "https://www.drupal.org/files/issues/2022-06-15/coc_forms_auto_export.2.0.x-dev.rector.patch", "3259009 - PHP Warnings/Notices on Download Page" : "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/1.diff" }, "drupal/webform_node_element": { From 9d55dba63f79b07bd74b05de0a01eace761b3d78 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Thu, 22 May 2025 11:29:16 +0200 Subject: [PATCH 3/6] Removed old patches --- composer.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/composer.json b/composer.json index cf5d781..b75d8f8 100644 --- a/composer.json +++ b/composer.json @@ -102,11 +102,6 @@ "Add custom hook (hook_webform_post_load_data) for audit logging": "https://gist.githubusercontent.com/cableman/d26898fc8f65ee0a31001bf391583b59/raw/6189dc4c2ceaabb19d25cc4b98b0b3028a6b0e1e/gistfile1.txt" }, - "drupal/coc_forms_auto_export": { - "#3240592 - Problem with phpseclib requirement in 2.x (https://www.drupal.org/project/coc_forms_auto_export/issues/3240592)": "https://www.drupal.org/files/issues/2021-10-04/requirement-namespace-3240592-1.patch", - "#3286562 - Automated Drupal 10 compatibility fixes" : "https://www.drupal.org/files/issues/2022-06-15/coc_forms_auto_export.2.0.x-dev.rector.patch", - "3259009 - PHP Warnings/Notices on Download Page" : "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/1.diff" - }, "drupal/webform_node_element": { "3290637 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-05-12/webform_node_element_d10-3290637-11.patch" }, From 4e8062fb8e159cd6f8b45ad63dec3c35d9411bd5 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Fri, 23 May 2025 11:15:51 +0200 Subject: [PATCH 4/6] Added patch allowing attachments in coc_forms_auto_export --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index b75d8f8..b0208d2 100644 --- a/composer.json +++ b/composer.json @@ -102,6 +102,9 @@ "Add custom hook (hook_webform_post_load_data) for audit logging": "https://gist.githubusercontent.com/cableman/d26898fc8f65ee0a31001bf391583b59/raw/6189dc4c2ceaabb19d25cc4b98b0b3028a6b0e1e/gistfile1.txt" }, + "drupal/coc_forms_auto_export": { + "3256951: - Unable to receive attachments in emails sent" : "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/11.diff" + }, "drupal/webform_node_element": { "3290637 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-05-12/webform_node_element_d10-3290637-11.patch" }, From 059329bc88723d9a20ba3c767c1878c344edc7ee Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Fri, 23 May 2025 13:17:43 +0200 Subject: [PATCH 5/6] Updated CHANGELOG --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7175253..2daa19c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ before starting to add changes. Use example [placed in the end of the page](#exa ## [Unreleased] +- [PR-176](https://github.com/OS2Forms/os2forms/pull/176) + - Patches `coc_forms_auto_export` to ensure attachments are added to emails, + cf. [Unable to receive attachments in emails sent](https://www.drupal.org/project/coc_forms_auto_export/issues/3256951) - [PR-166](https://github.com/OS2Forms/os2forms/pull/166) - Fix digital post commands - Updated versions in GitHub Actions `uses` steps @@ -363,7 +366,8 @@ f/OS-115_dawa_address - Security in case of vulnerabilities. ``` -[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.22.2...HEAD +[Unreleased]: https://github.com/OS2Forms/os2forms/compare/4.0.0...HEAD +[4.0.0]: https://github.com/OS2Forms/os2forms/compare/3.22.2...4.0.0 [3.22.2]: https://github.com/OS2Forms/os2forms/compare/3.22.1...3.22.2 [3.22.1]: https://github.com/OS2Forms/os2forms/compare/3.22.0...3.22.1 [3.22.0]: https://github.com/OS2Forms/os2forms/compare/3.21.2...3.22.0 From e73809ea3e2507db86a9932561b23dd18eb78f32 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Tue, 3 Jun 2025 09:11:02 +0200 Subject: [PATCH 6/6] #4232: Normalized composer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 819e7cb..5f20db3 100644 --- a/composer.json +++ b/composer.json @@ -115,7 +115,7 @@ "enable-patching": true, "patches": { "drupal/coc_forms_auto_export": { - "3256951: - Unable to receive attachments in emails sent" : "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/11.diff" + "3256951: - Unable to receive attachments in emails sent": "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/11.diff" }, "drupal/entity_print": { "2733781 - Add Export to Word Support": "https://www.drupal.org/files/issues/2019-11-22/2733781-47.patch"