diff --git a/composer.lock b/composer.lock index e32dca99..ac2a62fc 100644 --- a/composer.lock +++ b/composer.lock @@ -4223,16 +4223,16 @@ }, { "name": "drupal/helfi_proxy", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "58f13151d496f3da914c087e41b04a1e4702a44b" + "reference": "b14b5fc48eb3df0c88b2e77176561c94402674bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/58f13151d496f3da914c087e41b04a1e4702a44b", - "reference": "58f13151d496f3da914c087e41b04a1e4702a44b", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/b14b5fc48eb3df0c88b2e77176561c94402674bf", + "reference": "b14b5fc48eb3df0c88b2e77176561c94402674bf", "shasum": "" }, "require": { @@ -4244,6 +4244,7 @@ "php": "^8.0" }, "conflict": { + "drupal/core": "<10.1", "drupal/helfi_tunnistamo": "<=2.2.1" }, "require-dev": { @@ -4255,15 +4256,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.1.0", + "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-11-07T07:36:26+00:00" + "time": "2023-11-07T08:55:52+00:00" }, { "name": "drupal/helfi_tpr", @@ -7421,20 +7429,20 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.16.0", + "version": "v4.17.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" + "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", - "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c", + "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c", "shasum": "" }, "require": { - "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { "cerdic/css-tidy": "^1.7 || ^2.0", @@ -7476,9 +7484,9 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0" }, - "time": "2022-09-18T07:06:19+00:00" + "time": "2023-11-17T15:01:25+00:00" }, { "name": "fileeye/mimemap", @@ -16311,16 +16319,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.2", + "version": "1.24.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bcad8d995980440892759db0c32acae7c8e79442" + "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442", - "reference": "bcad8d995980440892759db0c32acae7c8e79442", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/12f01d214f1c73b9c91fdb3b1c415e4c70652083", + "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083", "shasum": "" }, "require": { @@ -16352,9 +16360,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.3" }, - "time": "2023-09-26T12:28:12+00:00" + "time": "2023-11-18T20:15:32+00:00" }, { "name": "phpstan/phpstan", diff --git a/conf/cmi/editor.editor.full_html.yml b/conf/cmi/editor.editor.full_html.yml index 291f8a9c..ba225def 100644 --- a/conf/cmi/editor.editor.full_html.yml +++ b/conf/cmi/editor.editor.full_html.yml @@ -42,6 +42,9 @@ settings: - heading4 - heading5 - heading6 + ckeditor5_list: + reversed: false + startIndex: true ckeditor5_sourceEditing: allowed_tags: - '
' @@ -60,16 +63,13 @@ settings: - '
' - '
' - '
' - ckeditor5_list: - reversed: false - startIndex: true - linkit_extension: - linkit_enabled: true - linkit_profile: helfi helfi_ckeditor_helfi_link: helfi_link_attributes: - '' - '' + linkit_extension: + linkit_enabled: true + linkit_profile: helfi image_upload: status: false scheme: public diff --git a/conf/cmi/editor.editor.minimal.yml b/conf/cmi/editor.editor.minimal.yml index e3565eae..134d3240 100644 --- a/conf/cmi/editor.editor.minimal.yml +++ b/conf/cmi/editor.editor.minimal.yml @@ -24,22 +24,22 @@ settings: - '|' - sourceEditing plugins: + ckeditor5_list: + reversed: false + startIndex: true ckeditor5_sourceEditing: allowed_tags: - '' - '