Skip to content

Commit 053d525

Browse files
committed
Merge branch 'develop'
* develop: Drupal 10.4.9 update Updating os2forms_sync 1.3.0 OS-224 Drupal core 10.4.8 OS-223 updating email_tfa 2.0.6 OS-216 updating coc_forms_auto_export 3.0.0-alpha1, dependency updates Updating os2forms_forloeb_profile 1.16 OS-209 switching os2forms_sync repo location OS-198 removing modules
2 parents ed99717 + 814dab5 commit 053d525

File tree

3 files changed

+1184
-896
lines changed

3 files changed

+1184
-896
lines changed

composer.json

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,6 @@
2727
}
2828
}
2929
},
30-
{
31-
"type": "package",
32-
"package": {
33-
"name": "drupal/webform_permissions_by_term",
34-
"version": "1.2.0",
35-
"dist": {
36-
"type": "zip",
37-
"url": "https://ftp.drupal.org/files/projects/webform_permissions_by_term-8.x-1.2.zip",
38-
"reference": "8.x-1.2",
39-
"shasum": "eabcfdbbbc850986fdd0d8b3a26cad8d6b5d675e"
40-
},
41-
"require": {
42-
"drupal/core": "~8.0 || ^9.0",
43-
"drupal/permissions_by_term": "*"
44-
},
45-
"type": "drupal-module"
46-
}
47-
},
4830
{
4931
"type": "package",
5032
"package": {
@@ -88,11 +70,10 @@
8870
"cweagans/composer-patches": "^1.7",
8971
"drupal/bootstrap": "^3.32",
9072
"drupal/ckeditor": "^1.0",
91-
"drupal/coc_forms_auto_export": "^2.0@alpha",
9273
"drupal/color": "^1.0",
93-
"drupal/core-composer-scaffold": "^10",
94-
"drupal/core-project-message": "^10",
95-
"drupal/core-recommended": "^10",
74+
"drupal/core-composer-scaffold": "10.4.9",
75+
"drupal/core-project-message": "10.4.9",
76+
"drupal/core-recommended": "10.4.9",
9677
"drupal/core-vendor-hardening": "^9.4",
9778
"drupal/email_tfa": "^2.0",
9879
"drupal/entity_export_csv": "^2.0@beta",
@@ -116,8 +97,8 @@
11697
"mglaman/composer-drupal-lenient": "^1.0",
11798
"os2forms/os2forms": "^4.0",
11899
"os2forms/os2forms_egbolig": "dev-master",
119-
"os2forms/os2forms_forloeb_profile": "dev-f/d10_readiness",
120-
"os2forms/os2forms_sync": "^1.1",
100+
"os2forms/os2forms_forloeb_profile": "^1",
101+
"os2forms/os2forms_sync": "^1.2",
121102
"os2web/os2web_logging": "dev-master",
122103
"simplesamlphp/simplesamlphp": "^2.0",
123104
"vlucas/phpdotenv": "^5.1",
@@ -206,11 +187,6 @@
206187
"Enabled D9 support": "./patches/webform_embed-d9.patch",
207188
"3170384 - Fixed D9 imcopatibility": "https://www.drupal.org/files/issues/2020-09-11/3170384-2.patch"
208189
},
209-
"drupal/coc_forms_auto_export": {
210-
"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",
211-
"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",
212-
"3259009 - PHP Warnings/Notices on Download Page" : "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/1.diff"
213-
},
214190
"drupal/webform_node_element": {
215191
"3290637 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-05-12/webform_node_element_d10-3290637-11.patch"
216192
},

0 commit comments

Comments
 (0)