Skip to content

Commit 7346ebc

Browse files
committed
Merge branch 'develop' into f/OS-110
* develop: Release 4.1.0 #4232: Normalized composer Updated CHANGELOG Added patch allowing attachments in coc_forms_auto_export Removed old patches Removed old patches Updated composer
2 parents 2482846 + fb058b7 commit 7346ebc

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ before starting to add changes. Use example [placed in the end of the page](#exa
1111

1212
## [Unreleased]
1313

14+
## [4.1.0] 2025-06-03
15+
16+
- [PR-176](https://github.com/OS2Forms/os2forms/pull/176)
17+
- Patches `coc_forms_auto_export` to ensure attachments are added to emails,
18+
cf. [Unable to receive attachments in emails sent](https://www.drupal.org/project/coc_forms_auto_export/issues/3256951)
1419
- [PR-168](https://github.com/OS2Forms/os2forms/pull/168)
1520
Cleaned up code
1621
- [PR-166](https://github.com/OS2Forms/os2forms/pull/166)
@@ -366,7 +371,9 @@ f/OS-115_dawa_address
366371
- Security in case of vulnerabilities.
367372
```
368373

369-
[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.22.2...HEAD
374+
[Unreleased]: https://github.com/OS2Forms/os2forms/compare/4.1.0...HEAD
375+
[4.1.0]: https://github.com/OS2Forms/os2forms/compare/4.0.0...4.1.0
376+
[4.0.0]: https://github.com/OS2Forms/os2forms/compare/3.22.2...4.0.0
370377
[3.22.2]: https://github.com/OS2Forms/os2forms/compare/3.22.1...3.22.2
371378
[3.22.1]: https://github.com/OS2Forms/os2forms/compare/3.22.0...3.22.1
372379
[3.22.0]: https://github.com/OS2Forms/os2forms/compare/3.21.2...3.22.0

composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"drupal/advancedqueue": "^1.0",
1414
"drupal/cache_control_override": "^1.1 || ^2.0",
1515
"drupal/clientside_validation": "^4.0",
16-
"drupal/coc_forms_auto_export": "^2.0@alpha",
16+
"drupal/coc_forms_auto_export": "^3.0@alpha",
1717
"drupal/config_entity_revisions": "2.0.x-dev",
1818
"drupal/diff": "^1.0",
1919
"drupal/embed": "^1.4",
@@ -115,9 +115,7 @@
115115
"enable-patching": true,
116116
"patches": {
117117
"drupal/coc_forms_auto_export": {
118-
"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",
119-
"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",
120-
"3259009 - PHP Warnings/Notices on Download Page": "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/1.diff"
118+
"3256951: - Unable to receive attachments in emails sent": "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/11.diff"
121119
},
122120
"drupal/entity_print": {
123121
"2733781 - Add Export to Word Support": "https://www.drupal.org/files/issues/2019-11-22/2733781-47.patch"

0 commit comments

Comments
 (0)