diff --git a/composer.lock b/composer.lock
index 0743e49be..e395c2428 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1753,6 +1753,101 @@
"issues": "https://www.drupal.org/project/issues/better_exposed_filters"
}
},
+ {
+ "name": "drupal/ckeditor",
+ "version": "1.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://git.drupalcode.org/project/ckeditor.git",
+ "reference": "1.0.2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://ftp.drupal.org/files/projects/ckeditor-1.0.2.zip",
+ "reference": "1.0.2",
+ "shasum": "fec2ca9ad852a00c7b9584cb6040dc860364c481"
+ },
+ "require": {
+ "drupal/core": "^9.4 || ^10"
+ },
+ "require-dev": {
+ "drupal/classy": "*"
+ },
+ "type": "drupal-module",
+ "extra": {
+ "drupal": {
+ "version": "1.0.2",
+ "datestamp": "1695740655",
+ "security-coverage": {
+ "status": "covered",
+ "message": "Covered by Drupal's security advisory policy"
+ }
+ }
+ },
+ "notification-url": "https://packages.drupal.org/8/downloads",
+ "license": [
+ "GPL-2.0-or-later"
+ ],
+ "authors": [
+ {
+ "name": "dczepierga",
+ "homepage": "https://www.drupal.org/user/911466"
+ },
+ {
+ "name": "hass",
+ "homepage": "https://www.drupal.org/user/85918"
+ },
+ {
+ "name": "jcisio",
+ "homepage": "https://www.drupal.org/user/210762"
+ },
+ {
+ "name": "Jorrit",
+ "homepage": "https://www.drupal.org/user/161217"
+ },
+ {
+ "name": "lauriii",
+ "homepage": "https://www.drupal.org/user/1078742"
+ },
+ {
+ "name": "Magnus",
+ "homepage": "https://www.drupal.org/user/73919"
+ },
+ {
+ "name": "mkesicki",
+ "homepage": "https://www.drupal.org/user/922884"
+ },
+ {
+ "name": "nod_",
+ "homepage": "https://www.drupal.org/user/598310"
+ },
+ {
+ "name": "p.wiaderny",
+ "homepage": "https://www.drupal.org/user/2956619"
+ },
+ {
+ "name": "vokiel",
+ "homepage": "https://www.drupal.org/user/2793801"
+ },
+ {
+ "name": "Wim Leers",
+ "homepage": "https://www.drupal.org/user/99777"
+ },
+ {
+ "name": "wwalc",
+ "homepage": "https://www.drupal.org/user/184556"
+ },
+ {
+ "name": "xjm",
+ "homepage": "https://www.drupal.org/user/65776"
+ }
+ ],
+ "description": "WYSIWYG editing for rich text fields using CKEditor.",
+ "homepage": "https://www.drupal.org/project/ckeditor",
+ "support": {
+ "source": "https://git.drupalcode.org/project/ckeditor"
+ }
+ },
{
"name": "drupal/config_filter",
"version": "2.6.0",
@@ -3832,12 +3927,12 @@
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "208ce49b6a98cb46b8b8cd0e658b3cd1f07746cb"
+ "reference": "05d2280eab35c6695283c92233158831bcaa6cbb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/208ce49b6a98cb46b8b8cd0e658b3cd1f07746cb",
- "reference": "208ce49b6a98cb46b8b8cd0e658b3cd1f07746cb",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/05d2280eab35c6695283c92233158831bcaa6cbb",
+ "reference": "05d2280eab35c6695283c92233158831bcaa6cbb",
"shasum": ""
},
"require": {
@@ -3858,7 +3953,7 @@
"source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.x",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2023-11-06T07:19:12+00:00"
+ "time": "2023-11-13T11:29:28+00:00"
},
{
"name": "drupal/hdbt_admin",
@@ -3947,16 +4042,16 @@
},
{
"name": "drupal/helfi_api_base",
- "version": "2.5.11",
+ "version": "2.5.12",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
- "reference": "cd300f71fcf464111636eec7c1da7f4bc855f772"
+ "reference": "0e993700f6611def239ec225a3ada1d123b30623"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/cd300f71fcf464111636eec7c1da7f4bc855f772",
- "reference": "cd300f71fcf464111636eec7c1da7f4bc855f772",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/0e993700f6611def239ec225a3ada1d123b30623",
+ "reference": "0e993700f6611def239ec225a3ada1d123b30623",
"shasum": ""
},
"require": {
@@ -3984,23 +4079,23 @@
],
"description": "Helfi - API Base",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.11",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.12",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
},
- "time": "2023-11-06T08:22:25+00:00"
+ "time": "2023-11-15T13:15:43+00:00"
},
{
"name": "drupal/helfi_azure_fs",
- "version": "2.0.0",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git",
- "reference": "c54a5f60f4b6260870180128f7cb350bc59fc88c"
+ "reference": "92684fb57edbe6fbc2704c57637ba877583de254"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/c54a5f60f4b6260870180128f7cb350bc59fc88c",
- "reference": "c54a5f60f4b6260870180128f7cb350bc59fc88c",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/92684fb57edbe6fbc2704c57637ba877583de254",
+ "reference": "92684fb57edbe6fbc2704c57637ba877583de254",
"shasum": ""
},
"require": {
@@ -4012,15 +4107,22 @@
"drupal/coder": "^8.3"
},
"type": "drupal-module",
+ "extra": {
+ "patches": {
+ "twistor/flysystem-stream-wrapper": {
+ "PHP 8.2 support (https://www.drupal.org/project/flysystem/issues/3387094)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-azure-fs/ddb222622b92d1c2b7db975a84167a00579a1ad0/patches/3387094-add-context-property-to-stream-wrapper.patch"
+ }
+ }
+ },
"license": [
"GPL-2.0-or-later"
],
"description": "Helfi - Azure FS",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.0",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.1",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues"
},
- "time": "2023-10-30T08:38:25+00:00"
+ "time": "2023-11-08T06:50:43+00:00"
},
{
"name": "drupal/helfi_drupal_tools",
@@ -4114,17 +4216,18 @@
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "b64ea18ac6db2c24bde11d921d33b941893039e7"
+ "reference": "feb2db984953d0a40c468f58d7be16e5c0740fc8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/b64ea18ac6db2c24bde11d921d33b941893039e7",
- "reference": "b64ea18ac6db2c24bde11d921d33b941893039e7",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/feb2db984953d0a40c468f58d7be16e5c0740fc8",
+ "reference": "feb2db984953d0a40c468f58d7be16e5c0740fc8",
"shasum": ""
},
"require": {
"drupal/admin_toolbar": "^3.0",
"drupal/allowed_formats": "^2.0",
+ "drupal/ckeditor": "^1.0",
"drupal/config_ignore": "^2.3",
"drupal/config_rewrite": "^1.4",
"drupal/content_lock": "^2.2",
@@ -4226,20 +4329,20 @@
"source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.x",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2023-11-06T07:25:19+00:00"
+ "time": "2023-11-09T12:10:10+00:00"
},
{
"name": "drupal/helfi_proxy",
- "version": "3.0.6",
+ "version": "3.1.1",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git",
- "reference": "66121d5241d9cff17021f8a197a2d79361d06f80"
+ "reference": "b14b5fc48eb3df0c88b2e77176561c94402674bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/66121d5241d9cff17021f8a197a2d79361d06f80",
- "reference": "66121d5241d9cff17021f8a197a2d79361d06f80",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/b14b5fc48eb3df0c88b2e77176561c94402674bf",
+ "reference": "b14b5fc48eb3df0c88b2e77176561c94402674bf",
"shasum": ""
},
"require": {
@@ -4251,6 +4354,7 @@
"php": "^8.0"
},
"conflict": {
+ "drupal/core": "<10.1",
"drupal/helfi_tunnistamo": "<=2.2.1"
},
"require-dev": {
@@ -4262,15 +4366,22 @@
"phpspec/prophecy-phpunit": "^2"
},
"type": "drupal-module",
+ "extra": {
+ "patches": {
+ "drupal/core": {
+ "[#3385550] Language negotiation breaks updating Drupal 9 to 10": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-proxy/ffbde3654e0011e237a17ea1cb3a7291685e0c30/patches/3385550.patch"
+ }
+ }
+ },
"license": [
"GPL-2.0-or-later"
],
"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/3.0.6",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.1.1",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues"
},
- "time": "2023-09-04T11:31:52+00:00"
+ "time": "2023-11-07T08:55:52+00:00"
},
{
"name": "drupal/helfi_tpr",
@@ -6328,17 +6439,17 @@
},
{
"name": "drupal/sophron",
- "version": "2.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/sophron.git",
- "reference": "2.0.1"
+ "reference": "2.0.2"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/sophron-2.0.1.zip",
- "reference": "2.0.1",
- "shasum": "eb9b22e843400392ba7fa35dc99c644d2cf08982"
+ "url": "https://ftp.drupal.org/files/projects/sophron-2.0.2.zip",
+ "reference": "2.0.2",
+ "shasum": "ed5d910d6612ea591950b67384cc5ff26c5c7cc9"
},
"require": {
"drupal/core": "^10",
@@ -6347,8 +6458,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "2.0.1",
- "datestamp": "1676319965",
+ "version": "2.0.2",
+ "datestamp": "1699798487",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -7542,16 +7653,16 @@
},
{
"name": "fileeye/mimemap",
- "version": "2.0.2",
+ "version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/FileEye/MimeMap.git",
- "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d"
+ "reference": "0795b7db12838ffb7bc564e0a02cf53fb1463ec0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d",
- "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d",
+ "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/0795b7db12838ffb7bc564e0a02cf53fb1463ec0",
+ "reference": "0795b7db12838ffb7bc564e0a02cf53fb1463ec0",
"shasum": ""
},
"require": {
@@ -7598,9 +7709,9 @@
],
"support": {
"issues": "https://github.com/FileEye/MimeMap/issues",
- "source": "https://github.com/FileEye/MimeMap/tree/2.0.2"
+ "source": "https://github.com/FileEye/MimeMap/tree/2.0.3"
},
- "time": "2023-08-29T16:20:26+00:00"
+ "time": "2023-11-11T14:14:23+00:00"
},
{
"name": "fileeye/pel",
@@ -11146,16 +11257,16 @@
},
{
"name": "symfony/console",
- "version": "v6.3.4",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6"
+ "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6",
- "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6",
+ "url": "https://api.github.com/repos/symfony/console/zipball/0d14a9f6d04d4ac38a8cea1171f4554e325dae92",
+ "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92",
"shasum": ""
},
"require": {
@@ -11216,7 +11327,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v6.3.4"
+ "source": "https://github.com/symfony/console/tree/v6.3.8"
},
"funding": [
{
@@ -11232,20 +11343,20 @@
"type": "tidelift"
}
],
- "time": "2023-08-16T10:10:12+00:00"
+ "time": "2023-10-31T08:09:35+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v6.3.5",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993"
+ "reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ed62b3bf98346e1f45529a7b6be2196739bb993",
- "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1f30f545c4151f611148fc19e28d54d39e0a00bc",
+ "reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc",
"shasum": ""
},
"require": {
@@ -11297,7 +11408,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dependency-injection/tree/v6.3.5"
+ "source": "https://github.com/symfony/dependency-injection/tree/v6.3.8"
},
"funding": [
{
@@ -11313,7 +11424,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-25T16:46:40+00:00"
+ "time": "2023-10-31T08:07:48+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -11911,16 +12022,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v6.3.7",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "59d1837d5d992d16c2628cd0d6b76acf8d69b33e"
+ "reference": "ce332676de1912c4389222987193c3ef38033df6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/59d1837d5d992d16c2628cd0d6b76acf8d69b33e",
- "reference": "59d1837d5d992d16c2628cd0d6b76acf8d69b33e",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ce332676de1912c4389222987193c3ef38033df6",
+ "reference": "ce332676de1912c4389222987193c3ef38033df6",
"shasum": ""
},
"require": {
@@ -11968,7 +12079,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v6.3.7"
+ "source": "https://github.com/symfony/http-foundation/tree/v6.3.8"
},
"funding": [
{
@@ -11984,20 +12095,20 @@
"type": "tidelift"
}
],
- "time": "2023-10-28T23:55:27+00:00"
+ "time": "2023-11-07T10:17:15+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v6.3.7",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "6d4098095f93279d9536a0e9124439560cc764d0"
+ "reference": "929202375ccf44a309c34aeca8305408442ebcc1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6d4098095f93279d9536a0e9124439560cc764d0",
- "reference": "6d4098095f93279d9536a0e9124439560cc764d0",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/929202375ccf44a309c34aeca8305408442ebcc1",
+ "reference": "929202375ccf44a309c34aeca8305408442ebcc1",
"shasum": ""
},
"require": {
@@ -12081,7 +12192,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/v6.3.7"
+ "source": "https://github.com/symfony/http-kernel/tree/v6.3.8"
},
"funding": [
{
@@ -12097,7 +12208,7 @@
"type": "tidelift"
}
],
- "time": "2023-10-29T14:31:45+00:00"
+ "time": "2023-11-10T13:47:32+00:00"
},
{
"name": "symfony/mime",
@@ -13382,16 +13493,16 @@
},
{
"name": "symfony/serializer",
- "version": "v6.3.7",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
- "reference": "641472dd3d6dc3c4d0fdd1496ebd1b55c72e43d9"
+ "reference": "b3ad1515a276473f7919ac97e560017284a7c4bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/serializer/zipball/641472dd3d6dc3c4d0fdd1496ebd1b55c72e43d9",
- "reference": "641472dd3d6dc3c4d0fdd1496ebd1b55c72e43d9",
+ "url": "https://api.github.com/repos/symfony/serializer/zipball/b3ad1515a276473f7919ac97e560017284a7c4bf",
+ "reference": "b3ad1515a276473f7919ac97e560017284a7c4bf",
"shasum": ""
},
"require": {
@@ -13456,7 +13567,7 @@
"description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/serializer/tree/v6.3.7"
+ "source": "https://github.com/symfony/serializer/tree/v6.3.8"
},
"funding": [
{
@@ -13472,7 +13583,7 @@
"type": "tidelift"
}
],
- "time": "2023-10-26T18:15:14+00:00"
+ "time": "2023-11-07T10:11:25+00:00"
},
{
"name": "symfony/service-contracts",
@@ -13558,16 +13669,16 @@
},
{
"name": "symfony/string",
- "version": "v6.3.5",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
+ "reference": "13880a87790c76ef994c91e87efb96134522577a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
- "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
+ "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a",
+ "reference": "13880a87790c76ef994c91e87efb96134522577a",
"shasum": ""
},
"require": {
@@ -13624,7 +13735,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v6.3.5"
+ "source": "https://github.com/symfony/string/tree/v6.3.8"
},
"funding": [
{
@@ -13640,7 +13751,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-18T10:38:32+00:00"
+ "time": "2023-11-09T08:28:21+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -13722,16 +13833,16 @@
},
{
"name": "symfony/validator",
- "version": "v6.3.7",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
- "reference": "9cc736663fa5839b9710ac2c303bb0b951014fc1"
+ "reference": "f75b40e088d095db1e788b81605a76f4563cb80e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/validator/zipball/9cc736663fa5839b9710ac2c303bb0b951014fc1",
- "reference": "9cc736663fa5839b9710ac2c303bb0b951014fc1",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/f75b40e088d095db1e788b81605a76f4563cb80e",
+ "reference": "f75b40e088d095db1e788b81605a76f4563cb80e",
"shasum": ""
},
"require": {
@@ -13798,7 +13909,7 @@
"description": "Provides tools to validate values",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/validator/tree/v6.3.7"
+ "source": "https://github.com/symfony/validator/tree/v6.3.8"
},
"funding": [
{
@@ -13814,20 +13925,20 @@
"type": "tidelift"
}
],
- "time": "2023-10-28T23:11:45+00:00"
+ "time": "2023-11-07T10:17:15+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v6.3.6",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "999ede244507c32b8e43aebaa10e9fce20de7c97"
+ "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/999ede244507c32b8e43aebaa10e9fce20de7c97",
- "reference": "999ede244507c32b8e43aebaa10e9fce20de7c97",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/81acabba9046550e89634876ca64bfcd3c06aa0a",
+ "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a",
"shasum": ""
},
"require": {
@@ -13882,7 +13993,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v6.3.6"
+ "source": "https://github.com/symfony/var-dumper/tree/v6.3.8"
},
"funding": [
{
@@ -13898,7 +14009,7 @@
"type": "tidelift"
}
],
- "time": "2023-10-12T18:45:56+00:00"
+ "time": "2023-11-08T10:42:36+00:00"
},
{
"name": "symfony/var-exporter",
@@ -13976,16 +14087,16 @@
},
{
"name": "symfony/yaml",
- "version": "v6.3.7",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8"
+ "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/9758b6c69d179936435d0ffb577c3708d57e38a8",
- "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/3493af8a8dad7fa91c77fa473ba23ecd95334a92",
+ "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92",
"shasum": ""
},
"require": {
@@ -14028,7 +14139,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/yaml/tree/v6.3.7"
+ "source": "https://github.com/symfony/yaml/tree/v6.3.8"
},
"funding": [
{
@@ -14044,7 +14155,7 @@
"type": "tidelift"
}
],
- "time": "2023-10-28T23:31:00+00:00"
+ "time": "2023-11-06T10:58:05+00:00"
},
{
"name": "t4web/composer-lock-parser",
diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml
index 13de2846b..2653434ea 100644
--- a/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml
+++ b/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml
@@ -24,5 +24,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.after_school_activity_search.field_after_school_search_desc.yml b/conf/cmi/field.field.paragraph.after_school_activity_search.field_after_school_search_desc.yml
index 945439846..ed8dffb55 100644
--- a/conf/cmi/field.field.paragraph.after_school_activity_search.field_after_school_search_desc.yml
+++ b/conf/cmi/field.field.paragraph.after_school_activity_search.field_after_school_search_desc.yml
@@ -21,5 +21,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.banner.field_banner_desc.yml b/conf/cmi/field.field.paragraph.banner.field_banner_desc.yml
index 02f02b325..353bfb79b 100644
--- a/conf/cmi/field.field.paragraph.banner.field_banner_desc.yml
+++ b/conf/cmi/field.field.paragraph.banner.field_banner_desc.yml
@@ -19,5 +19,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.chart.field_chart_description.yml b/conf/cmi/field.field.paragraph.chart.field_chart_description.yml
index 665064da0..fab098626 100644
--- a/conf/cmi/field.field.paragraph.chart.field_chart_description.yml
+++ b/conf/cmi/field.field.paragraph.chart.field_chart_description.yml
@@ -19,5 +19,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.contact_card_listing.field_description.yml b/conf/cmi/field.field.paragraph.contact_card_listing.field_description.yml
index 6bd8e00a8..e04cdce4c 100644
--- a/conf/cmi/field.field.paragraph.contact_card_listing.field_description.yml
+++ b/conf/cmi/field.field.paragraph.contact_card_listing.field_description.yml
@@ -24,5 +24,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.daycare_search.field_daycare_search_description.yml b/conf/cmi/field.field.paragraph.daycare_search.field_daycare_search_description.yml
index feda50f44..f75168d2f 100644
--- a/conf/cmi/field.field.paragraph.daycare_search.field_daycare_search_description.yml
+++ b/conf/cmi/field.field.paragraph.daycare_search.field_daycare_search_description.yml
@@ -21,5 +21,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_list_description.yml b/conf/cmi/field.field.paragraph.event_list.field_event_list_description.yml
index 1b105cc0a..037dbaa4f 100644
--- a/conf/cmi/field.field.paragraph.event_list.field_event_list_description.yml
+++ b/conf/cmi/field.field.paragraph.event_list.field_event_list_description.yml
@@ -17,5 +17,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.group_news.field_group_news_description.yml b/conf/cmi/field.field.paragraph.group_news.field_group_news_description.yml
index f92ca606d..755b904c7 100644
--- a/conf/cmi/field.field.paragraph.group_news.field_group_news_description.yml
+++ b/conf/cmi/field.field.paragraph.group_news.field_group_news_description.yml
@@ -21,5 +21,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml b/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml
index ddc318407..3d6d3debe 100644
--- a/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml
+++ b/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml
@@ -24,5 +24,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.hero.field_hero_desc.yml b/conf/cmi/field.field.paragraph.hero.field_hero_desc.yml
index 2052b7162..501ebe916 100644
--- a/conf/cmi/field.field.paragraph.hero.field_hero_desc.yml
+++ b/conf/cmi/field.field.paragraph.hero.field_hero_desc.yml
@@ -23,5 +23,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.high_school_search.field_hs_search_description.yml b/conf/cmi/field.field.paragraph.high_school_search.field_hs_search_description.yml
index d5999ace3..af81b7387 100644
--- a/conf/cmi/field.field.paragraph.high_school_search.field_hs_search_description.yml
+++ b/conf/cmi/field.field.paragraph.high_school_search.field_hs_search_description.yml
@@ -21,5 +21,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.liftup_with_image.field_liftup_with_image_desc.yml b/conf/cmi/field.field.paragraph.liftup_with_image.field_liftup_with_image_desc.yml
index 883554230..7427346f1 100644
--- a/conf/cmi/field.field.paragraph.liftup_with_image.field_liftup_with_image_desc.yml
+++ b/conf/cmi/field.field.paragraph.liftup_with_image.field_liftup_with_image_desc.yml
@@ -19,5 +19,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.map.field_map_description.yml b/conf/cmi/field.field.paragraph.map.field_map_description.yml
index 5c8b92346..3b62f52a8 100644
--- a/conf/cmi/field.field.paragraph.map.field_map_description.yml
+++ b/conf/cmi/field.field.paragraph.map.field_map_description.yml
@@ -19,5 +19,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml b/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml
index 64c544216..f1c903f7e 100644
--- a/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml
+++ b/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml
@@ -24,5 +24,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.phasing.field_description.yml b/conf/cmi/field.field.paragraph.phasing.field_description.yml
index 4d245f46b..1c838013e 100644
--- a/conf/cmi/field.field.paragraph.phasing.field_description.yml
+++ b/conf/cmi/field.field.paragraph.phasing.field_description.yml
@@ -24,5 +24,6 @@ required: false
translatable: true
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.phasing_item.field_description.yml b/conf/cmi/field.field.paragraph.phasing_item.field_description.yml
index c472ac752..d446503a9 100644
--- a/conf/cmi/field.field.paragraph.phasing_item.field_description.yml
+++ b/conf/cmi/field.field.paragraph.phasing_item.field_description.yml
@@ -24,5 +24,6 @@ required: false
translatable: true
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.playground_search.field_playground_search_desc.yml b/conf/cmi/field.field.paragraph.playground_search.field_playground_search_desc.yml
index 0ca7af299..4a22efaa1 100644
--- a/conf/cmi/field.field.paragraph.playground_search.field_playground_search_desc.yml
+++ b/conf/cmi/field.field.paragraph.playground_search.field_playground_search_desc.yml
@@ -21,5 +21,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.school_search.field_comp_search_description.yml b/conf/cmi/field.field.paragraph.school_search.field_comp_search_description.yml
index 8947a10bf..f8f2c0975 100644
--- a/conf/cmi/field.field.paragraph.school_search.field_comp_search_description.yml
+++ b/conf/cmi/field.field.paragraph.school_search.field_comp_search_description.yml
@@ -21,5 +21,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.sidebar_text.field_sidebar_text_text.yml b/conf/cmi/field.field.paragraph.sidebar_text.field_sidebar_text_text.yml
index 786941d8e..6540a2a66 100644
--- a/conf/cmi/field.field.paragraph.sidebar_text.field_sidebar_text_text.yml
+++ b/conf/cmi/field.field.paragraph.sidebar_text.field_sidebar_text_text.yml
@@ -24,5 +24,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.target_group_links.field_target_group_links_desc.yml b/conf/cmi/field.field.paragraph.target_group_links.field_target_group_links_desc.yml
index d3c8bf0cb..2e089e871 100644
--- a/conf/cmi/field.field.paragraph.target_group_links.field_target_group_links_desc.yml
+++ b/conf/cmi/field.field.paragraph.target_group_links.field_target_group_links_desc.yml
@@ -23,5 +23,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.text.field_text.yml b/conf/cmi/field.field.paragraph.text.field_text.yml
index ef215a9b6..53ea91f48 100644
--- a/conf/cmi/field.field.paragraph.text.field_text.yml
+++ b/conf/cmi/field.field.paragraph.text.field_text.yml
@@ -24,5 +24,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.vocational_school_search.field_vs_search_description.yml b/conf/cmi/field.field.paragraph.vocational_school_search.field_vs_search_description.yml
index 345a56b52..1f2171643 100644
--- a/conf/cmi/field.field.paragraph.vocational_school_search.field_vs_search_description.yml
+++ b/conf/cmi/field.field.paragraph.vocational_school_search.field_vs_search_description.yml
@@ -21,5 +21,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats: { }
field_type: text_long
diff --git a/conf/cmi/language/fi/group.content_type.group_content_type_5e8b00831189e.yml b/conf/cmi/language/fi/group.content_type.group_content_type_5e8b00831189e.yml
deleted file mode 100644
index 8446d1b86..000000000
--- a/conf/cmi/language/fi/group.content_type.group_content_type_5e8b00831189e.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-label: 'Lukion TPR-toimipiste'
-description: 'Lisää TPR-toimipiste ryhmään.'
diff --git a/conf/cmi/language/fi/group.content_type.group_content_type_8cf71fbe8b0c4.yml b/conf/cmi/language/fi/group.content_type.group_content_type_8cf71fbe8b0c4.yml
deleted file mode 100644
index 7a1212a9e..000000000
--- a/conf/cmi/language/fi/group.content_type.group_content_type_8cf71fbe8b0c4.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-label: 'Lukion uutissivu'
-description: 'Lisää uutinen lukioryhmään.'
diff --git a/conf/cmi/language/fi/group.content_type.group_content_type_b0ee7f3e08749.yml b/conf/cmi/language/fi/group.content_type.group_content_type_b0ee7f3e08749.yml
deleted file mode 100644
index a81e8df74..000000000
--- a/conf/cmi/language/fi/group.content_type.group_content_type_b0ee7f3e08749.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-label: 'Lukion perussivu'
-description: 'Lisää perussivu lukioryhmään.'
diff --git a/conf/cmi/language/fi/group.content_type.group_content_type_c28cd27128f0f.yml b/conf/cmi/language/fi/group.content_type.group_content_type_c28cd27128f0f.yml
deleted file mode 100644
index a904dd28a..000000000
--- a/conf/cmi/language/fi/group.content_type.group_content_type_c28cd27128f0f.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-label: 'Lukion sisällöntuottaja'
-description: 'Lisää käyttäjä lukion sisällöntuottajaksi.'
diff --git a/conf/cmi/language/fi/group.content_type.group_content_type_c5fd8986910a1.yml b/conf/cmi/language/fi/group.content_type.group_content_type_c5fd8986910a1.yml
deleted file mode 100644
index 10f97fc89..000000000
--- a/conf/cmi/language/fi/group.content_type.group_content_type_c5fd8986910a1.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-label: 'Lukion ryhmävalikko'
-description: 'Lisää ryhmävalikko lukioryhmään.'
diff --git a/conf/cmi/language/fi/group.content_type.group_content_type_cb62eb2a38c4f.yml b/conf/cmi/language/fi/group.content_type.group_content_type_cb62eb2a38c4f.yml
deleted file mode 100644
index c031bd235..000000000
--- a/conf/cmi/language/fi/group.content_type.group_content_type_cb62eb2a38c4f.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-label: 'Lukion laskeutumissivu'
-description: 'Lisää laskeutumissivu lukioryhmään.'
diff --git a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
index 85aac6c5a..80a4fff3c 100644
--- a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
+++ b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
@@ -1,4 +1,4 @@
site_settings:
- theme_color: metro
default_icon: face-smile
+ theme_color: metro
koro: pulse
diff --git a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
index 85aac6c5a..80a4fff3c 100644
--- a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
+++ b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
@@ -1,4 +1,4 @@
site_settings:
- theme_color: metro
default_icon: face-smile
+ theme_color: metro
koro: pulse
diff --git a/tools/commit-msg b/tools/commit-msg
index 04a430867..9840c0bd5 100755
--- a/tools/commit-msg
+++ b/tools/commit-msg
@@ -4,12 +4,13 @@
# feature/PROJECT-1234-test-test
# PROJECT-1234-test-test
# PROJECT-1234_test_test
+# fixup! (for git rebase --autosquash)
id=$(echo `git rev-parse --abbrev-ref HEAD` | sed -nE 's|([a-z]+/)?([A-Z]+-[0-9]+)(-.+)?(_.+)?|\2|p')
COMMIT_MESSAGE=$(cat $1)
# Only prepare commit message if pattern matched and Jira ID was found and
# message doesn't contain Jira ID already.
-if [[ ! -z $id ]] && [[ $COMMIT_MESSAGE != $id* ]]; then
+if [[ ! -z $id ]] && [[ $COMMIT_MESSAGE != $id* ]] && [[ $COMMIT_MESSAGE != "fixup!"* ]]; then
# $1 is the name of the file containing the commit message
# Prepend "ABCD-123: "
sed -i.bak -E "1s/^/${id}: /" $1