Skip to content

Commit d409839

Browse files
author
Oleg Zinoviev
committed
Merge branch 'UI' into MAGETWO-32274
2 parents 8684a8d + a761e78 commit d409839

File tree

1,595 files changed

+19234
-12412
lines changed

Some content is hidden

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

1,595 files changed

+19234
-12412
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ atlassian*
3232
/pub/media/theme/*
3333
/pub/media/theme_customization/*
3434
!/pub/media/theme_customization/.htaccess
35+
/pub/media/wysiwyg/*
36+
!/pub/media/wysiwyg/.htaccess
3537
/pub/media/tmp/*
3638
!/pub/media/tmp/.htaccess
3739
/pub/static/*

‎.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: php
22
php:
33
- 5.4
44
- 5.5
5+
- 5.6
56
env:
67
- TEST_SUITE=unit
78
- TEST_SUITE=integration
@@ -14,6 +15,10 @@ matrix:
1415
env: TEST_SUITE=static_phpcs
1516
- php: 5.4
1617
env: TEST_SUITE=static_annotation
18+
- php: 5.6
19+
env: TEST_SUITE=static_phpcs
20+
- php: 5.6
21+
env: TEST_SUITE=static_annotation
1722
before_install:
1823
- sudo apt-get update -qq
1924
- sudo apt-get install -y -qq postfix

‎CHANGELOG.md

Lines changed: 139 additions & 89 deletions
Large diffs are not rendered by default.

‎COPYING.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
22

33
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.
4+
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
55

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.
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.
77
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/bootstrap.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
/* PHP version validation */
1515
if (version_compare(phpversion(), '5.4.11', '<') === true) {
1616
if (PHP_SAPI == 'cli') {
17-
echo 'Magento supports PHP 5.4.11 or newer. Please read http://www.magento.com/install.';
17+
echo 'Magento supports PHP 5.4.11 or later. ' .
18+
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
1819
} else {
1920
echo <<<HTML
2021
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
21-
<div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
22-
<h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
23-
Whoops, it looks like you have an invalid PHP version.</h3>
24-
</div>
25-
<p>Magento supports PHP 5.4.11 or newer.
22+
<p>Magento supports PHP 5.4.11 or later. Please read
23+
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
24+
Magento System Requirements</a>.
2625
</div>
2726
HTML;
2827
}

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-core": "0.42.0-beta3",
8-
"magento/module-backend": "0.42.0-beta3",
9-
"magento/framework": "0.42.0-beta3",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-core": "0.42.0-beta4",
8+
"magento/module-backend": "0.42.0-beta4",
9+
"magento/framework": "0.42.0-beta4",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta3",
14+
"version": "0.42.0-beta4",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"name": "magento/module-authorization",
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
6-
"magento/module-backend": "0.42.0-beta3",
7-
"magento/framework": "0.42.0-beta3",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
6+
"magento/module-backend": "0.42.0-beta4",
7+
"magento/framework": "0.42.0-beta4",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta3",
11+
"version": "0.42.0-beta4",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Authorization/sql/authorization_setup/install-2.0.0.php

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,7 @@
99

1010
$installer->startSetup();
1111

12-
if ($installer->getConnection()->isTableExists($installer->getTable('admin_role'))) {
13-
/**
14-
* Rename existing 'admin_role' table into 'authorization_role' (to avoid forcing Magento re-installation)
15-
* TODO: This conditional logic can be removed some time after pull request is delivered to the mainline
16-
*/
17-
$installer->getConnection()->renameTable(
18-
$installer->getTable('admin_role'),
19-
$installer->getTable('authorization_role')
20-
);
21-
} elseif (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
12+
if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
2213
/**
2314
* Create table 'authorization_role'
2415
*/
@@ -84,16 +75,7 @@
8475
$installer->getConnection()->createTable($table);
8576
}
8677

87-
if ($installer->getConnection()->isTableExists($installer->getTable('admin_rule'))) {
88-
/**
89-
* Rename existing 'admin_rule' table into 'authorization_rule' (to avoid forcing Magento re-installation)
90-
* TODO: This conditional logic can be removed some time after pull request is delivered to the mainline
91-
*/
92-
$installer->getConnection()->renameTable(
93-
$installer->getTable('admin_rule'),
94-
$installer->getTable('authorization_rule')
95-
);
96-
} elseif (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
78+
if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
9779
/**
9880
* Create table 'authorization_rule'
9981
*/

‎app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Grid widget massaction block
1212
*
13-
* @method \Magento\Sales\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
13+
* @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
1414
* @method boolean getHideFormElement()
1515
* @author Magento Core Team <core@magentocommerce.com>
1616
*/

‎app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Grid widget massaction block
1010
*
11-
* @method \Magento\Sales\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
11+
* @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
1212
* @method boolean getHideFormElement()
1313
* @author Magento Core Team <core@magentocommerce.com>
1414
* @deprecated support Magento 1.x grid massaction implementation

0 commit comments

Comments
 (0)