Skip to content

Commit

Permalink
Merge pull request #299 from UN-OCHA/release-versions/v3.7.5
Browse files Browse the repository at this point in the history
release versions/v3.7.5
  • Loading branch information
berliner authored Dec 16, 2024
2 parents 5da8d5a + c09b282 commit 880b3ea
Show file tree
Hide file tree
Showing 58 changed files with 4,007 additions and 222 deletions.
3 changes: 2 additions & 1 deletion composer.patches.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"drupal/active_tags": {
"Issue #3481823: HTML tags appear in 'Not exist' and 'Not found' messages": "https://www.drupal.org/files/issues/2024-11-08/3481823-3.patch",
"Issue #3486362: Limit 0 for select dropdowns is not respected": "https://git.drupalcode.org/project/active_tags/-/merge_requests/2.patch",
"Issue #3488660: Missing spaces in highlighted terms in select dropdown": "https://git.drupalcode.org/project/active_tags/-/merge_requests/3.patch"
"Issue #3488660: Missing spaces in highlighted terms in select dropdown": "https://git.drupalcode.org/project/active_tags/-/merge_requests/3.patch",
"Issue #3491949: White space / line breaks in autocomplete dropdown": "https://git.drupalcode.org/project/active_tags/-/merge_requests/4.patch"
},
"drupal/core": {
"Issue #2544110: XSS attribute filtering is inconsistent and strips valid attributes": "./patches/2544110-2024-02-15.patch",
Expand Down
45 changes: 27 additions & 18 deletions config/core.entity_form_display.node.article.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,9 @@ third_party_settings:
group_meta_data:
children:
- field_content_space
- field_document_type
- field_year
- field_month
- field_country
- field_theme
- group_tags
- field_author
- field_pdf
- field_automatically_visible
label: Properties
region: content
parent_name: group_tabs
Expand Down Expand Up @@ -114,6 +109,26 @@ third_party_settings:
formatter: closed
description: ''
required_fields: true
group_tags:
children:
- field_document_type
- field_year
- field_month
- field_country
- field_theme
label: Tags
region: content
parent_name: group_meta_data
weight: 2
format_type: details
format_settings:
classes: ''
show_empty_fields: false
id: ''
label_as_html: false
open: true
description: ''
required_fields: true
id: node.article.default
targetEntityType: node
bundle: article
Expand Down Expand Up @@ -143,13 +158,6 @@ content:
revision: false
removed_reference: optional
third_party_settings: { }
field_automatically_visible:
type: boolean_checkbox
weight: 10
region: content
settings:
display_label: true
third_party_settings: { }
field_caption:
type: double_field
weight: 6
Expand Down Expand Up @@ -185,7 +193,7 @@ content:
third_party_settings: { }
field_country:
type: select_active_tags
weight: 5
weight: 6
region: content
settings:
match_operator: CONTAINS
Expand All @@ -195,7 +203,7 @@ content:
third_party_settings: { }
field_document_type:
type: select_active_tags
weight: 2
weight: 3
region: content
settings:
match_operator: CONTAINS
Expand All @@ -212,7 +220,7 @@ content:
third_party_settings: { }
field_month:
type: select_active_tags
weight: 4
weight: 5
region: content
settings:
match_operator: CONTAINS
Expand Down Expand Up @@ -264,7 +272,7 @@ content:
hide_guidelines: '1'
field_theme:
type: select_active_tags
weight: 6
weight: 7
region: content
settings:
match_operator: CONTAINS
Expand All @@ -274,7 +282,7 @@ content:
third_party_settings: { }
field_year:
type: select_active_tags
weight: 3
weight: 4
region: content
settings:
match_operator: CONTAINS
Expand Down Expand Up @@ -305,6 +313,7 @@ content:
third_party_settings: { }
hidden:
field_appeals: true
field_automatically_visible: true
field_card_title: true
field_computed_tags: true
field_report_link: true
Expand Down
45 changes: 27 additions & 18 deletions config/core.entity_form_display.node.document.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,8 @@ third_party_settings:
group_meta_data:
children:
- field_content_space
- field_document_type
- field_year
- field_month
- field_country
- field_theme
- group_tags
- field_summary
- field_automatically_visible
label: Properties
region: content
parent_name: group_tabs
Expand Down Expand Up @@ -98,6 +93,26 @@ third_party_settings:
formatter: closed
description: ''
required_fields: true
group_tags:
children:
- field_document_type
- field_year
- field_month
- field_country
- field_theme
label: Tags
region: content
parent_name: group_meta_data
weight: 28
format_type: details
format_settings:
classes: ''
show_empty_fields: false
id: ''
label_as_html: false
open: true
description: ''
required_fields: true
id: node.document.default
targetEntityType: node
bundle: document
Expand All @@ -109,13 +124,6 @@ content:
region: content
settings: { }
third_party_settings: { }
field_automatically_visible:
type: boolean_checkbox
weight: 35
region: content
settings:
display_label: true
third_party_settings: { }
field_caption:
type: double_field
weight: 29
Expand Down Expand Up @@ -147,7 +155,7 @@ content:
third_party_settings: { }
field_country:
type: select_active_tags
weight: 31
weight: 32
region: content
settings:
match_operator: CONTAINS
Expand All @@ -157,7 +165,7 @@ content:
third_party_settings: { }
field_document_type:
type: select_active_tags
weight: 28
weight: 29
region: content
settings:
match_operator: CONTAINS
Expand All @@ -174,7 +182,7 @@ content:
third_party_settings: { }
field_month:
type: select_active_tags
weight: 30
weight: 31
region: content
settings:
match_operator: CONTAINS
Expand Down Expand Up @@ -216,7 +224,7 @@ content:
third_party_settings: { }
field_theme:
type: select_active_tags
weight: 32
weight: 33
region: content
settings:
match_operator: CONTAINS
Expand All @@ -226,7 +234,7 @@ content:
third_party_settings: { }
field_year:
type: select_active_tags
weight: 29
weight: 30
region: content
settings:
match_operator: CONTAINS
Expand Down Expand Up @@ -280,6 +288,7 @@ content:
placeholder: ''
third_party_settings: { }
hidden:
field_automatically_visible: true
field_computed_tags: true
field_tags: true
path: true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
uuid: 8c961a0e-f545-4bc8-b05c-d1bfd797eb46
langcode: en
status: true
dependencies:
config:
- field.field.paragraph.interactive_content_2_columns.field_full_width
- paragraphs.paragraphs_type.interactive_content_2_columns
module:
- field_group
third_party_settings:
field_group:
group_tabs:
children:
- group_layout
- group_settings
label: Tabs
region: content
parent_name: ''
weight: 0
format_type: tabs
format_settings:
classes: ''
show_empty_fields: false
id: ''
label_as_html: false
direction: horizontal
width_breakpoint: 640
group_layout:
children:
- layout_paragraphs_fields
label: Layout
region: content
parent_name: group_tabs
weight: 4
format_type: tab
format_settings:
classes: ''
show_empty_fields: true
id: ''
label_as_html: false
formatter: closed
description: ''
required_fields: true
group_settings:
children:
- field_full_width
label: 'Additional settings'
region: content
parent_name: group_tabs
weight: 5
format_type: tab
format_settings:
classes: ''
show_empty_fields: false
id: ''
label_as_html: false
formatter: closed
description: ''
required_fields: true
id: paragraph.interactive_content_2_columns.default
targetEntityType: paragraph
bundle: interactive_content_2_columns
mode: default
content:
field_full_width:
type: boolean_checkbox
weight: 3
region: content
settings:
display_label: true
third_party_settings: { }
layout_paragraphs_fields:
weight: 2
region: content
settings: { }
third_party_settings: { }
status:
type: boolean_checkbox
weight: 1
region: content
settings:
display_label: true
third_party_settings: { }
hidden:
created: true
20 changes: 15 additions & 5 deletions config/core.entity_form_display.paragraph.story.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,32 @@ langcode: en
status: true
dependencies:
config:
- entity_browser.browser.story
- field.field.paragraph.story.field_story
- paragraphs.paragraphs_type.story
module:
- ncms_ui
id: paragraph.story.default
targetEntityType: paragraph
bundle: story
mode: default
content:
field_story:
type: entity_reference_autocomplete
type: entity_reference_browser_table_widget_ncms
weight: 0
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
open: true
entity_browser: story
field_widget_display: label
field_widget_edit: '1'
field_widget_remove: '1'
field_widget_replace: '1'
selection_mode: selection_append
additional_fields:
options:
status: status
field_widget_display_settings: { }
third_party_settings: { }
status:
type: boolean_checkbox
Expand Down
20 changes: 15 additions & 5 deletions config/core.entity_form_display.paragraph.sub_article.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,33 @@ langcode: en
status: true
dependencies:
config:
- entity_browser.browser.article
- field.field.paragraph.sub_article.field_article
- field.field.paragraph.sub_article.field_collapsible
- paragraphs.paragraphs_type.sub_article
module:
- ncms_ui
id: paragraph.sub_article.default
targetEntityType: paragraph
bundle: sub_article
mode: default
content:
field_article:
type: entity_reference_autocomplete
type: entity_reference_browser_table_widget_ncms
weight: 0
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
open: true
entity_browser: article
field_widget_display: label
field_widget_edit: '1'
field_widget_remove: '1'
field_widget_replace: '1'
selection_mode: selection_append
additional_fields:
options:
status: status
field_widget_display_settings: { }
third_party_settings: { }
field_collapsible:
type: boolean_checkbox
Expand Down
Loading

0 comments on commit 880b3ea

Please sign in to comment.