Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2116 commits
Select commit Hold shift + click to select a range
d41ce33
ENGCOM-1444: Prevent double home links in breadcrumbs at product page…
May 18, 2018
cbe91ae
ENGCOM-1587: Fix typo in property name #15292
magento-engcom-team May 18, 2018
7b417ed
MAGETWO-91327: Customer attributes length validation on form doesn't …
May 18, 2018
8ea661c
[task] add deprecated notice to misspelled method
May 18, 2018
1a0c8e5
[task] add deprecated notice to misspelled method
May 18, 2018
d29fdd2
Refactor javscript for customer logout
patelnimesh1988 May 18, 2018
48a8b1d
Fixed typo mistake in function comment
sanganinamrata May 18, 2018
1bd038e
MAGETWO-90968: Refund amounts are off when Rewards, Store Credit and …
YevSent May 18, 2018
1e1ceb9
Removed extra added space in function comment and fixed typo mistakes.
sanganinamrata May 18, 2018
298e392
Revert back file changes
sanganinamrata May 18, 2018
732832d
Fixed Invalid quote mark issue
patelnimesh1988 May 18, 2018
44031e0
Revert back file changes.
sanganinamrata May 18, 2018
c4db071
Merge branch 'ns-patch-8' of https://github.com/NamrataChangani/magen…
sanganinamrata May 18, 2018
6dd9f6e
[Fix] forgot to add lowercase conversion on grouped product assignati…
jalogut May 18, 2018
75f208f
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
May 18, 2018
9c2abef
MAGETWO-87955: Mini Cart is not getting updated while removing produc…
iivashchenko May 18, 2018
dfa8aa3
MAGETWO-73456: Product Url key value comes from product name on store…
May 18, 2018
8c63e42
Merge remote-tracking branch 'origin/MAGETWO-90634' into bugfixes
May 18, 2018
714d31c
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
VladimirZaets May 18, 2018
2201be6
MAGETWO-91894: Backport Static Test Fixes in CE
slavvka May 18, 2018
9644572
Merge pull request #2563 from magento-borg/MAGETWO-91894-2.2
slavvka May 18, 2018
630faa1
ENGCOM-1587: Fix typo in property name #15292
VladimirZaets May 18, 2018
96d31f5
ENGCOM-1586: [Backport] Fix typo in database column comment #15291
VladimirZaets May 18, 2018
807ab61
ENGCOM-1584: [fix] typo in private method name getUniq[ue]ImageIndex …
VladimirZaets May 18, 2018
c920e3e
ENGCOM-1582: Fix typo in Image::open exception message #15269
VladimirZaets May 18, 2018
94759da
ENGCOM-1513: Fix outdated address data when using Braintree's "Pay wi…
VladimirZaets May 18, 2018
819c65e
ENGCOM-1473: Add 'const' type support to layout arguments #15058
VladimirZaets May 18, 2018
0605a27
set alignment purchase order form and place order button
neeta-wagento May 19, 2018
75f62bc
#14063 - Wrong invoice prefix in multistore setup due to default stor…
sanjay-wagento May 19, 2018
21d429f
Added language translation for message string
yogeshsuhagiya May 19, 2018
e138881
#12820 - Wrong annotation in _toOptionArray - magento/framework/Data/…
sanjay-wagento May 19, 2018
b4d1fd4
Format the code
yogeshsuhagiya May 19, 2018
c84a2d8
Refactor message popup js
RahulKachhadia May 19, 2018
153faa6
fixed Submitting search form (mini) with enter key fires event handle…
amjad-codilar May 19, 2018
00bfbd0
Refactor validate code in Tax module
gelanivishal May 19, 2018
9339279
Function unnecessarily called multiple time
May 19, 2018
6fcfb88
Fixed breadcrumb quote issue in product page #15037
jignesh-baldha May 19, 2018
bfb39b5
Merge branch '2.2-develop' into jignesh-baldha-patch1
jignesh-baldha May 19, 2018
37851f4
Refactor javascript code of button split widget
amittiwari024 May 19, 2018
8c144a2
15319 : misleading data-container in product list
sunilit42 May 19, 2018
eef111f
Responsive Design Footers bottom of screen on mobile devices #15118
chirag-wagento May 19, 2018
f295906
Added language translation for comment tag
yogeshsuhagiya May 19, 2018
ac11a06
Removed duplicate line and added comment on variable
gelanivishal May 19, 2018
9e0db30
15259 : Unable to disable without providing Industry value
sunilit42 May 19, 2018
4b6d6ad
Added language translation in template files
RahulKachhadia May 19, 2018
35b2cdf
Fixed Purchased Order Form button should visible properly
gelanivishal May 19, 2018
c427ff1
Fix for Magnifier in inside mode
May 19, 2018
ff9bf03
Removed commented line,
gelanivishal May 19, 2018
c0b401b
ENGCOM-1591: Added language translation in template files #15371
magento-engcom-team May 19, 2018
3b03add
ENGCOM-1592: Removed duplicate line and added comment on variable #15362
magento-engcom-team May 19, 2018
cdc5b2f
Fixed semicolon issue
gelanivishal May 19, 2018
2d559e4
Fixed coding standard issue.
gelanivishal May 19, 2018
b40aae2
Unused variable removed
VitaliyBoyko May 19, 2018
b176413
Added language translation key
yogeshsuhagiya May 20, 2018
9a28908
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
May 20, 2018
0dc700b
Added language translation key
yogeshsuhagiya May 20, 2018
1da6d36
ENGCOM-1593: [Backport-2.2] Unused variable removed #15386
magento-engcom-team May 20, 2018
54ffb8c
ENGCOM-1599: Fixed typo mistake in function comment #15302
magento-engcom-team May 20, 2018
288c1b6
ENGCOM-1602: Fix typos in variable names #15294
magento-engcom-team May 20, 2018
62050b8
ENGCOM-1580: [fix] typo in method name _getCharg[e]ableOptionPrice #1…
magento-engcom-team May 20, 2018
b295a28
ENGCOM-1588: Fix typos in PHPDocs and comments #15293
magento-engcom-team May 20, 2018
a3f8bd5
ENGCOM-1602: Fix typos in variable names #15294
May 20, 2018
bd027a7
ENGCOM-1599: Fixed typo mistake in function comment #15302
May 20, 2018
ae634b4
ENGCOM-1593: [Backport-2.2] Unused variable removed #15386
May 20, 2018
a6c4865
ENGCOM-1588: Fix typos in PHPDocs and comments #15293
May 20, 2018
2bd2994
ENGCOM-1580: [fix] typo in method name _getCharg[e]ableOptionPrice #1…
May 20, 2018
b35f027
ENGCOM-1606: Responsive Design Footers bottom of screen on mobile dev…
magento-engcom-team May 20, 2018
5bfc22a
ENGCOM-1607: Function is unnecessarily called multiple time #15346
magento-engcom-team May 20, 2018
e2ab38c
ENGCOM-1609: Added language translation for message string #15333
magento-engcom-team May 20, 2018
32892a4
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
May 20, 2018
f8d5312
Fixed coding standard issue
gelanivishal May 20, 2018
817de22
Updated coding standard issue
gelanivishal May 20, 2018
1d1e118
Fixed set template syntax issue
gelanivishal May 21, 2018
d072dc0
Merge remote-tracking branch 'origin/MAGETWO-90190' into MPI-PR2
viktym May 21, 2018
e3d1b50
Merge remote-tracking branch 'origin/MAGETWO-90246' into MPI-PR2
viktym May 21, 2018
1cd46bd
Merge remote-tracking branch 'origin/MAGETWO-90193' into MPI-PR2
viktym May 21, 2018
c3e3fa2
Merge remote-tracking branch 'origin/MAGETWO-87047' into MPI-PR2
viktym May 21, 2018
04e2a1b
Merge remote-tracking branch 'origin/MAGETWO-89849' into MPI-PR2
viktym May 21, 2018
8e93b0d
Remove deprecated function #15037
jignesh-baldha May 21, 2018
3453461
Merge remote-tracking branch 'origin/2.2-develop' into bugfixes
May 21, 2018
424cf6f
ENGCOM-1616: Submitting search form (mini) with enter key fires event…
magento-engcom-team May 21, 2018
03465eb
Revert "15259 : Unable to disable without providing Industry value"
sunilit42 May 21, 2018
5078646
ENGCOM-1618: Fixed set template syntax issue #15398
magento-engcom-team May 21, 2018
a9758f4
ENGCOM-1622: 15319 : misleading data-container in product list #15350
magento-engcom-team May 21, 2018
f74f224
ENGCOM-1623: #14063 - Wrong invoice prefix in multistore setup due to…
magento-engcom-team May 21, 2018
dccefc4
ENGCOM-1581: [fix] typo in method name _exportAddress[s]es #15275
magento-engcom-team May 21, 2018
65019ab
declare var to fix scope error #15265
VladimirZaets May 21, 2018
a582a28
ENGCOM-1617: Fixed breadcrumb quote issue in product page #15037 #15347
magento-engcom-team May 21, 2018
b0a4c49
Merge remote-tracking branch 'magento2/2.2-develop' into MAGETWO-88411
viktym May 21, 2018
b899de1
ENGCOM-1628: #12820 - Wrong annotation in _toOptionArray - magento/fr…
magento-engcom-team May 21, 2018
eae0ac6
Update _payments.less
dankhrapiyush May 21, 2018
502d962
Prevent multiple add-to-cart initializations in case of ajax loaded c…
vovayatsyuk May 21, 2018
131a458
Fixed according to review
May 21, 2018
4c51dba
ENGCOM-1633: Error 500 in Module Manager #15211
magento-engcom-team May 21, 2018
be8c6cb
Minor styles nesting fix
rogyar May 21, 2018
a39c854
ENGCOM-1634: Fixed Purchased Order Form button should visible properl…
magento-engcom-team May 21, 2018
6a95dba
MAGETWO-87872: Free Shipping Cart Price Rule not working when UPS shi…
dhorytskyi May 21, 2018
d9b4d6d
ENGCOM-1551: Fix unnecessary recalculation of product list pricing #1…
magento-engcom-team May 21, 2018
7509a5f
Merge pull request #2572 from magento-mpi/MPI-PR2
viktym May 21, 2018
c5c47d1
MAGETWO-87872: Free Shipping Cart Price Rule not working when UPS shi…
dhorytskyi May 21, 2018
bf12959
MAGETWO-89532: Google Analytics - addToCart event triggers before add…
iivashchenko May 21, 2018
06c8fd4
ENGCOM-1604: Added language translation for comment tag #15364
magento-engcom-team May 21, 2018
79e025c
Fixed abstract.js typo
VitaliyBoyko May 21, 2018
f671224
ENGCOM-1637: [Backport-2.2] Fixed abstract.js typo #15411
magento-engcom-team May 21, 2018
ee2b0ba
Moved css from media #TODO
gelanivishal May 22, 2018
4e542b3
Updated font-size variable and standardize #ToDo UI
gelanivishal May 22, 2018
86685fb
Merge remote-tracking branch 'origin/2.2-develop' into bugfixes
May 22, 2018
28642a6
Refactor JavsScript for UrlRewrite module edit page
patelnimesh1988 May 22, 2018
da14d9c
ENGCOM-1640: Refactor javascript code of button split widget #15351
magento-engcom-team May 22, 2018
376872d
ENGCOM-1641: Refactored javascript code of admin notification modal p…
magento-engcom-team May 22, 2018
dcab9e9
ENGCOM-1643: Prevent multiple add-to-cart initializations in case of …
magento-engcom-team May 22, 2018
1d711c9
ENGCOM-1646: set alignment purchase order form and place order button…
magento-engcom-team May 22, 2018
2ecf8c6
Format the javascript code in Tax module #15343
VladimirZaets May 22, 2018
5cd0767
ENGCOM-1642: Format the javascript code in Tax module #15343
magento-engcom-team May 22, 2018
e62f736
ENGCOM-1646: set alignment purchase order form and place order button…
VladimirZaets May 22, 2018
43e9236
ENGCOM-1641: Refactored javascript code of admin notification modal p…
VladimirZaets May 22, 2018
24ae1c7
ENGCOM-1640: Refactor javascript code of button split widget #15351
VladimirZaets May 22, 2018
5f45b12
ENGCOM-1637: [Backport-2.2] Fixed abstract.js typo #15411
VladimirZaets May 22, 2018
d870d06
ENGCOM-1622: 15319 : misleading data-container in product list #15350
VladimirZaets May 22, 2018
7a6149b
ENGCOM-1609: Added language translation for message string #15333
VladimirZaets May 22, 2018
ffdc870
ENGCOM-1607: Function is unnecessarily called multiple time #15346
VladimirZaets May 22, 2018
85df843
ENGCOM-1592: Removed duplicate line and added comment on variable #15362
VladimirZaets May 22, 2018
b728c84
ENGCOM-1583: declare var to fix scope error #15265
VladimirZaets May 22, 2018
ac673f9
ENGCOM-1642: Format the javascript code in Tax module #15343
VladimirZaets May 22, 2018
6729e36
MAGETWO-90533: Error on RMA shipping label creation for FedEx Smart Post
YevSent May 22, 2018
aaf99a9
Merge pull request #2581 from magento-chaika/bugfixes
May 22, 2018
325a446
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team May 22, 2018
b2d43e1
typo correction
AnshuMishra17 May 22, 2018
de7437a
ENGCOM-1647: typo correction #15431
magento-engcom-team May 22, 2018
d9dc66c
ENGCOM-1583: declare var to fix scope error #15265
May 22, 2018
d0ac1e1
Removed redundant else statement
rogyar May 22, 2018
b3ead94
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
dhorytskyi May 22, 2018
7ae8aa0
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team May 22, 2018
23b4aca
ENGCOM-1634: Fixed Purchased Order Form button should visible properl…
May 22, 2018
fcef86e
ENGCOM-1628: #12820 - Wrong annotation in _toOptionArray - magento/fr…
May 22, 2018
5ec3a15
ENGCOM-1623: #14063 - Wrong invoice prefix in multistore setup due to…
May 22, 2018
660dea4
ENGCOM-1617: Fixed breadcrumb quote issue in product page #15037 #15347
May 22, 2018
2821a28
ENGCOM-1581: [fix] typo in method name _exportAddress[s]es #15275
May 22, 2018
a7910d9
ENGCOM-1573: ISSUE-14747 Newsletter subscription confirmation message…
May 22, 2018
2401aa5
ENGCOM-1551: Fix unnecessary recalculation of product list pricing #1…
May 22, 2018
67b5fe7
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team May 22, 2018
e623b76
ENGCOM-1606: Responsive Design Footers bottom of screen on mobile dev…
May 23, 2018
4ac5828
ENGCOM-1647: typo correction #15431
May 23, 2018
5068662
ENGCOM-1618: Fixed set template syntax issue #15398
May 23, 2018
a86e302
ENGCOM-1606: Responsive Design Footers bottom of screen on mobile dev…
May 23, 2018
18f3b8a
ENGCOM-1651: [Backport] Removed redundant else statement #15435
magento-engcom-team May 23, 2018
a2a2a5d
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team May 23, 2018
07f96a5
Fix HTML syntax in report.phtml error template
abcpremium May 23, 2018
4457a83
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
dhorytskyi May 23, 2018
2796309
MAGETWO-87872: Free Shipping Cart Price Rule not working when UPS shi…
dhorytskyi May 23, 2018
c25602d
ENGCOM-1654: Fix HTML syntax in report.phtml error template #15454
magento-engcom-team May 23, 2018
2cc78bc
[Resolved : UI Component listing action column outside of screen when…
hitesh-wagento May 23, 2018
5eb14b7
ENGCOM-1655: [Fix] forgot to add lowercase conversion on grouped prod…
magento-engcom-team May 23, 2018
cb027aa
ENGCOM-1656: Refactor JavsScript for UrlRewrite module edit page #15422
magento-engcom-team May 23, 2018
0f777bd
ENGCOM-1657: Updated font-size variable and standardize #ToDo UI #15421
magento-engcom-team May 23, 2018
cf973f2
Improvements to the CONTRIBUTING.md document, including wording chang…
RebeccaBrocton May 23, 2018
1106af3
ADHOC: update the contribution templates to include a bit of manners …
dmanners May 19, 2018
f6e63f1
ADHOC: update the contribution templates to include a not on actual a…
dmanners May 23, 2018
eed4a1a
ENGCOM-1658: Improvements to the CONTRIBUTING.md document #15460
magento-engcom-team May 23, 2018
1e36495
Issue 15467 where a configuration sku gets deleted but is still saved…
jonshipman May 23, 2018
be776f8
ENGCOM-1659: Fix for Magnifier in inside mode #15382
magento-engcom-team May 24, 2018
2c75729
ENGCOM-1662: Moved css from media #TODO #15416
magento-engcom-team May 24, 2018
83ecea7
Merge pull request #2594 from magento-tango/MAGETWO-87872
dhorytskyi May 24, 2018
31e3b63
Issue 15469: Javascript error dropdowns.js
brian-labelle May 24, 2018
4dc60a4
MAGETWO-92154: [Backport to 2.2] Unlock Locales Editing when SCD on D…
May 24, 2018
4f86476
ENGCOM-1658: Improvements to the CONTRIBUTING.md document #15460
May 25, 2018
e5615f5
ENGCOM-1657: Updated font-size variable and standardize #ToDo UI #15421
May 25, 2018
d645a1f
ENGCOM-1656: Refactor JavsScript for UrlRewrite module edit page #15422
May 25, 2018
3003465
ENGCOM-1651: [Backport] Removed redundant else statement #15435
May 25, 2018
5d32882
ENGCOM-1643: Prevent multiple add-to-cart initializations in case of …
May 25, 2018
adf80bc
ENGCOM-1633: Error 500 in Module Manager #15211
May 25, 2018
1490377
ENGCOM-1616: Submitting search form (mini) with enter key fires event…
May 25, 2018
d12ad33
ENGCOM-1604: Added language translation for comment tag #15364
May 25, 2018
dd1d8a6
ENGCOM-1591: Added language translation in template files #15371
May 25, 2018
33a2b9e
ENGCOM-1579: [backport] fixes for instant purchase module from #15257…
May 25, 2018
1b8d099
ENGCOM-1464: [BUGFIX] Added row_id to the flat action indexer so the …
May 25, 2018
5e993f6
[fix] test references invalid backend model
May 25, 2018
8c68d6b
[fix] anonymous function has an unused use $data.
May 25, 2018
1fbea94
ENGCOM-1665: Adding manners to GitHub templates 2.2 #15462
magento-engcom-team May 25, 2018
78fdec4
[fix] getConfiguration() invoked with 1 parameter, 0 required
May 25, 2018
c261463
[fix] Class Magento\Ui\Component\Control\ActionPool constructor invok…
May 25, 2018
3b35bc5
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
May 25, 2018
c7d6259
ENGCOM-1673: Fixes in config module #15511
magento-engcom-team May 25, 2018
7320a74
ENGCOM-1655: [Fix] forgot to add lowercase conversion on grouped prod…
May 25, 2018
aa96d02
:pencil2: Fix typos in Multishipping and User module
avoelkl May 25, 2018
87c0333
:art: Fix typo in method name
avoelkl May 25, 2018
ea2ea54
ENGCOM-1467: [2.2-develop] Transport variable can not be altered in e…
magento-engcom-team May 25, 2018
349ee59
ENGCOM-1676: Fix typos in Multishipping and User module #15513
magento-engcom-team May 25, 2018
61cb003
ENGCOM-1677: Issue 15469: Javascript error dropdowns.js #15499
magento-engcom-team May 25, 2018
eead125
[fix] fix dynamical assigned property as it wasn't assigned to an exi…
May 25, 2018
b8046e5
ENGCOM-1678: Fixes in ui module #15512
magento-engcom-team May 25, 2018
1d2e59b
ENGCOM-1682: Refactor JavsScript for customer logout #15301
magento-engcom-team May 25, 2018
1986568
ENGCOM-1673: Fixes in config module #15511
May 25, 2018
3c8c4b8
ENGCOM-1665: Adding manners to GitHub templates 2.2 #15462
May 25, 2018
c4d9a99
ENGCOM-1662: Moved css from media #TODO #15416
May 25, 2018
588a8b0
ENGCOM-1655: [Fix] forgot to add lowercase conversion on grouped prod…
May 25, 2018
583b1f0
ENGCOM-1654: Fix HTML syntax in report.phtml error template #15454
May 25, 2018
56a20b7
ENGCOM-1467: [2.2-develop] Transport variable can not be altered in e…
May 25, 2018
8d74d8f
ENGCOM-1676: Fix typos in Multishipping and User module #15513
May 25, 2018
cf9b169
Use stored value of method instead of calling same method again.
May 25, 2018
855e73a
Use stored value of method instead of calling same method again.
May 25, 2018
54df540
ENGCOM-1684: [fix] dynamical assigned property in webapi #15515
magento-engcom-team May 25, 2018
a57e830
Typo correction
May 25, 2018
4405582
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team May 25, 2018
caa818e
linetoobig
jonshipman May 25, 2018
0efc836
Revert "Use stored value of method instead of calling same method aga…
May 25, 2018
9cb4e9a
Revert ":pencil2: Fix typos in Multishipping and User module"
avoelkl May 25, 2018
34f62cc
ENGCOM-1686: Issue 15467 where a configuration sku gets deleted but i…
magento-engcom-team May 25, 2018
282186e
:bug: Add phpdoc return type
avoelkl May 25, 2018
488f4cd
Remove unneeded white space
dmanners May 25, 2018
79520f9
ENGCOM-1688: Use stored value of method instead of calling same metho…
magento-engcom-team May 26, 2018
4587b30
Merge branch '2.2-develop' into MAGETWO-92154
May 26, 2018
5b39538
ENGCOM-1684: [fix] dynamical assigned property in webapi #15515
May 27, 2018
9bfee87
ENGCOM-1682: Refactor JavsScript for customer logout #15301
May 27, 2018
e43cd18
ENGCOM-1678: Fixes in ui module #15512
May 27, 2018
27e6f06
ENGCOM-1677: Issue 15469: Javascript error dropdowns.js #15499
May 27, 2018
d071e5b
ENGCOM-1659: Fix for Magnifier in inside mode #15382
May 27, 2018
6f8fc45
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team May 27, 2018
1143e70
Fixed typo error
gelanivishal May 28, 2018
af90664
ENGCOM-1692: Typo correction #15519
magento-engcom-team May 28, 2018
238f2e8
Remove extra space from trnslation file
May 28, 2018
1c3a7f2
Merge branch 'MAGETWO-87955' into MPI-PR
YevSent May 29, 2018
606595b
Merge branch 'MAGETWO-90968' into MPI-PR
YevSent May 29, 2018
f4ca672
Merge branch 'MAGETWO-88411' into MPI-PR
YevSent May 29, 2018
7c0a49c
Merge branch 'MAGETWO-90533' into MPI-PR
YevSent May 29, 2018
f42d8b3
Merge branch 'MAGETWO-89532' into MPI-PR
YevSent May 29, 2018
92d836c
ENGCOM-1679: [Resolved : UI Component listing action column outside o…
magento-engcom-team May 29, 2018
8c24f73
ENGCOM-1679: [Resolved : UI Component listing action column outside o…
May 29, 2018
7fa5f24
ENGCOM-1697: Remove extra space and format the code in translation fi…
magento-engcom-team May 29, 2018
432236c
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-91327
May 29, 2018
9a34c54
ENGCOM-1700: Fixed typo error #15549
magento-engcom-team May 29, 2018
323994f
Merge pull request #2610 from magento-chaika/MAGETWO-91327
May 29, 2018
7494455
Merge branch '2.2-develop' into MAGETWO-92154
May 29, 2018
c77653d
MAGETWO-90968: Refund amounts are off when Rewards, Store Credit and …
YevSent May 30, 2018
dbc2b5d
Merge branch 'MAGETWO-90968' into MPI-PR
YevSent May 30, 2018
97606ec
Merge branch '2.2-develop' of github.com:magento/magento2ce into MPI-PR
YevSent May 30, 2018
9d6930c
Merge pull request #2618 from magento-mpi/MPI-PR
viktym May 30, 2018
53aca32
ENGCOM-1675: Fix method name (typo) #15514
magento-engcom-team May 30, 2018
0d90929
Merge branch '2.2-develop' into MAGETWO-92154
May 30, 2018
3d42703
MAGETWO-92154: [Backport to 2.2] Unlock Locales Editing when SCD on D…
May 31, 2018
bef7c86
ENGCOM-1700: Fixed typo error #15549
VladimirZaets May 31, 2018
76c4b47
ENGCOM-1697: Remove extra space and format the code in translation fi…
VladimirZaets May 31, 2018
9739a0b
ENGCOM-1692: Typo correction #15519
VladimirZaets May 31, 2018
4630b3b
ENGCOM-1688: Use stored value of method instead of calling same metho…
VladimirZaets May 31, 2018
b9300d0
ENGCOM-1686: Issue 15467 where a configuration sku gets deleted but i…
VladimirZaets May 31, 2018
c800bbf
ENGCOM-1679: [Resolved : UI Component listing action column outside o…
VladimirZaets May 31, 2018
cbd2c96
ENGCOM-1675: Fix method name (typo) #15514
VladimirZaets May 31, 2018
1ce8c0a
Merge pull request #2620 from magento-thunder/MAGETWO-92154
arhiopterecs May 31, 2018
47e1b69
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team May 31, 2018
22eac8e
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Jun 1, 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
4 changes: 0 additions & 4 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
* See COPYING.txt for license details.
*/

/**
* Pre-commit hook installation:
* vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
*/
$finder = PhpCsFixer\Finder::create()
->name('*.phtml')
->exclude('dev/tests/functional/generated')
Expand Down
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ language: php
php:
- 7.0
- 7.1
git:
depth: 5
env:
global:
- COMPOSER_BIN_DIR=~/bin
- INTEGRATION_SETS=3
- NODE_JS_VERSION=6
- NODE_JS_VERSION=8
- MAGENTO_HOST_NAME="magento2.travis"
matrix:
- TEST_SUITE=unit
Expand Down
Loading