Skip to content

Commit 88988c2

Browse files
eddielaueddielau
committed
Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into develop
Conflicts: app/code/Magento/AdminNotification/composer.json app/code/Magento/Authorization/composer.json app/code/Magento/Backend/composer.json app/code/Magento/Backup/composer.json app/code/Magento/Bundle/composer.json app/code/Magento/Captcha/composer.json app/code/Magento/Catalog/composer.json app/code/Magento/CatalogImportExport/composer.json app/code/Magento/CatalogInventory/composer.json app/code/Magento/CatalogRule/composer.json app/code/Magento/CatalogSearch/composer.json app/code/Magento/CatalogUrlRewrite/composer.json app/code/Magento/CatalogWidget/composer.json app/code/Magento/Centinel/composer.json app/code/Magento/Checkout/composer.json app/code/Magento/CheckoutAgreements/composer.json app/code/Magento/Cms/composer.json app/code/Magento/CmsUrlRewrite/composer.json app/code/Magento/ConfigurableImportExport/composer.json app/code/Magento/ConfigurableProduct/composer.json app/code/Magento/Contact/composer.json app/code/Magento/Core/composer.json app/code/Magento/Cron/composer.json app/code/Magento/CurrencySymbol/composer.json app/code/Magento/Customer/composer.json app/code/Magento/CustomerImportExport/composer.json app/code/Magento/DesignEditor/composer.json app/code/Magento/Dhl/composer.json app/code/Magento/Directory/composer.json app/code/Magento/Downloadable/composer.json app/code/Magento/Eav/composer.json app/code/Magento/Email/composer.json app/code/Magento/Fedex/composer.json app/code/Magento/GiftMessage/composer.json app/code/Magento/GoogleAdwords/composer.json app/code/Magento/GoogleAnalytics/composer.json app/code/Magento/GoogleOptimizer/composer.json app/code/Magento/GoogleShopping/composer.json app/code/Magento/GroupedImportExport/composer.json app/code/Magento/GroupedProduct/composer.json app/code/Magento/ImportExport/composer.json app/code/Magento/Indexer/composer.json app/code/Magento/Integration/composer.json app/code/Magento/LayeredNavigation/composer.json app/code/Magento/Log/composer.json app/code/Magento/Msrp/composer.json app/code/Magento/Multishipping/composer.json app/code/Magento/Newsletter/composer.json app/code/Magento/OfflinePayments/composer.json app/code/Magento/OfflineShipping/composer.json app/code/Magento/PageCache/composer.json app/code/Magento/Payment/composer.json app/code/Magento/Persistent/composer.json app/code/Magento/ProductAlert/composer.json app/code/Magento/Reports/composer.json app/code/Magento/RequireJs/composer.json app/code/Magento/Review/composer.json app/code/Magento/Rss/composer.json app/code/Magento/Rule/composer.json app/code/Magento/Sales/composer.json app/code/Magento/SalesRule/composer.json app/code/Magento/Search/composer.json app/code/Magento/Sendfriend/composer.json app/code/Magento/Shipping/composer.json app/code/Magento/Sitemap/composer.json app/code/Magento/Store/composer.json app/code/Magento/Tax/composer.json app/code/Magento/TaxImportExport/composer.json app/code/Magento/Theme/composer.json app/code/Magento/Translation/composer.json app/code/Magento/Ui/composer.json app/code/Magento/Ups/composer.json app/code/Magento/UrlRewrite/composer.json app/code/Magento/User/composer.json app/code/Magento/Usps/composer.json app/code/Magento/Webapi/composer.json app/code/Magento/Weee/composer.json app/code/Magento/Widget/composer.json app/code/Magento/Wishlist/composer.json app/design/adminhtml/Magento/backend/composer.json app/design/frontend/Magento/blank/composer.json app/design/frontend/Magento/luma/composer.json composer.lock
2 parents 7fcf284 + 70394a6 commit 88988c2

File tree

16,524 files changed

+33739
-17265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

16,524 files changed

+33739
-17265
lines changed

‎.php_cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
45
*/
56

67
/**

‎CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
0.42.0-beta3
2+
=============
3+
* Fixed bugs:
4+
* Fixed an issue where malicious JavaScript could be executed when adding new User Roles in the backend
5+
* Fixed an issue where incorrect output format was returned when invoking the Customer service
6+
* Fixed an issue where it was impossible to activate an integration after editing the URLs
7+
* Fixed an issue where incorrect class path was used in the ObjectManager calls
8+
* Fixed an issue where inconsistent Reflection classes were used for WebApi applications
9+
* Fixed an issue where the parent element was removed from theme.xml by mistake
10+
* API functional tests changes:
11+
* Moved API functional tests to CE repository
12+
* Various improvements:
13+
* Removed include-path from composer.json
14+
* GitHub requests:
15+
* [#876](https://github.com/magento/magento2/pull/876) -- [BUGFIX] Fixed german translation "Warenkorbrn"
16+
* [#880](https://github.com/magento/magento2/pull/880) -- Naming fix in DI compiler.php - rename binary to igbinary to stay consistent
17+
* [#913](https://github.com/magento/magento2/pull/913) -- Specify date fixture and fix expectations
18+
* [#874](https://github.com/magento/magento2/pull/874) -- Prevent special characters finding their way into layout handle due to SKU being used
19+
* [#903](https://github.com/magento/magento2/pull/903) -- Small cleanup refactoring
20+
* [#905](https://github.com/magento/magento2/pull/905), [#907](https://github.com/magento/magento2/pull/907), [#908](https://github.com/magento/magento2/pull/908) -- Change interpret() return value to conform with Layout\ReaderInterface
21+
* [#913](https://github.com/magento/magento2/pull/913) -- Specify date fixture and fix expectations
22+
123
0.42.0-beta2
224
=============
325
* Framework improvements:

‎CONTRIBUTOR_LICENSE_AGREEMENT.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!--
22
/**
3-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
45
*/
56
-->
67
<!DOCTYPE html>

‎COPYING.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
2+
3+
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
4+
Please see <insert file name of the OSL license> for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
5+
6+
Subject to Licensee�s payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
7+
Please see <insert file name of the MEE license> for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.

‎app/autoload.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Register basic autoloader that uses include path
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
use Magento\Framework\Autoload\AutoloaderRegistry;
89
use Magento\Framework\Autoload\ClassLoaderWrapper;

‎app/bootstrap.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
45
*/
56

67
/**

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
namespace Magento\AdminNotification\Block\Grid\Renderer;
89

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
namespace Magento\AdminNotification\Block\Grid\Renderer;
89

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
namespace Magento\AdminNotification\Block\Grid\Renderer;
89

‎app/code/Magento/AdminNotification/Block/Inbox.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Adminhtml AdminNotification inbox grid
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
namespace Magento\AdminNotification\Block;
89

0 commit comments

Comments
 (0)