Upstream Merge Conflict (2.4-develop)#106

Merged

fballiano merged 674 commits into2.4-developfrom

2.4-develop-upstream

Oct 29, 2024

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

Commits on Sep 5, 2024

ACQE-6842 | AC-3857: Verify that customer matches to a segment with conditions "Order Address"
manjusha729
authored
ACQE-6842 | AC-3857: Verify that customer matches to a segment with conditions "Order Address"
manjusha729
authored
AC-12092_PHPUnit10: Providing invalid named argument is deprecated and will not be supported in PHPUnit 11.0
manishranjan-adobe
committed
Merge branch '2.4-develop' into AC-12092_PHPUnit10
manishranjan-adobe
committed
Merge branch 'ACQE-6742' into ACQE-6897-functional-mainline-deployment
manjusha729
committed
Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce into ACQE-6901
manjusha729
committed
Merge branch 'ACQE-6901' into ACQE-6897-functional-mainline-deployment
manjusha729
committed
AC-3921: Create Text Swatch from Stores ->Attributes section: Product
manjusha729
committed
ACQE-6915 | StorefrontAssertSeveralTermsAndConditionsOnPayPalExpressCheckoutReviewPageTest
Pavan-bj
authored
ACQE-6842 | AC-3857: Verify that customer matches to a segment with conditions "Order Address"
manjusha729
authored
Merge branch '2.4-develop' into AC-12092_PHPUnit10
manishranjan-adobe
authored
AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions
djadobe16
committed
AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions
djadobe16
committed
AC-12823: Unit Test fixes
nishant04412
committed
AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999)
glo17680
committed
AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999)
glo17680
committed
AC-12823:Investigate the unit test failure due to phpunit patch update during component upgrade-Fix unit tests
jayrangnani-gl
committed
AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999)
glo17680
committed
Merge branch '2.4-develop' into AC-12593-2
magento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into ACQE-6897-functional-mainline-deployment
magento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into Tier4-Kings-PR-08-23-2024
devarul
committed
AC-12823: Unit Test fixes
nishant04412
committed
Merge remote-tracking branch 'origin/AC-12715' into AC-12715
nishant04412
committed
AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions
djadobe16
committed
AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999)
glo17680
committed
AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999)
glo17680
committed
Merge branch '2.4-develop' into Tier4-PR-2024-08-05
mirceaRosmeteniuc
committed
AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions
djadobe16
committed
AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions
djadobe16
committed
AC-9712::Difference in less compilation between php & nodejs library
glo71317
committed
Merge branch 'AC-9712' of github.com:magento-gl/magento2ce into AC-9712
glo71317
committed
Merge remote-tracking branch 'origin/2.4-develop' into AC-12715
glo71317
committed
Merge remote-tracking branch 'act4/2.4-develop' into ACP2E-3247
o-iegorov
committed
AC-12715::fixed the static test
glo71317
committed
AC-12715::Investigate the laminas composer dependencies upgrading to latest version
glo71317
committed

Commits on Sep 6, 2024

Commits on Sep 7, 2024

Commits on Sep 9, 2024

Commits on Sep 10, 2024

Commits on Sep 11, 2024

Commits on Sep 12, 2024

Commits on Sep 13, 2024

Commits on Sep 16, 2024

Commits on Sep 18, 2024

Commits on Sep 19, 2024

AC-12092_PHPUnit10: Not Static Deprecation Fixes forWidget Module

Raj Mohan
authored and
Raj Mohan
committed
LYNX-542: Change updateCartItems mutation response (#291)
sumesh-GL
authored
Merge remote-tracking branch 'act4/2.4-develop' into ACP2E-3230
o-iegorov
committed
AC-12092_PHPUnit10: Fixed Risky testcase issues
manishranjan-adobe
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-948
dhorytskyi
committed
AC-12092_PHPUnit10: PHPUnit Deprecation Error Fixes

Raj Mohan
authored and
Raj Mohan
committed
Merge remote-tracking branch 'origin/AC-12092_PHPUnit10' into AC-12092_PHPUnit10

Raj Mohan
authored and
Raj Mohan
committed
Merge remote-tracking branch 'act4/2.4-develop' into ACP2E-3247
o-iegorov
committed

Commits on Sep 23, 2024

Commits on Sep 25, 2024

Commits on Sep 27, 2024

Commits on Sep 30, 2024

Merge branch '2.4-develop' into 2.4.8-graphql-api-enhancements
svera
authored

Commits on Oct 2, 2024

Commits on Oct 7, 2024

Merge pull request #9288 from adobe-commerce-tier-4/PR-10-04-24
dhorytskyi
authored

Commits on Oct 21, 2024