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.

Sign up for GitHub

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

Backport v1.10.0 changes from master #799

Merged
merged 18 commits into from
Nov 19, 2024
Merged

Backport v1.10.0 changes from master #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8fc4adb
chore: bump pantheon.yml so PHP and MariaDB upgrades happen on multidevs
vinmassaro Nov 5, 2024
b138a14
fix(layout_builder_browser): Update block link changed time
dblanken-yale Nov 6, 2024
f9563fb
fix(twig): set twig version until they fix it
dblanken-yale Nov 6, 2024
2ba0db7
Revert "fix(twig): set twig version until they fix it"
dblanken-yale Nov 7, 2024
c9c3759
fix(v1.10.0): bump quick node clone to 1.19.0
dblanken-yale Nov 8, 2024
dee6428
fix(ys_views_basic): use "Show Affiliations" for profile selection
dblanken-yale Nov 8, 2024
040a327
fix(ys_views_basic): remove 'Filter' from filter list
dblanken-yale Nov 8, 2024
688877b
refactor(ys_views_basic): use the new event type variable
dblanken-yale Nov 8, 2024
a2962b3
fix(ys_views_basic): re-add conditional event display
dblanken-yale Nov 8, 2024
7add2c8
feat: update atomic to 1.39.1
dblanken-yale Nov 12, 2024
9120a73
fix(v1.10.0): multiple fixes
dblanken-yale Nov 12, 2024
ccfc071
feat: update drupal core to 10.3.8
vinmassaro Nov 14, 2024
a7bb517
Merge pull request #796 from yalesites-org/update-d10.3.8
vinmassaro Nov 15, 2024
9cd3d0b
feat(ai_engine): bump ai_engine to 1.2.6
dblanken-yale Nov 19, 2024
3af6d62
chore: last config export for drupal 10.3 upgrade
vinmassaro Nov 19, 2024
d5003ec
Merge pull request #798 from yalesites-org/update-config-10.3
vinmassaro Nov 19, 2024
dbc1942
Merge pull request #792 from yalesites-org/v1100
vinmassaro Nov 19, 2024
efb7863
chore: bump yalesites_profile to 1.10.0
semantic-release-bot Nov 19, 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
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"require": {
"composer/installers": "^1.9",
"cweagans/composer-patches": "^1.7",
"drupal/core-composer-scaffold": "10.3.6",
"drupal/core-project-message": "10.3.6",
"drupal/core-recommended": "10.3.6",
"drupal/core-composer-scaffold": "10.3.8",
"drupal/core-project-message": "10.3.8",
"drupal/core-recommended": "10.3.8",
"drush/drush": "^11 || ^12",
"oomphinc/composer-installers-extender": "^2.0",
"pantheon-systems/drupal-integrations": "^10",
Expand Down
1 change: 1 addition & 0 deletions pantheon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
api_version: 1
# Downstream sites should not change the workflow.

# Specifying Quicksilver workflows in pantheon.upstream.yml is not supported.
workflows:
clone_database:
Expand Down
2 changes: 1 addition & 1 deletion patches/layout_builder_browser/3408935-and-3409153-9.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ index 34310e2..fa855a6 100644
+ if ($config->get('group_reusable_blocks_together')) {
+
+ foreach ($block_links as $key => $block_link) {
+ $changed = date('m/d/Y - H:i', $block_link['#changed']);
+ $changed = date('m/d/Y - H:i', $block_link['link']['#changed']);
+ $block_links[$key]['link']['#title']['label']['#markup'] = "
+ <span class='underlined-title'>{$block_link['link']['#title']['label']['#markup']}</span>
+ <br>
Expand Down
6 changes: 3 additions & 3 deletions web/profiles/custom/yalesites_profile/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"drupal/paragraphs_features": "2.0.0",
"drupal/pathauto": "1.13.0",
"drupal/publishcontent": "1.6",
"drupal/quick_node_clone": "1.18.0",
"drupal/quick_node_clone": "1.19.0",
"drupal/recaptcha": "3.4.0",
"drupal/recaptcha_v3": "2.0.3",
"drupal/redirect": "1.10.0",
Expand All @@ -111,8 +111,8 @@
"jjj/chosen": "2.2.1",
"laminas/laminas-escaper": "2.13.0",
"northernco/ckeditor5-anchor-drupal": "0.4.0",
"yalesites-org/ai_engine": "1.2.5",
"yalesites-org/atomic": "1.39.0",
"yalesites-org/ai_engine": "1.2.6",
"yalesites-org/atomic": "1.39.1",
"yalesites-org/yale_cas": "v1.0.5"
},
"minimum-stability": "dev",
Expand Down
2 changes: 1 addition & 1 deletion web/profiles/custom/yalesites_profile/config/sync/editor.editor.webform_default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
uuid: null
uuid: 56ddbda0-c014-4865-8529-616d20969e4a
langcode: en
status: true
dependencies:
Expand Down
24 changes: 12 additions & 12 deletions web/profiles/custom/yalesites_profile/config/sync/filter.format.heading_html.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@ filters:
status: false
weight: 50
settings:
remove_empty_paragraphs: '0'
remove_empty_paragraphs: false
typogrify:
id: typogrify
provider: typogrify
status: true
weight: 10
settings:
smartypants_enabled: '1'
smartypants_hyphens: '2'
space_hyphens: '0'
widont_enabled: '0'
hyphenate_shy: '0'
space_to_nbsp: '1'
wrap_caps: '0'
wrap_ampersand: '0'
wrap_abbr: '0'
wrap_numbers: '0'
wrap_initial_quotes: '1'
smartypants_enabled: 1
smartypants_hyphens: 2
space_hyphens: 0
wrap_ampersand: 0
widont_enabled: 0
space_to_nbsp: 1
hyphenate_shy: 0
wrap_abbr: 0
wrap_caps: 0
wrap_initial_quotes: 1
wrap_numbers: 0
ligatures: 'a:0:{}'
arrows: 'a:0:{}'
fractions: 'a:0:{}'
Expand Down
2 changes: 1 addition & 1 deletion web/profiles/custom/yalesites_profile/config/sync/filter.format.plain_text.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ filters:
status: false
weight: 50
settings:
remove_empty_paragraphs: '0'
remove_empty_paragraphs: false
24 changes: 12 additions & 12 deletions web/profiles/custom/yalesites_profile/config/sync/filter.format.restricted_html.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,24 @@ filters:
status: true
weight: 50
settings:
remove_empty_paragraphs: '1'
remove_empty_paragraphs: true
typogrify:
id: typogrify
provider: typogrify
status: true
weight: 10
settings:
smartypants_enabled: '1'
smartypants_hyphens: '2'
space_hyphens: '0'
wrap_ampersand: '0'
widont_enabled: '0'
space_to_nbsp: '1'
hyphenate_shy: '0'
wrap_abbr: '0'
wrap_caps: '0'
wrap_initial_quotes: '1'
wrap_numbers: '0'
smartypants_enabled: 1
smartypants_hyphens: 2
space_hyphens: 0
wrap_ampersand: 0
widont_enabled: 0
space_to_nbsp: 1
hyphenate_shy: 0
wrap_abbr: 0
wrap_caps: 0
wrap_initial_quotes: 1
wrap_numbers: 0
ligatures: 'a:0:{}'
arrows: 'a:0:{}'
fractions: 'a:0:{}'
Expand Down
3 changes: 1 addition & 2 deletions web/profiles/custom/yalesites_profile/config/sync/filter.format.webform_default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
uuid: 263588a0-329b-4b3a-a970-b41e61c401ae
langcode: en
status: true
dependencies:
Expand All @@ -7,6 +8,4 @@ dependencies:
name: 'Webform (Default) - DO NOT EDIT'
format: webform_default
weight: 100
roles:
- authenticated
filters: { }
2 changes: 2 additions & 0 deletions ...s_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.advanced.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ id: advanced
label: Advanced
weight: -7
opened: true
image_path: null
image_alt: null
2 changes: 2 additions & 0 deletions ...profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.all_blocks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ id: all_blocks
label: 'All Blocks'
weight: -10
opened: true
image_path: null
image_alt: null
2 changes: 2 additions & 0 deletions ...ites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ id: basic
label: Basic
weight: -9
opened: true
image_path: null
image_alt: null
2 changes: 2 additions & 0 deletions ...ites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.media.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ id: media
label: Media
weight: -8
opened: true
image_path: null
image_alt: null
2 changes: 1 addition & 1 deletion web/profiles/custom/yalesites_profile/config/sync/views.view.archive.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ display:
type: mini
options:
offset: 0
pagination_heading_level: h4
items_per_page: 10
total_pages: 0
id: 0
Expand All @@ -43,7 +44,6 @@ display:
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
2 changes: 1 addition & 1 deletion web/profiles/custom/yalesites_profile/config/sync/views.view.block_content.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ display:
type: mini
options:
offset: 0
pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
Expand All @@ -287,7 +288,6 @@ display:
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
6 changes: 3 additions & 3 deletions web/profiles/custom/yalesites_profile/config/sync/views.view.editoria11y_dismissals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
uuid: null
uuid: e102d13e-68ee-4f7f-94de-c8b8a6769f7a
langcode: en
status: true
dependencies:
Expand Down Expand Up @@ -647,11 +647,11 @@ display:
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
separator: ''
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
separator: ''
nothing:
id: nothing
table: views
Expand Down Expand Up @@ -705,6 +705,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
Expand All @@ -722,7 +723,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
sorts:
created:
id: created
Expand Down
12 changes: 6 additions & 6 deletions web/profiles/custom/yalesites_profile/config/sync/views.view.editoria11y_results.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
uuid: null
uuid: 842dbcfb-3f53-4011-9f35-30e6d13e8757
langcode: en
status: true
dependencies:
Expand Down Expand Up @@ -1072,6 +1072,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
Expand All @@ -1089,7 +1090,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
sorts:
result_name_count:
id: result_name_count
Expand Down Expand Up @@ -1453,6 +1453,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
Expand All @@ -1470,7 +1471,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
sorts:
result_name_count:
id: result_name_count
Expand Down Expand Up @@ -1939,6 +1939,7 @@ display:
type: mini
options:
offset: 0
pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
Expand All @@ -1953,7 +1954,6 @@ display:
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
pagination_heading_level: h4
sorts:
page_result_count:
id: page_result_count
Expand Down Expand Up @@ -2451,6 +2451,7 @@ display:
type: mini
options:
offset: 0
pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
Expand All @@ -2465,7 +2466,6 @@ display:
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
pagination_heading_level: h4
sorts:
result_name_count:
id: result_name_count
Expand Down Expand Up @@ -2994,6 +2994,7 @@ display:
type: mini
options:
offset: 0
pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
Expand All @@ -3008,7 +3009,6 @@ display:
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
pagination_heading_level: h4
sorts:
created:
id: created
Expand Down
2 changes: 1 addition & 1 deletion web/profiles/custom/yalesites_profile/config/sync/views.view.export_media.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
Expand All @@ -418,7 +419,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
2 changes: 1 addition & 1 deletion web/profiles/custom/yalesites_profile/config/sync/views.view.export_nodes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
Expand All @@ -496,7 +497,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
2 changes: 1 addition & 1 deletion web/profiles/custom/yalesites_profile/config/sync/views.view.export_taxonomy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
Expand All @@ -418,7 +419,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
Loading