Skip to content

Commit 92526c9

Browse files
committed
Merge branch 'develop' of github.com:OS2web/os2web8 into develop
2 parents dd9d44f + 5761b28 commit 92526c9

File tree

118 files changed

+6410
-1047
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+6410
-1047
lines changed

composer.json

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,14 @@
6666
"drupal/core-project-message": "~9.5.1",
6767
"drupal/core-recommended": "~9.5.1",
6868
"drupal/csv_importer": "^1.12",
69-
"drupal/devel": "^4.1",
69+
"drupal/devel": "^5.1",
7070
"drupal/editor_file": "^1.6",
7171
"drupal/entity_clone": "^2.0@beta",
7272
"drupal/fancy_file_delete": "^2.0",
7373
"drupal/file_management": "1.x-dev@dev",
7474
"drupal/flood_control": "^2.2",
7575
"drupal/form_options_attributes": "^1.2",
76+
"drupal/forum_notifications_subscription": "^1.0@alpha",
7677
"drupal/gdpr": "^3.0@alpha",
7778
"drupal/gin": "^3.0",
7879
"drupal/gin_login": "^1.0@RC",
@@ -86,9 +87,11 @@
8687
"drupal/memcache": "^2.2",
8788
"drupal/menu_block": "^1.8",
8889
"drupal/menu_breadcrumb": "^1.16",
90+
"drupal/menu_link_attributes": "^1.3",
8991
"drupal/modules_weight": "^1.9",
9092
"drupal/monitoring": "^1.9",
9193
"drupal/pdf_api": "^2.0",
94+
"drupal/permissions_filter": "^1.3",
9295
"drupal/photoswipe": "^3.1",
9396
"drupal/popular_search_keywords": "^1.0",
9497
"drupal/queue_mail": "^1.4",
@@ -194,7 +197,8 @@
194197
"enable-patching": true,
195198
"patches": {
196199
"drupal/textfield_counter" : {
197-
"Fix scrolltop prevent" : "./patches/textfield_counter-scrolltop-fix.patch"
200+
"Fix scrolltop prevent" : "./patches/textfield_counter-scrolltop-fix.patch",
201+
"fix static call" : "./patches/3272128-9.patch"
198202
},
199203
"drupal/field_group" : {
200204
"HTML5 Validation Prevents Submission in Tabs" : "https://www.drupal.org/files/issues/2019-10-04/field_group-HTML5_validation_prevents_submission_in_tabs-2969051-9.patch"
@@ -224,10 +228,14 @@
224228
"drupal/facets" : {
225229
"Add option to reset other facets on value change" : "https://www.drupal.org/files/issues/2023-01-25/3190289-22-reroll.patch"
226230
},
227-
"drupal/color" : {
228-
"fix color php8 issues " : "./patches/20230320-color-php8.patch"
229-
}
230-
231+
"drupal/forum_notifications_subscription" : {
232+
"Error sending email, subscribe button is not displayed correctly" : "https://www.drupal.org/files/issues/2023-02-22/forum_notifications_subscription.patch",
233+
"Warning on user form submission when no forums or topics subscribed to" : "https://www.drupal.org/files/issues/2023-04-14/prevent-foreach.patch",
234+
"Anonym user subscription prevention": "./patches/forum_notifications_subscription-anonym-user-subscription.diff"
235+
},
236+
"drupal/color" : {
237+
"fix color php8 issues " : "./patches/20230320-color-php8.patch"
238+
}
231239
}
232240
}
233241
}

0 commit comments

Comments
 (0)