Skip to content

Commit 14b93b9

Browse files
Dell-Dell-
committed
Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-32628
Conflicts: app/code/Magento/Checkout/composer.json app/code/Magento/Quote/composer.json
2 parents 2eee173 + 927e8e2 commit 14b93b9

File tree

299 files changed

+7277
-4991
lines changed

Some content is hidden

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

299 files changed

+7277
-4991
lines changed

‎CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
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+
128
0.74.0-beta3
229
=============
330
* API

‎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-beta3",
7-
"magento/module-backend": "0.74.0-beta3",
8-
"magento/module-media-storage": "0.74.0-beta3",
9-
"magento/framework": "0.74.0-beta3",
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-beta3",
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-beta3",
7-
"magento/framework": "0.74.0-beta3",
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-beta3",
11+
"version": "0.74.0-beta4",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎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'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getHtml()
6666
$html = '<select name="' . $this->_getHtmlName() . '" id="' . $this->_getHtmlId() . '"' . $this->getUiId(
6767
'filter',
6868
$this->_getHtmlName()
69-
) . 'class="no-changes">';
69+
) . 'class="admin__control-select no-changes">';
7070
$value = $this->getValue();
7171
foreach ($this->_getOptions() as $option) {
7272
if (is_array($option['value'])) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function getHtml()
2323
$this->_getHtmlId() .
2424
'" value="' .
2525
$this->getEscapedValue() .
26-
'" class="input-text no-changes"' .
26+
'" class="input-text admin__control-text no-changes"' .
2727
$this->getUiId(
2828
'filter',
2929
$this->_getHtmlName()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function getHtml()
4444
array_unshift($options, ['value' => '', 'label' => '']);
4545
}
4646
$html = sprintf(
47-
'<select name="%s" id="%s" class="no-changes" %s>%s</select>',
47+
'<select name="%s" id="%s" class="admin__control-select no-changes" %s>%s</select>',
4848
$this->_getHtmlName(),
4949
$this->_getHtmlId(),
5050
$this->getUiId('filter', $this->_getHtmlName()),

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,11 @@ protected function _getCheckboxHtml($value, $checked)
113113
$html .= 'value="' . $this->escapeHtml($value) . '" ';
114114
$html .= 'class="' .
115115
($this->getColumn()->getInlineCss() ? $this->getColumn()->getInlineCss() : 'checkbox') .
116+
' admin__control-checkbox' .
116117
'"';
117118
$html .= $checked . $this->getDisabled() . '/>';
119+
$html .= '<label></label>';
120+
/* ToDo UI: add class="admin__field-label" after some refactoring _fields.less */
118121
return $html;
119122
}
120123

‎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-beta3",
7-
"magento/module-directory": "0.74.0-beta3",
8-
"magento/module-developer": "0.74.0-beta3",
9-
"magento/module-eav": "0.74.0-beta3",
10-
"magento/module-cron": "0.74.0-beta3",
11-
"magento/module-theme": "0.74.0-beta3",
12-
"magento/module-reports": "0.74.0-beta3",
13-
"magento/module-sales": "0.74.0-beta3",
14-
"magento/module-quote": "0.74.0-beta3",
15-
"magento/module-catalog": "0.74.0-beta3",
16-
"magento/module-user": "0.74.0-beta3",
17-
"magento/module-backup": "0.74.0-beta3",
18-
"magento/module-customer": "0.74.0-beta3",
19-
"magento/module-translation": "0.74.0-beta3",
20-
"magento/module-require-js": "0.74.0-beta3",
21-
"magento/module-config": "0.74.0-beta3",
22-
"magento/framework": "0.74.0-beta3",
6+
"magento/module-store": "0.74.0-beta4",
7+
"magento/module-directory": "0.74.0-beta4",
8+
"magento/module-developer": "0.74.0-beta4",
9+
"magento/module-eav": "0.74.0-beta4",
10+
"magento/module-cron": "0.74.0-beta4",
11+
"magento/module-theme": "0.74.0-beta4",
12+
"magento/module-reports": "0.74.0-beta4",
13+
"magento/module-sales": "0.74.0-beta4",
14+
"magento/module-quote": "0.74.0-beta4",
15+
"magento/module-catalog": "0.74.0-beta4",
16+
"magento/module-user": "0.74.0-beta4",
17+
"magento/module-backup": "0.74.0-beta4",
18+
"magento/module-customer": "0.74.0-beta4",
19+
"magento/module-translation": "0.74.0-beta4",
20+
"magento/module-require-js": "0.74.0-beta4",
21+
"magento/module-config": "0.74.0-beta4",
22+
"magento/framework": "0.74.0-beta4",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta3",
26+
"version": "0.74.0-beta4",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

0 commit comments

Comments
 (0)