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.

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

updating magento #38

Merged
merged 4,920 commits into from
Apr 12, 2020
Merged

updating magento #38

merged 4,920 commits into from
Apr 12, 2020

Conversation

saphaljha
Copy link
Owner

Description (*)

Fixed Issues (if relevant)

  1. magento/magento2#<issue_number>: Issue title

Manual testing scenarios (*)

  1. ...
  2. ...

Questions or comments

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds are green)

slavvka and others added 30 commits March 31, 2020 13:45
Update unit tests in AdminNotification module
…ix/fix-test-for-datetime

# Conflicts:
#	lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeTest.php
Fix static tests
#27492

 - Merge Pull Request #27492 from andrewbess/magento2:bugfix/fix-test-for-datetime
 - Merged commits:
   1. b20f9eb
   2. 7ee81db
…-fast-lane-prs

 - merged with '2.4-develop-prs' branch
- add secondary sort by entity to mimic behavior of Page Builder category page and products to show newest entity first
- add secondary sort by entity to mimic behavior of Page Builder category page and products to show newest entity first
 - Merge Pull Request #26736 from konarshankar07/magento2:Sortby-component
 - Merged commits:
   1. d913e15
   2. 4e65dc9
   3. a483274
   4. dd95f5e
   5. bdfe729
   6. 9404f53
   7. 858756d
   8. 7dc8227
   9. 08aea80
   10. a1b3c47
   11. 6aaebb2
   12. 9aa1cfc
   13. a66fb6c
   14. 5010692
   15. aa09e38
   16. 1f5bed9
   17. 31926d6
   18. 76c357b
 - Merge Pull Request #26100 from Usik2203/magento2:24990-logo-link-is-not-directing-to-admin-dashboard
 - Merged commits:
   1. 5a5091c
   2. 1818eaf
   3. c98e03f
   4. 8c672eb
   5. b90f20c
   6. 531a22f
   7. 4336cf1
   8. f39a494
   9. 31bbf07
   10. e1b0ff0
[TSG] TESTs Fixes for 2.4 (pr27) (2.4-develop)
serhii-balko and others added 28 commits April 9, 2020 11:58
 - Merge Pull Request #27671 from Usik2203/magento2:use-action-group-to-click-minicart
 - Merged commits:
   1. 2a824b0
   2. 3edb1f8
Fixed issues:
- MC-32792: Get Categories server side API operation to improve in 2.4
…gallery. #27652

 - Merge Pull Request #27652 from Nazar65/magento2:ASI-delete_folder
 - Merged commits:
   1. b4c7ed2
…-expedited-prs

 - merged with '2.4-develop-fast-lane-prs' branch
…-expedited-prs

 - merged with '2.4-develop-temporary-five-prs' branch
…-expedited-prs

 - merged with '2.4-develop-express-lane-prs' branch
…op expedited

Accepted Community Pull Requests:
 - #26926: Fix hard-code scope store string (by @mrtuvn)
 - #27597: magento/partners-magento2ee#171  Cover reported Admin Log bug with MFTF tests (by @lbajsarowicz)
 - #27627: #27500 - Replace deprecated constructs from OfflinePa… (by @cristiano-pacheco)
 - #26036: Fixes phpcs  errors and warnings for Magento\Framework\Image (by @krisdante)
 - #27563: [MFTF] Set correct url for CmsPageEditPage (by @Usik2203)
 - #27491: Cleanup ObjectManager usage - Magento_Developer (by @Bartlomiejsz)
 - #27652: Fix An error occurred during delete folder from a media gallery. (by @Nazar65)
 - #27343: 13851 Added improvements for credit memo total fields (by @sergiy-v)
 - #26988: #26986 REST API Pagination issue (by @lbajsarowicz)


Fixed GitHub Issues:
 - #26986: REST API Pagination Does not work as expected (reported by @lbajsarowicz) has been fixed in #26988 by @lbajsarowicz in 2.4-develop branch
   Related commits:
     1. a6f76f3
     2. b254764
     3. 11567f6
     4. 6771122
     5. e001493
     6. ecb3a8d
     7. 015c5fc
     8. 18e43a8
     9. 9d0ae13
     10. 2439e17
     11. 14ea335
     12. 0fe9cf2
     13. dab0cda
     14. c403c52
     15. d7cdd7b
     16. 05f1a2b
     17. f25de7b
     18. 51a18f6
     19. 0bae5d5
     20. 1e7082d
     21. f5aa61d
     22. e8d3b78
     23. 6c171ce
     24. 8c9189f
     25. 68cf64d
     26. 0db9220
     27. c44bbf5
     28. 84fdc7a
     29. 162eb14
     30. 11c3eea
     31. 986a4ef
     32. 80cb06e
     33. db71c46
     34. e105152
     35. bd5c98e
…-prs

 - merged with '2.4-develop-fast-lane-prs' branch
Accepted Community Pull Requests:
 - #27547: Fix type hint for Select::where (by @marcusirgens)
 - #27671: [MFTF] Use Action Group to click on minicart (by @Usik2203)
 - #27552: Fix issue with loading mask on Admin Checkout (by @lbajsarowicz)
MQE-2046: remove deprecated entities usages in MFTF tests
@saphaljha saphaljha merged commit 1ea3208 into saphaljha:2.4-develop Apr 12, 2020
saphaljha pushed a commit that referenced this pull request Jul 22, 2021
MC-42290: Check bind changes are covered by test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.