[Github Action] Automated trickest wordlists update.

2026-08-09 18:27:33 +00:00 · 2024-08-08 10:03:33 +00:00
parent 9329d3521f
commit bcc47a6434
30 changed files with 2880 additions and 2085 deletions
@@ -31,10 +31,6 @@ ar-softdelete/README.md
 README.md
 lib/composer-LICENSE.txt
 composer-LICENSE.txt
-lib/yii2/helpers/ArrayHelper.php
-yii2/helpers/ArrayHelper.php
-helpers/ArrayHelper.php
-ArrayHelper.php
 lib/yii2/Yii.php
 yii2/Yii.php
 Yii.php
@@ -1366,10 +1362,10 @@ src/templates/users/_passkeys-table.twig
 templates/users/_passkeys-table.twig
 users/_passkeys-table.twig
 _passkeys-table.twig
-src/templates/users/index.twig
-templates/users/index.twig
-users/index.twig
-index.twig
+src/templates/users/_index.twig
+templates/users/_index.twig
+users/_index.twig
+_index.twig
 src/templates/403.twig
 templates/403.twig
 403.twig
@@ -1492,11 +1488,11 @@ templates/settings/globals/_edit.twig
 settings/globals/_edit.twig
 globals/_edit.twig
 _edit.twig
-src/templates/settings/globals/index.twig
-templates/settings/globals/index.twig
-settings/globals/index.twig
-globals/index.twig
-index.twig
+src/templates/settings/globals/_index.twig
+templates/settings/globals/_index.twig
+settings/globals/_index.twig
+globals/_index.twig
+_index.twig
 src/templates/settings/general/_images/image.twig
 templates/settings/general/_images/image.twig
 settings/general/_images/image.twig
@@ -1816,6 +1812,10 @@ src/templates/_layouts/cp.twig
 templates/_layouts/cp.twig
 _layouts/cp.twig
 cp.twig
+src/templates/_login/form.twig
+templates/_login/form.twig
+_login/form.twig
+form.twig
 src/templates/400.twig
 templates/400.twig
 400.twig
@@ -2440,6 +2440,9 @@ ImageException.php
 src/errors/FieldNotFoundException.php
 errors/FieldNotFoundException.php
 FieldNotFoundException.php
+src/errors/SsoFailedException.php
+errors/SsoFailedException.php
+SsoFailedException.php
 src/errors/AssetDisallowedExtensionException.php
 errors/AssetDisallowedExtensionException.php
 AssetDisallowedExtensionException.php
@@ -2452,6 +2455,9 @@ FsObjectExistsException.php
 src/errors/EntryTypeNotFoundException.php
 errors/EntryTypeNotFoundException.php
 EntryTypeNotFoundException.php
+src/errors/AuthProviderNotFoundException.php
+errors/AuthProviderNotFoundException.php
+AuthProviderNotFoundException.php
 src/errors/InvalidLicenseKeyException.php
 errors/InvalidLicenseKeyException.php
 InvalidLicenseKeyException.php
@@ -3330,6 +3336,10 @@ src/console/controllers/InvalidateTagsController.php
 console/controllers/InvalidateTagsController.php
 controllers/InvalidateTagsController.php
 InvalidateTagsController.php
+src/console/controllers/EntryTypesController.php
+console/controllers/EntryTypesController.php
+controllers/EntryTypesController.php
+EntryTypesController.php
 src/console/controllers/TestsController.php
 console/controllers/TestsController.php
 controllers/TestsController.php
@@ -3386,6 +3396,10 @@ src/console/controllers/FixtureController.php
 console/controllers/FixtureController.php
 controllers/FixtureController.php
 FixtureController.php
+src/console/controllers/EnvController.php
+console/controllers/EnvController.php
+controllers/EnvController.php
+EnvController.php
 src/console/controllers/DbController.php
 console/controllers/DbController.php
 controllers/DbController.php
@@ -3434,6 +3448,10 @@ src/console/controllers/ProjectConfigController.php
 console/controllers/ProjectConfigController.php
 controllers/ProjectConfigController.php
 ProjectConfigController.php
+src/console/controllers/FieldsController.php
+console/controllers/FieldsController.php
+controllers/FieldsController.php
+FieldsController.php
 src/console/controllers/UsersController.php
 console/controllers/UsersController.php
 controllers/UsersController.php
@@ -3478,6 +3496,65 @@ InvalidateTagAction.php
 src/console/CallableAction.php
 console/CallableAction.php
 CallableAction.php
+src/auth/sso/BaseProvider.php
+auth/sso/BaseProvider.php
+sso/BaseProvider.php
+BaseProvider.php
+src/auth/sso/ProviderInterface.php
+auth/sso/ProviderInterface.php
+sso/ProviderInterface.php
+ProviderInterface.php
+src/auth/sso/CraftProvider.php
+auth/sso/CraftProvider.php
+sso/CraftProvider.php
+CraftProvider.php
+src/auth/sso/ProviderTrait.php
+auth/sso/ProviderTrait.php
+sso/ProviderTrait.php
+ProviderTrait.php
+src/auth/sso/mapper/ExplicitUserMapper.php
+auth/sso/mapper/ExplicitUserMapper.php
+sso/mapper/ExplicitUserMapper.php
+mapper/ExplicitUserMapper.php
+ExplicitUserMapper.php
+src/auth/sso/mapper/MapFactory.php
+auth/sso/mapper/MapFactory.php
+sso/mapper/MapFactory.php
+mapper/MapFactory.php
+MapFactory.php
+src/auth/sso/mapper/UserMapInterface.php
+auth/sso/mapper/UserMapInterface.php
+sso/mapper/UserMapInterface.php
+mapper/UserMapInterface.php
+UserMapInterface.php
+src/auth/sso/mapper/IdpAttributeUserMapper.php
+auth/sso/mapper/IdpAttributeUserMapper.php
+sso/mapper/IdpAttributeUserMapper.php
+mapper/IdpAttributeUserMapper.php
+IdpAttributeUserMapper.php
+src/auth/sso/mapper/UserAttributesMapper.php
+auth/sso/mapper/UserAttributesMapper.php
+sso/mapper/UserAttributesMapper.php
+mapper/UserAttributesMapper.php
+UserAttributesMapper.php
+src/auth/sso/mapper/SetUserValueTrait.php
+auth/sso/mapper/SetUserValueTrait.php
+sso/mapper/SetUserValueTrait.php
+mapper/SetUserValueTrait.php
+SetUserValueTrait.php
+src/auth/sso/mapper/TemplateValueUserMapper.php
+auth/sso/mapper/TemplateValueUserMapper.php
+sso/mapper/TemplateValueUserMapper.php
+mapper/TemplateValueUserMapper.php
+TemplateValueUserMapper.php
+src/auth/sso/BaseExternalProvider.php
+auth/sso/BaseExternalProvider.php
+sso/BaseExternalProvider.php
+BaseExternalProvider.php
+src/auth/sso/README.md
+auth/sso/README.md
+sso/README.md
+README.md
 src/auth/methods/AuthMethodInterface.php
 auth/methods/AuthMethodInterface.php
 methods/AuthMethodInterface.php
@@ -3570,6 +3647,10 @@ src/translations/pt/app.php
 translations/pt/app.php
 pt/app.php
 app.php
+src/translations/el/app.php
+translations/el/app.php
+el/app.php
+app.php
 src/translations/de-CH/app.php
 translations/de-CH/app.php
 de-CH/app.php
@@ -3740,6 +3821,9 @@ SystemMessages.php
 src/services/Volumes.php
 services/Volumes.php
 Volumes.php
+src/services/Sso.php
+services/Sso.php
+Sso.php
 src/services/Config.php
 services/Config.php
 Config.php
@@ -3794,6 +3878,9 @@ SiteGroup.php
 src/records/GlobalSet.php
 records/GlobalSet.php
 GlobalSet.php
+src/records/SsoIdentity.php
+records/SsoIdentity.php
+SsoIdentity.php
 src/records/AssetIndexingSession.php
 records/AssetIndexingSession.php
 AssetIndexingSession.php
@@ -4055,6 +4142,12 @@ ImageTransformIndex.php
 src/updates/migration.php.template
 updates/migration.php.template
 migration.php.template
+src/updates/field-merge.php.template
+updates/field-merge.php.template
+field-merge.php.template
+src/updates/entry-type-merge.php.template
+updates/entry-type-merge.php.template
+entry-type-merge.php.template
 src/validators/UsernameValidator.php
 validators/UsernameValidator.php
 UsernameValidator.php
@@ -9573,6 +9666,9 @@ BaseElementsController.php
 src/controllers/AuthController.php
 controllers/AuthController.php
 AuthController.php
+src/controllers/SsoController.php
+controllers/SsoController.php
+SsoController.php
 src/controllers/VolumesController.php
 controllers/VolumesController.php
 VolumesController.php
@@ -9737,6 +9833,10 @@ elements/conditions/tags/TagCondition.php
 conditions/tags/TagCondition.php
 tags/TagCondition.php
 TagCondition.php
+src/elements/conditions/HasDescendantsRule.php
+elements/conditions/HasDescendantsRule.php
+conditions/HasDescendantsRule.php
+HasDescendantsRule.php
 src/elements/conditions/DateCreatedConditionRule.php
 elements/conditions/DateCreatedConditionRule.php
 conditions/DateCreatedConditionRule.php
@@ -9984,6 +10084,10 @@ EagerLoadPlan.php
 src/elements/Asset.php
 elements/Asset.php
 Asset.php
+src/elements/actions/MoveToSection.php
+elements/actions/MoveToSection.php
+actions/MoveToSection.php
+MoveToSection.php
 src/elements/actions/UnsuspendUsers.php
 elements/actions/UnsuspendUsers.php
 actions/UnsuspendUsers.php
@@ -10096,9 +10200,15 @@ Install.php
 src/migrations/m230607_102049_add_entrytype_slug_translation_columns.php
 migrations/m230607_102049_add_entrytype_slug_translation_columns.php
 m230607_102049_add_entrytype_slug_translation_columns.php
+src/migrations/m240723_214330_drop_bulkop_fk.php
+migrations/m240723_214330_drop_bulkop_fk.php
+m240723_214330_drop_bulkop_fk.php
 src/migrations/m230616_173810_kill_field_groups.php
 migrations/m230616_173810_kill_field_groups.php
 m230616_173810_kill_field_groups.php
+src/migrations/m240731_053543_soft_delete_fields.php
+migrations/m240731_053543_soft_delete_fields.php
+m240731_053543_soft_delete_fields.php
 src/migrations/m230904_190356_address_fields.php
 migrations/m230904_190356_address_fields.php
 m230904_190356_address_fields.php
@@ -10114,6 +10224,9 @@ m240619_091352_add_auth_2fa_timestamp.php
 src/migrations/m221205_082005_translatable_asset_alt_text.php
 migrations/m221205_082005_translatable_asset_alt_text.php
 m221205_082005_translatable_asset_alt_text.php
+src/migrations/BaseFieldMergeMigration.php
+migrations/BaseFieldMergeMigration.php
+BaseFieldMergeMigration.php
 src/migrations/m230314_111234_add_webauthn_table.php
 migrations/m230314_111234_add_webauthn_table.php
 m230314_111234_add_webauthn_table.php
@@ -10126,12 +10239,18 @@ m240207_182452_address_line_3.php
 src/migrations/m230820_162023_fix_cache_id_type.php
 migrations/m230820_162023_fix_cache_id_type.php
 m230820_162023_fix_cache_id_type.php
+src/migrations/m240805_154041_sso_identities.php
+migrations/m240805_154041_sso_identities.php
+m240805_154041_sso_identities.php
 src/migrations/m230616_183820_remove_field_name_limit.php
 migrations/m230616_183820_remove_field_name_limit.php
 m230616_183820_remove_field_name_limit.php
 src/migrations/CreateDbCacheTable.php
 migrations/CreateDbCacheTable.php
 CreateDbCacheTable.php
+src/migrations/BaseEntryTypeMergeMigration.php
+migrations/BaseEntryTypeMergeMigration.php
+BaseEntryTypeMergeMigration.php
 src/migrations/m230524_000002_entry_type_colors.php
 migrations/m230524_000002_entry_type_colors.php
 m230524_000002_entry_type_colors.php
@@ -13446,6 +13565,13 @@ cp/src/js/ElementFieldSettings.js
 src/js/ElementFieldSettings.js
 js/ElementFieldSettings.js
 ElementFieldSettings.js
+src/web/assets/cp/src/js/EnvVarGenerator.js
+web/assets/cp/src/js/EnvVarGenerator.js
+assets/cp/src/js/EnvVarGenerator.js
+cp/src/js/EnvVarGenerator.js
+src/js/EnvVarGenerator.js
+js/EnvVarGenerator.js
+EnvVarGenerator.js
 src/web/assets/cp/src/js/BaseElementSelectorModal.js
 web/assets/cp/src/js/BaseElementSelectorModal.js
 assets/cp/src/js/BaseElementSelectorModal.js
@@ -13551,6 +13677,13 @@ cp/src/js/CraftDisclosure.js
 src/js/CraftDisclosure.js
 js/CraftDisclosure.js
 CraftDisclosure.js
+src/web/assets/cp/src/js/EntryMover.js
+web/assets/cp/src/js/EntryMover.js
+assets/cp/src/js/EntryMover.js
+cp/src/js/EntryMover.js
+src/js/EntryMover.js
+js/EntryMover.js
+EntryMover.js
 src/web/assets/cp/src/js/ElementEditorSlideout.js
 web/assets/cp/src/js/ElementEditorSlideout.js
 assets/cp/src/js/ElementEditorSlideout.js
@@ -13558,6 +13691,13 @@ cp/src/js/ElementEditorSlideout.js
 src/js/ElementEditorSlideout.js
 js/ElementEditorSlideout.js
 ElementEditorSlideout.js
+src/web/assets/cp/src/js/LinkInput.js
+web/assets/cp/src/js/LinkInput.js
+assets/cp/src/js/LinkInput.js
+cp/src/js/LinkInput.js
+src/js/LinkInput.js
+js/LinkInput.js
+LinkInput.js
 src/web/assets/cp/src/js/InfoIcon.js
 web/assets/cp/src/js/InfoIcon.js
 assets/cp/src/js/InfoIcon.js
@@ -15951,28 +16091,11 @@ web/assets/vue/VueAsset.php
 assets/vue/VueAsset.php
 vue/VueAsset.php
 VueAsset.php
-src/web/assets/elementresizedetector/webpack.config.js
-web/assets/elementresizedetector/webpack.config.js
-assets/elementresizedetector/webpack.config.js
-elementresizedetector/webpack.config.js
-webpack.config.js
 src/web/assets/elementresizedetector/ElementResizeDetectorAsset.php
 web/assets/elementresizedetector/ElementResizeDetectorAsset.php
 assets/elementresizedetector/ElementResizeDetectorAsset.php
 elementresizedetector/ElementResizeDetectorAsset.php
 ElementResizeDetectorAsset.php
-src/web/assets/elementresizedetector/dist/element-resize-detector.js.LICENSE.txt
-web/assets/elementresizedetector/dist/element-resize-detector.js.LICENSE.txt
-assets/elementresizedetector/dist/element-resize-detector.js.LICENSE.txt
-elementresizedetector/dist/element-resize-detector.js.LICENSE.txt
-dist/element-resize-detector.js.LICENSE.txt
-element-resize-detector.js.LICENSE.txt
-src/web/assets/elementresizedetector/dist/element-resize-detector.js
-web/assets/elementresizedetector/dist/element-resize-detector.js
-assets/elementresizedetector/dist/element-resize-detector.js
-elementresizedetector/dist/element-resize-detector.js
-dist/element-resize-detector.js
-element-resize-detector.js
 src/web/assets/upgrade/UpgradeAsset.php
 web/assets/upgrade/UpgradeAsset.php
 assets/upgrade/UpgradeAsset.php
@@ -16387,6 +16510,15 @@ TimePeriod.php
 src/enums/AttributeStatus.php
 enums/AttributeStatus.php
 AttributeStatus.php
+src/filters/SiteFilterTrait.php
+filters/SiteFilterTrait.php
+SiteFilterTrait.php
+src/filters/Headers.php
+filters/Headers.php
+Headers.php
+src/filters/Cors.php
+filters/Cors.php
+Cors.php
 src/Craft.php
 Craft.php
 src/db/Table.php
@@ -16512,6 +16644,9 @@ PluginInterface.php
 src/base/ConfigurableComponent.php
 base/ConfigurableComponent.php
 ConfigurableComponent.php
+src/base/RelationalFieldTrait.php
+base/RelationalFieldTrait.php
+RelationalFieldTrait.php
 src/base/NestedElementInterface.php
 base/NestedElementInterface.php
 NestedElementInterface.php
@@ -16530,6 +16665,9 @@ CpEditable.php
 src/base/FieldLayoutElement.php
 base/FieldLayoutElement.php
 FieldLayoutElement.php
+src/base/MergeableFieldInterface.php
+base/MergeableFieldInterface.php
+MergeableFieldInterface.php
 src/base/Image.php
 base/Image.php
 Image.php
@@ -16664,6 +16802,9 @@ BaseFsInterface.php
 src/base/ElementExporterInterface.php
 base/ElementExporterInterface.php
 ElementExporterInterface.php
+src/base/Grippable.php
+base/Grippable.php
+Grippable.php
 src/base/FieldInterface.php
 base/FieldInterface.php
 FieldInterface.php
@@ -16688,6 +16829,9 @@ ConfigurableComponentInterface.php
 src/base/SavableComponent.php
 base/SavableComponent.php
 SavableComponent.php
+src/base/RelationalFieldInterface.php
+base/RelationalFieldInterface.php
+RelationalFieldInterface.php
 src/base/ElementAction.php
 base/ElementAction.php
 ElementAction.php
@@ -16868,6 +17012,9 @@ PopulateElementEvent.php
 src/events/LocateUploadedFilesEvent.php
 events/LocateUploadedFilesEvent.php
 LocateUploadedFilesEvent.php
+src/events/MoveEntryEvent.php
+events/MoveEntryEvent.php
+MoveEntryEvent.php
 src/events/RegisterTemplateRootsEvent.php
 events/RegisterTemplateRootsEvent.php
 RegisterTemplateRootsEvent.php
@@ -16964,6 +17111,9 @@ UserGroupEvent.php
 src/events/InvalidateElementCachesEvent.php
 events/InvalidateElementCachesEvent.php
 InvalidateElementCachesEvent.php
+src/events/DefineShowFieldLayoutComponentInFormEvent.php
+events/DefineShowFieldLayoutComponentInFormEvent.php
+DefineShowFieldLayoutComponentInFormEvent.php
 src/events/RegisterElementSortOptionsEvent.php
 events/RegisterElementSortOptionsEvent.php
 RegisterElementSortOptionsEvent.php
@@ -17093,6 +17243,9 @@ DuplicateNestedElementsEvent.php
 src/events/DefineAssetThumbUrlEvent.php
 events/DefineAssetThumbUrlEvent.php
 DefineAssetThumbUrlEvent.php
+src/events/SsoEvent.php
+events/SsoEvent.php
+SsoEvent.php
 src/events/DefineRulesEvent.php
 events/DefineRulesEvent.php
 DefineRulesEvent.php
@@ -17319,6 +17472,10 @@ src/fields/data/SingleOptionFieldData.php
 fields/data/SingleOptionFieldData.php
 data/SingleOptionFieldData.php
 SingleOptionFieldData.php
+src/fields/data/LinkData.php
+fields/data/LinkData.php
+data/LinkData.php
+LinkData.php
 src/fields/data/MultiOptionsFieldData.php
 fields/data/MultiOptionsFieldData.php
 data/MultiOptionsFieldData.php
@@ -17327,9 +17484,48 @@ src/fields/data/ColorData.php
 fields/data/ColorData.php
 data/ColorData.php
 ColorData.php
+src/fields/linktypes/Phone.php
+fields/linktypes/Phone.php
+linktypes/Phone.php
+Phone.php
+src/fields/linktypes/Category.php
+fields/linktypes/Category.php
+linktypes/Category.php
+Category.php
+src/fields/linktypes/BaseElementLinkType.php
+fields/linktypes/BaseElementLinkType.php
+linktypes/BaseElementLinkType.php
+BaseElementLinkType.php
+src/fields/linktypes/Url.php
+fields/linktypes/Url.php
+linktypes/Url.php
+Url.php
+src/fields/linktypes/Entry.php
+fields/linktypes/Entry.php
+linktypes/Entry.php
+Entry.php
+src/fields/linktypes/BaseTextLinkType.php
+fields/linktypes/BaseTextLinkType.php
+linktypes/BaseTextLinkType.php
+BaseTextLinkType.php
+src/fields/linktypes/Asset.php
+fields/linktypes/Asset.php
+linktypes/Asset.php
+Asset.php
+src/fields/linktypes/BaseLinkType.php
+fields/linktypes/BaseLinkType.php
+linktypes/BaseLinkType.php
+BaseLinkType.php
+src/fields/linktypes/Email.php
+fields/linktypes/Email.php
+linktypes/Email.php
+Email.php
 src/fields/Number.php
 fields/Number.php
 Number.php
+src/fields/Link.php
+fields/Link.php
+Link.php
 src/fields/Date.php
 fields/Date.php
 Date.php
@@ -12,7 +12,6 @@ lib/ar-softdelete/src/SoftDeleteBehavior.php
 lib/ar-softdelete/src/SoftDeleteQueryBehavior.php
 lib/ar-softdelete/README.md
 lib/composer-LICENSE.txt
-lib/yii2/helpers/ArrayHelper.php
 lib/yii2/Yii.php
 CHANGELOG.md
 crowdin.yml
@@ -364,7 +363,7 @@ src/templates/users/_auth-methods.twig
 src/templates/users/_password.twig
 src/templates/users/_permissions.twig
 src/templates/users/_passkeys-table.twig
-src/templates/users/index.twig
+src/templates/users/_index.twig
 src/templates/403.twig
 src/templates/entries/index.twig
 src/templates/plugin-store/_special/oauth/modal-callback.twig
@@ -392,7 +391,7 @@ src/templates/_elements/revisions.twig
 src/templates/settings/sections/_edit.twig
 src/templates/settings/sections/_index.twig
 src/templates/settings/globals/_edit.twig
-src/templates/settings/globals/index.twig
+src/templates/settings/globals/_index.twig
 src/templates/settings/general/_images/image.twig
 src/templates/settings/general/_images/logo.twig
 src/templates/settings/general/_images/icon.twig
@@ -459,6 +458,7 @@ src/templates/_layouts/basecp.twig
 src/templates/_layouts/base.twig
 src/templates/_layouts/elementindex.twig
 src/templates/_layouts/cp.twig
+src/templates/_login/form.twig
 src/templates/400.twig
 src/templates/categories/_index.twig
 src/templates/_includes/forms/timeZone.twig
@@ -579,10 +579,12 @@ src/views/debug/deprecated/detail.php
 src/views/debug/deprecated/summary.php
 src/errors/ImageException.php
 src/errors/FieldNotFoundException.php
+src/errors/SsoFailedException.php
 src/errors/AssetDisallowedExtensionException.php
 src/errors/TokenNotFoundException.php
 src/errors/FsObjectExistsException.php
 src/errors/EntryTypeNotFoundException.php
+src/errors/AuthProviderNotFoundException.php
 src/errors/InvalidLicenseKeyException.php
 src/errors/CategoryGroupNotFoundException.php
 src/errors/StructureNotFoundException.php
@@ -809,6 +811,7 @@ src/console/controllers/BackupTrait.php
 src/console/controllers/UpController.php
 src/console/controllers/OnController.php
 src/console/controllers/InvalidateTagsController.php
+src/console/controllers/EntryTypesController.php
 src/console/controllers/TestsController.php
 src/console/controllers/PluginController.php
 src/console/controllers/utils/UpdateUsernamesController.php
@@ -821,6 +824,7 @@ src/console/controllers/utils/PruneOrphanedEntriesController.php
 src/console/controllers/utils/FixFieldLayoutUidsController.php
 src/console/controllers/IndexAssetsController.php
 src/console/controllers/FixtureController.php
+src/console/controllers/EnvController.php
 src/console/controllers/DbController.php
 src/console/controllers/UpdateController.php
 src/console/controllers/ElementsController.php
@@ -833,6 +837,7 @@ src/console/controllers/OffController.php
 src/console/controllers/RestoreController.php
 src/console/controllers/ClearDeprecationsController.php
 src/console/controllers/ProjectConfigController.php
+src/console/controllers/FieldsController.php
 src/console/controllers/UsersController.php
 src/console/controllers/HelpController.php
 src/console/controllers/BackupController.php
@@ -845,6 +850,19 @@ src/console/ErrorHandler.php
 src/console/actions/ClearCacheAction.php
 src/console/actions/InvalidateTagAction.php
 src/console/CallableAction.php
+src/auth/sso/BaseProvider.php
+src/auth/sso/ProviderInterface.php
+src/auth/sso/CraftProvider.php
+src/auth/sso/ProviderTrait.php
+src/auth/sso/mapper/ExplicitUserMapper.php
+src/auth/sso/mapper/MapFactory.php
+src/auth/sso/mapper/UserMapInterface.php
+src/auth/sso/mapper/IdpAttributeUserMapper.php
+src/auth/sso/mapper/UserAttributesMapper.php
+src/auth/sso/mapper/SetUserValueTrait.php
+src/auth/sso/mapper/TemplateValueUserMapper.php
+src/auth/sso/BaseExternalProvider.php
+src/auth/sso/README.md
 src/auth/methods/AuthMethodInterface.php
 src/auth/methods/TOTP.php
 src/auth/methods/BaseAuthMethod.php
@@ -868,6 +886,7 @@ src/translations/es/app.php
 src/translations/cy/app.php
 src/translations/he/app.php
 src/translations/pt/app.php
+src/translations/el/app.php
 src/translations/de-CH/app.php
 src/translations/da/app.php
 src/translations/fa/app.php
@@ -920,6 +939,7 @@ src/services/AssetIndexer.php
 src/services/Webpack.php
 src/services/SystemMessages.php
 src/services/Volumes.php
+src/services/Sso.php
 src/services/Config.php
 src/services/Revisions.php
 src/services/Routes.php
@@ -938,6 +958,7 @@ src/records/GqlSchema.php
 src/records/UserPermission_User.php
 src/records/SiteGroup.php
 src/records/GlobalSet.php
+src/records/SsoIdentity.php
 src/records/AssetIndexingSession.php
 src/records/Section_SiteSettings.php
 src/records/FieldLayout.php
@@ -1025,6 +1046,8 @@ src/models/TagGroup.php
 src/models/UserGroup.php
 src/models/ImageTransformIndex.php
 src/updates/migration.php.template
+src/updates/field-merge.php.template
+src/updates/entry-type-merge.php.template
 src/validators/UsernameValidator.php
 src/validators/ColorValidator.php
 src/validators/DateTimeValidator.php
@@ -2426,6 +2449,7 @@ src/controllers/EntriesController.php
 src/controllers/ImageTransformsController.php
 src/controllers/BaseElementsController.php
 src/controllers/AuthController.php
+src/controllers/SsoController.php
 src/controllers/VolumesController.php
 src/controllers/SectionsController.php
 src/controllers/TemplatesController.php
@@ -2463,6 +2487,7 @@ src/elements/conditions/entries/ViewableConditionRule.php
 src/elements/conditions/entries/AuthorConditionRule.php
 src/elements/conditions/tags/GroupConditionRule.php
 src/elements/conditions/tags/TagCondition.php
+src/elements/conditions/HasDescendantsRule.php
 src/elements/conditions/DateCreatedConditionRule.php
 src/elements/conditions/SiteConditionRule.php
 src/elements/conditions/assets/SavableConditionRule.php
@@ -2519,6 +2544,7 @@ src/elements/db/AssetQuery.php
 src/elements/db/GlobalSetQuery.php
 src/elements/db/EagerLoadPlan.php
 src/elements/Asset.php
+src/elements/actions/MoveToSection.php
 src/elements/actions/UnsuspendUsers.php
 src/elements/actions/NewChild.php
 src/elements/actions/ShowInFolder.php
@@ -2548,18 +2574,23 @@ src/elements/ElementCollection.php
 src/migrations/m231213_030600_element_bulk_ops.php
 src/migrations/Install.php
 src/migrations/m230607_102049_add_entrytype_slug_translation_columns.php
+src/migrations/m240723_214330_drop_bulkop_fk.php
 src/migrations/m230616_173810_kill_field_groups.php
+src/migrations/m240731_053543_soft_delete_fields.php
 src/migrations/m230904_190356_address_fields.php
 src/migrations/m221101_115859_create_entries_authors_table.php
 src/migrations/BaseContentRefactorMigration.php
 src/migrations/m240619_091352_add_auth_2fa_timestamp.php
 src/migrations/m221205_082005_translatable_asset_alt_text.php
+src/migrations/BaseFieldMergeMigration.php
 src/migrations/m230314_111234_add_webauthn_table.php
 src/migrations/m240302_212719_solo_preview_targets.php
 src/migrations/m240207_182452_address_line_3.php
 src/migrations/m230820_162023_fix_cache_id_type.php
+src/migrations/m240805_154041_sso_identities.php
 src/migrations/m230616_183820_remove_field_name_limit.php
 src/migrations/CreateDbCacheTable.php
+src/migrations/BaseEntryTypeMergeMigration.php
 src/migrations/m230524_000002_entry_type_colors.php
 src/migrations/m230710_162700_element_activity.php
 src/migrations/m230511_215903_content_refactor.php
@@ -3083,6 +3114,7 @@ src/web/assets/cp/src/css/charts.scss
 src/web/assets/cp/src/css/_color-palette.scss
 src/web/assets/cp/src/css/_global-sidebar.scss
 src/web/assets/cp/src/js/ElementFieldSettings.js
+src/web/assets/cp/src/js/EnvVarGenerator.js
 src/web/assets/cp/src/js/BaseElementSelectorModal.js
 src/web/assets/cp/src/js/Chart.js
 src/web/assets/cp/src/js/ElementActionTrigger.js
@@ -3098,7 +3130,9 @@ src/web/assets/cp/src/js/Slideout.js
 src/web/assets/cp/src/js/BaseElementSelectInput.js
 src/web/assets/cp/src/js/CpModal.js
 src/web/assets/cp/src/js/CraftDisclosure.js
+src/web/assets/cp/src/js/EntryMover.js
 src/web/assets/cp/src/js/ElementEditorSlideout.js
+src/web/assets/cp/src/js/LinkInput.js
 src/web/assets/cp/src/js/InfoIcon.js
 src/web/assets/cp/src/js/LightSwitch.js
 src/web/assets/cp/src/js/Grid.js
@@ -3454,10 +3488,7 @@ src/web/assets/vue/webpack.config.js
 src/web/assets/vue/dist/vue.js.LICENSE.txt
 src/web/assets/vue/dist/vue.js
 src/web/assets/vue/VueAsset.php
-src/web/assets/elementresizedetector/webpack.config.js
 src/web/assets/elementresizedetector/ElementResizeDetectorAsset.php
-src/web/assets/elementresizedetector/dist/element-resize-detector.js.LICENSE.txt
-src/web/assets/elementresizedetector/dist/element-resize-detector.js
 src/web/assets/upgrade/UpgradeAsset.php
 src/web/assets/upgrade/webpack.config.js
 src/web/assets/upgrade/src/upgrade.scss
@@ -3544,6 +3575,9 @@ src/enums/PropagationMethod.php
 src/enums/CmsEdition.php
 src/enums/TimePeriod.php
 src/enums/AttributeStatus.php
+src/filters/SiteFilterTrait.php
+src/filters/Headers.php
+src/filters/Cors.php
 src/Craft.php
 src/db/Table.php
 src/db/Command.php
@@ -3584,12 +3618,14 @@ src/base/SavableComponentInterface.php
 src/base/FieldLayoutProviderInterface.php
 src/base/PluginInterface.php
 src/base/ConfigurableComponent.php
+src/base/RelationalFieldTrait.php
 src/base/NestedElementInterface.php
 src/base/ThumbableFieldInterface.php
 src/base/Component.php
 src/base/FieldLayoutComponent.php
 src/base/CpEditable.php
 src/base/FieldLayoutElement.php
+src/base/MergeableFieldInterface.php
 src/base/Image.php
 src/base/FsTrait.php
 src/base/Widget.php
@@ -3630,6 +3666,7 @@ src/base/Colorable.php
 src/base/ClonefixTrait.php
 src/base/BaseFsInterface.php
 src/base/ElementExporterInterface.php
+src/base/Grippable.php
 src/base/FieldInterface.php
 src/base/PreviewableFieldInterface.php
 src/base/Plugin.php
@@ -3638,6 +3675,7 @@ src/base/Model.php
 src/base/Serializable.php
 src/base/ConfigurableComponentInterface.php
 src/base/SavableComponent.php
+src/base/RelationalFieldInterface.php
 src/base/ElementAction.php
 src/base/Statusable.php
 src/base/WidgetInterface.php
@@ -3698,6 +3736,7 @@ src/events/CancelableEvent.php
 src/events/RegisterCpNavItemsEvent.php
 src/events/PopulateElementEvent.php
 src/events/LocateUploadedFilesEvent.php
+src/events/MoveEntryEvent.php
 src/events/RegisterTemplateRootsEvent.php
 src/events/DefineAddressFieldLabelEvent.php
 src/events/ErrorEvent.php
@@ -3730,6 +3769,7 @@ src/events/SetElementRouteEvent.php
 src/events/DefineFieldLayoutFieldsEvent.php
 src/events/UserGroupEvent.php
 src/events/InvalidateElementCachesEvent.php
+src/events/DefineShowFieldLayoutComponentInFormEvent.php
 src/events/RegisterElementSortOptionsEvent.php
 src/events/RegisterElementActionsEvent.php
 src/events/ElementQueryEvent.php
@@ -3773,6 +3813,7 @@ src/events/RegisterCpSettingsEvent.php
 src/events/ExecuteGqlQueryEvent.php
 src/events/DuplicateNestedElementsEvent.php
 src/events/DefineAssetThumbUrlEvent.php
+src/events/SsoEvent.php
 src/events/DefineRulesEvent.php
 src/events/DefineHtmlEvent.php
 src/events/CreateTwigEvent.php
@@ -3844,9 +3885,20 @@ src/fields/Money.php
 src/fields/Checkboxes.php
 src/fields/data/OptionData.php
 src/fields/data/SingleOptionFieldData.php
+src/fields/data/LinkData.php
 src/fields/data/MultiOptionsFieldData.php
 src/fields/data/ColorData.php
+src/fields/linktypes/Phone.php
+src/fields/linktypes/Category.php
+src/fields/linktypes/BaseElementLinkType.php
+src/fields/linktypes/Url.php
+src/fields/linktypes/Entry.php
+src/fields/linktypes/BaseTextLinkType.php
+src/fields/linktypes/Asset.php
+src/fields/linktypes/BaseLinkType.php
+src/fields/linktypes/Email.php
 src/fields/Number.php
+src/fields/Link.php
 src/fields/Date.php
 src/fields/RadioButtons.php
 src/fields/MultiSelect.php
@@ -28,7 +28,6 @@ api/src/middleware/cache.ts
 api/src/middleware/rate-limiter-global.ts
 api/src/middleware/error-handler.test.ts
 api/src/middleware/collection-exists.ts
-api/src/middleware/get-permissions.ts
 api/src/middleware/extract-token.ts
 api/src/middleware/validate-batch.test.ts
 api/src/middleware/rate-limiter-ip.ts
@@ -41,7 +40,6 @@ api/src/middleware/validate-batch.ts
 api/src/middleware/authenticate.test.ts
 api/src/middleware/error-handler.ts
 api/src/middleware/rate-limiter-registration.ts
-api/src/middleware/check-ip.ts
 api/src/lock/lib/use-lock.test.ts
 api/src/lock/lib/use-lock.ts
 api/src/lock/index.ts
@@ -56,8 +54,10 @@ api/src/auth/auth.ts
 api/src/services/schema.ts
 api/src/services/specifications.test.ts
 api/src/services/utils.ts
+api/src/services/policies.ts
 api/src/services/flows.ts
-api/src/services/authorization.ts
+api/src/services/policies.test.ts
+api/src/services/items.test.ts
 api/src/services/websocket.ts
 api/src/services/revisions.ts
 api/src/services/presets.ts
@@ -70,12 +70,14 @@ api/src/services/server.ts
 api/src/services/users.ts
 api/src/services/meta.ts
 api/src/services/operations.ts
+api/src/services/access.ts
 api/src/services/tfa.ts
 api/src/services/fields.ts
 api/src/services/files.ts
 api/src/services/settings.ts
 api/src/services/users.test.ts
 api/src/services/items.ts
+api/src/services/import-export.test.ts
 api/src/services/graphql/schema-cache.ts
 api/src/services/graphql/errors/validation.ts
 api/src/services/graphql/errors/index.ts
@@ -100,10 +102,6 @@ api/src/services/panels.ts
 api/src/services/notifications.ts
 api/src/services/shares.ts
 api/src/services/roles.ts
-api/src/services/permissions/lib/with-app-minimal-permissions.test.ts
-api/src/services/permissions/lib/with-app-minimal-permissions.ts
-api/src/services/permissions/index.ts
-api/src/services/permissions/index.test.ts
 api/src/services/import-export.ts
 api/src/services/extensions.ts
 api/src/services/files/lib/extract-metadata.ts
@@ -116,6 +114,7 @@ api/src/services/files.test.ts
 api/src/services/relations.ts
 api/src/services/payload.ts
 api/src/services/webhooks.test.ts
+api/src/services/permissions.ts
 api/src/services/collections.ts
 api/src/services/assets.ts
 api/src/services/tus/data-store.ts
@@ -196,30 +195,22 @@ api/src/telemetry/lib/init-telemetry.ts
 api/src/telemetry/lib/track.test.ts
 api/src/telemetry/lib/send-report.test.ts
 api/src/telemetry/index.ts
-api/src/telemetry/utils/get-user-count.ts
 api/src/telemetry/utils/get-user-item-count.ts
-api/src/telemetry/utils/get-role-counts-by-users.ts
 api/src/telemetry/utils/get-user-item-count.test.ts
 api/src/telemetry/utils/get-filesize-sum.ts
-api/src/telemetry/utils/get-role-counts-by-roles.ts
 api/src/telemetry/utils/get-item-count.ts
 api/src/telemetry/utils/get-field-count.test.ts
-api/src/telemetry/utils/get-user-counts-by-roles.ts
 api/src/telemetry/utils/get-random-wait-time.ts
-api/src/telemetry/utils/check-increased-user-limits.ts
 api/src/telemetry/utils/get-item-count.test.ts
 api/src/telemetry/utils/get-extension-count.ts
-api/src/telemetry/utils/get-user-count.test.ts
+api/src/telemetry/utils/check-user-limits.ts
 api/src/telemetry/utils/get-random-wait-time.test.ts
-api/src/telemetry/utils/get-role-counts-by-users.test.ts
 api/src/telemetry/utils/get-field-count.ts
 api/src/telemetry/utils/get-filesize-sum.test.ts
-api/src/telemetry/utils/check-increased-user-limits.test.ts
 api/src/telemetry/utils/should-check-user-limits.test.ts
 api/src/telemetry/utils/should-check-user-limits.ts
-api/src/telemetry/utils/get-user-counts-by-roles.test.ts
+api/src/telemetry/utils/check-user-limits.test.ts
 api/src/telemetry/utils/get-extension-count.test.ts
-api/src/telemetry/utils/get-role-counts-by-roles.test.ts
 api/src/telemetry/types/report.ts
 api/src/logger/index.ts
 api/src/logger/redact-query.ts
@@ -266,11 +257,11 @@ api/src/utils/validate-keys.test.ts
 api/src/utils/get-versioned-hash.ts
 api/src/utils/compress.ts
 api/src/utils/validate-snapshot.test.ts
-api/src/utils/merge-permissions.test.ts
 api/src/utils/map-values-deep.ts
 api/src/utils/get-accountability-for-token.ts
 api/src/utils/validate-query.ts
 api/src/utils/get-relation-info.test.ts
+api/src/utils/validate-user-count-integrity.test.ts
 api/src/utils/get-config-from-env.ts
 api/src/utils/is-url-allowed.test.ts
 api/src/utils/job-queue.ts
@@ -278,6 +269,12 @@ api/src/utils/validate-diff.ts
 api/src/utils/is-directus-jwt.test.ts
 api/src/utils/validate-snapshot.ts
 api/src/utils/apply-snapshot.ts
+api/src/utils/fetch-user-count/fetch-active-users.ts
+api/src/utils/fetch-user-count/fetch-user-count.ts
+api/src/utils/fetch-user-count/fetch-access-roles.test.ts
+api/src/utils/fetch-user-count/fetch-access-roles.ts
+api/src/utils/fetch-user-count/get-user-count-query.ts
+api/src/utils/fetch-user-count/fetch-access-lookup.ts
 api/src/utils/is-login-redirect-allowed.test.ts
 api/src/utils/is-valid-uuid.ts
 api/src/utils/sanitize-schema.ts
@@ -286,11 +283,9 @@ api/src/utils/get-milliseconds.ts
 api/src/utils/calculate-field-depth.ts
 api/src/utils/ip-in-networks.test.ts
 api/src/utils/get-cache-key.ts
-api/src/utils/get-permissions.ts
 api/src/utils/get-date-formatted.ts
 api/src/utils/should-clear-cache.ts
 api/src/utils/validate-env.test.ts
-api/src/utils/merge-permissions.ts
 api/src/utils/apply-function-to-column-name.test.ts
 api/src/utils/is-login-redirect-allowed.ts
 api/src/utils/merge-version-data.test.ts
@@ -329,13 +324,13 @@ api/src/utils/map-values-deep.test.ts
 api/src/utils/get-date-formatted.test.ts
 api/src/utils/apply-function-to-column-name.ts
 api/src/utils/require-yaml.ts
+api/src/utils/validate-user-count-integrity.ts
 api/src/utils/validate-query.test.ts
 api/src/utils/get-versioned-hash.test.ts
 api/src/utils/jwt.ts
 api/src/utils/get-column-path.ts
 api/src/utils/is-valid-uuid.test.ts
 api/src/utils/validate-keys.ts
-api/src/utils/merge-permissions-for-share.ts
 api/src/utils/get-milliseconds.test.ts
 api/src/utils/transaction.ts
 api/src/utils/get-collection-from-alias.ts
@@ -345,7 +340,6 @@ api/src/utils/apply-diff.ts
 api/src/utils/get-field-system-rows.ts
 api/src/utils/get-config-from-env.test.ts
 api/src/utils/transformations.ts
-api/src/utils/get-ast-from-query.ts
 api/src/utils/sanitize-query.test.ts
 api/src/database/helpers/date/index.ts
 api/src/database/helpers/date/types.ts
@@ -355,6 +349,8 @@ api/src/database/helpers/date/dialects/mysql.ts
 api/src/database/helpers/date/dialects/oracle.ts
 api/src/database/helpers/date/dialects/sqlite.ts
 api/src/database/helpers/schema/index.ts
+api/src/database/helpers/schema/utils/preprocess-bindings.ts
+api/src/database/helpers/schema/utils/preprocess-bindings.test.ts
 api/src/database/helpers/schema/types.ts
 api/src/database/helpers/schema/dialects/cockroachdb.ts
 api/src/database/helpers/schema/dialects/mssql.ts
@@ -394,6 +390,18 @@ api/src/database/helpers/geometry/dialects/redshift.ts
 api/src/database/helpers/geometry/dialects/postgres.ts
 api/src/database/helpers/geometry/dialects/oracle.ts
 api/src/database/helpers/geometry/dialects/sqlite.ts
+api/src/database/run-ast/lib/get-db-query.ts
+api/src/database/run-ast/lib/parse-current-level.ts
+api/src/database/run-ast/utils/apply-parent-filters.ts
+api/src/database/run-ast/utils/get-field-alias.ts
+api/src/database/run-ast/utils/with-preprocess-bindings.ts
+api/src/database/run-ast/utils/remove-temporary-fields.ts
+api/src/database/run-ast/utils/get-inner-query-column-pre-processor.ts
+api/src/database/run-ast/utils/apply-case-when.ts
+api/src/database/run-ast/utils/merge-with-parent-items.ts
+api/src/database/run-ast/utils/get-column-pre-processor.ts
+api/src/database/run-ast/run-ast.ts
+api/src/database/run-ast/types.ts
 api/src/database/errors/translate.ts
 api/src/database/errors/dialects/mssql.ts
 api/src/database/errors/dialects/mysql.ts
@@ -418,6 +426,12 @@ api/src/database/seeds/14-webhooks.yaml
 api/src/database/seeds/07-files.yaml
 api/src/database/seeds/12-sessions.yaml
 api/src/database/seeds/13-settings.yaml
+api/src/database/get-ast-from-query/lib/convert-wildcards.ts
+api/src/database/get-ast-from-query/lib/parse-fields.ts
+api/src/database/get-ast-from-query/utils/get-deep-query.ts
+api/src/database/get-ast-from-query/utils/get-related-collection.ts
+api/src/database/get-ast-from-query/utils/get-relation.ts
+api/src/database/get-ast-from-query/get-ast-from-query.ts
 api/src/database/migrations/20220402A-remove-default-value-panel-icon.ts
 api/src/database/migrations/20210805A-update-groups.ts
 api/src/database/migrations/20210811A-add-geometry-config.ts
@@ -490,6 +504,7 @@ api/src/database/migrations/20210929A-rename-login-action.ts
 api/src/database/migrations/20240716A-update-files-date-fields.ts
 api/src/database/migrations/20210626A-change-filesize-bigint.ts
 api/src/database/migrations/20220429A-add-flows.ts
+api/src/database/migrations/20240806A-permissions-policies.ts
 api/src/database/migrations/20220429B-add-color-to-insights-icon.ts
 api/src/database/migrations/20210506A-rename-interfaces.ts
 api/src/database/migrations/20211016A-add-webhook-headers.ts
@@ -500,7 +515,6 @@ api/src/database/migrations/20240422A-public-registration.ts
 api/src/database/migrations/20231010A-add-extensions.ts
 api/src/database/migrations/20220314A-add-translation-strings.ts
 api/src/database/migrations/20231009A-update-csv-fields-to-text.ts
-api/src/database/run-ast.ts
 api/src/types/graphql.ts
 api/src/types/services.ts
 api/src/types/express.d.ts
@@ -522,6 +536,7 @@ api/src/controllers/schema.ts
 api/src/controllers/graphql.ts
 api/src/controllers/not-found.ts
 api/src/controllers/utils.ts
+api/src/controllers/policies.ts
 api/src/controllers/flows.ts
 api/src/controllers/revisions.ts
 api/src/controllers/presets.ts
@@ -532,6 +547,7 @@ api/src/controllers/server.ts
 api/src/controllers/users.ts
 api/src/controllers/operations.ts
 api/src/controllers/tus.ts
+api/src/controllers/access.ts
 api/src/controllers/fields.ts
 api/src/controllers/files.ts
 api/src/controllers/settings.ts
@@ -582,6 +598,94 @@ api/src/cli/commands/bootstrap/index.ts
 api/src/cli/commands/count/index.ts
 api/src/cli/load-extensions.ts
 api/src/start.ts
+api/src/permissions/modules/fetch-allowed-collections/fetch-allowed-collections.ts
+api/src/permissions/modules/fetch-allowed-collections/fetch-allowed-collections.test.ts
+api/src/permissions/modules/fetch-policies-ip-access/fetch-policies-ip-access.ts
+api/src/permissions/modules/validate-remaining-admin/validate-remaining-admin-count.ts
+api/src/permissions/modules/validate-remaining-admin/validate-remaining-admin-users.ts
+api/src/permissions/modules/fetch-accountability-policy-globals/fetch-accountability-policy-globals.test.ts
+api/src/permissions/modules/fetch-accountability-policy-globals/fetch-accountability-policy-globals.ts
+api/src/permissions/modules/validate-access/lib/validate-item-access.test.ts
+api/src/permissions/modules/validate-access/lib/validate-item-access.ts
+api/src/permissions/modules/validate-access/lib/validate-collection-access.ts
+api/src/permissions/modules/validate-access/lib/validate-collection-access.test.ts
+api/src/permissions/modules/validate-access/validate-access.ts
+api/src/permissions/modules/validate-access/validate-access.test.ts
+api/src/permissions/modules/process-payload/lib/is-field-nullable.test.ts
+api/src/permissions/modules/process-payload/lib/is-field-nullable.ts
+api/src/permissions/modules/process-payload/process-payload.test.ts
+api/src/permissions/modules/process-payload/process-payload.ts
+api/src/permissions/modules/fetch-allowed-fields/fetch-allowed-fields.ts
+api/src/permissions/modules/fetch-allowed-fields/fetch-allowed-fields.test.ts
+api/src/permissions/modules/fetch-inconsistent-field-map/fetch-inconsistent-field-map.test.ts
+api/src/permissions/modules/fetch-inconsistent-field-map/fetch-inconsistent-field-map.ts
+api/src/permissions/modules/fetch-global-access/lib/fetch-global-access-for-roles.ts
+api/src/permissions/modules/fetch-global-access/lib/fetch-global-access-for-user.test.ts
+api/src/permissions/modules/fetch-global-access/lib/fetch-global-access-for-user.ts
+api/src/permissions/modules/fetch-global-access/lib/fetch-global-access-for-roles.test.ts
+api/src/permissions/modules/fetch-global-access/fetch-global-access.test.ts
+api/src/permissions/modules/fetch-global-access/utils/fetch-global-access-for-query.test.ts
+api/src/permissions/modules/fetch-global-access/utils/fetch-global-access-for-query.ts
+api/src/permissions/modules/fetch-global-access/fetch-global-access.ts
+api/src/permissions/modules/fetch-global-access/types.ts
+api/src/permissions/modules/fetch-allowed-field-map/fetch-allowed-field-map.test.ts
+api/src/permissions/modules/fetch-allowed-field-map/fetch-allowed-field-map.ts
+api/src/permissions/modules/fetch-accountability-collection-access/fetch-accountability-collection-access.ts
+api/src/permissions/modules/fetch-accountability-collection-access/fetch-accountability-collection-access.test.ts
+api/src/permissions/modules/process-ast/lib/extract-fields-from-query.test.ts
+api/src/permissions/modules/process-ast/lib/extract-fields-from-children.test.ts
+api/src/permissions/modules/process-ast/lib/inject-cases.test.ts
+api/src/permissions/modules/process-ast/lib/field-map-from-ast.test.ts
+api/src/permissions/modules/process-ast/lib/field-map-from-ast.ts
+api/src/permissions/modules/process-ast/lib/extract-fields-from-query.ts
+api/src/permissions/modules/process-ast/lib/extract-fields-from-children.ts
+api/src/permissions/modules/process-ast/lib/inject-cases.ts
+api/src/permissions/modules/process-ast/process-ast.ts
+api/src/permissions/modules/process-ast/utils/get-info-for-path.test.ts
+api/src/permissions/modules/process-ast/utils/format-a2o-key.test.ts
+api/src/permissions/modules/process-ast/utils/find-related-collection.ts
+api/src/permissions/modules/process-ast/utils/stringify-query-path.ts
+api/src/permissions/modules/process-ast/utils/extract-paths-from-query.test.ts
+api/src/permissions/modules/process-ast/utils/validate-path/validate-path-permissions.ts
+api/src/permissions/modules/process-ast/utils/validate-path/create-error.ts
+api/src/permissions/modules/process-ast/utils/validate-path/validate-path-existence.test.ts
+api/src/permissions/modules/process-ast/utils/validate-path/validate-path-existence.ts
+api/src/permissions/modules/process-ast/utils/validate-path/validate-path-permissions.test.ts
+api/src/permissions/modules/process-ast/utils/dedupe-access.ts
+api/src/permissions/modules/process-ast/utils/flatten-filter.test.ts
+api/src/permissions/modules/process-ast/utils/stringify-query-path.test.ts
+api/src/permissions/modules/process-ast/utils/extract-paths-from-query.ts
+api/src/permissions/modules/process-ast/utils/has-item-permissions.ts
+api/src/permissions/modules/process-ast/utils/has-item-permissions.test.ts
+api/src/permissions/modules/process-ast/utils/format-a2o-key.ts
+api/src/permissions/modules/process-ast/utils/find-related-collection.test.ts
+api/src/permissions/modules/process-ast/utils/flatten-filter.ts
+api/src/permissions/modules/process-ast/utils/dedupe-access.test.ts
+api/src/permissions/modules/process-ast/utils/collections-in-field-map.ts
+api/src/permissions/modules/process-ast/utils/get-info-for-path.ts
+api/src/permissions/modules/process-ast/utils/collections-in-field-map.test.ts
+api/src/permissions/modules/process-ast/types.ts
+api/src/permissions/modules/process-ast/process-ast.test.ts
+api/src/permissions/cache.ts
+api/src/permissions/lib/with-app-minimal-permissions.test.ts
+api/src/permissions/lib/fetch-permissions.ts
+api/src/permissions/lib/fetch-roles-tree.test.ts
+api/src/permissions/lib/fetch-permissions.test.ts
+api/src/permissions/lib/with-app-minimal-permissions.ts
+api/src/permissions/lib/fetch-policies.test.ts
+api/src/permissions/lib/fetch-roles-tree.ts
+api/src/permissions/lib/fetch-policies.ts
+api/src/permissions/utils/get-unaliased-field-key.ts
+api/src/permissions/utils/fetch-dynamic-variable-context.ts
+api/src/permissions/utils/filter-policies-by-ip.test.ts
+api/src/permissions/utils/with-cache.ts
+api/src/permissions/utils/extract-required-dynamic-variable-context.ts
+api/src/permissions/utils/extract-required-dynamic-variable-context.test.ts
+api/src/permissions/utils/fetch-dynamic-variable-context.test.ts
+api/src/permissions/utils/process-permissions.ts
+api/src/permissions/utils/filter-policies-by-ip.ts
+api/src/permissions/utils/create-default-accountability.ts
+api/src/permissions/types.ts
 api/src/operations/condition/index.ts
 api/src/operations/condition/index.test.ts
 api/src/operations/json-web-token/index.ts
@@ -652,6 +756,7 @@ sdk/src/schema/field.ts
 sdk/src/schema/dashboard.ts
 sdk/src/schema/flow.ts
 sdk/src/schema/revision.ts
+sdk/src/schema/policy.ts
 sdk/src/schema/file.ts
 sdk/src/schema/relation.ts
 sdk/src/schema/collection.ts
@@ -721,6 +826,7 @@ sdk/src/rest/commands/schema/snapshot.ts
 sdk/src/rest/commands/schema/diff.ts
 sdk/src/rest/commands/schema/apply.ts
 sdk/src/rest/commands/index.ts
+sdk/src/rest/commands/delete/policies.ts
 sdk/src/rest/commands/delete/flows.ts
 sdk/src/rest/commands/delete/presets.ts
 sdk/src/rest/commands/delete/dashboards.ts
@@ -761,6 +867,7 @@ sdk/src/rest/commands/utils/sort.ts
 sdk/src/rest/commands/utils/shares.ts
 sdk/src/rest/commands/utils/hash.ts
 sdk/src/rest/commands/utils/versions.ts
+sdk/src/rest/commands/update/policies.ts
 sdk/src/rest/commands/update/flows.ts
 sdk/src/rest/commands/update/presets.ts
 sdk/src/rest/commands/update/dashboards.ts
@@ -785,6 +892,7 @@ sdk/src/rest/commands/update/permissions.ts
 sdk/src/rest/commands/update/collections.ts
 sdk/src/rest/commands/update/folders.ts
 sdk/src/rest/commands/update/versions.ts
+sdk/src/rest/commands/read/policies.ts
 sdk/src/rest/commands/read/flows.ts
 sdk/src/rest/commands/read/revisions.ts
 sdk/src/rest/commands/read/presets.ts
@@ -812,6 +920,7 @@ sdk/src/rest/commands/read/collections.ts
 sdk/src/rest/commands/read/assets.ts
 sdk/src/rest/commands/read/folders.ts
 sdk/src/rest/commands/read/versions.ts
+sdk/src/rest/commands/create/policies.ts
 sdk/src/rest/commands/create/flows.ts
 sdk/src/rest/commands/create/presets.ts
 sdk/src/rest/commands/create/dashboards.ts
@@ -1052,6 +1161,7 @@ packages/memory/src/cache/lib/redis.test.ts
 packages/memory/src/cache/lib/index.ts
 packages/memory/src/cache/lib/create.test.ts
 packages/memory/src/cache/lib/multi.test.ts
+packages/memory/src/cache/lib/define.ts
 packages/memory/src/cache/lib/local.ts
 packages/memory/src/cache/lib/multi.ts
 packages/memory/src/cache/lib/create.ts
@@ -1451,6 +1561,7 @@ packages/utils/shared/to-array.ts
 packages/utils/shared/defaults.test.ts
 packages/utils/shared/is-dynamic-variable.test.ts
 packages/utils/shared/deep-map.test.ts
+packages/utils/shared/process-chunk.ts
 packages/utils/shared/abbreviate-number.test.ts
 packages/utils/shared/is-object.test.ts
 packages/utils/shared/adjust-date.ts
@@ -1553,6 +1664,7 @@ packages/types/readme.md
 packages/types/tsconfig.json
 packages/types/package.json
 packages/types/src/schema.ts
+packages/types/src/policies.ts
 packages/types/src/flows.ts
 packages/types/src/geometry.ts
 packages/types/src/vue.ts
@@ -1601,6 +1713,7 @@ packages/system-data/src/app-access-permissions/index.ts
 packages/system-data/src/app-access-permissions/schema-access-permissions.yaml
 packages/system-data/src/app-access-permissions/app-access-permissions.yaml
 packages/system-data/src/types.ts
+packages/system-data/src/fields/access.yaml
 packages/system-data/src/fields/relations.yaml
 packages/system-data/src/fields/roles.yaml
 packages/system-data/src/fields/fields.yaml
@@ -1616,6 +1729,7 @@ packages/system-data/src/fields/translations.yaml
 packages/system-data/src/fields/flows.yaml
 packages/system-data/src/fields/migrations.yaml
 packages/system-data/src/fields/collections.yaml
+packages/system-data/src/fields/policies.yaml
 packages/system-data/src/fields/dashboards.yaml
 packages/system-data/src/fields/panels.yaml
 packages/system-data/src/fields/folders.yaml
@@ -1638,6 +1752,7 @@ packages/constants/src/number.ts
 packages/constants/src/fields.ts
 packages/constants/src/files.ts
 packages/constants/src/activity.ts
+packages/constants/src/permissions.ts
 packages/constants/license
 packages/composables/readme.md
 packages/composables/tsconfig.json
@@ -2010,6 +2125,8 @@ docs/reference/system/folders.md
 docs/reference/system/extensions.md
 docs/reference/system/activity.md
 docs/reference/system/roles.md
+docs/reference/system/webhooks.md
+docs/reference/system/policies.md
 docs/reference/system/fields.md
 docs/reference/system/revisions.md
 docs/reference/system/translations.md
@@ -2109,6 +2226,10 @@ app/src/modules/settings/routes/extensions/components/extension-item.vue
 app/src/modules/settings/routes/extensions/extensions.vue
 app/src/modules/settings/routes/extensions/types.ts
 app/src/modules/settings/routes/extensions/constants.ts
+app/src/modules/settings/routes/policies/item.vue
+app/src/modules/settings/routes/policies/use-save.ts
+app/src/modules/settings/routes/policies/add-new.vue
+app/src/modules/settings/routes/policies/collection.vue
 app/src/modules/settings/routes/appearance/item.vue
 app/src/modules/settings/routes/appearance/components/theming-info-sidebar-detail.vue
 app/src/modules/settings/routes/data-model/collections/collections.vue
@@ -2161,25 +2282,11 @@ app/src/modules/settings/routes/data-model/fields/components/field-select.vue
 app/src/modules/settings/routes/data-model/fields/components/field-select-menu.vue
 app/src/modules/settings/routes/data-model/fields/components/fields-management.vue
 app/src/modules/settings/routes/data-model/fields/fields.vue
-app/src/modules/settings/routes/roles/item/item.vue
-app/src/modules/settings/routes/roles/item/components/permissions-overview-header.vue
-app/src/modules/settings/routes/roles/item/components/permissions-overview-row.vue
-app/src/modules/settings/routes/roles/item/components/permissions-overview.vue
-app/src/modules/settings/routes/roles/item/components/permissions-overview-toggle.vue
-app/src/modules/settings/routes/roles/item/components/role-info-sidebar-detail.vue
-app/src/modules/settings/routes/roles/item/composables/use-permissions.ts
-app/src/modules/settings/routes/roles/item/composables/use-update-permissions.ts
+app/src/modules/settings/routes/roles/item.vue
+app/src/modules/settings/routes/roles/use-save.ts
 app/src/modules/settings/routes/roles/public-item.vue
 app/src/modules/settings/routes/roles/add-new.vue
-app/src/modules/settings/routes/roles/app-permissions.ts
-app/src/modules/settings/routes/roles/permissions-detail/components/actions.vue
-app/src/modules/settings/routes/roles/permissions-detail/components/app-minimal.vue
-app/src/modules/settings/routes/roles/permissions-detail/components/presets.vue
-app/src/modules/settings/routes/roles/permissions-detail/components/permissions.vue
-app/src/modules/settings/routes/roles/permissions-detail/components/tabs.vue
-app/src/modules/settings/routes/roles/permissions-detail/components/validation.vue
-app/src/modules/settings/routes/roles/permissions-detail/components/fields.vue
-app/src/modules/settings/routes/roles/permissions-detail/permissions-detail.vue
+app/src/modules/settings/routes/roles/role-info-sidebar-detail.vue
 app/src/modules/settings/routes/roles/collection.vue
 app/src/modules/settings/routes/webhooks/item.vue
 app/src/modules/settings/routes/webhooks/collection.vue
@@ -2656,6 +2763,7 @@ app/src/utils/geometry/index.ts
 app/src/utils/geometry/controls.ts
 app/src/utils/get-route.ts
 app/src/utils/get-groups.ts
+app/src/app-permissions.ts
 app/src/themes/register.ts
 app/src/directives/register.ts
 app/src/directives/markdown.ts
@@ -2697,11 +2805,13 @@ app/src/__histoire__/setup.ts
 app/src/__histoire__/wrapper.vue
 app/src/types/insights.ts
 app/src/types/login.ts
+app/src/types/user.ts
 app/src/types/revisions.ts
 app/src/types/error.ts
 app/src/types/activity.ts
 app/src/types/panels.ts
 app/src/types/notifications.ts
+app/src/types/permissions.ts
 app/src/types/collections.ts
 app/src/types/folders.ts
 app/src/types/interfaces.ts
@@ -2857,6 +2967,20 @@ app/src/interfaces/_system/system-scope/index.ts
 app/src/interfaces/_system/system-scope/system-scope.vue
 app/src/interfaces/_system/system-display-template/index.ts
 app/src/interfaces/_system/system-display-template/system-display-template.vue
+app/src/interfaces/_system/system-permissions/detail/components/actions.vue
+app/src/interfaces/_system/system-permissions/detail/components/app-minimal.vue
+app/src/interfaces/_system/system-permissions/detail/components/presets.vue
+app/src/interfaces/_system/system-permissions/detail/components/permissions.vue
+app/src/interfaces/_system/system-permissions/detail/components/tabs.vue
+app/src/interfaces/_system/system-permissions/detail/components/validation.vue
+app/src/interfaces/_system/system-permissions/detail/components/fields.vue
+app/src/interfaces/_system/system-permissions/detail/permissions-detail.vue
+app/src/interfaces/_system/system-permissions/index.ts
+app/src/interfaces/_system/system-permissions/system-permissions.vue
+app/src/interfaces/_system/system-permissions/permissions-toggle.vue
+app/src/interfaces/_system/system-permissions/permissions-row.vue
+app/src/interfaces/_system/system-permissions/add-collection-row.vue
+app/src/interfaces/_system/system-permissions/permissions-header.vue
 app/src/interfaces/_system/system-field/index.ts
 app/src/interfaces/_system/system-field/system-field.vue
 app/src/interfaces/_system/system-collections/index.ts
@@ -3212,38 +3336,7 @@ app/src/lang/number-formats.yaml
 app/src/lang/get-current-language.test.ts
 app/license
 contributing.md
-.changeset/lucky-plants-drum.md
-.changeset/yellow-buses-itch.md
-.changeset/chilly-adults-jog.md
-.changeset/cool-spiders-invent.md
-.changeset/chilled-pets-rush.md
-.changeset/cool-peaches-enjoy.md
-.changeset/stale-chicken-perform.md
-.changeset/fuzzy-jars-worry.md
-.changeset/green-pumas-perform.md
 .changeset/config.json
-.changeset/forty-seahorses-occur.md
-.changeset/four-falcons-remember.md
-.changeset/nice-bears-matter.md
-.changeset/silent-emus-rush.md
-.changeset/young-phones-shop.md
-.changeset/shy-chairs-return.md
-.changeset/few-mayflies-smash.md
-.changeset/wild-squids-approve.md
-.changeset/dirty-rings-greet.md
-.changeset/eighty-crabs-smile.md
-.changeset/afraid-garlics-occur.md
-.changeset/moody-plums-smile.md
-.changeset/fifty-shirts-wait.md
-.changeset/warm-pugs-tell.md
-.changeset/flat-bottles-unite.md
-.changeset/modern-lamps-sleep.md
-.changeset/popular-files-teach.md
-.changeset/dull-ducks-shake.md
-.changeset/few-horses-join.md
-.changeset/clean-cameras-jump.md
-.changeset/seven-clocks-sit.md
-.changeset/neat-pumas-ring.md
 contributors.yml
 license
 .dockerignore
@@ -101692,6 +101692,13 @@ Tests/Core/Controller/ControllerBaseTest.php
 Core/Controller/ControllerBaseTest.php
 Controller/ControllerBaseTest.php
 ControllerBaseTest.php
+core/tests/Drupal/Tests/Core/Controller/StubControllerBase.php
+tests/Drupal/Tests/Core/Controller/StubControllerBase.php
+Drupal/Tests/Core/Controller/StubControllerBase.php
+Tests/Core/Controller/StubControllerBase.php
+Core/Controller/StubControllerBase.php
+Controller/StubControllerBase.php
+StubControllerBase.php
 core/tests/Drupal/Tests/Core/Controller/TestController.php
 tests/Drupal/Tests/Core/Controller/TestController.php
 Drupal/Tests/Core/Controller/TestController.php
@@ -105171,24 +105178,12 @@ vendor/jquery.ui/ui/scroll-parent-min.js.map
 jquery.ui/ui/scroll-parent-min.js.map
 ui/scroll-parent-min.js.map
 scroll-parent-min.js.map
-core/assets/vendor/jquery.ui/ui/form-min.js.map
-assets/vendor/jquery.ui/ui/form-min.js.map
-vendor/jquery.ui/ui/form-min.js.map
-jquery.ui/ui/form-min.js.map
-ui/form-min.js.map
-form-min.js.map
 core/assets/vendor/jquery.ui/ui/labels-min.js
 assets/vendor/jquery.ui/ui/labels-min.js
 vendor/jquery.ui/ui/labels-min.js
 jquery.ui/ui/labels-min.js
 ui/labels-min.js
 labels-min.js
-core/assets/vendor/jquery.ui/ui/safe-blur-min.js.map
-assets/vendor/jquery.ui/ui/safe-blur-min.js.map
-vendor/jquery.ui/ui/safe-blur-min.js.map
-jquery.ui/ui/safe-blur-min.js.map
-ui/safe-blur-min.js.map
-safe-blur-min.js.map
 core/assets/vendor/jquery.ui/ui/form-reset-mixin-min.js.map
 assets/vendor/jquery.ui/ui/form-reset-mixin-min.js.map
 vendor/jquery.ui/ui/form-reset-mixin-min.js.map
@@ -105219,12 +105214,6 @@ vendor/jquery.ui/ui/disable-selection-min.js
 jquery.ui/ui/disable-selection-min.js
 ui/disable-selection-min.js
 disable-selection-min.js
-core/assets/vendor/jquery.ui/ui/safe-blur-min.js
-assets/vendor/jquery.ui/ui/safe-blur-min.js
-vendor/jquery.ui/ui/safe-blur-min.js
-jquery.ui/ui/safe-blur-min.js
-ui/safe-blur-min.js
-safe-blur-min.js
 core/assets/vendor/jquery.ui/ui/form-reset-mixin-min.js
 assets/vendor/jquery.ui/ui/form-reset-mixin-min.js
 vendor/jquery.ui/ui/form-reset-mixin-min.js
@@ -105267,18 +105256,6 @@ vendor/jquery.ui/ui/plugin-min.js
 jquery.ui/ui/plugin-min.js
 ui/plugin-min.js
 plugin-min.js
-core/assets/vendor/jquery.ui/ui/safe-blur.js
-assets/vendor/jquery.ui/ui/safe-blur.js
-vendor/jquery.ui/ui/safe-blur.js
-jquery.ui/ui/safe-blur.js
-ui/safe-blur.js
-safe-blur.js
-core/assets/vendor/jquery.ui/ui/ie-min.js
-assets/vendor/jquery.ui/ui/ie-min.js
-vendor/jquery.ui/ui/ie-min.js
-jquery.ui/ui/ie-min.js
-ui/ie-min.js
-ie-min.js
 core/assets/vendor/jquery.ui/ui/widget-min.js
 assets/vendor/jquery.ui/ui/widget-min.js
 vendor/jquery.ui/ui/widget-min.js
@@ -105321,24 +105298,12 @@ vendor/jquery.ui/ui/keycode.js
 jquery.ui/ui/keycode.js
 ui/keycode.js
 keycode.js
-core/assets/vendor/jquery.ui/ui/safe-active-element.js
-assets/vendor/jquery.ui/ui/safe-active-element.js
-vendor/jquery.ui/ui/safe-active-element.js
-jquery.ui/ui/safe-active-element.js
-ui/safe-active-element.js
-safe-active-element.js
 core/assets/vendor/jquery.ui/ui/plugin.js
 assets/vendor/jquery.ui/ui/plugin.js
 vendor/jquery.ui/ui/plugin.js
 jquery.ui/ui/plugin.js
 ui/plugin.js
 plugin.js
-core/assets/vendor/jquery.ui/ui/form-min.js
-assets/vendor/jquery.ui/ui/form-min.js
-vendor/jquery.ui/ui/form-min.js
-jquery.ui/ui/form-min.js
-ui/form-min.js
-form-min.js
 core/assets/vendor/jquery.ui/ui/labels.js
 assets/vendor/jquery.ui/ui/labels.js
 vendor/jquery.ui/ui/labels.js
@@ -105357,24 +105322,12 @@ vendor/jquery.ui/ui/version.js
 jquery.ui/ui/version.js
 ui/version.js
 version.js
-core/assets/vendor/jquery.ui/ui/ie.js
-assets/vendor/jquery.ui/ui/ie.js
-vendor/jquery.ui/ui/ie.js
-jquery.ui/ui/ie.js
-ui/ie.js
-ie.js
 core/assets/vendor/jquery.ui/ui/jquery-patch-min.js
 assets/vendor/jquery.ui/ui/jquery-patch-min.js
 vendor/jquery.ui/ui/jquery-patch-min.js
 jquery.ui/ui/jquery-patch-min.js
 ui/jquery-patch-min.js
 jquery-patch-min.js
-core/assets/vendor/jquery.ui/ui/safe-active-element-min.js.map
-assets/vendor/jquery.ui/ui/safe-active-element-min.js.map
-vendor/jquery.ui/ui/safe-active-element-min.js.map
-jquery.ui/ui/safe-active-element-min.js.map
-ui/safe-active-element-min.js.map
-safe-active-element-min.js.map
 core/assets/vendor/jquery.ui/ui/widgets/controlgroup-min.js
 assets/vendor/jquery.ui/ui/widgets/controlgroup-min.js
 vendor/jquery.ui/ui/widgets/controlgroup-min.js
@@ -105582,12 +105535,6 @@ vendor/jquery.ui/ui/data-min.js
 jquery.ui/ui/data-min.js
 ui/data-min.js
 data-min.js
-core/assets/vendor/jquery.ui/ui/ie-min.js.map
-assets/vendor/jquery.ui/ui/ie-min.js.map
-vendor/jquery.ui/ui/ie-min.js.map
-jquery.ui/ui/ie-min.js.map
-ui/ie-min.js.map
-ie-min.js.map
 core/assets/vendor/jquery.ui/ui/jquery-patch-min.js.map
 assets/vendor/jquery.ui/ui/jquery-patch-min.js.map
 vendor/jquery.ui/ui/jquery-patch-min.js.map
@@ -105624,18 +105571,6 @@ vendor/jquery.ui/ui/version-min.js
 jquery.ui/ui/version-min.js
 ui/version-min.js
 version-min.js
-core/assets/vendor/jquery.ui/ui/safe-active-element-min.js
-assets/vendor/jquery.ui/ui/safe-active-element-min.js
-vendor/jquery.ui/ui/safe-active-element-min.js
-jquery.ui/ui/safe-active-element-min.js
-ui/safe-active-element-min.js
-safe-active-element-min.js
-core/assets/vendor/jquery.ui/ui/form.js
-assets/vendor/jquery.ui/ui/form.js
-vendor/jquery.ui/ui/form.js
-jquery.ui/ui/form.js
-ui/form.js
-form.js
 core/assets/vendor/loadjs/loadjs.min.js
 assets/vendor/loadjs/loadjs.min.js
 vendor/loadjs/loadjs.min.js
@@ -14785,6 +14785,7 @@ core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php
 core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
 core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php
 core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php
+core/tests/Drupal/Tests/Core/Controller/StubControllerBase.php
 core/tests/Drupal/Tests/Core/Controller/TestController.php
 core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
 core/tests/Drupal/Tests/Core/Field/FieldTypePluginManagerTest.php
@@ -15301,15 +15302,12 @@ core/assets/vendor/floating-ui/floating-ui.core.umd.min.js
 core/assets/vendor/floating-ui/floating-ui.dom.umd.min.js
 core/assets/vendor/jquery.ui/ui/unique-id-min.js.map
 core/assets/vendor/jquery.ui/ui/scroll-parent-min.js.map
-core/assets/vendor/jquery.ui/ui/form-min.js.map
 core/assets/vendor/jquery.ui/ui/labels-min.js
-core/assets/vendor/jquery.ui/ui/safe-blur-min.js.map
 core/assets/vendor/jquery.ui/ui/form-reset-mixin-min.js.map
 core/assets/vendor/jquery.ui/ui/focusable-min.js
 core/assets/vendor/jquery.ui/ui/unique-id-min.js
 core/assets/vendor/jquery.ui/ui/disable-selection-min.js.map
 core/assets/vendor/jquery.ui/ui/disable-selection-min.js
-core/assets/vendor/jquery.ui/ui/safe-blur-min.js
 core/assets/vendor/jquery.ui/ui/form-reset-mixin-min.js
 core/assets/vendor/jquery.ui/ui/keycode-min.js
 core/assets/vendor/jquery.ui/ui/keycode-min.js.map
@@ -15317,8 +15315,6 @@ core/assets/vendor/jquery.ui/ui/data-min.js.map
 core/assets/vendor/jquery.ui/ui/plugin-min.js.map
 core/assets/vendor/jquery.ui/ui/scroll-parent.js
 core/assets/vendor/jquery.ui/ui/plugin-min.js
-core/assets/vendor/jquery.ui/ui/safe-blur.js
-core/assets/vendor/jquery.ui/ui/ie-min.js
 core/assets/vendor/jquery.ui/ui/widget-min.js
 core/assets/vendor/jquery.ui/ui/scroll-parent-min.js
 core/assets/vendor/jquery.ui/ui/widget-min.js.map
@@ -15326,15 +15322,11 @@ core/assets/vendor/jquery.ui/ui/version-min.js.map
 core/assets/vendor/jquery.ui/ui/labels-min.js.map
 core/assets/vendor/jquery.ui/ui/disable-selection.js
 core/assets/vendor/jquery.ui/ui/keycode.js
-core/assets/vendor/jquery.ui/ui/safe-active-element.js
 core/assets/vendor/jquery.ui/ui/plugin.js
-core/assets/vendor/jquery.ui/ui/form-min.js
 core/assets/vendor/jquery.ui/ui/labels.js
 core/assets/vendor/jquery.ui/ui/data.js
 core/assets/vendor/jquery.ui/ui/version.js
-core/assets/vendor/jquery.ui/ui/ie.js
 core/assets/vendor/jquery.ui/ui/jquery-patch-min.js
-core/assets/vendor/jquery.ui/ui/safe-active-element-min.js.map
 core/assets/vendor/jquery.ui/ui/widgets/controlgroup-min.js
 core/assets/vendor/jquery.ui/ui/widgets/checkboxradio-min.js.map
 core/assets/vendor/jquery.ui/ui/widgets/dialog-min.js
@@ -15365,15 +15357,12 @@ core/assets/vendor/jquery.ui/ui/widgets/mouse-min.js.map
 core/assets/vendor/jquery.ui/ui/jquery-patch.js
 core/assets/vendor/jquery.ui/ui/form-reset-mixin.js
 core/assets/vendor/jquery.ui/ui/data-min.js
-core/assets/vendor/jquery.ui/ui/ie-min.js.map
 core/assets/vendor/jquery.ui/ui/jquery-patch-min.js.map
 core/assets/vendor/jquery.ui/ui/widget.js
 core/assets/vendor/jquery.ui/ui/focusable-min.js.map
 core/assets/vendor/jquery.ui/ui/unique-id.js
 core/assets/vendor/jquery.ui/ui/focusable.js
 core/assets/vendor/jquery.ui/ui/version-min.js
-core/assets/vendor/jquery.ui/ui/safe-active-element-min.js
-core/assets/vendor/jquery.ui/ui/form.js
 core/assets/vendor/loadjs/loadjs.min.js
 core/assets/vendor/once/once.min.js.map
 core/assets/vendor/once/once.min.js
@@ -1142,6 +1142,13 @@ EntityManager/Hook/Hooks/PlusCreateHook.php
 Hook/Hooks/PlusCreateHook.php
 Hooks/PlusCreateHook.php
 PlusCreateHook.php
+application/Espo/Tools/EntityManager/Hook/Hooks/DeleteHasChildrenLinks.php
+Espo/Tools/EntityManager/Hook/Hooks/DeleteHasChildrenLinks.php
+Tools/EntityManager/Hook/Hooks/DeleteHasChildrenLinks.php
+EntityManager/Hook/Hooks/DeleteHasChildrenLinks.php
+Hook/Hooks/DeleteHasChildrenLinks.php
+Hooks/DeleteHasChildrenLinks.php
+DeleteHasChildrenLinks.php
 application/Espo/Tools/EntityManager/Hook/Hooks/EventCreateHook.php
 Espo/Tools/EntityManager/Hook/Hooks/EventCreateHook.php
 Tools/EntityManager/Hook/Hooks/EventCreateHook.php
@@ -3262,6 +3269,15 @@ Select/Task/BoolFilters/Completed.php
 Task/BoolFilters/Completed.php
 BoolFilters/Completed.php
 Completed.php
+application/Espo/Modules/Crm/Classes/Select/Task/Orderers/DateUpcoming.php
+Espo/Modules/Crm/Classes/Select/Task/Orderers/DateUpcoming.php
+Modules/Crm/Classes/Select/Task/Orderers/DateUpcoming.php
+Crm/Classes/Select/Task/Orderers/DateUpcoming.php
+Classes/Select/Task/Orderers/DateUpcoming.php
+Select/Task/Orderers/DateUpcoming.php
+Task/Orderers/DateUpcoming.php
+Orderers/DateUpcoming.php
+DateUpcoming.php
 application/Espo/Modules/Crm/Classes/Select/Task/PrimaryFilters/Actual.php
 Espo/Modules/Crm/Classes/Select/Task/PrimaryFilters/Actual.php
 Modules/Crm/Classes/Select/Task/PrimaryFilters/Actual.php
@@ -214,6 +214,7 @@ application/Espo/Tools/EntityManager/EntityManager.php
 application/Espo/Tools/EntityManager/Hook/CreateHook.php
 application/Espo/Tools/EntityManager/Hook/Hooks/EventDeleteHook.php
 application/Espo/Tools/EntityManager/Hook/Hooks/PlusCreateHook.php
+application/Espo/Tools/EntityManager/Hook/Hooks/DeleteHasChildrenLinks.php
 application/Espo/Tools/EntityManager/Hook/Hooks/EventCreateHook.php
 application/Espo/Tools/EntityManager/Hook/Hooks/PlusDeleteHook.php
 application/Espo/Tools/EntityManager/Hook/DeleteHook.php
@@ -569,6 +570,7 @@ application/Espo/Modules/Crm/Classes/Select/Lead/PrimaryFilters/Actual.php
 application/Espo/Modules/Crm/Classes/Select/Lead/PrimaryFilters/Converted.php
 application/Espo/Modules/Crm/Classes/Select/Task/BoolFilters/Actual.php
 application/Espo/Modules/Crm/Classes/Select/Task/BoolFilters/Completed.php
+application/Espo/Modules/Crm/Classes/Select/Task/Orderers/DateUpcoming.php
 application/Espo/Modules/Crm/Classes/Select/Task/PrimaryFilters/Actual.php
 application/Espo/Modules/Crm/Classes/Select/Task/PrimaryFilters/Todays.php
 application/Espo/Modules/Crm/Classes/Select/Task/PrimaryFilters/Completed.php
@@ -1173,12 +1173,6 @@ tests/integration/forum/GlobalLogoutTest.php
 integration/forum/GlobalLogoutTest.php
 forum/GlobalLogoutTest.php
 GlobalLogoutTest.php
-framework/core/tests/integration/notification/NotificationSyncerTest.php
-core/tests/integration/notification/NotificationSyncerTest.php
-tests/integration/notification/NotificationSyncerTest.php
-integration/notification/NotificationSyncerTest.php
-notification/NotificationSyncerTest.php
-NotificationSyncerTest.php
 framework/core/tests/integration/admin/IndexTest.php
 core/tests/integration/admin/IndexTest.php
 tests/integration/admin/IndexTest.php
@@ -207,7 +207,6 @@ framework/core/tests/integration/forum/LoginTest.php
 framework/core/tests/integration/forum/IndexTest.php
 framework/core/tests/integration/forum/RegisterTest.php
 framework/core/tests/integration/forum/GlobalLogoutTest.php
-framework/core/tests/integration/notification/NotificationSyncerTest.php
 framework/core/tests/integration/admin/IndexTest.php
 framework/core/tests/phpunit.unit.xml
 framework/core/tests/unit/Settings/DatabaseSettingsRepositoryTest.php
@@ -27443,12 +27443,9 @@ ghost/post-events/README.md
 post-events/README.md
 README.md
 SECURITY.md
-.envrc
 LICENSE
-flake.nix
 PRIVACY.md
 .gitattributes
-flake.lock
 package.json
 apps/admin-x-activitypub/vite.config.mjs
 admin-x-activitypub/vite.config.mjs
@@ -4514,12 +4514,9 @@ ghost/post-events/test/.eslintrc.js
 ghost/post-events/test/post-events.test.ts
 ghost/post-events/README.md
 SECURITY.md
-.envrc
 LICENSE
-flake.nix
 PRIVACY.md
 .gitattributes
-flake.lock
 package.json
 apps/admin-x-activitypub/vite.config.mjs
 apps/admin-x-activitypub/.eslintrc.cjs
@@ -1,5 +1,6 @@
 .codesandbox/ci.json
 ci.json
+.npmrc
 CONTRIBUTING.md
 SECURITY.md
 renovate.json
@@ -1,4 +1,5 @@
 .codesandbox/ci.json
+.npmrc
 CONTRIBUTING.md
 SECURITY.md
 renovate.json
@@ -119609,6 +119609,14 @@ Test/Mftf/Test/AdminLowStockProductTest.xml
 Mftf/Test/AdminLowStockProductTest.xml
 Test/AdminLowStockProductTest.xml
 AdminLowStockProductTest.xml
+app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderProductsDatePickerTest.xml
+code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderProductsDatePickerTest.xml
+Magento/Reports/Test/Mftf/Test/AdminReportsOrderProductsDatePickerTest.xml
+Reports/Test/Mftf/Test/AdminReportsOrderProductsDatePickerTest.xml
+Test/Mftf/Test/AdminReportsOrderProductsDatePickerTest.xml
+Mftf/Test/AdminReportsOrderProductsDatePickerTest.xml
+Test/AdminReportsOrderProductsDatePickerTest.xml
+AdminReportsOrderProductsDatePickerTest.xml
 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
 code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
 Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
@@ -13934,6 +13934,7 @@ app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml
 app/code/Magento/Reports/Test/Mftf/Test/AdminCanceledOrdersInOrderSalesReportTest.xml
 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalDatePickerTest.xml
 app/code/Magento/Reports/Test/Mftf/Test/AdminLowStockProductTest.xml
+app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderProductsDatePickerTest.xml
 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml
 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml
@@ -33727,6 +33727,10 @@ upload/system/library/language.php
 system/library/language.php
 library/language.php
 language.php
+upload/system/library/curl.php
+system/library/curl.php
+library/curl.php
+curl.php
 upload/system/library/cart/weight.php
 system/library/cart/weight.php
 library/cart/weight.php
@@ -3495,6 +3495,7 @@ upload/system/library/session/file.php
 upload/system/library/session/db.php
 upload/system/library/request.php
 upload/system/library/language.php
+upload/system/library/curl.php
 upload/system/library/cart/weight.php
 upload/system/library/cart/currency.php
 upload/system/library/cart/length.php
@@ -9594,12 +9594,6 @@ Framework/DataAbstractionLayer/Write/WriterExtensionTest.php
 DataAbstractionLayer/Write/WriterExtensionTest.php
 Write/WriterExtensionTest.php
 WriterExtensionTest.php
-tests/integration/Core/Framework/DataAbstractionLayer/DataAbstractionLayerValidateCommandTest.php
-integration/Core/Framework/DataAbstractionLayer/DataAbstractionLayerValidateCommandTest.php
-Core/Framework/DataAbstractionLayer/DataAbstractionLayerValidateCommandTest.php
-Framework/DataAbstractionLayer/DataAbstractionLayerValidateCommandTest.php
-DataAbstractionLayer/DataAbstractionLayerValidateCommandTest.php
-DataAbstractionLayerValidateCommandTest.php
 tests/integration/Core/Framework/DataAbstractionLayer/Doctrine/Doctrine/MultiInsertQueryQueueTest.php
 integration/Core/Framework/DataAbstractionLayer/Doctrine/Doctrine/MultiInsertQueryQueueTest.php
 Core/Framework/DataAbstractionLayer/Doctrine/Doctrine/MultiInsertQueryQueueTest.php
@@ -33257,6 +33251,9 @@ _unreleased/2024-07-22-add-cart-event-interface.md
 changelog/_unreleased/2024-06-19-fix-no-matching-sales-channel-found-when-creating-order.md
 _unreleased/2024-06-19-fix-no-matching-sales-channel-found-when-creating-order.md
 2024-06-19-fix-no-matching-sales-channel-found-when-creating-order.md
+changelog/_unreleased/2024-08-05-improve-slider-element-accessibility.md
+_unreleased/2024-08-05-improve-slider-element-accessibility.md
+2024-08-05-improve-slider-element-accessibility.md
 changelog/_unreleased/2024-08-02-allow-empty-tax-provider-results.md
 _unreleased/2024-08-02-allow-empty-tax-provider-results.md
 2024-08-02-allow-empty-tax-provider-results.md
@@ -33278,6 +33275,9 @@ _unreleased/2024-07-10-fix-github-jest-and-lint-workflows.md
 changelog/_unreleased/2024-07-19-add-component_payment_method_name-block.md
 _unreleased/2024-07-19-add-component_payment_method_name-block.md
 2024-07-19-add-component_payment_method_name-block.md
+changelog/_unreleased/2024-07-24-fix-shipping-address-in-order-detail-work-not-correct-after-changes.md
+_unreleased/2024-07-24-fix-shipping-address-in-order-detail-work-not-correct-after-changes.md
+2024-07-24-fix-shipping-address-in-order-detail-work-not-correct-after-changes.md
 changelog/_unreleased/2024-01-31-improve-cart-page-performance.md
 _unreleased/2024-01-31-improve-cart-page-performance.md
 2024-01-31-improve-cart-page-performance.md
@@ -33335,6 +33335,9 @@ _unreleased/2024-05-22-navbar-for-main-navigation.md
 changelog/_unreleased/2024-07-05-increase-app-payment-timeout-to-20-s.md
 _unreleased/2024-07-05-increase-app-payment-timeout-to-20-s.md
 2024-07-05-increase-app-payment-timeout-to-20-s.md
+changelog/_unreleased/2024-08-07-change-typehint-in-mediaurlplaceholderhandler.md
+_unreleased/2024-08-07-change-typehint-in-mediaurlplaceholderhandler.md
+2024-08-07-change-typehint-in-mediaurlplaceholderhandler.md
 changelog/_unreleased/2024-06-10-run-unit-setup-in-admin-unit-watch-command.md
 _unreleased/2024-06-10-run-unit-setup-in-admin-unit-watch-command.md
 2024-06-10-run-unit-setup-in-admin-unit-watch-command.md
@@ -55889,6 +55892,16 @@ module/sw-order/state/order-detail.store.js
 sw-order/state/order-detail.store.js
 state/order-detail.store.js
 order-detail.store.js
+src/Administration/Resources/app/administration/src/module/sw-order/state/order-detail.store.spec.js
+Administration/Resources/app/administration/src/module/sw-order/state/order-detail.store.spec.js
+Resources/app/administration/src/module/sw-order/state/order-detail.store.spec.js
+app/administration/src/module/sw-order/state/order-detail.store.spec.js
+administration/src/module/sw-order/state/order-detail.store.spec.js
+src/module/sw-order/state/order-detail.store.spec.js
+module/sw-order/state/order-detail.store.spec.js
+sw-order/state/order-detail.store.spec.js
+state/order-detail.store.spec.js
+order-detail.store.spec.js
 src/Administration/Resources/app/administration/src/module/sw-settings-mailer/index.js
 Administration/Resources/app/administration/src/module/sw-settings-mailer/index.js
 Resources/app/administration/src/module/sw-settings-mailer/index.js
@@ -114960,6 +114973,12 @@ Write/Validation/TestDefinition/TestTranslationDefinition.php
 Validation/TestDefinition/TestTranslationDefinition.php
 TestDefinition/TestTranslationDefinition.php
 TestTranslationDefinition.php
+src/Core/Framework/Test/DataAbstractionLayer/DataAbstractionLayerValidateCommandTest.php
+Core/Framework/Test/DataAbstractionLayer/DataAbstractionLayerValidateCommandTest.php
+Framework/Test/DataAbstractionLayer/DataAbstractionLayerValidateCommandTest.php
+Test/DataAbstractionLayer/DataAbstractionLayerValidateCommandTest.php
+DataAbstractionLayer/DataAbstractionLayerValidateCommandTest.php
+DataAbstractionLayerValidateCommandTest.php
 src/Core/Framework/Test/DataAbstractionLayer/Search/Util/DateHistogramCase.php
 Core/Framework/Test/DataAbstractionLayer/Search/Util/DateHistogramCase.php
 Framework/Test/DataAbstractionLayer/Search/Util/DateHistogramCase.php
@@ -1406,7 +1406,6 @@ tests/integration/Core/Framework/DataAbstractionLayer/Write/Validation/LockValid
 tests/integration/Core/Framework/DataAbstractionLayer/Write/ParentChildTest.php
 tests/integration/Core/Framework/DataAbstractionLayer/Write/WriteCommandExtractorTest.php
 tests/integration/Core/Framework/DataAbstractionLayer/Write/WriterExtensionTest.php
-tests/integration/Core/Framework/DataAbstractionLayer/DataAbstractionLayerValidateCommandTest.php
 tests/integration/Core/Framework/DataAbstractionLayer/Doctrine/Doctrine/MultiInsertQueryQueueTest.php
 tests/integration/Core/Framework/DataAbstractionLayer/EntityExtensionReadTest.php
 tests/integration/Core/Framework/DataAbstractionLayer/Reader/EntityReaderTest.php
@@ -5933,6 +5932,7 @@ changelog/_unreleased/2024-06-17-fix-that-company-address-is-shown-twice.md
 changelog/_unreleased/2024-07-08-fix-automatically-applied-promotions-does-not-work-after-save-the-order.md
 changelog/_unreleased/2024-07-22-add-cart-event-interface.md
 changelog/_unreleased/2024-06-19-fix-no-matching-sales-channel-found-when-creating-order.md
+changelog/_unreleased/2024-08-05-improve-slider-element-accessibility.md
 changelog/_unreleased/2024-08-02-allow-empty-tax-provider-results.md
 changelog/_unreleased/2024-07-08-merge-search-preferences.md
 changelog/_unreleased/2024-07-05-enhance-plugin-list-command-output-with-information-about-plugins-required-by-composer.md
@@ -5940,6 +5940,7 @@ changelog/_unreleased/2024-07-05-only-cleanup-sucessfully-delivered-webhooks.md
 changelog/_unreleased/2024-07-05-search-by-product-number-should-redirect-to-detail-page.md
 changelog/_unreleased/2024-07-10-fix-github-jest-and-lint-workflows.md
 changelog/_unreleased/2024-07-19-add-component_payment_method_name-block.md
+changelog/_unreleased/2024-07-24-fix-shipping-address-in-order-detail-work-not-correct-after-changes.md
 changelog/_unreleased/2024-01-31-improve-cart-page-performance.md
 changelog/_unreleased/2024-06-03-fixed-the-headline-for-seo-in-product-detail-page.md
 changelog/_unreleased/2024-08-02-next-26712-add-visible-focus-states-for-wishlist-buttons.md
@@ -5959,6 +5960,7 @@ changelog/_unreleased/2024-08-06-fix-filtering-payment-shipping-method-route.md
 changelog/_unreleased/2024-05-08-order-placed-incorrectly.md
 changelog/_unreleased/2024-05-22-navbar-for-main-navigation.md
 changelog/_unreleased/2024-07-05-increase-app-payment-timeout-to-20-s.md
+changelog/_unreleased/2024-08-07-change-typehint-in-mediaurlplaceholderhandler.md
 changelog/_unreleased/2024-06-10-run-unit-setup-in-admin-unit-watch-command.md
 changelog/_unreleased/2024-07-29-affiliate-and-campaign-code-editable.md
 changelog/_unreleased/2024-07-31-fix-missing-salutation-error-when-creating-a-customer.md
@@ -9808,6 +9810,7 @@ src/Administration/Resources/app/administration/src/module/sw-order/page/sw-orde
 src/Administration/Resources/app/administration/src/module/sw-order/page/sw-order-detail/sw-order-detail.scss
 src/Administration/Resources/app/administration/src/module/sw-order/state/order.store.ts
 src/Administration/Resources/app/administration/src/module/sw-order/state/order-detail.store.js
+src/Administration/Resources/app/administration/src/module/sw-order/state/order-detail.store.spec.js
 src/Administration/Resources/app/administration/src/module/sw-settings-mailer/index.js
 src/Administration/Resources/app/administration/src/module/sw-settings-mailer/component/sw-settings-mailer-smtp/sw-settings-mailer-smtp.spec.js
 src/Administration/Resources/app/administration/src/module/sw-settings-mailer/component/sw-settings-mailer-smtp/sw-settings-mailer-smtp.html.twig
@@ -17139,6 +17142,7 @@ src/Core/Framework/Test/DataAbstractionLayer/Write/NonUuidFkField/TestEntityOneD
 src/Core/Framework/Test/DataAbstractionLayer/Write/NonUuidFkField/NonUuidFkFieldSerializer.php
 src/Core/Framework/Test/DataAbstractionLayer/Write/Validation/TestDefinition/TestDefinition.php
 src/Core/Framework/Test/DataAbstractionLayer/Write/Validation/TestDefinition/TestTranslationDefinition.php
+src/Core/Framework/Test/DataAbstractionLayer/DataAbstractionLayerValidateCommandTest.php
 src/Core/Framework/Test/DataAbstractionLayer/Search/Util/DateHistogramCase.php
 src/Core/Framework/Test/DataAbstractionLayer/Search/TestAggregation.php
 src/Core/Framework/Test/DataAbstractionLayer/Search/Definition/FkFieldPrimaryTestDefinition.php
@@ -31,10 +31,6 @@ ar-softdelete/README.md
 README.md
 lib/composer-LICENSE.txt
 composer-LICENSE.txt
-lib/yii2/helpers/ArrayHelper.php
-yii2/helpers/ArrayHelper.php
-helpers/ArrayHelper.php
-ArrayHelper.php
 lib/yii2/Yii.php
 yii2/Yii.php
 Yii.php
@@ -1366,10 +1362,10 @@ src/templates/users/_passkeys-table.twig
 templates/users/_passkeys-table.twig
 users/_passkeys-table.twig
 _passkeys-table.twig
-src/templates/users/index.twig
-templates/users/index.twig
-users/index.twig
-index.twig
+src/templates/users/_index.twig
+templates/users/_index.twig
+users/_index.twig
+_index.twig
 src/templates/403.twig
 templates/403.twig
 403.twig
@@ -1492,11 +1488,11 @@ templates/settings/globals/_edit.twig
 settings/globals/_edit.twig
 globals/_edit.twig
 _edit.twig
-src/templates/settings/globals/index.twig
-templates/settings/globals/index.twig
-settings/globals/index.twig
-globals/index.twig
-index.twig
+src/templates/settings/globals/_index.twig
+templates/settings/globals/_index.twig
+settings/globals/_index.twig
+globals/_index.twig
+_index.twig
 src/templates/settings/general/_images/image.twig
 templates/settings/general/_images/image.twig
 settings/general/_images/image.twig
@@ -1816,6 +1812,10 @@ src/templates/_layouts/cp.twig
 templates/_layouts/cp.twig
 _layouts/cp.twig
 cp.twig
+src/templates/_login/form.twig
+templates/_login/form.twig
+_login/form.twig
+form.twig
 src/templates/400.twig
 templates/400.twig
 400.twig
@@ -2440,6 +2440,9 @@ ImageException.php
 src/errors/FieldNotFoundException.php
 errors/FieldNotFoundException.php
 FieldNotFoundException.php
+src/errors/SsoFailedException.php
+errors/SsoFailedException.php
+SsoFailedException.php
 src/errors/AssetDisallowedExtensionException.php
 errors/AssetDisallowedExtensionException.php
 AssetDisallowedExtensionException.php
@@ -2452,6 +2455,9 @@ FsObjectExistsException.php
 src/errors/EntryTypeNotFoundException.php
 errors/EntryTypeNotFoundException.php
 EntryTypeNotFoundException.php
+src/errors/AuthProviderNotFoundException.php
+errors/AuthProviderNotFoundException.php
+AuthProviderNotFoundException.php
 src/errors/InvalidLicenseKeyException.php
 errors/InvalidLicenseKeyException.php
 InvalidLicenseKeyException.php
@@ -3330,6 +3336,10 @@ src/console/controllers/InvalidateTagsController.php
 console/controllers/InvalidateTagsController.php
 controllers/InvalidateTagsController.php
 InvalidateTagsController.php
+src/console/controllers/EntryTypesController.php
+console/controllers/EntryTypesController.php
+controllers/EntryTypesController.php
+EntryTypesController.php
 src/console/controllers/TestsController.php
 console/controllers/TestsController.php
 controllers/TestsController.php
@@ -3386,6 +3396,10 @@ src/console/controllers/FixtureController.php
 console/controllers/FixtureController.php
 controllers/FixtureController.php
 FixtureController.php
+src/console/controllers/EnvController.php
+console/controllers/EnvController.php
+controllers/EnvController.php
+EnvController.php
 src/console/controllers/DbController.php
 console/controllers/DbController.php
 controllers/DbController.php
@@ -3434,6 +3448,10 @@ src/console/controllers/ProjectConfigController.php
 console/controllers/ProjectConfigController.php
 controllers/ProjectConfigController.php
 ProjectConfigController.php
+src/console/controllers/FieldsController.php
+console/controllers/FieldsController.php
+controllers/FieldsController.php
+FieldsController.php
 src/console/controllers/UsersController.php
 console/controllers/UsersController.php
 controllers/UsersController.php
@@ -3478,6 +3496,65 @@ InvalidateTagAction.php
 src/console/CallableAction.php
 console/CallableAction.php
 CallableAction.php
+src/auth/sso/BaseProvider.php
+auth/sso/BaseProvider.php
+sso/BaseProvider.php
+BaseProvider.php
+src/auth/sso/ProviderInterface.php
+auth/sso/ProviderInterface.php
+sso/ProviderInterface.php
+ProviderInterface.php
+src/auth/sso/CraftProvider.php
+auth/sso/CraftProvider.php
+sso/CraftProvider.php
+CraftProvider.php
+src/auth/sso/ProviderTrait.php
+auth/sso/ProviderTrait.php
+sso/ProviderTrait.php
+ProviderTrait.php
+src/auth/sso/mapper/ExplicitUserMapper.php
+auth/sso/mapper/ExplicitUserMapper.php
+sso/mapper/ExplicitUserMapper.php
+mapper/ExplicitUserMapper.php
+ExplicitUserMapper.php
+src/auth/sso/mapper/MapFactory.php
+auth/sso/mapper/MapFactory.php
+sso/mapper/MapFactory.php
+mapper/MapFactory.php
+MapFactory.php
+src/auth/sso/mapper/UserMapInterface.php
+auth/sso/mapper/UserMapInterface.php
+sso/mapper/UserMapInterface.php
+mapper/UserMapInterface.php
+UserMapInterface.php
+src/auth/sso/mapper/IdpAttributeUserMapper.php
+auth/sso/mapper/IdpAttributeUserMapper.php
+sso/mapper/IdpAttributeUserMapper.php
+mapper/IdpAttributeUserMapper.php
+IdpAttributeUserMapper.php
+src/auth/sso/mapper/UserAttributesMapper.php
+auth/sso/mapper/UserAttributesMapper.php
+sso/mapper/UserAttributesMapper.php
+mapper/UserAttributesMapper.php
+UserAttributesMapper.php
+src/auth/sso/mapper/SetUserValueTrait.php
+auth/sso/mapper/SetUserValueTrait.php
+sso/mapper/SetUserValueTrait.php
+mapper/SetUserValueTrait.php
+SetUserValueTrait.php
+src/auth/sso/mapper/TemplateValueUserMapper.php
+auth/sso/mapper/TemplateValueUserMapper.php
+sso/mapper/TemplateValueUserMapper.php
+mapper/TemplateValueUserMapper.php
+TemplateValueUserMapper.php
+src/auth/sso/BaseExternalProvider.php
+auth/sso/BaseExternalProvider.php
+sso/BaseExternalProvider.php
+BaseExternalProvider.php
+src/auth/sso/README.md
+auth/sso/README.md
+sso/README.md
+README.md
 src/auth/methods/AuthMethodInterface.php
 auth/methods/AuthMethodInterface.php
 methods/AuthMethodInterface.php
@@ -3570,6 +3647,10 @@ src/translations/pt/app.php
 translations/pt/app.php
 pt/app.php
 app.php
+src/translations/el/app.php
+translations/el/app.php
+el/app.php
+app.php
 src/translations/de-CH/app.php
 translations/de-CH/app.php
 de-CH/app.php
@@ -3740,6 +3821,9 @@ SystemMessages.php
 src/services/Volumes.php
 services/Volumes.php
 Volumes.php
+src/services/Sso.php
+services/Sso.php
+Sso.php
 src/services/Config.php
 services/Config.php
 Config.php
@@ -3794,6 +3878,9 @@ SiteGroup.php
 src/records/GlobalSet.php
 records/GlobalSet.php
 GlobalSet.php
+src/records/SsoIdentity.php
+records/SsoIdentity.php
+SsoIdentity.php
 src/records/AssetIndexingSession.php
 records/AssetIndexingSession.php
 AssetIndexingSession.php
@@ -4055,6 +4142,12 @@ ImageTransformIndex.php
 src/updates/migration.php.template
 updates/migration.php.template
 migration.php.template
+src/updates/field-merge.php.template
+updates/field-merge.php.template
+field-merge.php.template
+src/updates/entry-type-merge.php.template
+updates/entry-type-merge.php.template
+entry-type-merge.php.template
 src/validators/UsernameValidator.php
 validators/UsernameValidator.php
 UsernameValidator.php
@@ -9573,6 +9666,9 @@ BaseElementsController.php
 src/controllers/AuthController.php
 controllers/AuthController.php
 AuthController.php
+src/controllers/SsoController.php
+controllers/SsoController.php
+SsoController.php
 src/controllers/VolumesController.php
 controllers/VolumesController.php
 VolumesController.php
@@ -9737,6 +9833,10 @@ elements/conditions/tags/TagCondition.php
 conditions/tags/TagCondition.php
 tags/TagCondition.php
 TagCondition.php
+src/elements/conditions/HasDescendantsRule.php
+elements/conditions/HasDescendantsRule.php
+conditions/HasDescendantsRule.php
+HasDescendantsRule.php
 src/elements/conditions/DateCreatedConditionRule.php
 elements/conditions/DateCreatedConditionRule.php
 conditions/DateCreatedConditionRule.php
@@ -9984,6 +10084,10 @@ EagerLoadPlan.php
 src/elements/Asset.php
 elements/Asset.php
 Asset.php
+src/elements/actions/MoveToSection.php
+elements/actions/MoveToSection.php
+actions/MoveToSection.php
+MoveToSection.php
 src/elements/actions/UnsuspendUsers.php
 elements/actions/UnsuspendUsers.php
 actions/UnsuspendUsers.php
@@ -10096,9 +10200,15 @@ Install.php
 src/migrations/m230607_102049_add_entrytype_slug_translation_columns.php
 migrations/m230607_102049_add_entrytype_slug_translation_columns.php
 m230607_102049_add_entrytype_slug_translation_columns.php
+src/migrations/m240723_214330_drop_bulkop_fk.php
+migrations/m240723_214330_drop_bulkop_fk.php
+m240723_214330_drop_bulkop_fk.php
 src/migrations/m230616_173810_kill_field_groups.php
 migrations/m230616_173810_kill_field_groups.php
 m230616_173810_kill_field_groups.php
+src/migrations/m240731_053543_soft_delete_fields.php
+migrations/m240731_053543_soft_delete_fields.php
+m240731_053543_soft_delete_fields.php
 src/migrations/m230904_190356_address_fields.php
 migrations/m230904_190356_address_fields.php
 m230904_190356_address_fields.php
@@ -10114,6 +10224,9 @@ m240619_091352_add_auth_2fa_timestamp.php
 src/migrations/m221205_082005_translatable_asset_alt_text.php
 migrations/m221205_082005_translatable_asset_alt_text.php
 m221205_082005_translatable_asset_alt_text.php
+src/migrations/BaseFieldMergeMigration.php
+migrations/BaseFieldMergeMigration.php
+BaseFieldMergeMigration.php
 src/migrations/m230314_111234_add_webauthn_table.php
 migrations/m230314_111234_add_webauthn_table.php
 m230314_111234_add_webauthn_table.php
@@ -10126,12 +10239,18 @@ m240207_182452_address_line_3.php
 src/migrations/m230820_162023_fix_cache_id_type.php
 migrations/m230820_162023_fix_cache_id_type.php
 m230820_162023_fix_cache_id_type.php
+src/migrations/m240805_154041_sso_identities.php
+migrations/m240805_154041_sso_identities.php
+m240805_154041_sso_identities.php
 src/migrations/m230616_183820_remove_field_name_limit.php
 migrations/m230616_183820_remove_field_name_limit.php
 m230616_183820_remove_field_name_limit.php
 src/migrations/CreateDbCacheTable.php
 migrations/CreateDbCacheTable.php
 CreateDbCacheTable.php
+src/migrations/BaseEntryTypeMergeMigration.php
+migrations/BaseEntryTypeMergeMigration.php
+BaseEntryTypeMergeMigration.php
 src/migrations/m230524_000002_entry_type_colors.php
 migrations/m230524_000002_entry_type_colors.php
 m230524_000002_entry_type_colors.php
@@ -13446,6 +13565,13 @@ cp/src/js/ElementFieldSettings.js
 src/js/ElementFieldSettings.js
 js/ElementFieldSettings.js
 ElementFieldSettings.js
+src/web/assets/cp/src/js/EnvVarGenerator.js
+web/assets/cp/src/js/EnvVarGenerator.js
+assets/cp/src/js/EnvVarGenerator.js
+cp/src/js/EnvVarGenerator.js
+src/js/EnvVarGenerator.js
+js/EnvVarGenerator.js
+EnvVarGenerator.js
 src/web/assets/cp/src/js/BaseElementSelectorModal.js
 web/assets/cp/src/js/BaseElementSelectorModal.js
 assets/cp/src/js/BaseElementSelectorModal.js
@@ -13551,6 +13677,13 @@ cp/src/js/CraftDisclosure.js
 src/js/CraftDisclosure.js
 js/CraftDisclosure.js
 CraftDisclosure.js
+src/web/assets/cp/src/js/EntryMover.js
+web/assets/cp/src/js/EntryMover.js
+assets/cp/src/js/EntryMover.js
+cp/src/js/EntryMover.js
+src/js/EntryMover.js
+js/EntryMover.js
+EntryMover.js
 src/web/assets/cp/src/js/ElementEditorSlideout.js
 web/assets/cp/src/js/ElementEditorSlideout.js
 assets/cp/src/js/ElementEditorSlideout.js
@@ -13558,6 +13691,13 @@ cp/src/js/ElementEditorSlideout.js
 src/js/ElementEditorSlideout.js
 js/ElementEditorSlideout.js
 ElementEditorSlideout.js
+src/web/assets/cp/src/js/LinkInput.js
+web/assets/cp/src/js/LinkInput.js
+assets/cp/src/js/LinkInput.js
+cp/src/js/LinkInput.js
+src/js/LinkInput.js
+js/LinkInput.js
+LinkInput.js
 src/web/assets/cp/src/js/InfoIcon.js
 web/assets/cp/src/js/InfoIcon.js
 assets/cp/src/js/InfoIcon.js
@@ -15951,28 +16091,11 @@ web/assets/vue/VueAsset.php
 assets/vue/VueAsset.php
 vue/VueAsset.php
 VueAsset.php
-src/web/assets/elementresizedetector/webpack.config.js
-web/assets/elementresizedetector/webpack.config.js
-assets/elementresizedetector/webpack.config.js
-elementresizedetector/webpack.config.js
-webpack.config.js
 src/web/assets/elementresizedetector/ElementResizeDetectorAsset.php
 web/assets/elementresizedetector/ElementResizeDetectorAsset.php
 assets/elementresizedetector/ElementResizeDetectorAsset.php
 elementresizedetector/ElementResizeDetectorAsset.php
 ElementResizeDetectorAsset.php
-src/web/assets/elementresizedetector/dist/element-resize-detector.js.LICENSE.txt
-web/assets/elementresizedetector/dist/element-resize-detector.js.LICENSE.txt
-assets/elementresizedetector/dist/element-resize-detector.js.LICENSE.txt
-elementresizedetector/dist/element-resize-detector.js.LICENSE.txt
-dist/element-resize-detector.js.LICENSE.txt
-element-resize-detector.js.LICENSE.txt
-src/web/assets/elementresizedetector/dist/element-resize-detector.js
-web/assets/elementresizedetector/dist/element-resize-detector.js
-assets/elementresizedetector/dist/element-resize-detector.js
-elementresizedetector/dist/element-resize-detector.js
-dist/element-resize-detector.js
-element-resize-detector.js
 src/web/assets/upgrade/UpgradeAsset.php
 web/assets/upgrade/UpgradeAsset.php
 assets/upgrade/UpgradeAsset.php
@@ -16387,6 +16510,15 @@ TimePeriod.php
 src/enums/AttributeStatus.php
 enums/AttributeStatus.php
 AttributeStatus.php
+src/filters/SiteFilterTrait.php
+filters/SiteFilterTrait.php
+SiteFilterTrait.php
+src/filters/Headers.php
+filters/Headers.php
+Headers.php
+src/filters/Cors.php
+filters/Cors.php
+Cors.php
 src/Craft.php
 Craft.php
 src/db/Table.php
@@ -16512,6 +16644,9 @@ PluginInterface.php
 src/base/ConfigurableComponent.php
 base/ConfigurableComponent.php
 ConfigurableComponent.php
+src/base/RelationalFieldTrait.php
+base/RelationalFieldTrait.php
+RelationalFieldTrait.php
 src/base/NestedElementInterface.php
 base/NestedElementInterface.php
 NestedElementInterface.php
@@ -16530,6 +16665,9 @@ CpEditable.php
 src/base/FieldLayoutElement.php
 base/FieldLayoutElement.php
 FieldLayoutElement.php
+src/base/MergeableFieldInterface.php
+base/MergeableFieldInterface.php
+MergeableFieldInterface.php
 src/base/Image.php
 base/Image.php
 Image.php
@@ -16664,6 +16802,9 @@ BaseFsInterface.php
 src/base/ElementExporterInterface.php
 base/ElementExporterInterface.php
 ElementExporterInterface.php
+src/base/Grippable.php
+base/Grippable.php
+Grippable.php
 src/base/FieldInterface.php
 base/FieldInterface.php
 FieldInterface.php
@@ -16688,6 +16829,9 @@ ConfigurableComponentInterface.php
 src/base/SavableComponent.php
 base/SavableComponent.php
 SavableComponent.php
+src/base/RelationalFieldInterface.php
+base/RelationalFieldInterface.php
+RelationalFieldInterface.php
 src/base/ElementAction.php
 base/ElementAction.php
 ElementAction.php
@@ -16868,6 +17012,9 @@ PopulateElementEvent.php
 src/events/LocateUploadedFilesEvent.php
 events/LocateUploadedFilesEvent.php
 LocateUploadedFilesEvent.php
+src/events/MoveEntryEvent.php
+events/MoveEntryEvent.php
+MoveEntryEvent.php
 src/events/RegisterTemplateRootsEvent.php
 events/RegisterTemplateRootsEvent.php
 RegisterTemplateRootsEvent.php
@@ -16964,6 +17111,9 @@ UserGroupEvent.php
 src/events/InvalidateElementCachesEvent.php
 events/InvalidateElementCachesEvent.php
 InvalidateElementCachesEvent.php
+src/events/DefineShowFieldLayoutComponentInFormEvent.php
+events/DefineShowFieldLayoutComponentInFormEvent.php
+DefineShowFieldLayoutComponentInFormEvent.php
 src/events/RegisterElementSortOptionsEvent.php
 events/RegisterElementSortOptionsEvent.php
 RegisterElementSortOptionsEvent.php
@@ -17093,6 +17243,9 @@ DuplicateNestedElementsEvent.php
 src/events/DefineAssetThumbUrlEvent.php
 events/DefineAssetThumbUrlEvent.php
 DefineAssetThumbUrlEvent.php
+src/events/SsoEvent.php
+events/SsoEvent.php
+SsoEvent.php
 src/events/DefineRulesEvent.php
 events/DefineRulesEvent.php
 DefineRulesEvent.php
@@ -17319,6 +17472,10 @@ src/fields/data/SingleOptionFieldData.php
 fields/data/SingleOptionFieldData.php
 data/SingleOptionFieldData.php
 SingleOptionFieldData.php
+src/fields/data/LinkData.php
+fields/data/LinkData.php
+data/LinkData.php
+LinkData.php
 src/fields/data/MultiOptionsFieldData.php
 fields/data/MultiOptionsFieldData.php
 data/MultiOptionsFieldData.php
@@ -17327,9 +17484,48 @@ src/fields/data/ColorData.php
 fields/data/ColorData.php
 data/ColorData.php
 ColorData.php
+src/fields/linktypes/Phone.php
+fields/linktypes/Phone.php
+linktypes/Phone.php
+Phone.php
+src/fields/linktypes/Category.php
+fields/linktypes/Category.php
+linktypes/Category.php
+Category.php
+src/fields/linktypes/BaseElementLinkType.php
+fields/linktypes/BaseElementLinkType.php
+linktypes/BaseElementLinkType.php
+BaseElementLinkType.php
+src/fields/linktypes/Url.php
+fields/linktypes/Url.php
+linktypes/Url.php
+Url.php
+src/fields/linktypes/Entry.php
+fields/linktypes/Entry.php
+linktypes/Entry.php
+Entry.php
+src/fields/linktypes/BaseTextLinkType.php
+fields/linktypes/BaseTextLinkType.php
+linktypes/BaseTextLinkType.php
+BaseTextLinkType.php
+src/fields/linktypes/Asset.php
+fields/linktypes/Asset.php
+linktypes/Asset.php
+Asset.php
+src/fields/linktypes/BaseLinkType.php
+fields/linktypes/BaseLinkType.php
+linktypes/BaseLinkType.php
+BaseLinkType.php
+src/fields/linktypes/Email.php
+fields/linktypes/Email.php
+linktypes/Email.php
+Email.php
 src/fields/Number.php
 fields/Number.php
 Number.php
+src/fields/Link.php
+fields/Link.php
+Link.php
 src/fields/Date.php
 fields/Date.php
 Date.php
@@ -12,7 +12,6 @@ lib/ar-softdelete/src/SoftDeleteBehavior.php
 lib/ar-softdelete/src/SoftDeleteQueryBehavior.php
 lib/ar-softdelete/README.md
 lib/composer-LICENSE.txt
-lib/yii2/helpers/ArrayHelper.php
 lib/yii2/Yii.php
 CHANGELOG.md
 crowdin.yml
@@ -364,7 +363,7 @@ src/templates/users/_auth-methods.twig
 src/templates/users/_password.twig
 src/templates/users/_permissions.twig
 src/templates/users/_passkeys-table.twig
-src/templates/users/index.twig
+src/templates/users/_index.twig
 src/templates/403.twig
 src/templates/entries/index.twig
 src/templates/plugin-store/_special/oauth/modal-callback.twig
@@ -392,7 +391,7 @@ src/templates/_elements/revisions.twig
 src/templates/settings/sections/_edit.twig
 src/templates/settings/sections/_index.twig
 src/templates/settings/globals/_edit.twig
-src/templates/settings/globals/index.twig
+src/templates/settings/globals/_index.twig
 src/templates/settings/general/_images/image.twig
 src/templates/settings/general/_images/logo.twig
 src/templates/settings/general/_images/icon.twig
@@ -459,6 +458,7 @@ src/templates/_layouts/basecp.twig
 src/templates/_layouts/base.twig
 src/templates/_layouts/elementindex.twig
 src/templates/_layouts/cp.twig
+src/templates/_login/form.twig
 src/templates/400.twig
 src/templates/categories/_index.twig
 src/templates/_includes/forms/timeZone.twig
@@ -579,10 +579,12 @@ src/views/debug/deprecated/detail.php
 src/views/debug/deprecated/summary.php
 src/errors/ImageException.php
 src/errors/FieldNotFoundException.php
+src/errors/SsoFailedException.php
 src/errors/AssetDisallowedExtensionException.php
 src/errors/TokenNotFoundException.php
 src/errors/FsObjectExistsException.php
 src/errors/EntryTypeNotFoundException.php
+src/errors/AuthProviderNotFoundException.php
 src/errors/InvalidLicenseKeyException.php
 src/errors/CategoryGroupNotFoundException.php
 src/errors/StructureNotFoundException.php
@@ -809,6 +811,7 @@ src/console/controllers/BackupTrait.php
 src/console/controllers/UpController.php
 src/console/controllers/OnController.php
 src/console/controllers/InvalidateTagsController.php
+src/console/controllers/EntryTypesController.php
 src/console/controllers/TestsController.php
 src/console/controllers/PluginController.php
 src/console/controllers/utils/UpdateUsernamesController.php
@@ -821,6 +824,7 @@ src/console/controllers/utils/PruneOrphanedEntriesController.php
 src/console/controllers/utils/FixFieldLayoutUidsController.php
 src/console/controllers/IndexAssetsController.php
 src/console/controllers/FixtureController.php
+src/console/controllers/EnvController.php
 src/console/controllers/DbController.php
 src/console/controllers/UpdateController.php
 src/console/controllers/ElementsController.php
@@ -833,6 +837,7 @@ src/console/controllers/OffController.php
 src/console/controllers/RestoreController.php
 src/console/controllers/ClearDeprecationsController.php
 src/console/controllers/ProjectConfigController.php
+src/console/controllers/FieldsController.php
 src/console/controllers/UsersController.php
 src/console/controllers/HelpController.php
 src/console/controllers/BackupController.php
@@ -845,6 +850,19 @@ src/console/ErrorHandler.php
 src/console/actions/ClearCacheAction.php
 src/console/actions/InvalidateTagAction.php
 src/console/CallableAction.php
+src/auth/sso/BaseProvider.php
+src/auth/sso/ProviderInterface.php
+src/auth/sso/CraftProvider.php
+src/auth/sso/ProviderTrait.php
+src/auth/sso/mapper/ExplicitUserMapper.php
+src/auth/sso/mapper/MapFactory.php
+src/auth/sso/mapper/UserMapInterface.php
+src/auth/sso/mapper/IdpAttributeUserMapper.php
+src/auth/sso/mapper/UserAttributesMapper.php
+src/auth/sso/mapper/SetUserValueTrait.php
+src/auth/sso/mapper/TemplateValueUserMapper.php
+src/auth/sso/BaseExternalProvider.php
+src/auth/sso/README.md
 src/auth/methods/AuthMethodInterface.php
 src/auth/methods/TOTP.php
 src/auth/methods/BaseAuthMethod.php
@@ -868,6 +886,7 @@ src/translations/es/app.php
 src/translations/cy/app.php
 src/translations/he/app.php
 src/translations/pt/app.php
+src/translations/el/app.php
 src/translations/de-CH/app.php
 src/translations/da/app.php
 src/translations/fa/app.php
@@ -920,6 +939,7 @@ src/services/AssetIndexer.php
 src/services/Webpack.php
 src/services/SystemMessages.php
 src/services/Volumes.php
+src/services/Sso.php
 src/services/Config.php
 src/services/Revisions.php
 src/services/Routes.php
@@ -938,6 +958,7 @@ src/records/GqlSchema.php
 src/records/UserPermission_User.php
 src/records/SiteGroup.php
 src/records/GlobalSet.php
+src/records/SsoIdentity.php
 src/records/AssetIndexingSession.php
 src/records/Section_SiteSettings.php
 src/records/FieldLayout.php
@@ -1025,6 +1046,8 @@ src/models/TagGroup.php
 src/models/UserGroup.php
 src/models/ImageTransformIndex.php
 src/updates/migration.php.template
+src/updates/field-merge.php.template
+src/updates/entry-type-merge.php.template
 src/validators/UsernameValidator.php
 src/validators/ColorValidator.php
 src/validators/DateTimeValidator.php
@@ -2426,6 +2449,7 @@ src/controllers/EntriesController.php
 src/controllers/ImageTransformsController.php
 src/controllers/BaseElementsController.php
 src/controllers/AuthController.php
+src/controllers/SsoController.php
 src/controllers/VolumesController.php
 src/controllers/SectionsController.php
 src/controllers/TemplatesController.php
@@ -2463,6 +2487,7 @@ src/elements/conditions/entries/ViewableConditionRule.php
 src/elements/conditions/entries/AuthorConditionRule.php
 src/elements/conditions/tags/GroupConditionRule.php
 src/elements/conditions/tags/TagCondition.php
+src/elements/conditions/HasDescendantsRule.php
 src/elements/conditions/DateCreatedConditionRule.php
 src/elements/conditions/SiteConditionRule.php
 src/elements/conditions/assets/SavableConditionRule.php
@@ -2519,6 +2544,7 @@ src/elements/db/AssetQuery.php
 src/elements/db/GlobalSetQuery.php
 src/elements/db/EagerLoadPlan.php
 src/elements/Asset.php
+src/elements/actions/MoveToSection.php
 src/elements/actions/UnsuspendUsers.php
 src/elements/actions/NewChild.php
 src/elements/actions/ShowInFolder.php
@@ -2548,18 +2574,23 @@ src/elements/ElementCollection.php
 src/migrations/m231213_030600_element_bulk_ops.php
 src/migrations/Install.php
 src/migrations/m230607_102049_add_entrytype_slug_translation_columns.php
+src/migrations/m240723_214330_drop_bulkop_fk.php
 src/migrations/m230616_173810_kill_field_groups.php
+src/migrations/m240731_053543_soft_delete_fields.php
 src/migrations/m230904_190356_address_fields.php
 src/migrations/m221101_115859_create_entries_authors_table.php
 src/migrations/BaseContentRefactorMigration.php
 src/migrations/m240619_091352_add_auth_2fa_timestamp.php
 src/migrations/m221205_082005_translatable_asset_alt_text.php
+src/migrations/BaseFieldMergeMigration.php
 src/migrations/m230314_111234_add_webauthn_table.php
 src/migrations/m240302_212719_solo_preview_targets.php
 src/migrations/m240207_182452_address_line_3.php
 src/migrations/m230820_162023_fix_cache_id_type.php
+src/migrations/m240805_154041_sso_identities.php
 src/migrations/m230616_183820_remove_field_name_limit.php
 src/migrations/CreateDbCacheTable.php
+src/migrations/BaseEntryTypeMergeMigration.php
 src/migrations/m230524_000002_entry_type_colors.php
 src/migrations/m230710_162700_element_activity.php
 src/migrations/m230511_215903_content_refactor.php
@@ -3083,6 +3114,7 @@ src/web/assets/cp/src/css/charts.scss
 src/web/assets/cp/src/css/_color-palette.scss
 src/web/assets/cp/src/css/_global-sidebar.scss
 src/web/assets/cp/src/js/ElementFieldSettings.js
+src/web/assets/cp/src/js/EnvVarGenerator.js
 src/web/assets/cp/src/js/BaseElementSelectorModal.js
 src/web/assets/cp/src/js/Chart.js
 src/web/assets/cp/src/js/ElementActionTrigger.js
@@ -3098,7 +3130,9 @@ src/web/assets/cp/src/js/Slideout.js
 src/web/assets/cp/src/js/BaseElementSelectInput.js
 src/web/assets/cp/src/js/CpModal.js
 src/web/assets/cp/src/js/CraftDisclosure.js
+src/web/assets/cp/src/js/EntryMover.js
 src/web/assets/cp/src/js/ElementEditorSlideout.js
+src/web/assets/cp/src/js/LinkInput.js
 src/web/assets/cp/src/js/InfoIcon.js
 src/web/assets/cp/src/js/LightSwitch.js
 src/web/assets/cp/src/js/Grid.js
@@ -3454,10 +3488,7 @@ src/web/assets/vue/webpack.config.js
 src/web/assets/vue/dist/vue.js.LICENSE.txt
 src/web/assets/vue/dist/vue.js
 src/web/assets/vue/VueAsset.php
-src/web/assets/elementresizedetector/webpack.config.js
 src/web/assets/elementresizedetector/ElementResizeDetectorAsset.php
-src/web/assets/elementresizedetector/dist/element-resize-detector.js.LICENSE.txt
-src/web/assets/elementresizedetector/dist/element-resize-detector.js
 src/web/assets/upgrade/UpgradeAsset.php
 src/web/assets/upgrade/webpack.config.js
 src/web/assets/upgrade/src/upgrade.scss
@@ -3544,6 +3575,9 @@ src/enums/PropagationMethod.php
 src/enums/CmsEdition.php
 src/enums/TimePeriod.php
 src/enums/AttributeStatus.php
+src/filters/SiteFilterTrait.php
+src/filters/Headers.php
+src/filters/Cors.php
 src/Craft.php
 src/db/Table.php
 src/db/Command.php
@@ -3584,12 +3618,14 @@ src/base/SavableComponentInterface.php
 src/base/FieldLayoutProviderInterface.php
 src/base/PluginInterface.php
 src/base/ConfigurableComponent.php
+src/base/RelationalFieldTrait.php
 src/base/NestedElementInterface.php
 src/base/ThumbableFieldInterface.php
 src/base/Component.php
 src/base/FieldLayoutComponent.php
 src/base/CpEditable.php
 src/base/FieldLayoutElement.php
+src/base/MergeableFieldInterface.php
 src/base/Image.php
 src/base/FsTrait.php
 src/base/Widget.php
@@ -3630,6 +3666,7 @@ src/base/Colorable.php
 src/base/ClonefixTrait.php
 src/base/BaseFsInterface.php
 src/base/ElementExporterInterface.php
+src/base/Grippable.php
 src/base/FieldInterface.php
 src/base/PreviewableFieldInterface.php
 src/base/Plugin.php
@@ -3638,6 +3675,7 @@ src/base/Model.php
 src/base/Serializable.php
 src/base/ConfigurableComponentInterface.php
 src/base/SavableComponent.php
+src/base/RelationalFieldInterface.php
 src/base/ElementAction.php
 src/base/Statusable.php
 src/base/WidgetInterface.php
@@ -3698,6 +3736,7 @@ src/events/CancelableEvent.php
 src/events/RegisterCpNavItemsEvent.php
 src/events/PopulateElementEvent.php
 src/events/LocateUploadedFilesEvent.php
+src/events/MoveEntryEvent.php
 src/events/RegisterTemplateRootsEvent.php
 src/events/DefineAddressFieldLabelEvent.php
 src/events/ErrorEvent.php
@@ -3730,6 +3769,7 @@ src/events/SetElementRouteEvent.php
 src/events/DefineFieldLayoutFieldsEvent.php
 src/events/UserGroupEvent.php
 src/events/InvalidateElementCachesEvent.php
+src/events/DefineShowFieldLayoutComponentInFormEvent.php
 src/events/RegisterElementSortOptionsEvent.php
 src/events/RegisterElementActionsEvent.php
 src/events/ElementQueryEvent.php
@@ -3773,6 +3813,7 @@ src/events/RegisterCpSettingsEvent.php
 src/events/ExecuteGqlQueryEvent.php
 src/events/DuplicateNestedElementsEvent.php
 src/events/DefineAssetThumbUrlEvent.php
+src/events/SsoEvent.php
 src/events/DefineRulesEvent.php
 src/events/DefineHtmlEvent.php
 src/events/CreateTwigEvent.php
@@ -3844,9 +3885,20 @@ src/fields/Money.php
 src/fields/Checkboxes.php
 src/fields/data/OptionData.php
 src/fields/data/SingleOptionFieldData.php
+src/fields/data/LinkData.php
 src/fields/data/MultiOptionsFieldData.php
 src/fields/data/ColorData.php
+src/fields/linktypes/Phone.php
+src/fields/linktypes/Category.php
+src/fields/linktypes/BaseElementLinkType.php
+src/fields/linktypes/Url.php
+src/fields/linktypes/Entry.php
+src/fields/linktypes/BaseTextLinkType.php
+src/fields/linktypes/Asset.php
+src/fields/linktypes/BaseLinkType.php
+src/fields/linktypes/Email.php
 src/fields/Number.php
+src/fields/Link.php
 src/fields/Date.php
 src/fields/RadioButtons.php
 src/fields/MultiSelect.php
@@ -2039,6 +2039,12 @@ tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts
 DefaultConfig/Content/ContentWithPropertyEditors.spec.ts
 Content/ContentWithPropertyEditors.spec.ts
 ContentWithPropertyEditors.spec.ts
+tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts
+Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts
+tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts
+DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts
+Content/ContentWithMultipleMediaPicker.spec.ts
+ContentWithMultipleMediaPicker.spec.ts
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ChildrenContent.spec.ts
 Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ChildrenContent.spec.ts
 tests/DefaultConfig/Content/ChildrenContent.spec.ts
@@ -2063,6 +2069,18 @@ tests/DefaultConfig/Content/RedirectManagement.spec.ts
 DefaultConfig/Content/RedirectManagement.spec.ts
 Content/RedirectManagement.spec.ts
 RedirectManagement.spec.ts
+tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts
+Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts
+tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts
+DefaultConfig/Content/ContentWithMediaPicker.spec.ts
+Content/ContentWithMediaPicker.spec.ts
+ContentWithMediaPicker.spec.ts
+tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts
+Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts
+tests/DefaultConfig/Content/ContentWithDropdown.spec.ts
+DefaultConfig/Content/ContentWithDropdown.spec.ts
+Content/ContentWithDropdown.spec.ts
+ContentWithDropdown.spec.ts
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts
 Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts
 tests/DefaultConfig/Content/ContentInfoTab.spec.ts
@@ -2075,6 +2093,12 @@ tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts
 DefaultConfig/Content/ContentWithCheckboxList.spec.ts
 Content/ContentWithCheckboxList.spec.ts
 ContentWithCheckboxList.spec.ts
+tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts
+Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts
+tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts
+DefaultConfig/Content/ContentWithContentPicker.spec.ts
+Content/ContentWithContentPicker.spec.ts
+ContentWithContentPicker.spec.ts
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/CreatedPackages.spec.ts
 Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/CreatedPackages.spec.ts
 tests/DefaultConfig/Packages/CreatedPackages.spec.ts
@@ -7839,6 +7863,11 @@ Umbraco.Core/Media/EmbedProviders/OEmbedProviderBase.cs
 Media/EmbedProviders/OEmbedProviderBase.cs
 EmbedProviders/OEmbedProviderBase.cs
 OEmbedProviderBase.cs
+src/Umbraco.Core/Media/EmbedProviders/X.cs
+Umbraco.Core/Media/EmbedProviders/X.cs
+Media/EmbedProviders/X.cs
+EmbedProviders/X.cs
+X.cs
 src/Umbraco.Core/Media/EmbedProviders/OEmbedResponseBase.cs
 Umbraco.Core/Media/EmbedProviders/OEmbedResponseBase.cs
 Media/EmbedProviders/OEmbedResponseBase.cs
@@ -15281,6 +15310,11 @@ Umbraco.Cms.Api.Management/Controllers/MediaType/ImportExistingMediaTypeControll
 Controllers/MediaType/ImportExistingMediaTypeController.cs
 MediaType/ImportExistingMediaTypeController.cs
 ImportExistingMediaTypeController.cs
+src/Umbraco.Cms.Api.Management/Controllers/MediaType/ConfigurationMediaTypeController.cs
+Umbraco.Cms.Api.Management/Controllers/MediaType/ConfigurationMediaTypeController.cs
+Controllers/MediaType/ConfigurationMediaTypeController.cs
+MediaType/ConfigurationMediaTypeController.cs
+ConfigurationMediaTypeController.cs
 src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.cs
 Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.cs
 Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.cs
@@ -16369,6 +16403,11 @@ Umbraco.Cms.Api.Management/Controllers/MemberType/UpdateMemberTypeController.cs
 Controllers/MemberType/UpdateMemberTypeController.cs
 MemberType/UpdateMemberTypeController.cs
 UpdateMemberTypeController.cs
+src/Umbraco.Cms.Api.Management/Controllers/MemberType/ConfigurationMemberTypeController.cs
+Umbraco.Cms.Api.Management/Controllers/MemberType/ConfigurationMemberTypeController.cs
+Controllers/MemberType/ConfigurationMemberTypeController.cs
+MemberType/ConfigurationMemberTypeController.cs
+ConfigurationMemberTypeController.cs
 src/Umbraco.Cms.Api.Management/Controllers/MemberType/AvailableCompositionMemberTypeController.cs
 Umbraco.Cms.Api.Management/Controllers/MemberType/AvailableCompositionMemberTypeController.cs
 Controllers/MemberType/AvailableCompositionMemberTypeController.cs
@@ -18984,6 +19023,11 @@ Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeCompositionResponseMode
 ViewModels/MediaType/MediaTypeCompositionResponseModel.cs
 MediaType/MediaTypeCompositionResponseModel.cs
 MediaTypeCompositionResponseModel.cs
+src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeConfigurationModel.cs
+Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeConfigurationModel.cs
+ViewModels/MediaType/MediaTypeConfigurationModel.cs
+MediaType/MediaTypeConfigurationModel.cs
+MediaTypeConfigurationModel.cs
 src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeReferenceModel.cs
 Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeReferenceModel.cs
 ViewModels/MediaType/MediaTypeReferenceModel.cs
@@ -19780,6 +19824,11 @@ Umbraco.Cms.Api.Management/ViewModels/Folder/CreateFolderRequestModel.cs
 ViewModels/Folder/CreateFolderRequestModel.cs
 Folder/CreateFolderRequestModel.cs
 CreateFolderRequestModel.cs
+src/Umbraco.Cms.Api.Management/ViewModels/MemberType/MemberTypeConfigurationResponseModel.cs
+Umbraco.Cms.Api.Management/ViewModels/MemberType/MemberTypeConfigurationResponseModel.cs
+ViewModels/MemberType/MemberTypeConfigurationResponseModel.cs
+MemberType/MemberTypeConfigurationResponseModel.cs
+MemberTypeConfigurationResponseModel.cs
 src/Umbraco.Cms.Api.Management/ViewModels/MemberType/UpdateMemberTypeRequestModel.cs
 Umbraco.Cms.Api.Management/ViewModels/MemberType/UpdateMemberTypeRequestModel.cs
 ViewModels/MemberType/UpdateMemberTypeRequestModel.cs
@@ -435,12 +435,16 @@ tests/Umbraco.Tests.AcceptanceTest/createTest.js
 tests/Umbraco.Tests.AcceptanceTest/misc/Directory.Packages.props
 tests/Umbraco.Tests.AcceptanceTest/package-lock.json
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts
+tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ChildrenContent.spec.ts
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CultureAndHostnames.spec.ts
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RedirectManagement.spec.ts
+tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts
+tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts
+tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/CreatedPackages.spec.ts
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/InstalledPackages.spec.ts
 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/PackagesPackages.spec.ts
@@ -1700,6 +1704,7 @@ src/Umbraco.Core/Media/EmbedProviders/Hulu.cs
 src/Umbraco.Core/Media/EmbedProviders/Twitter.cs
 src/Umbraco.Core/Media/EmbedProviders/Youtube.cs
 src/Umbraco.Core/Media/EmbedProviders/OEmbedProviderBase.cs
+src/Umbraco.Core/Media/EmbedProviders/X.cs
 src/Umbraco.Core/Media/EmbedProviders/OEmbedResponseBase.cs
 src/Umbraco.Core/Media/EmbedProviders/DailyMotion.cs
 src/Umbraco.Core/Media/EmbedProviders/Giphy.cs
@@ -3395,6 +3400,7 @@ src/Umbraco.Cms.Api.Management/Controllers/MediaType/AvailableCompositionMediaTy
 src/Umbraco.Cms.Api.Management/Controllers/MediaType/MoveMediaTypeController.cs
 src/Umbraco.Cms.Api.Management/Controllers/MediaType/DeleteMediaTypeController.cs
 src/Umbraco.Cms.Api.Management/Controllers/MediaType/ImportExistingMediaTypeController.cs
+src/Umbraco.Cms.Api.Management/Controllers/MediaType/ConfigurationMediaTypeController.cs
 src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.cs
 src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/RootMediaTypeTreeController.cs
 src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/MediaTypeTreeControllerBase.cs
@@ -3596,6 +3602,7 @@ src/Umbraco.Cms.Api.Management/Controllers/Media/ValidateUpdateMediaController.c
 src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/ObjectTypesControllerBase.cs
 src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/AllowedObjectTypesController.cs
 src/Umbraco.Cms.Api.Management/Controllers/MemberType/UpdateMemberTypeController.cs
+src/Umbraco.Cms.Api.Management/Controllers/MemberType/ConfigurationMemberTypeController.cs
 src/Umbraco.Cms.Api.Management/Controllers/MemberType/AvailableCompositionMemberTypeController.cs
 src/Umbraco.Cms.Api.Management/Controllers/MemberType/CreateMemberTypeController.cs
 src/Umbraco.Cms.Api.Management/Controllers/MemberType/CopyMemberTypeController.cs
@@ -4134,6 +4141,7 @@ src/Umbraco.Cms.Api.Management/ViewModels/MediaType/AvailableMediaTypeCompositio
 src/Umbraco.Cms.Api.Management/ViewModels/MediaType/AllowedDocumentTypeChild.cs
 src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeCollectionReferenceResponseModel.cs
 src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeCompositionResponseModel.cs
+src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeConfigurationModel.cs
 src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeReferenceModel.cs
 src/Umbraco.Cms.Api.Management/ViewModels/MediaType/CopyMediaTypeRequestModel.cs
 src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeSort.cs
@@ -4288,6 +4296,7 @@ src/Umbraco.Cms.Api.Management/ViewModels/Folder/FolderResponseModel.cs
 src/Umbraco.Cms.Api.Management/ViewModels/Folder/UpdateFolderResponseModel.cs
 src/Umbraco.Cms.Api.Management/ViewModels/Folder/FolderModelBase.cs
 src/Umbraco.Cms.Api.Management/ViewModels/Folder/CreateFolderRequestModel.cs
+src/Umbraco.Cms.Api.Management/ViewModels/MemberType/MemberTypeConfigurationResponseModel.cs
 src/Umbraco.Cms.Api.Management/ViewModels/MemberType/UpdateMemberTypeRequestModel.cs
 src/Umbraco.Cms.Api.Management/ViewModels/MemberType/MemberTypeCompositionRequestModel.cs
 src/Umbraco.Cms.Api.Management/ViewModels/MemberType/MemberTypeResponseModel.cs
@@ -707,6 +707,11 @@ js/product-editor/changelog/fix-45641
 product-editor/changelog/fix-45641
 changelog/fix-45641
 fix-45641
+packages/js/product-editor/changelog/update-e2e-product-editor-create-simple-product
+js/product-editor/changelog/update-e2e-product-editor-create-simple-product
+product-editor/changelog/update-e2e-product-editor-create-simple-product
+changelog/update-e2e-product-editor-create-simple-product
+update-e2e-product-editor-create-simple-product
 packages/js/product-editor/changelog/fix-product-editor-length-label
 js/product-editor/changelog/fix-product-editor-length-label
 product-editor/changelog/fix-product-editor-length-label
@@ -1192,6 +1197,11 @@ js/product-editor/changelog/fix-product-editor-variations-remove-sizes-and-color
 product-editor/changelog/fix-product-editor-variations-remove-sizes-and-colors-buttons
 changelog/fix-product-editor-variations-remove-sizes-and-colors-buttons
 fix-product-editor-variations-remove-sizes-and-colors-buttons
+packages/js/product-editor/changelog/fix-50058_gb_modal_conflict
+js/product-editor/changelog/fix-50058_gb_modal_conflict
+product-editor/changelog/fix-50058_gb_modal_conflict
+changelog/fix-50058_gb_modal_conflict
+fix-50058_gb_modal_conflict
 packages/js/product-editor/changelog/dev-50276_rename_and_move_error_handler
 js/product-editor/changelog/dev-50276_rename_and_move_error_handler
 product-editor/changelog/dev-50276_rename_and_move_error_handler
@@ -26429,6 +26439,13 @@ customize-store/assembler-hub/context/selected-block-ref-context.tsx
 assembler-hub/context/selected-block-ref-context.tsx
 context/selected-block-ref-context.tsx
 selected-block-ref-context.tsx
+plugins/woocommerce-admin/client/customize-store/assembler-hub/context/zoom-out-context.tsx
+woocommerce-admin/client/customize-store/assembler-hub/context/zoom-out-context.tsx
+client/customize-store/assembler-hub/context/zoom-out-context.tsx
+customize-store/assembler-hub/context/zoom-out-context.tsx
+assembler-hub/context/zoom-out-context.tsx
+context/zoom-out-context.tsx
+zoom-out-context.tsx
 plugins/woocommerce-admin/client/customize-store/assembler-hub/context/highlighted-block-context.tsx
 woocommerce-admin/client/customize-store/assembler-hub/context/highlighted-block-context.tsx
 client/customize-store/assembler-hub/context/highlighted-block-context.tsx
@@ -26575,6 +26592,13 @@ customize-store/assembler-hub/components/style.scss
 assembler-hub/components/style.scss
 components/style.scss
 style.scss
+plugins/woocommerce-admin/client/customize-store/assembler-hub/components/device-toolbar.tsx
+woocommerce-admin/client/customize-store/assembler-hub/components/device-toolbar.tsx
+client/customize-store/assembler-hub/components/device-toolbar.tsx
+customize-store/assembler-hub/components/device-toolbar.tsx
+assembler-hub/components/device-toolbar.tsx
+components/device-toolbar.tsx
+device-toolbar.tsx
 plugins/woocommerce-admin/client/customize-store/assembler-hub/components/sidebar.tsx
 woocommerce-admin/client/customize-store/assembler-hub/components/sidebar.tsx
 client/customize-store/assembler-hub/components/sidebar.tsx
@@ -57637,6 +57661,12 @@ tests/php/includes/class-wc-auth-test.php
 php/includes/class-wc-auth-test.php
 includes/class-wc-auth-test.php
 class-wc-auth-test.php
+plugins/woocommerce/tests/php/includes/class-wc-cache-helper-test.php
+woocommerce/tests/php/includes/class-wc-cache-helper-test.php
+tests/php/includes/class-wc-cache-helper-test.php
+php/includes/class-wc-cache-helper-test.php
+includes/class-wc-cache-helper-test.php
+class-wc-cache-helper-test.php
 plugins/woocommerce/tests/php/includes/class-wc-template-loader-test.php
 woocommerce/tests/php/includes/class-wc-template-loader-test.php
 tests/php/includes/class-wc-template-loader-test.php
@@ -63065,6 +63095,10 @@ plugins/woocommerce/changelog/add-bump-stats-error
 woocommerce/changelog/add-bump-stats-error
 changelog/add-bump-stats-error
 add-bump-stats-error
+plugins/woocommerce/changelog/update-e2e-product-editor-create-simple-product
+woocommerce/changelog/update-e2e-product-editor-create-simple-product
+changelog/update-e2e-product-editor-create-simple-product
+update-e2e-product-editor-create-simple-product
 plugins/woocommerce/changelog/prep-post-release-tasks-9.1.4
 woocommerce/changelog/prep-post-release-tasks-9.1.4
 changelog/prep-post-release-tasks-9.1.4
@@ -63073,6 +63107,10 @@ plugins/woocommerce/changelog/fix-49980-overlay-navigation-title-icon
 woocommerce/changelog/fix-49980-overlay-navigation-title-icon
 changelog/fix-49980-overlay-navigation-title-icon
 fix-49980-overlay-navigation-title-icon
+plugins/woocommerce/changelog/45439-feature-normalize-geolocation-hash
+woocommerce/changelog/45439-feature-normalize-geolocation-hash
+changelog/45439-feature-normalize-geolocation-hash
+45439-feature-normalize-geolocation-hash
 plugins/woocommerce/changelog/49304-update-express-checkout-layout
 woocommerce/changelog/49304-update-express-checkout-layout
 changelog/49304-update-express-checkout-layout
@@ -63105,6 +63143,10 @@ plugins/woocommerce/changelog/50157-patch-10
 woocommerce/changelog/50157-patch-10
 changelog/50157-patch-10
 50157-patch-10
+plugins/woocommerce/changelog/update-enable-remote-logging
+woocommerce/changelog/update-enable-remote-logging
+changelog/update-enable-remote-logging
+update-enable-remote-logging
 plugins/woocommerce/changelog/50198-patch-13
 woocommerce/changelog/50198-patch-13
 changelog/50198-patch-13
@@ -63153,6 +63195,10 @@ plugins/woocommerce/changelog/49803-fix-subscription-activation-with-multiple-su
 woocommerce/changelog/49803-fix-subscription-activation-with-multiple-subs-for-same-product
 changelog/49803-fix-subscription-activation-with-multiple-subs-for-same-product
 49803-fix-subscription-activation-with-multiple-subs-for-same-product
+plugins/woocommerce/changelog/dev-codesniffer-validate-psr4-autoloading
+woocommerce/changelog/dev-codesniffer-validate-psr4-autoloading
+changelog/dev-codesniffer-validate-psr4-autoloading
+dev-codesniffer-validate-psr4-autoloading
 plugins/woocommerce/changelog/46201-product-collection-sync-with-current-query-doesnt-display-the-correct-products-in-the-specific-category-templates
 woocommerce/changelog/46201-product-collection-sync-with-current-query-doesnt-display-the-correct-products-in-the-specific-category-templates
 changelog/46201-product-collection-sync-with-current-query-doesnt-display-the-correct-products-in-the-specific-category-templates
@@ -63277,6 +63323,14 @@ plugins/woocommerce/changelog/fix-wcadmin-react-18-create-root
 woocommerce/changelog/fix-wcadmin-react-18-create-root
 changelog/fix-wcadmin-react-18-create-root
 fix-wcadmin-react-18-create-root
+plugins/woocommerce/changelog/fix-cys-animation
+woocommerce/changelog/fix-cys-animation
+changelog/fix-cys-animation
+fix-cys-animation
+plugins/woocommerce/changelog/fix-44478
+woocommerce/changelog/fix-44478
+changelog/fix-44478
+fix-44478
 plugins/woocommerce/changelog/50127-fix-47557-display-address-card-for-virtual-products
 woocommerce/changelog/50127-fix-47557-display-address-card-for-virtual-products
 changelog/50127-fix-47557-display-address-card-for-virtual-products
@@ -63333,6 +63387,10 @@ plugins/woocommerce/changelog/fix-43628-view-button-orders-page
 woocommerce/changelog/fix-43628-view-button-orders-page
 changelog/fix-43628-view-button-orders-page
 fix-43628-view-button-orders-page
+plugins/woocommerce/changelog/fix-classic-template-tests-product-attribute-template
+woocommerce/changelog/fix-classic-template-tests-product-attribute-template
+changelog/fix-classic-template-tests-product-attribute-template
+fix-classic-template-tests-product-attribute-template
 plugins/woocommerce/changelog/50332-patch-19
 woocommerce/changelog/50332-patch-19
 changelog/50332-patch-19
@@ -63341,6 +63399,14 @@ plugins/woocommerce/changelog/fix-pc-max-price-filter-value-inclusion
 woocommerce/changelog/fix-pc-max-price-filter-value-inclusion
 changelog/fix-pc-max-price-filter-value-inclusion
 fix-pc-max-price-filter-value-inclusion
+plugins/woocommerce/changelog/fix-hpos-diff-prevent-sync-on-read
+woocommerce/changelog/fix-hpos-diff-prevent-sync-on-read
+changelog/fix-hpos-diff-prevent-sync-on-read
+fix-hpos-diff-prevent-sync-on-read
+plugins/woocommerce/changelog/update-e2e-test-utils-playwright
+woocommerce/changelog/update-e2e-test-utils-playwright
+changelog/update-e2e-test-utils-playwright
+update-e2e-test-utils-playwright
 plugins/woocommerce/changelog/dev-ci-phpunit-sharding
 woocommerce/changelog/dev-ci-phpunit-sharding
 changelog/dev-ci-phpunit-sharding
@@ -63349,6 +63415,10 @@ plugins/woocommerce/changelog/49648-fix-43603-footer-text-color
 woocommerce/changelog/49648-fix-43603-footer-text-color
 changelog/49648-fix-43603-footer-text-color
 49648-fix-43603-footer-text-color
+plugins/woocommerce/changelog/add-cys-assembler-zoomed-out-view
+woocommerce/changelog/add-cys-assembler-zoomed-out-view
+changelog/add-cys-assembler-zoomed-out-view
+add-cys-assembler-zoomed-out-view
 plugins/woocommerce/changelog/fix-page-titles-49798
 woocommerce/changelog/fix-page-titles-49798
 changelog/fix-page-titles-49798
@@ -63369,10 +63439,18 @@ plugins/woocommerce/changelog/add-php-remote-error-logging
 woocommerce/changelog/add-php-remote-error-logging
 changelog/add-php-remote-error-logging
 add-php-remote-error-logging
+plugins/woocommerce/changelog/fix-50167-payment-gateway-suggestions-flaky-unit-test
+woocommerce/changelog/fix-50167-payment-gateway-suggestions-flaky-unit-test
+changelog/fix-50167-payment-gateway-suggestions-flaky-unit-test
+fix-50167-payment-gateway-suggestions-flaky-unit-test
 plugins/woocommerce/changelog/fix-logout-endpoint-handling-25288
 woocommerce/changelog/fix-logout-endpoint-handling-25288
 changelog/fix-logout-endpoint-handling-25288
 fix-logout-endpoint-handling-25288
+plugins/woocommerce/changelog/ci-only-run-last-failed-e2e-tests
+woocommerce/changelog/ci-only-run-last-failed-e2e-tests
+changelog/ci-only-run-last-failed-e2e-tests
+ci-only-run-last-failed-e2e-tests
 plugins/woocommerce/changelog/e2e-remove-github-reporter
 woocommerce/changelog/e2e-remove-github-reporter
 changelog/e2e-remove-github-reporter
@@ -63401,6 +63479,10 @@ plugins/woocommerce/changelog/49999-feat-49998-replace-product-filters-block-wit
 woocommerce/changelog/49999-feat-49998-replace-product-filters-block-with-template-part-in-overlay-template-part
 changelog/49999-feat-49998-replace-product-filters-block-with-template-part-in-overlay-template-part
 49999-feat-49998-replace-product-filters-block-with-template-part-in-overlay-template-part
+plugins/woocommerce/changelog/update--remove-add-to-cart-from-webpack-entries
+woocommerce/changelog/update--remove-add-to-cart-from-webpack-entries
+changelog/update--remove-add-to-cart-from-webpack-entries
+update--remove-add-to-cart-from-webpack-entries
 plugins/woocommerce/changelog/add-reactify-offline-wcpay-settings-pages
 woocommerce/changelog/add-reactify-offline-wcpay-settings-pages
 changelog/add-reactify-offline-wcpay-settings-pages
@@ -63449,10 +63531,10 @@ plugins/woocommerce/changelog/49961-update-server-caching-link
 woocommerce/changelog/49961-update-server-caching-link
 changelog/49961-update-server-caching-link
 49961-update-server-caching-link
-plugins/woocommerce/changelog/update-admin-reset-password
-woocommerce/changelog/update-admin-reset-password
-changelog/update-admin-reset-password
-update-admin-reset-password
+plugins/woocommerce/changelog/update-pattern-placeholder-image-optimization
+woocommerce/changelog/update-pattern-placeholder-image-optimization
+changelog/update-pattern-placeholder-image-optimization
+update-pattern-placeholder-image-optimization
 plugins/woocommerce/phpcs.xml
 woocommerce/phpcs.xml
 phpcs.xml
@@ -148,6 +148,7 @@ packages/js/product-editor/changelog/tweak-number-control
 packages/js/product-editor/changelog/dev-46768_add_ref_to_number_control
 packages/js/product-editor/changelog/add-46919
 packages/js/product-editor/changelog/fix-45641
+packages/js/product-editor/changelog/update-e2e-product-editor-create-simple-product
 packages/js/product-editor/changelog/fix-product-editor-length-label
 packages/js/product-editor/changelog/fix-loading-layout-template
 packages/js/product-editor/changelog/add-50231_e2e_description_using_block_editor
@@ -245,6 +246,7 @@ packages/js/product-editor/changelog/fix-product-editor-modal-block-editor-heade
 packages/js/product-editor/changelog/update-move-logic-to-add-new-attribute
 packages/js/product-editor/changelog/.gitkeep
 packages/js/product-editor/changelog/fix-product-editor-variations-remove-sizes-and-colors-buttons
+packages/js/product-editor/changelog/fix-50058_gb_modal_conflict
 packages/js/product-editor/changelog/dev-50276_rename_and_move_error_handler
 packages/js/product-editor/changelog/enhancement-45920
 packages/js/product-editor/changelog/add-47221_tracks_events_to_publish_dropdown
@@ -4361,6 +4363,7 @@ plugins/woocommerce-admin/client/customize-store/assembler-hub/resizable-frame.j
 plugins/woocommerce-admin/client/customize-store/assembler-hub/block-editor.tsx
 plugins/woocommerce-admin/client/customize-store/assembler-hub/_mixins.scss
 plugins/woocommerce-admin/client/customize-store/assembler-hub/context/selected-block-ref-context.tsx
+plugins/woocommerce-admin/client/customize-store/assembler-hub/context/zoom-out-context.tsx
 plugins/woocommerce-admin/client/customize-store/assembler-hub/context/highlighted-block-context.tsx
 plugins/woocommerce-admin/client/customize-store/assembler-hub/hooks/use-home-templates.ts
 plugins/woocommerce-admin/client/customize-store/assembler-hub/hooks/use-is-active-new-neutral-variation.ts
@@ -4382,6 +4385,7 @@ plugins/woocommerce-admin/client/customize-store/assembler-hub/block-preview.tsx
 plugins/woocommerce-admin/client/customize-store/assembler-hub/block-editor-container.tsx
 plugins/woocommerce-admin/client/customize-store/assembler-hub/logo-block-context.tsx
 plugins/woocommerce-admin/client/customize-store/assembler-hub/components/style.scss
+plugins/woocommerce-admin/client/customize-store/assembler-hub/components/device-toolbar.tsx
 plugins/woocommerce-admin/client/customize-store/assembler-hub/components/sidebar.tsx
 plugins/woocommerce-admin/client/customize-store/assembler-hub/utils/select-block-on-hover.ts
 plugins/woocommerce-admin/client/customize-store/assembler-hub/utils/is-tracking-allowed.ts
@@ -8773,6 +8777,7 @@ plugins/woocommerce/tests/php/includes/admin/class-wc-admin-dashboard-setup-test
 plugins/woocommerce/tests/php/includes/admin/class-wc-admin-meta-boxes-test.php
 plugins/woocommerce/tests/php/includes/cli/class-wc-cli-update-command-test.php
 plugins/woocommerce/tests/php/includes/class-wc-auth-test.php
+plugins/woocommerce/tests/php/includes/class-wc-cache-helper-test.php
 plugins/woocommerce/tests/php/includes/class-wc-template-loader-test.php
 plugins/woocommerce/tests/php/includes/rest-api/Controllers/Version1/class-wc-rest-product-attributes-v1-controller-tests.php
 plugins/woocommerce/tests/php/includes/rest-api/Controllers/Version1/class-wc-rest-customer-downloads-v1-controller-tests.php
@@ -9513,8 +9518,10 @@ plugins/woocommerce/license.txt
 plugins/woocommerce/changelog/e2e-fix-cart-checkout-tax-test
 plugins/woocommerce/changelog/fix-cart-token-disable-nonces-42341
 plugins/woocommerce/changelog/add-bump-stats-error
+plugins/woocommerce/changelog/update-e2e-product-editor-create-simple-product
 plugins/woocommerce/changelog/prep-post-release-tasks-9.1.4
 plugins/woocommerce/changelog/fix-49980-overlay-navigation-title-icon
+plugins/woocommerce/changelog/45439-feature-normalize-geolocation-hash
 plugins/woocommerce/changelog/49304-update-express-checkout-layout
 plugins/woocommerce/changelog/add-50231_e2e_description_using_block_editor
 plugins/woocommerce/changelog/dev-speedup-check-asset-sizes-take-3
@@ -9523,6 +9530,7 @@ plugins/woocommerce/changelog/50278-fix-improve_label
 plugins/woocommerce/changelog/add-wcadmin-remote-logging
 plugins/woocommerce/changelog/update-log-directory-init
 plugins/woocommerce/changelog/50157-patch-10
+plugins/woocommerce/changelog/update-enable-remote-logging
 plugins/woocommerce/changelog/50198-patch-13
 plugins/woocommerce/changelog/add-php-mc-stats
 plugins/woocommerce/changelog/49757-dev-remove-unused-imports
@@ -9535,6 +9543,7 @@ plugins/woocommerce/changelog/fix-50112-ux-improvements-core-profiler-checkbox
 plugins/woocommerce/changelog/48843-update-48796-use-createRoot-instead-of-render
 plugins/woocommerce/changelog/fix-wcadmin-react-18-create-root-shippingzones-payment-methods
 plugins/woocommerce/changelog/49803-fix-subscription-activation-with-multiple-subs-for-same-product
+plugins/woocommerce/changelog/dev-codesniffer-validate-psr4-autoloading
 plugins/woocommerce/changelog/46201-product-collection-sync-with-current-query-doesnt-display-the-correct-products-in-the-specific-category-templates
 plugins/woocommerce/changelog/add-49908_track_unit_tests
 plugins/woocommerce/changelog/50348-fix-improve-documentation
@@ -9566,6 +9575,8 @@ plugins/woocommerce/changelog/fix-warning-related-to-customer-meta-field-without
 plugins/woocommerce/changelog/50145-patch-4
 plugins/woocommerce/changelog/dev-49582_use_custom_link_for_sku_error
 plugins/woocommerce/changelog/fix-wcadmin-react-18-create-root
+plugins/woocommerce/changelog/fix-cys-animation
+plugins/woocommerce/changelog/fix-44478
 plugins/woocommerce/changelog/50127-fix-47557-display-address-card-for-virtual-products
 plugins/woocommerce/changelog/49748-49589-new-cys-homepage-tests
 plugins/woocommerce/changelog/48371-frosso-patch-1
@@ -9580,16 +9591,22 @@ plugins/woocommerce/changelog/GIT STATUS
 plugins/woocommerce/changelog/fix-linked-product-timing-issue
 plugins/woocommerce/changelog/50138-fix-show-new-account-nag
 plugins/woocommerce/changelog/fix-43628-view-button-orders-page
+plugins/woocommerce/changelog/fix-classic-template-tests-product-attribute-template
 plugins/woocommerce/changelog/50332-patch-19
 plugins/woocommerce/changelog/fix-pc-max-price-filter-value-inclusion
+plugins/woocommerce/changelog/fix-hpos-diff-prevent-sync-on-read
+plugins/woocommerce/changelog/update-e2e-test-utils-playwright
 plugins/woocommerce/changelog/dev-ci-phpunit-sharding
 plugins/woocommerce/changelog/49648-fix-43603-footer-text-color
+plugins/woocommerce/changelog/add-cys-assembler-zoomed-out-view
 plugins/woocommerce/changelog/fix-page-titles-49798
 plugins/woocommerce/changelog/50016-skip-cys-test-wordpress-version
 plugins/woocommerce/changelog/48937-update-perf-test-my-account-orders-id-boundary
 plugins/woocommerce/changelog/.gitkeep
 plugins/woocommerce/changelog/add-php-remote-error-logging
+plugins/woocommerce/changelog/fix-50167-payment-gateway-suggestions-flaky-unit-test
 plugins/woocommerce/changelog/fix-logout-endpoint-handling-25288
+plugins/woocommerce/changelog/ci-only-run-last-failed-e2e-tests
 plugins/woocommerce/changelog/e2e-remove-github-reporter
 plugins/woocommerce/changelog/move-product-collection
 plugins/woocommerce/changelog/50247-patch-17
@@ -9597,6 +9614,7 @@ plugins/woocommerce/changelog/fix-42328
 plugins/woocommerce/changelog/fix-40589-order-status-color-contrast
 plugins/woocommerce/changelog/fix-payment-settings-remove-save-changes-button
 plugins/woocommerce/changelog/49999-feat-49998-replace-product-filters-block-with-template-part-in-overlay-template-part
+plugins/woocommerce/changelog/update--remove-add-to-cart-from-webpack-entries
 plugins/woocommerce/changelog/add-reactify-offline-wcpay-settings-pages
 plugins/woocommerce/changelog/tests-move-api-tests-into-e2e
 plugins/woocommerce/changelog/50243-patch-14
@@ -9609,7 +9627,7 @@ plugins/woocommerce/changelog/49214-fix-remove-active-shipping-zone-check-cart-p
 plugins/woocommerce/changelog/fix-ci-metrics-job
 plugins/woocommerce/changelog/fix-49578-new-attribute-filter-inspector-settings
 plugins/woocommerce/changelog/49961-update-server-caching-link
-plugins/woocommerce/changelog/update-admin-reset-password
+plugins/woocommerce/changelog/update-pattern-placeholder-image-optimization
 plugins/woocommerce/phpcs.xml
 plugins/woocommerce/.phpunit-watcher.yml
 plugins/woocommerce/sample-data/sample_products.xml