Skip to content

Commit be754a8

Browse files
mazhalaimazhalai
committed
Merge branch 'mainline_develop' into develop
Conflicts: setup/pub/magento/setup/css/app.css setup/view/magento/setup/customize-your-store.phtml setup/view/magento/setup/web-configuration.phtml
2 parents 2ebd193 + 765f195 commit be754a8

File tree

1,730 files changed

+15229
-13864
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,730 files changed

+15229
-13864
lines changed

‎CHANGELOG.md

+47
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,50 @@
1+
0.42.0-beta7
2+
=============
3+
* Various improvements:
4+
* Added Varnish 4 support
5+
* Added CSS minification
6+
* Improved the performance toolkit
7+
* Fixed bugs:
8+
* Fixed an issue where the compiler for the single tenant mode did not resolve Repositories
9+
* Fixed an issue where the "Select all" mass action on the Customers page did not select all customers
10+
* Fixed an issue where values for a customer attribute of multiple-select type were not saved
11+
* Fixed an issue where the parental wakeup() method was not called in interceptors
12+
* Fixed an issue where bundle products with the same configurations added from different pages were displayed in the wishlist as separate items
13+
* Fixed an issue where the number of items added to the wishlist was not displayed on certain pages
14+
* Fixed an issue where logging was broken
15+
* Fixed an issue where it was impossible to use \Magento\Customer\Model\Resource\AddressRepository::getList with predefined direction(sortOrder)
16+
* Fixed an issue where editing a product from wishlist led caused a fatal error
17+
* Fixed an issue where the redirect link to continue shopping was absent in the success message after adding product to a wishlist
18+
* Fixed an issue where HTML tags where displayed in product prices on the Customer's Wishlist page in Admin
19+
* Fixed an issue where the Name and Email fields were not automatically when creating an email using the Email to Friend functionality
20+
* Fixed an issue with the redirect after searching product in a customer wishlist in Admin
21+
* Fixed an issue where a configurable product did not go out of stock when last subitem of some option was sold
22+
* Fixed an issue with varnish config generation for multiple IPs in access list field
23+
* Fixed the wrong di.xml in the Magento_Developer module
24+
* Fixed an issue where changes were not saved when default billing/shipping address was not selected in customer addresses
25+
* Fixed the issue where the Update Qty button looked disabled during a partial invoice creation
26+
* Fixed an issue where the creation date was not displayed in invoices and credit memo grids
27+
* Fixed an issue where it was impossible to install Magento_Quote on PHP 5.6
28+
* Fixed an issue that changes are not saved when default billing/shipping address is unchecked in customer addresses
29+
* Fixed an issue where "Update Qty" button looks disabled while creating partial invoice
30+
* Fixed an issue where date created column is not populated in invoices and credit memo grid
31+
* Fixed an issue with installation of Magento_Quote module on PHP 5.6
32+
* Fixed an issue with wrong link "File Permission Help"
33+
* Fixed an issue where dev/tools are broken when DI compiler is used due to skipped by the compiler dev/tools/Magento folder
34+
* Framework improvements:
35+
* JavaScript testsuites divided into frontend, backend and lib suites
36+
* Implemented image compression on server side upload
37+
* Implemented frontend page resources sorting
38+
* Removed the Magic __call method usage in templates
39+
* Introduced Jasmine + PhantomJS JavaScript testing infrastructure
40+
* Removed support of PHP 5.4
41+
* Setup Tool improvements:
42+
* Added tools for enabling/disabling modules: "module-enable --modules=Module_One,Module_Two, module-disable --modules=Module_One,Module_Two"
43+
* Added help option for displaying list of available modules: "help module-list"
44+
* GitHub requests :
45+
* [#593](https://github.com/magento/magento2/issues/593) -- Allow to use "0" as customer group
46+
* [#804](https://github.com/magento/magento2/issues/804) -- Comment about VAT number displayed under different field in Customer Configuration
47+
148
0.42.0-beta6
249
=============
350
* Various improvements:

‎Gruntfile.js

+21-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ module.exports = function (grunt) {
99

1010
// Required plugins
1111
// _____________________________________________
12-
var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt);
12+
13+
var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt),
14+
svgo = require('imagemin-svgo');
1315

1416
require('./dev/tools/grunt/tasks/mage-minify')(grunt);
1517

@@ -21,8 +23,6 @@ module.exports = function (grunt) {
2123
pattern: ['grunt-*', '!grunt-template-jasmine-requirejs']
2224
});
2325

24-
var svgo = require('imagemin-svgo');
25-
2626
// Configuration
2727
// _____________________________________________
2828

@@ -318,7 +318,8 @@ module.exports = function (grunt) {
318318

319319
cssmin: {
320320
options: {
321-
report: 'gzip'
321+
report: 'gzip',
322+
keepSpecialComments: 0
322323
},
323324
setup: {
324325
files: {
@@ -342,6 +343,20 @@ module.exports = function (grunt) {
342343
}
343344
},
344345

346+
// Concatenation
347+
// ---------------------------------------------
348+
349+
concat: {
350+
options: {
351+
stripBanners: true,
352+
banner: '/**\n * Copyright © <%= grunt.template.today("yyyy") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n'
353+
},
354+
setup: {
355+
src: '<%= path.css.setup %>/setup.css',
356+
dest: '<%= path.css.setup %>/setup.css'
357+
}
358+
},
359+
345360

346361
// Watches files for changes and runs tasks based on the changed files
347362
// ---------------------------------------------
@@ -545,7 +560,8 @@ module.exports = function (grunt) {
545560
grunt.task.run([
546561
'less:' + component,
547562
'autoprefixer:' + component,
548-
'cssmin:' + component
563+
'cssmin:' + component,
564+
'concat:' + component
549565
]);
550566
}
551567
if (component == undefined) {

‎app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getUnreadMessages()
6666
/**
6767
* Retrieve popup title
6868
*
69-
* @return string
69+
* @return \Magento\Framework\Phrase
7070
*/
7171
public function getPopupTitle()
7272
{

‎app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
2121
protected $_config;
2222

2323
/**
24-
* @var \Magento\Framework\Store\StoreManagerInterface
24+
* @var \Magento\Store\Model\StoreManagerInterface
2525
*/
2626
protected $_storeManager;
2727

@@ -32,13 +32,13 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
3232

3333
/**
3434
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
35-
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
35+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
3636
* @param \Magento\Framework\UrlInterface $urlBuilder
3737
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
3838
*/
3939
public function __construct(
4040
\Magento\Framework\App\Config\ScopeConfigInterface $config,
41-
\Magento\Framework\Store\StoreManagerInterface $storeManager,
41+
\Magento\Store\Model\StoreManagerInterface $storeManager,
4242
\Magento\Framework\UrlInterface $urlBuilder,
4343
\Magento\Framework\App\Config\ValueFactory $configValueFactory
4444
) {
@@ -114,7 +114,7 @@ public function isDisplayed()
114114
/**
115115
* Retrieve message text
116116
*
117-
* @return string
117+
* @return \Magento\Framework\Phrase
118118
*/
119119
public function getText()
120120
{

‎app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function getIdentity()
6969
public function isDisplayed()
7070
{
7171
return $this->_authorization->isAllowed(
72-
'Magento_Adminhtml::cache'
72+
'Magento_Backend::cache'
7373
) && count(
7474
$this->_getCacheTypesForRefresh()
7575
) > 0;

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function _shouldBeDisplayed()
3131
/**
3232
* Retrieve message text
3333
*
34-
* @return string
34+
* @return \Magento\Framework\Phrase
3535
*/
3636
public function getText()
3737
{

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected function _shouldBeDisplayed()
3030
/**
3131
* Retrieve message text
3232
*
33-
* @return string
33+
* @return \Magento\Framework\Phrase
3434
*/
3535
public function getText()
3636
{

‎app/code/Magento/AdminNotification/Model/System/Message/Security.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public function isDisplayed()
129129
/**
130130
* Retrieve message text
131131
*
132-
* @return string
132+
* @return \Magento\Framework\Phrase
133133
*/
134134
public function getText()
135135
{

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta6",
7-
"magento/module-core": "0.42.0-beta6",
8-
"magento/module-backend": "0.42.0-beta6",
9-
"magento/framework": "0.42.0-beta6",
6+
"magento/module-store": "0.42.0-beta7",
7+
"magento/module-core": "0.42.0-beta7",
8+
"magento/module-backend": "0.42.0-beta7",
9+
"magento/framework": "0.42.0-beta7",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta6",
14+
"version": "0.42.0-beta7",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/AdminNotification/etc/acl.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
99
<acl>
1010
<resources>
11-
<resource id="Magento_Adminhtml::admin">
12-
<resource id="Magento_Adminhtml::system">
13-
<resource id="Magento_Adminhtml::system_other_settings">
11+
<resource id="Magento_Backend::admin">
12+
<resource id="Magento_Backend::system">
13+
<resource id="Magento_Backend::system_other_settings">
1414
<resource id="Magento_AdminNotification::adminnotification" title="Notifications" sortOrder="10">
1515
<resource id="Magento_AdminNotification::show_toolbar" title="Show Toolbar" sortOrder="10" />
1616
<resource id="Magento_AdminNotification::show_list" title="Show List" sortOrder="20" />

‎app/code/Magento/AdminNotification/etc/adminhtml/routes.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
99
<router id="admin">
1010
<route id="adminhtml">
11-
<module name="Magento_AdminNotification" before="Magento_Adminhtml" />
11+
<module name="Magento_AdminNotification" before="Magento_Backend" />
1212
</route>
1313
</router>
1414
</config>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<head>
10-
<css src="Magento_Core::prototype/magento.css"/>
10+
<css src="Magento_Theme::prototype/magento.css"/>
1111
</head>
1212
<body>
1313
<referenceContainer name="notifications">

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta6",
7-
"magento/framework": "0.42.0-beta6",
6+
"magento/module-backend": "0.42.0-beta7",
7+
"magento/framework": "0.42.0-beta7",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta6",
11+
"version": "0.42.0-beta7",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747
$this->createRules()->setData(
4848
[
4949
'role_id' => $admGroupRole->getId(),
50-
'resource_id' => 'Magento_Adminhtml::all',
50+
'resource_id' => 'Magento_Backend::all',
5151
'privileges' => null,
5252
'permission' => 'allow',
5353
]
5454
)->save();
5555
} else {
5656
/** @var \Magento\Authorization\Model\Rules $rule */
5757
foreach ($rulesCollection as $rule) {
58-
$rule->setData('resource_id', 'Magento_Adminhtml::all')->save();
58+
$rule->setData('resource_id', 'Magento_Backend::all')->save();
5959
}
6060
}

‎app/code/Magento/Backend/App/Router.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Router extends \Magento\Core\App\Router\Base
5353
* @param \Magento\Framework\App\ResponseFactory $responseFactory
5454
* @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
5555
* @param \Magento\Framework\UrlInterface $url
56-
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
56+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
5757
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
5858
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
5959
* @param string $routerId
@@ -70,7 +70,7 @@ public function __construct(
7070
\Magento\Framework\App\ResponseFactory $responseFactory,
7171
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
7272
\Magento\Framework\UrlInterface $url,
73-
\Magento\Framework\Store\StoreManagerInterface $storeManager,
73+
\Magento\Store\Model\StoreManagerInterface $storeManager,
7474
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
7575
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
7676
$routerId,

‎app/code/Magento/Backend/Block/Dashboard.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function _prepareLayout()
3131

3232
$this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
3333

34-
if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
34+
if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
3535
$block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
3636
} else {
3737
$block = $this->getLayout()->createBlock(

‎app/code/Magento/Backend/Block/Dashboard/Graph.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public function getChartUrl($directUrl = true)
210210

211211
$timezoneLocal = $this->_scopeConfig->getValue(
212212
$this->_localeDate->getDefaultTimezonePath(),
213-
\Magento\Framework\Store\ScopeInterface::SCOPE_STORE
213+
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
214214
);
215215

216216
list($dateStart, $dateEnd) = $this->_collectionFactory->create()->getDateRange(

‎app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ protected function _prepareColumns()
110110
'items',
111111
[
112112
'header' => __('Items'),
113-
'align' => 'right',
114113
'type' => 'number',
115114
'sortable' => false,
116115
'index' => 'items_count'
@@ -122,8 +121,7 @@ protected function _prepareColumns()
122121
$this->addColumn(
123122
'total',
124123
[
125-
'header' => __('Grand Total'),
126-
'align' => 'right',
124+
'header' => __('Total'),
127125
'sortable' => false,
128126
'type' => 'currency',
129127
'currency_code' => $baseCurrencyCode,

‎app/code/Magento/Backend/Block/Dashboard/Sales.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ protected function _prepareLayout()
7171
$sales = $collection->getFirstItem();
7272

7373
$this->addTotal(__('Lifetime Sales'), $sales->getLifetime());
74-
$this->addTotal(__('Average Orders'), $sales->getAverage());
74+
$this->addTotal(__('Average Order'), $sales->getAverage());
7575
}
7676
}

‎app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,25 @@ protected function _prepareColumns()
9191
'orders_avg_amount',
9292
[
9393
'header' => __('Average'),
94-
'align' => 'right',
9594
'sortable' => false,
9695
'type' => 'currency',
9796
'currency_code' => $baseCurrencyCode,
98-
'index' => 'orders_avg_amount'
97+
'index' => 'orders_avg_amount',
98+
'header_css_class' => 'col-avg',
99+
'column_css_class' => 'col-avg'
99100
]
100101
);
101102

102103
$this->addColumn(
103104
'orders_sum_amount',
104105
[
105106
'header' => __('Total'),
106-
'align' => 'right',
107107
'sortable' => false,
108108
'type' => 'currency',
109109
'currency_code' => $baseCurrencyCode,
110-
'index' => 'orders_sum_amount'
110+
'index' => 'orders_sum_amount',
111+
'header_css_class' => 'col-total',
112+
'column_css_class' => 'col-total'
111113
]
112114
);
113115

‎app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,27 @@ protected function _prepareColumns()
8989
'orders_avg_amount',
9090
[
9191
'header' => __('Average'),
92-
'align' => 'right',
9392
'sortable' => false,
9493
'type' => 'currency',
9594
'currency_code' => $baseCurrencyCode,
9695
'index' => 'orders_avg_amount',
97-
'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency'
96+
'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
97+
'header_css_class' => 'col-avg',
98+
'column_css_class' => 'col-avg'
9899
]
99100
);
100101

101102
$this->addColumn(
102103
'orders_sum_amount',
103104
[
104105
'header' => __('Total'),
105-
'align' => 'right',
106106
'sortable' => false,
107107
'type' => 'currency',
108108
'currency_code' => $baseCurrencyCode,
109109
'index' => 'orders_sum_amount',
110-
'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency'
110+
'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
111+
'header_css_class' => 'col-total',
112+
'column_css_class' => 'col-total'
111113
]
112114
);
113115

0 commit comments

Comments
 (0)