diff --git a/PATCHES/common_design-drupal-10-compatibility.patch b/PATCHES/common_design-drupal-10-compatibility.patch
deleted file mode 100644
index 54fb69caf..000000000
--- a/PATCHES/common_design-drupal-10-compatibility.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/common_design.info.yml b/common_design.info.yml
-index ca86d3c..af2e0f9 100644
---- a/common_design.info.yml
-+++ b/common_design.info.yml
-@@ -1,7 +1,7 @@
- name: OCHA Common Design
- type: theme
- description: OCHA Common Design drupal theme. Use as a base theme, and extend.
--core_version_requirement: ^8.8 || ^9
-+core_version_requirement: ^9 || ^10
- base theme: stable
- logo: 'img/logos/ocha-lockup-blue.svg'
-
-diff --git a/common_design_subtheme/common_design_subtheme.info.yml.example b/common_design_subtheme/common_design_subtheme.info.yml.example
-index 2dbde6a..8794cb6 100644
---- a/common_design_subtheme/common_design_subtheme.info.yml.example
-+++ b/common_design_subtheme/common_design_subtheme.info.yml.example
-@@ -1,6 +1,6 @@
- name: OCHA Common Design sub-theme
- description: OCHA Common Design sub-theme
--core_version_requirement: ^8.8 || ^9
-+core_version_requirement: ^9 || ^10
- type: theme
- base theme: common_design
- logo: 'img/logos/ocha-lockup-blue.svg'
-diff --git a/templates/navigation/menu--account.html.twig b/templates/navigation/menu--account.html.twig
-index d2acaec..a8ae929 100755
---- a/templates/navigation/menu--account.html.twig
-+++ b/templates/navigation/menu--account.html.twig
-@@ -60,7 +60,7 @@
- If the menu item has children and javascript is enabled then this will
- be replaced with a button to show the child menu.
- #}
-- {% spaceless %}
-+ {% apply spaceless %}
-
- {# Add the user icon for the first menu item of the root element. #}
- {% if menu_level == 0 and loop.index == 1 %}
-@@ -70,7 +70,7 @@
- {% endif %}
- {{ item.title }}
-
-- {% endspaceless %}
-+ {% endapply %}
-
- {#
- If the menu item has children then we mark the sub-menu as toggable
-diff --git a/templates/navigation/menu--help.html.twig b/templates/navigation/menu--help.html.twig
-index ed14b75..2ece6fe 100755
---- a/templates/navigation/menu--help.html.twig
-+++ b/templates/navigation/menu--help.html.twig
-@@ -61,7 +61,7 @@
- If the menu item has children and javascript is enabled then this will
- be replaced with a button to show the child menu.
- #}
-- {% spaceless %}
-+ {% apply spaceless %}
-
- {# Add the user icon for the first menu item of the root element. #}
- {% if menu_level == 0 and loop.index == 1 %}
-@@ -71,7 +71,7 @@
- {% endif %}
- {{ title }}
-
-- {% endspaceless %}
-+ {% endapply %}
-
- {# If the menu item has children then we mark it as toggable and we'll
- let the dropdown javascript handle the rest. #}
diff --git a/composer.json b/composer.json
index 1d56a5406..fcb0b9f47 100644
--- a/composer.json
+++ b/composer.json
@@ -71,7 +71,7 @@
"reliefweb/simple-autocomplete": "^v1.3",
"reliefweb/simple-datepicker": "^v1.3",
"symfony/uid": "^6.2",
- "unocha/common_design": "^7.4",
+ "unocha/common_design": "^9.2",
"webflo/drupal-finder": "^1.2.2"
},
"require-dev": {
diff --git a/composer.lock b/composer.lock
index 9e5f343e2..1c4cac144 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": "706c99bd199323e0e46bd92e36ec0f88",
+ "content-hash": "0837d71de0ac6731f17067f29f58f516",
"packages": [
{
"name": "asm89/stack-cors",
@@ -550,16 +550,16 @@
},
{
"name": "composer/composer",
- "version": "2.6.3",
+ "version": "2.6.4",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "ff477832e6d838a736556d4a39a3b80f4412abfd"
+ "reference": "d75d17c16a863438027d1d96401cddcd6aa5bb60"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/ff477832e6d838a736556d4a39a3b80f4412abfd",
- "reference": "ff477832e6d838a736556d4a39a3b80f4412abfd",
+ "url": "https://api.github.com/repos/composer/composer/zipball/d75d17c16a863438027d1d96401cddcd6aa5bb60",
+ "reference": "d75d17c16a863438027d1d96401cddcd6aa5bb60",
"shasum": ""
},
"require": {
@@ -644,7 +644,7 @@
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/composer/issues",
"security": "https://github.com/composer/composer/security/policy",
- "source": "https://github.com/composer/composer/tree/2.6.3"
+ "source": "https://github.com/composer/composer/tree/2.6.4"
},
"funding": [
{
@@ -660,7 +660,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-15T07:38:22+00:00"
+ "time": "2023-09-29T08:54:47+00:00"
},
{
"name": "composer/installers",
@@ -1975,16 +1975,16 @@
},
{
"name": "doctrine/deprecations",
- "version": "v1.1.1",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
- "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
+ "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
- "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
+ "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
"shasum": ""
},
"require": {
@@ -2016,9 +2016,9 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
+ "source": "https://github.com/doctrine/deprecations/tree/1.1.2"
},
- "time": "2023-06-03T09:27:29+00:00"
+ "time": "2023-09-27T20:04:15+00:00"
},
{
"name": "doctrine/instantiator",
@@ -2297,7 +2297,7 @@
"extra": {
"drupal": {
"version": "1.0.2",
- "datestamp": "1687261951",
+ "datestamp": "1695740655",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -2716,16 +2716,16 @@
},
{
"name": "drupal/core",
- "version": "10.1.4",
+ "version": "10.1.5",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "443b8e72b4dff11cd0d6b40de5cd887c7a9bd94d"
+ "reference": "1272c35d547e844e7ebf3fe5513542291cda8cec"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/443b8e72b4dff11cd0d6b40de5cd887c7a9bd94d",
- "reference": "443b8e72b4dff11cd0d6b40de5cd887c7a9bd94d",
+ "url": "https://api.github.com/repos/drupal/core/zipball/1272c35d547e844e7ebf3fe5513542291cda8cec",
+ "reference": "1272c35d547e844e7ebf3fe5513542291cda8cec",
"shasum": ""
},
"require": {
@@ -2870,13 +2870,13 @@
],
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"support": {
- "source": "https://github.com/drupal/core/tree/10.1.4"
+ "source": "https://github.com/drupal/core/tree/10.1.5"
},
- "time": "2023-09-19T17:57:50+00:00"
+ "time": "2023-10-04T21:37:59+00:00"
},
{
"name": "drupal/core-composer-scaffold",
- "version": "10.1.4",
+ "version": "10.1.5",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-composer-scaffold.git",
@@ -2920,13 +2920,13 @@
"drupal"
],
"support": {
- "source": "https://github.com/drupal/core-composer-scaffold/tree/10.1.4"
+ "source": "https://github.com/drupal/core-composer-scaffold/tree/10.1.5"
},
"time": "2023-04-30T16:15:32+00:00"
},
{
"name": "drupal/core-dev",
- "version": "10.1.4",
+ "version": "10.1.5",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-dev.git",
@@ -2974,22 +2974,22 @@
],
"description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
"support": {
- "source": "https://github.com/drupal/core-dev/tree/10.1.4"
+ "source": "https://github.com/drupal/core-dev/tree/10.1.5"
},
"time": "2023-05-25T11:39:24+00:00"
},
{
"name": "drupal/core-recommended",
- "version": "10.1.4",
+ "version": "10.1.5",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
- "reference": "c0306542c1e9377a47ce5f6084e1bd03c32d4817"
+ "reference": "2c5cf420ddb06f3e9b624d168b724ca1c7c326e2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-recommended/zipball/c0306542c1e9377a47ce5f6084e1bd03c32d4817",
- "reference": "c0306542c1e9377a47ce5f6084e1bd03c32d4817",
+ "url": "https://api.github.com/repos/drupal/core-recommended/zipball/2c5cf420ddb06f3e9b624d168b724ca1c7c326e2",
+ "reference": "2c5cf420ddb06f3e9b624d168b724ca1c7c326e2",
"shasum": ""
},
"require": {
@@ -2998,7 +2998,7 @@
"doctrine/annotations": "~1.14.3",
"doctrine/deprecations": "~v1.1.1",
"doctrine/lexer": "~2.1.0",
- "drupal/core": "10.1.4",
+ "drupal/core": "10.1.5",
"egulias/email-validator": "~4.0.1",
"guzzlehttp/guzzle": "~7.7.0",
"guzzlehttp/psr7": "~2.5.0",
@@ -3055,9 +3055,9 @@
],
"description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.",
"support": {
- "source": "https://github.com/drupal/core-recommended/tree/10.1.4"
+ "source": "https://github.com/drupal/core-recommended/tree/10.1.5"
},
- "time": "2023-09-19T17:57:50+00:00"
+ "time": "2023-10-04T21:37:59+00:00"
},
{
"name": "drupal/ctools",
@@ -6392,16 +6392,16 @@
},
{
"name": "justinrainbow/json-schema",
- "version": "5.2.12",
+ "version": "v5.2.13",
"source": {
"type": "git",
"url": "https://github.com/justinrainbow/json-schema.git",
- "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60"
+ "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
- "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
+ "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
+ "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
"shasum": ""
},
"require": {
@@ -6456,9 +6456,9 @@
],
"support": {
"issues": "https://github.com/justinrainbow/json-schema/issues",
- "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12"
+ "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
},
- "time": "2022-04-13T08:02:27+00:00"
+ "time": "2023-09-26T02:20:38+00:00"
},
{
"name": "league/commonmark",
@@ -8542,16 +8542,16 @@
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.24.1",
+ "version": "1.24.2",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01"
+ "reference": "bcad8d995980440892759db0c32acae7c8e79442"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01",
- "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442",
+ "reference": "bcad8d995980440892759db0c32acae7c8e79442",
"shasum": ""
},
"require": {
@@ -8583,22 +8583,22 @@
"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.1"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2"
},
- "time": "2023-09-18T12:18:02+00:00"
+ "time": "2023-09-26T12:28:12+00:00"
},
{
"name": "phpstan/phpstan",
- "version": "1.10.35",
+ "version": "1.10.37",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3"
+ "reference": "058ba07e92f744d4dcf6061ae75283d0c6456f2e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e730e5facb75ffe09dfb229795e8c01a459f26c3",
- "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/058ba07e92f744d4dcf6061ae75283d0c6456f2e",
+ "reference": "058ba07e92f744d4dcf6061ae75283d0c6456f2e",
"shasum": ""
},
"require": {
@@ -8647,7 +8647,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-19T15:27:56+00:00"
+ "time": "2023-10-02T16:18:37+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
@@ -9325,16 +9325,16 @@
},
{
"name": "psr/http-client",
- "version": "1.0.2",
+ "version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-client.git",
- "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
+ "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
- "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
+ "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+ "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
"shasum": ""
},
"require": {
@@ -9371,9 +9371,9 @@
"psr-18"
],
"support": {
- "source": "https://github.com/php-fig/http-client/tree/1.0.2"
+ "source": "https://github.com/php-fig/http-client"
},
- "time": "2023-04-10T20:12:12+00:00"
+ "time": "2023-09-23T14:17:50+00:00"
},
{
"name": "psr/http-factory",
@@ -11430,16 +11430,16 @@
},
{
"name": "symfony/dependency-injection",
- "version": "v6.3.4",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "68a5a9570806a087982f383f6109c5e925892a49"
+ "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/68a5a9570806a087982f383f6109c5e925892a49",
- "reference": "68a5a9570806a087982f383f6109c5e925892a49",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ed62b3bf98346e1f45529a7b6be2196739bb993",
+ "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993",
"shasum": ""
},
"require": {
@@ -11491,7 +11491,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.4"
+ "source": "https://github.com/symfony/dependency-injection/tree/v6.3.5"
},
"funding": [
{
@@ -11507,7 +11507,7 @@
"type": "tidelift"
}
],
- "time": "2023-08-16T17:55:17+00:00"
+ "time": "2023-09-25T16:46:40+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -11645,16 +11645,16 @@
},
{
"name": "symfony/error-handler",
- "version": "v6.3.2",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "85fd65ed295c4078367c784e8a5a6cee30348b7a"
+ "reference": "1f69476b64fb47105c06beef757766c376b548c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/85fd65ed295c4078367c784e8a5a6cee30348b7a",
- "reference": "85fd65ed295c4078367c784e8a5a6cee30348b7a",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/1f69476b64fb47105c06beef757766c376b548c4",
+ "reference": "1f69476b64fb47105c06beef757766c376b548c4",
"shasum": ""
},
"require": {
@@ -11699,7 +11699,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/error-handler/tree/v6.3.2"
+ "source": "https://github.com/symfony/error-handler/tree/v6.3.5"
},
"funding": [
{
@@ -11715,7 +11715,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-16T17:05:46+00:00"
+ "time": "2023-09-12T06:57:20+00:00"
},
{
"name": "symfony/event-dispatcher",
@@ -11938,16 +11938,16 @@
},
{
"name": "symfony/finder",
- "version": "v6.3.3",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e"
+ "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/9915db259f67d21eefee768c1abcf1cc61b1fc9e",
- "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4",
+ "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4",
"shasum": ""
},
"require": {
@@ -11982,7 +11982,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v6.3.3"
+ "source": "https://github.com/symfony/finder/tree/v6.3.5"
},
"funding": [
{
@@ -11998,20 +11998,20 @@
"type": "tidelift"
}
],
- "time": "2023-07-31T08:31:44+00:00"
+ "time": "2023-09-26T12:56:25+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v6.3.4",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "cac1556fdfdf6719668181974104e6fcfa60e844"
+ "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cac1556fdfdf6719668181974104e6fcfa60e844",
- "reference": "cac1556fdfdf6719668181974104e6fcfa60e844",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b50f5e281d722cb0f4c296f908bacc3e2b721957",
+ "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957",
"shasum": ""
},
"require": {
@@ -12059,7 +12059,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.4"
+ "source": "https://github.com/symfony/http-foundation/tree/v6.3.5"
},
"funding": [
{
@@ -12075,20 +12075,20 @@
"type": "tidelift"
}
],
- "time": "2023-08-22T08:20:46+00:00"
+ "time": "2023-09-04T21:33:54+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v6.3.4",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "36abb425b4af863ae1fe54d8a8b8b4c76a2bccdb"
+ "reference": "9f991a964368bee8d883e8d57ced4fe9fff04dfc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/36abb425b4af863ae1fe54d8a8b8b4c76a2bccdb",
- "reference": "36abb425b4af863ae1fe54d8a8b8b4c76a2bccdb",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9f991a964368bee8d883e8d57ced4fe9fff04dfc",
+ "reference": "9f991a964368bee8d883e8d57ced4fe9fff04dfc",
"shasum": ""
},
"require": {
@@ -12172,7 +12172,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.4"
+ "source": "https://github.com/symfony/http-kernel/tree/v6.3.5"
},
"funding": [
{
@@ -12188,7 +12188,7 @@
"type": "tidelift"
}
],
- "time": "2023-08-26T13:54:49+00:00"
+ "time": "2023-09-30T06:37:04+00:00"
},
{
"name": "symfony/lock",
@@ -12271,16 +12271,16 @@
},
{
"name": "symfony/mime",
- "version": "v6.3.3",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "9a0cbd52baa5ba5a5b1f0cacc59466f194730f98"
+ "reference": "d5179eedf1cb2946dbd760475ebf05c251ef6a6e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/9a0cbd52baa5ba5a5b1f0cacc59466f194730f98",
- "reference": "9a0cbd52baa5ba5a5b1f0cacc59466f194730f98",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/d5179eedf1cb2946dbd760475ebf05c251ef6a6e",
+ "reference": "d5179eedf1cb2946dbd760475ebf05c251ef6a6e",
"shasum": ""
},
"require": {
@@ -12335,7 +12335,7 @@
"mime-type"
],
"support": {
- "source": "https://github.com/symfony/mime/tree/v6.3.3"
+ "source": "https://github.com/symfony/mime/tree/v6.3.5"
},
"funding": [
{
@@ -12351,7 +12351,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-31T07:08:24+00:00"
+ "time": "2023-09-29T06:59:36+00:00"
},
{
"name": "symfony/phpunit-bridge",
@@ -13561,16 +13561,16 @@
},
{
"name": "symfony/routing",
- "version": "v6.3.3",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "e7243039ab663822ff134fbc46099b5fdfa16f6a"
+ "reference": "82616e59acd3e3d9c916bba798326cb7796d7d31"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/e7243039ab663822ff134fbc46099b5fdfa16f6a",
- "reference": "e7243039ab663822ff134fbc46099b5fdfa16f6a",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/82616e59acd3e3d9c916bba798326cb7796d7d31",
+ "reference": "82616e59acd3e3d9c916bba798326cb7796d7d31",
"shasum": ""
},
"require": {
@@ -13624,7 +13624,7 @@
"url"
],
"support": {
- "source": "https://github.com/symfony/routing/tree/v6.3.3"
+ "source": "https://github.com/symfony/routing/tree/v6.3.5"
},
"funding": [
{
@@ -13640,20 +13640,20 @@
"type": "tidelift"
}
],
- "time": "2023-07-31T07:08:24+00:00"
+ "time": "2023-09-20T16:05:51+00:00"
},
{
"name": "symfony/serializer",
- "version": "v6.3.4",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
- "reference": "96d28a58d5a128bf77c54534b380eb7c92c8f846"
+ "reference": "855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/serializer/zipball/96d28a58d5a128bf77c54534b380eb7c92c8f846",
- "reference": "96d28a58d5a128bf77c54534b380eb7c92c8f846",
+ "url": "https://api.github.com/repos/symfony/serializer/zipball/855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c",
+ "reference": "855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c",
"shasum": ""
},
"require": {
@@ -13718,7 +13718,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.4"
+ "source": "https://github.com/symfony/serializer/tree/v6.3.5"
},
"funding": [
{
@@ -13734,7 +13734,7 @@
"type": "tidelift"
}
],
- "time": "2023-08-24T14:35:28+00:00"
+ "time": "2023-09-29T16:18:53+00:00"
},
{
"name": "symfony/service-contracts",
@@ -13820,16 +13820,16 @@
},
{
"name": "symfony/string",
- "version": "v6.3.2",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "53d1a83225002635bca3482fcbf963001313fb68"
+ "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68",
- "reference": "53d1a83225002635bca3482fcbf963001313fb68",
+ "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
+ "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
"shasum": ""
},
"require": {
@@ -13886,7 +13886,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v6.3.2"
+ "source": "https://github.com/symfony/string/tree/v6.3.5"
},
"funding": [
{
@@ -13902,7 +13902,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-05T08:41:27+00:00"
+ "time": "2023-09-18T10:38:32+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -14058,16 +14058,16 @@
},
{
"name": "symfony/validator",
- "version": "v6.3.4",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
- "reference": "0c8435154920b9bbe93bece675234c244cadf73b"
+ "reference": "48e815ba3b5eb72e632588dbf7ea2dc4e608ee47"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/validator/zipball/0c8435154920b9bbe93bece675234c244cadf73b",
- "reference": "0c8435154920b9bbe93bece675234c244cadf73b",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/48e815ba3b5eb72e632588dbf7ea2dc4e608ee47",
+ "reference": "48e815ba3b5eb72e632588dbf7ea2dc4e608ee47",
"shasum": ""
},
"require": {
@@ -14134,7 +14134,7 @@
"description": "Provides tools to validate values",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/validator/tree/v6.3.4"
+ "source": "https://github.com/symfony/validator/tree/v6.3.5"
},
"funding": [
{
@@ -14150,20 +14150,20 @@
"type": "tidelift"
}
],
- "time": "2023-08-17T15:49:05+00:00"
+ "time": "2023-09-29T07:41:15+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v6.3.4",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "2027be14f8ae8eae999ceadebcda5b4909b81d45"
+ "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2027be14f8ae8eae999ceadebcda5b4909b81d45",
- "reference": "2027be14f8ae8eae999ceadebcda5b4909b81d45",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3d9999376be5fea8de47752837a3e1d1c5f69ef5",
+ "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5",
"shasum": ""
},
"require": {
@@ -14218,7 +14218,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v6.3.4"
+ "source": "https://github.com/symfony/var-dumper/tree/v6.3.5"
},
"funding": [
{
@@ -14234,7 +14234,7 @@
"type": "tidelift"
}
],
- "time": "2023-08-24T14:51:05+00:00"
+ "time": "2023-09-12T10:11:35+00:00"
},
{
"name": "symfony/var-exporter",
@@ -14563,32 +14563,33 @@
},
{
"name": "unocha/common_design",
- "version": "v7.4.1",
+ "version": "v9.2.0",
"source": {
"type": "git",
"url": "https://github.com/UN-OCHA/common_design.git",
- "reference": "b803f6b303bfcc2a46b5d2d531189832679d820a"
+ "reference": "d390483e4edd0720fcc66bd98e94ecfd4fa92896"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/b803f6b303bfcc2a46b5d2d531189832679d820a",
- "reference": "b803f6b303bfcc2a46b5d2d531189832679d820a",
+ "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/d390483e4edd0720fcc66bd98e94ecfd4fa92896",
+ "reference": "d390483e4edd0720fcc66bd98e94ecfd4fa92896",
"shasum": ""
},
"require": {
- "composer/installers": "^1.2"
+ "composer/installers": "^1.2",
+ "drupal/stable": "^2.0"
},
"type": "drupal-theme",
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-only"
],
- "description": "OCHA Common Design base theme for Drupal 8",
+ "description": "OCHA Common Design base theme for Drupal 9+",
"support": {
"issues": "https://github.com/UN-OCHA/common_design/issues",
- "source": "https://github.com/UN-OCHA/common_design/tree/v7.4.1"
+ "source": "https://github.com/UN-OCHA/common_design/tree/v9.2.0"
},
- "time": "2023-01-10T14:13:58+00:00"
+ "time": "2023-09-28T07:31:27+00:00"
},
{
"name": "webflo/drupal-finder",
diff --git a/composer.patches.json b/composer.patches.json
index ee60a8d09..b536c57cc 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -27,9 +27,6 @@
},
"drush/drush": {
"https://humanitarian.atlassian.net/browse/OPS-8026": "PATCHES/drush--timeout-override.patch"
- },
- "unocha/common_design": {
- "Drupal 10 compatibility": "PATCHES/common_design-drupal-10-compatibility.patch"
}
}
}
diff --git a/config/filter.format.markdown_editor.yml b/config/filter.format.markdown_editor.yml
index beb80d89b..16e6c1add 100644
--- a/config/filter.format.markdown_editor.yml
+++ b/config/filter.format.markdown_editor.yml
@@ -3,7 +3,10 @@ langcode: en
status: true
dependencies:
module:
+ - editor
+ - media
- reliefweb_fields
+ - reliefweb_guidelines
- reliefweb_utility
name: 'Markdown with Editor'
format: markdown_editor
@@ -13,7 +16,7 @@ filters:
id: filter_html
provider: filter
status: true
- weight: -10
+ weight: -49
settings:
allowed_html: '