Skip to content

Commit ecdbeb5

Browse files
committed
D11
update custom modules to work with D11 update update ckeditor_templates remove tide_test module from composer.json fixed media widget update add patches back bump lesstif/php-jira-rest-client use cweagans/composer-patches ^1.6 version. D11 upgrade. fixes simple_oauth update hook issue. Fixes status page error. add missed modules. Updates ckeditor template configs. add content_lock patch user_roles function is deprecated update patches. 1. elasticsearch_connector 2. views_data_export update jira_rest lints # Conflicts: # composer.json
1 parent b3fafec commit ecdbeb5

78 files changed

Lines changed: 1098 additions & 1273 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

composer.dev.json

Lines changed: 374 additions & 475 deletions
Large diffs are not rendered by default.

composer.json

Lines changed: 451 additions & 460 deletions
Large diffs are not rendered by default.

config/install/ckeditor_templates.ckeditor_templates.blockquote.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ id: blockquote
55
label: Blockquote
66
description: 'Blockquote with 2 lines of caption'
77
thumb: { }
8-
code: "<blockquote class=\"quotation\">\r\n<p>Berios sim destrum facientota nis ex eost aut prae vendis explam aliquis dolorpo rrorem reptaep elenis net.</p>\r\n\r\n<footer><cite><span class=\"quotation__author\">Her Excellency the Honourable Linda Dessau AC</span><br />\r\n<span class=\"quotation__author-title\">Governor of Victoria</span> </cite></footer>\r\n</blockquote>\r\n"
8+
code:
9+
value: '<blockquote class="quotation"><p>Berios sim destrum facientota nis ex eost aut prae vendis explam aliquis dolorpo rrorem reptaep elenis net.</p><footer><cite><span class="quotation__author">Her Excellency the Honourable Linda Dessau AC</span><br /><span class="quotation__author-title">Governor of Victoria</span></cite></footer></blockquote>'
10+
format: rich_text
911
formats:
1012
rich_text: rich_text
1113
summary_text: summary_text
1214
admin_text: admin_text
1315
weight: 0
16+
thumb_alternative: ''

config/install/ckeditor_templates.ckeditor_templates.primary_button.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ id: primary_button
55
label: 'Primary Button'
66
description: ''
77
thumb: { }
8-
code: '<p><a class="button" href="Primary-button-link">Primary button text</a></p>'
8+
code:
9+
value: '<p><a class="button" href="Primary-button-link">Primary button text</a></p>'
10+
format: rich_text
911
formats:
1012
rich_text: rich_text
1113
summary_text: summary_text
1214
admin_text: admin_text
1315
weight: 1
16+
thumb_alternative: ''

config/install/ckeditor_templates.ckeditor_templates.secondary_button.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ id: secondary_button
55
label: 'Secondary Button'
66
description: ''
77
thumb: { }
8-
code: '<p><a class="button button--secondary" href="Secondary-button-link">Secondary button text</a></p>'
8+
code:
9+
value: '<p><a class="button button--secondary" href="Secondary-button-link">Secondary button text</a></p>'
10+
format: rich_text
911
formats:
1012
rich_text: rich_text
1113
summary_text: summary_text
1214
admin_text: admin_text
1315
weight: 2
16+
thumb_alternative: ''

config/install/editor.editor.admin_text.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ settings:
8080
- '<td align class>'
8181
- '<p class="quotation__quote">'
8282
ckeditor5_list:
83-
reversed: false
84-
startIndex: true
83+
properties:
84+
reversed: false
85+
startIndex: true
8586
ckeditor5_alignment:
8687
enabled_alignments:
8788
- left
@@ -102,7 +103,7 @@ image_upload:
102103
status: false
103104
scheme: public
104105
directory: inline-images
105-
max_size: ''
106+
max_size: '10MB'
106107
max_dimensions:
107108
width: null
108109
height: null

config/install/editor.editor.rich_text.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ settings:
1515
- strikethrough
1616
- style
1717
- superscript
18-
- Callout
19-
- embeddedContent
2018
- tide_media
2119
- ckeditorTemplates
2220
- subscript
@@ -94,8 +92,9 @@ settings:
9492
- '<td align class>'
9593
- '<p class="quotation__quote">'
9694
ckeditor5_list:
97-
reversed: true
98-
startIndex: true
95+
properties:
96+
reversed: true
97+
startIndex: true
9998
ckeditor5_alignment:
10099
enabled_alignments:
101100
- left
@@ -108,7 +107,7 @@ image_upload:
108107
status: true
109108
scheme: public
110109
directory: inline-images
111-
max_size: ''
110+
max_size: '10MB'
112111
max_dimensions:
113112
width: null
114113
height: null

config/install/editor.editor.summary_text.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@ settings:
5656
- '<h4 id>'
5757
- '<h5 id>'
5858
ckeditor5_list:
59-
reversed: false
60-
startIndex: true
59+
properties:
60+
reversed: false
61+
startIndex: true
6162
ckeditor5_alignment:
6263
enabled_alignments:
6364
- left
@@ -78,7 +79,7 @@ image_upload:
7879
status: true
7980
scheme: public
8081
directory: inline-images
81-
max_size: ''
82+
max_size: '10MB'
8283
max_dimensions:
8384
width: null
8485
height: null
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
langcode: en
2+
status: true
3+
dependencies:
4+
module:
5+
- block_content
6+
- text
7+
id: block_content.body
8+
field_name: body
9+
entity_type: block_content
10+
type: text_with_summary
11+
settings: { }
12+
module: text
13+
locked: false
14+
cardinality: 1
15+
translatable: true
16+
indexes: { }
17+
persist_with_no_fields: true
18+
custom_storage: false
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
langcode: en
2+
status: true
3+
dependencies:
4+
module:
5+
- node
6+
- text
7+
id: node.body
8+
field_name: body
9+
entity_type: node
10+
type: text_with_summary
11+
settings: { }
12+
module: text
13+
locked: false
14+
cardinality: 1
15+
translatable: true
16+
indexes: { }
17+
persist_with_no_fields: true
18+
custom_storage: false

0 commit comments

Comments
 (0)