Skip to content

Commit 644af41

Browse files
monkeyseemonkeysee
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-37710-composer-readiness-check
2 parents c3d691b + 86674b4 commit 644af41

File tree

294 files changed

+9273
-2328
lines changed

Some content is hidden

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

294 files changed

+9273
-2328
lines changed

‎CHANGELOG.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
0.74.0-beta11
2+
=============
3+
* Framework improvements:
4+
* Improved component Bookmarks component in scope of Enhanced Data Grids on CMS
5+
* Improved component Advanced Filtering component in scope of Enhanced Data Grids on CMS
6+
* Fixed bugs:
7+
* Fixed an issue where incorrect keys in REST request body allowed the request to go through successfully
8+
* Fixed an issue where interceptors were Generated with Invalid __wakeup()
9+
* Fixed an issue where redirect on the current page was not working in certain conditions
10+
* Fixed an issue where first store could not be selected on frontend
11+
* Fixed an issue with performance toolkit category creation
12+
* Fixed an issue when columns 'Interval', 'Price Rule' had incorrect values in Coupon Usage report
13+
* Fixed an issue where fatal error occured on Abandoned Carts report grid
14+
* Fixed an issue where it was not possible to add product to shopping cart if Use Secure URLs in Frontend = Yes
15+
* Fixed an issue where email was not required during Guest Checkout
16+
* Fixed broken ability to skip reindex in `bin/magento setup:performance:generate-fixtures` command
17+
* Fixed an issue where `bin/magento indexer:reindex` command failed after `bin/magento setup:di:compile` was run
18+
* Fixed bug with broken JS i18n
19+
* Fixed an issue with wrong value at created_at updated_at fields after quote* save
20+
* Fixed an issue where customer could not be created in backend after adding Image type attribute
21+
* Fixed Sales InvoiceItem and Order data interfaces implementation
22+
* Fixed an issue with performance toolkit medium profile
23+
* Fixed an issue where Excel Formula Injection via CSV/XML export
24+
* Fixed an issue where it was not possible to open the Customers page in backend
25+
* Fixed an issue with internal server error after clicking Continue on Billing information
26+
* Fixed an issue where it was not possible to place order with Fedex shipping method
27+
* Various changes:
28+
* Magento Centinel Removal
29+
* Removed ability to have multi-statement queries
30+
* Test coverage:
31+
* Unit tests coverage
32+
* Covered php code by unit tests after new checkout implementation
33+
* Github issues:
34+
* [#424](https://github.com/magento/magento2/issues/424) -- Combine tier pricing messages into block sentences
35+
* [#1300](https://github.com/magento/magento2/issues/1300), [#1311](https://github.com/magento/magento2/issues/1311), [#1313](https://github.com/magento/magento2/issues/1313) -- Creating product error with startdate
36+
137
0.74.0-beta10
238
=============
339
* Framework improvements:

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

Lines changed: 5 additions & 5 deletions
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.74.0-beta10",
7-
"magento/module-backend": "0.74.0-beta10",
8-
"magento/module-media-storage": "0.74.0-beta10",
9-
"magento/framework": "0.74.0-beta10",
6+
"magento/module-store": "0.74.0-beta11",
7+
"magento/module-backend": "0.74.0-beta11",
8+
"magento/module-media-storage": "0.74.0-beta11",
9+
"magento/framework": "0.74.0-beta11",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta10",
14+
"version": "0.74.0-beta11",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 3 additions & 3 deletions
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.74.0-beta10",
7-
"magento/framework": "0.74.0-beta10",
6+
"magento/module-backend": "0.74.0-beta11",
7+
"magento/framework": "0.74.0-beta11",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta10",
11+
"version": "0.74.0-beta11",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,22 @@ 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\Store\Model\ScopeInterface::SCOPE_STORE)) {
34+
$isChartEnabled = $this->_scopeConfig->getValue(
35+
self::XML_PATH_ENABLE_CHARTS,
36+
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
37+
);
38+
if ($isChartEnabled) {
3539
$block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
3640
} else {
3741
$block = $this->getLayout()->createBlock(
3842
'Magento\Backend\Block\Template'
3943
)->setTemplate(
4044
'dashboard/graph/disabled.phtml'
4145
)->setConfigUrl(
42-
$this->getUrl('adminhtml/system_config/edit', ['section' => 'admin'])
46+
$this->getUrl(
47+
'adminhtml/system_config/edit',
48+
['section' => 'admin', '_fragment' => 'admin_dashboard-link']
49+
)
4350
);
4451
}
4552
$this->setChild('diagrams', $block);

‎app/code/Magento/Backend/Model/Auth.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public function getCredentialStorage()
145145
public function login($username, $password)
146146
{
147147
if (empty($username) || empty($password)) {
148-
self::throwException(__('Please correct the user name or password.'));
148+
self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));
149149
}
150150

151151
try {
@@ -162,7 +162,7 @@ public function login($username, $password)
162162
}
163163

164164
if (!$this->getAuthStorage()->getUser()) {
165-
self::throwException(__('Please correct the user name or password.'));
165+
self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));
166166
}
167167
} catch (PluginAuthenticationException $e) {
168168
$this->_eventManager->dispatch(
@@ -175,7 +175,9 @@ public function login($username, $password)
175175
'backend_auth_user_login_failed',
176176
['user_name' => $username, 'exception' => $e]
177177
);
178-
self::throwException(__($e->getMessage()? : 'Please correct the user name or password.'));
178+
self::throwException(
179+
__($e->getMessage()? : 'You did not sign in correctly or your account is temporarily disabled.')
180+
);
179181
}
180182
}
181183

‎app/code/Magento/Backend/Test/Unit/Model/AuthTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected function setUp()
5050

5151
/**
5252
* @expectedException \Magento\Framework\Exception\AuthenticationException
53-
* @expectedExceptionMessage Please correct the user name or password.
53+
* @expectedExceptionMessage You did not sign in correctly or your account is temporarily disabled.
5454
*/
5555
public function testLoginFailed()
5656
{
@@ -59,8 +59,9 @@ public function testLoginFailed()
5959
->method('create')
6060
->with('Magento\Backend\Model\Auth\Credential\StorageInterface')
6161
->will($this->returnValue($this->_credentialStorage));
62-
$exceptionMock =
63-
new \Magento\Framework\Exception\LocalizedException(__('Please correct the user name or password.'));
62+
$exceptionMock = new \Magento\Framework\Exception\LocalizedException(
63+
__('You did not sign in correctly or your account is temporarily disabled.')
64+
);
6465
$this->_credentialStorage
6566
->expects($this->once())
6667
->method('login')

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta10",
7-
"magento/module-directory": "0.74.0-beta10",
8-
"magento/module-developer": "0.74.0-beta10",
9-
"magento/module-eav": "0.74.0-beta10",
10-
"magento/module-cron": "0.74.0-beta10",
11-
"magento/module-theme": "0.74.0-beta10",
12-
"magento/module-reports": "0.74.0-beta10",
13-
"magento/module-sales": "0.74.0-beta10",
14-
"magento/module-quote": "0.74.0-beta10",
15-
"magento/module-catalog": "0.74.0-beta10",
16-
"magento/module-user": "0.74.0-beta10",
17-
"magento/module-backup": "0.74.0-beta10",
18-
"magento/module-customer": "0.74.0-beta10",
19-
"magento/module-translation": "0.74.0-beta10",
20-
"magento/module-require-js": "0.74.0-beta10",
21-
"magento/module-config": "0.74.0-beta10",
22-
"magento/framework": "0.74.0-beta10",
6+
"magento/module-store": "0.74.0-beta11",
7+
"magento/module-directory": "0.74.0-beta11",
8+
"magento/module-developer": "0.74.0-beta11",
9+
"magento/module-eav": "0.74.0-beta11",
10+
"magento/module-cron": "0.74.0-beta11",
11+
"magento/module-theme": "0.74.0-beta11",
12+
"magento/module-reports": "0.74.0-beta11",
13+
"magento/module-sales": "0.74.0-beta11",
14+
"magento/module-quote": "0.74.0-beta11",
15+
"magento/module-catalog": "0.74.0-beta11",
16+
"magento/module-user": "0.74.0-beta11",
17+
"magento/module-backup": "0.74.0-beta11",
18+
"magento/module-customer": "0.74.0-beta11",
19+
"magento/module-translation": "0.74.0-beta11",
20+
"magento/module-require-js": "0.74.0-beta11",
21+
"magento/module-config": "0.74.0-beta11",
22+
"magento/framework": "0.74.0-beta11",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta10",
26+
"version": "0.74.0-beta11",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backend/i18n/de_DE.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
287287
"Current Month","Current Month"
288288
YTD,YTD
289289
2YTD,2YTD
290-
"Please correct the user name or password.","Please correct the user name or password."
290+
"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
291291
"Authentication error occurred.","Authentication error occurred."
292292
"Please specify the admin custom URL.","Please specify the admin custom URL."
293293
"Invalid %1. %2","Invalid %1. %2"

‎app/code/Magento/Backend/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
287287
"Current Month","Current Month"
288288
YTD,YTD
289289
2YTD,2YTD
290-
"Please correct the user name or password.","Please correct the user name or password."
290+
"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
291291
"Authentication error occurred.","Authentication error occurred."
292292
"Please specify the admin custom URL.","Please specify the admin custom URL."
293293
"Invalid %1. %2","Invalid %1. %2"

‎app/code/Magento/Backend/i18n/es_ES.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
287287
"Current Month","Current Month"
288288
YTD,YTD
289289
2YTD,2YTD
290-
"Please correct the user name or password.","Please correct the user name or password."
290+
"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
291291
"Authentication error occurred.","Authentication error occurred."
292292
"Please specify the admin custom URL.","Please specify the admin custom URL."
293293
"Invalid %1. %2","Invalid %1. %2"

0 commit comments

Comments
 (0)