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) #65

Merged
merged 450 commits into from
Dec 5, 2023
Merged

Upstream Merge Conflict (2.4-develop) #65

merged 450 commits into from
Dec 5, 2023
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Nov 3, 2023

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

    …ento2ce into ACP2E-2267
    @aplapana
    aplapana committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    a58fe76 View commit details
    Browse the repository at this point in the history

  2. ACPT-1551 Modularity of ReloadProcessor::reloadApplicationState

    @aa-kashk
    aa-kashk committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    ca44b1a View commit details
    Browse the repository at this point in the history

  3. ACP2E-2267: The requested qty is not available message issues 

    -addressed static
    @aplapana
    aplapana committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    c3aa0a5 View commit details
    Browse the repository at this point in the history

  4. ACPT-1625

    @aa-kashk
    aa-kashk committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    7750077 View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2469
    Anna Bukatar committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    c32b015 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2023

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

    …into ACP2E-2127
    @devarul
    devarul committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    38d01fd View commit details
    Browse the repository at this point in the history

  2. ACP2E-2127: Date filter is not working in admin grid. 

     - Fixed the CR comments.
    @devarul
    devarul committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    9f57557 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. ACP2E-2404: [Magento Cloud] Bug of product custom option validation i… 

    …n product view page
    Sarmistha authored and Sarmistha committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    269e534 View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2404
    Sarmistha authored and Sarmistha committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    a58f4c4 View commit details
    Browse the repository at this point in the history

  3. ACP2E-2303: Shipping prices do not include tax in the Shipping Method 

     - Fixed the issue and added the test coverage.
    @devarul
    devarul committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    348a66f View commit details
    Browse the repository at this point in the history

  4. ACPT-1625 

    Co-authored-by: Andrii Dimov <[email protected]>
    @aa-kashk @andimov
    aa-kashk and andimov authored Nov 6, 2023
    Configuration menu
    Copy the full SHA
    c74824e View commit details
    Browse the repository at this point in the history

  5. ACP2E-2520: Once Cart Become Virtual Cart after removing physical pro… 

    …ducts it still returns shipping method and address in Cart Quote Graphql response
    @veloraven
    veloraven committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    f3b7c81 View commit details
    Browse the repository at this point in the history

  6. Merge branch '2.4-develop' into ACP2E-2520

    @veloraven
    veloraven committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    c5628dd View commit details
    Browse the repository at this point in the history

  7. ACPT-1625 

    Co-authored-by: Andrii Dimov <[email protected]>
    @aa-kashk @andimov
    aa-kashk and andimov authored Nov 6, 2023
    Configuration menu
    Copy the full SHA
    de8fe82 View commit details
    Browse the repository at this point in the history

  8. ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(… 

    …Image)
    @o-iegorov
    o-iegorov committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    548789b View commit details
    Browse the repository at this point in the history

  9. ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(… 

    …Image)
    @o-iegorov
    o-iegorov committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    2b0c8fe View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. Merge pull request #565 from magento-performance/ACPT-1589 

    ACPT-1589: Add GraphQL P1 queries to GraphQlStateTest
    @andimov
    andimov authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    dcf0e0b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/AC-9313' into spartans_pr_07112023

    @glo60612
    glo60612 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    1f0b3e0 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/AC-9027' into spartans_pr_07112023

    @glo60612
    glo60612 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    32189da View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/AC-8998' into spartans_pr_07112023

    @glo60612
    glo60612 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    cde4ea3 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/AC-8795' into spartans_pr_07112023

    @glo60612
    glo60612 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    57c0c33 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/AC-7099-v4' into spartans_pr_071… 

    …12023
    @glo60612
    glo60612 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    a795230 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/AC-1477' into spartans_pr_07112023

    @glo60612
    glo60612 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    8bb0c22 View commit details
    Browse the repository at this point in the history

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

    …112023
    @glo60612
    glo60612 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    5e0d192 View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2127
    @devarul
    devarul committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    e03bc48 View commit details
    Browse the repository at this point in the history

  10. ACP2E-2127: Date filter is not working in admin grid. 

     - Added the different solution.
    @devarul
    devarul committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    55da81c View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2303
    @devarul
    devarul committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    3b2af91 View commit details
    Browse the repository at this point in the history

  12. ACP2E-2303: Shipping prices do not include tax in the Shipping Method 

     - Added the test coverage.
    @devarul
    devarul committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    cc4e0b1 View commit details
    Browse the repository at this point in the history

  13. AC-2917::Migration from extjs library for pages catalog/category/tree… 

    ….phtml in Magento_Catalog Module - Implemented category tree

AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Implemented Category move, edit and other functionalities

AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Fix Functional tests failure

AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Fix Functional tests failure

AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Fix Static Test Failure

AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Code review comment fixes

AC-2917::Bugfix reported in AC-10090

AC-2917::Fixed some irregularities in category tree
    @Atul-glo35265
    Atul-glo35265 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    67f1b8f View commit details
    Browse the repository at this point in the history

  14. AC-2917 conflict resolve

    @Atul-glo35265
    Atul-glo35265 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    4fb74ce View commit details
    Browse the repository at this point in the history

  15. Merge branch 'magento-commerce:2.4-develop' into extjs-jira-ac-9320

    @nishant04412
    nishant04412 authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    d9cdefc View commit details
    Browse the repository at this point in the history

  16. ACP2E-2267: The requested qty is not available message issues 

    - probing solution
    @aplapana
    aplapana committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    1f99ad8 View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2267
    @aplapana
    aplapana committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    ac4f101 View commit details
    Browse the repository at this point in the history

  18. ACP2E-2267: The requested qty is not available message issues 

    - addressed static
    @aplapana
    aplapana committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    8e0a404 View commit details
    Browse the repository at this point in the history

  19. ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(… 

    …Image)
    @o-iegorov
    o-iegorov committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    92ee679 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'application-server' of github.com:magento-performance/m… 

    …agento2ce into ACPT-1634
    @JacobBrownAustin
    JacobBrownAustin committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    2bb12c4 View commit details
    Browse the repository at this point in the history

  21. ACP2E-2495: Promocode is not getting released for payment failed with… 

    … order cancel
    @dhorytskyi
    dhorytskyi committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    19738a7 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. ACP2E-2267: The requested qty is not available message issues 

    - addressed static
    @aplapana
    aplapana committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    2118964 View commit details
    Browse the repository at this point in the history

  2. AC-9713:Upgrade Less Library(fix issue for grunt less:luma)

    @glo17680
    glo17680 committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    fe17ac2 View commit details
    Browse the repository at this point in the history

  3. ACP2E-2127: Date filter is not working in admin grid. 

     - Fixed the workaround solution.
    @devarul
    devarul committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    369aff2 View commit details
    Browse the repository at this point in the history

  4. ACPT-1669: GraphQl\Config & Search\Request\Config need to be cleaned … 

    …when attributes change

Magento\Framework\GraphQl\Config and Magento\Framework\Search\Request both use only the default cache tags (MAGE & CONFIG).  Because both of those configurations have data that comes from the current attributes,  when attributes change, they need to be invalidated/cleaned.  Therefore,  they need to have the EAV tag added to them.
    @JacobBrownAustin
    JacobBrownAustin committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    4cd3fbf View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ACPT-1634' into ACPT-1660-and-ACPT-1634

    @JacobBrownAustin
    JacobBrownAustin committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    67d0a93 View commit details
    Browse the repository at this point in the history

  6. ACPT-1669: GraphQl\Config & Search\Request\Config need to be cleaned … 

    …when attributes change

Magento\Framework\GraphQl\Config and Magento\Framework\Search\Request both use only the default cache tags (MAGE & CONFIG).  Because both of those configurations have data that comes from the current attributes,  when attributes change, they need to be invalidated/cleaned.  Therefore,  they need to have the EAV tag added to them.
    @JacobBrownAustin
    JacobBrownAustin committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    fe5fae9 View commit details
    Browse the repository at this point in the history

  7. ACP2E-2267: The requested qty is not available message issues 

    - implemented different solution
    @aplapana
    aplapana committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    3888862 View commit details
    Browse the repository at this point in the history

  8. ACP2E-2520: Once Cart Become Virtual Cart after removing physical pro… 

    …ducts it still returns shipping method and address in Cart Quote Graphql response
    @veloraven
    veloraven committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    2100cc7 View commit details
    Browse the repository at this point in the history

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

    …ento2ce into ACP2E-2495
    @dhorytskyi
    dhorytskyi committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    7a90710 View commit details
    Browse the repository at this point in the history

  10. ACP2E-2495: Promocode is not getting released for payment failed with… 

    … order cancel
    @dhorytskyi
    dhorytskyi committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    5441ed6 View commit details
    Browse the repository at this point in the history

  11. ACP2E-2520: Once Cart Become Virtual Cart after removing physical pro… 

    …ducts it still returns shipping method and address in Cart Quote Graphql response
    @veloraven
    veloraven committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    f36f0fd View commit details
    Browse the repository at this point in the history

  12. Merge branch '2.4-develop' into ACP2E-2520

    @veloraven
    veloraven committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    569fdf2 View commit details
    Browse the repository at this point in the history

  13. ACP2E-2520: Once Cart Become Virtual Cart after removing physical pro… 

    …ducts it still returns shipping method and address in Cart Quote Graphql response
    @veloraven
    veloraven committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    5e501ba View commit details
    Browse the repository at this point in the history

  14. ACPT-1679: Skip failing WebApi GraphQL tests 

    fixing in ACPT-1660
    @JacobBrownAustin
    JacobBrownAustin committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    ee2f6b4 View commit details
    Browse the repository at this point in the history

  15. ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not s… 

    …howing in Media Gallery when upload both lowercase and uppercase image with same name)
    @thiaramus
    thiaramus committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    3088085 View commit details
    Browse the repository at this point in the history

  16. ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(… 

    …Image)
    @o-iegorov
    o-iegorov committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    71e6a30 View commit details
    Browse the repository at this point in the history

  17. ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(… 

    …Image)
    @o-iegorov
    o-iegorov committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    2bd3e58 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Merge branch 'magento-commerce:2.4-develop' into ACP2E-2595

    @o-iegorov
    o-iegorov authored Nov 9, 2023
    Configuration menu
    Copy the full SHA
    31c9a56 View commit details
    Browse the repository at this point in the history

  2. AC-9713:Upgrade Less Library(fix static test failures)

    @glo17680
    glo17680 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    c352f29 View commit details
    Browse the repository at this point in the history

  3. AC-9653::UPS SOAP and REST support in 2.4.7-beta3-code review fixes o… 

    …n copyright text update
    @glo05363
    glo05363 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    cec737f View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2127
    @devarul
    devarul committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    8e7cae2 View commit details
    Browse the repository at this point in the history

  5. ACP2E-2127: Date filter is not working in admin grid. 

     - Fixed the different workaround solution.
    @devarul
    devarul committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    29389d0 View commit details
    Browse the repository at this point in the history

  6. ACP2E-2127: Date filter is not working in admin grid. 

     - Fixed the different workaround solution.
    @devarul
    devarul committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    fcbf36a View commit details
    Browse the repository at this point in the history

  7. ACP2E-2127: Date filter is not working in admin grid. 

     - Fixed the different workaround solution.
    @devarul
    devarul committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    cbb44f9 View commit details
    Browse the repository at this point in the history

  8. ACP2E-2127: Date filter is not working in admin grid. 

     - Removed the Timezone.php file.
    @devarul
    devarul committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    90cc520 View commit details
    Browse the repository at this point in the history

  9. Merge branch '2.4-develop' into UPS_AC9653_OCT_22_2023

    @glo05363
    glo05363 authored Nov 9, 2023
    Configuration menu
    Copy the full SHA
    73a3ce5 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'gl_magento2ce/AC-9653' into UPS_AC9653_… 

    …OCT_22_2023
    @glo05363
    glo05363 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    22f1039 View commit details
    Browse the repository at this point in the history

  11. Migration from extjs to jstree minor corrections

    @nishant04412
    nishant04412 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    28ff7b6 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'magento-commerce:2.4-develop' into application-server

    @andimov
    andimov authored Nov 9, 2023
    Configuration menu
    Copy the full SHA
    f3babf0 View commit details
    Browse the repository at this point in the history

  13. ACP2E-2520: Once Cart Become Virtual Cart after removing physical pro… 

    …ducts it still returns shipping method and address in Cart Quote Graphql response
    @veloraven
    veloraven committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    b37aa1b View commit details
    Browse the repository at this point in the history

  14. Merge branch '2.4-develop' into ACP2E-2520

    @veloraven
    veloraven committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    13c1af0 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'magento-commerce:2.4-develop' into application-server

    @andimov
    andimov authored Nov 9, 2023
    Configuration menu
    Copy the full SHA
    672e7b2 View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'perf-ce/application-server' into ACPT-1551

    @aa-kashk
    aa-kashk committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    087de6b View commit details
    Browse the repository at this point in the history

  17. ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(… 

    …Image)
    @o-iegorov
    o-iegorov committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    dd1da05 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'magento-commerce:2.4-develop' into ACP2E-2595

    @o-iegorov
    o-iegorov authored Nov 9, 2023
    Configuration menu
    Copy the full SHA
    5dcb5c1 View commit details
    Browse the repository at this point in the history

  19. ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState

    @aa-kashk
    aa-kashk committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    d2a69d4 View commit details
    Browse the repository at this point in the history

  20. ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not s… 

    …howing in Media Gallery when upload both lowercase and uppercase image with same name)
    @thiaramus
    thiaramus committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    dafd5fa 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 ACP2E-2568
    @thiaramus
    thiaramus committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    1952326 View commit details
    Browse the repository at this point in the history

  22. ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not s… 

    …howing in Media Gallery when upload both lowercase and uppercase image with same name)
    @thiaramus
    thiaramus committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    f0267fc View commit details
    Browse the repository at this point in the history

  23. ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not s… 

    …howing in Media Gallery when upload both lowercase and uppercase image with same name)
    @thiaramus
    thiaramus committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    fd075fd View commit details
    Browse the repository at this point in the history

  24. ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not s… 

    …howing in Media Gallery when upload both lowercase and uppercase image with same name)
    @thiaramus
    thiaramus committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    f25ff07 View commit details
    Browse the repository at this point in the history

  25. ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not s… 

    …howing in Media Gallery when upload both lowercase and uppercase image with same name)
    @thiaramus
    thiaramus committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    599e242 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. ACPT-1660: Fix WebApi GraphQL tests on Application Server 

    Adding _resetState to Magento/Framework/App/Cache/State because it caches result from config, and config can change.
    @JacobBrownAustin
    JacobBrownAustin committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    0d63775 View commit details
    Browse the repository at this point in the history

  2. ACPT-1669 

    Fixing static test failures related to virtual type which isn't a real class.
    @JacobBrownAustin
    JacobBrownAustin committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    d5ae702 View commit details
    Browse the repository at this point in the history

  3. ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState

    @aa-kashk
    aa-kashk committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    43ad3bf View commit details
    Browse the repository at this point in the history

  4. AC-9653::UPS SOAP and REST support in 2.4.7-beta3-SVC Approval fixes … 

    …for tracking_url
    @glo05363
    glo05363 committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    86db0d8 View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2127
    @devarul
    devarul committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    0264d9e View commit details
    Browse the repository at this point in the history

  6. Merge branch '2.4-develop' into UPS_AC9653_OCT_22_2023

    @glo05363
    glo05363 authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    0ce144d View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'gl_magento2ce/AC-9653' into UPS_AC9653_… 

    …OCT_22_2023
    @glo05363
    glo05363 committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    e7df0c2 View commit details
    Browse the repository at this point in the history

  8. ACP2E-2127: Date filter is not working in admin grid. 

     - Added the test coverage.
    @devarul
    devarul committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    894dccf View commit details
    Browse the repository at this point in the history

  9. Merge branch '2.4-develop' into ACPT-1669

    @JacobBrownAustin
    JacobBrownAustin authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    adedbc7 View commit details
    Browse the repository at this point in the history

  10. Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce … 

    …into ACPT-1660-and-ACPT-1634
    @JacobBrownAustin
    JacobBrownAustin committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    e5d7579 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #573 from magento-performance/ACPT-1679-and-ACPT-1… 

    …660-and-ACPT-1634

ACPT-1679 and ACPT-1660 and ACPT-1634
    @andimov
    andimov authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    95cdf3c View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'perf-ce/application-server' into ACPT-1551

    @aa-kashk
    aa-kashk committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    22cd0cf View commit details
    Browse the repository at this point in the history

  13. ACPT-1660: Fix WebApi GraphQL tests on Application Server 

    * Modifying MediaGalleryTest to be compatible with Redis backend
    @JacobBrownAustin
    JacobBrownAustin committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    b65f8a4 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'application-server' of github.com:magento-performance/m… 

    …agento2ce into ACPT-1660-and-ACPT-1634
    @JacobBrownAustin
    JacobBrownAustin committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    a6baf81 View commit details
    Browse the repository at this point in the history

  15. Revert "ACPT-1679: Skip failing WebApi GraphQL tests" 

    This reverts commit ee2f6b4.
    @JacobBrownAustin
    JacobBrownAustin committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    decf9fa View commit details
    Browse the repository at this point in the history

  16. ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState

    @aa-kashk
    aa-kashk committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    ea03f79 View commit details
    Browse the repository at this point in the history

  17. ACPT-1660: Fix WebApi GraphQL tests on Application Server 

    Adding _resetState to GraphQlResolverCache/Model/Resolver/Result/ValueProcessor
    @JacobBrownAustin
    JacobBrownAustin committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    1c90e29 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

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

    …into ACP2E-2267
    @aplapana
    aplapana committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    0175ea7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'magento-commerce:2.4-develop' into application-server

    @andimov
    andimov authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    7e8f46a View commit details
    Browse the repository at this point in the history

  3. Merge branch '2.4-develop' into ds_fix-docs

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    06a797a View commit details
    Browse the repository at this point in the history

  4. ACPT-1660: Fix WebApi GraphQL tests on Application Server 

    * Adding _resetState() to Product/Price/Provider to workaround bug that is mutable state in service class
    @JacobBrownAustin
    JacobBrownAustin committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    43f16c9 View commit details
    Browse the repository at this point in the history

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

    …into ACPT-1660-and-ACPT-1634
    @JacobBrownAustin
    JacobBrownAustin committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    01dc90e View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

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

    Sarmistha authored and Sarmistha committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    04add01 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'magento-l3/ACP2E-2303' into 2.4-develop

    Sarmistha authored and Sarmistha committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    4cde0ce View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'magento-l3/ACP2E-2404' into 2.4-develop

    Sarmistha authored and Sarmistha committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    364d994 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'magento-l3/ACP2E-2481' into 2.4-develop

    Sarmistha authored and Sarmistha committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    3adc18f View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'magento-l3/ACP2E-2511' into 2.4-develop

    Sarmistha authored and Sarmistha committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    0e33f6f View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2267
    @aplapana
    aplapana committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    064c834 View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2127
    @devarul
    devarul committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    5147420 View commit details
    Browse the repository at this point in the history

  8. ACP2E-2127: Date filter is not working in admin grid. 

     - Addressed the CR comments.
    @devarul
    devarul committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    55f401c View commit details
    Browse the repository at this point in the history

  9. Fix ShowTest

    @dshevtsov
    dshevtsov committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    36d6566 View commit details
    Browse the repository at this point in the history

  10. ACPT-1687: Move State Comparator/Collector into proper place

    @JacobBrownAustin
    JacobBrownAustin committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    396ef20 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. ACP2E-2412: Custom Address Attribute not rendering as per sort order

    @arnobsh
    arnobsh committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    80cd957 View commit details
    Browse the repository at this point in the history

  2. ACP2E-2127: Date filter is not working in admin grid. 

     - Fixed the CR comments.
    @devarul
    devarul committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    6ce291b View commit details
    Browse the repository at this point in the history

  3. ACPT-1665:Fix searchConfig merge in SearchCriteriaBuilder

    @aa-kashk
    aa-kashk committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    03b2996 View commit details
    Browse the repository at this point in the history

  4. ACP2E-2127: Date filter is not working in admin grid. 

     - Fixed the CR comments.
    @devarul
    devarul committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    82343cb View commit details
    Browse the repository at this point in the history

  5. Merge pull request #574 from magento-performance/ACPT-1660-and-ACPT-1634 

    ACPT-1660: Fix WebApi GraphQL tests on Application Server
    @andimov
    andimov authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    57138e7 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'application-server' of github.com:magento-performance/m… 

    …agento2ce into ACPT-1687
    @JacobBrownAustin
    JacobBrownAustin committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    c179f4d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #575 from magento-performance/ACPT-1687 

    ACPT-1687: Move State Comparator/Collector into proper place
    @andimov
    andimov authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    ee8ac1e View commit details
    Browse the repository at this point in the history

  8. ACPT-1665:Fix searchConfig merge in SearchCriteriaBuilder

    @aa-kashk
    aa-kashk committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    1a58d72 View commit details
    Browse the repository at this point in the history

  9. ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState

    @aa-kashk
    aa-kashk committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    62a9208 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #562 from magento-performance/ACPT-1551 

    ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState
    @andimov
    andimov authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    f327620 View commit details
    Browse the repository at this point in the history

  11. Use @codingStandardsIgnoreLine for long URLs

    @dshevtsov
    dshevtsov committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    0630664 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Merge branch '2.4-develop' into ds_fix-docs

    @dshevtsov
    dshevtsov authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    cfe41e5 View commit details
    Browse the repository at this point in the history

  2. Fix types

    @dshevtsov
    dshevtsov committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    777c86d View commit details
    Browse the repository at this point in the history

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

    …ento2ce into 2.4-develop
    Sarmistha authored and Sarmistha committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    1b8597a View commit details
    Browse the repository at this point in the history

  4. ACP2E-2459: Exception during multiple address checkout when admin use… 

    …r using "Login as Customer" functionality
    @arnobsh
    arnobsh committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    735b0b4 View commit details
    Browse the repository at this point in the history

  5. Merge branch '2.4-develop' into UPS_AC9653_OCT_22_2023

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    4fa8f6d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'magento-commerce:2.4-develop' into application-server

    @andimov
    andimov authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    68fd4b5 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState

    @aa-kashk
    aa-kashk committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    79bb853 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #577 from magento-performance/ACPT-1551-2 

    ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState
    @andimov
    andimov authored Nov 17, 2023
    Configuration menu
    Copy the full SHA
    2feb4ea View commit details
    Browse the repository at this point in the history

  3. Merge pull request #576 from magento-performance/ACPT-1665 

    ACPT-1665:Fix searchConfig merge in SearchCriteriaBuilder
    @andimov
    andimov authored Nov 17, 2023
    Configuration menu
    Copy the full SHA
    2cc0a1f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ACPT-1669' into application-server

    @JacobBrownAustin
    JacobBrownAustin committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    6abbd3f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'application-server' of github.com:magento-performance/m… 

    …agento2ce into application-server
    @JacobBrownAustin
    JacobBrownAustin committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    10b1920 View commit details
    Browse the repository at this point in the history

  6. Merge branch '2.4-develop' into ACPT-1669

    @andimov
    andimov authored Nov 17, 2023
    Configuration menu
    Copy the full SHA
    5365518 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2023

  1. ACPT-1688: Fix Static Tests failures on Application-Server branch

    @yaroslavGoncharuk
    yaroslavGoncharuk committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    d9d6dfd View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2023

  1. Merge pull request #8593 from commerce-docs/ds_fix-docs 

    Minor fixes in docs
    @okolesnyk
    okolesnyk authored Nov 19, 2023
    Configuration menu
    Copy the full SHA
    edd599b View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.4-develop' into UPS_AC9653_OCT_22_2023

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 19, 2023
    Configuration menu
    Copy the full SHA
    0b66a45 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

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

    …ento2ce into 2.4-develop
    Sarmistha authored and Sarmistha committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    f838c9e View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.4-develop' into ACPT-1669

    @andimov
    andimov authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    b25f3b2 View commit details
    Browse the repository at this point in the history

  3. Merge branch '2.4-develop' into application-server

    @andimov
    andimov authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    5c69f9b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ACP2E-2503' of https://github.com/magento-l3/magento2ce … 

    …into Tier4-PR-10-30-2023
    @thiaramus
    thiaramus committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    b8d8c7a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ACP2E-2308' of https://github.com/magento-l3/magento2ce … 

    …into Tier4-PR-10-30-2023
    @thiaramus
    thiaramus committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    73b1515 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ACP2E-2296' of https://github.com/magento-l3/magento2ce … 

    …into Tier4-PR-10-30-2023
    @thiaramus
    thiaramus committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    b4d2d0e View commit details
    Browse the repository at this point in the history

  7. Merge branch 'ACP2E-2266' of https://github.com/magento-l3/magento2ce … 

    …into Tier4-PR-10-30-2023
    @thiaramus
    thiaramus committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    6235bb4 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'ACP2E-2260' of https://github.com/magento-l3/magento2ce … 

    …into Tier4-PR-10-30-2023
    @thiaramus
    thiaramus committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    81e372b View commit details
    Browse the repository at this point in the history

  9. Merge branch 'ACP2E-2252' of https://github.com/magento-l3/magento2ce … 

    …into Tier4-PR-10-30-2023
    @thiaramus
    thiaramus committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    36e6e6f View commit details
    Browse the repository at this point in the history

  10. Merge branch 'ACP2E-2166' of https://github.com/magento-l3/magento2ce … 

    …into Tier4-PR-10-30-2023
    @thiaramus
    thiaramus committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    3bfbf3b View commit details
    Browse the repository at this point in the history

  11. Merge branch 'ACP2E-2069' of https://github.com/magento-l3/magento2ce … 

    …into Tier4-PR-10-30-2023
    @thiaramus
    thiaramus committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    2f58bf9 View commit details
    Browse the repository at this point in the history

  12. ACPT-1688: Fix Static Tests failures on Application-Server branch 2

    @yaroslavGoncharuk
    yaroslavGoncharuk committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    3b1a80e View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. ACPT-1689: Fix Integration Tests failures on Application-Server branch

    @andimov
    andimov committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    60865b6 View commit details
    Browse the repository at this point in the history

  2. ACPT-1696: Fix SVC test failures on Application-Server branch

    @andimov
    andimov committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    e85da89 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8611 from magento-l3/Tier4-PR-10-30-2023 

    Tier4 PR Delivery 10.30.23
    @dhorytskyi
    dhorytskyi authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    97e33f5 View commit details
    Browse the repository at this point in the history

  4. Merge branch '2.4-develop' into application-server

    @andimov
    andimov authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    7b5b588 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'application-server' into ACPT-1688 

    # Conflicts:
#	app/code/Magento/ApplicationPerformanceMonitor/Profiler/Metric.php
    @yaroslavGoncharuk
    yaroslavGoncharuk committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    300eb43 View commit details
    Browse the repository at this point in the history

  6. ACPT-1688: Fix Static Tests failures on Application-Server branch; 

    -Remove dependency of library classes on non-library classes
    @aa-kashk
    aa-kashk committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    f60294e View commit details
    Browse the repository at this point in the history

  7. Merge branch '2.4-develop' into ACPT-1669

    @andimov
    andimov authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    38102ee View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. ACPT-1688: Fix Static Tests failures on Application-Server branch

    @andimov
    andimov committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    dfb74c2 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 2.4-develop
    Sarmistha authored and Sarmistha committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    13f645b View commit details
    Browse the repository at this point in the history

  3. ACPT-1688: Fix Static Tests failures on Application-Server branch

    @andimov
    andimov committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    c0f3904 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'magento-commerce:2.4-develop' into ACP2E-2357

    @lakshmana49
    lakshmana49 authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    da3d4f4 View commit details
    Browse the repository at this point in the history

  5. ACPT-1688: Fix Static Tests failures on Application-Server branch Final

    @yaroslavGoncharuk
    yaroslavGoncharuk committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    57365d2 View commit details
    Browse the repository at this point in the history

  6. Merge branch '2.4-develop' into spartans_pr_07112023

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    4882f16 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. Merge branch '2.4-develop' into Arrows_platform_health_Extjs

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 23, 2023
    Configuration menu
    Copy the full SHA
    cca96b9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8625 from magento-gl/Arrows_platform_health_Extjs 

    Arrows Platform Health Migration from ExtJs to Jstree
    @internal-magento-queue-manager
    internal-magento-queue-manager[bot] authored Nov 23, 2023
    Configuration menu
    Copy the full SHA
    298cbd4 View commit details
    Browse the repository at this point in the history

  3. Merge branch '2.4-develop' into application-server

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 23, 2023
    Configuration menu
    Copy the full SHA
    f111c28 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

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

    …112023
    @glo60612
    glo60612 committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    26126f1 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/spartans_pr_07112023' into spart… 

    …ans_pr_07112023
    @glo60612
    glo60612 committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    463065c View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge branch '2.4-develop' into ACPT-1669

    @aa-kashk
    aa-kashk authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    266fa1b View commit details
    Browse the repository at this point in the history

  2. ACPT-1688: Fix Static Tests failures

    @andimov
    andimov committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    b4e74c8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #578 from magento-performance/ACPT-1688 

    ACPT-1688: Fix Static Tests failures on Application-Server branch CE
    @andimov
    andimov authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    a41a139 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'l3/ACP2E-2267' into Tier4-PR-Delivery-1… 

    …1-18-23
    @veloraven
    veloraven committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    aca3ba4 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'l3/ACP2E-2345' into Tier4-PR-Delivery-1… 

    …1-18-23
    @veloraven
    veloraven committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    07d7db9 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'l3/ACP2E-2522-V2' into Tier4-PR-Deliver… 

    …y-11-18-23
    @veloraven
    veloraven committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    892abe1 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'l3/ACP2E-2412' into Tier4-PR-Delivery-1… 

    …1-18-23
    @veloraven
    veloraven committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    19e04f7 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'l3/ACP2E-2457' into Tier4-PR-Delivery-1… 

    …1-18-23
    @veloraven
    veloraven committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    3f9bb54 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'l3/ACP2E-2459' into Tier4-PR-Delivery-1… 

    …1-18-23
    @veloraven
    veloraven committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    9a56605 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'l3/ACP2E-2464' into Tier4-PR-Delivery-1… 

    …1-18-23
    @veloraven
    veloraven committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    1046d9b View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'l3/ACP2E-2469' into Tier4-PR-Delivery-1… 

    …1-18-23
    @veloraven
    veloraven committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    82e837f View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'l3/ACP2E-2495' into Tier4-PR-Delivery-1… 

    …1-18-23
    @veloraven
    veloraven committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    d7690e8 View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'l3/ACP2E-2520' into Tier4-PR-Delivery-1… 

    …1-18-23
    @veloraven
    veloraven committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    9f431a7 View commit details
    Browse the repository at this point in the history

  14. Merge remote-tracking branch 'l3/ACP2E-2568' into Tier4-PR-Delivery-1… 

    …1-18-23
    @veloraven
    veloraven committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    c6f24d4 View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'l3/ACP2E-2595' into Tier4-PR-Delivery-1… 

    …1-18-23
    @veloraven
    veloraven committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    f83266d View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2511
    Sarmistha authored and Sarmistha committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    748ab2f View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2404
    Sarmistha authored and Sarmistha committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    0d9cc7e View commit details
    Browse the repository at this point in the history

  18. ACPT-1697: Move state-*-list.php files back to dev from lib

    @JacobBrownAustin
    JacobBrownAustin committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    1993bce View commit details
    Browse the repository at this point in the history

  19. ACPT-1697: Move state-*-list.php files back to dev from lib

    @JacobBrownAustin
    JacobBrownAustin committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    265ae89 View commit details
    Browse the repository at this point in the history

  20. ACPT-1688: Fix Static Tests failures on Application-Server branch

    @yaroslavGoncharuk
    yaroslavGoncharuk committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    6d872de View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

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

    …into ACP2E-2127
    @devarul
    devarul committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    f0656a5 View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2303
    @devarul
    devarul committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    f5037fc View commit details
    Browse the repository at this point in the history

  3. Merge branch '2.4-develop' into UPS_AC9653_OCT_22_2023

    @glo05363
    glo05363 authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    921f4c5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'magento-commerce:2.4-develop' into ACP2E-2357

    @lakshmana49
    lakshmana49 authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    51fb3ae View commit details
    Browse the repository at this point in the history

  5. LYNX-289: Add property caching for customer_group_excluded_website 

    * LYNX-289: Add property caching for customer_group_excluded_website

* LYNX-289: Remove obsolete SOAP test; CR changes

* LYNX-289: CR changes
    @bl4de
    bl4de authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    fbd7676 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/AC-9665' into Hammer_PlatformHea… 

    …lth_247Beta3
    @glo71317
    glo71317 committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    9e05bc6 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #8599 from magento-gl/UPS_AC9653_OCT_22_2023 

    AC-9653::UPS SOAP and REST support in 2.4.7-beta3
    @sidolov
    sidolov authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    efe5560 View commit details
    Browse the repository at this point in the history

  8. Merge branch '2.4-develop' into ACPT-1669

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    5384483 View commit details
    Browse the repository at this point in the history

  9. Merge branch '2.4-develop' into spartans_pr_07112023

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    553e761 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'magento-commerce:2.4-develop' into application-server

    @andimov
    andimov authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    538a07f View commit details
    Browse the repository at this point in the history

  11. Merge pull request #580 from magento-performance/ACPT-1697 

    ACPT-1697: Move state-*-list.php files back to dev from lib
    @andimov
    andimov authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    b6791bb View commit details
    Browse the repository at this point in the history

  12. Merge branch '2.4-develop' into Tier4-PR-Delivery-11-18-23

    @veloraven
    veloraven committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    b5f4d4e View commit details
    Browse the repository at this point in the history

  13. Merge branch 'magento-commerce:2.4-develop' into ACP2E-2357

    @lakshmana49
    lakshmana49 authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    29bbc3a View commit details
    Browse the repository at this point in the history

  14. Merge branch 'application-server' into ACPT-1688_2

    @yaroslavGoncharuk
    yaroslavGoncharuk committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    484c2a8 View commit details
    Browse the repository at this point in the history

  15. ACPT-1688: Fix Static Tests failures on Application-Server branch 2

    @yaroslavGoncharuk
    yaroslavGoncharuk committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    e901757 View commit details
    Browse the repository at this point in the history

  16. Merge branch '2.4-develop' into MCLOUD-10884-Q4-API-performance-optim… 

    …izations
    @bl4de
    bl4de authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    ff5e460 View commit details
    Browse the repository at this point in the history

  17. ACPT-1688: Fix Static Tests failures on Application-Server branch 3

    @yaroslavGoncharuk
    yaroslavGoncharuk committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    ca55052 View commit details
    Browse the repository at this point in the history

  18. ACPT-1688: Fix Static Tests failures on Application-Server branch 4

    @yaroslavGoncharuk
    yaroslavGoncharuk committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    921bca9 View commit details
    Browse the repository at this point in the history

  19. GraphQlCheckoutMutationsStateTest & GraphQlCustomerMutationsTest: ski… 

    …pping tests that need to be fixed later
    @JacobBrownAustin
    JacobBrownAustin committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    5d5edd1 View commit details
    Browse the repository at this point in the history

  20. ACPT-1688: Fix Static Tests failures on Application-Server branch 5

    @yaroslavGoncharuk
    yaroslavGoncharuk committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    dca3621 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #8620 from magento-performance/ACPT-1669 

    ACPT-1669: GraphQl\Config & Search\Request\Config need to be cleaned when attributes change
    @andimov
    andimov authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    2807445 View commit details
    Browse the repository at this point in the history

  22. Merge branch '2.4-develop' into spartans_pr_07112023

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    d0aee58 View commit details
    Browse the repository at this point in the history

  23. Merge branch '2.4-develop' into Tier4-PR-Delivery-11-18-23

    @veloraven
    veloraven committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    83a151e View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

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

    …rver
    @andimov
    andimov committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    3cf454d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #581 from magento-performance/ACPT-1688_2 

    ACPT-1688: Fix Static Tests failures on Application-Server branch
    @andimov
    andimov authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    ee0548e View commit details
    Browse the repository at this point in the history

  3. ACPT-1688: Fix Metric Types

    @andimov
    andimov committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    1674596 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8623 from magento-gl/spartans_pr_07112023 

    [Spartans] Bugfix Delivery
    @internal-magento-queue-manager
    internal-magento-queue-manager[bot] authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    601dec4 View commit details
    Browse the repository at this point in the history

  5. Merge branch '2.4-develop' into application-server

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c19167f View commit details
    Browse the repository at this point in the history

  6. Merge branch '2.4-develop' into Tier4-PR-Delivery-11-18-23

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c922e63 View commit details
    Browse the repository at this point in the history

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

    …ento2ce into 2.4-develop
    Sarmistha authored and Sarmistha committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    6ee4669 View commit details
    Browse the repository at this point in the history

  8. Merge branch '2.4-develop' into MCLOUD-10884-Q4-API-performance-optim… 

    …izations
    @sivaschenko
    sivaschenko authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    01fd80b View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2404
    Sarmistha authored and Sarmistha committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    46e1e8d View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2511
    Sarmistha authored and Sarmistha committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    28d6a16 View commit details
    Browse the repository at this point in the history

  11. LYNX-290: Bulk quote_shipping_rate delete (#174)

    @sivaschenko
    sivaschenko authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c0d0f76 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #8640 from magento-l3/Tier4-PR-Delivery-11-18-23 

    Tier4 PR Delivery 11.18.23
    @dhorytskyi
    dhorytskyi authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    f8474ca View commit details
    Browse the repository at this point in the history

  13. Merge branch '2.4-develop' into application-server

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    5100c9b View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

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

    …into ACP2E-2511
    Sarmistha authored and Sarmistha committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    8f73193 View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2404
    Sarmistha authored and Sarmistha committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    771b165 View commit details
    Browse the repository at this point in the history

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

    …ento2ce into 2.4-develop
    Sarmistha authored and Sarmistha committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    de0507f View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2303
    @devarul
    devarul committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    94eada5 View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2127
    @devarul
    devarul committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    f14414a View commit details
    Browse the repository at this point in the history

  6. Merge branch '2.4-develop' into MCLOUD-10884-Q4-API-performance-optim… 

    …izations
    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    5aed474 View commit details
    Browse the repository at this point in the history

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

    …into ACP2E-2481
    Chhandak.Barua authored and Chhandak.Barua committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    0afe466 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'magento-l3/ACP2E-2127' into Tier4-Kings… 

    …-PR-11-08-2023
    Sarmistha authored and Sarmistha committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    faefcde View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'magento-l3/ACP2E-2303' into Tier4-Kings… 

    …-PR-11-08-2023
    Sarmistha authored and Sarmistha committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    1efd720 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'magento-l3/ACP2E-2357' into Tier4-Kings… 

    …-PR-11-08-2023
    Sarmistha authored and Sarmistha committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    d57e5df View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'magento-l3/ACP2E-2404' into Tier4-Kings… 

    …-PR-11-08-2023
    Sarmistha authored and Sarmistha committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    408d183 View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'magento-l3/ACP2E-2511' into Tier4-Kings… 

    …-PR-11-08-2023
    Sarmistha authored and Sarmistha committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    90b2571 View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'magento-l3/ACP2E-2481' into Tier4-Kings… 

    …-PR-11-08-2023
    Sarmistha authored and Sarmistha committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    e90caea View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Merge branch '2.4-develop' into Hammer_PlatformHealth_247Beta3

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

  2. Merge pull request #8648 from magento-lynx/MCLOUD-10884-Q4-API-perfor… 

    …mance-optimizations

[LYNX] Performance improvements
    @svera
    svera authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    50c513f View commit details
    Browse the repository at this point in the history

  3. Merge branch '2.4-develop' into Tier4-Kings-PR-11-08-2023

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    7f2b597 View commit details
    Browse the repository at this point in the history

  4. Merge branch '2.4-develop' into Hammer_PlatformHealth_247Beta3

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    81112a9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #8626 from magento-l3/Tier4-Kings-PR-11-08-2023 

    Tier4 Kings PR Delivery 11.08.2023
    @dhorytskyi
    dhorytskyi authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    7d724b7 View commit details
    Browse the repository at this point in the history

  6. Merge branch '2.4-develop' into Hammer_PlatformHealth_247Beta3

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    1633f2a View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2023

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

    …rver
    @aa-kashk
    aa-kashk committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    982a732 View commit details
    Browse the repository at this point in the history

  2. ACPT-1226: GraphQlStateTest improvements and other fixes; 

    -Fix integration test failure
    @aa-kashk
    aa-kashk committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    ec0c9d6 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2023

  1. ACPT-1689: Fix Integration Tests failures

    @andimov
    andimov committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    8f142e5 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Merge pull request #8629 from magento-performance/application-server 

    ACPT-1226: GraphQlStateTest improvements and other fixes
    @andimov
    andimov authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    dfba86f View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.4-develop' into Hammer_PlatformHealth_247Beta3

    @magento-devops-queue-mgr-svc
    magento-devops-queue-mgr-svc authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    d11dc91 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8649 from magento-gl/Hammer_PlatformHealth_247Beta3 

    [Hammer - Platform Health Scope]-AC-9665: Update all js library and npm dependency with latest available version
    @internal-magento-queue-manager
    internal-magento-queue-manager[bot] authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    d88a9d2 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Resolve merge conflict in CONTRIBUTING.md (#66)

    @Vinai
    Vinai authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    2c3cbff View commit details
    Browse the repository at this point in the history

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

    @mage-os-ci
    mage-os-ci authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    42d810b View commit details
    Browse the repository at this point in the history