Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update 2.2 #1

Merged
merged 6,980 commits into from
Sep 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6980 commits
Select commit Hold shift + click to select a range
b62c3ed
remove lib-url-check
Karlasa Aug 9, 2018
432dd6a
remove lib-url-check
Karlasa Aug 9, 2018
c1488a1
remove lib-url-check
Karlasa Aug 9, 2018
ef187c7
remove lib-url-check
Karlasa Aug 9, 2018
e7e376f
remove lib-url-check
Karlasa Aug 9, 2018
ad05aee
remove lib-url-check
Karlasa Aug 9, 2018
5d9ceb5
remove lib-url-check
Karlasa Aug 9, 2018
d0a78ec
remove lib-url-check
Karlasa Aug 9, 2018
ff2bfcb
remove lib-url-check
Karlasa Aug 9, 2018
8ee1b6a
ENGCOM-2734: Introduce Block Config Source #16021
magento-engcom-team Aug 10, 2018
93f80aa
ENGCOM-2736: updating lib LESS docs #17479
magento-engcom-team Aug 10, 2018
66754d6
ENGCOM-2724: Magento 2.2.5: Year-to-date dropdown in Stores>Configura…
Aug 10, 2018
24daf3b
Merge remote-tracking branch 'origin/MAGETWO-94003' into PANDA-2.2-de…
RuslanKostiv1 Aug 10, 2018
09cf555
Merge remote-tracking branch 'origin/MAGETWO-94005' into PANDA-2.2-de…
RuslanKostiv1 Aug 10, 2018
e498f28
Shorten Variable Name requesterVatNumberSanitized
Drischie Aug 10, 2018
e6b92a5
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 10, 2018
9288d83
Merge remote-tracking branch 'mainline/2.2-develop' into PANDA-2.2-de…
RuslanKostiv1 Aug 10, 2018
f66f469
Merge pull request #3009 from magento-panda/PANDA-2.2-develop-PR
Aug 10, 2018
934aa12
ENGCOM-2721: AD-HOC feat (Profiler): Allow supplying complex profiler…
Aug 10, 2018
e521de5
ENGCOM-2718: Doesn't work if use date as condition for Catalog Price …
Aug 10, 2018
08b8956
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 10, 2018
4a29647
Solution for User role issue with customer group
Aug 11, 2018
19e13eb
ENGCOM-2740: Fix possible undefined index when caching config data #1…
magento-engcom-team Aug 11, 2018
d2a514d
Translated menu titles
yogeshsuhagiya Aug 11, 2018
208c019
Translated acl rule title
yogeshsuhagiya Aug 11, 2018
23a27b6
Translated acl rule title
yogeshsuhagiya Aug 11, 2018
8a32c28
Merge pull request https://github.com/magento/magento2/pull/17525 to …
magento-engcom-team Aug 11, 2018
c789fb2
Fixed undefinded shipping method name issue
gelanivishal Aug 11, 2018
1499e0c
ENGCOM-2746: Solution for User role issue with customer group #17515
magento-engcom-team Aug 11, 2018
de0ec20
Refactor JS code and added JS component file
yogeshsuhagiya Aug 11, 2018
0c1104f
Replaced jQuery with $ alias
yogeshsuhagiya Aug 11, 2018
8ab5997
ENGCOM-2748: Refactor JS code and added JS component file #17527
magento-engcom-team Aug 11, 2018
d122d30
ENGCOM-2740: Fix possible undefined index when caching config data #1…
Aug 11, 2018
692f9fb
Reformat the xml code in menu.xml
yogeshsuhagiya Aug 11, 2018
6203162
Merge branch 'yogesh-patch-6' of https://github.com/Yogeshks/magento2…
yogeshsuhagiya Aug 11, 2018
1e1647a
UI Component category_form - set default sort order for General fieldset
Aug 11, 2018
7e87221
Refactor: remove some code duplication
arnoudhgz Aug 10, 2018
128724f
Merge branch '2.2-develop' into 2.2-develop-13747
eduard13 Aug 12, 2018
30822ef
Refactoring the construct to have an optionally dependency instead a …
eduard13 Aug 12, 2018
bc697d9
Merge branch '2.2-develop' into 2.2-develop-14248-issue
eduard13 Aug 12, 2018
840d5b2
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 12, 2018
d10de87
Link logo in web setup wizard to back-end base URL
arnoudhgz Aug 11, 2018
bfeba59
Fixing the black background filling
eduard13 Aug 12, 2018
b6bbc14
ENGCOM-2758: Fix for #15041 Adding a new fieldset to the admin catego…
magento-engcom-team Aug 12, 2018
7aecb1f
Fixed undefinded shipping method name issue #17492
VladimirZaets Aug 12, 2018
854ad16
ENGCOM-2743: Fixed undefinded shipping method name issue #17492 #17526
magento-engcom-team Aug 12, 2018
c948f43
ENGCOM-2762: Refactor: remove some code duplication #17505
magento-engcom-team Aug 12, 2018
94b969c
ENGCOM-2737: [Backport] Fix incorrect image magnifier size bug in Saf…
magento-engcom-team Aug 12, 2018
8f10d65
ENGCOM-2762: Refactor: remove some code duplication #17505
VladimirZaets Aug 12, 2018
5eee042
ENGCOM-2736: updating lib LESS docs #17479
VladimirZaets Aug 12, 2018
70d8491
Fix proxy generation return type
adrian-martinez-interactiv4 Aug 12, 2018
ae388e8
Catalog: Add unit tests for Cron classes
dmytro-ch Aug 13, 2018
c385580
ENGCOM-2772: Catalog: Add unit tests for Cron classes #17561
magento-engcom-team Aug 13, 2018
73c22ec
Fixed static test failure
Aug 13, 2018
182e2e9
ENGCOM-2772: Catalog: Add unit tests for Cron classes #17561
Aug 13, 2018
fdcfdcc
ENGCOM-2746: Solution for User role issue with customer group #17515
Aug 13, 2018
ad88653
ENGCOM-2772: Catalog: Add unit tests for Cron classes #17561
Aug 13, 2018
6bee431
MAGETWO-74289: Cannot choose wishlist on shopping cart page
victor-v-rad Aug 13, 2018
33d39af
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 13, 2018
a019dcc
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-74289
victor-v-rad Aug 13, 2018
47cbfff
Translated validation error messages
yogeshsuhagiya Aug 13, 2018
2e69236
Removed extra semicolon
rogyar Aug 13, 2018
9712f52
ENGCOM-1605: 6305 - Resolved product custom option title save issue #…
Aug 13, 2018
85c1d4a
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr40
zakdma Aug 13, 2018
a63527b
MAGETWO-87437: [Magento Cloud] Google Tag Manager dataLayer does not …
iivashchenko Aug 13, 2018
b2c4372
ENGCOM-2776: Fix proxy generation return type #17552
magento-engcom-team Aug 13, 2018
569e6e4
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-87437
iivashchenko Aug 13, 2018
0b29c8d
MAGETWO-89892: Video is displayed as image and can't be played
ameysar Aug 13, 2018
b394e08
MAGETWO-74289: Cannot choose wishlist on shopping cart page
victor-v-rad Aug 14, 2018
38f7daa
ENGCOM-2720: Fixed review list ajax if product not exist redirect to …
magento-engcom-team Aug 14, 2018
059af88
MAGETWO-74289: Cannot choose wishlist on shopping cart page
victor-v-rad Aug 14, 2018
91999b8
Covering Magento\Braintree\Model\InstantPurchase\CreditCard\TokenForm…
eduard13 Aug 14, 2018
a20cfca
ENGCOM-2780: Braintree: Add unit test for CreditCard/TokenFormatter #…
magento-engcom-team Aug 14, 2018
65f9f39
ENGCOM-2781: Translated validation error messages #17575
magento-engcom-team Aug 14, 2018
0e835c9
Merge pull request #3003 from magento-tsg/2.2-develop-pr40
Aug 14, 2018
9a7ebe5
ENGCOM-2783: Link logo in web setup wizard to back-end base URL #17543
magento-engcom-team Aug 14, 2018
1b2a3f5
MAGETWO-86712: Magento PayPal checkout fails if email sending fails /…
Aug 14, 2018
391a69e
ENGCOM-2780: Braintree: Add unit test for CreditCard/TokenFormatter #…
Aug 14, 2018
28953db
ENGCOM-2776: Fix proxy generation return type #17552
Aug 14, 2018
ebc950b
ENGCOM-2758: Fix for #15041 Adding a new fieldset to the admin catego…
Aug 14, 2018
4ff0c26
ENGCOM-2743: Fixed undefinded shipping method name issue #17492 #17526
Aug 14, 2018
66c581b
ENGCOM-2737: [Backport] Fix incorrect image magnifier size bug in Saf…
Aug 14, 2018
5d47632
ENGCOM-2734: Introduce Block Config Source #16021
Aug 14, 2018
12ff548
ENGCOM-2720: Fixed review list ajax if product not exist redirect to …
Aug 14, 2018
f4741dd
ENGCOM-1605: 6305 - Resolved product custom option title save issue #…
Aug 14, 2018
0df7c4f
ENGCOM-1440: Fix unstable session manager #14973
Aug 14, 2018
c120002
Minor code style fixes
Aug 14, 2018
a69ced7
Fix sending duplicate emails
iGerchak Aug 14, 2018
8739f8e
Fixing the address checkbox being unchecked on payment step.
eduard13 Aug 14, 2018
d0ad839
ENGCOM-2785: Fixed #16929 - Incorrect displaying Product Image Waterm…
magento-engcom-team Aug 14, 2018
14f5e9d
ENGCOM-2787: Fix sending duplicate emails #17484
magento-engcom-team Aug 14, 2018
226354f
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 14, 2018
9ecd487
ENGCOM-2789: Fixing the address checkbox being unchecked on payment s…
magento-engcom-team Aug 14, 2018
21f0b64
Fix Custom Attribute Group can not translation in catalog/product page
GraysonChiang Aug 14, 2018
01ed836
ENGCOM-2748: Refactor JS code and added JS component file #17527
Aug 14, 2018
2ed5b1b
ENGCOM-2783: Link logo in web setup wizard to back-end base URL #17543
Aug 14, 2018
f965dcd
ENGCOM-2781: Translated validation error messages #17575
Aug 14, 2018
cd09c7c
ENGCOM-2748: Refactor JS code and added JS component file #17527
Aug 14, 2018
eef9628
ENGCOM-2677: Fix Translation of error message on cart for deleted bun…
Aug 14, 2018
7c852d1
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 14, 2018
727a82d
Fix failed test EmailSenderHandlerTest
Aug 15, 2018
ad6240e
ENGCOM-2789: Fixing the address checkbox being unchecked on payment s…
Aug 15, 2018
b5d2d85
ENGCOM-2787: Fix sending duplicate emails #17484
Aug 15, 2018
41e1a08
ENGCOM-2785: Fixed #16929 - Incorrect displaying Product Image Waterm…
Aug 15, 2018
614570f
Adding a new interface and implementing it
eduard13 Aug 15, 2018
507d183
Adjusting the Unit Test and changing the interface for deprecated con…
eduard13 Aug 15, 2018
d4f935d
ENGCOM-2799: Fix Custom Attribute Group can not translate in catalog/…
magento-engcom-team Aug 15, 2018
3559460
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 15, 2018
d0ac109
ENGCOM-2070: Making configurable settings for MAX_IMAGE_WIDTH and MAX…
magento-engcom-team Aug 15, 2018
12b3a60
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-89892
zakdma Aug 15, 2018
c5ba706
Added unit test for newsletter problem model
rogyar Aug 15, 2018
739132a
Minor naming adjustments
rogyar Aug 15, 2018
96de230
ENGCOM-2799: Fix Custom Attribute Group can not translate in catalog/…
Aug 15, 2018
596a8e6
ENGCOM-2070: Making configurable settings for MAX_IMAGE_WIDTH and MAX…
Aug 15, 2018
48356c0
MAGETWO-93038: Category not updating until full reindex
joni-jones Aug 16, 2018
ecebc42
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 16, 2018
468d411
ENGCOM-2807: Added unit test for newsletter problem model #17633
magento-engcom-team Aug 16, 2018
188c26e
MAGETWO-94080: Aditional Fix for "Catalog Products List" widget displ…
victor-v-rad Aug 16, 2018
d5b87f5
MAGETWO-91293: [2.2.x][Jenkins-Tests] - OnePageCheckoutOfflinePayment…
StasKozar Aug 16, 2018
27c1d74
Minor fixes for better code readability
Aug 16, 2018
4f4a8a1
Removing the KEEP_TRANSPARENCY const
eduard13 Aug 16, 2018
a091194
MAGETWO-93223: [Magento cloud] Import history wrong execution time
dhorytskyi Aug 16, 2018
154c3ad
Use '.min' in filenames of already minified js files in the Swagger m…
hostep Aug 15, 2018
99a616d
Merge pull request #2 from magento/2.2-develop
markshust Aug 16, 2018
317545a
Make "time12h" validation rule to be compatible with minify js
markshust Aug 16, 2018
34879dd
Merge remote-tracking branch 'mainline/2.2-develop' into bulk_api_bac…
vrann Aug 16, 2018
1137890
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-89369
DianaRusin Aug 17, 2018
190c9b8
ENGCOM-2807: Added unit test for newsletter problem model #17633
Aug 17, 2018
1d833da
ENGCOM-2382: Validate that the PO Number is set on the payment instan…
Aug 17, 2018
3636f31
ENGCOM-2382: Validate that the PO Number is set on the payment instan…
Aug 17, 2018
2f52c52
ENGCOM-2812: Update time12h javascript validation rule to be compatib…
magento-engcom-team Aug 17, 2018
900ecea
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
Aug 17, 2018
b3b18c9
MAGETWO-92144: Shipment grid show wrong order status
dhorytskyi Aug 17, 2018
aa481ab
MAGETWO-89831: Unstable FAT: Magento\SalesRule\Test\TestCase\CreateSa…
DianaRusin Aug 17, 2018
890b91f
ENGCOM-2817: Translated admin menu titles #17521
magento-engcom-team Aug 17, 2018
d3da81e
ENGCOM-2812: Update time12h javascript validation rule to be compatib…
Aug 18, 2018
02026d9
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 18, 2018
79c0382
CMS: Add missing unit tests for model classes
dmytro-ch Aug 18, 2018
1ab1366
Fixed code style issue
Aug 18, 2018
c879102
ENGCOM-2823: CMS: Add missing unit tests for model classes #17678
magento-engcom-team Aug 18, 2018
53d4742
ENGCOM-2823: CMS: Add missing unit tests for model classes #17678
Aug 18, 2018
369b5ce
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 18, 2018
a177e60
Integration test for reviews delete observer
rogyar Aug 19, 2018
e796bcb
ENGCOM-2828: Integration test for reviews delete observer #17690
magento-engcom-team Aug 19, 2018
8df62dd
Review: add missing unit test for Observer
eduard13 Aug 20, 2018
f7ba084
Merge branch 'MAGETWO-74289' of github.com:magento-tango/magento2ce i…
Aug 20, 2018
d0667dd
Merge branch 'MAGETWO-91063' of github.com:magento-tango/magento2ce i…
Aug 20, 2018
0809bf3
MAGETWO-94080: Aditional Fix for "Catalog Products List" widget displ…
victor-v-rad Aug 20, 2018
6ef2a2e
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-94080
victor-v-rad Aug 20, 2018
72b23b4
Fixing the namespace
eduard13 Aug 20, 2018
6f4d467
ENGCOM-2830: Review: Adding missing unit test for Observer #17693
magento-engcom-team Aug 20, 2018
b968fbe
ENGCOM-2830: Review: Adding missing unit test for Observer #17693
Aug 20, 2018
652e620
ENGCOM-2828: Integration test for reviews delete observer #17690
Aug 20, 2018
83b64c1
ENGCOM-2817: Translated admin menu titles #17521
Aug 20, 2018
5f1998d
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-91293
svitja Aug 20, 2018
18b8a17
Merge remote-tracking branch 'origin/MAGETWO-91293' into 2.2-develop-…
svitja Aug 20, 2018
3c77057
Merge pull request #3053 from magento-tango/PR-2008
dhorytskyi Aug 20, 2018
6366478
MAGETWO-93810: Unable to view order Placed via Checked Out with Multi…
OlgaVasyltsun Aug 20, 2018
4556c9a
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-93810
OlgaVasyltsun Aug 20, 2018
e207786
Merge remote-tracking branch 'origin/MAGETWO-89369' into 2.2-develop-…
StasKozar Aug 20, 2018
335aa89
MAGETWO-86179: Cannot add address when editing Billing Address during…
joni-jones Aug 20, 2018
d28bf82
Fixed incorrect namespace
Aug 20, 2018
af23bf4
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 20, 2018
d438e9b
Message list component fix: the message type is always error when par…
dmytro-ch Aug 20, 2018
cbb44a4
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-93810
OlgaVasyltsun Aug 20, 2018
764b00c
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 20, 2018
9a46340
ENGCOM-2834: Message list component fix: the message type is always e…
magento-engcom-team Aug 20, 2018
61018ed
ENGCOM-2837: Use '.min' in filenames of already minified js files in …
magento-engcom-team Aug 20, 2018
92a0cdb
Add unit tests for Sales Rule model classes
dmytro-ch Aug 20, 2018
f287b2d
ENGCOM-2843: Sales Rule: Add unit tests for model classes #17710
magento-engcom-team Aug 21, 2018
4c72a77
ENGCOM-2843: Sales Rule: Add unit tests for model classes #17710
Aug 21, 2018
4716f81
ENGCOM-2834: Message list component fix: the message type is always e…
Aug 21, 2018
cee874a
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 21, 2018
bbd9ba7
ISSUE-17715: Duplicate event in Delete operation transaction "entity_…
p-bystritsky Aug 21, 2018
d3c8570
MAGETWO-91288: Custom role backend user cannot place an admin order u…
ameysar Aug 21, 2018
f5946eb
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-91288
ameysar Aug 21, 2018
436bbda
Fix translation issue
jignesh-baldha Aug 22, 2018
5ad7976
MAGETWO-94213: Fatal error message is shown while trying to install m…
zakdma Aug 22, 2018
708c4a5
Search: Add unit test for PopularSearchTerms model
dmytro-ch Aug 22, 2018
3302f22
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-89831
svitja Aug 22, 2018
5284790
Merge remote-tracking branch 'origin/MAGETWO-89831' into 2.2-develop-…
svitja Aug 22, 2018
cbf417d
Merge remote-tracking branch 'origin/MAGETWO-93810' into 2.2-develop-…
StasKozar Aug 22, 2018
7138ab9
ENGCOM-2855: Fixes black background for png images in wysiwyg editors…
magento-engcom-team Aug 22, 2018
2699eca
ENGCOM-2860: ISSUE-17715: Duplicate event in Delete operation transac…
magento-engcom-team Aug 22, 2018
09e52a8
ENGCOM-2863: Fix translation issue #17735
magento-engcom-team Aug 22, 2018
5452266
Merge remote-tracking branch 'origin/MAGETWO-94213' into 2.2-develop-…
StasKozar Aug 22, 2018
54c34be
Merge remote-tracking branch 'origin/MAGETWO-91288' into 2.2-develop-…
OlgaVasyltsun Aug 22, 2018
7b94a57
merge magento/2.2-develop into magento-engcom/bulk_api_backport
Aug 22, 2018
0ddea98
Merge pull request #3071 from magento-engcom/bulk_api_backport
Aug 22, 2018
04898cd
merge magento/2.2-develop into magento-tango/MAGETWO-92144
Aug 23, 2018
a37302c
ENGCOM-2837: Use '.min' in filenames of already minified js files in …
Aug 23, 2018
8855a66
Changed storage.php
MartinAarts Aug 23, 2018
1d7dada
ENGCOM-2872: Changed storage.php #17776
magento-engcom-team Aug 23, 2018
d9f8f03
[Search] Unit test for SynonymAnalyzer model
furseyev Aug 26, 2018
2683329
Removing memory limit temporary adjustment
furseyev Aug 26, 2018
54fc709
ENGCOM-2876: [Search] Unit test for SynonymAnalyzer model #17801
magento-engcom-team Aug 26, 2018
a9888e0
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr42
zakdma Aug 27, 2018
10ca795
MAGETWO-93047: rest/all/V1/categories/:categoryID deletes category name
Aug 27, 2018
affda7f
Create multiple issue templates
ishakhsuvarov Aug 27, 2018
dc3b6a8
MAGETWO-93047: rest/all/V1/categories/:categoryID deletes category name
Aug 27, 2018
2a76139
MAGETWO-93047: rest/all/V1/categories/:categoryID deletes category name
Aug 27, 2018
383f7b5
MAGETWO-93047: rest/all/V1/categories/:categoryID deletes category name
Aug 27, 2018
a39af15
MAGETWO-93047: rest/all/V1/categories/:categoryID deletes category name
Aug 27, 2018
d40a9ec
Merge pull request #3076 from magento-engcom/2.2-develop-prs
VladimirZaets Aug 27, 2018
1bddc79
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr42
zakdma Aug 28, 2018
60dcd51
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
Aug 28, 2018
efcce50
ENGCOM-2876: [Search] Unit test for SynonymAnalyzer model #17801
Aug 28, 2018
36c65fb
ENGCOM-2872: Changed storage.php #17776
Aug 28, 2018
7296c88
ENGCOM-2863: Fix translation issue #17735
Aug 28, 2018
941874a
ENGCOM-2860: ISSUE-17715: Duplicate event in Delete operation transac…
Aug 28, 2018
3f5725c
ENGCOM-2855: Fixes black background for png images in wysiwyg editors…
Aug 28, 2018
d544af3
Merge remote-tracking branch 'magento/2.2-develop' into MAGETWO-93990
viktym Aug 28, 2018
4f5bcca
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Aug 28, 2018
541d489
merge magento/2.2-develop into magento-tsg/2.2-develop-pr42
Aug 28, 2018
95a3467
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
dhorytskyi Aug 28, 2018
07ef8c1
Merge pull request #3074 from magento-tango/MAGETWO-92144
dhorytskyi Aug 28, 2018
5c4c49a
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr42
zakdma Aug 28, 2018
95c8103
Merge pull request #3091 from magento-tsg/2.2-develop-pr42
Aug 29, 2018
3766e6b
ENGCOM-2896: Update issue templates for Magento 2 GitHub project #17817
magento-engcom-team Aug 29, 2018
40b3da6
ENGCOM-2896: Update issue templates for Magento 2 GitHub project #17817
ishakhsuvarov Aug 29, 2018
19bec6f
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
ishakhsuvarov Aug 29, 2018
5afb64e
Sales: Add unit test for validator model class
dmytro-ch Aug 31, 2018
0a205b2
Remove the empty extra line
dmytro-ch Aug 31, 2018
2139fec
[Resolved: Wishlist icon cut on Shopping cart page in mobile view #17…
hitesh-wagento Aug 31, 2018
1017d2b
ENGCOM-2901: Resolved : Wishlist icon cut on Shopping cart page in mo…
magento-engcom-team Aug 31, 2018
74c533f
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
Aug 31, 2018
e5df24d
Merge remote-tracking branch 'tango/MAGETWO-93223' into TANGO-PR-22
dhorytskyi Aug 31, 2018
b75955f
Merge remote-tracking branch 'tango/MAGETWO-94080' into TANGO-PR-22
dhorytskyi Aug 31, 2018
d3ed5a1
Merge remote-tracking branch 'tango/MAGETWO-93047-2' into TANGO-PR-22
dhorytskyi Aug 31, 2018
cac184c
Fix for ProductLink - setterName was incorrectly being set to an ucfi…
johnorourke Aug 23, 2018
f1a2770
Update for pull request #17773 - now using SimpleDataObjectConverter:…
Aug 31, 2018
cdc0f46
ENGCOM-2907: Sales: Add unit test for validator model class #17876
magento-engcom-team Sep 2, 2018
9c83721
ENGCOM-2908: Search: Add unit test for PopularSearchTerms model #17739
magento-engcom-team Sep 2, 2018
a7c7f00
ENGCOM-2875: Fix for ProductLink - setterName was incorrectly being s…
magento-engcom-team Sep 3, 2018
26c49c8
Merge branch 'MAGETWO-93038' into mpi-PR-2008
Sep 3, 2018
4d50006
Code style fixes
Sep 3, 2018
d78086b
Merge branch 'MAGETWO-87437' into mpi-PR-2008
Sep 3, 2018
e1208c2
ENGCOM-2668: Remove leading Countrycode from EU-VAT-Numbers #17385
magento-engcom-team Sep 3, 2018
56556f4
Merge branch 'MAGETWO-86179' into mpi-PR-2008
Sep 3, 2018
9b76a32
Merge branch 'MAGETWO-93990' into mpi-PR-2008
Sep 3, 2018
eb84c53
Merge pull request #3107 from magento-tango/TANGO-PR-22
dhorytskyi Sep 3, 2018
e3158f1
Merge branch '2.2-develop' of github.com:magento/magento2ce into mpi-…
Sep 3, 2018
6a3f845
ENGCOM-2908: Search: Add unit test for PopularSearchTerms model #17739
Sep 3, 2018
5dc47da
ENGCOM-2907: Sales: Add unit test for validator model class #17876
Sep 3, 2018
7c00de3
ENGCOM-2901: Resolved : Wishlist icon cut on Shopping cart page in mo…
Sep 3, 2018
79810b5
ENGCOM-2875: Fix for ProductLink - setterName was incorrectly being s…
Sep 3, 2018
d1c1d77
ENGCOM-2668: Remove leading Countrycode from EU-VAT-Numbers #17385
Sep 3, 2018
ef55fa7
Merge pull request #3098 from magento-mpi/mpi-PR-2008
viktym Sep 4, 2018
cb2d5c0
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Sep 4, 2018
3a2c177
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
Sep 4, 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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 8 additions & 0 deletions .github/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

46 changes: 46 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at engcom@magento.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
36 changes: 36 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# 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. 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 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 within two weeks, the pull request will be closed.


## Contribution requirements

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
* 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). 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 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

Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).
35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!---
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
<!---
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
<!---
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. [Screenshots, logs or description]

### Actual result
<!--- Tell us what happens instead -->
1. [Screenshots, logs or description]
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
name: Bug report
about: Technical issue with the Magento 2 core components

---

<!---
Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
-->

### Preconditions
<!---
Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
-->
1.
2.

### Steps to reproduce
<!---
Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
-->
1.
2.

### Expected result
<!--- Tell us what do you expect to happen. -->
1. [Screenshots, logs or description]
2.

### Actual result
<!--- Tell us what happened instead. Include error messages and issues. -->
1. [Screenshots, logs or description]
2.
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/developer-experience-issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: Developer experience issue
about: Issues related to customization, extensibility, modularity

---

<!---
Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
-->

### Summary
<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->

### Examples
<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->

### Proposed solution
<!--- Suggest your potential solutions for this issue. -->
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
name: Feature request
about: Please consider reporting directly to https://github.com/magento/community-features

---

<!---
Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum.
-->

### Description
<!--- Describe the feature you would like to add. -->

### Expected behavior
<!--- What is the expected behavior of this feature? How is it going to work? -->

### Benefits
<!--- How do you think this feature would improve Magento? -->

### Additional information
<!--- What other information can you provide about the desired feature? -->
37 changes: 37 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!---
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
<!---
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)
<!---
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
<!---
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. ...

### Contribution checklist
- [ ] Pull request has a meaningful description of its purpose
- [ ] All commits are accompanied by meaningful commit messages
- [ ] All new or changed code is covered with unit/integration tests (if applicable)
- [ ] All automated tests passed successfully (all builds on Travis CI are green)
18 changes: 9 additions & 9 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -274,15 +274,6 @@
Require all denied
</IfVersion>
</Files>
<Files CONTRIBUTING.md>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files COPYING.txt>
<IfVersion < 2.4>
order allow,deny
Expand Down Expand Up @@ -355,6 +346,15 @@
Require all denied
</IfVersion>
</Files>
<Files auth.json>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files magento_umask>
<IfVersion < 2.4>
order allow,deny
Expand Down
18 changes: 9 additions & 9 deletions .htaccess.sample
Original file line number Diff line number Diff line change
Expand Up @@ -251,15 +251,6 @@
Require all denied
</IfVersion>
</Files>
<Files CONTRIBUTING.md>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files COPYING.txt>
<IfVersion < 2.4>
order allow,deny
Expand Down Expand Up @@ -332,6 +323,15 @@
Require all denied
</IfVersion>
</Files>
<Files auth.json>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files magento_umask>
<IfVersion < 2.4>
order allow,deny
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