From 1ecf1308eade27b87fc6369eeda265792f8740b2 Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Thu, 1 Oct 2026 10:17:19 +0300 Subject: [PATCH 1/5] Synching develop with master changes (#364) --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd3935f..db861be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa ## [Unreleased] +## [6.0.0] 2026-09-30 + - [PR-346](https://github.com/OS2Forms/os2forms/pull/346) Drupal 11 compatibility. - [#355](https://github.com/OS2Forms/os2forms/issues/355) From 675d992e0a2c8f131e167fcdb2a7ef0faf8e920b Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Tue, 6 Oct 2026 15:29:10 +0300 Subject: [PATCH 2/5] Fixing translation setting page (#359) --- CHANGELOG.md | 1 + .../os2forms_webform_maps/os2forms_webform_maps.module | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db861be..c007fac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ before starting to add changes. Use example [placed in the end of the page](#exa Drupal 11 compatibility. - [#355](https://github.com/OS2Forms/os2forms/issues/355) Children select elements warning fix. +- os2forms_webform_maps translation page fix ## [5.1.0] 2026-06-03 diff --git a/modules/os2forms_webform_maps/os2forms_webform_maps.module b/modules/os2forms_webform_maps/os2forms_webform_maps.module index af545a5..a0991a8 100644 --- a/modules/os2forms_webform_maps/os2forms_webform_maps.module +++ b/modules/os2forms_webform_maps/os2forms_webform_maps.module @@ -27,7 +27,13 @@ function os2forms_webform_maps_theme() { function os2forms_webform_maps_locale_translation_projects_alter(&$projects) { $module_handler = \Drupal::service('module_handler'); $path = $module_handler->getModule('os2forms_webform_maps')->getPath(); - $projects['os2forms_webform_maps']['info']['interface translation server pattern'] = $path . '/translations/%language.po'; + $projects['os2forms_webform_maps'] = [ + 'project_type' => 'module', + 'info' => [ + 'name' => 'OS2Forms Webform Maps', + 'interface translation server pattern' => $path . '/translations/%language.po' + ], + ]; } /** From 47a7d478587a539bd3298a2b18f0ba6c666f2394 Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Fri, 9 Oct 2026 12:00:15 +0300 Subject: [PATCH 3/5] OS-320 SBSYS child elements integration (#365) --- CHANGELOG.md | 4 +++- .../Plugin/WebformElement/MitidChildElementBase.php | 2 +- .../WebformElement/NemidChildElementInterface.php | 10 ++++++++++ .../src/Plugin/WebformElement/NemidChildrenRadios.php | 2 +- .../src/Plugin/WebformElement/NemidChildrenSelect.php | 2 +- .../src/Element/WebformAttachmentSbsysXml.php | 4 ++++ .../WebformElement/WebformAttachmentSbsysXml.php | 7 ++++++- 7 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildElementInterface.php diff --git a/CHANGELOG.md b/CHANGELOG.md index c007fac..0ab89d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,13 +11,15 @@ before starting to add changes. Use example [placed in the end of the page](#exa ## [Unreleased] +- Adding children information to Attachment SBSYS +- os2forms_webform_maps translation page fix + ## [6.0.0] 2026-09-30 - [PR-346](https://github.com/OS2Forms/os2forms/pull/346) Drupal 11 compatibility. - [#355](https://github.com/OS2Forms/os2forms/issues/355) Children select elements warning fix. -- os2forms_webform_maps translation page fix ## [5.1.0] 2026-06-03 diff --git a/modules/os2forms_nemid/src/Plugin/WebformElement/MitidChildElementBase.php b/modules/os2forms_nemid/src/Plugin/WebformElement/MitidChildElementBase.php index fbdd7dc..79d78cc 100644 --- a/modules/os2forms_nemid/src/Plugin/WebformElement/MitidChildElementBase.php +++ b/modules/os2forms_nemid/src/Plugin/WebformElement/MitidChildElementBase.php @@ -12,7 +12,7 @@ * @see \Drupal\webform\Plugin\WebformElementInterface * @see \Drupal\webform\Annotation\WebformElement */ -abstract class MitidChildElementBase extends WebformElementBase { +abstract class MitidChildElementBase extends WebformElementBase implements NemidChildElementInterface { /** * {@inheritdoc} diff --git a/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildElementInterface.php b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildElementInterface.php new file mode 100644 index 0000000..967b3c7 --- /dev/null +++ b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildElementInterface.php @@ -0,0 +1,10 @@ + Date: Tue, 20 Oct 2026 09:49:58 +0300 Subject: [PATCH 4/5] Upgrading Gin theme --- CHANGELOG.md | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ab89d0..08cd499 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ before starting to add changes. Use example [placed in the end of the page](#exa - Adding children information to Attachment SBSYS - os2forms_webform_maps translation page fix +- Upgrading Gin theme versions ## [6.0.0] 2026-09-30 diff --git a/composer.json b/composer.json index 00a0560..171c936 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "drupal/entity_print": "^2.1", "drupal/eu_cookie_compliance": "^1.8", "drupal/events_logging": "^2.0@beta", - "drupal/gin": "^3.0-rc", + "drupal/gin": "^4.0 || ^5.0", "drupal/honeypot": "^2.0", "drupal/ldap": "^4.2", "drupal/leaflet": "^10.0", From b8519595e37df6a8173a37b0630aa13d1ea374ec Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Thu, 22 Oct 2026 11:59:45 +0300 Subject: [PATCH 5/5] Preparing 6.1.0 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08cd499..1833f6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa ## [Unreleased] +## [6.1.0] 2026-10-22 + - Adding children information to Attachment SBSYS - os2forms_webform_maps translation page fix - Upgrading Gin theme versions