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

2.2.4 #1

Open
wants to merge 10,000 commits into
base: 2.2
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
eac255e
Merge remote-tracking branch 'mpi/MC-19019' into BUGFIX-2.2-0823
dhorytskyi Aug 23, 2019
2f59ef1
Merge remote-tracking branch 'chaika/MC-18604' into BUGFIX-2.2-0823
dhorytskyi Aug 23, 2019
573a835
Merge remote-tracking branch 'mpi/MC-18741' into BUGFIX-2.2-0823
dhorytskyi Aug 23, 2019
2fb6bc1
Merge remote-tracking branch 'tango/MC-19199' into BUGFIX-2.2-0823
dhorytskyi Aug 23, 2019
7826dd2
Merge remote-tracking branch 'chaika/MC-18985' into BUGFIX-2.2-0823
dhorytskyi Aug 23, 2019
31630b7
Merge remote-tracking branch 'mpi/MC-18287' into BUGFIX-2.2-0823
dhorytskyi Aug 23, 2019
2aa3b76
Merge remote-tracking branch 'mpi/MC-18534' into BUGFIX-2.2-0823
dhorytskyi Aug 23, 2019
5562d10
Merge remote-tracking branch 'mpi/MC-18770' into BUGFIX-2.2-0823
dhorytskyi Aug 23, 2019
f312045
Merge remote-tracking branch 'mpi/MC-18790' into BUGFIX-2.2-0823
dhorytskyi Aug 23, 2019
49c408a
Merge pull request #4680 from magento-tango/BUGFIX-2.2-0823
dhorytskyi Aug 23, 2019
9c1ab2f
Merge pull request #4679 from magento-trigger/MC-19614
fascinosum Aug 23, 2019
3ac5c73
merge magento/2.2.10-develop into magento-tsg/2.2.10-develop-pr112
magento-cicd2 Aug 23, 2019
4e95621
Merge pull request #4681 from magento-tsg/2.2.10-develop-pr112
zakdma Aug 23, 2019
890d7dd
merge magento/2.2.10-develop into magento-tsg/MC-19568
magento-cicd2 Aug 26, 2019
1eca084
MC-19299: Change single pipes to double pipes in 2.2-develop composer…
fascinosum Aug 26, 2019
d3b5fd5
MC-19299: Change single pipes to double pipes in 2.2-develop composer…
fascinosum Aug 26, 2019
53d131a
Merge pull request #4687 from magento-tsg/MC-19568
nathanjosiah Aug 26, 2019
bdb65db
MC-18491: Update Changelog based on delivered scope
kieuphan2406 Aug 26, 2019
a8d44c3
MC-18491: Update Changelog based on delivered scope
kieuphan2406 Aug 26, 2019
e1c1f1b
MC-19610: Order is placed despite of js error
Aug 27, 2019
4cd347f
MC-19047: [Test Failed]: Magento\FunctionalTestingFramework.functiona…
zakdma Aug 27, 2019
5d747d6
MC-19519: Incorrect behavior after shipping methods disabled
SeruyV Aug 27, 2019
dd02241
MC-19519: Incorrect behavior after shipping methods disabled
SeruyV Aug 27, 2019
54e96be
MC-19047: [Test Failed]: Magento\FunctionalTestingFramework.functiona…
zakdma Aug 27, 2019
e340978
MC-19168: [backport for 2.2] backport fix for MC-18954 to 2.2-develop…
dhorytskyi Aug 28, 2019
9289ab9
Merge remote-tracking branch 'origin/2.2.10-develop' into MC-19610
SeruyV Aug 28, 2019
06e9c78
Merge remote-tracking branch 'origin/MC-19519' into 2.2.10-develop-pr113
zakdma Aug 28, 2019
95ae661
Merge remote-tracking branch 'origin/MC-19610' into 2.2.10-develop-pr113
SeruyV Aug 28, 2019
1e8e950
Merge remote-tracking branch 'origin/2.2.10-develop-pr113' into 2.2.1…
SeruyV Aug 28, 2019
cbe1c40
MC-19046: [Test Failed]: Magento\FunctionalTestingFramework.functiona…
ameysar Aug 28, 2019
d11afb1
MC-18801: Wish List shows it has an item but is really empty
odubovyk Aug 28, 2019
517fd51
MC-18801: Wish List shows it has an item but is really empty
odubovyk Aug 28, 2019
7497bf5
MC-19172: [backport for 2.2.10] backport fix for MC-18954 to 2.2.10 b…
dhorytskyi Aug 29, 2019
3be983f
Merge pull request #4700 from magento-tsg/2.2.10-develop-pr113
zakdma Aug 29, 2019
57b3c96
merge magento/2.2.10-develop into magento-tsg/2.2.10-develop-pr114
magento-cicd2 Aug 29, 2019
3ae1e3e
Merge pull request #4704 from magento-tsg/2.2.10-develop-pr114
zakdma Aug 29, 2019
7edfdab
MC-19048: [Test Failed]: Magento\FunctionalTestingFramework.functiona…
viktorpetryk Aug 29, 2019
778b54c
Merge remote-tracking branch 'origin/2.2.10-develop' into MC-19048
viktorpetryk Aug 29, 2019
3adfca7
MC-19050: [Test Failed]: Magento\FunctionalTestingFramework.functiona…
zakdma Aug 29, 2019
ebca033
Merge remote-tracking branch 'origin/MC-19050' into 2.2.10-develop-pr115
Aug 29, 2019
474b6e8
MC-19048: [Test Failed]: Magento\FunctionalTestingFramework.functiona…
zakdma Aug 29, 2019
c20097e
Merge remote-tracking branch 'origin/MC-19048' into 2.2.10-develop-pr115
zakdma Aug 29, 2019
893988e
MC-19048: [Test Failed]: Magento\FunctionalTestingFramework.functiona…
zakdma Aug 29, 2019
9caa386
Merge remote-tracking branch 'origin/MC-19048' into 2.2.10-develop-pr115
zakdma Aug 29, 2019
c3827e7
merge magento/2.2.10-develop into magento-tango/MC-19172
magento-cicd2 Aug 29, 2019
cdc6ea2
Merge pull request #4705 from magento-tsg/2.2.10-develop-pr115
zakdma Aug 29, 2019
e5f676d
Merge branch '2.2.10-develop' of https://github.com/magento/magento2c…
dhorytskyi Aug 29, 2019
a68880c
Merge branch 'MC-19172' of https://github.com/magento-tango/magento2c…
dhorytskyi Aug 29, 2019
10d2f78
Merge pull request #4710 from magento-tango/MC-19168
dhorytskyi Aug 29, 2019
94b85ea
Merge pull request #4703 from magento-tango/MC-19172
dhorytskyi Aug 29, 2019
f1dcd64
merge magento/2.2-develop into magento-trigger/MC-19299
magento-cicd2 Aug 30, 2019
d317cd4
Merge pull request #4714 from magento-trigger/MC-19299
fascinosum Aug 30, 2019
c304b05
MQE-1715: .credentials file must exist but it should not have to
okolesnyk Aug 30, 2019
d6b2741
Merge pull request #4716 from magento-pangolin/MQE-1715-2.2
okolesnyk Aug 30, 2019
d757fed
MC-19672: Simple product disappearing in the configurable grid after …
dhorytskyi Aug 30, 2019
7ea36ae
MC-19672: Simple product disappearing in the configurable grid after …
dhorytskyi Aug 31, 2019
60284ae
Merge remote-tracking branch 'mpi/MC-18809' into Chaika-PR-2019-09-01…
veloraven Sep 1, 2019
e1211b6
Merge pull request #4718 from magento-chaika/Chaika-PR-2019-09-01-2.2
dhorytskyi Sep 2, 2019
8dd332d
Merge remote-tracking branch 'chaika/MC-18801' into Chaika-PR-2019-09…
veloraven Sep 3, 2019
59b1140
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
dhorytskyi Sep 3, 2019
e618d24
MC-19773: Error Sorry we cannot connect to PayPal. Please try again i…
viktym Sep 3, 2019
d37be45
Merge remote-tracking branch 'magento/2.2-develop' into MC-19773
viktym Sep 4, 2019
86e20ed
MC-19048: [Test Failed]: Magento\FunctionalTestingFramework.functiona…
viktorpetryk Sep 4, 2019
105c706
MC-19048: [Test Failed]: Magento\FunctionalTestingFramework.functiona…
viktorpetryk Sep 4, 2019
a774aad
MC-17605: Unable to save edited product when max_sale_qty is Magento'…
zakdma Sep 4, 2019
0ad43ac
MC-17605: Unable to save edited product when max_sale_qty is Magento'…
zakdma Sep 4, 2019
10b3371
MC-19773: Error Sorry we cannot connect to PayPal. Please try again i…
viktym Sep 4, 2019
7f54568
MC-19672: Simple product disappearing in the configurable grid after …
dhorytskyi Sep 4, 2019
7e77407
Merge remote-tracking branch 'origin/2.2-develop' into MC-19590
adifucan Sep 4, 2019
70f04c0
MC-19672: Simple product disappearing in the configurable grid after …
dhorytskyi Sep 5, 2019
5ab8d6c
MC-19045: [Test Failed]:Magento\FunctionalTestingFramework.functional…
ameysar Sep 5, 2019
06abe7f
MC-19046: [Test Failed]: Magento\FunctionalTestingFramework.functiona…
ameysar Sep 5, 2019
36c80c8
MC-19672: Simple product disappearing in the configurable grid after …
dhorytskyi Sep 5, 2019
5618bf8
Merge pull request #4725 from magento-chaika/Chaika-PR-2019-09-03-2.2
dhorytskyi Sep 5, 2019
8a018d0
MC-19046: [Test Failed]: Magento\FunctionalTestingFramework.functiona…
ameysar Sep 6, 2019
0cc44c6
Merge remote-tracking branch 'origin/2.2-develop' into MC-19045
viktorpetryk Sep 6, 2019
0d439b6
Merge remote-tracking branch 'origin/2.2-develop' into MC-19590
adifucan Sep 6, 2019
37a0e7a
MC-19591: [2.2.x] Fix missing shim configurations
adifucan Sep 6, 2019
19603c9
MC-19588: [2.2.x] Fix phtml files with mage-init directives that cann…
adifucan Sep 6, 2019
023a47d
Merge remote-tracking branch 'performance-ce/MC-19590' into MC-19587
adifucan Sep 6, 2019
85b8882
Merge remote-tracking branch 'performance-ce/MC-19591' into MC-19587
adifucan Sep 6, 2019
b85b601
MC-19591: [2.2.x] Fix missing shim configurations
adifucan Sep 6, 2019
0d99c9f
Merge remote-tracking branch 'performance-ce/MC-19591' into MC-19587
adifucan Sep 6, 2019
abb3de3
MC-19588: [2.2.x] Fix phtml files with mage-init directives that cann…
adifucan Sep 6, 2019
e1a817a
Merge remote-tracking branch 'performance-ce/MC-19588' into MC-19587
adifucan Sep 6, 2019
909ff45
MC-19588: [2.2.x] Fix phtml files with mage-init directives that cann…
adifucan Sep 6, 2019
f99dff5
Merge remote-tracking branch 'performance-ce/MC-19588' into MC-19587
adifucan Sep 6, 2019
6c9e6f9
Merge remote-tracking branch 'tango/MC-19672' into Chailka-PR-2019-09…
veloraven Sep 7, 2019
87f4e1e
Merge pull request #4740 from magento-performance/MC-19587
duhon Sep 9, 2019
3720033
Merge branch '2.2-develop' into Chailka-PR-2019-09-06-2.2-2
veloraven Sep 9, 2019
0cffc58
Merge remote-tracking branch 'origin/2.2-develop' into MC-19046
viktorpetryk Sep 10, 2019
3a5185a
Merge pull request #4741 from magento-chaika/Chailka-PR-2019-09-06-2.2-2
dhorytskyi Sep 10, 2019
8ecde9c
MC-19539: Adding new configurations with new images to an existing co…
rostyslav-hymon Sep 11, 2019
f1b8d13
MC-8838: Frontend area session must not affect admin area
zakdma Sep 11, 2019
9679c05
Merge remote-tracking branch 'origin/MC-19045' into 2.2-develop-pr108
zakdma Sep 11, 2019
6343478
Merge remote-tracking branch 'origin/MC-19046' into 2.2-develop-pr108
zakdma Sep 11, 2019
e465c8a
Merge remote-tracking branch 'origin/MC-19048' into 2.2-develop-pr108
zakdma Sep 11, 2019
6db5533
MC-17605: Unable to save edited product when max_sale_qty is Magento'…
zakdma Sep 11, 2019
80ccd9f
Merge remote-tracking branch 'origin/MC-17605' into 2.2-develop-pr108
zakdma Sep 11, 2019
15eadfc
merge magento/2.2.10-develop into magento-trigger/MC-18491
magento-cicd2 Sep 11, 2019
12ee2b3
Merge pull request #4701 from magento-trigger/MC-18491
irenelagno Sep 11, 2019
71c2d12
MC-8724: Verify Category Product and Product Category partial reindex
DianaRusin Sep 13, 2019
4c7f71d
MC-18013: Ensure that accordion anchor is visible on viewport once cl…
svitja Sep 13, 2019
b611779
MC-18013: Ensure that accordion anchor is visible on viewport once cl…
svitja Sep 13, 2019
ed82741
MC-18013: Ensure that accordion anchor is visible on viewport once cl…
svitja Sep 13, 2019
4ba06ff
MC-13827: Failed funtional test Magento\FunctionalTestingFramework.fu…
dhorytskyi Sep 14, 2019
40c4fac
MC-13827: Failed funtional test Magento\FunctionalTestingFramework.fu…
dhorytskyi Sep 15, 2019
0666c86
Merge remote-tracking branch 'mpi/MC-19773' into Chaika-PR-2019-09-15…
veloraven Sep 16, 2019
6a7484e
Merge pull request #4780 from magento-tsg/2.2-develop-pr108
zakdma Sep 16, 2019
2a3c943
MC-7811: Cannot upload incorrect file
zakdma Sep 16, 2019
deade5d
MC-8724: Verify Category Product and Product Category partial reindex
DianaRusin Sep 16, 2019
afd3637
MC-7811: Cannot upload incorrect file
zakdma Sep 16, 2019
85f95be
Merge remote-tracking branch 'origin/2.2-develop' into MC-8724
svitja Sep 16, 2019
b08962c
Merge remote-tracking branch 'origin/MC-8724' into 2.2-develop-pr116
svitja Sep 16, 2019
40d6441
MC-8107: Storefront Navigation Menu UI, desktop
StasKozar Sep 16, 2019
6e9ad0a
Merge remote-tracking branch 'origin/MC-7811' into 2.2-develop-pr116
StasKozar Sep 16, 2019
96bd13c
Merge remote-tracking branch 'origin/MC-8107' into 2.2-develop-pr116
Sep 16, 2019
51ea9c4
Merge remote-tracking branch 'origin/MC-18013' into 2.2-develop-pr117
zakdma Sep 16, 2019
3a68504
Merge pull request #4787 from magento-tsg/2.2-develop-pr116
zakdma Sep 16, 2019
4fc5977
merge magento/2.2-develop into magento-chaika/Chaika-PR-2019-09-15-2.2
magento-cicd2 Sep 16, 2019
ab23533
Merge pull request #4776 from magento-tango/MC-13827
dhorytskyi Sep 16, 2019
aed8a0b
Merge pull request #4783 from magento-chaika/Chaika-PR-2019-09-15-2.2
dhorytskyi Sep 16, 2019
6e8eb6e
Merge remote-tracking branch 'origin/2.2-develop' into MC-18013
zakdma Sep 17, 2019
72cf490
MC-18013: Ensure that accordion anchor is visible on viewport once cl…
zakdma Sep 17, 2019
070eb29
Merge remote-tracking branch 'origin/MC-18013' into 2.2-develop-pr117
zakdma Sep 17, 2019
41c0af2
Merge pull request #4791 from magento-tsg/2.2-develop-pr117
zakdma Sep 17, 2019
e23c5a8
Merge branch '2.2-develop' into MC-19539
serhii-balko Sep 17, 2019
e94ea09
merge magento/2.2-develop into magento-tsg-csl3/MC-19539
magento-cicd2 Sep 17, 2019
6659a47
MC-20202: Move test MC-7811 to infrastructure
zakdma Sep 18, 2019
70207f4
Merge pull request #4792 from magento-tsg-csl3/MC-19539
zakdma Sep 18, 2019
e06216d
Merge remote-tracking branch 'origin/2.2-develop' into MC-20202
zakdma Sep 18, 2019
380b734
MC-20236: [2.2.10]Revert unapproved PR
irenelagno Sep 18, 2019
3510d97
Merge pull request #4801 from magento-trigger/MC-20236
irenelagno Sep 18, 2019
2dd1e1a
MC-18482: Magento 2.2.10 Publication
magento-team Sep 18, 2019
38e4028
MC-20202: Move test MC-7811 to infrastructure
zakdma Sep 19, 2019
42ee113
MQE-1746: Bump MFTF version in Magento
KevinBKozan Sep 19, 2019
830768c
Merge pull request #4821 from magento-pangolin/MFTF-2.5.0-2.2
KevinBKozan Sep 25, 2019
aa37684
MC-20416: Automation MC-8968
viktorpetryk Sep 25, 2019
aeeb08a
Merge remote-tracking branch 'origin/2.2-develop' into MC-20416
ameysar Sep 30, 2019
5793428
Merge remote-tracking branch 'origin/2.2-develop' into MC-20202
zakdma Oct 2, 2019
d55fb46
MC-20202: Move test MC-7811 to infrastructure
zakdma Oct 2, 2019
a6583be
MC-20157: Fix customer export
SeruyV Oct 3, 2019
92414d2
MC-20276: Image element minor changes
SeruyV Oct 4, 2019
f04a653
MC-18754: [Backport for 2.2.x] 'adminhtml_user_delete' missing delete…
svitja Oct 4, 2019
38c2709
MC-20276: Image element minor changes
SeruyV Oct 4, 2019
412fe3c
Merge pull request #4871 from magento-borg/borg-2.2.11
nathanjosiah Oct 8, 2019
bdf731f
Merge remote-tracking branch 'origin/2.2.11-develop' into MC-20157
SeruyV Oct 8, 2019
3db7e44
Merge remote-tracking branch 'origin/2.2.11-develop' into MC-20276
SeruyV Oct 8, 2019
e687bcf
Merge remote-tracking branch 'origin/MC-20276' into 2.2.11-develop-pr120
SeruyV Oct 8, 2019
1b0ccd5
MC-20615: [MFTF] Automate test AdminDeleteUsedCategoryUpdateTest MC-9217
viktorpetryk Oct 8, 2019
641ef20
MC-18684: [2.2.x] Remove custom layout updates from admin
Oct 8, 2019
7bf227d
MC-18684: [2.2.x] Remove custom layout updates from admin
Oct 8, 2019
d3ab916
MC-20615: [MFTF] Automate test AdminDeleteUsedCategoryUpdateTest MC-9217
viktorpetryk Oct 9, 2019
6419654
MC-20615: [MFTF] Automate test AdminDeleteUsedCategoryUpdateTest MC-9217
viktorpetryk Oct 9, 2019
5aec5d4
MC-20615: [MFTF] Automate test AdminDeleteUsedCategoryUpdateTest MC-9217
viktorpetryk Oct 9, 2019
04d01b8
MC-18684: [2.2.x] Remove custom layout updates from admin
Oct 9, 2019
c510d6e
MC-18684: [2.2.x] Remove custom layout updates from admin
Oct 9, 2019
b4d2413
MC-18684: [2.2.x] Remove custom layout updates from admin
Oct 9, 2019
157e1dc
MC-18684: [2.2.x] Remove custom layout updates from admin
Oct 9, 2019
571da16
MQE-1815: Bump MFTF version in Magento
tomreece Oct 10, 2019
4f88aa5
Merge pull request #4885 from magento-pangolin/MQE-1815-2.2
tomreece Oct 10, 2019
09a8e0f
Merge remote-tracking branch 'mainline/2.2' into MC-18487
Rrego6 Oct 11, 2019
ab74a16
MC-18487: Merge release branch into 2.2-develop
Rrego6 Oct 11, 2019
dc9b1bd
MC-18487: Merge release branch into 2.2-develop
Rrego6 Oct 11, 2019
f16a0bf
MC-18487: Merge release branch into 2.2-develop
Rrego6 Oct 11, 2019
4bb1163
MC-18487: Merge release branch into 2.2-develop
Rrego6 Oct 11, 2019
6ceb359
MC-18487: Merge release branch into 2.2-develop
Rrego6 Oct 11, 2019
59b3d78
Merge remote-tracking branch 'mainline/2.2-develop' into MC-18487
Rrego6 Oct 14, 2019
cb0c096
MC-18487: Merge release branch into 2.2-develop
Rrego6 Oct 14, 2019
cbaf1b4
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
Oct 15, 2019
c0a47cd
MC-18684: [2.2.x] Remove custom layout updates from admin
Oct 15, 2019
1c03288
MC-18684: [2.2.x] Remove custom layout updates from admin
Oct 16, 2019
18102d9
Merge pull request #4906 from magento-trigger/MC-18487
fascinosum Oct 17, 2019
7e3dc29
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
Oct 19, 2019
fb43b86
Merge remote-tracking branch 'origin/2.2-develop' into MC-20615
viktorpetryk Oct 21, 2019
994a649
MQE-1836: Bump MFTF version in Magento
soumyau Oct 23, 2019
3f6b55b
Merge pull request #4922 from magento-pangolin/2.2-develop-MFTF2.5.2
KevinBKozan Oct 23, 2019
f6e5dc7
Merge remote-tracking branch 'origin/2.2-develop' into MC-20615
Oct 24, 2019
5c170fc
Merge remote-tracking branch 'origin/2.2-develop' into MC-20416
viktorpetryk Oct 24, 2019
a2997b0
MC-20416: Automation MC-8968
viktorpetryk Oct 24, 2019
bbaecc6
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
Oct 24, 2019
bd30060
Merge branch '2.2-develop' into 2.2.11-develop
dvoskoboinikov Oct 24, 2019
3652abc
MC-18684: [2.2.x] Remove custom layout updates from admin
Oct 24, 2019
5905592
MC-18762: Fix incorrect website name rendering
SeruyV Oct 25, 2019
db2b978
MC-18762: Fix incorrect website name rendering
SeruyV Oct 25, 2019
4055818
Merge remote-tracking branch 'upstream/2.2.11-develop' into MAGETWO-9…
Oct 25, 2019
8df459c
Merge pull request #4926 from magento-arcticfoxes/MAGETWO-97997
joanhe Oct 25, 2019
3dee417
Merge remote-tracking branch 'origin/2.2.11-develop' into MC-18762
SeruyV Oct 30, 2019
925c5f8
Merge remote-tracking branch 'origin/MC-18762' into 2.2.11-develop-pr120
SeruyV Oct 30, 2019
57fb6d3
MC-21505: Deprecate Authorize.Net core payment integration in 2.2.11
ameysar Oct 30, 2019
6edfb10
MC-21966: Category path changes
Oct 30, 2019
5d4323d
MC-22172: Resolve jQuery issue
Oct 30, 2019
bc78473
MC-20202: Move test MC-7811 to infrastructure
zakdma Oct 31, 2019
280ccf7
Merge remote-tracking branch 'origin/MC-20202' into 2.2-develop-pr118
zakdma Oct 31, 2019
114c812
Merge remote-tracking branch 'origin/MC-20416' into 2.2-develop-pr118
zakdma Oct 31, 2019
af66f47
Merge remote-tracking branch 'origin/MC-20615' into 2.2-develop-pr118
zakdma Oct 31, 2019
ba60b45
MC-20157: Fix customer export
zakdma Oct 31, 2019
5551a35
Merge remote-tracking branch 'origin/MC-20157' into 2.2.11-develop-pr120
zakdma Oct 31, 2019
45d8f5a
MQE-1879: Deliver MFTF 2.5.3 to mainline branches
KevinBKozan Oct 31, 2019
3350e4a
MC-20202: Move test MC-7811 to infrastructure
zakdma Nov 1, 2019
de3cdad
MC-20615: [MFTF] Automate test AdminDeleteUsedCategoryUpdateTest MC-9217
zakdma Nov 1, 2019
ced6027
MC-20416: Automation MC-8968
zakdma Nov 1, 2019
66e70a7
MC-20615: [MFTF] Automate test AdminDeleteUsedCategoryUpdateTest MC-9217
zakdma Nov 1, 2019
a05fe38
Merge remote-tracking branch 'origin/MC-20615' into 2.2-develop-pr118
zakdma Nov 1, 2019
b507a09
Merge remote-tracking branch 'origin/MC-20416' into 2.2-develop-pr118
zakdma Nov 1, 2019
8a4974f
Merge remote-tracking branch 'origin/MC-20202' into 2.2-develop-pr118
zakdma Nov 1, 2019
2f1db51
Merge pull request #4956 from magento-pangolin/MFTF-2.5.3-2.2
KevinBKozan Nov 1, 2019
6607565
merge magento/2.2-develop into magento-tsg/2.2-develop-pr118
magento-mts-svc Nov 2, 2019
02d975a
Merge pull request #4957 from magento-tsg/2.2-develop-pr118
zakdma Nov 2, 2019
eb91c20
Merge pull request #4963 from magento-tsg/2.2.11-develop-pr120
zakdma Nov 4, 2019
7f1b353
Merge remote-tracking branch 'upstream/2.2-develop' into MC-22172
Nov 4, 2019
b60d290
Merge pull request #4943 from magento-borg/MC-22172
nathanjosiah Nov 4, 2019
e5525c4
merge magento/2.2-develop into magento-qwerty/MC-18684
dvoskoboinikov Nov 4, 2019
6f7f395
MC-22758: Update filtered methods to prevent template errors
nathanjosiah Nov 4, 2019
38de4ec
Merge pull request #4969 from magento-qwerty/MC-18684
dvoskoboinikov Nov 4, 2019
8784691
MC-22758: Update filtered methods to prevent template errors
nathanjosiah Nov 5, 2019
3c114db
Merge pull request #4975 from magento-borg/MC-22758
nathanjosiah Nov 5, 2019
30bda58
Merge remote-tracking branch 'origin/2.2.11-develop' into MC-21966
Nov 5, 2019
d90c731
Merge remote-tracking branch 'origin/MC-21505' into 2.2-develop-pr122
zakdma Nov 7, 2019
d2529b5
Merge pull request #4999 from magento-tsg/2.2.11-develop-pr121
zakdma Nov 7, 2019
1778c8f
Merge pull request #5005 from magento-tsg/2.2-develop-pr122
zakdma Nov 8, 2019
7efdeeb
MC-22925: Backport template filter strict mode
nathanjosiah Sep 10, 2019
09542b8
Merge branch '2.2-develop' into 2.2.11-develop
fascinosum Nov 8, 2019
d2b9542
MC-22925: Backport template filter strict mode
nathanjosiah Nov 8, 2019
81311d5
MC-22925: Backport template filter strict mode
nathanjosiah Nov 8, 2019
e289d4f
MC-22925: Backport template filter strict mode
nathanjosiah Nov 9, 2019
1224b47
MC-22925: Backport template filter strict mode
nathanjosiah Nov 9, 2019
51e2624
Merge pull request #5009 from magento-borg/scalar-pr-2.2
nathanjosiah Nov 9, 2019
e98eff7
Merge branch '2.2-develop' into 2.2.11-develop
fascinosum Nov 11, 2019
d652422
MC-23123: PHP 7.1 syntax in 2.2 release line
nathanjosiah Nov 14, 2019
c147a89
MC-23059: Template strict mode is not set for unsaved template previews
nathanjosiah Nov 14, 2019
8049a14
MC-23059: Template strict mode is not set for unsaved template previews
nathanjosiah Nov 14, 2019
60ccf94
MC-23059: Template strict mode is not set for unsaved template previews
nathanjosiah Nov 15, 2019
7b5b332
Merge pull request #5029 from magento-borg/MC-23123
nathanjosiah Nov 15, 2019
08a64c1
MC-29044: PHP 7.1 syntax in 2.2 release line
irenelagno Nov 21, 2019
4c6a785
MC-29042: script text rendering in Magento UI in 2.2.10 & 2.2.11
Nov 27, 2019
0216792
MC-29042: script text rendering in Magento UI in 2.2.10 & 2.2.11
Nov 28, 2019
951224a
MC-29042: script text rendering in Magento UI in 2.2.10 & 2.2.11
zakdma Nov 29, 2019
bb61a1c
MC-29042: script text rendering in Magento UI in 2.2.10 & 2.2.11
zakdma Dec 2, 2019
f8383a6
MC-29042: script text rendering in Magento UI in 2.2.10 & 2.2.11
zakdma Dec 3, 2019
a0b9beb
Merge pull request #5076 from magento-tsg/2.2.11-develop-pr124
zakdma Dec 4, 2019
09a7892
merge magento/2.2.11-develop into magento-trigger/MC-29044
magento-mts-svc Dec 4, 2019
b793a3f
Merge pull request #5046 from magento-trigger/MC-29044
zakdma Dec 4, 2019
1ad4498
MC-29378: Preview URLs
Dec 9, 2019
3eb81e2
Merge pull request #5100 from magento-borg/MC-29378
nathanjosiah Dec 10, 2019
8b05171
MC-29763: [2.2.11] Reviews do not render in Staging Preview
SeruyV Dec 17, 2019
ad73e52
Merge pull request #5138 from magento-tsg/2.2.11-develop-pr125
zakdma Dec 18, 2019
b6c553b
MC-29778: Cannot add configurable product to cart
nathanjosiah Dec 19, 2019
25bba66
Merge pull request #5142 from magento-borg/MC-29778
zakdma Dec 19, 2019
5911389
MC-22048: Magento 2.2.11 Publication
magento-team Jan 7, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
MC-23059: Template strict mode is not set for unsaved template previews
  • Loading branch information
nathanjosiah committed Nov 14, 2019
commit 8049a14a4cadbc3fbf9793e15c222204d2c2ecba
Original file line number Diff line number Diff line change
@@ -36,6 +36,7 @@
<switchToNextTab stepKey="switchToPreviewTab"/>
<waitForElementVisible selector="{{BasicFieldNewsletterSection.previewIframe}}" stepKey="waitForIframeVisible"/>
<executeJS function="document.getElementById('preview_iframe').sandbox.add('allow-scripts')" stepKey="addSandboxValue"/>
<wait time="10" stepKey="waitForSandbox"/>
<switchToIFrame userInput="preview_iframe" stepKey="switchToIframe"/>
<waitForPageLoad stepKey="waitForPreviewIframeLoaded"/>
</actionGroup>
@@ -44,6 +45,6 @@
<arguments>
<argument name="Newsletter" defaultValue="BasicFieldNewsletterSection"/>
</arguments>
<waitForText userInput="{{Newsletter.expectedTemplate}}" stepKey="checkTemplateContainsText"/>
<waitForText userInput="{{Newsletter.expectedTemplate}}" stepKey="checkTemplateContainsText" time="30"/>
</actionGroup>
</actionGroups>