Skip to content

Commit

Permalink
Merge branch 'develop' into feature/DP-35259_paragraphs_enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
joeg8612 authored Nov 5, 2024
2 parents bb433f1 + 9b501a0 commit 399afa1
Show file tree
Hide file tree
Showing 5 changed files with 375 additions and 321 deletions.
41 changes: 41 additions & 0 deletions changelogs/DP-34964.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: Updates to purge modules and DTT, Drush
issue: DP-34964
41 changes: 41 additions & 0 deletions changelogs/DP-35160.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: Review and update .htaccess to make sure it reflects the latest changes in the Drupal core 10.3.x
issue: DP-35160
19 changes: 1 addition & 18 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,18 +117,6 @@
}
}
},
{
"type": "package",
"package": {
"name": "furf/jquery-ui-touch-punch",
"version": "dev-master",
"type": "drupal-library",
"dist": {
"url": "https://github.com/furf/jquery-ui-touch-punch/archive/refs/heads/master.zip",
"type": "zip"
}
}
},
{
"type": "package",
"package": {
Expand Down Expand Up @@ -267,7 +255,6 @@
"drupal/views_taxonomy_term_name_into_id": "^1.0@alpha",
"drush/drush": "^13",
"enyo/dropzone": "5.7.2",
"furf/jquery-ui-touch-punch": "dev-master",
"geocoder-php/open-cage-provider": "^4.6",
"google/cloud-bigquery": "^1.25",
"massgov/mayflower-artifacts": "dev-develop",
Expand All @@ -291,7 +278,7 @@
"phpspec/prophecy-phpunit": "^2",
"previousnext/phpunit-finder": "dev-main",
"vincentlanglet/twig-cs-fixer": "^2.5",
"weitzman/drupal-test-traits": "dev-addLoginTrait as 2.x-dev"
"weitzman/drupal-test-traits": "^2"
},
"autoload-dev": {
"psr-4": {
Expand Down Expand Up @@ -439,10 +426,6 @@
"drupal/password_policy": {
"Can't edit user profile because password policy validates even when password unchanged": "https://www.drupal.org/files/issues/2020-03-19/password_policy-empty-password-skip-validation-2971079-37.patch"
},
"drupal/purge": {
"Add alter hooks for plugin definitions - purger, queue, queuer (https://www.drupal.org/project/purge/issues/2757155#comment-14335663)": "https://www.drupal.org/files/issues/2021-12-10/alters.diff",
"Undefined array key in Drupal\\purge\\Plugin\\Purge\\Queue\\QueueService->commitAdding() (https://www.drupal.org/project/purge/issues/3343141#comment-14965816)": "https://www.drupal.org/files/issues/2023-03-14/purge-fix-undefined-key-for-invalidation-buffer-3343141-4.patch"
},
"drupal/redirect": {
"Add an intermediate redirect (https://www.drupal.org/project/redirect/issues/3162696#comment-15085388)": "https://www.drupal.org/files/issues/2023-05-31/tmp.diff",
"Filter by redirect destination does not work with URL alias (https://www.drupal.org/project/redirect/issues/2981544) (See DP-31078 before replacing)": "https://www.drupal.org/files/issues/2024-08-13/2981544-45.patch",
Expand Down
Loading

0 comments on commit 399afa1

Please sign in to comment.