Upstream Merge Conflict (2.4-develop)#67

Merged

Vinai merged 449 commits into2.4-developfrom

2.4-develop-upstream

Dec 5, 2023

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 5, 2023

Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-2127
devarul
committed
ACP2E-2127: Date filter is not working in admin grid.
devarul
committed

Commits on Nov 6, 2023

ACP2E-2404: [Magento Cloud] Bug of product custom option validation in product view page

Sarmistha
authored and
Sarmistha
committed
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-2404

Sarmistha
authored and
Sarmistha
committed
ACP2E-2303: Shipping prices do not include tax in the Shipping Method
devarul
committed
ACPT-1625

aa-kashk
and
andimov
authored
ACP2E-2520: Once Cart Become Virtual Cart after removing physical products it still returns shipping method and address in Cart Quote Graphql response
veloraven
committed
Merge branch '2.4-develop' into ACP2E-2520
veloraven
committed
ACPT-1625

aa-kashk
and
andimov
authored
ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(Image)
o-iegorov
committed
ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(Image)
o-iegorov
committed

Commits on Nov 7, 2023

Commits on Nov 8, 2023

Commits on Nov 9, 2023

Commits on Nov 10, 2023

Commits on Nov 14, 2023

Merge remote-tracking branch 'magento-l3/ACP2E-2357' into 2.4-develop

Sarmistha
authored and
Sarmistha
committed
Merge remote-tracking branch 'magento-l3/ACP2E-2303' into 2.4-develop

Sarmistha
authored and
Sarmistha
committed
Merge remote-tracking branch 'magento-l3/ACP2E-2404' into 2.4-develop

Sarmistha
authored and
Sarmistha
committed
Merge remote-tracking branch 'magento-l3/ACP2E-2481' into 2.4-develop

Sarmistha
authored and
Sarmistha
committed
Merge remote-tracking branch 'magento-l3/ACP2E-2511' into 2.4-develop

Sarmistha
authored and
Sarmistha
committed
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-2267
aplapana
committed
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-2127
devarul
committed
ACP2E-2127: Date filter is not working in admin grid.
devarul
committed
Fix ShowTest
dshevtsov
committed
ACPT-1687: Move State Comparator/Collector into proper place
JacobBrownAustin
committed

Commits on Nov 15, 2023

Commits on Nov 18, 2023

ACPT-1688: Fix Static Tests failures on Application-Server branch
yaroslavGoncharuk
committed

Commits on Nov 19, 2023

Commits on Nov 20, 2023

Commits on Nov 21, 2023

Commits on Nov 23, 2023

Commits on Nov 24, 2023

Commits on Nov 27, 2023

Commits on Nov 28, 2023

Commits on Nov 29, 2023

Commits on Nov 30, 2023

Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-2511

Sarmistha
authored and
Sarmistha
committed
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-2404

Sarmistha
authored and
Sarmistha
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into 2.4-develop

Sarmistha
authored and
Sarmistha
committed
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-2303
devarul
committed
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-2127
devarul
committed
Merge branch '2.4-develop' into MCLOUD-10884-Q4-API-performance-optimizations
magento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-2481

Chhandak.Barua
authored and
Chhandak.Barua
committed
Merge remote-tracking branch 'magento-l3/ACP2E-2127' into Tier4-Kings-PR-11-08-2023

Sarmistha
authored and
Sarmistha
committed
Merge remote-tracking branch 'magento-l3/ACP2E-2303' into Tier4-Kings-PR-11-08-2023

Sarmistha
authored and
Sarmistha
committed
Merge remote-tracking branch 'magento-l3/ACP2E-2357' into Tier4-Kings-PR-11-08-2023

Sarmistha
authored and
Sarmistha
committed
Merge remote-tracking branch 'magento-l3/ACP2E-2404' into Tier4-Kings-PR-11-08-2023

Sarmistha
authored and
Sarmistha
committed
Merge remote-tracking branch 'magento-l3/ACP2E-2511' into Tier4-Kings-PR-11-08-2023

Sarmistha
authored and
Sarmistha
committed
Merge remote-tracking branch 'magento-l3/ACP2E-2481' into Tier4-Kings-PR-11-08-2023

Sarmistha
authored and
Sarmistha
committed

Commits on Dec 1, 2023

Commits on Dec 2, 2023

Commits on Dec 3, 2023

ACPT-1689: Fix Integration Tests failures
andimov
committed

Commits on Dec 4, 2023

Commits on Dec 5, 2023

Merge branch '2.4-develop' into 2.4-develop-upstream
mage-os-ci
authored