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

Merge from magento #2

Merged
merged 85 commits into from
Jan 22, 2021
Merged

Merge from magento #2

merged 85 commits into from
Jan 22, 2021

Conversation

gixid192
Copy link

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes magento/magento2#<issue_number>

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)

engcom-Echo and others added 30 commits January 5, 2021 15:57
@engcom-Echo
MC-23915: Wrong currency symbol in creditmemo_grid & sales_order_view…
af8443c 
… > creditmemo grid for subtotal & Shipping and Handling fee
@engcom-Echo
MC-23915: Wrong currency symbol in creditmemo_grid & sales_order_view…
07f0fad 
… > creditmemo grid for subtotal & Shipping and Handling fee
@engcom-Echo
MC-23915: Wrong currency symbol in creditmemo_grid & sales_order_view…
940d74a 
… > creditmemo grid for subtotal & Shipping and Handling fee
@viktorpetryk
MC-38088: [MFTF] Flaky AdminSimpleProductRemoveImagesTest
e85c550
@engcom-Echo
MC-23915: Wrong currency symbol in creditmemo_grid & sales_order_view…
3174a69 
… > creditmemo grid for subtotal & Shipping and Handling fee
@engcom-Echo
Merge branch '2.4-develop' into MC-23915
8b59b7a
@engcom-Echo
MC-30152: Bundle Product / Create / Price validation for dynamic price
4c62af0
@engcom-Echo
MC-23915: Wrong currency symbol in creditmemo_grid & sales_order_view…
8417b88 
… > creditmemo grid for subtotal & Shipping and Handling fee
@joanhe
B2B-1637: Fix GET_LOCK error on read-only slave connection
0b3c5f1
@nmalevanec
MC-40344: Sorting by position on product search via REST API does not…
9ef6460 
… work.
@SmVladyslav
MC-39317: Reorder is not working with custom options date for custome…
60ea40d 
…r created during checkout
@viktorpetryk
MC-36149: [CLOUD] 'Be the first to review this product' link is not c…
e467331 
…hanged after admin has approved the review
@dhaecker
B2B-1640: Add MFTF test for MC-38222
21d42cb 
- Adding MFTF import test for MC-38222
@dhaecker
B2B-1640: Add MFTF test for MC-38222
476e755 
- Adding MFTF S3 import test for MC-38222
@dhaecker
B2B-1640: Add MFTF test for MC-38222
b850e35 
- Adding csv file for import
@dhaecker
B2B-1640: Add MFTF test for MC-38222
8d203cc 
- Skipping S3 test
@SmVladyslav
Merge remote-tracking branch 'origin/2.4-develop' into MC-39317
2a0b9ac
@viktorpetryk
MC-36149: [CLOUD] 'Be the first to review this product' link is not c…
a690b16 
…hanged after admin has approved the review
@viktorpetryk
Merge remote-tracking branch 'origin/2.4-develop' into MC-36149
ba8fb2d
@ysapiga
MC-40053: Create automated test for: "Update attribute option by API …
ef975c5 
…call"
@ysapiga
Merge branch '2.4-develop' into MC-40053
6a8ceb3
@dhaecker
B2B-1640: Add MFTF test for MC-38222
4099fef 
 - Adding reindex to test
@viktorpetryk
Merge remote-tracking branch 'origin/2.4-develop' into MC-36149
d8498f0
@dhaecker
B2B-1640: Add MFTF test for MC-38222
02163a6 
 - Remove pause
@SmVladyslav
MC-35640: The product is not added to the cart
942e44e
@SmVladyslav
Merge remote-tracking branch 'origin/2.4-develop' into MC-35640
85a2c0a
MC-34851: Foreign key error in MySQL 8.0 from MFTF test
9ad6f13
@ysapiga
MC-40053: Create automated test for: "Update attribute option by API …
2a8f5a6 
…call"
MC-34851: Foreign key error in MySQL 8.0 from MFTF test
00ec932
@viktorpetryk
Merge remote-tracking branch 'origin/2.4-develop' into MC-38088
66d8e52
zakdma and others added 29 commits January 19, 2021 13:41
@zakdma
Merge remote-tracking branch 'origin/MC-39481' into 2.4-develop-pr120
83b03a9
@dhaecker
B2B-1640: Add MFTF test for MC-38222
07b2081 
 - Adding check on Import History page
@dhaecker
Merge branch 'magento-commerce/2.4-develop' into B2B-1640
234f69d
@magento-mts-svc
merge magento-commerce/2.4-develop into magento-tsg/2.4-develop-pr120
836baf6
@joanhe
Merge remote-tracking branch 'upstream/2.4-develop' into B2B-1637
86884b6
@dhaecker
B2B-1640: Add MFTF test for MC-38222
3f75f67 
 - Moving MFTF data to data files
@zakdma
Merge remote-tracking branch 'origin/2.4-develop' into 2.4-develop-pr120
85727ba
@ysapiga
MC-39550: Create automated test for: "Add new website to products usi…
8912370 
…ng mass product update and run cron."
@zakdma
MC-40463: Vimeo simple API stop working as expected
f2231f8
@zakdma
Merge remote-tracking branch 'origin/MC-40463' into 2.4-develop-pr120
0f69efe
@ysapiga
Merge remote-tracking branch 'origin/MC-39550' into 2.4-develop-sidec…
9c6edc7 
…ar-pr12
@ysapiga
MC-39722: Create automated test for: "Dropdown attribute in flat prod…
8059762 
…uct"
@ysapiga
Merge remote-tracking branch 'origin/2.4-develop' into MC-39722
85d1491
@ysapiga
MC-40081: Create automated test for: "Disable flat product"
9f5e706
@ysapiga
Merge branch 'MC-40081' into 2.4-develop-sidecar-pr12
e2d5b32
@ysapiga
MC-39722: Create automated test for: "Dropdown attribute in flat prod…
bc14738 
…uct"
@zakdma
Merge pull request #6524 from magento-tsg/2.4-develop-pr120
fb2f1a7 
[Arrows] Fixes for 2.4 (pr120) (2.4-develop)
@rganin
Merge branch '2.4-develop' of https://github.com/magento/magento2ce i…
c118929 
…nto B2B-1640
@rganin
Merge remote-tracking branch 'af/B2B-1637' into develop-prs
71a29cc
@ysapiga
Merge remote-tracking branch 'origin/MC-39722' into 2.4-develop-sidec…
da4ea87 
…ar-pr12
@zakdma
MC-23915: Revert 23915 because it caused static tests failure
152b41b
@magento-mts-svc
merge magento-commerce/2.4-develop into magento-tsg/2.4-develop-sidec…
01222ac 
…ar-pr12
@zakdma
Merge pull request #6536 from magento-tsg/MC-23915
4c6636d 
[Arrows] MC-23915: Revert 23915 because it caused static tests failure
@rganin
Merge branch '2.4-develop' of https://github.com/magento/magento2ce i…
f14f3cf 
…nto develop-prs
@dhaecker
B2B-1640: Add MFTF test for MC-38222
7b9f198 
 - Removing gift card references from import csv
@magento-mts-svc
merge magento-commerce/2.4-develop into magento-tsg/2.4-develop-sidec…
971c447 
…ar-pr12
@rganin
Merge pull request #6531 from magento-arcticfoxes/develop-prs
1c78cdb 
[arcticfoxes] B2B-1637: Fix GET_LOCK error on read-only slave connection
@magento-mts-svc
merge magento-commerce/2.4-develop into magento-tsg/2.4-develop-sidec…
1051f5b 
…ar-pr12
@zakdma
Merge pull request #6537 from magento-tsg/2.4-develop-sidecar-pr12
00a70ec 
[Sidecar] Fixes for 2.4 (pr12)
@gixid192 gixid192 merged commit e40e457 into mageplaza:2.4-develop Jan 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone