Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/composer/symfony/routing-6.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@edmund-dunn
edmund-dunn authored Jan 31, 2024
2 parents c707f8d + 6d33bc6 commit 219b4a2
Show file tree
Hide file tree
Showing 6 changed files with 275 additions and 24 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@
"2942404 - Contentinfo landmark" : "https://www.drupal.org/files/issues/2023-06-30/2942404-messages-should-have-role-status.patch",
"3047110 - Add workflow to taxonomy" : "https://www.drupal.org/files/issues/2023-04-14/3047110-45.patch",
"3106205 - Length of menu_tree.url and menu_tree.route_param_key are too short (255 characters)": "https://www.drupal.org/files/issues/2024-01-02/3106205-length-menu-tree-too-short-48.patch",
"3333401 - Pager h4 cause accessibility flag on many pages": "https://www.drupal.org/files/issues/2023-11-01/3333401-64.patch",
"3333401 - Pager h4 cause accessibility flag on many pages": "patches/3333401-configurable-pager-heading-default-h2.patch",
"3382759 - Add multiple workflow content moderation filter to Views.": "https://www.drupal.org/files/issues/2023-08-24/3382759-8.patch",
"3241295 - CKEditor 5 isn't respecting field widgets row settings": "https://www.drupal.org/files/issues/2023-11-14/3241295-d10.1.6-114.patch",
"3376267 - [upstream] Add style to anchor leads to unusable behavior": "https://www.drupal.org/files/issues/2023-08-09/fix_anchor_scheme_to_not_copy_on_enter-3376167-11.patch"
Expand Down
47 changes: 27 additions & 20 deletions composer.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "1bd88357c60cc37eb2c92720b5436545",
"content-hash": "52a8fc943fb3e90574fb0f0ec2e4a5b0",
"packages": [
{
"name": "asm89/stack-cors",
Expand Down Expand Up @@ -1808,16 +1808,16 @@
},
{
"name": "doctrine/deprecations",
"version": "1.1.2",
"version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
"reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931"
"reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
"reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
"url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
"reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -1849,9 +1849,9 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
"source": "https://github.com/doctrine/deprecations/tree/1.1.2"
"source": "https://github.com/doctrine/deprecations/tree/1.1.3"
},
"time": "2023-09-27T20:04:15+00:00"
"time": "2024-01-30T19:34:25+00:00"
},
{
"name": "doctrine/event-manager",
Expand Down Expand Up @@ -6519,17 +6519,17 @@
},
{
"name": "drupal/geocoder",
"version": "4.20.0",
"version": "4.21.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/geocoder.git",
"reference": "8.x-4.20"
"reference": "8.x-4.21"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/geocoder-8.x-4.20.zip",
"reference": "8.x-4.20",
"shasum": "1bf5ff7082e64f55128032b61c7333fd611c5347"
"url": "https://ftp.drupal.org/files/projects/geocoder-8.x-4.21.zip",
"reference": "8.x-4.21",
"shasum": "f7c7a6dbfa1d9b3fb9768d4956e6a931db85317b"
},
"require": {
"davedevelopment/stiphle": "^0.9.2",
Expand All @@ -6540,9 +6540,9 @@
"willdurand/geocoder": "^4.0"
},
"require-dev": {
"drupal/address": "*",
"drupal/address": "^1.11 || ^2.0",
"drupal/geocoder_field": "*",
"drupal/geofield": "*",
"drupal/geofield": "^1.52",
"geo6/geocoder-php-addok-provider": "^1.0",
"geo6/geocoder-php-bpost-provider": "^1.3.0",
"geo6/geocoder-php-geopunt-provider": "^1.0",
Expand All @@ -6552,30 +6552,29 @@
"geocoder-php/bing-maps-provider": "^4.0",
"geocoder-php/free-geoip-provider": "^4.1",
"geocoder-php/geo-plugin-provider": "^4.0",
"geocoder-php/geoips-provider": "^4.1",
"geocoder-php/geonames-provider": "^4.1",
"geocoder-php/google-maps-provider": "^4.2",
"geocoder-php/graphhopper-provider": "^0.1.0",
"geocoder-php/graphhopper-provider": "^0.5.0",
"geocoder-php/host-ip-provider": "^4.0",
"geocoder-php/ip-info-db-provider": "^4.0",
"geocoder-php/mapbox-provider": "^0.1",
"geocoder-php/mapbox-provider": "^1.0",
"geocoder-php/mapquest-provider": "^4.0",
"geocoder-php/maptiler-provider": "^1.0",
"geocoder-php/maxmind-provider": "^4.1",
"geocoder-php/nominatim-provider": "^5.0",
"geocoder-php/open-cage-provider": "^4.0",
"geocoder-php/openrouteservice-provider": "^1.0",
"geocoder-php/pelias-provider": "^1.1",
"geocoder-php/photon-provider": "^0.1.0",
"geocoder-php/photon-provider": "^0.6",
"geocoder-php/tomtom-provider": "^4.0",
"geocoder-php/yandex-provider": "^4.0",
"systonic/ban-france-provider": "^1.0"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-4.20",
"datestamp": "1706097387",
"version": "8.x-4.21",
"datestamp": "1706483330",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -7525,6 +7524,10 @@
"name": "dawehner",
"homepage": "https://www.drupal.org/user/99340"
},
{
"name": "dww",
"homepage": "https://www.drupal.org/user/46549"
},
{
"name": "geek-merlin",
"homepage": "https://www.drupal.org/user/229048"
Expand Down Expand Up @@ -9332,6 +9335,10 @@
"name": "amitaibu",
"homepage": "https://www.drupal.org/user/57511"
},
{
"name": "bluegeek9",
"homepage": "https://www.drupal.org/user/1286304"
},
{
"name": "jhedstrom",
"homepage": "https://www.drupal.org/user/208732"
Expand Down
1 change: 0 additions & 1 deletion config/sync/feature_toggle.features.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ features:
feature_all_hub_side_navs: FEATURE_ALL_HUB_SIDE_NAVS
feature_health_connect_number: FEATURE_HEALTH_CONNECT_NUMBER
feature_next_story_preview: FEATURE_NEXT_STORY_PREVIEW
feature_mobile_app_promo: FEATURE_MOBILE_APP_PROMO
2 changes: 1 addition & 1 deletion config/sync/views.view.content.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
pagination_heading_level: ''
exposed_form:
type: basic
options:
Expand Down
2 changes: 1 addition & 1 deletion config/sync/views.view.orphaned_paragraphs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
pagination_heading_level: ''
exposed_form:
type: basic
options:
Expand Down
Loading

0 comments on commit 219b4a2

Please sign in to comment.