Skip to content

Commit d2fb2ab

Browse files
committed
Merge branch 'release/2.1.0' into develop
2 parents b15c593 + bbe75e8 commit d2fb2ab

9 files changed

+742
-797
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret.
55

66
## [Under udvikling]
77

8+
## [2.1.0]
9+
810
* os2forms/os2forms_get_organized (1.1.0)
911
(<https://github.com/itk-dev/os2forms_selvbetjening/pull/177>).
12+
* Opdaterede `itk-dev/os2forms_nemlogin_openid_connect`, `os2forms/os2forms` og
13+
`os2forms/os2forms_get_organized`
14+
(<https://github.com/itk-dev/os2forms_selvbetjening/pull/176>).
1015
* Installerede `os2forms/os2forms_get_organized`
1116
(<https://github.com/itk-dev/os2forms_selvbetjening/pull/174>).
1217
* Opdaterede CVR-elementer og konfiguration af CVR-opslagservice
@@ -28,6 +33,7 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret.
2833
* itk-dev/itkdev-booking (1.0.1)
2934
* Tilføjet language switcher block
3035
* Updated composite element styling
36+
* Added translation block in top
3137

3238
## [2.0.0] 29.03.2023
3339

composer.json

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"itk-dev/os2forms_cvr_lookup": "^1.1",
7272
"itk-dev/os2forms_digital_post": "^1.1",
7373
"itk-dev/os2forms_failed_jobs": "^1.0",
74-
"itk-dev/os2forms_nemlogin_openid_connect": "^1.0",
74+
"itk-dev/os2forms_nemlogin_openid_connect": "^1.2",
7575
"itk-dev/os2forms_user_field_lookup": "^1.0",
7676
"itk-dev/web_accessibility_statement": "^1.0",
7777
"os2forms/os2forms_forloeb_profile": "^1.8",
@@ -99,7 +99,6 @@
9999
"sort-packages": true,
100100
"allow-plugins": {
101101
"simplesamlphp/composer-module-installer": true,
102-
"vaimo/composer-patches": true,
103102
"cweagans/composer-patches": true,
104103
"zaporylie/composer-drupal-optimizations": true,
105104
"composer/installers": true,
@@ -138,11 +137,20 @@
138137
"https://www.drupal.org/project/config_entity_revisions/issues/3260602": "https://www.drupal.org/files/issues/2022-03-15/content_entity_revisions-3260602-07.patch",
139138
"webform_revisions_install called twice during site:install --existing-config": "patches/drupal/config_entity_revisions/webform_revisions.install.patch"
140139
},
141-
"os2forms/os2forms": {
142-
"https://github.com/OS2Forms/os2forms/pull/40": "https://patch-diff.githubusercontent.com/raw/OS2Forms/os2forms/pull/40.diff"
143-
},
144140
"drupal/permissions_by_term": {
145-
"Change check for node form": "patches/drupal/permissions_by_term/changeNodeCheck.patch"
141+
"Change check for node form": "patches/drupal/permissions_by_term/changeNodeCheck.patch",
142+
"https://www.drupal.org/project/permissions_by_term/issues/3354478": "https://git.drupalcode.org/project/permissions_by_term/-/merge_requests/20.patch"
143+
},
144+
"drupal/lang_dropdown": {
145+
"https://www.drupal.org/project/lang_dropdown/issues/3348277": "https://www.drupal.org/files/issues/2023-03-16/lang_dropdown-2-0-0--3348277-16.patch"
146+
}
147+
},
148+
"patches-ignore": {
149+
"//": "@see https://github.com/cweagans/composer-patches/tree/1.x#ignoring-patches",
150+
"os2forms/os2forms_forloeb": {
151+
"drupal/smtp": {
152+
"(This patch does not apply anymore) Duplicated attachments in emails generated by Webform: (https://www.drupal.org/project/smtp/issues/2995290)": "https://www.drupal.org/files/issues/2021-11-02/smtp-2995290-23.patch"
153+
}
146154
}
147155
},
148156
"installer-paths": {

0 commit comments

Comments
 (0)