From 57ef0ffdf6c9183badf2ef83a0ef79eb27fe1861 Mon Sep 17 00:00:00 2001 From: Andy Postnikov Date: Wed, 7 Jun 2023 21:46:16 +0200 Subject: [PATCH 01/23] Add back drupal/lb_ux module --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7eb15c0..49603a0 100644 --- a/composer.json +++ b/composer.json @@ -30,6 +30,7 @@ "drupal/layout_builder_restrictions": "^2.7", "drupal/layout_library": "^1.0@beta", "drupal/layout_paragraphs": "^2.0", + "drupal/lb_ux": "1.x@dev", "drupal/manage_display": "^2.0@beta", "drupal/menu_admin_per_menu": "^1.1", "drupal/menu_link_attributes": "^1.1", @@ -108,7 +109,6 @@ "Profile block config schema": "https://www.drupal.org/files/issues/2023-01-18/missing_config_schema_blocks-3073274-3323373.patch" }, "drupal/lb_ux": { - "D10 and PHP 8.2": "https://git.drupalcode.org/project/lb_ux/-/merge_requests/2.diff", "Cog icon not showing when Preview disabled": "https://www.drupal.org/files/issues/2020-05-22/3116402-8.patch", "Errors when using with modules that alter a section's contextual menu": "https://www.drupal.org/files/issues/2020-05-22/3106939-4.patch" }, From 5d0e6d11c044ba6213920788cc285b55b9ec8089 Mon Sep 17 00:00:00 2001 From: Julien Fresique Date: Tue, 11 Jul 2023 14:42:34 +0200 Subject: [PATCH 02/23] Removed patch from composer.json --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index 49603a0..8c213a3 100644 --- a/composer.json +++ b/composer.json @@ -95,9 +95,6 @@ "Allow field blocks to display the configuration label when set in Layout Builder": "https://www.drupal.org/files/issues/2021-08-17/3039185-46.patch", "Add multilingual support for caching basefield definitions": "https://www.drupal.org/files/issues/2022-02-27/3114824-9.patch" }, - "drupal/block_content_permissions": { - "Allow accessing the Custom block library page without Administer blocks permission": "https://www.drupal.org/files/issues/2020-06-05/block_content_permissions-access_listing_page-2920739-31.patch" - }, "drupal/focal_point": { "Integrate focal point with media_library": "https://www.drupal.org/files/issues/2019-12-11/focal_point-compatibility-with-media-libary-3094478-2.patch" }, From e55c32df9504bc0738c41b712d7bf3628ce94a56 Mon Sep 17 00:00:00 2001 From: Julien Fresique Date: Tue, 11 Jul 2023 14:42:34 +0200 Subject: [PATCH 03/23] Removed patch from composer.json --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index 49603a0..8c213a3 100644 --- a/composer.json +++ b/composer.json @@ -95,9 +95,6 @@ "Allow field blocks to display the configuration label when set in Layout Builder": "https://www.drupal.org/files/issues/2021-08-17/3039185-46.patch", "Add multilingual support for caching basefield definitions": "https://www.drupal.org/files/issues/2022-02-27/3114824-9.patch" }, - "drupal/block_content_permissions": { - "Allow accessing the Custom block library page without Administer blocks permission": "https://www.drupal.org/files/issues/2020-06-05/block_content_permissions-access_listing_page-2920739-31.patch" - }, "drupal/focal_point": { "Integrate focal point with media_library": "https://www.drupal.org/files/issues/2019-12-11/focal_point-compatibility-with-media-libary-3094478-2.patch" }, From 8e69f1960158607f465b2ea4318b6102ba58d985 Mon Sep 17 00:00:00 2001 From: Julien Fresique Date: Tue, 11 Jul 2023 15:59:36 +0200 Subject: [PATCH 04/23] Removed patch from composer.json --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8c213a3..c5420f1 100644 --- a/composer.json +++ b/composer.json @@ -92,9 +92,11 @@ "Claro + layout builder messages display additional icon in top left corner": "https://www.drupal.org/files/issues/2022-12-15/3143237-74.patch", "Expose Layout Builder data to REST and JSON:API": "https://www.drupal.org/files/issues/2023-02-08/2942975-230.patch", "Taxonomy pages crash with layout_builder enabled": "https://www.drupal.org/files/issues/2018-09-19/2959132-taxo-17-PASS.patch", - "Allow field blocks to display the configuration label when set in Layout Builder": "https://www.drupal.org/files/issues/2021-08-17/3039185-46.patch", "Add multilingual support for caching basefield definitions": "https://www.drupal.org/files/issues/2022-02-27/3114824-9.patch" }, + "drupal/block_content_permissions": { + "Allow accessing the Custom block library page without Administer blocks permission": "https://www.drupal.org/files/issues/2020-06-05/block_content_permissions-access_listing_page-2920739-31.patch" + }, "drupal/focal_point": { "Integrate focal point with media_library": "https://www.drupal.org/files/issues/2019-12-11/focal_point-compatibility-with-media-libary-3094478-2.patch" }, From cb9e2e3ff2b326dd8f38d40ed40bab763b73943d Mon Sep 17 00:00:00 2001 From: Andy Postnikov Date: Fri, 28 Jul 2023 13:29:18 +0200 Subject: [PATCH 05/23] add patch for drupal/userprotect --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c5420f1..4f0f233 100644 --- a/composer.json +++ b/composer.json @@ -95,7 +95,7 @@ "Add multilingual support for caching basefield definitions": "https://www.drupal.org/files/issues/2022-02-27/3114824-9.patch" }, "drupal/block_content_permissions": { - "Allow accessing the Custom block library page without Administer blocks permission": "https://www.drupal.org/files/issues/2020-06-05/block_content_permissions-access_listing_page-2920739-31.patch" + "Allow accessing the Custom block library page without Administer blocks permission": "https://www.drupal.org/files/issues/2020-06-05/block_content_permissions-access_listing_page-2920739-31.patch" }, "drupal/focal_point": { "Integrate focal point with media_library": "https://www.drupal.org/files/issues/2019-12-11/focal_point-compatibility-with-media-libary-3094478-2.patch" @@ -114,6 +114,9 @@ "drupal/menu_link_attributes": { "Add missing schema for menu_link_attributes": "https://patch-diff.githubusercontent.com/raw/yannickoo/menu_link_attributes/pull/52.patch" }, + "drupal/userprotect": { + "Call to a member function grantPermission() on null in userprotect_install()": "https://www.drupal.org/files/issues/2023-07-28/3349663-8.patch" + }, "drupal/gin": { "Missing config schema": "https://www.drupal.org/files/issues/2022-05-09/missing_config_schema_3279472.patch" } From 4b0df98655991e2d0db249a544aefdd13b31ba4a Mon Sep 17 00:00:00 2001 From: qmarie <77155883+temlife@users.noreply.github.com> Date: Fri, 11 Aug 2023 12:45:04 +0200 Subject: [PATCH 06/23] Updated symfony_mailer and added needed patch (#40) --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4f0f233..9fbca2b 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "drupal/role_delegation": "^1.1", "drupal/seckit": "^2.0", "drupal/svg_image": "^3.0", - "drupal/symfony_mailer": "^1.2", + "drupal/symfony_mailer": "^1.3", "drupal/telephone_validation": "^2.4", "drupal/token": "^1", "drupal/username_enumeration_prevention": "^1.1", @@ -119,6 +119,9 @@ }, "drupal/gin": { "Missing config schema": "https://www.drupal.org/files/issues/2022-05-09/missing_config_schema_3279472.patch" + }, + "drupal/symfony_mailer": { + "Upgrade leads to array_merge(): Argument #2 must be of type array, null given": "https://www.drupal.org/files/issues/2023-08-06/symfony_mailer.upgrade-error.3378860-5.patch" } } } From 244622101abe07f531218248526f5ee4154dea4e Mon Sep 17 00:00:00 2001 From: Andy Postnikov Date: Fri, 11 Aug 2023 12:54:19 +0200 Subject: [PATCH 07/23] Remove patch as 1.3.1 is out --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 9fbca2b..73b52de 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "drupal/role_delegation": "^1.1", "drupal/seckit": "^2.0", "drupal/svg_image": "^3.0", - "drupal/symfony_mailer": "^1.3", + "drupal/symfony_mailer": "^1.3.1", "drupal/telephone_validation": "^2.4", "drupal/token": "^1", "drupal/username_enumeration_prevention": "^1.1", @@ -119,9 +119,6 @@ }, "drupal/gin": { "Missing config schema": "https://www.drupal.org/files/issues/2022-05-09/missing_config_schema_3279472.patch" - }, - "drupal/symfony_mailer": { - "Upgrade leads to array_merge(): Argument #2 must be of type array, null given": "https://www.drupal.org/files/issues/2023-08-06/symfony_mailer.upgrade-error.3378860-5.patch" } } } From c7e584068cfad4b0b63bbda7ca6a1122a969c81f Mon Sep 17 00:00:00 2001 From: Quentin Marie Date: Fri, 10 Nov 2023 15:37:05 +0100 Subject: [PATCH 08/23] Add focal_point patch --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 73b52de..41ff9d1 100644 --- a/composer.json +++ b/composer.json @@ -98,7 +98,8 @@ "Allow accessing the Custom block library page without Administer blocks permission": "https://www.drupal.org/files/issues/2020-06-05/block_content_permissions-access_listing_page-2920739-31.patch" }, "drupal/focal_point": { - "Integrate focal point with media_library": "https://www.drupal.org/files/issues/2019-12-11/focal_point-compatibility-with-media-libary-3094478-2.patch" + "Integrate focal point with media_library": "https://www.drupal.org/files/issues/2019-12-11/focal_point-compatibility-with-media-libary-3094478-2.patch", + "Error: Call to a member function isNew() on null in focal_point_entity_update()": "https://www.drupal.org/files/issues/2021-03-18/fix-error-call-a-member-is-new-on-null-3105826-11.patch" }, "drupal/formblock": { "Feature: Node edit form block": "https://www.drupal.org/files/issues/2020-12-07/formblock-node_edit_form-3090910-5.patch", From c7a894b81e76eced10f9b259e38917e7085bc7b5 Mon Sep 17 00:00:00 2001 From: David Ferlay Date: Fri, 8 Dec 2023 15:49:33 +0100 Subject: [PATCH 09/23] Removing dblog from modules enabled by profile --- druxxy.info.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/druxxy.info.yml b/druxxy.info.yml index f7b1726..bb85919 100644 --- a/druxxy.info.yml +++ b/druxxy.info.yml @@ -22,7 +22,6 @@ dependencies: - custom_pub - datetime - datetime_range - - dblog - dynamic_page_cache - editor - field From 9a831afa824ef863e0baf1a7f07972ff84e7acc6 Mon Sep 17 00:00:00 2001 From: Julien Fresique Date: Mon, 22 Apr 2024 15:26:51 +0200 Subject: [PATCH 10/23] Removed patch from composer.json --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 41ff9d1..cee15e0 100644 --- a/composer.json +++ b/composer.json @@ -89,7 +89,6 @@ "drupal/core": { "Fix multilingual site's layout edit context issue": "https://www.drupal.org/files/issues/2019-12-19/3101231-19.patch", "Callers of LayoutEntityHelperTrait::getEntitySections() do not account for the view mode": "https://www.drupal.org/files/issues/2022-12-15/3008924-42.patch", - "Claro + layout builder messages display additional icon in top left corner": "https://www.drupal.org/files/issues/2022-12-15/3143237-74.patch", "Expose Layout Builder data to REST and JSON:API": "https://www.drupal.org/files/issues/2023-02-08/2942975-230.patch", "Taxonomy pages crash with layout_builder enabled": "https://www.drupal.org/files/issues/2018-09-19/2959132-taxo-17-PASS.patch", "Add multilingual support for caching basefield definitions": "https://www.drupal.org/files/issues/2022-02-27/3114824-9.patch" From 3d07e0ab91e34aa49c113f834d11504470eef40f Mon Sep 17 00:00:00 2001 From: Julien Fresique Date: Mon, 22 Apr 2024 16:21:16 +0200 Subject: [PATCH 11/23] Add log_stdout --- composer.json | 1 + config/install/log_stdout.settings.yml | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 config/install/log_stdout.settings.yml diff --git a/composer.json b/composer.json index cee15e0..a7ee1a1 100644 --- a/composer.json +++ b/composer.json @@ -31,6 +31,7 @@ "drupal/layout_library": "^1.0@beta", "drupal/layout_paragraphs": "^2.0", "drupal/lb_ux": "1.x@dev", + "drupal/log_stdout": "^1.5", "drupal/manage_display": "^2.0@beta", "drupal/menu_admin_per_menu": "^1.1", "drupal/menu_link_attributes": "^1.1", diff --git a/config/install/log_stdout.settings.yml b/config/install/log_stdout.settings.yml new file mode 100644 index 0000000..13cabd5 --- /dev/null +++ b/config/install/log_stdout.settings.yml @@ -0,0 +1,4 @@ +_core: + default_config_hash: CkmpJe8_0UrxS99diNYffcf6SJcbRtIxgQTeCOxeOhQ +format: '[@severity] [@type] [@date] @message | uid: @uid | request-uri: @request_uri | refer: @referer | ip: @ip | link: @link' +use_stderr: '0' From a224adf7dec4bdde5b9bc740d5a6a41a365460f2 Mon Sep 17 00:00:00 2001 From: Julien Fresique Date: Mon, 22 Apr 2024 17:01:23 +0200 Subject: [PATCH 12/23] Enable log_stdout by default --- druxxy.info.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/druxxy.info.yml b/druxxy.info.yml index bb85919..2637daf 100644 --- a/druxxy.info.yml +++ b/druxxy.info.yml @@ -45,6 +45,7 @@ dependencies: - layout_paragraphs - link - locale + - log_stdout - manage_display - media - media_library From dd86f243c963e2ec0d6b5ebf7b26f5d2ed876676 Mon Sep 17 00:00:00 2001 From: Andy Postnikov Date: Mon, 17 Apr 2023 18:49:42 +0200 Subject: [PATCH 13/23] Require 10.0.9 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a7ee1a1..e6af8fb 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "drupal/block_content_permissions": "^1.11", "drupal/coffee": "^1.3", "drupal/config_override_warn": "^1.4", - "drupal/core-recommended": "^9.5.9 || ^10.0", + "drupal/core-recommended": "^10.0.9", "drupal/custom_pub": "^1.0", "drupal/file_entity": "dev-2.x", "drupal/focal_point": "^2.0", From 8b49a7771bd81ba3aba0edf793f5f997bfd23ae9 Mon Sep 17 00:00:00 2001 From: Andy Postnikov Date: Wed, 7 Jun 2023 18:45:38 +0200 Subject: [PATCH 14/23] Set core_version_requirement to 10 only --- druxxy.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/druxxy.info.yml b/druxxy.info.yml index 2637daf..90ae433 100644 --- a/druxxy.info.yml +++ b/druxxy.info.yml @@ -1,7 +1,7 @@ name: Druxxy type: profile description: 'Skilld Drupal installation profile' -core_version_requirement: ^8 || ^9 || ^10 +core_version_requirement: ^10 dependencies: - automated_cron From 60b4e5070fc83924bfda33322522e8d20aece53f Mon Sep 17 00:00:00 2001 From: Andy Postnikov Date: Fri, 11 Aug 2023 12:57:58 +0200 Subject: [PATCH 15/23] https://www.drupal.org/sa-contrib-2023-031 and https://www.drupal.org/node/3354665 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e6af8fb..3b21893 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ "drupal/role_delegation": "^1.1", "drupal/seckit": "^2.0", "drupal/svg_image": "^3.0", - "drupal/symfony_mailer": "^1.3.1", + "drupal/symfony_mailer": "^1.3", "drupal/telephone_validation": "^2.4", "drupal/token": "^1", "drupal/username_enumeration_prevention": "^1.1", From f542ecf02d899d21016194390a800b6a43fbdae0 Mon Sep 17 00:00:00 2001 From: Andy Postnikov Date: Tue, 19 Dec 2023 14:46:07 +0100 Subject: [PATCH 16/23] Require drupal/core >= 10.1.4 (#48) - the last security release and new release for 10.1 compatibility - patch drupal.org/i/3039185 commited to 10.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3b21893..0670da4 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "drupal/block_content_permissions": "^1.11", "drupal/coffee": "^1.3", "drupal/config_override_warn": "^1.4", - "drupal/core-recommended": "^10.0.9", + "drupal/core-recommended": "^10.1.4", "drupal/custom_pub": "^1.0", "drupal/file_entity": "dev-2.x", "drupal/focal_point": "^2.0", From 38d41569fb6df2423d7926580a87ef633d06cb87 Mon Sep 17 00:00:00 2001 From: Andy Postnikov Date: Tue, 19 Dec 2023 14:57:45 +0100 Subject: [PATCH 17/23] Require drupal/core >=10.2.0 --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0670da4..4f8a6c3 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "drupal/block_content_permissions": "^1.11", "drupal/coffee": "^1.3", "drupal/config_override_warn": "^1.4", - "drupal/core-recommended": "^10.1.4", + "drupal/core-recommended": "^10.2.0", "drupal/custom_pub": "^1.0", "drupal/file_entity": "dev-2.x", "drupal/focal_point": "^2.0", @@ -90,6 +90,7 @@ "drupal/core": { "Fix multilingual site's layout edit context issue": "https://www.drupal.org/files/issues/2019-12-19/3101231-19.patch", "Callers of LayoutEntityHelperTrait::getEntitySections() do not account for the view mode": "https://www.drupal.org/files/issues/2022-12-15/3008924-42.patch", + "Claro + layout builder messages display additional icon in top left corner": "https://www.drupal.org/files/issues/2023-12-17/3143237-83.patch", "Expose Layout Builder data to REST and JSON:API": "https://www.drupal.org/files/issues/2023-02-08/2942975-230.patch", "Taxonomy pages crash with layout_builder enabled": "https://www.drupal.org/files/issues/2018-09-19/2959132-taxo-17-PASS.patch", "Add multilingual support for caching basefield definitions": "https://www.drupal.org/files/issues/2022-02-27/3114824-9.patch" From 37cd5b7b8ae583336a18dc91ec725108a250fb20 Mon Sep 17 00:00:00 2001 From: sorlov Date: Fri, 12 Jan 2024 10:36:33 +0600 Subject: [PATCH 18/23] Update dependency and configs to CKeditor 5 --- config/install/editor.editor.basic_html.yml | 119 ++++++++------ config/install/editor.editor.full_html.yml | 146 ++++++++++++------ .../install/editor.editor.restricted_html.yml | 122 ++++++++------- config/install/filter.format.basic_html.yml | 28 ++-- config/install/filter.format.full_html.yml | 30 ++-- .../install/filter.format.restricted_html.yml | 14 +- druxxy.info.yml | 2 +- 7 files changed, 271 insertions(+), 190 deletions(-) diff --git a/config/install/editor.editor.basic_html.yml b/config/install/editor.editor.basic_html.yml index 4bf4a52..5d2b713 100644 --- a/config/install/editor.editor.basic_html.yml +++ b/config/install/editor.editor.basic_html.yml @@ -4,61 +4,80 @@ dependencies: config: - filter.format.basic_html module: - - ckeditor + - ckeditor5 format: basic_html -editor: ckeditor +editor: ckeditor5 settings: toolbar: - rows: - - - - - name: Formatting - items: - - Format - - Bold - - Italic - - Underline - - Blockquote - - Strike - - Superscript - - Subscript - - RemoveFormat - - JustifyLeft - - JustifyCenter - - JustifyRight - - JustifyBlock - - Language - - HorizontalRule - - Table - - DrupalMediaLibrary - - - name: Links - items: - - DrupalLink - - DrupalUnlink - - - name: Lists - items: - - BulletedList - - NumberedList - - Outdent - - Indent - - - name: Tools - items: - - Undo - - Redo - - Cut - - Copy - - PasteText - - Paste - - PasteFromWord - - Maximize + items: + - heading + - bold + - italic + - underline + - blockQuote + - strikethrough + - superscript + - subscript + - removeFormat + - alignment + - textPartLanguage + - horizontalLine + - insertTable + - drupalMedia + - '|' + - link + - '|' + - bulletedList + - numberedList + - outdent + - indent + - '|' + - undo + - redo + - '|' + - code + - sourceEditing plugins: - stylescombo: - styles: '' - language: + ckeditor5_alignment: + enabled_alignments: + - center + - justify + - left + - right + ckeditor5_heading: + enabled_headings: + - heading2 + - heading3 + - heading4 + - heading5 + - heading6 + ckeditor5_language: language_list: un + ckeditor5_list: + properties: + reversed: false + startIndex: true + multiBlock: true + ckeditor5_sourceEditing: + allowed_tags: + - '' + - '
' + - '
' + - '
' + - '' + - '' + - '

' + - '

' + - '

' + - '

' + - '
' + - '' + - '
' + - '