Skip to content

Commit 5a0c934

Browse files
author
Joan He
committed
Merge remote-tracking branch 'upstream/develop' into MAGETWO-25343-remove-theme-version
2 parents 3ebde7e + 94f9665 commit 5a0c934

File tree

16,525 files changed

+33913
-17183
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,525 files changed

+33913
-17183
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)