Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream Merge Conflict (2.4-develop) #103

Merged
merged 558 commits into from
Oct 1, 2024
Merged

Upstream Merge Conflict (2.4-develop) #103

merged 558 commits into from
Oct 1, 2024
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Aug 29, 2024

  1. ACQE-6901: Create Text Swatch from Stores ->Attributes section: Product 

    Added an element and updated test file
    @glo25731
    glo25731 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    bb21bec View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Merge remote-tracking branch 'origin/2.4-develop' into spartans_pr_29… 

    …082024
    @glo60612
    glo60612 committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    91d2cf9 View commit details
    Browse the repository at this point in the history

  2. AC-12823:Investigate the unit test failure due to phpunit patch updat… 

    …e during component upgrade-Fix unit tests
    @jayrangnani-gl
    jayrangnani-gl committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    f13e9c0 View commit details
    Browse the repository at this point in the history

  3. Merge branch '2.4-develop' into AC-12593-2

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    962500d View commit details
    Browse the repository at this point in the history

  4. LYNX-523: GraphQL: Provide available order actions

    @wip44850
    wip44850 authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    71d43a9 View commit details
    Browse the repository at this point in the history

  5. Merge branch '2.4-develop' into 2.4.8-graphql-api-enhancements

    @svera
    svera authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    c742a57 View commit details
    Browse the repository at this point in the history

  6. ACP2E-3149: Double slashes in customer segment URL

    @lakshmana49
    lakshmana49 committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    381de9e View commit details
    Browse the repository at this point in the history

  7. Merge branch '2.4-develop' into ACP2E-3149

    @lakshmana49
    lakshmana49 committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    9d43830 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1708 from magento-gl/2.4-develop 

    Merge 2.4-develop into AC-12085
    @djadobe16
    djadobe16 authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    7728309 View commit details
    Browse the repository at this point in the history

  9. Merge branch '2.4-develop' into AC-12593-2

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    ac6af9a View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2024

  1. Merge branch '2.4-develop' into 2.4.8-graphql-api-enhancements

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 1, 2024
    Configuration menu
    Copy the full SHA
    a4a0616 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3165' into … 

    …Tier4-Kings-PR-08-23-2024
    @devarul
    devarul committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    01a6ea4 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3166' into … 

    …Tier4-Kings-PR-08-23-2024
    @devarul
    devarul committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    f473ebf View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3178' into … 

    …Tier4-Kings-PR-08-23-2024
    @devarul
    devarul committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    514d2a3 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3253' into … 

    …Tier4-Kings-PR-08-23-2024
    @devarul
    devarul committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    821ddee View commit details
    Browse the repository at this point in the history

  5. Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce … 

    …into ACQE-6897-functional-mainline-deployment
    @manjusha729
    manjusha729 committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    b0c05b4 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ACQE-6710' into ACQE-6897-functional-mainline-deployment

    @manjusha729
    manjusha729 committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    5d299c6 View commit details
    Browse the repository at this point in the history

  7. ACQE-6897 | Mainline Deployment Test Fix

    @manjusha729
    manjusha729 authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    a6d850e View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/2.4-develop' into spartans_pr_29… 

    …082024
    @glo60612
    glo60612 committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    49f189f View commit details
    Browse the repository at this point in the history

  9. ACQE-6897 | Mainline Deployment Test Annotation fix

    @manjusha729
    manjusha729 authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    b535e7e View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1711 from magento-gl/2.4-develop 

    Merge 2.4-develop into AC-12085
    @djadobe16
    djadobe16 authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    b4d9987 View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'hostep/fix-for-issue-37841' into AC-9712

    @glo71317
    glo71317 committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    d28c2a8 View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'origin/2.4-develop' into AC-12715

    @glo71317
    glo71317 committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    a4d414a View commit details
    Browse the repository at this point in the history

  13. ACQE-6897 | Mainline PR Deployment | mftf update

    @manjusha729
    manjusha729 committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    f1a4675 View commit details
    Browse the repository at this point in the history

  14. AC-12823:Investigate the unit test failure due to phpunit patch updat… 

    …e during component upgrade-Fix unit tests
    @jayrangnani-gl
    jayrangnani-gl committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    40f4860 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. ACQE-6915 | Several Terms and Conditions with different types are sho… 

    …wn on PayPal express checkout review page
    “Pavan-bj”  authored and “Pavan-bj”  committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    6674eb0 View commit details
    Browse the repository at this point in the history

  2. ACQE-6915 | Several Terms and Conditions with different types are sho… 

    …wn on PayPal express checkout review page

Added fix for the PR
    “Pavan-bj”  authored and “Pavan-bj”  committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    627987e View commit details
    Browse the repository at this point in the history

  3. ACQE-6915 | Several Terms and Conditions with different types are sho… 

    …wn on PayPal express checkout review page

Added fix for the PR
    “Pavan-bj”  authored and “Pavan-bj”  committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    e931da1 View commit details
    Browse the repository at this point in the history

  4. ACQE-6842 | AC-3857: Verify that customer matches to a segment with … 

    …conditions
    @manjusha729
    manjusha729 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    96ef2b3 View commit details
    Browse the repository at this point in the history

  5. ACQE-6901: Create Text Swatch from Stores ->Attributes section: Product 

    Created AGs and updated those in test file
    @glo25731
    glo25731 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    6902aed View commit details
    Browse the repository at this point in the history

  6. Merge branch '2.4-develop' into tinymce-upgrade

    @engcom-Charlie
    engcom-Charlie authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    e2e7ea7 View commit details
    Browse the repository at this point in the history

  7. Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce … 

    …into ACQE-6742
    @manjusha729
    manjusha729 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    76c63a1 View commit details
    Browse the repository at this point in the history

  8. AC-12823:Investigate the unit test failure due to phpunit patch updat… 

    …e during component upgrade-Fix unit tests
    @jayrangnani-gl
    jayrangnani-gl committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    5d1a851 View commit details
    Browse the repository at this point in the history

  9. ACQE-6901: Create Text Swatch from Stores ->Attributes section: Product 

    Updated test file
    @glo25731
    glo25731 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    f726e48 View commit details
    Browse the repository at this point in the history

  10. ACQE-6897 | Mainline Deployment

    @manjusha729
    manjusha729 authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    0ad2d26 View commit details
    Browse the repository at this point in the history

  11. LYNX-524 - Add customer information to CustomerOrder type

    @cod40403
    cod40403 authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    6c45e1a View commit details
    Browse the repository at this point in the history

  12. ACQE-6897 | Mainline Deployment

    @manjusha729
    manjusha729 authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    d535f4b View commit details
    Browse the repository at this point in the history

  13. AC-12823:Investigate the unit test failure due to phpunit patch updat… 

    …e during component upgrade-Fix unit tests
    @jayrangnani-gl
    jayrangnani-gl committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    486cbf1 View commit details
    Browse the repository at this point in the history

  14. ACP2E-3172: Import button missing

    Chhandak.Barua authored and Chhandak.Barua committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    858a2ce View commit details
    Browse the repository at this point in the history

  15. ACP2E-3273: avoid using toggle / fadeIn / fadeOut as it will generate… 

    … a display none and this in turn impacts the styling for recaptcha
    @alzota
    alzota committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    cbce5fc View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'origin/2.4-develop' into ACP2E-3172

    Chhandak.Barua authored and Chhandak.Barua committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    1a9a738 View commit details
    Browse the repository at this point in the history

  17. AC-12715::Investigate the laminas composer dependencies upgrading to … 

    …latest version
    @djadobe16
    djadobe16 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    b91f7af View commit details
    Browse the repository at this point in the history

  18. Merge remote-tracking branch 'origin/2.4-develop' into AC-12715

    @glo71317
    glo71317 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    d44dbb6 View commit details
    Browse the repository at this point in the history

  19. Merge remote-tracking branch 'origin/2.4-develop' into ACP2E-3172

    Chhandak.Barua authored and Chhandak.Barua committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    f8f7d92 View commit details
    Browse the repository at this point in the history

  20. Merge branch '2.4-develop' into AC-12593-2

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    a054818 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Merge branch '2.4-develop' into ACQE-6897-functional-mainline-deployment

    @manjusha729
    manjusha729 authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    cf81c56 View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.4-develop' of https://github.com/magento-commerce/mag… 

    …ento2ce into Tier4-Kings-PR-08-23-2024
    @devarul
    devarul committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    f66e599 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3149' into … 

    …Tier4-Kings-PR-08-23-2024
    @devarul
    devarul committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    7580be8 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin' into AC-12482

    @jayrangnani-gl
    jayrangnani-gl committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    0d1dc68 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/2.4-develop' into AC-9712

    @glo71317
    glo71317 committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    53a3005 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/AC-11723' into AC-12482

    @jayrangnani-gl
    jayrangnani-gl committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    84d6b4c View commit details
    Browse the repository at this point in the history

  7. ACQE-6901: Create Text Swatch from Stores ->Attributes section: Product 

    Removed extra space in AG and added valuable name parameter for a locator
    @glo25731
    glo25731 committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    c7d32f2 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/AC-12571' into AC-12482

    @jayrangnani-gl
    jayrangnani-gl committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    2d5ea68 View commit details
    Browse the repository at this point in the history

  9. ACQE-6897 | Mainline Deployment

    @manjusha729
    manjusha729 authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    73b8790 View commit details
    Browse the repository at this point in the history

  10. ACQE-6897 | Mainline Deployment

    @manjusha729
    manjusha729 authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    0cf7025 View commit details
    Browse the repository at this point in the history

  11. ACQE-6897 | Mainline Deployment

    @manjusha729
    manjusha729 authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    da6eca1 View commit details
    Browse the repository at this point in the history

  12. ACQE-6897 | Mainline Deployment

    @manjusha729
    manjusha729 authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    56d39e1 View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'origin/2.4-develop' into AC-12085

    @glo71317
    glo71317 committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    d296c4a View commit details
    Browse the repository at this point in the history

  14. AC-12092_PHPUnit10: Providing invalid named argument is deprecated an… 

    …d will not be supported in PHPUnit 11.0
    @manishranjan-adobe
    manishranjan-adobe committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    77a77f9 View commit details
    Browse the repository at this point in the history

  15. AC-12901: Require.js upgrade to the latest version 2.3.7 (security vu… 

    …lnerability CVE-2024-38999)
    @glo17680
    glo17680 committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    7c6aa4d View commit details
    Browse the repository at this point in the history

  16. LYNX-505 - Allow guest to cancel order via GraphQL

    @cod40403
    cod40403 authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    4d60033 View commit details
    Browse the repository at this point in the history

  17. Merge branch '2.4-develop' into 2.4.8-graphql-api-enhancements

    @svera
    svera authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    6e1e229 View commit details
    Browse the repository at this point in the history

  18. Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3103' into … 

    …Tier4-PR-2024-08-05
    @mirceaRosmeteniuc
    mirceaRosmeteniuc committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    cc78d0a View commit details
    Browse the repository at this point in the history

  19. Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3139' into … 

    …Tier4-PR-2024-08-05
    @mirceaRosmeteniuc
    mirceaRosmeteniuc committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    a6131a2 View commit details
    Browse the repository at this point in the history

  20. Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3143' into … 

    …Tier4-PR-2024-08-05
    @mirceaRosmeteniuc
    mirceaRosmeteniuc committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    8cc27f8 View commit details
    Browse the repository at this point in the history

  21. Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3152' into … 

    …Tier4-PR-2024-08-05
    @mirceaRosmeteniuc
    mirceaRosmeteniuc committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    33540a7 View commit details
    Browse the repository at this point in the history

  22. AC-12092_PHPUnit10: Providing invalid named argument is deprecated an… 

    …d will not be supported in PHPUnit 11.0
    @manishranjan-adobe
    manishranjan-adobe committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    f8d5abd View commit details
    Browse the repository at this point in the history

  23. ACP2E-3273: fix static errors

    @alzota
    alzota committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    b5ef62a View commit details
    Browse the repository at this point in the history

  24. ACP2E-3273: update short description

    @alzota
    alzota committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    43c052c View commit details
    Browse the repository at this point in the history

  25. AC-12823:Investigate the unit test failure due to phpunit patch updat… 

    …e during component upgrade-Fix unit tests
    @jayrangnani-gl
    jayrangnani-gl committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    a6bf743 View commit details
    Browse the repository at this point in the history

  26. Merge branch '2.4-develop' of https://github.com/magento-commerce/mag… 

    …ento2ce into ACP2E-3308
    @thiaramus
    thiaramus committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    278b9d6 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. ACQE-6842 | AC-3857: Verify that customer matches to a segment with c… 

    …onditions "Order Address"

Resolved static check error by updating the name
    @manjusha729
    manjusha729 authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    aeb0373 View commit details
    Browse the repository at this point in the history

  2. ACQE-6842 | AC-3857: Verify that customer matches to a segment with c… 

    …onditions "Order Address"
    @manjusha729
    manjusha729 authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    c2ec64f View commit details
    Browse the repository at this point in the history

  3. AC-12092_PHPUnit10: Providing invalid named argument is deprecated an… 

    …d will not be supported in PHPUnit 11.0
    @manishranjan-adobe
    manishranjan-adobe committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    b913c85 View commit details
    Browse the repository at this point in the history

  4. Merge branch '2.4-develop' into AC-12092_PHPUnit10

    @manishranjan-adobe
    manishranjan-adobe committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    2f5bc19 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ACQE-6742' into ACQE-6897-functional-mainline-deployment

    @manjusha729
    manjusha729 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    cb3a73c View commit details
    Browse the repository at this point in the history

  6. Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce … 

    …into ACQE-6901
    @manjusha729
    manjusha729 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    5ad49e3 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'ACQE-6901' into ACQE-6897-functional-mainline-deployment

    @manjusha729
    manjusha729 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    f36111b View commit details
    Browse the repository at this point in the history

  8. AC-3921: Create Text Swatch from Stores ->Attributes section: Product

    @manjusha729
    manjusha729 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    bbd9bbe View commit details
    Browse the repository at this point in the history

  9. ACQE-6915 | StorefrontAssertSeveralTermsAndConditionsOnPayPalExpressC… 

    …heckoutReviewPageTest
    @Pavan-bj
    Pavan-bj authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    e336a5a View commit details
    Browse the repository at this point in the history

  10. ACQE-6842 | AC-3857: Verify that customer matches to a segment with c… 

    …onditions "Order Address"
    @manjusha729
    manjusha729 authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    887ec66 View commit details
    Browse the repository at this point in the history

  11. Merge branch '2.4-develop' into AC-12092_PHPUnit10

    @manishranjan-adobe
    manishranjan-adobe authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    e7b8e98 View commit details
    Browse the repository at this point in the history

  12. AC-9712::Difference in less compilation between php & nodejs library … 

    …(grunt) with complicated calc expressions
    @djadobe16
    djadobe16 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    438f978 View commit details
    Browse the repository at this point in the history

  13. AC-9712::Difference in less compilation between php & nodejs library … 

    …(grunt) with complicated calc expressions
    @djadobe16
    djadobe16 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    78b2c55 View commit details
    Browse the repository at this point in the history

  14. AC-12823: Unit Test fixes

    @nishant04412
    nishant04412 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    510adb6 View commit details
    Browse the repository at this point in the history

  15. AC-12901: Require.js upgrade to the latest version 2.3.7 (security vu… 

    …lnerability CVE-2024-38999)
    @glo17680
    glo17680 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    7302cf1 View commit details
    Browse the repository at this point in the history

  16. AC-12901: Require.js upgrade to the latest version 2.3.7 (security vu… 

    …lnerability CVE-2024-38999)
    @glo17680
    glo17680 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    022bdec View commit details
    Browse the repository at this point in the history

  17. AC-12823:Investigate the unit test failure due to phpunit patch updat… 

    …e during component upgrade-Fix unit tests
    @jayrangnani-gl
    jayrangnani-gl committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    ee3543b View commit details
    Browse the repository at this point in the history

  18. AC-12901: Require.js upgrade to the latest version 2.3.7 (security vu… 

    …lnerability CVE-2024-38999)
    @glo17680
    glo17680 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    9364a98 View commit details
    Browse the repository at this point in the history

  19. Merge branch '2.4-develop' into AC-12593-2

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    549e7e6 View commit details
    Browse the repository at this point in the history

  20. Merge branch '2.4-develop' into ACQE-6897-functional-mainline-deployment

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    be0b1b1 View commit details
    Browse the repository at this point in the history

  21. Merge branch '2.4-develop' of https://github.com/magento-commerce/mag… 

    …ento2ce into Tier4-Kings-PR-08-23-2024
    @devarul
    devarul committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    69929ef View commit details
    Browse the repository at this point in the history

  22. AC-12823: Unit Test fixes

    @nishant04412
    nishant04412 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    9f48e4d View commit details
    Browse the repository at this point in the history

  23. Merge remote-tracking branch 'origin/AC-12715' into AC-12715

    @nishant04412
    nishant04412 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    0fafcd7 View commit details
    Browse the repository at this point in the history

  24. AC-9712::Difference in less compilation between php & nodejs library … 

    …(grunt) with complicated calc expressions
    @djadobe16
    djadobe16 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    1976516 View commit details
    Browse the repository at this point in the history

  25. AC-12901: Require.js upgrade to the latest version 2.3.7 (security vu… 

    …lnerability CVE-2024-38999)
    @glo17680
    glo17680 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    4388248 View commit details
    Browse the repository at this point in the history

  26. AC-12901: Require.js upgrade to the latest version 2.3.7 (security vu… 

    …lnerability CVE-2024-38999)
    @glo17680
    glo17680 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    a37f9f8 View commit details
    Browse the repository at this point in the history

  27. Merge branch '2.4-develop' into Tier4-PR-2024-08-05

    @mirceaRosmeteniuc
    mirceaRosmeteniuc committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    df2a648 View commit details
    Browse the repository at this point in the history

  28. AC-9712::Difference in less compilation between php & nodejs library … 

    …(grunt) with complicated calc expressions
    @djadobe16
    djadobe16 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    33e00f4 View commit details
    Browse the repository at this point in the history

  29. AC-9712::Difference in less compilation between php & nodejs library … 

    …(grunt) with complicated calc expressions
    @djadobe16
    djadobe16 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    9b5f07d View commit details
    Browse the repository at this point in the history

  30. AC-9712::Difference in less compilation between php & nodejs library

    @glo71317
    glo71317 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    5d6f3db View commit details
    Browse the repository at this point in the history

  31. Merge branch 'AC-9712' of github.com:magento-gl/magento2ce into AC-9712

    @glo71317
    glo71317 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    7a69afb View commit details
    Browse the repository at this point in the history

  32. Merge remote-tracking branch 'origin/2.4-develop' into AC-12715

    @glo71317
    glo71317 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    45b0a2b View commit details
    Browse the repository at this point in the history

  33. AC-12715::fixed the static test

    @glo71317
    glo71317 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    b9bd8d0 View commit details
    Browse the repository at this point in the history

  34. AC-12715::Investigate the laminas composer dependencies upgrading to … 

    …latest version
    @glo71317
    glo71317 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    6e88fde View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. AC-12715::Investigate the laminas composer dependencies upgrading to … 

    …latest version
    @glo71317
    glo71317 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    8374ecb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1725 from magento-gl/2.4-develop 

    Merge 2.4-develop into AC-9712
    @djadobe16
    djadobe16 authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    9804246 View commit details
    Browse the repository at this point in the history

  3. AC-12823:Investigate the unit test failure due to phpunit patch updat… 

    …e during component upgrade-Fix unit tests
    @jayrangnani-gl
    jayrangnani-gl committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    7d0d5d0 View commit details
    Browse the repository at this point in the history

  4. Merge branch '2.4-develop' into 2.4.8-graphql-api-enhancements

    @svera
    svera authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    e1b8fa3 View commit details
    Browse the repository at this point in the history

  5. Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce … 

    …into ACQE-6915
    @manjusha729
    manjusha729 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    61d1fd3 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ACQE-6915' into ACQE-6897-functional-mainline-deployment

    @manjusha729
    manjusha729 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    d9475a8 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'ACQE-6897-functional-mainline-deployment' of https://gi… 

    …thub.com/magento-gl/magento2ce into ACQE-6897-functional-mainline-deployment
    @manjusha729
    manjusha729 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    4524dfa View commit details
    Browse the repository at this point in the history

  8. AC-12092_PHPUnit10: Providing invalid named argument is deprecated an… 

    …d will not be supported in PHPUnit 11
    @manishranjan-adobe
    manishranjan-adobe committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    1d1acab View commit details
    Browse the repository at this point in the history

  9. AC-12715::Investigate the laminas composer dependencies upgrading to … 

    …latest version
    @glo71317
    glo71317 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    4860d6a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'AC-12715' of github.com:magento-gl/magento2ce into AC-1… 

    …2715
    @glo71317
    glo71317 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    422d707 View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'origin/2.4-develop' into Hammer-Platefo… 

    …rm-Health-04Sept24
    @glo71317
    glo71317 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    258cbe4 View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'origin/AC-9712' into Hammer-Plateform-H… 

    …ealth-04Sept24
    @glo71317
    glo71317 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    6be8d4e View commit details
    Browse the repository at this point in the history

  13. ACP2E-3273: added jasmine unit test

    @alzota
    alzota committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    b9c8b4a View commit details
    Browse the repository at this point in the history

  14. Merge branch '2.4-develop' of https://github.com/magento-commerce/mag… 

    …ento2ce into ACP2E-3273
    @alzota
    alzota committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    397fe4a View commit details
    Browse the repository at this point in the history

  15. AC-12901: Require.js upgrade to the latest version 2.3.7 (security vu… 

    …lnerability CVE-2024-38999)
    @glo17680
    glo17680 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    e885b2a View commit details
    Browse the repository at this point in the history

  16. AC-12092: Deprecations related to not static functionality removal in… 

    … PHPUnit 10
    Raj Mohan authored and Raj Mohan committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    581c532 View commit details
    Browse the repository at this point in the history

  17. Merge remote-tracking branch 'origin/AC-12715' into Hammer-Plateform-… 

    …Health-04Sept24
    @glo71317
    glo71317 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    bbfc69e View commit details
    Browse the repository at this point in the history

  18. Merge remote-tracking branch 'origin/AC-12901' into Hammer-Plateform-… 

    …Health-04Sept24
    @glo71317
    glo71317 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    c8b40a9 View commit details
    Browse the repository at this point in the history

  19. ACP2E-3273: emulate 'display:none' better avoiding extra white space

    @alzota
    alzota committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    6c9e67b View commit details
    Browse the repository at this point in the history

  20. ACP2E-3172: Import button missing

    Chhandak.Barua authored and Chhandak.Barua committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    2dcdce8 View commit details
    Browse the repository at this point in the history

  21. Merge remote-tracking branch 'origin/2.4-develop' into ACP2E-3172

    Chhandak.Barua authored and Chhandak.Barua committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    b46c1d5 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. ACQE-6897 | Mainline Deployment 

    Test Fix
    @manjusha729
    manjusha729 authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    9f2d97b View commit details
    Browse the repository at this point in the history

  2. ACQE-6897 | Mainline Deployment 

    Test Fix
    @manjusha729
    manjusha729 authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    11322ea View commit details
    Browse the repository at this point in the history

  3. ACQE-6897 | Mainline Deployment

    @manjusha729
    manjusha729 authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    503564f View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. ACQE-6897 | Mainline Deployment 

    Removed extra spaces
    @manjusha729
    manjusha729 authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    52c7f45 View commit details
    Browse the repository at this point in the history

  2. ACQE-6897 | Mainline Deployment 

    Space fix
    @manjusha729
    manjusha729 authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    7926293 View commit details
    Browse the repository at this point in the history

  3. ACQE-6897 | Mainline PR Deployment 

    Alignment Fix
    @manjusha729
    manjusha729 authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    50e976b View commit details
    Browse the repository at this point in the history

  4. ACQE-6897 | Mainline Deployment 

    Removed space
    @manjusha729
    manjusha729 authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    776e853 View commit details
    Browse the repository at this point in the history

  5. AC-12092_PHPUnit10: Providing invalid named argument is deprecated an… 

    …d will not be supported in PHPUnit 11.
    @manishranjan-adobe
    manishranjan-adobe committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    a6d64f2 View commit details
    Browse the repository at this point in the history

  6. Merge branch '2.4-develop' into AC-12482

    @nishant04412
    nishant04412 authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    0cdb20b View commit details
    Browse the repository at this point in the history

  7. ACQE-6966 | [MFTF PR TESTS] StorefrontCashOnDeliveryPaymentForSpecifi… 

    …cCountryTestCest

Added pr_exclude . Will be fixed in the scope of ACQE-6966
    @manjusha729
    manjusha729 authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    403fe7b View commit details
    Browse the repository at this point in the history

  8. ACQE-6795 | Mainline PR deployment 

    Added pr_exclude .Will be fixed in the scope of ACQE-6795
    @manjusha729
    manjusha729 authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    ae2dec6 View commit details
    Browse the repository at this point in the history

  9. Merge branch '2.4-develop' into AC-12092_PHPUnit10

    @manishranjan-adobe
    manishranjan-adobe committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    ca02c06 View commit details
    Browse the repository at this point in the history

  10. AC-9712::Difference in less compilation between php & nodejs library … 

    …(grunt) with complicated calc expressions
    @djadobe16
    djadobe16 committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    1fd8df0 View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'origin/AC-12092_PHPUnit10' into AC-1209… 

    …2_PHPUnit10
    Raj Mohan authored and Raj Mohan committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    cf01c5f View commit details
    Browse the repository at this point in the history

  12. Merge pull request #9173 from magento-gl/ACQE-6897-functional-mainlin… 

    …e-deployment

Bengals | Functional Tests Mainline Deployment
    @internal-magento-queue-manager
    internal-magento-queue-manager[bot] authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    3c83d94 View commit details
    Browse the repository at this point in the history

  13. Merge branch '2.4-develop' into AC-12593-2

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    d71dac8 View commit details
    Browse the repository at this point in the history

  14. Merge branch '2.4-develop' into 2.4.8-graphql-api-enhancements

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    ee252b2 View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'origin/2.4-develop' into Hammer-Platefo… 

    …rm-Health-04Sept24
    @glo71317
    glo71317 committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    bba05f1 View commit details
    Browse the repository at this point in the history

  16. AC-9712::Difference in less compilation between php & nodejs library … 

    …(grunt) with complicated calc expressions
    @djadobe16
    djadobe16 committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    b618ee3 View commit details
    Browse the repository at this point in the history

  17. ACP2E-3172: Import button missing

    Chhandak.Barua authored and Chhandak.Barua committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    0b399cd View commit details
    Browse the repository at this point in the history

  18. Merge branch '2.4-develop' of https://github.com/magento-commerce/mag… 

    …ento2ce into Tier4-Kings-PR-08-23-2024
    @devarul
    devarul committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    19fa937 View commit details
    Browse the repository at this point in the history

  19. ACP2E-3172: Import button missing

    Chhandak.Barua authored and Chhandak.Barua committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    90fdb43 View commit details
    Browse the repository at this point in the history

  20. Merge remote-tracking branch 'origin/2.4-develop' into ACP2E-3172

    Chhandak.Barua authored and Chhandak.Barua committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    1fae05d View commit details
    Browse the repository at this point in the history

  21. AC-9712::Difference in less compilation between php & nodejs library … 

    …(grunt) with complicated calc expressions
    @djadobe16
    djadobe16 committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    96cd829 View commit details
    Browse the repository at this point in the history

  22. Merge remote-tracking branch 'origin/2.4-develop' into ACP2E-3131 

    # Conflicts:
#	app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
    @arnobsh
    arnobsh committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    dc1001d View commit details
    Browse the repository at this point in the history

  23. Merge branch '2.4-develop' into Tier4-PR-2024-08-05

    @mirceaRosmeteniuc
    mirceaRosmeteniuc committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    ca5531d View commit details
    Browse the repository at this point in the history

  24. Merge branch '2.4-develop' into AC-12482

    @nishant04412
    nishant04412 authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    9492591 View commit details
    Browse the repository at this point in the history

  25. ACP2E-3131: [Cloud] Anchor/Non-Anchor Categories Reversed in Content … 

    …Widget

- Fix for default category
    @arnobsh
    arnobsh committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    b2ecc62 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #9148 from magento-cia/AC-12593-2 

    AC-12589: Implement CLI command to generate new encryption key
    @dvoskoboinikov
    dvoskoboinikov authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    0cfe4a3 View commit details
    Browse the repository at this point in the history

  27. Merge branch '2.4-develop' into 2.4.8-graphql-api-enhancements

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    a7d43ce View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Merge branch '2.4-develop' into Tier4-Kings-PR-08-23-2024

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    df96d36 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1733 from magento-gl/2.4-develop 

    Merge 2.4-develop into AC-9712
    @djadobe16
    djadobe16 authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    d1c51dc View commit details
    Browse the repository at this point in the history

  3. Merge branch '2.4-develop' into Tier4-PR-2024-08-05

    @mirceaRosmeteniuc
    mirceaRosmeteniuc committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    fa190d5 View commit details
    Browse the repository at this point in the history

  4. AC-12092 Magento Framework PHPUnit10 Fixes

    Raj Mohan authored and Raj Mohan committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    ca90622 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/2.4-develop' into ACP2E-3172

    Chhandak.Barua authored and Chhandak.Barua committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    54c5416 View commit details
    Browse the repository at this point in the history

  6. LYNX-512: original_item_price is not including discounts

    @sumesh-GL
    sumesh-GL authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    2261e6c View commit details
    Browse the repository at this point in the history

  7. LYNX-519 : Error codes for order cancellation

    @wip44850
    wip44850 authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    750dab4 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/2.4-develop' into Hammer-Platefo… 

    …rm-Health-04Sept24
    @glo71317
    glo71317 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    882c1ba View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/AC-9712' into Hammer-Plateform-H… 

    …ealth-04Sept24
    @glo71317
    glo71317 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    03754be View commit details
    Browse the repository at this point in the history

  10. Check impact of paste and noeditable plugin removal

    @djadobe16
    djadobe16 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    09aa203 View commit details
    Browse the repository at this point in the history

  11. Acqe 7010 mftf thirdparty test pr exclude (#1744) 

    * ACQE-7010: [MFTF Tests] Add payment related third party test in pr exclude
    @mohit-adobe
    mohit-adobe authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    08ae888 View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'origin/2.4-develop' into AC-12715

    @glo71317
    glo71317 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    66b6e08 View commit details
    Browse the repository at this point in the history

  13. AC-12715::Update the magento-coding-standard version

    @glo71317
    glo71317 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    7af3c46 View commit details
    Browse the repository at this point in the history

  14. Check impact of paste and noeditable plugin removal

    @glo71317
    glo71317 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    ea4e217 View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'origin/AC-12715' into Hammer-Plateform-… 

    …Health-04Sept24
    @glo71317
    glo71317 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    20b80b7 View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'origin/TinyMCE7' into Hammer-Plateform-… 

    …Health-04Sept24
    @glo71317
    glo71317 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    c36e780 View commit details
    Browse the repository at this point in the history

  17. AC-12951::Remove from files from tinymce 7

    @glo71317
    glo71317 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    2c4b798 View commit details
    Browse the repository at this point in the history

  18. Merge remote-tracking branch 'origin/TinyMCE7' into Hammer-Plateform-… 

    …Health-04Sept24
    @glo71317
    glo71317 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    cd3f055 View commit details
    Browse the repository at this point in the history

  19. Merge remote-tracking branch 'AntonEvers/tinymce-upgrade' into TinyMCE7

    @glo71317
    glo71317 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    2178c08 View commit details
    Browse the repository at this point in the history

  20. AC-12092_PHPUnit10: PHPUnit10 Fixes for Magento Framework Modules

    Raj Mohan authored and Raj Mohan committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    6c54ac2 View commit details
    Browse the repository at this point in the history

  21. ACP2E-3131: [Cloud] Anchor/Non-Anchor Categories Reversed in Content … 

    …Widget

- Fix for default category
    @arnobsh
    arnobsh committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    f979b85 View commit details
    Browse the repository at this point in the history

  22. Merge remote-tracking branch 'origin/TinyMCE7' into Hammer-Plateform-… 

    …Health-04Sept24
    @glo71317
    glo71317 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    690a222 View commit details
    Browse the repository at this point in the history

  23. Merge remote-tracking branch 'origin/2.4-develop' into ACP2E-3131

    @arnobsh
    arnobsh committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    0e6bad0 View commit details
    Browse the repository at this point in the history

  24. ACP2E-3131: [Cloud] Anchor/Non-Anchor Categories Reversed in Content … 

    …Widget

- Fix for default category
    @arnobsh
    arnobsh committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    024a648 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #9262 from magento-gl/ACQE-7010-mftf-third-party-t… 

    …est-pr-exclude

[Bengals] ACQE-7010: Add mftf third party test in pr exclude
    @sidolov
    sidolov authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    d06337a View commit details
    Browse the repository at this point in the history

  26. Merge remote-tracking branch 'origin/2.4-develop' into Hammer-Platefo… 

    …rm-Health-04Sept24
    @glo71317
    glo71317 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    efdf631 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Merge branch '2.4-develop' into AC-12482

    @nishant04412
    nishant04412 authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    3c0cf62 View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.4-develop' of https://github.com/magento-commerce/mag… 

    …ento2ce into Tier4-Kings-PR-08-23-2024
    @devarul
    devarul committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    d382b03 View commit details
    Browse the repository at this point in the history

  3. AC-12092_PHPUnit10: Providing invalid named argument is deprecated an… 

    …d will not be supported in PHPUnit 11.
    @manishranjan-adobe
    manishranjan-adobe committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    e26fb73 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/2.4-develop' into spartans_pr_29… 

    …082024
    @glo60612
    glo60612 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    64a5b5f View commit details
    Browse the repository at this point in the history

  5. AC-12092_PHPUnit10: PHPUnit10.5 Deprecation Fixes Framework App, Cach… 

    …e, Code, Validator Modules
    Raj Mohan authored and Raj Mohan committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    0762bcb View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/AC-12092_PHPUnit10' into AC-1209… 

    …2_PHPUnit10
    Raj Mohan authored and Raj Mohan committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    a6d7473 View commit details
    Browse the repository at this point in the history

  7. Merge branch '2.4-develop' into Tier4-PR-2024-08-05

    @mirceaRosmeteniuc
    mirceaRosmeteniuc committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    1cb7f4a View commit details
    Browse the repository at this point in the history

  8. Merge branch '2.4-develop' into 2.4.8-graphql-api-enhancements

    @bl4de
    bl4de authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    0fbfc39 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #9202 from adobe-commerce-tier-4/Tier4-Kings-PR-08… 

    …-23-2024

[Support Tier-4-Kings glo02433] 08.23.2024 Regular delivery of bugfixes and improvements
    @dhorytskyi
    dhorytskyi authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    8459b17 View commit details
    Browse the repository at this point in the history

  10. Merge branch '2.4-develop' into spartans_pr_29082024

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    97d78d1 View commit details
    Browse the repository at this point in the history

  11. Merge branch '2.4-develop' into AC-12482

    @nishant04412
    nishant04412 authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    7aa3a0e View commit details
    Browse the repository at this point in the history

  12. Merge branch '2.4-develop' into Tier4-PR-2024-08-05

    @mirceaRosmeteniuc
    mirceaRosmeteniuc committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    0eac79f View commit details
    Browse the repository at this point in the history

  13. Merge pull request #9213 from magento-gl/AC-12482 

    [Arrows] Platform Health Delivery
    @sidolov
    sidolov authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    0611e75 View commit details
    Browse the repository at this point in the history

  14. Merge branch '2.4-develop' into spartans_pr_29082024

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    823a966 View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'origin/2.4-develop' into Hammer-Platefo… 

    …rm-Health-04Sept24
    @glo71317
    glo71317 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    7761a2e View commit details
    Browse the repository at this point in the history

  16. AC-12092_PHPUnit10: PHP Unit 10 Deprecation Fixes For Framework DB, D… 

    …ata, Encryption, Profiler, Validator Modules
    Raj Mohan authored and Raj Mohan committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    36752e2 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #9219 from magento-gl/spartans_pr_29082024 

    [Spartans] Bugfixes Delivery
    @sidolov
    sidolov authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    44cef3a View commit details
    Browse the repository at this point in the history

  18. Merge branch '2.4-develop' into Tier4-PR-2024-08-05

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    e0be428 View commit details
    Browse the repository at this point in the history

  19. Merge remote-tracking branch 'origin/2.4-develop' into Hammer-Platefo… 

    …rm-Health-04Sept24
    @glo71317
    glo71317 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    9656b96 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Merge pull request #9236 from magento-gl/Hammer-Plateform-Health-04Se… 

    …pt24

Hammer plateform health 04 sept24
    @sidolov
    sidolov authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    b34c0a7 View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.4-develop' into Tier4-PR-2024-08-05

    @mirceaRosmeteniuc
    mirceaRosmeteniuc committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    4b92b75 View commit details
    Browse the repository at this point in the history

  3. LYNX-536:orders/date_of_first_order always returning null

    @wip44850
    wip44850 authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    9a698ee View commit details
    Browse the repository at this point in the history

  4. LYNX-544: Customer must not be able to cancel a partially shipped order

    @wip44850
    wip44850 authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    5887e33 View commit details
    Browse the repository at this point in the history

  5. Merge branch '2.4-develop' into 2.4.8-graphql-api-enhancements

    @svera
    svera authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    ea222bc View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ACP2E-3236' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into PR-08-29-2024
    @chittima
    chittima committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    3c6c9a5 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'ACP2E-3183' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into PR-08-29-2024
    @chittima
    chittima committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    ee74fcc View commit details
    Browse the repository at this point in the history

  8. Merge branch 'ACP2E-3063-2' of https://github.com/adobe-commerce-tier… 

    …-4/magento2ce into PR-08-29-2024
    @chittima
    chittima committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    13e95ea View commit details
    Browse the repository at this point in the history

  9. Merge branch 'ACP2E-3176' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into PR-08-29-2024
    @chittima
    chittima committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    772140e View commit details
    Browse the repository at this point in the history

  10. Merge branch 'ACP2E-3208' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into PR-08-29-2024
    @chittima
    chittima committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    25d77b8 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'ACP2E-3211' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into PR-08-29-2024
    @chittima
    chittima committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    3ca04a5 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #9221 from adobe-commerce-tier-4/PR-08-29-2024 

    [Support Tier-4 chittima] 08-29-2024 Regular delivery of bugfixes and improvements
    @dhorytskyi
    dhorytskyi authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    66dea0d View commit details
    Browse the repository at this point in the history

  13. Merge branch '2.4-develop' into 2.4.8-graphql-api-enhancements

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    d190dff View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. ACP2E-3248: update en_US.csv with missing translatable lines

    @alzota
    alzota committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    180687e View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.4-develop' into Tier4-PR-2024-08-05

    @mirceaRosmeteniuc
    mirceaRosmeteniuc committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    f587a16 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #9175 from magento-lynx/2.4.8-graphql-api-enhancem… 

    …ents
    @svera
    svera authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    ea32163 View commit details
    Browse the repository at this point in the history

  4. Merge branch '2.4-develop' into Tier4-PR-2024-08-05

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    583e1a5 View commit details
    Browse the repository at this point in the history

  5. AC-12092_PHPUnit10: PHP Unit10 Deprecation Fixes for Framework Code, … 

    …Jwt and Test Modules
    Raj Mohan authored and Raj Mohan committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    9ee118c View commit details
    Browse the repository at this point in the history

  6. Merge branch '2.4-develop' into AC-12092_PHPUnit10

    @cod43156
    cod43156 authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    6385d42 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'ACP2E-3248' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into Tier4-09-12-2024
    @thiaramus
    thiaramus committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    e3e8224 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'ACP2E-3308' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into Tier4-09-12-2024
    @thiaramus
    thiaramus committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    92c8c57 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'ACP2E-3273' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into Tier4-09-12-2024
    @thiaramus
    thiaramus committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    c4e2a58 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'ACP2E-3189' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into Tier4-09-12-2024
    @thiaramus
    thiaramus committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    0f767ef View commit details
    Browse the repository at this point in the history

  11. Merge branch 'ACP2E-3163' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into Tier4-09-12-2024
    @thiaramus
    thiaramus committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    30b974a View commit details
    Browse the repository at this point in the history

  12. Merge branch 'ACP2E-3131' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into Tier4-09-12-2024
    @thiaramus
    thiaramus committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    29f38a1 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'ACP2E-2139' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into Tier4-09-12-2024
    @thiaramus
    thiaramus committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    1503c06 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #9234 from adobe-commerce-tier-4/Tier4-PR-2024-08-05 

    [Support Tier-4 mrosmeteniuc] 08-05-2024 Regular delivery of bugfixes and improvements
    @dhorytskyi
    dhorytskyi authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    d01ee51 View commit details
    Browse the repository at this point in the history

  15. Merge branch '2.4-develop' into Tier4-09-12-2024

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    6767f2c View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. AC-12092_PHPUnit10: Merge 2.4-develop

    Raj Mohan authored and Raj Mohan committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    da850b9 View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.4-develop' of https://github.com/magento-commerce/mag… 

    …ento2ce into ACP2E-3038
    @alzota
    alzota committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    11555ef View commit details
    Browse the repository at this point in the history

  3. AC-12092_PHPUnit10: Conflict Fixes

    Raj Mohan authored and Raj Mohan committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    ed0bc69 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ACP2E-3038' of https://github.com/adobe-commerce-tier-4… 

    …/magento2ce into Tier4-09-12-2024
    @thiaramus
    thiaramus committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    eb75cf7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'Tier4-09-12-2024' of https://github.com/adobe-commerce-… 

    …tier-4/magento2ce into Tier4-09-12-2024
    @thiaramus
    thiaramus committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    c13a3ca View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. AC-12092_PHPUnit10: phpcs issue fix

    @manishranjan-adobe
    manishranjan-adobe committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    5f93ccc View commit details
    Browse the repository at this point in the history

  2. AC-12092_PHPUnit10: PHPUnit Error fix

    @manishranjan-adobe
    manishranjan-adobe committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    cca6908 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #9268 from adobe-commerce-tier-4/Tier4-09-12-2024 

    Tier 4 PR Delivery 09-12-2024
    @dhorytskyi
    dhorytskyi authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    7377de5 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. AC-12092_PHPUnit10: Not Static Deprecation Fixes forWidget Module

    Raj Mohan authored and Raj Mohan committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    424ad2a View commit details
    Browse the repository at this point in the history

  2. AC-12092_PHPUnit10: Fixed Risky testcase issues

    @manishranjan-adobe
    manishranjan-adobe committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    c3b7947 View commit details
    Browse the repository at this point in the history

  3. AC-12092_PHPUnit10: PHPUnit Deprecation Error Fixes

    Raj Mohan authored and Raj Mohan committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    13d3e59 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/AC-12092_PHPUnit10' into AC-1209… 

    …2_PHPUnit10
    Raj Mohan authored and Raj Mohan committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    6673030 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. AC-12092_PHPUnit10: Failure Fix for CatalogInventory Module

    Raj Mohan authored and Raj Mohan committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    1867abc View commit details
    Browse the repository at this point in the history

  2. Revert "AC-12092_PHPUnit10: Fixed Risky testcase issues" 

    This reverts commit c3b7947.
    @manishranjan-adobe
    manishranjan-adobe committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    4ef3660 View commit details
    Browse the repository at this point in the history

  3. AC-12092_PHPUnit10: PHPUnit Failure fix

    @manishranjan-adobe
    manishranjan-adobe committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    306a9f2 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/AC-12092_PHPUnit10' into Arrows_… 

    …Delivery_07162024
    @nishant04412
    nishant04412 committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    0e66a0d View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/2.4-develop' into Arrows_Deliver… 

    …y_07162024
    @nishant04412
    nishant04412 committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    e0176eb View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Merge pull request #9086 from magento-gl/Arrows_Delivery_07162024 

    [Arrows] Delivery of PHPUnit 10 Deprecations removal
    @sidolov
    sidolov authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    249c371 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3172' into … 

    …Tier4-Kings-PR-09-27-2024
    @glo23503
    glo23503 committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    f70a20e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #9281 from adobe-commerce-tier-4/Tier4-Kings-PR-09… 

    …-27-2024

[Support Tier-4-Kings glo23503] 09.27.2024 Regular delivery of bugfixes and improvements
    @internal-magento-queue-manager
    internal-magento-queue-manager[bot] authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    1819fe7 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge branch '2.4-develop' into 2.4-develop-upstream

    @rhoerr
    rhoerr authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    f128554 View commit details
    Browse the repository at this point in the history