Skip to content

Commit f168b0c

Browse files
committed
MAGETWO-45095: Product base images aren't centered in Wish List on Storefront
- Merge remote-tracking branch 'origin/develop' into MAGETWO-45095 - Conflicts: - app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less - app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less - app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
2 parents 1063850 + 2bcd7f3 commit f168b0c

File tree

475 files changed

+7644
-2085
lines changed

Some content is hidden

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

475 files changed

+7644
-2085
lines changed

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
2.0.0
2+
=============
3+
* Fixed bugs:
4+
* Fixed an issue where discount to the shipping amount was not applied during invoice creation
5+
* Fixed an issue where inline translations did not work correctly for phrases with special characters
6+
* Eliminated multiple escaping in the inline translation pop-up
7+
* Fixed an issue where searching in Billing Agreements grid in Admin resulted in an SQL
8+
* Fixed the Refresh Lifetime Statistics functionality in Reports
9+
* Increased the limit of cookies per domain, according to following recommendations https://tools.ietf.org/html/rfc6265#section-6.1
10+
* Fixed filtering by date in grids
11+
* Fixed an issue where Totals were not calculated correctly if discount was applied when placing an order from Admin
12+
* Fixed filtering of online customers by session Start Time
13+
* Fixed an issue where it was impossible to register a customer on the storefront if an attribute with file type was required
14+
* Fixed the issues in the Custom Admin URL with https functionality
15+
* Fixed an issue where the category storefront URL did not include its parents
16+
* Fixed an issue where Product API did not work properly for not default store code
17+
* Fixed issues with adding images for a first product in a new attribute set
18+
* Fixed an issue where it was impossible to create a credit memo for the order with downloadable product and sales rule applied
19+
* Fixed an issue where it was impossible to manually add products to a configurable product
20+
* Fixed an issue with custom timezone
21+
122
2.0.0-rc2
223
=============
324
* Fixed bugs:

app/code/Magento/AdminNotification/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"lib-libxml": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.0.1",
13+
"version": "100.0.2",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

app/code/Magento/AdvancedPricingImportExport/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/framework": "100.0.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.0.1",
16+
"version": "100.0.2",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

app/code/Magento/Authorization/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"magento/framework": "100.0.*"
88
},
99
"type": "magento2-module",
10-
"version": "100.0.1",
10+
"version": "100.0.2",
1111
"license": [
1212
"OSL-3.0",
1313
"AFL-3.0"

app/code/Magento/Authorizenet/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/framework": "100.0.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.0.1",
16+
"version": "100.0.2",
1717
"license": [
1818
"proprietary"
1919
],

app/code/Magento/Backend/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"magento/framework": "100.0.*"
2222
},
2323
"type": "magento2-module",
24-
"version": "100.0.1",
24+
"version": "100.0.2",
2525
"license": [
2626
"OSL-3.0",
2727
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ password,password
361361
"Shipping Amount","Shipping Amount"
362362
"Tax Amount","Tax Amount"
363363
"Browse Files...","Browse Files..."
364-
"Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.","Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved."
364+
"Copyright© %1 Magento Commerce Inc. All rights reserved.","Copyright© %1 Magento Commerce Inc. All rights reserved."
365365
"Magento ver. %1","Magento ver. %1"
366366
"Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
367367
"Account Setting","Account Setting"

app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88

99
?>
1010
<a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
11-
<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento. All rights reserved.', date('Y')) ?>
11+
<?php /* @escapeNotVerified */ echo __('Copyright&copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>

app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<?php
1111
/* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
1212
$element = $block->getElement();
13-
$note = $element->getNote() ? '<div class="note" id="' . $element->getId() . '-note">' . $element->getNote() . '</div>' : '';
13+
$note = $element->getNote() ? '<div class="note admin__field-note" id="' . $element->getId() . '-note">' . $element->getNote() . '</div>' : '';
1414
$elementBeforeLabel = $element->getExtType() == 'checkbox admin__control-checkbox' || $element->getExtType() == 'radio admin__control-radio';
1515
$addOn = ($element->getBeforeElementHtml() || $element->getAfterElementHtml()) && !$element->getNoWrapAsAddon();
1616
$fieldId = ($element->getHtmlContainerId()) ? ' id="' . $element->getHtmlContainerId() . '"' : '';

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
<div class="mass-select-wrap">
4545
<select
4646
id="<?php echo $block->getHtmlId() ?>-mass-select"
47-
class="action-select-multiselect"
47+
class="action-select-multiselect _disabled"
48+
disabled="disabled"
4849
data-menu="grid-mass-select">
4950
<optgroup label="<?php /* @escapeNotVerified */ echo __('Mass Actions')?>">
5051
<option disabled selected></option>
@@ -68,10 +69,14 @@
6869
</div>
6970

7071
<script>
71-
require(['jquery'], function($){
72+
require(['jquery', 'domReady!'], function($){
7273
'use strict';
73-
$('#<?php echo $block->getHtmlId() ?>-mass-select').change(function () {
74+
$('#<?php echo $block->getHtmlId() ?>-mass-select')
75+
.removeClass('_disabled')
76+
.prop('disabled', false)
77+
.change(function () {
7478
var massAction = $('option:selected', this).val();
79+
this.blur();
7580
switch (massAction) {
7681
<?php if ($block->getUseSelectAll()):?>
7782
case 'selectAll':
@@ -88,7 +93,6 @@
8893
return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectVisible();
8994
break;
9095
}
91-
this.blur();
9296
});
9397
});
9498
<?php if (!$block->getParentBlock()->canDisplayContainer()): ?>

0 commit comments

Comments
 (0)