Skip to content
Snippets Groups Projects
Commit 9763a1be authored by Martin Leblanc's avatar Martin Leblanc
Browse files

Merge branch 'feature/ISTWCMS-5643-ebremner-update-core-9-4-5' into '1.0.x'

ISTWCMS-5643: ensure that features are not overridden for core update to 9.4.5

See merge request !262
parents aebe280d d64618ab
No related branches found
No related tags found
1 merge request!262ISTWCMS-5643: ensure that features are not overridden for core update to 9.4.5
Showing
with 28 additions and 33 deletions
...@@ -44,10 +44,6 @@ settings: ...@@ -44,10 +44,6 @@ settings:
drupallink: drupallink:
linkit_enabled: true linkit_enabled: true
linkit_profile: default linkit_profile: default
language:
language_list: un
stylescombo:
styles: ''
image_upload: image_upload:
status: false status: false
scheme: public scheme: public
......
...@@ -86,8 +86,6 @@ settings: ...@@ -86,8 +86,6 @@ settings:
drupallink: drupallink:
linkit_enabled: true linkit_enabled: true
linkit_profile: default linkit_profile: default
language:
language_list: un
stylescombo: stylescombo:
styles: "p.highlight|Highlight\r\np.caption|Caption\r\nins|Inserted text\r\ndel|Deleted text\r\ncode|Inline code\r\nkbd|Key input\r\nsamp|Sample output\r\nvar|Variable\r\naddress|Address\r\n" styles: "p.highlight|Highlight\r\np.caption|Caption\r\nins|Inserted text\r\ndel|Deleted text\r\ncode|Inline code\r\nkbd|Key input\r\nsamp|Sample output\r\nvar|Variable\r\naddress|Address\r\n"
image_upload: image_upload:
......
...@@ -5,7 +5,7 @@ id: inline_blockuw_cbl_mailchimp ...@@ -5,7 +5,7 @@ id: inline_blockuw_cbl_mailchimp
block_id: 'inline_block:uw_cbl_mailchimp' block_id: 'inline_block:uw_cbl_mailchimp'
category: uw_bc_external_embeds category: uw_bc_external_embeds
label: Mailchimp label: Mailchimp
weight: null
image_path: images/layout_builder_browser/mailchimp.svg image_path: images/layout_builder_browser/mailchimp.svg
image_path_base: 'theme:uw_fdsu_theme_resp' image_path_base: 'theme:uw_fdsu_theme_resp'
image_alt: '' image_alt: ''
weight: null
...@@ -5,7 +5,7 @@ id: inline_blockuw_cbl_social_intents ...@@ -5,7 +5,7 @@ id: inline_blockuw_cbl_social_intents
block_id: 'inline_block:uw_cbl_social_intents' block_id: 'inline_block:uw_cbl_social_intents'
category: uw_bc_external_embeds category: uw_bc_external_embeds
label: 'Social Intents' label: 'Social Intents'
weight: null
image_path: images/layout_builder_browser/socialintents.svg image_path: images/layout_builder_browser/socialintents.svg
image_path_base: 'theme:uw_fdsu_theme_resp' image_path_base: 'theme:uw_fdsu_theme_resp'
image_alt: '' image_alt: ''
weight: null
...@@ -5,5 +5,5 @@ id: '403' ...@@ -5,5 +5,5 @@ id: '403'
label: '403 access denied' label: '403 access denied'
tags: tags:
shortlink: '[site:url]' shortlink: '[site:url]'
robots: 'noindex' robots: noindex
canonical_url: '[site:url]' canonical_url: '[site:url]'
...@@ -9,7 +9,7 @@ type: 'canonical_entities:node' ...@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'blog/[node:title]' pattern: 'blog/[node:title]'
selection_criteria: selection_criteria:
6008045d-ac62-416d-a3f4-46c30aaab4d5: 6008045d-ac62-416d-a3f4-46c30aaab4d5:
id: entity_bundle:node id: 'entity_bundle:node'
bundles: bundles:
uw_ct_blog: uw_ct_blog uw_ct_blog: uw_ct_blog
negate: false negate: false
......
...@@ -9,7 +9,7 @@ type: 'canonical_entities:node' ...@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'catalogs/[node:field_uw_catalog_catalog]/[node:title]' pattern: 'catalogs/[node:field_uw_catalog_catalog]/[node:title]'
selection_criteria: selection_criteria:
337b44da-103c-4fa1-a2a2-27a56e73e8f1: 337b44da-103c-4fa1-a2a2-27a56e73e8f1:
id: entity_bundle:node id: 'entity_bundle:node'
bundles: bundles:
uw_ct_catalog_item: uw_ct_catalog_item uw_ct_catalog_item: uw_ct_catalog_item
negate: false negate: false
......
...@@ -9,7 +9,7 @@ type: 'canonical_entities:node' ...@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'contacts/[node:title]' pattern: 'contacts/[node:title]'
selection_criteria: selection_criteria:
13ad4ca2-9556-4f2f-89fc-45501bae3153: 13ad4ca2-9556-4f2f-89fc-45501bae3153:
id: entity_bundle:node id: 'entity_bundle:node'
bundles: bundles:
uw_ct_contact: uw_ct_contact uw_ct_contact: uw_ct_contact
negate: false negate: false
......
...@@ -9,7 +9,7 @@ type: 'canonical_entities:node' ...@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'events/[node:title]' pattern: 'events/[node:title]'
selection_criteria: selection_criteria:
0f8d7153-46e2-4788-a25b-8a998481ed5d: 0f8d7153-46e2-4788-a25b-8a998481ed5d:
id: entity_bundle:node id: 'entity_bundle:node'
bundles: bundles:
uw_ct_event: uw_ct_event uw_ct_event: uw_ct_event
negate: false negate: false
......
...@@ -9,7 +9,7 @@ type: 'canonical_entities:node' ...@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'news/[node:title]' pattern: 'news/[node:title]'
selection_criteria: selection_criteria:
92cc743b-f206-40a5-a6a9-4f67373876ad: 92cc743b-f206-40a5-a6a9-4f67373876ad:
id: entity_bundle:node id: 'entity_bundle:node'
bundles: bundles:
uw_ct_news_item: uw_ct_news_item uw_ct_news_item: uw_ct_news_item
negate: false negate: false
......
...@@ -9,7 +9,7 @@ type: 'canonical_entities:node' ...@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'opportunities/[node:title]' pattern: 'opportunities/[node:title]'
selection_criteria: selection_criteria:
85a0576d-37f6-4897-92c2-cc7f18605172: 85a0576d-37f6-4897-92c2-cc7f18605172:
id: entity_bundle:node id: 'entity_bundle:node'
bundles: bundles:
uw_ct_opportunity: uw_ct_opportunity uw_ct_opportunity: uw_ct_opportunity
negate: false negate: false
......
...@@ -9,7 +9,7 @@ type: 'canonical_entities:node' ...@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'profiles/[node:title]' pattern: 'profiles/[node:title]'
selection_criteria: selection_criteria:
0f8a9aae-cf05-4d9b-9dd9-a128ce9fa7cf: 0f8a9aae-cf05-4d9b-9dd9-a128ce9fa7cf:
id: entity_bundle:node id: 'entity_bundle:node'
bundles: bundles:
uw_ct_profile: uw_ct_profile uw_ct_profile: uw_ct_profile
negate: false negate: false
......
...@@ -9,7 +9,7 @@ type: 'canonical_entities:node' ...@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'services/[node:title]' pattern: 'services/[node:title]'
selection_criteria: selection_criteria:
21884b74-d98d-49ba-9cab-9093f18a6a95: 21884b74-d98d-49ba-9cab-9093f18a6a95:
id: entity_bundle:node id: 'entity_bundle:node'
bundles: bundles:
uw_ct_service: uw_ct_service uw_ct_service: uw_ct_service
negate: false negate: false
......
...@@ -9,7 +9,7 @@ type: 'canonical_entities:node' ...@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'sidebars/[node:title]' pattern: 'sidebars/[node:title]'
selection_criteria: selection_criteria:
96550c84-2385-43f7-aa25-ca80528ddf91: 96550c84-2385-43f7-aa25-ca80528ddf91:
id: entity_bundle:node id: 'entity_bundle:node'
bundles: bundles:
uw_ct_sidebar: uw_ct_sidebar uw_ct_sidebar: uw_ct_sidebar
negate: false negate: false
......
...@@ -9,7 +9,7 @@ type: 'canonical_entities:node' ...@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'site-footer/[node:title]' pattern: 'site-footer/[node:title]'
selection_criteria: selection_criteria:
1c4af52c-2d8a-420f-a820-a89df82759ef: 1c4af52c-2d8a-420f-a820-a89df82759ef:
id: entity_bundle:node id: 'entity_bundle:node'
bundles: bundles:
uw_ct_site_footer: uw_ct_site_footer uw_ct_site_footer: uw_ct_site_footer
negate: false negate: false
......
...@@ -99,7 +99,7 @@ display: ...@@ -99,7 +99,7 @@ display:
hide_empty: false hide_empty: false
empty_zero: false empty_zero: false
hide_alter_empty: true hide_alter_empty: true
entity_type: entity_bundle:node entity_type: 'entity_bundle:node'
plugin_id: standard plugin_id: standard
description: description:
id: description id: description
...@@ -149,7 +149,7 @@ display: ...@@ -149,7 +149,7 @@ display:
hide_empty: false hide_empty: false
empty_zero: false empty_zero: false
hide_alter_empty: true hide_alter_empty: true
entity_type: entity_bundle:node entity_type: 'entity_bundle:node'
plugin_id: standard plugin_id: standard
operation: operation:
id: operation id: operation
...@@ -199,7 +199,7 @@ display: ...@@ -199,7 +199,7 @@ display:
hide_empty: false hide_empty: false
empty_zero: false empty_zero: false
hide_alter_empty: true hide_alter_empty: true
entity_type: entity_bundle:node entity_type: 'entity_bundle:node'
plugin_id: config_entity_operations plugin_id: config_entity_operations
filters: { } filters: { }
sorts: { } sorts: { }
......
...@@ -3,13 +3,14 @@ status: true ...@@ -3,13 +3,14 @@ status: true
dependencies: dependencies:
module: module:
- node - node
label: Default
id: default id: default
label: Default
description: 'A default Linkit profile' description: 'A default Linkit profile'
matchers: matchers:
556010a3-e317-48b3-b4ed-854c10f4b950: 556010a3-e317-48b3-b4ed-854c10f4b950:
id: 'entity:node'
uuid: 556010a3-e317-48b3-b4ed-854c10f4b950 uuid: 556010a3-e317-48b3-b4ed-854c10f4b950
id: 'entity:node'
weight: -9
settings: settings:
metadata: '[node:content-type] by [node:author] | [node:created:long] (node [node:nid])' metadata: '[node:content-type] by [node:author] | [node:created:long] (node [node:nid])'
bundles: { } bundles: { }
...@@ -17,20 +18,20 @@ matchers: ...@@ -17,20 +18,20 @@ matchers:
substitution_type: canonical substitution_type: canonical
limit: 100 limit: 100
include_unpublished: true include_unpublished: true
weight: -9
6104a100-f463-4c40-8bde-6c442591afe7: 6104a100-f463-4c40-8bde-6c442591afe7:
id: email
uuid: 6104a100-f463-4c40-8bde-6c442591afe7 uuid: 6104a100-f463-4c40-8bde-6c442591afe7
settings: { } id: email
weight: -6 weight: -6
settings: { }
d53fbc60-f2a7-40b5-a643-1c20c21143a4: d53fbc60-f2a7-40b5-a643-1c20c21143a4:
id: anchor_basic
uuid: d53fbc60-f2a7-40b5-a643-1c20c21143a4 uuid: d53fbc60-f2a7-40b5-a643-1c20c21143a4
settings: { } id: anchor_basic
weight: -10 weight: -10
settings: { }
dbcc29e8-5c1a-4a8f-8a76-f4f7adc645a5: dbcc29e8-5c1a-4a8f-8a76-f4f7adc645a5:
id: 'entity:media'
uuid: dbcc29e8-5c1a-4a8f-8a76-f4f7adc645a5 uuid: dbcc29e8-5c1a-4a8f-8a76-f4f7adc645a5
id: 'entity:media'
weight: -8
settings: settings:
metadata: '<img src="[media:field_media_image:linkit_result_thumbnail]" alt="[media:field_media_image:alt]">' metadata: '<img src="[media:field_media_image:linkit_result_thumbnail]" alt="[media:field_media_image:alt]">'
bundles: bundles:
...@@ -38,10 +39,10 @@ matchers: ...@@ -38,10 +39,10 @@ matchers:
group_by_bundle: true group_by_bundle: true
substitution_type: media substitution_type: media
limit: 100 limit: 100
weight: -8
280dc52b-0208-4458-b3dc-21ddbaac15e8: 280dc52b-0208-4458-b3dc-21ddbaac15e8:
id: 'entity:media'
uuid: 280dc52b-0208-4458-b3dc-21ddbaac15e8 uuid: 280dc52b-0208-4458-b3dc-21ddbaac15e8
id: 'entity:media'
weight: -7
settings: settings:
metadata: '' metadata: ''
bundles: bundles:
...@@ -49,4 +50,3 @@ matchers: ...@@ -49,4 +50,3 @@ matchers:
group_by_bundle: true group_by_bundle: true
substitution_type: media substitution_type: media
limit: 100 limit: 100
weight: -7
...@@ -49,6 +49,7 @@ dependencies: ...@@ -49,6 +49,7 @@ dependencies:
- 'drupal:user' - 'drupal:user'
- 'drupal:userprotect' - 'drupal:userprotect'
- 'drupal:views' - 'drupal:views'
- 'fillpdf:fillpdf'
- 'metatag:metatag_extended_perms' - 'metatag:metatag_extended_perms'
- 'quick_node_clone:quick_node_clone' - 'quick_node_clone:quick_node_clone'
- 'scheduler:scheduler' - 'scheduler:scheduler'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment