Skip to content

Commit

Permalink
Merged in changes from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
tom-fleming committed Sep 15, 2023
2 parents 07bed99 + 0483ad5 commit 1ae2874
Show file tree
Hide file tree
Showing 36 changed files with 691 additions and 613 deletions.
3 changes: 3 additions & 0 deletions changelogs/DP-28339.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Changed:
- description: D10 upgrade packages - tokens/metatag/schema_metatag/field_tokens.
issue: DP-28339
41 changes: 41 additions & 0 deletions changelogs/DP-28823.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#
# Write your changelog entry here. Every pull request must have a changelog yml file.
#
# Change types:
# #############################################################################
# You can use one of the following types:
# - Added: For new features.
# - Changed: For changes to existing functionality.
# - Deprecated: For soon-to-be removed features.
# - Removed: For removed features.
# - Fixed: For any bug fixes.
# - Security: In case of vulnerabilities.
#
# Format
# #############################################################################
# The format is crucial. Please follow the examples below. For reference, the requirements are:
# - All 3 parts are required and you must include "Type", "description" and "issue".
# - "Type" must be left aligned and followed by a colon.
# - "description" must be indented with 2 spaces followed by a colon
# - "issue" must be indented with 4 spaces followed by a colon.
# - "issue" is for the Jira ticket number only e.g. DP-1234
# - No extra spaces, indents, or blank lines are allowed.
#
# Example:
# #############################################################################
# Fixed:
# - description: Fixes scrolling on edit pages in Safari.
# issue: DP-13314
#
# You may add more than 1 description & issue for each type using the following format:
# Changed:
# - description: Automating the release branch.
# issue: DP-10166
# - description: Second change item that needs a description.
# issue: DP-19875
# - description: Third change item that needs a description along with an issue.
# issue: DP-19843
#
Changed:
- description: D10 upgrade - pathologic, Components, Datalayer
issue: DP-28823
41 changes: 41 additions & 0 deletions changelogs/DP-28824.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#
# Write your changelog entry here. Every pull request must have a changelog yml file.
#
# Change types:
# #############################################################################
# You can use one of the following types:
# - Added: For new features.
# - Changed: For changes to existing functionality.
# - Deprecated: For soon-to-be removed features.
# - Removed: For removed features.
# - Fixed: For any bug fixes.
# - Security: In case of vulnerabilities.
#
# Format
# #############################################################################
# The format is crucial. Please follow the examples below. For reference, the requirements are:
# - All 3 parts are required and you must include "Type", "description" and "issue".
# - "Type" must be left aligned and followed by a colon.
# - "description" must be indented with 2 spaces followed by a colon
# - "issue" must be indented with 4 spaces followed by a colon.
# - "issue" is for the Jira ticket number only e.g. DP-1234
# - No extra spaces, indents, or blank lines are allowed.
#
# Example:
# #############################################################################
# Fixed:
# - description: Fixes scrolling on edit pages in Safari.
# issue: DP-13314
#
# You may add more than 1 description & issue for each type using the following format:
# Changed:
# - description: Automating the release branch.
# issue: DP-10166
# - description: Second change item that needs a description.
# issue: DP-19875
# - description: Third change item that needs a description along with an issue.
# issue: DP-19843
#
Changed:
- description: D10 upgrade - 3 jQuery UI modules.
issue: DP-28824
17 changes: 6 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/field_tokens.git",
"reference": "d56389a1c3b521fc4d1d69b215f39a686c4c3e3c"
"reference": "6dcfbdeddeeda9a081078bf4b923415a8429edb9"
}
}
},
Expand Down Expand Up @@ -167,12 +167,12 @@
"drupal/asset_cache_bust": "^1.0",
"drupal/auto_entitylabel": "^3",
"drupal/autologout": "^1",
"drupal/better_exposed_filters": "^6.0",
"drupal/better_exposed_filters": "^6.0.3",
"drupal/cache_metrics": "^2",
"drupal/ckeditor_liststyle": "dev-1.x",
"drupal/coffee": "^1",
"drupal/color": "^1",
"drupal/components": "^2.4",
"drupal/components": "^3",
"drupal/composer_deploy": "^1.4",
"drupal/conditional_fields": "4.0.0-alpha1",
"drupal/config_ignore": "3.x-dev",
Expand All @@ -181,7 +181,7 @@
"drupal/core-recommended": "^9.5",
"drupal/csv_field": "^1",
"drupal/csv_serialization": "^2.0 || ^3.0",
"drupal/datalayer": "^1",
"drupal/datalayer": "^2",
"drupal/devel": "^5",
"drupal/devel_entity_updates": "^4.0",
"drupal/diff": "^1.0",
Expand Down Expand Up @@ -230,7 +230,7 @@
"drupal/openid_connect_windows_aad": "dev-2.0.x",
"drupal/paragraphs": "^1.10",
"drupal/pathauto": "^1",
"drupal/pathologic": "^1",
"drupal/pathologic": "^2",
"drupal/prepopulate": "^2.0",
"drupal/private_files_download_permission": "^3",
"drupal/prod_no_redirect": "dev-1.0.x",
Expand All @@ -244,7 +244,7 @@
"drupal/require_on_publish": "dev-1.x",
"drupal/route_iframes": "^2.0",
"drupal/scheduled_transitions": "^2",
"drupal/schema_metatag": "^1",
"drupal/schema_metatag": "^2.0",
"drupal/seckit": "^2",
"drupal/security_review": "^2",
"drupal/seven": "^1.0",
Expand Down Expand Up @@ -346,7 +346,6 @@
},
"drupal/core": {
"Don't break if telephone number is less than 6 digits. (https://www.drupal.org/node/2575577)": "https://www.drupal.org/files/issues/2022-07-12/2575577-38.patch",
"Fix config-import when uninstalling a theme": "https://www.drupal.org/files/issues/2018-04-04/2958649-1.patch",
"Remove final from a class in order to inherit from it": "patches/DP-11721-jsonapi-serializer.patch",
"Remove type hint which allows usage in combination with workbench_moderation": "patches/jsonapi-2.3.0-no-type-hint.patch",
"Notice: Undefined index: #type in drupal_process_states() (https://www.drupal.org/project/drupal/issues/2700667)": "https://www.drupal.org/files/issues/2019-12-05/2700667-89.patch",
Expand Down Expand Up @@ -401,7 +400,6 @@
"3098550 - Nested groups render on other entity forms (or when fields are inaccessible) when they shouldn't": "https://www.drupal.org/files/issues/2020-06-18/3098550-12.patch"
},
"drupal/field_tokens": {
"Drupal 9 compatibility": "patches/local-dist_d9_compatibility-3165349-8.patch",
"Fatal errors in entities that does not declare getFieldDefinitions method (https://www.drupal.org/project/field_tokens/issues/2835032)": "https://www.drupal.org/files/issues/2835032-config-entity-support-9.patch"
},
"drupal/focal_point": {
Expand All @@ -423,9 +421,6 @@
"CKeditor Plugin - using a combined patch to avoid conflict (https://www.drupal.org/node/2928318)": "https://www.drupal.org/files/issues/2020-10-28/media_entity_download-ckeditor_plugin-2928318-20.patch",
"3106062 - Track the usage of Media entity through media_entity_download route with entity_usage": "https://www.drupal.org/files/issues/2020-01-13/3106062-5.patch"
},
"drupal/metatag": {
"Process tokens for arrays (https://www.drupal.org/project/metatag/issues/3162986#comment-14075815)": "https://www.drupal.org/files/issues/2021-04-28/metatag-3162986-13_0.patch"
},
"drupal/pathologic": {
"Dynamic routes like image styles break under pathologic (https://www.drupal.org/project/pathologic/issues/2718473)": "https://www.drupal.org/files/issues/2020-01-29/2718473-dynamic-image-style-lookup-20.patch"
},
Expand Down
Loading

0 comments on commit 1ae2874

Please sign in to comment.