Skip to content

Commit 72857fd

Browse files
Dell-Dell-
committed
Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-24173
2 parents 48070b2 + 927e8e2 commit 72857fd

File tree

1,461 files changed

+25938
-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.

1,461 files changed

+25938
-17183
lines changed

‎CHANGELOG.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,61 @@
1+
0.74.0-beta4
2+
=============
3+
* Various
4+
* Implemented the getDefaultResult method, to be able to catch exceptions in FrontController and redirect user to the correct page
5+
* The getDefaultResult method is invoked to return default result of action execution within controllers. It can be used to generate the ‘execute’ method result in action controllers
6+
* Eliminated the unused exceptions. Exceptions that weren't linked to any logic were also eliminated and replaced with LocalizedException or its child classes
7+
* Refactored all controllers where possible: the default exception handling logic moved to FrontController. Controllers that cannot be refactored do not conflict with the new logic
8+
* Framework:
9+
* Created Magento Console to perform CLI actions
10+
* Introduced a new SalesSequence module that is responsible for documents numeration management across the Order Management System
11+
* Implemented the mechanism of asynchronous indexing of sales entities grids
12+
* Setup
13+
* Added the ConfigOption and ConfigOptionsList classes to be used by modules to manage deployment configuration
14+
* Moved all existing segments logic to new classes
15+
* Added the config:set command, which enables deployment configuration management
16+
* Removed the old 'install-configuration' tool
17+
* Functional tests:
18+
* Fixed functional test for order placement from backend
19+
* Replaced the end-to-end test for a product with MAP with an injectable test
20+
* Design
21+
* Updated the Blank and Luma themes to enable theme (not only library) variables overriding in the _theme.less file of any inherited theme. Included LESS code standards to the UI Library documentation
22+
* Fixed bugs:
23+
* Fixed an issue where composite products could not be added to the order from the Recently Viewed Products section
24+
* Fixed an issue where not all .js files were added to a bundle
25+
* Fixed an issue where it was possible to save an incorrect IP value in the Developer Client Restriction field
26+
* Fixed an issue where a raw DB error was thrown when trying to enter a custom variable with duplicated variable code
27+
28+
0.74.0-beta3
29+
=============
30+
* API
31+
* The orders were extended with the gift messages
32+
* The page and block data and repository interfaces
33+
* Updated the public API list
34+
* Framework improvements
35+
* Improved the profile generator
36+
* Introduced the new environment for Jasmine tests
37+
* Design
38+
* Inverted the new admin area styles scope, clean up the old styles
39+
* New Side Panels on Admin Area
40+
* Various
41+
* Asynchronous indexing for sales grids
42+
* Advanced Mini Cart
43+
* The HTML minification management on Admin Area
44+
* Minor UI improvements
45+
* The GitHub contribution process was updated in the README.md file
46+
* Fixed bugs
47+
* Fixed the assets deployment tool with the minification
48+
* Fixed the JMeter scenario for the performance toolkit
49+
* Fixed the static files caching on Varnish
50+
* Fixed Admin user creation with the duplicated email or name (incorrect URL)
51+
* Fixed the link on Reset password email for secure URL case
52+
* Fixed the configured product adding from the wish-list to shopping cart
53+
* Fixed the long labels display on Admin Area
54+
* Fixed the Navigation Menu items on Admin Area
55+
* Various unit and integration tests bugs
56+
* GitHub issues and requests
57+
[#675] (https://github.com/magento/magento2/issues/675) -- Fix for Textarea element cols and rows #675
58+
159
0.74.0-beta2
260
=============
361
* Fixed bugs

‎README.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Use the following table to verify you have the correct prerequisites to install
2727
</tr>
2828
<tr>
2929
<td>Apache 2.2 or 2.4</td>
30-
<td>Ubuntu: <code>apache -v</code><br>
30+
<td>Ubuntu: <code>apache2 -v</code><br>
3131
CentOS: <code>httpd -v</code></td>
3232
<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/apache.html">Apache</a></td>
3333
</tr>
@@ -57,3 +57,17 @@ After verifying your prerequisites, perform the following tasks in order to prep
5757
* <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html">Install Magento software using the web interface</a>
5858
* <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-cli.html">Install Magento software using the command line</a>
5959
2. <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/verify.html">Verify the installation</a>
60+
61+
<h2>Contributing to the Magento 2 code base</h2>
62+
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
63+
64+
To make learn about how to make a contribution, click [here][1].
65+
66+
To learn about issues, click [here][2]. To open an issue, click [here][3].
67+
68+
To suggest documentation improvements, click [here][4].
69+
70+
[1]: <http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html>
71+
[2]: <http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html#report>
72+
[3]: <https://github.com/magento/magento2/issues>
73+
[4]: <http://devdocs.magento.com>

‎app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
namespace Magento\AdminNotification\Model;
77

8+
use Magento\Framework\Config\ConfigOptionsList;
9+
810
/**
911
* AdminNotification Feed model
1012
*
@@ -135,7 +137,7 @@ public function checkUpdate()
135137

136138
$feedXml = $this->getFeedData();
137139

138-
$installDate = strtotime($this->_deploymentConfig->get('install/date'));
140+
$installDate = strtotime($this->_deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE));
139141

140142
if ($feedXml && $feedXml->channel && $feedXml->channel->item) {
141143
foreach ($feedXml->channel->item as $item) {

‎app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace Magento\AdminNotification\Test\Unit\Model;
88

99
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
10+
use Magento\Framework\Config\ConfigOptionsList;
1011

1112
/**
1213
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -140,7 +141,8 @@ public function testCheckUpdate($callInbox, $curlRequest)
140141
$this->backendConfig->expects($this->at(1))->method('getValue')
141142
->will($this->returnValue('http://feed.magento.com'));
142143
$this->deploymentConfig->expects($this->once())->method('get')
143-
->with('install/date')->will($this->returnValue('Sat, 6 Sep 2014 16:46:11 UTC'));
144+
->with(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE)
145+
->will($this->returnValue('Sat, 6 Sep 2014 16:46:11 UTC'));
144146
if ($callInbox) {
145147
$this->inboxFactory->expects($this->once())->method('create')
146148
->will(($this->returnValue($this->inboxModel)));

‎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-beta2",
7-
"magento/module-backend": "0.74.0-beta2",
8-
"magento/module-media-storage": "0.74.0-beta2",
9-
"magento/framework": "0.74.0-beta2",
6+
"magento/module-store": "0.74.0-beta4",
7+
"magento/module-backend": "0.74.0-beta4",
8+
"magento/module-media-storage": "0.74.0-beta4",
9+
"magento/framework": "0.74.0-beta4",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta2",
14+
"version": "0.74.0-beta4",
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-beta2",
7-
"magento/framework": "0.74.0-beta2",
6+
"magento/module-backend": "0.74.0-beta4",
7+
"magento/framework": "0.74.0-beta4",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta2",
11+
"version": "0.74.0-beta4",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/App/Action/Context.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ class Context extends \Magento\Framework\App\Action\Context
6161
* @param \Magento\Framework\App\ActionFlag $actionFlag
6262
* @param \Magento\Framework\App\ViewInterface $view
6363
* @param \Magento\Framework\Message\ManagerInterface $messageManager
64+
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
6465
* @param \Magento\Backend\Model\Session $session
6566
* @param \Magento\Framework\AuthorizationInterface $authorization
6667
* @param \Magento\Backend\Model\Auth $auth
@@ -81,6 +82,7 @@ public function __construct(
8182
\Magento\Framework\App\ActionFlag $actionFlag,
8283
\Magento\Framework\App\ViewInterface $view,
8384
\Magento\Framework\Message\ManagerInterface $messageManager,
85+
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
8486
\Magento\Backend\Model\Session $session,
8587
\Magento\Framework\AuthorizationInterface $authorization,
8688
\Magento\Backend\Model\Auth $auth,
@@ -99,7 +101,8 @@ public function __construct(
99101
$redirect,
100102
$actionFlag,
101103
$view,
102-
$messageManager
104+
$messageManager,
105+
$resultRedirectFactory
103106
);
104107

105108
$this->_session = $session;

‎app/code/Magento/Backend/App/Area/FrontNameResolver.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88
namespace Magento\Backend\App\Area;
99

10+
use Magento\Backend\Setup\ConfigOptionsList;
1011
use Magento\Framework\App\DeploymentConfig;
1112

1213
class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolverInterface
@@ -15,8 +16,6 @@ class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolver
1516

1617
const XML_PATH_CUSTOM_ADMIN_PATH = 'admin/url/custom_path';
1718

18-
const PARAM_BACKEND_FRONT_NAME = 'backend/frontName';
19-
2019
/**
2120
* Backend area code
2221
*/
@@ -46,7 +45,7 @@ class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolver
4645
public function __construct(\Magento\Backend\App\Config $config, DeploymentConfig $deploymentConfig)
4746
{
4847
$this->config = $config;
49-
$this->defaultFrontName = $deploymentConfig->get(self::PARAM_BACKEND_FRONT_NAME);
48+
$this->defaultFrontName = $deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME);
5049
}
5150

5251
/**

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getHtml()
6666
'From'
6767
) . '" value="' . $this->getEscapedValue(
6868
'from'
69-
) . '" class="input-text no-changes" ' . $this->getUiId(
69+
) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
7070
'filter',
7171
$this->_getHtmlName(),
7272
'from'
@@ -81,7 +81,7 @@ public function getHtml()
8181
'To'
8282
) . '" value="' . $this->getEscapedValue(
8383
'to'
84-
) . '" class="input-text no-changes" ' . $this->getUiId(
84+
) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
8585
'filter',
8686
$this->_getHtmlName(),
8787
'to'

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function getHtml()
2828
'From'
2929
) . '" value="' . $this->getEscapedValue(
3030
'from'
31-
) . '" class="input-text no-changes" ' . $this->getUiId(
31+
) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
3232
'filter',
3333
$this->_getHtmlName(),
3434
'from'
@@ -43,7 +43,7 @@ public function getHtml()
4343
'To'
4444
) . '" value="' . $this->getEscapedValue(
4545
'to'
46-
) . '" class="input-text no-changes" ' . $this->getUiId(
46+
) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
4747
'filter',
4848
$this->_getHtmlName(),
4949
'to'

0 commit comments

Comments
 (0)