From d0f3549f9c354863d8ebe98f758c4c055b490187 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 2 Nov 2022 08:46:00 +0000 Subject: [PATCH] Update configuration --- composer.lock | 172 ++++++++---------- ...form_display.paragraph.phasing.default.yml | 7 +- ..._display.helfi_news.helfi_news.default.yml | 2 +- ...ay.helfi_news.helfi_news.medium_teaser.yml | 2 +- ...view_display.paragraph.phasing.default.yml | 7 - ...view_display.tpr_unit.tpr_unit.default.yml | 2 +- ..._view_display.tpr_unit.tpr_unit.teaser.yml | 2 +- ...ay.tpr_unit.tpr_unit.teaser_with_image.yml | 2 +- ..._display.tpr_unit.tpr_unit.wide_teaser.yml | 2 +- conf/cmi/core.extension.yml | 1 - conf/cmi/eu_cookie_compliance.settings.yml | 4 + ...ervice.tpr_service.field_lower_content.yml | 5 + ....tpr_unit.tpr_unit.field_lower_content.yml | 5 + conf/cmi/filelog.settings.yml | 13 -- conf/cmi/openid_connect.client.tunnistamo.yml | 1 + public/sites/default/settings.php | 12 +- 16 files changed, 110 insertions(+), 129 deletions(-) delete mode 100644 conf/cmi/filelog.settings.yml diff --git a/composer.lock b/composer.lock index a563a2c5..d4212658 100644 --- a/composer.lock +++ b/composer.lock @@ -3355,26 +3355,26 @@ }, { "name": "drupal/eu_cookie_compliance", - "version": "1.19.0", + "version": "1.24.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/eu-cookie-compliance.git", - "reference": "8.x-1.19" + "reference": "8.x-1.24" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/eu_cookie_compliance-8.x-1.19.zip", - "reference": "8.x-1.19", - "shasum": "5a13cd53f87a58501cebd6e560c280ad7274035c" + "url": "https://ftp.drupal.org/files/projects/eu_cookie_compliance-8.x-1.24.zip", + "reference": "8.x-1.24", + "shasum": "ab8dcd866e5ad95cde6fdf9cbca509c7f399bd23" }, "require": { - "drupal/core": "^8.9 || ^9" + "drupal/core": "^8.9 || ^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.19", - "datestamp": "1633775773", + "version": "8.x-1.24", + "datestamp": "1665158185", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3642,29 +3642,26 @@ }, { "name": "drupal/field_group", - "version": "3.3.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/field_group.git", - "reference": "8.x-3.3" + "reference": "8.x-3.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.3.zip", - "reference": "8.x-3.3", - "shasum": "c7a423b1d7643ee40dd1543d72fa04e8ac1756e4" + "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.4.zip", + "reference": "8.x-3.4", + "shasum": "80b937e1a11f8b29c69d853fc4bf798c057c6f94" }, "require": { - "drupal/core": "^8.8 || ^9" - }, - "require-dev": { - "drupal/jquery_ui_accordion": "^1.0" + "drupal/core": "^9.2 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.3", - "datestamp": "1663516404", + "version": "8.x-3.4", + "datestamp": "1667241979", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4057,16 +4054,16 @@ }, { "name": "drupal/hdbt", - "version": "4.1.9", + "version": "4.1.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "5282586e08cb2e54a0a68501b31fb2b90d7bab5f" + "reference": "472406aed1fa83569a6cf92f4cd72bdd9b880650" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/5282586e08cb2e54a0a68501b31fb2b90d7bab5f", - "reference": "5282586e08cb2e54a0a68501b31fb2b90d7bab5f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/472406aed1fa83569a6cf92f4cd72bdd9b880650", + "reference": "472406aed1fa83569a6cf92f4cd72bdd9b880650", "shasum": "" }, "require": { @@ -4081,23 +4078,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.9", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.10", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-10-25T06:16:45+00:00" + "time": "2022-10-28T12:05:09+00:00" }, { "name": "drupal/hdbt_admin", - "version": "1.7.1", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "96cbfd700b2076bc1a0a9b60948dfb47ca445bbd" + "reference": "9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/96cbfd700b2076bc1a0a9b60948dfb47ca445bbd", - "reference": "96cbfd700b2076bc1a0a9b60948dfb47ca445bbd", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2", + "reference": "9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2", "shasum": "" }, "require": { @@ -4113,10 +4110,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.1", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.3", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2022-10-14T06:09:35+00:00" + "time": "2022-11-01T12:58:43+00:00" }, { "name": "drupal/helfi_ahjo", @@ -4153,16 +4150,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.3.3", + "version": "2.3.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "403c56e5dc436ba0c404c240546e59de944eae2e" + "reference": "f3560b56532df468b8f5433875a7dc79bab10c1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/403c56e5dc436ba0c404c240546e59de944eae2e", - "reference": "403c56e5dc436ba0c404c240546e59de944eae2e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/f3560b56532df468b8f5433875a7dc79bab10c1f", + "reference": "f3560b56532df468b8f5433875a7dc79bab10c1f", "shasum": "" }, "require": { @@ -4185,10 +4182,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2022-10-24T06:09:19+00:00" + "time": "2022-11-02T08:44:03+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4385,16 +4382,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.13.7", + "version": "2.13.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "312e9ddfedc54228e67c8ea571fe0785da0c7533" + "reference": "685f4e467c04512b71e02130a34548edfbdfae50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/312e9ddfedc54228e67c8ea571fe0785da0c7533", - "reference": "312e9ddfedc54228e67c8ea571fe0785da0c7533", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/685f4e467c04512b71e02130a34548edfbdfae50", + "reference": "685f4e467c04512b71e02130a34548edfbdfae50", "shasum": "" }, "require": { @@ -4414,7 +4411,7 @@ "drupal/elasticsearch_connector": "^7.0@alpha", "drupal/entity_browser": "^2.5", "drupal/entity_usage": "^2.0@beta", - "drupal/eu_cookie_compliance": "1.19", + "drupal/eu_cookie_compliance": "^1.24", "drupal/external_entities": "^2.0@alpha", "drupal/features": "^3.12", "drupal/field_group": "^3.1", @@ -4475,8 +4472,7 @@ "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" }, "drupal/eu_cookie_compliance": { - "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/d1a6866b2138f7d3597df79f395a5c1a9e19ee2e/patches/eu_cookie_compliance_block_8.x-1.19.patch", - "[#UHF-2956] Fix JavaScript error at cookie preference page": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/97683d32e57808a4c9a4f6a2d20757af7a0b8c37/patches/eu_cookie_compliance_js_error_8.x-1.19-patched.patch" + "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/e02b73fc68bd7d9f3611a1d55da267f6fe826340/patches/eu_cookie_compliance_block_8.x-1.24.patch" }, "drupal/features": { "https://www.drupal.org/project/features/issues/2869336": "https://www.drupal.org/files/issues/features_export-config-translation-2869336-2.patch" @@ -4504,23 +4500,23 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.10", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-10-27T14:24:33+00:00" + "time": "2022-11-01T07:30:14+00:00" }, { "name": "drupal/helfi_proxy", - "version": "2.2.8", + "version": "2.2.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "e75e953316a551a2075ddb7edad8b09128b19723" + "reference": "949daf441d06906263dd34b7e05bcfe42dc5a9fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/e75e953316a551a2075ddb7edad8b09128b19723", - "reference": "e75e953316a551a2075ddb7edad8b09128b19723", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/949daf441d06906263dd34b7e05bcfe42dc5a9fe", + "reference": "949daf441d06906263dd34b7e05bcfe42dc5a9fe", "shasum": "" }, "require": { @@ -4543,10 +4539,10 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.2.8", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.2.9", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2022-10-25T06:04:50+00:00" + "time": "2022-11-02T07:15:53+00:00" }, { "name": "drupal/helfi_tpr", @@ -5316,10 +5312,6 @@ "GPL-2.0-or-later" ], "authors": [ - { - "name": "balintk", - "homepage": "https://www.drupal.org/user/613760" - }, { "name": "bojanz", "homepage": "https://www.drupal.org/user/86106" @@ -5328,10 +5320,6 @@ "name": "jcnventura", "homepage": "https://www.drupal.org/user/122464" }, - { - "name": "Mario Steinitz", - "homepage": "https://www.drupal.org/user/2536014" - }, { "name": "pfrilling", "homepage": "https://www.drupal.org/user/169695" @@ -5340,10 +5328,6 @@ "name": "pjcdawkins", "homepage": "https://www.drupal.org/user/1025236" }, - { - "name": "robertDouglass", - "homepage": "https://www.drupal.org/user/5449" - }, { "name": "sanduhrs", "homepage": "https://www.drupal.org/user/28074" @@ -10825,16 +10809,16 @@ }, { "name": "symfony/console", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4f40012db8d55c956406890b5720f686fee7f7b7" + "reference": "8e70c1cab07ac641b885ce80385b9824a293c623" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4f40012db8d55c956406890b5720f686fee7f7b7", - "reference": "4f40012db8d55c956406890b5720f686fee7f7b7", + "url": "https://api.github.com/repos/symfony/console/zipball/8e70c1cab07ac641b885ce80385b9824a293c623", + "reference": "8e70c1cab07ac641b885ce80385b9824a293c623", "shasum": "" }, "require": { @@ -10895,7 +10879,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.47" + "source": "https://github.com/symfony/console/tree/v4.4.48" }, "funding": [ { @@ -10911,7 +10895,7 @@ "type": "tidelift" } ], - "time": "2022-10-04T05:58:30+00:00" + "time": "2022-10-26T16:02:45+00:00" }, { "name": "symfony/debug", @@ -11493,16 +11477,16 @@ }, { "name": "symfony/http-client", - "version": "v5.4.14", + "version": "v5.4.15", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "8a3929c814cba77db93de61c22759e0dbeaa4c87" + "reference": "8f29b0f06c9ff48c8431e78eb90c8bd6f82cb12b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/8a3929c814cba77db93de61c22759e0dbeaa4c87", - "reference": "8a3929c814cba77db93de61c22759e0dbeaa4c87", + "url": "https://api.github.com/repos/symfony/http-client/zipball/8f29b0f06c9ff48c8431e78eb90c8bd6f82cb12b", + "reference": "8f29b0f06c9ff48c8431e78eb90c8bd6f82cb12b", "shasum": "" }, "require": { @@ -11560,7 +11544,7 @@ "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-client/tree/v5.4.14" + "source": "https://github.com/symfony/http-client/tree/v5.4.15" }, "funding": [ { @@ -11576,7 +11560,7 @@ "type": "tidelift" } ], - "time": "2022-10-11T15:16:01+00:00" + "time": "2022-10-25T16:22:13+00:00" }, { "name": "symfony/http-client-contracts", @@ -11658,16 +11642,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "7eea76ae186c68466e7676e62812ce2769f96811" + "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7eea76ae186c68466e7676e62812ce2769f96811", - "reference": "7eea76ae186c68466e7676e62812ce2769f96811", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cd4f478e67f7c8776a13b17e7d44241fd66261ad", + "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad", "shasum": "" }, "require": { @@ -11706,7 +11690,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.47" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.48" }, "funding": [ { @@ -11722,20 +11706,20 @@ "type": "tidelift" } ], - "time": "2022-10-01T21:39:02+00:00" + "time": "2022-10-12T09:40:54+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d" + "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/91cf5dbc9ea4d902470e596246a736179acfb79d", - "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a6d5229dd9466e046674baad8449ad92ee24eddd", + "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd", "shasum": "" }, "require": { @@ -11810,7 +11794,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.47" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.48" }, "funding": [ { @@ -11826,7 +11810,7 @@ "type": "tidelift" } ], - "time": "2022-10-12T07:05:45+00:00" + "time": "2022-10-28T16:49:22+00:00" }, { "name": "symfony/mime", @@ -13220,16 +13204,16 @@ }, { "name": "symfony/validator", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "37456082bb034cb5f2d8602471a0de6c448535b8" + "reference": "54781a4c41efbd283b779110bf8ae7f263737775" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/37456082bb034cb5f2d8602471a0de6c448535b8", - "reference": "37456082bb034cb5f2d8602471a0de6c448535b8", + "url": "https://api.github.com/repos/symfony/validator/zipball/54781a4c41efbd283b779110bf8ae7f263737775", + "reference": "54781a4c41efbd283b779110bf8ae7f263737775", "shasum": "" }, "require": { @@ -13306,7 +13290,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v4.4.47" + "source": "https://github.com/symfony/validator/tree/v4.4.48" }, "funding": [ { @@ -13322,7 +13306,7 @@ "type": "tidelift" } ], - "time": "2022-10-01T17:13:09+00:00" + "time": "2022-10-25T13:54:11+00:00" }, { "name": "symfony/var-dumper", diff --git a/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml b/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml index f9380c50..e5c4d15d 100644 --- a/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml @@ -44,12 +44,7 @@ content: collapse_edit_all: collapse_edit_all duplicate: duplicate third_party_settings: { } - field_phasing_item_title_level: - type: options_select - weight: 4 - region: content - settings: { } - third_party_settings: { } + field_phasing_item_title_level: { } field_phasing_title_level: type: options_select weight: 0 diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml index e3bece71..819cdd56 100644 --- a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml @@ -16,8 +16,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: gallery_thumbnail imagecache_external_link: '' + imagecache_external_responsive_style: gallery_thumbnail third_party_settings: { } weight: 1 region: content diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml index 46f78a50..450043d1 100644 --- a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml +++ b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml @@ -18,8 +18,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: gallery_thumbnail imagecache_external_link: '' + imagecache_external_responsive_style: gallery_thumbnail third_party_settings: { } weight: 1 region: content diff --git a/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml b/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml index b82f96d9..8d09291d 100644 --- a/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml @@ -35,13 +35,6 @@ content: third_party_settings: { } weight: 2 region: content - field_phasing_item_title_level: - type: list_default - label: hidden - settings: { } - third_party_settings: { } - weight: 3 - region: content field_phasing_title_level: type: list_key label: hidden diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index f9dffcf4..a5f6ac2f 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -155,8 +155,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: image__3_2 imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 third_party_settings: { } weight: 3 region: content diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml index c5532712..1b48f503 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml @@ -46,8 +46,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: image__3_2 imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 third_party_settings: { } weight: 0 region: content diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml index f6533836..3be43e8a 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml @@ -47,8 +47,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: image__3_2 imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 third_party_settings: { } weight: 0 region: content diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml index 15e099e0..6c34169a 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml @@ -60,8 +60,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: image__3_2 imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 third_party_settings: { } weight: 0 region: content diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 5ab4042f..bfb46c3a 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -33,7 +33,6 @@ module: field_group: 0 field_ui: 0 file: 0 - filelog: 0 filter: 0 flysystem: 0 flysystem_azure: 0 diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml index 6ffa0de9..a110ecce 100644 --- a/conf/cmi/eu_cookie_compliance.settings.yml +++ b/conf/cmi/eu_cookie_compliance.settings.yml @@ -74,3 +74,7 @@ cookie_value_disagreed: '0' cookie_value_agreed_show_thank_you: '1' cookie_value_agreed: '2' accessibility_focus: false +close_button_action: close_banner +reject_button_label: '' +reject_button_enabled: false +close_button_enabled: false diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml index f93f78c3..f9812800 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml @@ -15,6 +15,7 @@ dependencies: - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video + - paragraphs.paragraphs_type.event_list module: - entity_reference_revisions - helfi_tpr @@ -45,6 +46,7 @@ settings: liftup_with_image: liftup_with_image phasing: phasing news_list: news_list + event_list: event_list negate: 0 target_bundles_drag_drop: accordion: @@ -62,6 +64,9 @@ settings: content_cards: weight: -23 enabled: true + event_list: + weight: 44 + enabled: true from_library: weight: 21 enabled: true diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml index 5f2317d7..4a4c6dbc 100644 --- a/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml @@ -15,6 +15,7 @@ dependencies: - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.remote_video + - paragraphs.paragraphs_type.event_list module: - entity_reference_revisions - helfi_tpr @@ -45,6 +46,7 @@ settings: liftup_with_image: liftup_with_image contact_card_listing: contact_card_listing news_list: news_list + event_list: event_list negate: 0 target_bundles_drag_drop: accordion: @@ -68,6 +70,9 @@ settings: content_cards: weight: -23 enabled: true + event_list: + weight: 44 + enabled: true from_library: weight: 21 enabled: true diff --git a/conf/cmi/filelog.settings.yml b/conf/cmi/filelog.settings.yml deleted file mode 100644 index a8eca49f..00000000 --- a/conf/cmi/filelog.settings.yml +++ /dev/null @@ -1,13 +0,0 @@ -_core: - default_config_hash: uVSFqX1MwFixVjXjlh72ukQ8LKPgMKNi2raycY9vt3w -enabled: true -location: 'public://logs' -rotation: - schedule: daily - delete: false - destination: 'archive/[date:custom:Y/m/d].log' - gzip: true -format: '[[log:created]] [[log:level]] [[log:channel]] [client: [log:ip], [log:user]] [log:message]' -level: 7 -channels_type: exclude -channels: { } diff --git a/conf/cmi/openid_connect.client.tunnistamo.yml b/conf/cmi/openid_connect.client.tunnistamo.yml index bf6c8fc3..6111e35f 100644 --- a/conf/cmi/openid_connect.client.tunnistamo.yml +++ b/conf/cmi/openid_connect.client.tunnistamo.yml @@ -10,6 +10,7 @@ plugin: tunnistamo settings: client_id: placeholder client_secret: placeholder + iss_allowed_domains: '' is_production: 0 auto_login: 0 environment_url: 'https://tunnistamo.test.hel.ninja' diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 7507c1c0..2b34ca81 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -221,8 +221,16 @@ include __DIR__ . '/' . $env . '.settings.php'; } - if (file_exists(__DIR__ . '/' . $env . '.services.yml')) { - $settings['container_yamls'][] = __DIR__ . '/' . $env . '.services.yml'; + $servicesFiles = [ + 'services.yml', + 'all.services.yml', + $env . '.services.yml', + ]; + + foreach ($servicesFiles as $fileName) { + if (file_exists(__DIR__ . '/' . $fileName)) { + $settings['container_yamls'][] = __DIR__ . '/' . $fileName; + } } if (getenv('OPENSHIFT_BUILD_NAMESPACE') && file_exists(__DIR__ . '/azure.settings.php')) {