Skip to content

Commit 215652f

Browse files
author
Igor Melnikov
committed
MAGETWO-54447: Composer update fails
Merging with upstream, regenerating composer.lock
2 parents 9536b58 + 609be9d commit 215652f

File tree

307 files changed

+3674
-1758
lines changed

Some content is hidden

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

307 files changed

+3674
-1758
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2.1.0
2+
=============
3+
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
4+
15
2.0.0
26
=============
37
* Fixed bugs:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ public function render(\Magento\Framework\DataObject $row)
4141
{
4242
$readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
4343
'Read Details'
44-
) . '</a> | ' : '';
44+
) . '</a>' : '';
4545

4646
$markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
4747
'*/*/markAsRead/',
4848
['_current' => true, 'id' => $row->getId()]
4949
) . '">' . __(
5050
'Mark as Read'
51-
) . '</a> | ' : '';
51+
) . '</a>' : '';
5252

5353
$encodedUrl = $this->_urlHelper->getEncodedUrl();
5454
return sprintf(

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.6.0|7.0.2|~7.0.6",
6-
"magento/module-store": "100.1.*",
7-
"magento/module-backend": "100.1.*",
8-
"magento/module-media-storage": "100.1.*",
9-
"magento/framework": "100.1.*",
6+
"magento/module-store": "100.2.*",
7+
"magento/module-backend": "100.2.*",
8+
"magento/module-media-storage": "100.2.*",
9+
"magento/framework": "100.2.*",
1010
"lib-libxml": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.1.0-rc2",
13+
"version": "100.2.0-dev",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.6.0|7.0.2|~7.0.6",
6-
"magento/module-catalog": "101.0.*",
7-
"magento/module-catalog-inventory": "100.1.*",
8-
"magento/module-eav": "100.1.*",
9-
"magento/module-import-export": "100.1.*",
10-
"magento/module-catalog-import-export": "100.1.*",
11-
"magento/module-customer": "100.1.*",
12-
"magento/module-store": "100.1.*",
13-
"magento/framework": "100.1.*"
6+
"magento/module-catalog": "101.1.*",
7+
"magento/module-catalog-inventory": "100.2.*",
8+
"magento/module-eav": "100.2.*",
9+
"magento/module-import-export": "100.2.*",
10+
"magento/module-catalog-import-export": "100.2.*",
11+
"magento/module-customer": "100.2.*",
12+
"magento/module-store": "100.2.*",
13+
"magento/framework": "100.2.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.1.0-rc2",
16+
"version": "100.2.0-dev",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.6.0|7.0.2|~7.0.6",
6-
"magento/module-backend": "100.1.*",
7-
"magento/framework": "100.1.*"
6+
"magento/module-backend": "100.2.*",
7+
"magento/framework": "100.2.*"
88
},
99
"type": "magento2-module",
10-
"version": "100.1.0-rc2",
10+
"version": "100.2.0-dev",
1111
"license": [
1212
"OSL-3.0",
1313
"AFL-3.0"

‎app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Magento\Framework\Registry;
1616
use Magento\Payment\Model\IframeConfigProvider;
1717
use Magento\Quote\Api\CartManagementInterface;
18+
use Magento\Framework\Exception\LocalizedException;
1819

1920
/**
2021
* Class Place
@@ -125,6 +126,9 @@ protected function placeCheckoutOrder()
125126
'action' => $this
126127
]
127128
);
129+
} catch (LocalizedException $exception) {
130+
$result->setData('error', true);
131+
$result->setData('error_messages', $exception->getMessage());
128132
} catch (\Exception $exception) {
129133
$result->setData('error', true);
130134
$result->setData('error_messages', __('Unable to place order. Please try again later.'));

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.6.0|7.0.2|~7.0.6",
6-
"magento/module-sales": "100.1.*",
7-
"magento/module-store": "100.1.*",
8-
"magento/module-quote": "100.1.*",
9-
"magento/module-checkout": "100.1.*",
10-
"magento/module-backend": "100.1.*",
11-
"magento/module-payment": "100.1.*",
12-
"magento/module-catalog": "101.0.*",
13-
"magento/framework": "100.1.*"
6+
"magento/module-sales": "100.2.*",
7+
"magento/module-store": "100.2.*",
8+
"magento/module-quote": "100.2.*",
9+
"magento/module-checkout": "100.2.*",
10+
"magento/module-backend": "100.2.*",
11+
"magento/module-payment": "100.2.*",
12+
"magento/module-catalog": "101.1.*",
13+
"magento/framework": "100.2.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.1.0-rc2",
16+
"version": "100.2.0-dev",
1717
"license": [
1818
"proprietary"
1919
],

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.6.0|7.0.2|~7.0.6",
6-
"magento/module-store": "100.1.*",
7-
"magento/module-directory": "100.1.*",
8-
"magento/module-developer": "100.1.*",
9-
"magento/module-eav": "100.1.*",
10-
"magento/module-theme": "100.1.*",
11-
"magento/module-reports": "100.1.*",
12-
"magento/module-sales": "100.1.*",
13-
"magento/module-quote": "100.1.*",
14-
"magento/module-catalog": "101.0.*",
15-
"magento/module-user": "100.1.*",
16-
"magento/module-security": "100.1.*",
17-
"magento/module-backup": "100.1.*",
18-
"magento/module-customer": "100.1.*",
19-
"magento/module-translation": "100.1.*",
20-
"magento/module-require-js": "100.1.*",
21-
"magento/module-config": "100.1.*",
22-
"magento/framework": "100.1.*"
6+
"magento/module-store": "100.2.*",
7+
"magento/module-directory": "100.2.*",
8+
"magento/module-developer": "100.2.*",
9+
"magento/module-eav": "100.2.*",
10+
"magento/module-theme": "100.2.*",
11+
"magento/module-reports": "100.2.*",
12+
"magento/module-sales": "100.2.*",
13+
"magento/module-quote": "100.2.*",
14+
"magento/module-catalog": "101.1.*",
15+
"magento/module-user": "100.2.*",
16+
"magento/module-security": "100.2.*",
17+
"magento/module-backup": "100.2.*",
18+
"magento/module-customer": "100.2.*",
19+
"magento/module-translation": "100.2.*",
20+
"magento/module-require-js": "100.2.*",
21+
"magento/module-config": "100.2.*",
22+
"magento/framework": "100.2.*"
2323
},
2424
"type": "magento2-module",
25-
"version": "100.1.0-rc2",
25+
"version": "100.2.0-dev",
2626
"license": [
2727
"OSL-3.0",
2828
"AFL-3.0"

‎app/code/Magento/Backend/view/adminhtml/layout/default.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<head>
1010
<title>Magento Admin</title>
1111
<meta name="viewport" content="width=1024"/>
12+
<meta name="format-detection" content="telephone=no"/>
1213
<link src="requirejs/require.js"/>
1314
<css src="extjs/resources/css/ext-all.css"/>
1415
<css src="extjs/resources/css/ytheme-magento.css"/>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.6.0|7.0.2|~7.0.6",
6-
"magento/module-store": "100.1.*",
7-
"magento/module-backend": "100.1.*",
8-
"magento/module-cron": "100.1.*",
9-
"magento/framework": "100.1.*"
6+
"magento/module-store": "100.2.*",
7+
"magento/module-backend": "100.2.*",
8+
"magento/module-cron": "100.2.*",
9+
"magento/framework": "100.2.*"
1010
},
1111
"type": "magento2-module",
12-
"version": "100.1.0-rc2",
12+
"version": "100.2.0-dev",
1313
"license": [
1414
"OSL-3.0",
1515
"AFL-3.0"

0 commit comments

Comments
 (0)