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

pull from origin #3

Merged
merged 198 commits into from
Jan 27, 2021
Merged

pull from origin #3

merged 198 commits into from
Jan 27, 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)

nikunj and others added 30 commits March 20, 2019 18:16
#21853: Allow mview indexers to use different entity columns.
891198c
@slavvka
Merge branch '2.4-develop' into 21853
7da4940
#21853: Simplify the code change.
b59fc5a
#21853: Correct the comment.
4035ec0
21853: Send the view object and do all processing in buildStatement.
320ced7
@lenaorobei
Merge branch '2.4-develop' into 21853
0d1ac3a
@lenaorobei
Merge branch '2.4-develop' into 21853
6cbf85f
#21853: Fix tests.
7c2d2a6
#21853: Fix tests.
8388a90
@VladimirZaets
Merge branch '2.4-develop' into 21853
3f67ed8
@engcom-Foxtrot
Merge branch '2.4-develop' into 21853
873b814
@engcom-Foxtrot
Merge branch '2.4-develop-mainline' into 21853
392dbf6
@engcom-Foxtrot
#21853: Allow mview indexers to use different entity columns - unit &…
ff56be5 
… static tests fix.
@engcom-Foxtrot
Merge branch '2.4-develop-mainline' into 21853
e16f2c2
@engcom-Charlie
Merge branch '2.4-develop' into 21853
922e029
@aapokiiso
Allow backend login without redirect
df20ae1
@engcom-Charlie
Merge branch '2.4-develop' into 21853
330d595
@engcom-Charlie
extracted getting column to separate method
4c1094a
@engcom-Charlie
Merge branch '2.4-develop' into 21853
69cee97
Merge branch '2.4-develop' into backend-allow-login-without-redirect
62e54bd
@engcom-Charlie
Merge branch '2.4-develop' into 21853
46429a4 
# Conflicts:
#	lib/internal/Magento/Framework/Mview/View/Subscription.php
@engcom-Charlie
fix unit test
4ad7aae
@engcom-Charlie
define arguments & return types
8a9b768
@engcom-Charlie
Merge branch '2.4-develop' into 21853
db4cf23
Merge remote-tracking branch 'upstream/2.4-develop' into 2.4-develop
18aab3c
Changed config to store before default
1de30e3
@aapokiiso
Fix test to check that login form is visible after admin expiration
760a4e3
@AnnaAPak
Refactored Search Actions
edab7db
@AnnaAPak
AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest adjusted
e93ac14
@AnnaAPak
refactored
99cfcaa
Serhii Balko and others added 29 commits January 21, 2021 11:08
Merge remote-tracking branch 'mainline/2.4-develop' into 2.4-develop-…
0306d3f 
…pr50
@magento-engcom-team
ENGCOM-8675: Changed Newsletter Enabled/Disable config settings by pr…
a687390 
…iority, store scope then default scope #31208

 - Merge Pull Request #31208 from saphaljha/magento2:fixed-issue-31188
 - Merged commits:
   1. 18aab3c
   2. 1de30e3
   3. cb4988a
   4. 7889a6f
   5. 21c0bff
   6. 3e1d239
   7. 5dab4fa
   8. d099df9
   9. 1c056ea
   10. f3b63dc
@magento-engcom-team
[Magento Community Engineering] Community Contributions - 2.4-develop
2463577 
 - merged latest code from mainline branch
@magento-engcom-team
[Magento Community Engineering] Community Contributions - 2.4-develop
1a23f55 
 - merged latest code from mainline branch
@magento-mts-svc
merge magento-commerce/2.4-develop into magento-honey-badgers/MC-38927
e9540e7
@bubasuma
Merge remote-tracking branch 'origin/2.4-develop' into MC-40296
ecac5f5
Merge remote-tracking branch 'origin/MC-40283' into 2.4-develop-pr50
40fdd29
Merge remote-tracking branch 'mainline/2.4-develop' into 2.4-develop-…
146a85f 
…pr50
@magento-engcom-team
[Magento Community Engineering] Community Contributions - 2.4-develop
6ccb74d 
 - merged latest code from mainline branch
@magento-engcom-team
[Magento Community Engineering] Community Contributions - 2.4-develop
3770d95 
 - merged latest code from mainline branch
@zakdma
Merge pull request #6525 from magento-tsg-csl3/2.4-develop-pr50
30301a5 
[TSG-CSL3] For 2.4 (pr50)
@bubasuma
Merge remote-tracking branch 'origin/2.4-develop' into MC-40296
e927694
@magento-engcom-team
[Magento Community Engineering] Community Contributions - 2.4-develop
ba6d0c8 
 - merged latest code from mainline branch
@dhorytskyi
Merge pull request #6511 from magento-l3/MC-40296
c959471 
L3 Bugfixes
@magento-mts-svc
merge magento-commerce/2.4-develop into magento-honey-badgers/MC-38927
b11da0f
@magento-engcom-team
[Magento Community Engineering] Community Contributions - 2.4-develop
555f561 
 - merged latest code from mainline branch
@magento-engcom-team
[Magento Community Engineering] Community Contributions - 2.4-develop
8d162cc 
 - merged latest code from mainline branch
@gabrieldagama
🔃 [Magento Community Engineering] Community Contributions - 2.4-devel…
af3e2e4 
…op daily delivery

Accepted Community Pull Requests:
 - #31487: [MFTF] Refactoring AdminOrdersReleaseInUnholdStatusTest (by @AnnaAPak)
 - #31458: [MFTF] Refactoring CancelOrdersInOrderSalesReportTest (by @AnnaAPak)
 - #31418: [MFTF] Adding StorefrontGuestCheckoutProceedToPaymentStepActionGroup (by @AnnaAPak)
 - #31369: Updated wish list GraphQl read me file (by @chiranjeevi-cj)
 - #31240: [MFTF] Refactoring of Search actions on Storefront (by @AnnaAPak)


Fixed GitHub Issues:
 - #31521: [Issue] [MFTF] Refactoring AdminOrdersReleaseInUnholdStatusTest (reported by @m2-assistant[bot]) has been fixed in #31487 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. 815ef76

 - #31522: [Issue] [MFTF] Refactoring CancelOrdersInOrderSalesReportTest (reported by @m2-assistant[bot]) has been fixed in #31458 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. 3bc048d
     2. 5488c9d

 - #31441: [Issue] [MFTF] Adding StorefrontGuestCheckoutProceedToPaymentStepActionGroup (reported by @m2-assistant[bot]) has been fixed in #31418 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. 6ef6f57
     2. fa400a1
     3. cb793f8
     4. 2ee30cb
     5. cbc6bea
     6. ee97b00

 - #4451: Fix for admin shipment, creditmemo, invoice pdf emulation (reported by @ksz2013) has been fixed in #31369 by @chiranjeevi-cj in 2.4-develop branch
   Related commits:
     1. 628a1e4
     2. c16f995
     3. cfbc08c
     4. 6cb297b
     5. 8584f85
     6. ee667ff
     7. af5765d
     8. 7cf7657
     9. db1be3f
     10. 0b5401f
     11. 2a50bef
     12. f786e39
     13. 427e14b
     14. 2610382
     15. 350ba94
     16. a57297c
     17. 200771d
     18. 01a656f
     19. ed70125
     20. 4f4b98a
     21. 54d95d0
     22. 447f3c6
     23. f5fde08
     24. 7728961
     25. 354d3f6
     26. 6c1e76e
     27. 13f32b6
     28. 0b09f8c
     29. c95fee9
     30. bdf967d

 - #31251: [Issue] [MFTF] Refactoring of Search actions on Storefront (reported by @m2-assistant[bot]) has been fixed in #31240 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. edab7db
     2. e93ac14
     3. 99cfcaa
     4. 631dc30
     5. a675e9f
     6. b162d05
     7. 772b16f
     8. 958af2b
     9. 680312b
     10. 332ef5d
     11. 2561d07
@magento-engcom-team
[Magento Community Engineering] Community Contributions - 2.4-develop
47bf287 
 - merged latest code from mainline branch
@prabhuram93
Merge remote-tracking branch 'mainline/2.4-develop' into MC-38927
d10d88f
@gabrieldagama
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
5fa09cc 
Accepted Community Pull Requests:
 - #31321: Add missing "VAT Number" field to customer registration page (by @vovayatsyuk)
 - #31603: [MFTF] Adding AdminGoToOrderStatusPageActionGroup (by @AnnaAPak)
 - #31601: [MFTF] Updating with AdminClickInsertWidgetActionGroup (by @AnnaAPak)
 - #31394: [MFTF] Refactoring AdminCheckingCreditMemoTotalsTest (by @AnnaAPak)


Fixed GitHub Issues:
 - #31326: [Issue] Add missing "VAT Number" field to customer registration page (reported by @m2-assistant[bot]) has been fixed in #31321 by @vovayatsyuk in 2.4-develop branch
   Related commits:
     1. e5444ad
     2. 01f3185
     3. d01133d
     4. 13b966a
     5. ecc30d5
     6. 837a48a
     7. 8b4e8b5
     8. 93a0469
     9. 1f9802d
     10. 6bd52c9
     11. a24dce4
     12. c9bcf3d
     13. 71428b5

 - #31624: [Issue] [MFTF] Adding AdminGoToOrderStatusPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #31603 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. 5d84e2a
     2. d766016
     3. b628917

 - #31626: [Issue] [MFTF] Updating with AdminClickInsertWidgetActionGroup (reported by @m2-assistant[bot]) has been fixed in #31601 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. 0693f46

 - #31403: [Issue] [MFTF] Refactoring AdminCheckingCreditMemoTotalsTest (reported by @m2-assistant[bot]) has been fixed in #31394 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. cfa15e1
@magento-engcom-team
ENGCOM-8474: #21853: Allow mview indexers to use different entity col…
7327dc0 
…umns. #21857

 - Merge Pull Request #21857 from nikunjkotecha/magento2:21853
 - Merged commits:
   1. 891198c
   2. 7da4940
   3. b59fc5a
   4. 4035ec0
   5. 320ced7
   6. 0d1ac3a
   7. 6cbf85f
   8. 7c2d2a6
   9. 8388a90
   10. 3f67ed8
   11. 873b814
   12. 392dbf6
   13. ff56be5
   14. e16f2c2
   15. 922e029
   16. 330d595
   17. 4c1094a
   18. 69cee97
   19. 46429a4
   20. 4ad7aae
   21. 8a9b768
   22. db4cf23
   23. 094decc
   24. 910eb41
   25. be3f84b
@gabrieldagama
ENGCOM-8539: Allow backend login without redirect #30950
310a6ab
@gabrieldagama
ENGCOM-8536: [MFTF] Refactoring of AdminUpdateSimpleProduct...Tests (…
3788230 
…asserting product details on Storefront) #31247
@gabrieldagama
ENGCOM-8474: #21853: Allow mview indexers to use different entity col…
e5d0279 
…umns. #21857
@gabrieldagama
ENGCOM-8675: Changed Newsletter Enabled/Disable config settings by pr…
33d322b 
…iority, store scope then default scope #31208
@magento-engcom-team
🔃 [Magento Community Engineering] Community Contributions - 2.4-devel…
c9242e8 
…op daily delivery

Accepted Community Pull Requests:
 - #30950: Allow backend login without redirect (by @aapokiiso)
 - #31247: [MFTF] Refactoring of AdminUpdateSimpleProduct...Tests (asserting product details on Storefront) (by @AnnaAPak)
 - #21857: #21853: Allow mview indexers to use different entity columns. (by @nikunjkotecha)
 - #31208: Changed Newsletter Enabled/Disable config settings by priority, store scope then default scope (by @saphaljha)


Fixed GitHub Issues:
 - #31042: [Issue] Allow backend login without redirect (reported by @m2-assistant[bot]) has been fixed in #30950 by @aapokiiso in 2.4-develop branch
   Related commits:
     1. df20ae1
     2. 62e54bd
     3. 760a4e3
     4. 73ef59b
     5. 217c32c
     6. 6e3b5b0

 - #31248: [Issue] [MFTF] Refactoring of AdminUpdateSimpleProduct...Tests (asserting product details on Storefront) (reported by @m2-assistant[bot]) has been fixed in #31247 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. 701a96a
     2. 40cf39e
     3. ed00875
     4. 8ae0c79
     5. 791d006
     6. 9366f35

 - #21853: Not possible to use different column name in multiple indexers for subscription (reported by @nikunjkotecha) has been fixed in #21857 by @nikunjkotecha in 2.4-develop branch
   Related commits:
     1. 891198c
     2. 7da4940
     3. b59fc5a
     4. 4035ec0
     5. 320ced7
     6. 0d1ac3a
     7. 6cbf85f
     8. 7c2d2a6
     9. 8388a90
     10. 3f67ed8
     11. 873b814
     12. 392dbf6
     13. ff56be5
     14. e16f2c2
     15. 922e029
     16. 330d595
     17. 4c1094a
     18. 69cee97
     19. 46429a4
     20. 4ad7aae
     21. 8a9b768
     22. db4cf23
     23. 094decc
     24. 910eb41
     25. be3f84b

 - #31188: Newsletter enabled setting is always retrieved from the default scope (reported by @savimar06) has been fixed in #31208 by @saphaljha in 2.4-develop branch
   Related commits:
     1. 18aab3c
     2. 1de30e3
     3. cb4988a
     4. 7889a6f
     5. 21c0bff
     6. 3e1d239
     7. 5dab4fa
     8. d099df9
     9. 1c056ea
     10. f3b63dc
@magento-mts-svc
merge magento-commerce/2.4-develop into magento-honey-badgers/MC-38927
fd3cf88
@prabhuram93
Merge pull request #6518 from magento-honey-badgers/MC-38927
cd857f9 
[honey] MC-38927: [GraphQL] Customer Order Totals missing gift card amount
@gixid192 gixid192 merged commit b54b852 into mageplaza:2.4-develop Jan 27, 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