diff --git a/composer.lock b/composer.lock index 8d547c02..4009bb45 100644 --- a/composer.lock +++ b/composer.lock @@ -4022,16 +4022,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "e8a7a7e74cd2f77d322c352d0778276df2bd1be6" + "reference": "a01a197d7dcef0dcd10935c41955b69c6d216385" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/e8a7a7e74cd2f77d322c352d0778276df2bd1be6", - "reference": "e8a7a7e74cd2f77d322c352d0778276df2bd1be6", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/a01a197d7dcef0dcd10935c41955b69c6d216385", + "reference": "a01a197d7dcef0dcd10935c41955b69c6d216385", "shasum": "" }, "require": { @@ -4049,23 +4049,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.4", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2023-02-17T12:43:22+00:00" + "time": "2023-04-04T08:26:28+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "3.0.20", + "version": "3.0.22", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "adee6ff048849a42f01f78d539264b6e160482ac" + "reference": "20a7e2ad05e3fbb593717a202d7ec1a549a1dfc9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/adee6ff048849a42f01f78d539264b6e160482ac", - "reference": "adee6ff048849a42f01f78d539264b6e160482ac", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/20a7e2ad05e3fbb593717a202d7ec1a549a1dfc9", + "reference": "20a7e2ad05e3fbb593717a202d7ec1a549a1dfc9", "shasum": "" }, "require": { @@ -4167,10 +4167,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.20", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.22", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-04-04T07:00:17+00:00" + "time": "2023-04-04T14:34:12+00:00" }, { "name": "drupal/helfi_proxy", @@ -9905,25 +9905,25 @@ }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -9952,9 +9952,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/1.1" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index bf95a00c..335af97b 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -51,7 +51,6 @@ module: helfi_media_chart: 0 helfi_media_map: 0 helfi_media_remote_video: 0 - helfi_navigation: 0 helfi_node_announcement: 0 helfi_node_landing_page: 0 helfi_node_page: 0 @@ -147,6 +146,7 @@ module: views_bulk_edit: 0 views_bulk_operations: 0 views_ui: 0 + helfi_navigation: 1 pathauto: 1 content_translation: 10 externalauth: 10 diff --git a/conf/cmi/editor.editor.full_html.yml b/conf/cmi/editor.editor.full_html.yml index 0bfe4697..e77387c1 100644 --- a/conf/cmi/editor.editor.full_html.yml +++ b/conf/cmi/editor.editor.full_html.yml @@ -7,7 +7,7 @@ dependencies: module: - ckeditor _core: - default_config_hash: w_dt4BUk1J2csCeQd-yMvz54ANhBzvUDGbH_hpXw6pI + default_config_hash: mx77BnIuTY8Yrm6IkLsHnEOv6JJrHPMD_kKgjP0DVi4 format: full_html editor: ckeditor settings: diff --git a/conf/cmi/editor.editor.minimal.yml b/conf/cmi/editor.editor.minimal.yml index 24c173ee..3a737eb7 100644 --- a/conf/cmi/editor.editor.minimal.yml +++ b/conf/cmi/editor.editor.minimal.yml @@ -7,7 +7,7 @@ dependencies: module: - ckeditor _core: - default_config_hash: HEqlBl4yZwyvwM419DdClQNeHaD3d5x3pSB-0brI7oM + default_config_hash: UYVamJgeMVQeM3VYumbShc-tGJoYe4RhrXqiL_tJw4c format: minimal editor: ckeditor settings: diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml index d2defe7e..a35f6e2d 100644 --- a/conf/cmi/filter.format.full_html.yml +++ b/conf/cmi/filter.format.full_html.yml @@ -7,7 +7,7 @@ dependencies: - helfi_api_base - linkit _core: - default_config_hash: hsCqbtPIdEork-LODvqtOKTOyz6y1_6AtNMA-1QF8fw + default_config_hash: nhRyMD2DLIUZvFqqCGT5FZbfF9HUbPbm_B7Uz8-6E_E name: HTML format: full_html weight: 0 @@ -24,7 +24,7 @@ filters: status: true weight: -50 settings: - allowed_html: '