Skip to content

Commit c360e61

Browse files
authored
Merge pull request #109 from OS2Forms/release/3.15.2
Release/3.15.2
2 parents 2c1ee57 + a12e3aa commit c360e61

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

CHANGELOG.md

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

1212
## [Unreleased]
1313

14+
## [3.15.2] 2024-05-27
15+
16+
- [#108](https://github.com/OS2Forms/os2forms/pull/108)
17+
Patched webform encrypt to suppress warning when data is mixed between
18+
encrypted and not encrypted fields.
19+
1420
## [3.15.1] 2024-05-14
1521

1622
- Added missing return type.
@@ -224,7 +230,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
224230
- Security in case of vulnerabilities.
225231
```
226232

227-
[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.15.1...HEAD
233+
[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.15.2...HEAD
234+
[3.15.2]: https://github.com/OS2Forms/os2forms/compare/3.15.1...3.15.2
228235
[3.15.1]: https://github.com/OS2Forms/os2forms/compare/3.15.0...3.15.1
229236
[3.15.0]: https://github.com/OS2Forms/os2forms/compare/3.14.1...3.15.0
230237
[3.14.1]: https://github.com/OS2Forms/os2forms/compare/3.14.0...3.14.1

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@
116116
"entityQuery reference JOINs should specify target_type (https://www.drupal.org/project/dynamic_entity_reference/issues/3120952#comment-14141038)": "https://www.drupal.org/files/issues/2021-06-22/entityquery-reference-joins-should-specify-target_type-3120952-24.patch"
117117
},
118118
"drupal/webform_encrypt": {
119-
"Ensure data is base64 encoded (https://www.drupal.org/project/webform_encrypt/issues/3399414)": "https://git.drupalcode.org/project/webform_encrypt/-/merge_requests/4.patch"
119+
"Ensure data is base64 encoded (https://www.drupal.org/project/webform_encrypt/issues/3399414)": "https://git.drupalcode.org/project/webform_encrypt/-/merge_requests/4.patch",
120+
"PHP Warning if unserialize fails (https://www.drupal.org/project/webform_encrypt/issues/3292305)": "https://www.drupal.org/files/issues/2022-06-23/unserialize-php-notice.patch"
120121
}
121122
}
122123
},

0 commit comments

Comments
 (0)