Merge branch '11.5.2-release' of github.com:SU-HSDO/suhumsci into shs…

…-5911--add-indicator-of-shortcut-menu-3rd-level
SU-HSDO · Nov 13, 2024 · b9f3e56 · b9f3e56
2 parents e10457b + 4b0d964
commit b9f3e56
Show file tree

Hide file tree

Showing 23 changed files with 145 additions and 660 deletions.
diff --git a/composer.json b/composer.json
@@ -201,6 +201,7 @@
     },
     "conflict": {
         "drupal/drupal": "*",
+        "drupal/gin": ">3.0.0-rc13",
         "drupal/readonly_field_widget": ">1.5",
         "drupal/shortcut_menu": ">3.0.0-beta5"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/config/default/metatag.settings.yml b/config/default/metatag.settings.yml
@@ -0,0 +1 @@
+tag_trim_end: '|.,-:;/+&([{"'''
diff --git a/...es/modules/hs_row/config/install/field.field.paragraph.hs_row.field_hs_row_components.yml b/...es/modules/hs_row/config/install/field.field.paragraph.hs_row.field_hs_row_components.yml
diff --git a/...h_types/modules/hs_row/config/install/field.storage.paragraph.field_hs_row_components.yml b/...h_types/modules/hs_row/config/install/field.storage.paragraph.field_hs_row_components.yml
diff --git a/...ci/hs_paragraph_types/modules/hs_row/config/install/paragraphs.paragraphs_type.hs_row.yml b/...ci/hs_paragraph_types/modules/hs_row/config/install/paragraphs.paragraphs_type.hs_row.yml
diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/hs_row.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/hs_row.info.yml
diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/hs_row.install b/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/hs_row.install
diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/modules/hs_row_display/Gruntfile.js b/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/modules/hs_row_display/Gruntfile.js
diff --git a/...ules/hs_row_display/config/optional/core.entity_form_display.paragraph.hs_row.default.yml b/...ules/hs_row_display/config/optional/core.entity_form_display.paragraph.hs_row.default.yml
diff --git a/...ules/hs_row_display/config/optional/core.entity_view_display.paragraph.hs_row.default.yml b/...ules/hs_row_display/config/optional/core.entity_view_display.paragraph.hs_row.default.yml
diff --git a/...es/humsci/hs_paragraph_types/modules/hs_row/modules/hs_row_display/css/hs_row_display.css b/...es/humsci/hs_paragraph_types/modules/hs_row/modules/hs_row_display/css/hs_row_display.css
diff --git a/...s/humsci/hs_paragraph_types/modules/hs_row/modules/hs_row_display/hs_row_display.info.yml b/...s/humsci/hs_paragraph_types/modules/hs_row/modules/hs_row_display/hs_row_display.info.yml
diff --git a/...sci/hs_paragraph_types/modules/hs_row/modules/hs_row_display/hs_row_display.libraries.yml b/...sci/hs_paragraph_types/modules/hs_row/modules/hs_row_display/hs_row_display.libraries.yml