diff --git a/composer.json b/composer.json index a7d6aa3d5..cbd3c6d62 100644 --- a/composer.json +++ b/composer.json @@ -78,6 +78,7 @@ "drupal/editor_advanced_link": "^2.2", "drupal/entity_access_password": "^1.0", "drupal/field_group": "^3.1", + "drupal/flat_taxonomy": "^2.0", "drupal/fpa": "^4.0.0", "drupal/gin": "^3.0-beta5", "drupal/gin_lb": "^1.0@beta", @@ -116,6 +117,7 @@ "drupal/smugmug_api": "^2.0", "drupal/social_auth_hid": "^3.2", "drupal/stage_file_proxy": "^2.0", + "drupal/subpathauto": "^1.3", "drupal/tippy": "^1.0", "drupal/username_enumeration_prevention": "^1.3", "drupal/view_unpublished": "^1.0", diff --git a/composer.lock b/composer.lock index 04b910610..033f3e449 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "37a2d7f8ac293ee9322e859aa0ca4823", + "content-hash": "b3a7f2870be7ef34d5cd0fb94bc3ad37", "packages": [ { "name": "asm89/stack-cors", @@ -2911,6 +2911,50 @@ "source": "https://git.drupalcode.org/project/file_mdm" } }, + { + "name": "drupal/flat_taxonomy", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/flat_taxonomy.git", + "reference": "2.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/flat_taxonomy-2.0.0.zip", + "reference": "2.0.0", + "shasum": "b85d1bde4d8de589cd0dfc77b846e66f0906a0ce" + }, + "require": { + "drupal/core": "^8 || ^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0", + "datestamp": "1688494925", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "vbouchet", + "homepage": "https://www.drupal.org/user/1671428" + } + ], + "description": "Provides tools to force selected taxonomies to be flat.", + "homepage": "https://www.drupal.org/project/flat_taxonomy", + "support": { + "source": "https://git.drupalcode.org/project/flat_taxonomy" + } + }, { "name": "drupal/fpa", "version": "4.0.0", @@ -5673,6 +5717,62 @@ "source": "https://git.drupalcode.org/project/stage_file_proxy" } }, + { + "name": "drupal/subpathauto", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/subpathauto.git", + "reference": "8.x-1.3" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/subpathauto-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "b94e4ec3c8dcd42aa04b6796ae48a9aa1848862d" + }, + "require": { + "drupal/core": "^8.8 || ^9 || ^10" + }, + "require-dev": { + "drupal/redirect": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.3", + "datestamp": "1676316639", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Dave Reid", + "homepage": "https://www.drupal.org/user/53892" + }, + { + "name": "lauriii", + "homepage": "https://www.drupal.org/user/1078742" + }, + { + "name": "NickDickinsonWilde", + "homepage": "https://www.drupal.org/user/3094661" + } + ], + "description": "Provides support for extending sub-paths of URL aliases.", + "homepage": "https://www.drupal.org/project/subpathauto", + "support": { + "source": "https://cgit.drupalcode.org/subpathauto", + "issues": "https://www.drupal.org/project/issues/subpathauto" + } + }, { "name": "drupal/tippy", "version": "1.0", diff --git a/composer.patches.json b/composer.patches.json index 5ccfa2561..0149f0a4f 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -14,8 +14,12 @@ "drupal/autologout": { "Issue #3214958: Autologout triggered in background tab, no indication in other open tabs": "https://git.drupalcode.org/project/autologout/-/merge_requests/6.diff" }, + "drupal/flat_taxonomy": { + "Issue #3427628: Hide 'Add child' link from entity operations": "https://www.drupal.org/files/issues/2024-03-13/3427628-hide-add-child-link-2.patch" + }, "drupal/gin": { - "Issue #??: Use toolbar-bar as id for the toolbar to prevent JS errors in Drupal 10.2": "./patches/gin-toolbar-id.patch" + "Issue #??: Use toolbar-bar as id for the toolbar to prevent JS errors in Drupal 10.2": "./patches/gin-toolbar-id.patch", + "Issue #3281984: The breadcrumb shows 'Edit