Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare upgrade to 11 core #61

Draft
wants to merge 27 commits into
base: 1.x
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
57ef0ff
Add back drupal/lb_ux module
andypost Jun 7, 2023
5d0e6d1
Removed patch from composer.json
jf-skilld Jul 11, 2023
e55c32d
Removed patch from composer.json
jf-skilld Jul 11, 2023
8e69f19
Removed patch from composer.json
jf-skilld Jul 11, 2023
14895a0
Merge branch 'main' into main
jf-skilld Jul 11, 2023
66ce576
Merge pull request #39 from jf-skilld/main
jf-skilld Jul 11, 2023
cb9e2e3
add patch for drupal/userprotect
andypost Jul 28, 2023
4b0df98
Updated symfony_mailer and added needed patch (#40)
temlife Aug 11, 2023
2446221
Remove patch as 1.3.1 is out
andypost Aug 11, 2023
c7e5840
Add focal_point patch
temlife Nov 10, 2023
6dbe5a5
Merge pull request #44 from temlife/main
temlife Nov 13, 2023
c7a894b
Removing dblog from modules enabled by profile
davidferlay Dec 8, 2023
9a831af
Removed patch from composer.json
jf-skilld Apr 22, 2024
450f6b1
Merge pull request #55 from jf-skilld/main
temlife Apr 22, 2024
3d07e0a
Add log_stdout
jf-skilld Apr 22, 2024
a224adf
Enable log_stdout by default
jf-skilld Apr 22, 2024
dd86f24
Require 10.0.9
andypost Apr 17, 2023
8b49a77
Set core_version_requirement to 10 only
andypost Jun 7, 2023
60b4e50
https://www.drupal.org/sa-contrib-2023-031 and https://www.drupal.org…
andypost Aug 11, 2023
f542ecf
Require drupal/core >= 10.1.4 (#48)
andypost Dec 19, 2023
38d4156
Require drupal/core >=10.2.0
andypost Dec 19, 2023
37cd5b7
Update dependency and configs to CKeditor 5
Sergey-Orlov Jan 12, 2024
8cfa12e
Get rid of webp requirement in info file
koskinpark Feb 12, 2024
13c2d9d
Removed patch from composer.json
jf-skilld Apr 22, 2024
9014f4b
Update core and patches for Drupal 10.3
Sergey-Orlov Jun 24, 2024
5a1b842
Removed User protect patch -#3349663 Closed (fixed)
jf-skilld Jul 9, 2024
7cacbb1
Prepare upgrade to 11 core
andypost Jul 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,21 @@
"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.3 || ^11.0",
"drupal/custom_pub": "^1.0",
"drupal/file_entity": "dev-2.x",
"drupal/focal_point": "^2.0",
"drupal/focal_point": "^2.1",
"drupal/formblock": "^2.0@beta",
"drupal/gin": "^3.0@alpha",
"drupal/google_tag": "^2.0",
"drupal/imagemagick": "^4.0",
"drupal/layout_builder_modal": "^1.1",
"drupal/layout_builder_restrictions": "^2.7",
"drupal/layout_builder_restrictions": "^3.0",
"drupal/layout_library": "^1.0@beta",
"drupal/layout_paragraphs": "^2.0",
"drupal/manage_display": "^2.0@beta",
"drupal/lb_ux": "1.x@dev",
"drupal/log_stdout": "^1.5",
"drupal/manage_display": "^3.0",
"drupal/menu_admin_per_menu": "^1.1",
"drupal/menu_link_attributes": "^1.1",
"drupal/page_manager": "^4.0@beta",
Expand All @@ -46,15 +49,14 @@
"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",
"drupal/userprotect": "^1.1",
"drupal/views_bulk_edit": "^2",
"drupal/userprotect": "^1.3",
"drupal/views_bulk_edit": "^3.0",
"drupal/views_bulk_operations": "^4.2",
"drupal/webform": "^6.1",
"drupal/webp": "^1.0@beta"
"drupal/webform": "^6.1"
},
"conflict": {
"drupal/drupal": "*"
Expand Down Expand Up @@ -88,17 +90,16 @@
"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",
"Expose Layout Builder data to REST and JSON:API": "https://www.drupal.org/files/issues/2024-06-21/2942975-262-reroll.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"
"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",
Expand All @@ -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"
},
Expand Down
119 changes: 69 additions & 50 deletions config/install/editor.editor.basic_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- '<cite>'
- '<dl>'
- '<dt>'
- '<dd>'
- '<span>'
- '<img src alt height width data-entity-type data-entity-uuid data-align data-caption>'
- '<h2 id>'
- '<h3 id>'
- '<h4 id>'
- '<h5 id>'
- '<h6 id>'
- '<a hreflang>'
- '<blockquote cite>'
- '<ul type>'
- '<ol type>'
- '<drupal-media title>'
media_media:
allow_view_mode_override: false
image_upload:
status: false
scheme: public
Expand Down
146 changes: 95 additions & 51 deletions config/install/editor.editor.full_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,65 +4,109 @@ dependencies:
config:
- filter.format.full_html
module:
- ckeditor
- ckeditor5
format: full_html
editor: ckeditor
editor: ckeditor5
settings:
toolbar:
rows:
-
items:
- heading
- codeBlock
- bold
- italic
- underline
- blockQuote
- strikethrough
- superscript
- subscript
- removeFormat
- alignment
- textPartLanguage
- horizontalLine
- insertTable
- specialCharacters
- showBlocks
- drupalMedia
- '|'
- link
- '|'
- bulletedList
- numberedList
- outdent
- indent
- '|'
- undo
- redo
- sourceEditing
plugins:
ckeditor5_alignment:
enabled_alignments:
- center
- justify
- left
- right
ckeditor5_codeBlock:
languages:
-
name: Formatting
items:
- Format
- Bold
- Italic
- Underline
- Blockquote
- Strike
- Superscript
- Subscript
- '-'
- RemoveFormat
- JustifyLeft
- JustifyCenter
- JustifyRight
- JustifyBlock
- Language
- HorizontalRule
- Table
- SpecialChar
- ShowBlocks
- DrupalMediaLibrary
label: 'Plain text'
language: plaintext
-
name: Linking
items:
- DrupalLink
- DrupalUnlink
label: C
language: c
-
name: Lists
items:
- BulletedList
- NumberedList
- Outdent
- Indent
label: 'C#'
language: cs
-
name: Tools
items:
- Undo
- Redo
- Cut
- Copy
- Paste
- PasteText
- PasteFromWord
- Maximize
- Source
plugins:
stylescombo:
styles: ''
language:
label: C++
language: cpp
-
label: CSS
language: css
-
label: Diff
language: diff
-
label: HTML
language: html
-
label: Java
language: java
-
label: JavaScript
language: javascript
-
label: PHP
language: php
-
label: Python
language: python
-
label: Ruby
language: ruby
-
label: TypeScript
language: typescript
-
label: XML
language: xml
ckeditor5_heading:
enabled_headings:
- heading2
- heading3
- heading4
- heading5
- heading6
ckeditor5_language:
language_list: un
ckeditor5_list:
properties:
reversed: true
startIndex: true
multiBlock: true
ckeditor5_sourceEditing:
allowed_tags: { }
media_media:
allow_view_mode_override: false
image_upload:
status: false
scheme: public
Expand Down
Loading