Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
964 commits
Select commit Hold shift + click to select a range
eaf8caa
MAGETWO-91434: Default option for Status attribute not being set
dthampy Jun 4, 2018
3409fba
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 4, 2018
9fa6425
hitesh-wagento Jun 4, 2018
27e9d2f
fix: support multiple minisearch widget instances
May 17, 2018
7a3d351
MAGETWO-90764: [2.3.0] Cannot cancel orders with an expired authoriza…
OlgaVasyltsun Jun 5, 2018
b45ef30
MAGETWO-90808: [Performance] Customer Import check data does not comp…
zakdma Jun 5, 2018
cad4518
Merge branch '2.3-develop' into MAGETWO-90808
zakdma Jun 5, 2018
9e03568
ENGCOM-1845: [Forwardport] fix: support multiple minisearch widget in…
magento-engcom-team Jun 5, 2018
c825e04
ENGCOM-1851: [Forwardport] [Resolved : Styling <select> by changing l…
magento-engcom-team Jun 5, 2018
0ad656d
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
Jun 5, 2018
75b821d
MAGETWO-90808: [Performance] Customer Import check data does not comp…
zakdma Jun 5, 2018
f3066c6
ENGCOM-1857: [Forwardport] Error 500 in Module Manager #15755
magento-engcom-team Jun 5, 2018
279655a
MAGETWO-90787: Swagger does not render correctly for many POST/PUT op…
zakdma Jun 5, 2018
32e7169
MAGETWO-92128: Limitation of displayed attribute options number in la…
OlgaVasyltsun Jun 5, 2018
bc3c5db
Merge branch '2.3-develop' into MAGETWO-92128
OlgaVasyltsun Jun 5, 2018
8770b41
Merge remote-tracking branch 'origin/MAGETWO-89407' into 2.3-develop-…
zakdma Jun 5, 2018
3c60f87
Merge remote-tracking branch 'origin/MAGETWO-89991' into 2.3-develop-…
zakdma Jun 5, 2018
43b3714
Merge remote-tracking branch 'origin/MAGETWO-90762' into 2.3-develop-…
zakdma Jun 5, 2018
d128d03
Merge remote-tracking branch 'origin/MAGETWO-90787' into 2.3-develop-…
zakdma Jun 5, 2018
009ddf5
Merge remote-tracking branch 'origin/MAGETWO-91104' into 2.3-develop-…
zakdma Jun 5, 2018
1825c06
Merge remote-tracking branch 'origin/MAGETWO-91807' into 2.3-develop-…
zakdma Jun 5, 2018
a393505
Merge remote-tracking branch 'origin/MAGETWO-92134' into 2.3-develop-…
zakdma Jun 5, 2018
78e0d13
Merge remote-tracking branch 'origin/MAGETWO-66217' into 2.3-develop-…
zakdma Jun 5, 2018
745d99d
Merge remote-tracking branch 'origin/MAGETWO-90349' into 2.3-develop-…
zakdma Jun 5, 2018
71bfdc6
Merge remote-tracking branch 'origin/MAGETWO-64173' into 2.3-develop-…
zakdma Jun 5, 2018
843fa11
ENGCOM-1689: fix for Wrong price amount on product page #11717 #15540
magento-engcom-team Jun 5, 2018
110ee75
Format the javascript code
yogeshsuhagiya May 3, 2018
3994790
Refactor JS code and added JS component file
yogeshsuhagiya May 4, 2018
8281b38
Fixed issue of line feed at end of the file
yogeshsuhagiya May 4, 2018
d008516
Merge remote-tracking branch 'origin/MAGETWO-50831' into 2.3-develop-…
OlgaVasyltsun Jun 5, 2018
e7dc28f
ENGCOM-1871: [Forwardport] Format the javascript code #10 #15833
magento-engcom-team Jun 5, 2018
e46e5a5
check if order data is available to incl ec
torhoehn Jun 4, 2018
c77d3cb
ENGCOM-1872: [Up-port] check if order data is available to incl ec #1…
magento-engcom-team Jun 5, 2018
c3f5cd7
MAGETWO-67024: Sorting by price ignores Catalog Price Rule for Simple…
svitja Jun 5, 2018
c5295a4
MAGETWO-67024: Sorting by price ignores Catalog Price Rule for Simple…
svitja Jun 5, 2018
4bb4155
ENGCOM-1873: Fixed a couple of typos #15695
magento-engcom-team Jun 5, 2018
8583f10
MAGETWO-90764: [2.3.0] Cannot cancel orders with an expired authoriza…
OlgaVasyltsun Jun 5, 2018
644aabc
MAGETWO-91434: Default option for Status attribute not being set
dthampy Jun 5, 2018
7094961
MC-141: Guest customer should be able to advance search grouped produ…
jilu1 Jun 5, 2018
ea8c241
Fixed return type hinting in DocBlocks
rogyar Jun 5, 2018
16dd29a
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-9184…
danielrenaud Jun 5, 2018
addd4af
merge magento/2.3-develop into magento-arcticfoxes/MAGETWO-91434
Jun 5, 2018
539039c
ENGCOM-1877: Fixed return type hinting in DocBlocks for Wishlist modu…
magento-engcom-team Jun 5, 2018
5aaf95b
merge magento/2.3-develop into magento-honey-badgers/MAGETWO-91436-Cu…
Jun 5, 2018
43533f9
Update webapi.xml to fix typo
mhaack Jun 5, 2018
2c9cc60
MAGETWO-91437: Invalidate indexer after category is deleted
eric-bohanon Jun 5, 2018
eeef0be
MAGETWO-91437: Fix tests
eric-bohanon Jun 5, 2018
ef2c079
MC-181: Configurable Product goes "Out of Stock" if all associated Si…
leviv Jun 5, 2018
6110fdd
Merge pull request #2649 from magento-arcticfoxes/MAGETWO-91434
cpartica Jun 5, 2018
2136fca
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-9143…
cpartica Jun 5, 2018
92392b5
MAGETWO-91436: Custom Options are corruputed when saving product to a…
cpartica Jun 5, 2018
51f72c4
MC-181: Configurable Product goes "Out of Stock" if all associated Si…
leviv Jun 5, 2018
c257b80
MC-235: Customer should only see cart price rule discount if conditio…
tomreece Jun 5, 2018
5565a24
Merge pull request #2650 from magento-honey-badgers/MAGETWO-91436-Cus…
cpartica Jun 6, 2018
d93fc4f
merge magento/2.3-develop into magento-borg/MAGETWO-91848-max-characters
Jun 6, 2018
b5a2e0e
MAGETWO-92137: Refreshing page deletes shipping address on guest chec…
OlgaVasyltsun Jun 6, 2018
172e5ae
hitesh-wagento Jun 6, 2018
e6e0868
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr21
zakdma Jun 6, 2018
08e6de1
ENGCOM-1882: [Forwardport] [Resolved : limiter float too generic] #15879
magento-engcom-team Jun 6, 2018
eae1379
MAGETWO-92136: Tiered pricing and quantity Increments do not work wit…
svitja Jun 6, 2018
c44f1f8
[Forwardport 2.3] Trim username on customer account login page
dankhrapiyush Jun 6, 2018
d35b544
ENGCOM-1890: [Forwardport] Update webapi.xml to fix typo #15867
magento-engcom-team Jun 6, 2018
2e6669e
ENGCOM-1877: Fixed return type hinting in DocBlocks for Wishlist modu…
Jun 6, 2018
bd29d28
ENGCOM-1873: Fixed a couple of typos #15695
Jun 6, 2018
c5f9fb4
ENGCOM-1871: [Forwardport] Format the javascript code #10 #15833
Jun 6, 2018
7291e70
ENGCOM-1857: [Forwardport] Error 500 in Module Manager #15755
Jun 6, 2018
bf5f004
ENGCOM-1851: [Forwardport] [Resolved : Styling <select> by changing l…
Jun 6, 2018
cfa7196
ENGCOM-1845: [Forwardport] fix: support multiple minisearch widget in…
Jun 6, 2018
27807fd
ENGCOM-1829: Fixes in catalog component blocks [2.3-develop] #15558
Jun 6, 2018
65d27f5
ENGCOM-1827: [Forwardport] Docblock typo fixes #15572
Jun 6, 2018
50ff419
ENGCOM-1818: [Forwardport] Prevent multiple add-to-cart initializatio…
Jun 6, 2018
c5f43cf
ENGCOM-1811: [Forwardport] Fix method name (typo) #15745
Jun 6, 2018
b821f30
ENGCOM-1810: [Forwardport] Resolved : UI Component listing action col…
Jun 6, 2018
eabf3cb
ENGCOM-1783: Fix minor issues in ui export converter classes #15692
Jun 6, 2018
7e1b294
ENGCOM-1782: [Forwardport] Fixes in config module #15649
Jun 6, 2018
d3cf6ff
ENGCOM-1689: fix for Wrong price amount on product page #11717 #15540
Jun 6, 2018
8f9f374
ENGCOM-1810: [Forwardport] Resolved : UI Component listing action col…
Jun 6, 2018
697db6f
Merge remote-tracking branch 'origin/MAGETWO-90764' into 2.3-develop-…
DianaRusin Jun 6, 2018
a851540
Solve overlapping Issue on every Home page & category page of Hot Sel…
chirag-wagento Jun 6, 2018
793d9a6
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-92137
OlgaVasyltsun Jun 6, 2018
f6a18e0
MAGETWO-91102: [2.3.0] Admin orders being sent to Signifyd for review…
StasKozar Jun 6, 2018
1ccc299
MAGETWO-92130: An error happens when you have a new Critical Admin No…
zakdma Jun 6, 2018
400960c
MAGETWO-91102: [2.3.0] Admin orders being sent to Signifyd for review…
StasKozar Jun 6, 2018
5da50d2
MAGETWO-67024: Sorting by price ignores Catalog Price Rule for Simple…
svitja Jun 6, 2018
f70c155
MAGETWO-67024: Sorting by price ignores Catalog Price Rule for Simple…
svitja Jun 6, 2018
c62d922
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
Jun 6, 2018
0687df0
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr21
zakdma Jun 6, 2018
25bc40e
MAGETWO-65458: Cart Rules are not excluding Bundle Products
DianaRusin Jun 6, 2018
23d76ed
Adjust the cache key for product price box renderer in order to fix t…
dmytro-ch Jun 6, 2018
9620f5a
Merge remote-tracking branch 'origin/MAGETWO-92128' into 2.3-develop-…
DianaRusin Jun 6, 2018
eb7d034
MAGETWO-91529: Restricted admin user can remove product from other we…
Jun 6, 2018
d22ca2f
Merge branch 'reece-cart-rules' into RE-develop
tomreece Jun 6, 2018
d3a849c
Merge pull request #2656 from magento-tsg/2.3-develop-pr21
Jun 6, 2018
cb87510
MC-234: Admin should be able to create category from the product page
leviv Jun 1, 2018
c45b9f2
MC-234: Admin should be able to create category from the product page
leviv Jun 1, 2018
e0e4003
MC-234: Admin should be able to create category from the product page
leviv Jun 1, 2018
08b118d
MC-234: Admin should be able to create category from the product page
leviv Jun 1, 2018
0c2ff2b
MC-234: Admin should be able to create category from the product page
leviv Jun 4, 2018
7da6a5a
MC-234: Admin should be able to create category from the product page
leviv Jun 4, 2018
fa3637c
MC-234: Admin should be able to create category from the product page
leviv Jun 4, 2018
4efae74
Merge branch 'MC-234' into RE-develop
leviv Jun 6, 2018
622fa8d
MC-179: Admin should be able to update existing attributes of a confi…
leviv Jun 6, 2018
13b9bfa
MC-141: Guest customer should be able to advance search grouped produ…
jilu1 Jun 6, 2018
776988b
MC-179: Admin should be able to update existing attributes of a confi…
leviv Jun 6, 2018
a556767
merge magento/2.3-develop into magento-honey-badgers/MAGETWO-91437-Ca…
Jun 6, 2018
09f5b04
Merge branch 'MC-179' into RE-develop
leviv Jun 6, 2018
ffa75c9
MAGETWO-91437: Fix unit and static failures
eric-bohanon Jun 6, 2018
d8f617f
MAGETWO-91848: Hint on product option with Maximum Characters should …
danielrenaud Jun 6, 2018
9163538
ENGCOM-1893: [Forwardport] Solve overlapping Issue on every Home page…
magento-engcom-team Jun 6, 2018
7f93520
ENGCOM-1900: [Forwardport 2.3] Trim username on customer account logi…
magento-engcom-team Jun 6, 2018
fdaf7cb
Remove double semicolon from the style sheets.
sanganinamrata Jun 5, 2018
3782793
Fixed set template syntax issue
sanganinamrata Jun 5, 2018
21ce9fb
hitesh-wagento Jun 7, 2018
0157463
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-92137
OlgaVasyltsun Jun 7, 2018
4d03776
chore: remove unused less import
DanielRuf Jun 5, 2018
6655382
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-91102
StasKozar Jun 7, 2018
a0186de
MAGETWO-92137: Refreshing page deletes shipping address on guest chec…
OlgaVasyltsun Jun 7, 2018
4d611ba
ENGCOM-1901: [Forwardport] chore: remove unused less import #15921
magento-engcom-team Jun 7, 2018
16933f8
ENGCOM-1904: [Forwardport] [Resolved : Changing @tab-content__border …
magento-engcom-team Jun 7, 2018
09b3aac
Merge branch '2.3-develop' into MAGETWO-92130
zakdma Jun 7, 2018
b1e02d8
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-65458
DianaRusin Jun 7, 2018
f3234e1
MAGETWO-90761: [2.3.0] PayPal orders status display always as Processing
StasKozar Jun 7, 2018
56fc476
ENGCOM-1912: [Forwardport] Fixed set template syntax issue #15912
magento-engcom-team Jun 7, 2018
52c4e2b
ENGCOM-1913: [Forwardport] Remove double semicolon from the style she…
magento-engcom-team Jun 7, 2018
b02161b
MAGETWO-92137: Refreshing page deletes shipping address on guest chec…
OlgaVasyltsun Jun 7, 2018
5d9e6ea
ENGCOM-1914: [Forwardport] Complete the fix for cache issue due to th…
magento-engcom-team Jun 7, 2018
7618a9a
ENGCOM-1914: [Forwardport] Complete the fix for cache issue due to th…
Jun 7, 2018
fba5580
ENGCOM-1913: [Forwardport] Remove double semicolon from the style she…
Jun 7, 2018
c95e087
ENGCOM-1912: [Forwardport] Fixed set template syntax issue #15912
Jun 7, 2018
a3762f9
ENGCOM-1901: [Forwardport] chore: remove unused less import #15921
Jun 7, 2018
d6d758f
ENGCOM-1890: [Forwardport] Update webapi.xml to fix typo #15867
Jun 7, 2018
1b51d5c
ENGCOM-1872: [Up-port] check if order data is available to incl ec #1…
Jun 7, 2018
a9e9127
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-92136
ameysar Jun 7, 2018
30892bd
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-67024
zakdma Jun 7, 2018
f4caee2
ENGCOM-1919: [Forwardport] Fixed Purchased Order Form button should v…
magento-engcom-team Jun 7, 2018
73c97af
Merge remote-tracking branch 'origin/MAGETWO-67024' into 2.3-develop-…
zakdma Jun 7, 2018
c212f14
Merge remote-tracking branch 'origin/MAGETWO-92136' into 2.3-develop-…
ameysar Jun 7, 2018
5630657
Merge remote-tracking branch 'origin/MAGETWO-91803' into 2.3-develop-…
StasKozar Jun 7, 2018
55a6d51
MAGETWO-92133: Admin global search feature broken
svitja Jun 7, 2018
bb039a6
Merge remote-tracking branch 'origin/MAGETWO-90808' into 2.3-develop-…
StasKozar Jun 7, 2018
4688217
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 7, 2018
252e075
MAGETWO-90761: [2.3.0] PayPal orders status display always as Processing
StasKozar Jun 7, 2018
3bcd0d0
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-9184…
danielrenaud Jun 7, 2018
4c5410a
MC-181: Configurable Product goes "Out of Stock" if all associated Si…
leviv Jun 7, 2018
d6886c1
Merge remote-tracking branch 'origin/MAGETWO-92133' into 2.3-develop-…
StasKozar Jun 7, 2018
e38ac26
MC-181: Configurable Product goes "Out of Stock" if all associated Si…
leviv Jun 7, 2018
f5068ec
Merge branch 'MC-181' into RE-develop
leviv Jun 7, 2018
b65ba22
Merge remote-tracking branch 'upstream/2.3-develop' into RE-develop
jilu1 Jun 7, 2018
2722448
MC-248: Admin should be able to create simple product with two custom…
leviv Jun 1, 2018
40e12d9
MC-248: Admin should be able to create simple product with two custom…
leviv Jun 4, 2018
7ee5a8b
MC-248: Admin should be able to create simple product with two custom…
leviv Jun 5, 2018
784c1e1
MC-248: Admin should be able to create simple product with two custom…
leviv Jun 7, 2018
073fd71
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr22
zakdma Jun 7, 2018
f64e7fa
MAGETWO-91437: Formatting change
eric-bohanon Jun 7, 2018
8ef08d0
Merge branch 'MC-248' into RE-develop
leviv Jun 7, 2018
941f26f
ENGCOM-1833: Limit list of filterable product fields #26
Jun 7, 2018
90e95ff
merge magento/2.3-develop into magento-honey-badgers/MAGETWO-91437-Ca…
Jun 7, 2018
15c9fa5
Merge branch 'MC-111-2.3.0' into MQE-1048
jilu1 Jun 7, 2018
199200c
MQE-1048: add non-tests codes from branch with blocked tests
jilu1 Jun 7, 2018
7d370f4
MAGETWO-91848: Hint on product option with Maximum Characters should …
danielrenaud Jun 7, 2018
681e65f
Wrong annotation in _toOptionArray : lib\internal\Magento\Framework\D…
sanganinamrata Jun 6, 2018
cb0108f
Wrong annotation in _toOptionArray : lib\internal\Magento\Framework\D…
sanganinamrata Jun 6, 2018
d76fe20
ISSUE-11477 - fixed Swagger response for searchCriteria - added zero …
May 18, 2018
2b7beca
Merge pull request #2660 from magento-honey-badgers/MAGETWO-91437-Cat…
cpartica Jun 8, 2018
f752b9e
No need to pass method parameter as method definition does not requir…
Jun 6, 2018
9ae9bab
Merge remote-tracking branch 'origin/MAGETWO-90761' into 2.3-develop-…
DianaRusin Jun 8, 2018
f93c916
MAGETWO-92137: Refreshing page deletes shipping address on guest chec…
OlgaVasyltsun Jun 8, 2018
f5df570
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr22
zakdma Jun 8, 2018
b72f5c3
MAGETWO-65458: Cart Rules are not excluding Bundle Products
DianaRusin Jun 8, 2018
c20d777
Merge remote-tracking branch 'origin/MAGETWO-92130' into 2.3-develop-…
DianaRusin Jun 8, 2018
1d0ef5b
Merge remote-tracking branch 'origin/MAGETWO-92137' into 2.3-develop-…
DianaRusin Jun 8, 2018
7c08f0d
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-9184…
danielrenaud Jun 8, 2018
b0720bf
MQE-1048: add non-tests codes from branch with blocked tests
jilu1 Jun 8, 2018
445bb79
MC-234: Admin should be able to create category from the product page
leviv Jun 8, 2018
afa280c
Merge remote-tracking branch 'origin/MAGETWO-65458' into 2.3-develop-…
StasKozar Jun 8, 2018
af966c9
Merge branch 'MQE-1048' into RE-develop
jilu1 Jun 8, 2018
6f4bcfa
MC-234: Admin should be able to create category from the product page
leviv Jun 8, 2018
11ce389
MC-234: Admin should be able to create category from the product page
leviv Jun 8, 2018
756a72e
MAGETWO-91529: Restricted admin user can remove product from other we…
dthampy Jun 8, 2018
2eb2882
Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-91529
Jun 8, 2018
53fc9b8
Merge branch 'MAGETWO-91529' of https://github.com/magento-borg/magen…
Jun 8, 2018
e279d2c
Merge pull request #2651 from magento-borg/MAGETWO-91848-max-characters
cpartica Jun 8, 2018
6f13e93
MC-234: Admin should be able to create category from the product page
leviv Jun 8, 2018
f7c3630
MAGETWO-92468: Make PR tests namespace-agnostic to support testing ex…
pdohogne-magento Jun 5, 2018
5fe735b
MAGETWO-92468: Blacklisting non-Magento code directories from copyrig…
pdohogne-magento Jun 7, 2018
9efebd7
Merge branch 'mainline-2.3-develop' into ENGCOM-1833-magento-graphql-…
Jun 8, 2018
ce8a93e
Merge remote-tracking branch 'remotes/mainline/2.3-develop' into ENGC…
Jun 9, 2018
3ab560d
Merge pull request #2672 from magento-engcom/ENGCOM-1833-magento-grap…
paliarush Jun 9, 2018
ca5df87
merge magento/2.3-develop into magento-borg/MAGETWO-92468-make-tests-…
Jun 9, 2018
33393e2
Merge pull request #2676 from magento-borg/MAGETWO-92468-make-tests-n…
pdohogne-magento Jun 9, 2018
e508120
Added unit test for CaptchaStringResolver
rogyar Jun 10, 2018
19967c0
ENGCOM-1933: [Forwardport]No need to pass method parameter as method …
magento-engcom-team Jun 11, 2018
0717f9c
ENGCOM-1934: [Forwardport] ISSUE-11477 - fixed Swagger response for s…
magento-engcom-team Jun 11, 2018
9bdd954
ENGCOM-1936: [Forwardport] Wrong annotation in _toOptionArray : lib\i…
magento-engcom-team Jun 11, 2018
f958d50
Added strict types declaration
rogyar Jun 11, 2018
e65c7c1
ENGCOM-1936: [Forwardport] Wrong annotation in _toOptionArray : lib\i…
Jun 11, 2018
05f9392
ENGCOM-1934: [Forwardport] ISSUE-11477 - fixed Swagger response for s…
Jun 11, 2018
49ce545
ENGCOM-1933: [Forwardport]No need to pass method parameter as method …
Jun 11, 2018
25442f9
Merge remote-tracking branch 'origin/MAGETWO-91102' into 2.3-develop-…
svitja Jun 11, 2018
55256fa
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 11, 2018
444f5c7
ENGCOM-1943: Added unit test for CaptchaStringResolver #15986
magento-engcom-team Jun 11, 2018
cb141c5
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr22
zakdma Jun 11, 2018
5cfc987
merge magento/2.3-develop into magento-tsg/2.3-develop-pr22
Jun 11, 2018
02aaccb
Merge pull request #2681 from magento-tsg/2.3-develop-pr22
Jun 11, 2018
ad6b38e
Merge branch 'MC-234' into RE-develop
leviv Jun 11, 2018
cc91c03
Merge remote-tracking branch 'origin/2.3-develop' into RE-develop
tomreece Jun 11, 2018
ab33715
Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-91529
Jun 11, 2018
2e7c579
Remove unnecessary parameter from invoking toHtml() method
rogyar Jun 11, 2018
4e89943
merge magento/2.3-develop into magento-borg/MAGETWO-91529
Jun 11, 2018
507051b
MAGETWO-91529: Restricted admin user can remove product from other we…
Jun 12, 2018
206059f
MAGETWO-91529: Restricted admin user can remove product from other we…
Jun 12, 2018
0a76e94
MAGETWO-91529: Restricted admin user can remove product from other we…
Jun 12, 2018
e082db1
Merge branch 'MAGETWO-91529' of https://github.com/magento-borg/magen…
Jun 12, 2018
ddcf91f
MAGETWO-91529: Restricted admin user can remove product from other we…
Jun 12, 2018
852665a
ENGCOM-1943: Added unit test for CaptchaStringResolver #15986
Jun 12, 2018
5fd1bf5
ENGCOM-1919: [Forwardport] Fixed Purchased Order Form button should v…
Jun 12, 2018
ca6ee33
ENGCOM-1830: [Forwardport] FIX for issue #15457 - Bundle Products pri…
Jun 12, 2018
c9fc88f
ENGCOM-1831: [Forwardport] FIX fo rissue #15510 - First PDF download …
Jun 12, 2018
f4b014d
fix for dropdown toggle icon
Karlasa Jun 11, 2018
f28471e
extend default config instead overwrite
likemusic Jun 11, 2018
7782bdc
Simplify echo statement
orlangur Jun 12, 2018
81e4833
ENGCOM-1954: [Forwardport] Extend default config instead overwrite #1…
magento-engcom-team Jun 12, 2018
4c676c9
ENGCOM-1956: [Forwardport] fix for dropdown toggle icon in cart #16042
magento-engcom-team Jun 12, 2018
6b0f6ef
ENGCOM-1946: Wishlist: Remove unnecessary parameter from invoking toH…
magento-engcom-team Jun 12, 2018
a8a431e
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-90739
zakdma Jun 12, 2018
f2843b7
Merge branch 'MAGETWO-90739' into 2.3-develop-pr23
zakdma Jun 12, 2018
ff6e0b8
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 12, 2018
cea78f9
ENGCOM-1956: [Forwardport] fix for dropdown toggle icon in cart #16042
Jun 12, 2018
5c39bfa
ENGCOM-1954: [Forwardport] Extend default config instead overwrite #1…
Jun 12, 2018
762886e
ENGCOM-1946: Wishlist: Remove unnecessary parameter from invoking toH…
Jun 12, 2018
e533306
ENGCOM-1904: [Forwardport] [Resolved : Changing @tab-content__border …
Jun 12, 2018
88274d5
ENGCOM-1900: [Forwardport 2.3] Trim username on customer account logi…
Jun 12, 2018
4496e99
ENGCOM-1893: [Forwardport] Solve overlapping Issue on every Home page…
Jun 12, 2018
f238b8d
ENGCOM-1882: [Forwardport] [Resolved : limiter float too generic] #15879
Jun 12, 2018
b15327b
merge magento/2.3-develop into magento-borg/MAGETWO-91529
Jun 12, 2018
32486c5
ENGCOM-1904: [Forwardport] [Resolved : Changing @tab-content__border …
Jun 12, 2018
85953af
Merge remote-tracking branch 'origin/2.3-develop' into RE-develop
tomreece Jun 12, 2018
eca9d9d
Merge pull request #2691 from magento-borg/MAGETWO-91529
cpartica Jun 12, 2018
f57a4ef
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 12, 2018
1a1e5bf
merge magento/2.3-develop into magento-pangolin/RE-develop
Jun 12, 2018
8132ea4
Fixed static test failures
Jun 13, 2018
5d5bd7a
Fixed static test failures
Jun 13, 2018
5bb066c
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr23
zakdma Jun 13, 2018
285a39c
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 13, 2018
012d0a3
merge magento/2.3-develop into magento-tsg/2.3-develop-pr23
Jun 13, 2018
c67893b
Merge pull request #2696 from magento-tsg/2.3-develop-pr23
Jun 13, 2018
03011d0
MQE-1061: Stabilize RE-develop branch
tomreece Jun 13, 2018
6216112
merge magento/2.3-develop into magento-pangolin/RE-develop
Jun 13, 2018
919dd8c
Merge pull request #2683 from magento-pangolin/RE-develop
okolesnyk Jun 13, 2018
79fff2a
Disabling sorting in glob and scandir functions for better performance
Jun 12, 2018
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
  •  
  •  
  •  
28 changes: 14 additions & 14 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
# Contributing to Magento 2 code

Contributions to the Magento 2 codebase are done using the fork & pull model.
This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes (hence the phrase “pull request”).
This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes. For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).

Contributions can take the form of new components/features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations or just good suggestions.
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 or optimizations.

The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor for two weeks, the issue is closed.
The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor within two weeks, the pull request will be closed.


## Contribution requirements

1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v2.0/coding-standards/bk-coding-standards.html).
2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request to be merged quickly and without additional clarification requests.
3. Commits must be accompanied by meaningful commit messages.
4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.2/coding-standards/bk-coding-standards.html).
2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.2-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
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 (we will be releasing more information on writing test coverage in the near future).
* Proposed [documentation](http://devdocs.magento.com) update. Documentation contributions can be submitted [here](https://github.com/magento/devdocs).
4. For large features or changes, please [open an issue](https://github.com/magento/magento2/issues) and discuss first. This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
5. All automated tests are passed successfully (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
* 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).
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).

## Contribution process

If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, fork the Magento 2 project and be able to easily send pull requests.
If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). This will allow you to collaborate with the Magento 2 development team, fork the Magento 2 project and send pull requests.

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 [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
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).
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
29 changes: 20 additions & 9 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,35 @@
<!--- Provide a general summary of the issue in the Title above -->
<!--- Before adding new issues, please, check this article https://github.com/magento/magento2/wiki/Issue-reporting-guidelines-->
<!---
Thank you for contributing to Magento.
To help us process this issue we recommend that you add the following information:
- Summary of the issue,
- Information on your environment,
- Steps to reproduce,
- Expected and actual results,

Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
-->

### Preconditions
<!--- Provide a more detailed information of environment you use -->
<!--- Magento version, tag, HEAD, etc., PHP & MySQL version, etc.. -->
<!---
Please provide as detailed information about your environment as possible.
For example Magento version, tag, HEAD, PHP & MySQL version, etc..
-->
1.
2.

### Steps to reproduce
<!--- Provide a set of unambiguous steps to reproduce this bug include code, if relevant -->
<!---
It is important to provide a set of clear steps to reproduce this bug.
If relevant please include code samples
-->
1.
2.
3.

### Expected result
<!--- Tell us what should happen -->
1.
1. [Screenshots, logs or description]

### Actual result
<!--- Tell us what happens instead -->
1. [Screenshot, logs]

<!--- (This may be platform independent comment) -->
1. [Screenshots, logs or description]
25 changes: 21 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,32 @@
<!--- Provide a general summary of the Pull Request in the Title above -->
<!---
Thank you for contributing to Magento.
To help us process this pull request we recommend that you add the following information:
- Summary of the pull request,
- Issue(s) related to the changes made,
- Manual testing scenarios,
-->

<!--- Please provide a general summary of the Pull Request in the Title above -->

### Description
<!--- Provide a description of the changes proposed in the pull request -->
<!---
Please provide a description of the changes proposed in the pull request.
Letting us know what has changed and why it needed changing will help us validate this pull request.
-->

### Fixed Issues (if relevant)
<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant -->
<!---
If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
-->
1. magento/magento2#<issue_number>: Issue title
2. ...

### Manual testing scenarios
<!--- Provide a set of unambiguous steps to test the proposed code change -->
<!---
Please provide a set of unambiguous steps to test the proposed code change.
Giving us manual testing scenarios will help with the processing and validation process.
-->
1. ...
2. ...

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,10 @@ public function execute()
if (empty($result)) {
$result[] = [
'severity' => (string)\Magento\Framework\Notification\MessageInterface::SEVERITY_NOTICE,
'text' => 'You have viewed and resolved all recent system notices. '
. 'Please refresh the web page to clear the notice alert.',
'text' => __(
'You have viewed and resolved all recent system notices. '
. 'Please refresh the web page to clear the notice alert.'
)
];
}
/** @var \Magento\Framework\Controller\Result\Json $resultJson */
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/i18n/en_US.csv
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,4 @@ Severity,Severity
"Date Added","Date Added"
Message,Message
Actions,Actions
"You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert.","You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert."
75 changes: 57 additions & 18 deletions app/code/Magento/Authorizenet/Model/Directpost.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
*/
namespace Magento\Authorizenet\Model;

use Magento\Framework\HTTP\ZendClientFactory;
use Magento\Framework\App\ObjectManager;
use Magento\Payment\Model\Method\ConfigInterface;
use Magento\Payment\Model\Method\TransparentInterface;
use Magento\Sales\Model\Order\Email\Sender\OrderSender;

/**
* Authorize.net DirectPost payment method model.
Expand Down Expand Up @@ -102,7 +101,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
protected $response;

/**
* @var OrderSender
* @var \Magento\Sales\Model\Order\Email\Sender\OrderSender
*/
protected $orderSender;

Expand All @@ -123,6 +122,16 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
*/
private $psrLogger;

/**
* @var \Magento\Sales\Api\PaymentFailuresInterface
*/
private $paymentFailures;

/**
* @var \Magento\Sales\Model\Order
*/
private $order;

/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
Expand All @@ -134,18 +143,19 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
* @param \Magento\Framework\Module\ModuleListInterface $moduleList
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Authorizenet\Helper\Data $dataHelper
* @param Directpost\Request\Factory $requestFactory
* @param Directpost\Response\Factory $responseFactory
* @param \Magento\Authorizenet\Model\Directpost\Request\Factory $requestFactory
* @param \Magento\Authorizenet\Model\Directpost\Response\Factory $responseFactory
* @param \Magento\Authorizenet\Model\TransactionService $transactionService
* @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
* @param \Magento\Sales\Model\OrderFactory $orderFactory
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param OrderSender $orderSender
* @param \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender
* @param \Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
* @param array $data
* @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
Expand All @@ -161,16 +171,17 @@ public function __construct(
\Magento\Authorizenet\Helper\Data $dataHelper,
\Magento\Authorizenet\Model\Directpost\Request\Factory $requestFactory,
\Magento\Authorizenet\Model\Directpost\Response\Factory $responseFactory,
TransactionService $transactionService,
ZendClientFactory $httpClientFactory,
\Magento\Authorizenet\Model\TransactionService $transactionService,
\Magento\Framework\HTTP\ZendClientFactory $httpClientFactory,
\Magento\Sales\Model\OrderFactory $orderFactory,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender,
\Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository,
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
array $data = []
array $data = [],
\Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null
) {
$this->orderFactory = $orderFactory;
$this->storeManager = $storeManager;
Expand All @@ -179,6 +190,8 @@ public function __construct(
$this->orderSender = $orderSender;
$this->transactionRepository = $transactionRepository;
$this->_code = static::METHOD_CODE;
$this->paymentFailures = $paymentFailures ? : ObjectManager::getInstance()
->get(\Magento\Sales\Api\PaymentFailuresInterface::class);

parent::__construct(
$context,
Expand Down Expand Up @@ -561,13 +574,10 @@ public function process(array $responseData)
$this->validateResponse();

$response = $this->getResponse();
//operate with order
$orderIncrementId = $response->getXInvoiceNum();
$responseText = $this->dataHelper->wrapGatewayError($response->getXResponseReasonText());
$isError = false;
if ($orderIncrementId) {
/* @var $order \Magento\Sales\Model\Order */
$order = $this->orderFactory->create()->loadByIncrementId($orderIncrementId);
if ($this->getOrderIncrementId()) {
$order = $this->getOrderFromResponse();
//check payment method
$payment = $order->getPayment();
if (!$payment || $payment->getMethod() != $this->getCode()) {
Expand Down Expand Up @@ -632,9 +642,10 @@ public function checkResponseCode()
return true;
case self::RESPONSE_CODE_DECLINED:
case self::RESPONSE_CODE_ERROR:
throw new \Magento\Framework\Exception\LocalizedException(
$this->dataHelper->wrapGatewayError($this->getResponse()->getXResponseReasonText())
);
$errorMessage = $this->dataHelper->wrapGatewayError($this->getResponse()->getXResponseReasonText());
$order = $this->getOrderFromResponse();
$this->paymentFailures->handle((int)$order->getQuoteId(), $errorMessage);
throw new \Magento\Framework\Exception\LocalizedException($errorMessage);
default:
throw new \Magento\Framework\Exception\LocalizedException(
__('There was a payment authorization error.')
Expand Down Expand Up @@ -988,12 +999,40 @@ protected function getTransactionResponse($transactionId)
private function getPsrLogger()
{
if (null === $this->psrLogger) {
$this->psrLogger = \Magento\Framework\App\ObjectManager::getInstance()
$this->psrLogger = ObjectManager::getInstance()
->get(\Psr\Log\LoggerInterface::class);
}
return $this->psrLogger;
}

/**
* Fetch order by increment id from response.
*
* @return \Magento\Sales\Model\Order
*/
private function getOrderFromResponse(): \Magento\Sales\Model\Order
{
if (!$this->order) {
$this->order = $this->orderFactory->create();

if ($incrementId = $this->getOrderIncrementId()) {
$this->order = $this->order->loadByIncrementId($incrementId);
}
}

return $this->order;
}

/**
* Fetch order increment id from response.
*
* @return string
*/
private function getOrderIncrementId(): string
{
return $this->getResponse()->getXInvoiceNum();
}

/**
* Checks if filter action is Report Only. Transactions that trigger this filter are processed as normal,
* but are also reported in the Merchant Interface as triggering this filter.
Expand Down
Loading