Skip to content

Commit e90d8b6

Browse files
committed
Merge branch 'develop'
* develop: Adding email_tfa Updating Drupal core 10.4.3 Updated os2forms package OS-160 os2web_datalookup update OS-143 unused modules cleanup Removing os2core dependency OS-160 os2web_datalookup update OS-160 os2web_nemlogin update OS-160 environment_indicator gin menu styles fix OS-160 Deprecated function fix Updating os2forms OS-143 removed maillog OS-143 removed logging_alerts OS-143 Removing ckeditor_a11ychecker # Conflicts: # composer.lock
2 parents 5beed0e + 7725bd4 commit e90d8b6

File tree

2 files changed

+2677
-5359
lines changed

2 files changed

+2677
-5359
lines changed

composer.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"composer/installers": "^1.9",
8888
"cweagans/composer-patches": "^1.7",
8989
"drupal/bootstrap": "^3.32",
90-
"drupal/ckeditor_a11ychecker": "^3.0",
90+
"drupal/ckeditor": "^1.0",
9191
"drupal/coc_forms_auto_export": "^2.0@alpha",
9292
"drupal/color": "^1.0",
9393
"drupal/core-composer-scaffold": "^10",
@@ -98,7 +98,6 @@
9898
"drupal/entity_export_csv": "^2.0@beta",
9999
"drupal/fontyourface": "^4.0",
100100
"drupal/ldap": "^4.2",
101-
"drupal/maillog": "^1.0",
102101
"drupal/menu_link_attributes": "^1.3",
103102
"drupal/permissions_by_term": "^3.1",
104103
"drupal/queue_mail": "^1.3",
@@ -115,8 +114,7 @@
115114
"drupal/webform_views": "^5.0@alpha",
116115
"drush/drush": "^12",
117116
"mglaman/composer-drupal-lenient": "^1.0",
118-
"os2core/os2core": "^3.0",
119-
"os2forms/os2forms": "^3.16.0",
117+
"os2forms/os2forms": "^3.21.2",
120118
"os2forms/os2forms_egbolig": "dev-master",
121119
"os2forms/os2forms_forloeb_profile": "dev-f/d10_readiness",
122120
"os2forms/os2forms_sync": "^1.1",
@@ -148,7 +146,8 @@
148146
"drupal/core-composer-scaffold": true,
149147
"drupal/core-project-message": true,
150148
"drupal/core-vendor-hardening": true,
151-
"mglaman/composer-drupal-lenient": true
149+
"mglaman/composer-drupal-lenient": true,
150+
"simplesamlphp/composer-xmlprovider-installer": true
152151
}
153152
},
154153
"autoload": {
@@ -218,6 +217,12 @@
218217
"drupal/webform": {
219218
"3458611 Removing the polyfill-fastly.io library of webform.libraries.yml": "https://www.drupal.org/files/issues/2024-07-02/3458611-removing-the-polyfill-io.patch",
220219
"3415445 - Search Chinese in /admin/structure/webform cause error: Illegal mix of collations": "https://www.drupal.org/files/issues/2024-02-26/3415445-cant-load-non-english_0.patch"
220+
},
221+
"drupal/user_default_page": {
222+
"3351887 - Deprecated function: strpos(): Passing null to parameter #1 ($haystack) of type string is deprecated in user_default_page_user_login()": "https://www.drupal.org/files/issues/2023-04-19/added_condition_to_check_null-3351887-1.patch"
223+
},
224+
"drupal/environment_indicator": {
225+
"3336512 - Gin Compatibility: Account for \"open\" vertical toolbar": "https://git.drupalcode.org/project/environment_indicator/-/merge_requests/15.diff"
221226
}
222227
},
223228
"drupal-lenient": {

0 commit comments

Comments
 (0)