diff --git a/composer.json b/composer.json index 7288d119..45a62136 100644 --- a/composer.json +++ b/composer.json @@ -103,7 +103,7 @@ "drupal/editor_advanced_link": "^2", "drupal/error_log": "^1.0", "drupal/eu_cookie_compliance": "^1.14", - "drupal/field_group": "^3.x-dev@dev", + "drupal/field_group": "^3.6", "drupal/field_permissions": "^1.0", "drupal/flag": "^4.0@beta", "drupal/flag_lists": "^4.0@RC", @@ -262,10 +262,6 @@ "drupal/email_registration": { "allow email login through REST https://www.drupal.org/project/email_registration/issues/2856542": "https://www.drupal.org/files/issues/2021-06-11/2856542-13.patch" }, - "drupal/field_group": { - "undefined index name 18 https://www.drupal.org/project/field_group/issues/3064890" : "https://www.drupal.org/files/issues/2020-10-01/field_group-undefined-index-name-3064890-18.patch", - "undefined index name 16 https://www.drupal.org/project/field_group/issues/3064890" : "https://www.drupal.org/files/issues/2020-08-10/field_group-undefined-index-name-3064890-16.patch" - }, "drupal/stripe": { "Stripe is a web service and should be in system.admin_config_services https://www.drupal.org/project/stripe/issues/3090652": "https://www.drupal.org/files/issues/2020-01-08/stripe-link_menu_in_services-3090652-5.patch" }, @@ -313,6 +309,10 @@ }, "drupal/commerce_stripe" : { "Allow off_session payment intents for recurring payments https://www.drupal.org/project/commerce_stripe/issues/3171408": "https://www.drupal.org/files/issues/2021-10-04/commerce_stripe-allow-off_session-payment-intents-for-recurring-payments-3171408-34.patch" + }, + "drupal/field_group": { + "undefined index name 18 https://www.drupal.org/project/field_group/issues/3064890" : "https://www.drupal.org/files/issues/2020-10-01/field_group-undefined-index-name-3064890-18.patch", + "undefined index name 16 https://www.drupal.org/project/field_group/issues/3064890" : "https://www.drupal.org/files/issues/2020-08-10/field_group-undefined-index-name-3064890-16.patch" } }, "drupal-scaffold": { diff --git a/composer.lock b/composer.lock index 8ef60c03..a8ed48d7 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "a251f5d3f145783a84b3e7409362c41f", + "content-hash": "c89f12f367d46ecfec03e7a72b2c3584", "packages": [ { "name": "algolia/places", @@ -6493,10 +6493,10 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/date_range_formatter.git", - "reference": "c34acb20c37e6210099bf3080352a6da7227b867" + "reference": "d909818f1de39d7498e771a2c334ca7b9b4b350e" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^8 || ^9 || ^10" }, "type": "drupal-module", "extra": { @@ -6505,7 +6505,7 @@ }, "drupal": { "version": "9.0.x-dev", - "datestamp": "1589956448", + "datestamp": "1718887202", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -7687,13 +7687,13 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/field_group.git", - "reference": "f9a93f0d06b4fb354015e2b380492a5ddedd009e" + "reference": "df29940451bfd45137bde187200f2cd617d8ddcd" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^9.2 || ^10 || ^11" }, "require-dev": { - "drupal/jquery_ui_accordion": "^1.0" + "drupal/jquery_ui_accordion": "*" }, "type": "drupal-module", "extra": { @@ -7701,8 +7701,8 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.2+6-dev", - "datestamp": "1634760756", + "version": "8.x-3.5+1-dev", + "datestamp": "1722672400", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -7715,12 +7715,12 @@ ], "authors": [ { - "name": "Hydra", - "homepage": "https://www.drupal.org/user/647364" + "name": "Anybody", + "homepage": "https://www.drupal.org/user/291091" }, { - "name": "Stalski", - "homepage": "https://www.drupal.org/user/322618" + "name": "Hydra", + "homepage": "https://www.drupal.org/user/647364" }, { "name": "jyve", @@ -7730,6 +7730,10 @@ "name": "nils.destoop", "homepage": "https://www.drupal.org/user/361625" }, + { + "name": "Stalski", + "homepage": "https://www.drupal.org/user/322618" + }, { "name": "swentel", "homepage": "https://www.drupal.org/user/107403" @@ -25361,7 +25365,6 @@ "drupal/computed_field": 15, "drupal/config_split": 10, "drupal/content_sync": 20, - "drupal/field_group": 20, "drupal/flag": 10, "drupal/flag_lists": 5, "drupal/genpass": 20, @@ -25405,6 +25408,7 @@ "drupal/email_registration": 5, "drupal/entity_browser_enhanced": 5, "drupal/entity_clone": 15, + "drupal/field_group": 20, "drupal/filefield_sources": 20, "drupal/filter_perms": 20, "drupal/inline_entity_form": 5, diff --git a/config/sync/views.view.admin_nodes.yml b/config/sync/views.view.admin_nodes.yml index 85810290..5d483682 100644 --- a/config/sync/views.view.admin_nodes.yml +++ b/config/sync/views.view.admin_nodes.yml @@ -5142,12 +5142,12 @@ display: type: date_range_without_time settings: timezone_override: '' - single: 'd F Y' - single_all_day: 'd F Y' one_day: 'd F Y' one_month: 'd - {d} F Y' several_months: 'd F - {d} {F} Y' several_years: 'd F Y - {d} {F} {Y}' + single: 'd F Y' + single_all_day: 'd F Y' group_column: value group_columns: { } group_rows: true