Skip to content

update from upstream #3

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

Merged
merged 8,508 commits into from
May 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8508 commits
Select commit Hold shift + click to select a range
e04f566
GraphQL-608: Remove “cart_address_id” from “ShippingMethodInput”
naydav Apr 29, 2019
5899e77
GraphQL-530: [Cart Operations] Update Cart Items validation messages
naydav Apr 29, 2019
035f602
GraphQL-631: Schema inconsistency of "Quantity / Qty" declaration
naydav Apr 29, 2019
3ccf676
Merge pull request #4115 from magento-engcom/graphql-develop-prs
naydav Apr 29, 2019
22b34da
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-99402
adifucan Apr 29, 2019
2826fdd
Merge remote-tracking branch 'origin/MAGETWO-99402' into MAGETWO-99402
adifucan Apr 29, 2019
604e223
GraphQL-621: BillingAddress and ShippingAddress should have different…
naydav Apr 29, 2019
274bb5e
ENGCOM-4853: GraphQl-621: BillingAddress and ShippingAddress should h…
magento-engcom-team Apr 29, 2019
0cd4e02
Merge remote-tracking branch 'origin/2.3-develop' into PR#631
naydav Apr 29, 2019
63a740b
GraphQL-631: Schema inconsistency of "Quantity / Qty" declaration
naydav Apr 29, 2019
9a887ee
ENGCOM-4850: Fix Quote Schema inconsistency #634
magento-engcom-team Apr 29, 2019
bd11d2b
Merge remote-tracking branch 'origin/2.3-develop' into mtf-eol-pr
tomreece Apr 29, 2019
2426688
ENGCOM-4853: GraphQl-621: BillingAddress and ShippingAddress should h…
naydav Apr 29, 2019
b76602b
ENGCOM-4850: Fix Quote Schema inconsistency #634
naydav Apr 29, 2019
bfca73d
Merge remote-tracking branch 'origin/2.3-develop' into feature/offlin…
naydav Apr 29, 2019
5766e14
GraphQL-601: [Test Coverage] Offline payments methods
naydav Apr 29, 2019
c155d34
ENGCOM-4832: Offline Payment Method Tests #632
magento-engcom-team Apr 29, 2019
7a7b1b3
ENGCOM-4832: Offline Payment Method Tests #632
naydav Apr 29, 2019
109182e
GraphQL-631: Schema inconsistency of "Quantity / Qty" declaration
naydav Apr 29, 2019
c44df1c
GraphQL-631: Schema inconsistency of "Quantity / Qty" declaration
naydav Apr 29, 2019
601cd31
MC-16046: Leverage the font-display CSS feature to ensure text is use…
adifucan Apr 29, 2019
779f39c
GraphQL-575: Schema inconsistency of "SelectedShippingMethod" declara…
naydav Apr 29, 2019
51508dd
ENGCOM-4854: GraphQl-575: Schema inconsistency of 'SelectedShippingMe…
magento-engcom-team Apr 29, 2019
d1a39c6
Merge remote-tracking branch 'engcom/ENGCOM-4854-magento-graphql-ce-6…
naydav Apr 29, 2019
f75f1fe
Merge remote-tracking branch 'origin/mtf-eol' into MC-4457
soumyau Apr 29, 2019
9909ce0
MC-4457: Convert OnePageCheckoutTest to MFTF
soumyau Apr 29, 2019
a562d34
Merge pull request #4126 from magento-panda/MAGETWO-99402
igrybkov Apr 29, 2019
7d27046
GraphQL-575: Schema inconsistency of "SelectedShippingMethod" declara…
naydav Apr 30, 2019
ad79f2d
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Apr 30, 2019
f623200
GraphQL-575: Schema inconsistency of "SelectedShippingMethod" declara…
naydav Apr 30, 2019
dff979f
Merge remote-tracking branch 'engcom/graphql-develop-prs' into graphq…
naydav Apr 30, 2019
56f79ed
GraphQL-631: Schema inconsistency of "Quantity / Qty" declaration
naydav Apr 30, 2019
690aa3f
Merge branch 2.3-develop into ENGCOM-3817-magento-magento2-20135
magento-engcom-team Apr 30, 2019
74ef0c0
magento/magento2#22020 static-test-fix
Nazar65 Apr 30, 2019
cb2026c
ENGCOM-4838: Non existing file, when adding image to gallery with mov…
magento-engcom-team Apr 30, 2019
723d8ad
Merge branch 2.3-develop into ENGCOM-4838-magento-magento2-22020
magento-engcom-team Apr 30, 2019
93a8162
Merge pull request #4136 from magento-engcom/graphql-develop-prs
naydav Apr 30, 2019
f900e10
magento/magento2#22526 static-test-fix
Nazar65 Apr 30, 2019
6a672d9
ENGCOM-4836: code cleanup (http to https) #22526
magento-engcom-team Apr 30, 2019
c0c55ef
Merge branch 2.3-develop into ENGCOM-4836-magento-magento2-22526
magento-engcom-team Apr 30, 2019
90e46d4
Merge pull request #96 from magento-pangolin/MC-4457
soumyau Apr 30, 2019
2fa4514
Merge remote-tracking branch 'origin/mtf-eol' into MC-4466
tomreece Apr 30, 2019
d3d0b54
MC-4756: Convert CreateCreditMemoEntityTest to MFTF
MilaLesechko Apr 30, 2019
7e8ada3
ENGCOM-4861: #628 Check if email or password are empty (generateCusto…
magento-engcom-team Apr 30, 2019
b9c974b
Merge remote-tracking branch 'origin/2.3-develop' into mtf-eol-pr
tomreece Apr 30, 2019
d107ede
Merge remote-tracking branch 'origin/mtf-eol' into MC-4756
tomreece Apr 30, 2019
81daba8
Cannot return null for non-nullable field SelectedCustomizableOptionV…
XxXgeoXxX Mar 22, 2019
742e6a7
Cannot return null for non-nullable field SelectedCustomizableOptionV…
XxXgeoXxX Mar 28, 2019
30bc7b7
Cannot return null for non-nullable field SelectedCustomizableOptionV…
XxXgeoXxX Apr 3, 2019
733ddf9
Cannot return null for non-nullable field SelectedCustomizableOptionV…
XxXgeoXxX Apr 27, 2019
1315577
GraphQL-474: Cannot return null for non-nullable field SelectedCustom…
naydav Apr 30, 2019
b115f1c
GraphQL-474: Cannot return null for non-nullable field SelectedCustom…
naydav Apr 30, 2019
f393ffd
GraphQL-641: Schema Inconsistency of "cartItems" declaration
naydav Apr 30, 2019
a75fc35
MQE-1519: Deliver weekly MTF conversion PR
tomreece Apr 30, 2019
83ed2ed
MC-16046: Leverage the font-display CSS feature to ensure text is use…
adifucan Apr 30, 2019
a3db130
Merge remote-tracking branch 'mainline/2.3-develop' into MC-16046
adifucan Apr 30, 2019
c28268e
GraphQL-630: Schema inconsistency of "AvailableShippingMethod" declar…
naydav Apr 30, 2019
667a8dd
Merge pull request #110 from magento-pangolin/MC-4466
tomreece Apr 30, 2019
05ea6ef
GraphQL-474: Cannot return null for non-nullable field SelectedCustom…
naydav Apr 30, 2019
81d4a0d
ENGCOM-4871: Cannot return null for non-nullable field SelectedCustom…
magento-engcom-team Apr 30, 2019
9a01c2f
GraphQL-641: Schema Inconsistency of "cartItems" declaration
naydav Apr 30, 2019
e077fb6
ENGCOM-4873: GraphQL-641: Schema Inconsistency of 'cartItems' declara…
magento-engcom-team Apr 30, 2019
2445cd4
ENGCOM-4923: #21473: Form element validation is not triggered when va…
magento-engcom-team Apr 30, 2019
2d3760e
[Catalog|Eav] Revert change of PR magento/magento2#13302 not included…
Den4ik Apr 30, 2019
49097a9
ENGCOM-4844: #222249 configurable product images wrong sorting fix #2…
sidolov Apr 30, 2019
ac1fd7f
ENGCOM-4840: fixed issue 22527 wishlist and compare icon alignment #2…
sidolov Apr 30, 2019
d7684c0
ENGCOM-4838: Non existing file, when adding image to gallery with mov…
sidolov Apr 30, 2019
d7ac4f6
ENGCOM-4836: code cleanup (http to https) #22526
sidolov Apr 30, 2019
d493dfc
ENGCOM-4752: Disabling "Display on Product Details Page" the button i…
sidolov Apr 30, 2019
1b39eb3
ENGCOM-3817: issue fixed #20124 Sort By label is hidden by Shop By Me…
sidolov Apr 30, 2019
5523461
magento-engcom/magento2ce#2809: Suppressed static test failures
sidolov Apr 30, 2019
fbed769
MQE-1519: Deliver weekly MTF conversion PR
KevinBKozan Apr 30, 2019
302e6ab
MQE-1519: Deliver weekly MTF conversion PR
tomreece Apr 30, 2019
1c50eba
MC-4756: Convert CreateCreditMemoEntityTest to MFTF
tomreece Apr 30, 2019
aae7428
387-Test coverage of getting IDs of CMS page/blocks by GraphQL API
atwixfirster Apr 30, 2019
a253222
GraphQL-630: Schema inconsistency of "AvailableShippingMethod" declar…
naydav Apr 30, 2019
ea71848
GraphQL-630: Schema inconsistency of "AvailableShippingMethod" declar…
naydav Apr 30, 2019
a35e817
ENGCOM-4921: GraphQL-630: Schema inconsistency of 'AvailableShippingM…
magento-engcom-team Apr 30, 2019
d6b0ee2
ENGCOM-4788: Store view specific labels cut in left navigation menu #…
magento-engcom-team Apr 30, 2019
7b523ee
MQE-1536: Magento\Install\Test\TestCase\InstallTest is failing
jilu1 Apr 30, 2019
83a940e
ENGCOM-4872: Additional files for revert PR 3677 #22561
magento-engcom-team Apr 30, 2019
91d8a92
magento/graphql-ce#646: Incorrect name of Selected Shipping Method
atwixfirster Apr 30, 2019
8a65e48
graphQl-640: fixed input type declaration for PaymentMethodAdditional…
May 1, 2019
9d240e3
graphQl-535: provided catalog configs
May 1, 2019
98b1d3c
magento/graphql-ce#649: GetSpecifiedBillingAddressTest fix misspelling
atwixfirster May 1, 2019
ac76e2e
magento/graphql-ce#602: [Test Coverage] Get Specified shipping address
atwixfirster May 1, 2019
8f36cf2
graphQl-535: fixed namespace
May 1, 2019
37677f8
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team May 1, 2019
0205787
Resolved typo error
singhabhinay May 1, 2019
5406328
fixed typo error
singhabhinay May 1, 2019
6bd7e48
Added Test coverage for "Get Selected payment method"
vovsky May 1, 2019
1b1b95a
ENGCOM-5005: 2.3 develop pr1 #22569
magento-engcom-team May 1, 2019
be7391f
Merge branch '2.3-develop' into mtf-eol-pr
KevinBKozan May 1, 2019
a69e9e9
Update credit-card-number-validator.js
justin-at-bounteous May 1, 2019
8a9422b
MQE-1519: Deliver weekly MTF conversion PR
tomreece May 1, 2019
71ce417
Merge pull request #109 from magento-pangolin/MC-4756
tomreece May 1, 2019
7a4dff2
ENGCOM-5006: Added Test coverage for 'Get Selected payment method' #653
magento-engcom-team May 1, 2019
d9edfe2
MQE-1532: Bump MFTF version in Magento
KevinBKozan May 1, 2019
30b049d
GraphQL-602: [Test Coverage] Get Specified shipping address
naydav May 1, 2019
6f0fb7f
ENGCOM-5008: magento/graphql-ce#602: [Test Coverage] Get Specified sh…
magento-engcom-team May 1, 2019
bfc5228
ENGCOM-5009: magento/graphql-ce#649: GetSpecifiedBillingAddressTest f…
magento-engcom-team May 1, 2019
64e76c4
GraphQL-646: Incorrect name of Selected Shipping Method
naydav May 1, 2019
28e791a
ENGCOM-5010: magento/graphql-ce#646: Incorrect name of Selected Shipp…
magento-engcom-team May 1, 2019
0ccea38
MAGETWO-99451: Custom customer address attribute values are empty whe…
May 1, 2019
76286a0
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
May 1, 2019
3714430
Merge remote-tracking branch 'mainline/2.3-develop' into MC-16046
adifucan May 1, 2019
0959569
GraphQL-640: Input type declaration in GraphQL SDL cannot be empty
naydav May 1, 2019
e6687b0
ENGCOM-5011: graphQl-640: fixed input type declaration for PaymentMet…
magento-engcom-team May 1, 2019
8b3fd9d
Merge pull request #4052 from magento-pangolin/mtf-eol-pr
KevinBKozan May 1, 2019
6661215
ENGCOM-5011: graphQl-640: fixed input type declaration for PaymentMet…
naydav May 1, 2019
bcda0d3
ENGCOM-5010: magento/graphql-ce#646: Incorrect name of Selected Shipp…
naydav May 1, 2019
0a5fcf8
ENGCOM-5009: magento/graphql-ce#649: GetSpecifiedBillingAddressTest f…
naydav May 1, 2019
1170d5c
ENGCOM-5008: magento/graphql-ce#602: [Test Coverage] Get Specified sh…
naydav May 1, 2019
0cc1f1d
ENGCOM-5006: Added Test coverage for "Get Selected payment method" #653
naydav May 1, 2019
53e8c50
ENGCOM-4873: GraphQL-641: Schema Inconsistency of "cartItems" declara…
naydav May 1, 2019
18ab161
ENGCOM-4861: #628 Check if email or password are empty (generateCusto…
naydav May 1, 2019
4eb9f3b
Merge remote-tracking branch 'upstream/2.3-develop' into MFTF-2.4.0
KevinBKozan May 1, 2019
a445230
MQE-1532: Bump MFTF version in Magento
KevinBKozan May 1, 2019
7e75dfa
Merge remote-tracking branch 'origin/ENGCOM-4921-magento-graphql-ce-6…
naydav May 1, 2019
567a523
Merge remote-tracking branch 'origin/ENGCOM-4871-magento-graphql-ce-5…
naydav May 1, 2019
4f69961
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team May 1, 2019
d51d9d7
Merge remote-tracking branch 'origin/2.3-develop' into mtf-eol
tomreece May 1, 2019
98bf900
MAGETWO-99451: Custom customer address attribute values are empty whe…
May 1, 2019
2dfd233
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
May 1, 2019
3bba6f3
MAGETWO-99451: Custom customer address attribute values are empty whe…
May 1, 2019
a2b7a08
MC-16046: Leverage the font-display CSS feature to ensure text is use…
adifucan May 1, 2019
cb2c13f
Merge remote-tracking branch 'mainline/2.3-develop' into MC-16046
adifucan May 1, 2019
9dd61cf
MC-16046: Leverage the font-display CSS feature to ensure text is use…
adifucan May 1, 2019
9359cca
GraphQL-641: Schema Inconsistency of "cartItems" declaration
naydav May 2, 2019
b96c2d8
Correct spelling
ravi-chandra3197 May 2, 2019
aa8c4b1
Merge branch 2.3-develop into ENGCOM-4923-magento-magento2-21992
magento-engcom-team May 2, 2019
bda7741
Merge pull request #1 from magento/2.3-develop
AfreenScarlet May 2, 2019
183e062
fixed typo issue
AfreenScarlet May 2, 2019
a1efd76
ENGCOM-5023: Fixed typo issue #22594
magento-engcom-team May 2, 2019
6f16f17
Merge branch 2.3-develop into ENGCOM-4788-magento-magento2-22423
magento-engcom-team May 2, 2019
9d8eaa4
MC-16046: Leverage the font-display CSS feature to ensure text is use…
adifucan May 2, 2019
a83eade
MQE-1536: Magento\Install\Test\TestCase\InstallTest is failing
jilu1 May 2, 2019
3bff559
Merge remote-tracking branch 'upstream/2.3-develop' into MQE-1536-2.3
jilu1 May 2, 2019
fe550c9
ENGCOM-4826: Update credit-card-number-validator.js #22493
magento-engcom-team May 2, 2019
b69d5a8
ENGCOM-5025: Correct spelling #22599
magento-engcom-team May 2, 2019
149d8eb
MAGETWO-99451: Custom customer address attribute values are empty whe…
May 2, 2019
28757e4
Merge pull request #4151 from magento-engcom/graphql-develop-prs
naydav May 2, 2019
237ae33
MC-4466: Convert DeleteProductFromMiniShoppingCartTest to MFTF
soumyau May 2, 2019
44a3508
MC-4466: Convert DeleteProductFromMiniShoppingCartTest to MFTF
soumyau May 2, 2019
21fdc04
MQE-1540: Deliver weekly MTF conversion PR
soumyau May 2, 2019
b801acc
Merge remote-tracking branch 'origin/2.3-develop' into mtf-eol-pr
soumyau May 2, 2019
5741106
Merge remote-tracking branch 'mainline/2.3-develop' into MC-16046
RuslanKostiv1 May 2, 2019
c94a655
GraphQl-309: [Checkout] Checkout Agreements
naydav May 2, 2019
d82262c
Merge remote-tracking branch 'origin/2.3-develop' into graphQl-309-ch…
naydav May 2, 2019
cc65d3e
Prevent Error When Getting Payment Method Before Setting
pmclain May 3, 2019
8b37ef7
Prevent undefined index warning before setting shipping method
pmclain May 3, 2019
093af61
Fix static tests.
nmalevanec May 3, 2019
ad163a1
ENGCOM-4839: Prevent display of token when save for later is not sele…
magento-engcom-team May 3, 2019
5f4103e
Merge branch 2.3-develop into ENGCOM-4839-magento-magento2-19767
magento-engcom-team May 3, 2019
509cded
magento/magento2#22599 static-test-fix
Nazar65 May 3, 2019
22c6fed
ENGCOM-5025: Correct spelling #22599
magento-engcom-team May 3, 2019
81b9591
Merge branch 2.3-develop into ENGCOM-5025-magento-magento2-22599
magento-engcom-team May 3, 2019
5f5a261
Resolved Typo
UdgamN May 3, 2019
a5f9488
Merge pull request #4146 from magento-panda/MC-16046
igrybkov May 3, 2019
9ab3993
Merge remote-tracking branch 'upstream/2.3-develop' into MQE-1536-2.3
jilu1 May 3, 2019
709ec28
ENGCOM-5035: Resolved Typo #22621
magento-engcom-team May 3, 2019
c6b1e10
MQE-1532: Bump MFTF version in Magento
KevinBKozan May 1, 2019
774534a
ENGCOM-5042: Prevent undefined index warning before setting shipping …
magento-engcom-team May 3, 2019
8a5e967
ENGCOM-5043: Prevent Error When Getting Payment Method Before Setting…
magento-engcom-team May 3, 2019
19fcb92
Merge pull request #4147 from magento-pangolin/MQE-1536-2.3
May 3, 2019
cf119be
387-Test coverage of getting IDs of CMS page/blocks by GraphQL API
atwixfirster May 3, 2019
ff658b5
387-Test coverage of getting IDs of CMS page/blocks by GraphQL API
atwixfirster May 3, 2019
df3047b
Fixed typo issue and added missing header in customer sales order grid
vishal-7037 May 4, 2019
1ae8bf5
issue #22647 fixed
cedarvinda May 4, 2019
fbcfd11
Fixed:#22395
satyaprakashpatel May 4, 2019
7934d1d
ENGCOM-5054: issues #22647 fixed, In customer account create page wor…
magento-engcom-team May 4, 2019
ff4c8cc
ENGCOM-5056: Fixed:#22395 #22720
magento-engcom-team May 5, 2019
74f2ca5
ENGCOM-5059: Fixed typo issue and added missing header in customer sa…
magento-engcom-team May 5, 2019
6f41862
ENGCOM-5035: Resolved Typo #22621
sivaschenko May 6, 2019
5011801
ENGCOM-5025: Correct spelling #22599
sivaschenko May 6, 2019
afb322a
ENGCOM-5023: Fixed typo issue #22594
sivaschenko May 6, 2019
28ed9a9
ENGCOM-5005: 2.3 develop pr1 #22569
sivaschenko May 6, 2019
09af726
ENGCOM-4872: Additional files for revert PR 3677 #22561
sivaschenko May 6, 2019
e4c9638
ENGCOM-4788: Store view specific labels cut in left navigation menu #…
sivaschenko May 6, 2019
fed22e0
387-Test coverage of getting IDs of CMS page/blocks by GraphQL API
atwixfirster May 6, 2019
b4ea6b9
387-Test coverage of getting IDs of CMS page/blocks by GraphQL API
atwixfirster May 6, 2019
4ee64a5
387-Test coverage of getting IDs of CMS page/blocks by GraphQL API
atwixfirster May 6, 2019
6a9860f
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop Minor …
magento-engcom-team May 6, 2019
c4dbac7
Merge remote-tracking branch 'tango/MAGETWO-99370' into PR-05
dhorytskyi May 6, 2019
702166c
Merge remote-tracking branch 'tango/MAGETWO-93522' into PR-05
dhorytskyi May 6, 2019
f270f29
Merge remote-tracking branch 'tango/MAGETWO-98801' into PR-05
dhorytskyi May 6, 2019
4109cdb
Merge remote-tracking branch 'tango/MAGETWO-99451' into PR-05
dhorytskyi May 6, 2019
a12ecfd
MAGETWO-99451: Custom customer address attribute values are empty whe…
dhorytskyi May 6, 2019
bd82ed4
Merge pull request #4168 from magento-tango/PR-05
dhorytskyi May 7, 2019
62cbf5b
magento/magento2#22720 static-test-fix
Nazar65 May 7, 2019
2042c30
ENGCOM-5056: Fixed:#22395 #22720
magento-engcom-team May 7, 2019
4576dfa
Merge branch 2.3-develop into ENGCOM-5056-magento-magento2-22720
magento-engcom-team May 7, 2019
8659328
ENGCOM-5059: Fixed typo issue and added missing header in customer sa…
sivaschenko May 7, 2019
a3bd403
ENGCOM-5056: Fixed:#22395 #22720
sivaschenko May 7, 2019
ecc2c38
ENGCOM-5054: issues #22647 fixed, In customer account create page wor…
sivaschenko May 7, 2019
b202e67
ENGCOM-4923: #21473: Form element validation is not triggered when va…
sivaschenko May 7, 2019
72978fe
ENGCOM-4839: Prevent display of token when save for later is not sele…
sivaschenko May 7, 2019
0c84b91
ENGCOM-4826: Update credit-card-number-validator.js #22493
sivaschenko May 7, 2019
4c40ed1
ENGCOM-4588: Custom option type select - Allow modify list of single …
sivaschenko May 7, 2019
5b292b0
Merge branch '2.3-develop' into MFTF-2.4.0
KevinBKozan May 7, 2019
47e78f7
Merge remote-tracking branch 'origin/2.3-develop' into mtf-eol-pr
soumyau May 7, 2019
c56341c
Merge pull request #4145 from magento-pangolin/MFTF-2.4.0
KevinBKozan May 7, 2019
e6facbf
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team May 7, 2019
d6d94fe
merge magento/2.3-develop into magento-pangolin/mtf-eol-pr
magento-cicd2 May 7, 2019
9f2f5b6
graphQl-535: removed unnecessary configs
May 8, 2019
7305a43
graphQl-309: added agreement mode
May 8, 2019
6a8edac
graphQl-309: merge remote
May 8, 2019
42fcf3d
graphQl-198: merge develop
May 8, 2019
3a88a35
graphQl-198: refactor related products graph ql business logic to sep…
May 8, 2019
4a5b330
graphQl-198: fixed description
May 8, 2019
29d5b88
testBundleProductWithNotVisibleChildren fix misspelling
speedy008 May 8, 2019
ec2ee49
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-gr…
naydav May 8, 2019
9a0a1b2
ENGCOM-5081: Fixed internal server error for query urlResolver #445
magento-engcom-team May 8, 2019
53e1aa5
ENGCOM-5087: testBundleProductWithNotVisibleChildren fix misspelling …
magento-engcom-team May 8, 2019
ad5d78d
MC-1540: Deliver weekly MTF conversion PR
soumyau May 8, 2019
544287b
Merge branch 'mtf-eol-pr' of https://github.com/magento-pangolin/mage…
soumyau May 8, 2019
c3040e6
GraphQl-309: [Checkout] Checkout Agreements
naydav May 8, 2019
c1c1dc0
Merge remote-tracking branch 'origin/2.3-develop' into graphQl-309-ch…
naydav May 8, 2019
beb058c
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team May 8, 2019
4d7be93
GraphQl-309: [Checkout] Checkout Agreements
naydav May 8, 2019
5c32883
ENGCOM-5027: GraphQl-309: [Checkout] Checkout Agreements #504
magento-engcom-team May 8, 2019
36c6185
MC-16312: Revert fix ENGCOM-1351
slopukhov May 8, 2019
d7b7a2e
GraphQl-387: Test coverage of getting IDs of CMS page/blocks by Graph…
naydav May 8, 2019
478f438
Merge remote-tracking branch 'origin/2.3-develop' into 387-test-cover…
naydav May 8, 2019
4835285
GraphQl-198: Products: access to related/up-sell/cross-sell product f…
naydav May 8, 2019
92d6feb
GraphQl-198: Products: access to related/up-sell/cross-sell product f…
naydav May 8, 2019
44529af
ENGCOM-5091: GraphQl-198: Products: access to related/up-sell/cross-s…
magento-engcom-team May 8, 2019
ff754e8
ENGCOM-5092: GraphQl-535: provided catalog configs #650
magento-engcom-team May 8, 2019
30b7000
MC-16312: Revert fix ENGCOM-1351
slopukhov May 8, 2019
787d31b
GraphQl-387: Test coverage of getting IDs of CMS page/blocks by Graph…
naydav May 8, 2019
8b1a506
ENGCOM-5088: 387-Test coverage of getting IDs of CMS page/blocks by G…
magento-engcom-team May 8, 2019
42f5c82
ENGCOM-5092: GraphQl-535: provided catalog configs #650
naydav May 8, 2019
feccc42
ENGCOM-5088: 387-Test coverage of getting IDs of CMS page/blocks by G…
naydav May 8, 2019
e981e66
ENGCOM-5087: testBundleProductWithNotVisibleChildren fix misspelling …
naydav May 8, 2019
7a231da
ENGCOM-5081: Fixed internal server error for query urlResolver #445
naydav May 8, 2019
cec0a61
ENGCOM-5043: Prevent Error When Getting Payment Method Before Setting…
naydav May 8, 2019
cf9ee31
ENGCOM-5042: Prevent undefined index warning before setting shipping …
naydav May 8, 2019
2aeb977
ENGCOM-5027: GraphQl-309: [Checkout] Checkout Agreements #504
naydav May 8, 2019
319ed53
Merge remote-tracking branch 'origin/ENGCOM-5091-magento-graphql-ce-3…
naydav May 8, 2019
f6f0f84
MC-1540: Deliver weekly MTF conversion PR
soumyau May 8, 2019
dcbf99b
GraphQl-198: Products: access to related/up-sell/cross-sell product f…
naydav May 8, 2019
06f0427
GraphQl-689: testBundleProductWithNotVisibleChildren fix misspelling
naydav May 8, 2019
0a7221a
Merge pull request #4183 from magento-performance/MC-16312
naydav May 8, 2019
cec11d5
Merge remote-tracking branch 'upstream/2.3-develop' into mtf-eol-pr
KevinBKozan May 8, 2019
0c0c89d
[Magento Community Engineering] Community Contributions - 2.3-develop
magento-engcom-team May 8, 2019
b0919e8
GraphQl-198: Products: access to related/up-sell/cross-sell product f…
naydav May 8, 2019
02a7a53
Merge remote-tracking branch 'engcom/graphql-develop-prs' into graphq…
naydav May 8, 2019
2ec065d
Merge pull request #4154 from magento-pangolin/mtf-eol-pr
KevinBKozan May 9, 2019
129641c
[Magento Community Engineering] Community Contributions - 2.3-develop
magento-engcom-team May 9, 2019
72aebb7
Merge pull request #4185 from magento-engcom/graphql-develop-prs
naydav May 10, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The Magento 2 development team will review all issues and contributions submitte
4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
3. PRs which include new logic or new features must be submitted along with:
* Unit/integration test coverage
* Proposed [documentation](http://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).

Expand All @@ -27,7 +27,7 @@ If you are a new GitHub user, we recommend that you create your own [free github
1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
3. Create and test your work.
4. Fork the Magento 2 repository according to the [Fork A Repository instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.

## Code of Conduct
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ atlassian*
/pub/media/import/*
!/pub/media/import/.htaccess
/pub/media/logo/*
/pub/media/custom_options/*
!/pub/media/custom_options/.htaccess
/pub/media/theme/*
/pub/media/theme_customization/*
!/pub/media/theme_customization/.htaccess
Expand Down
14 changes: 14 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
#AddType x-mapp-php5 .php
#AddHandler x-mapp-php5 .php

############################################
## enable usage of methods arguments in backtrace

SetEnv MAGE_DEBUG_SHOW_ARGS 1

############################################
## default index file

Expand Down Expand Up @@ -364,6 +369,15 @@
Require all denied
</IfVersion>
</Files>
<Files .user.ini>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>

# For 404s and 403s that aren't handled by the application, show plain 404 response
ErrorDocument 404 /pub/errors/404.php
Expand Down
14 changes: 14 additions & 0 deletions .htaccess.sample
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
#AddType x-mapp-php5 .php
#AddHandler x-mapp-php5 .php

############################################
## enable usage of methods arguments in backtrace

SetEnv MAGE_DEBUG_SHOW_ARGS 1

############################################
## default index file

Expand Down Expand Up @@ -341,6 +346,15 @@
Require all denied
</IfVersion>
</Files>
<Files .user.ini>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>

# For 404s and 403s that aren't handled by the application, show plain 404 response
ErrorDocument 404 /pub/errors/404.php
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ cache:
- $HOME/node_modules
- $HOME/yarn.lock
before_install:
- curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.0.deb && sudo service elasticsearch restart
- ./dev/travis/before_install.sh
install: composer install --no-interaction
before_script: ./dev/travis/before_script.sh
Expand Down
14 changes: 7 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ To get detailed information about changes in Magento 2.3.0, see the [Release Not

2.1.0
=============
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](https://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")

2.0.0
=============
Expand Down Expand Up @@ -489,7 +489,7 @@ Tests:
* Fixed an issue where found records in global search in Backend could not be selected via keyboard
* Fixed an issue where Category menu items went out of screen when page side was reached
* Fixed an issue where subcategories in menu were shown instantly when user moved mouse quickly
* Fixed an issue where popup header was our of window range while creating group product
* Fixed an issue where popup header was out of window range while creating group product
* Fixed an issue where region field was absent in customer address form on backend for "United Kingdom" country
* Fixed an ability to edit the Order from Admin panel
* Fixed an issue where email could not be retrieved from \Magento\Quote\Api\Data\AddressInterface after adding an address on OnePageCheckout
Expand Down Expand Up @@ -626,7 +626,7 @@ Tests:
* Fixed an issue where filters were not shown on product reviews report grid
* Fixed an issue where second customer address was not deleted from customer account
* Fixed an issue where custom options pop-up was still displayed after submit
* Fixed an issue where Second Product was not added to Shopping Cart from Wishlist at first atempt
* Fixed an issue where Second Product was not added to Shopping Cart from Wishlist at first attempt
* Fixed an issue where customer invalid email message was not displayed
* Fixed an issue where All Access Tokens for Customer without Tokens could not be revoked
* Fixed an issue where it was impossible to add Product to Shopping Cart from shared Wishlist
Expand Down Expand Up @@ -785,7 +785,7 @@ Tests:
* Refactored controller actions in the Product area
* Moved commands cache.php, indexer.php, log.php, test.php, compiler.php, singletenant\_compiler.php, generator.php, pack.php, deploy.php and file\_assembler.php to the new bin/magento CLI framework
* Data Migration Tool
* The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
* The Data Migration Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
* Fixed bugs
* Fixed an issue where error appeared during placing order with virtual product
* Fixed an issue where billing and shipping sections didn't contain address information on order print
Expand Down Expand Up @@ -1025,7 +1025,7 @@ Tests:
* Improved backend menu keyboard accessibility
* Accessibility improvements: WAI-ARIA in a product item on a category page and related products
* Checkout flow code can work with a separate DB storage
* <a href="http://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
* <a href="https://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
* Addressed naming inconsistencies in REST routes
* Added Advanced Developer workflow for frontend developers
* Setup
Expand Down Expand Up @@ -4136,7 +4136,7 @@ Tests:
* Moved Multishipping functionality to newly created module Multishipping
* Extracted Product duplication behavior from Product model to Product\Copier model
* Replaced event "catalog_model_product_duplicate" with composite Product\Copier model
* Replaced event "catalog_product_prepare_save" with controller product initialization helper that can be customozed via plugins
* Replaced event "catalog_product_prepare_save" with controller product initialization helper that can be customized via plugins
* Consolidated Authorize.Net functionality in single module Authorizenet
* Eliminated dependency of Sales module on Shipping and Usa modules
* Eliminated dependency of Shipping module on Customer module
Expand Down Expand Up @@ -4335,7 +4335,7 @@ Tests:
* Fixed order placing with virtual product using Express Checkout
* Fixed the error during order placement with Recurring profile payment
* Fixed wrong redirect after customer registration during multishipping checkout
* Fixed inability to crate shipping labels
* Fixed inability to create shipping labels
* Fixed inability to switch language, if the default language is English
* Fixed an issue with incorrect XML appearing in cache after some actions on the frontend
* Fixed product export
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<h2>Welcome</h2>
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.

## Magento system requirements
[Magento system requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
## Magento System Requirements
[Magento System Requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html).

## Install Magento

* [Installation guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
* [Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).

<h2>Contributing to the Magento 2 code base</h2>
<h2>Contributing to the Magento 2 Code Base</h2>
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.

To learn about how to make a contribution, click [here][1].
Expand All @@ -39,13 +39,13 @@ Magento is thankful for any contribution that can improve our code base, documen
<img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
</a>

### Labels applied by the Magento team
### Labels Applied by the Magento Team
We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.

## Reporting security issues
## Reporting Security Issues

To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account [there](https://bugcrowd.com/magento) to submit and follow-up your issue. Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue).
To report security vulnerabilities or learn more about reporting security issues in Magento software or web sites visit the [Magento Bug Bounty Program](https://hackerone.com/magento) on hackerone. Please create a hackerone account [there](https://hackerone.com/magento) to submit and follow-up your issue.

Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications](https://magento.com/security/sign-up).

Expand Down
3 changes: 3 additions & 0 deletions app/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
* Environment initialization
*/
error_reporting(E_ALL);
if (in_array('phar', \stream_get_wrappers())) {
stream_wrapper_unregister('phar');
}
#ini_set('display_errors', 1);

/* PHP version validation */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

namespace Magento\AdminNotification\Block\Grid\Renderer;

/**
* Renderer class for action in the admin notifications grid
*
* @package Magento\AdminNotification\Block\Grid\Renderer
*/
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
/**
Expand Down Expand Up @@ -37,7 +42,9 @@ public function __construct(
*/
public function render(\Magento\Framework\DataObject $row)
{
$readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' .
$readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' .
$this->escapeUrl($row->getUrl())
. '">' .
__('Read Details') . '</a>' : '';

$markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
<entity name="AdminMenuSystem">
<data key="pageTitle">System</data>
<data key="title">Notifications</data>
<data key="dataUiId">magento-backend-system</data>
</entity>
<entity name="AdminMenuSystemOtherSettingsNotifications">
<data key="pageTitle">Notifications</data>
<data key="title">Notifications</data>
<data key="dataUiId">magento-adminnotification-system-adminnotification</data>
</entity>
</entities>
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="AdminSystemNotificationNavigateMenuTest">
<annotations>
<features value="AdminNotification"/>
<stories value="Menu Navigation"/>
<title value="Admin system notification navigate menu test"/>
<description value="Admin should be able to navigate to System > Notifications"/>
<severity value="CRITICAL"/>
<testCaseId value="MC-14125"/>
<group value="menu"/>
<group value="mtf_migrated"/>
</annotations>
<before>
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
</before>
<after>
<actionGroup ref="logout" stepKey="logout"/>
</after>
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemNotificationPage">
<argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
<argument name="submenuUiId" value="{{AdminMenuSystemOtherSettingsNotifications.dataUiId}}"/>
</actionGroup>
<actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
<argument name="title" value="{{AdminMenuSystemOtherSettingsNotifications.pageTitle}}"/>
</actionGroup>
</test>
</tests>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.notification.container.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">notificationGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\AdminNotification\Model\ResourceModel\Grid\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\AdminNotification\Model\ResourceModel\Grid\Collection</argument>
<argument name="default_dir" xsi:type="string">DESC</argument>
<argument name="default_sort" xsi:type="string">date_added</argument>
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceContainer name="notifications">
<uiComponent name="notification_area"/>
<uiComponent name="notification_area" aclResource="Magento_AdminNotification::show_list"/>
<block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup"
name="unread_system_messages"
as="unread_system_messages"
Expand Down
Loading