Skip to content

Commit c004e74

Browse files
author
Evgeniy Kolesov
committed
MAGETWO-45157: Update Magento logo & copyright to remove references to eBay
Merge remote-tracking branch 'origin/develop' into MAGETWO-45157 # Conflicts: # package.json
2 parents 08f8a99 + f3bf4cb commit c004e74

File tree

500 files changed

+6861
-4576
lines changed

Some content is hidden

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

500 files changed

+6861
-4576
lines changed

‎CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,53 @@
1+
2.0.0-rc2
2+
=============
3+
* Fixed bugs:
4+
* Fixed an issue where video didn’t play on iPad and iPhone
5+
* Fixed an issue where Admin panel was not accessible if port was used in URL
6+
* Fixed an issue where database name could not be changed after fail during installation process
7+
* Fixed an issue where bundle items quantities could not be saved when editing a bundle product in a wishlist on the storefront
8+
* Fixed PHP issue which appeared during Text Swatch product attribute creation
9+
* Fixed Mini Shopping Cart re-sizing after removing the product
10+
* Fixed an issue with negative subtotal during PayPal checkout
11+
* Fixed inconsistent credit card validation
12+
* Fixed an issue where the Product Gallery did not completely overlay the bottom layer in the full-screen view
13+
* Fixed an issue where the Product Gallery could not be easily opened in the full-screen view
14+
* Fixed an issue where the “+” icon was displayed on video preview hover
15+
* Fixed an issue where video preview was visible under video player
16+
* Fixed an issue where 'Admin' was not a required field for the new Swatch
17+
* Fixed an issue where shipping and billing country information was not transmitted to PayPal
18+
* Fixed an issue with the attribute in configurable products
19+
* Fixed a category page load time
20+
* Removed space outside the visible area in Admin
21+
* Fixed an issue where Magento was stuck in the maintenance mode, if a backup was created when disabling modules via Web Setup Wizard
22+
* Fixed session response to be in JSON
23+
* Fixed an issue where an out of stock product was displayed on the storefront
24+
* Fixed an error which appeared during product import with replace behavior
25+
* Fixed an issue were URL rewrites in catalog categories were wrong after URL key for a store view was changed or a category was moved
26+
* Fixed an issue where JSON was received instead of normal page when trying to delete a category after reset
27+
* Fixed an issue where product API with "all" store code did not work
28+
* Fixed the misleading system message about invalid indexers
29+
* Fixed an issue where a bundle product created using Web API was not visible on the storefront
30+
* Fixed an issue where it was impossible to save more than one configuration for a configurable product with the text swatch attribute
31+
* Fixed an issue with the absence of a proper indication about why an image could not be deleted not deleted when it was used in one of the store views
32+
* Fixed an issue with data modification in export result file
33+
* Fixed an issue with the incorrect behavior of the required check box custom
34+
* Fixed an issue where an exception was thrown when trying to install Magento having previously installed and uninstalled it
35+
* Fixed an issue where changing the layout of a CMS page caused its design theme to change to Magento Blank
36+
* Fixed an issue where CMS pages API did not work with store code
37+
* Fixed an issue where CMS blocks API did not work for multiple websites
38+
* Fixed an issue where XSS Payload could been saved into Admin Panel
39+
* Fixed an issue where an error caused by adding a new swatch attribute persisted after deleting the attribute
40+
* Fixed PHP notice which appeared during text swatch product attribute creation
41+
* Fixed JS error on credit memo view grid during export to CSV
42+
* Fixed an issue where a user was redirected to a blank page when canceling checkout with PayPal Express in Website Payments Pro Hosted Solution
43+
* Fixed an issue where it was impossible to checkout if Persistent Shopping Cart is enabled
44+
* Fixed an issue where it was impossible to complete the Braintree PayPal Checkout if Street line 2 is empty
45+
* Fixed an issue with XSS Payload in website's translation table
46+
* Fixed an issue where payment functionality matrix section was suitable only for AbstractMethod specializations, leaving other payment methods without valuable information
47+
* GitHub issues and requests:
48+
* [#2276](https://github.com/magento/magento2/issues/2276) -- Notice: getimagesize(): Read error! in app/code/Magento/Catalog/Model/Product/Image.php on line 949
49+
* [#2128](https://github.com/magento/magento2/issues/2128) -- wrong filename on products list
50+
151
2.0.0-rc
252
=============
353
* Performance improvements:

‎app/bootstrap.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,5 @@
4141
!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
4242
);
4343
}
44-
if (ini_get('date.timezone') == '') {
45-
date_default_timezone_set('UTC');
46-
}
44+
45+
date_default_timezone_set('UTC');

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,11 @@ public function checkUpdate()
141141

142142
if ($feedXml && $feedXml->channel && $feedXml->channel->item) {
143143
foreach ($feedXml->channel->item as $item) {
144-
if ($installDate <= strtotime((string)$item->pubDate)) {
144+
$itemPublicationDate = strtotime((string)$item->pubDate);
145+
if ($installDate <= $itemPublicationDate) {
145146
$feedData[] = [
146147
'severity' => (int)$item->severity,
147-
'date_added' => $this->getDate((string)$item->pubDate),
148+
'date_added' => date('Y-m-d H:i:s', $itemPublicationDate),
148149
'title' => (string)$item->title,
149150
'description' => (string)$item->description,
150151
'url' => (string)$item->link,
@@ -161,17 +162,6 @@ public function checkUpdate()
161162
return $this;
162163
}
163164

164-
/**
165-
* Retrieve DB date from RSS date
166-
*
167-
* @param string $rssDate
168-
* @return string YYYY-MM-DD YY:HH:SS
169-
*/
170-
public function getDate($rssDate)
171-
{
172-
return gmdate('Y-m-d H:i:s', strtotime($rssDate));
173-
}
174-
175165
/**
176166
* Retrieve Update Frequency
177167
*

‎app/code/Magento/AdminNotification/Observer/PredispathAdminActionControllerObserver.php renamed to ‎app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @author Magento Core Team <core@magentocommerce.com>
1414
*/
15-
class PredispathAdminActionControllerObserver implements ObserverInterface
15+
class PredispatchAdminActionControllerObserver implements ObserverInterface
1616
{
1717
/**
1818
* @var \Magento\AdminNotification\Model\FeedFactory

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,22 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0|~7.0.0",
6-
"magento/module-store": "100.0.0",
7-
"magento/module-backend": "100.0.0",
8-
"magento/module-media-storage": "100.0.0",
9-
"magento/framework": "100.0.0",
6+
"magento/module-store": "100.0.*",
7+
"magento/module-backend": "100.0.*",
8+
"magento/module-media-storage": "100.0.*",
9+
"magento/framework": "100.0.*",
1010
"lib-libxml": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.0.0",
13+
"version": "100.0.1",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"
1717
],
1818
"autoload": {
19-
"files": [ "registration.php" ],
19+
"files": [
20+
"registration.php"
21+
],
2022
"psr-4": {
2123
"Magento\\AdminNotification\\": ""
2224
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="controller_action_predispatch">
10-
<observer name="adminnotification" instance="Magento\AdminNotification\Observer\PredispathAdminActionControllerObserver" />
10+
<observer name="adminnotification" instance="Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver" />
1111
</event>
1212
</config>

‎app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,10 +345,10 @@ protected function getTierPrices(array $listSku, $table)
345345
if (isset($exportFilter) && !empty($exportFilter)) {
346346
$date = $exportFilter[\Magento\Catalog\Model\Category::KEY_UPDATED_AT];
347347
if (isset($date[0]) && !empty($date[0])) {
348-
$updatedAtFrom = date('Y-m-d H:i:s', strtotime($date[0]));
348+
$updatedAtFrom = $this->_localeDate->date($date[0], null, false)->format('Y-m-d H:i:s');
349349
}
350350
if (isset($date[1]) && !empty($date[1])) {
351-
$updatedAtTo = date('Y-m-d H:i:s', strtotime($date[1]));
351+
$updatedAtTo = $this->_localeDate->date($date[1], null, false)->format('Y-m-d H:i:s');
352352
}
353353
}
354354
try {

‎app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
143143
protected $_catalogProductEntity;
144144

145145
/**
146-
* @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
146+
* @var \Magento\Framework\Stdlib\DateTime\DateTime
147147
*/
148-
protected $_localeDate;
148+
protected $dateTime;
149149

150150
/**
151151
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -157,7 +157,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
157157
* @param \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper
158158
* @param \Magento\Framework\Stdlib\StringUtils $string
159159
* @param ProcessingErrorAggregatorInterface $errorAggregator
160-
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
160+
* @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
161161
* @param \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory
162162
* @param \Magento\Catalog\Model\Product $productModel
163163
* @param \Magento\Catalog\Helper\Data $catalogData
@@ -177,7 +177,7 @@ public function __construct(
177177
\Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper,
178178
\Magento\Framework\Stdlib\StringUtils $string,
179179
ProcessingErrorAggregatorInterface $errorAggregator,
180-
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
180+
\Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
181181
\Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory,
182182
\Magento\Catalog\Model\Product $productModel,
183183
\Magento\Catalog\Helper\Data $catalogData,
@@ -187,7 +187,7 @@ public function __construct(
187187
AdvancedPricing\Validator\Website $websiteValidator,
188188
AdvancedPricing\Validator\TierPrice $tierPriceValidator
189189
) {
190-
$this->_localeDate = $localeDate;
190+
$this->dateTime = $dateTime;
191191
$this->jsonHelper = $jsonHelper;
192192
$this->_importExportData = $importExportData;
193193
$this->_resourceHelper = $resourceHelper;
@@ -470,11 +470,11 @@ protected function deleteProductTierPrices(array $listSku, $tableName)
470470
*/
471471
protected function setUpdatedAt(array $listSku)
472472
{
473-
$updatedAt = $this->_localeDate->date(null, null, false)->format('Y-m-d H:i:s');
473+
$updatedAt = $this->dateTime->gmtDate('Y-m-d H:i:s');
474474
$this->_connection->update(
475475
$this->_catalogProductEntity,
476476
[\Magento\Catalog\Model\Category::KEY_UPDATED_AT => $updatedAt],
477-
$this->_connection->quoteInto('sku IN (?)', $listSku)
477+
$this->_connection->quoteInto('sku IN (?)', array_unique($listSku))
478478
);
479479
return $this;
480480
}

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
7979
/**
8080
* @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
8181
*/
82-
protected $localeDate;
82+
protected $dateTime;
8383

8484
/**
8585
* @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
@@ -249,14 +249,14 @@ public function setUp()
249249
false
250250
);
251251
$this->errorAggregator = $this->getErrorAggregatorObject();
252-
$this->localeDate = $this->getMock(
253-
'\Magento\Framework\Stdlib\DateTime\Timezone',
252+
$this->dateTime = $this->getMock(
253+
'\Magento\Framework\Stdlib\DateTime\DateTime',
254254
['date', 'format'],
255255
[],
256256
'',
257257
false
258258
);
259-
$this->localeDate->expects($this->any())->method('date')->willReturnSelf();
259+
$this->dateTime->expects($this->any())->method('date')->willReturnSelf();
260260

261261
$this->advancedPricing = $this->getAdvancedPricingMock([
262262
'retrieveOldSkus',
@@ -783,7 +783,7 @@ private function getAdvancedPricingMock($methods = [])
783783
$this->resourceHelper,
784784
$this->stringObject,
785785
$this->errorAggregator,
786-
$this->localeDate,
786+
$this->dateTime,
787787
$this->resourceFactory,
788788
$this->productModel,
789789
$this->catalogData,

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

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
{
2-
"name": "magento/module-advanced-pricing-import-export",
3-
"description": "N/A",
4-
"require": {
5-
"php": "~5.5.0|~5.6.0|~7.0.0",
6-
"magento/module-catalog": "100.0.0",
7-
"magento/module-catalog-inventory": "100.0.0",
8-
"magento/module-eav": "100.0.0",
9-
"magento/module-import-export": "100.0.0",
10-
"magento/module-catalog-import-export": "100.0.0",
11-
"magento/module-customer": "100.0.0",
12-
"magento/module-store": "100.0.0",
13-
"magento/framework": "100.0.0"
14-
},
15-
"type": "magento2-module",
16-
"version": "100.0.0",
17-
"license": [
18-
"OSL-3.0",
19-
"AFL-3.0"
20-
],
21-
"autoload": {
22-
"files": [ "registration.php" ],
23-
"psr-4": {
24-
"Magento\\AdvancedPricingImportExport\\": ""
2+
"name": "magento/module-advanced-pricing-import-export",
3+
"description": "N/A",
4+
"require": {
5+
"php": "~5.5.0|~5.6.0|~7.0.0",
6+
"magento/module-catalog": "100.0.*",
7+
"magento/module-catalog-inventory": "100.0.*",
8+
"magento/module-eav": "100.0.*",
9+
"magento/module-import-export": "100.0.*",
10+
"magento/module-catalog-import-export": "100.0.*",
11+
"magento/module-customer": "100.0.*",
12+
"magento/module-store": "100.0.*",
13+
"magento/framework": "100.0.*"
14+
},
15+
"type": "magento2-module",
16+
"version": "100.0.1",
17+
"license": [
18+
"OSL-3.0",
19+
"AFL-3.0"
20+
],
21+
"autoload": {
22+
"files": [
23+
"registration.php"
24+
],
25+
"psr-4": {
26+
"Magento\\AdvancedPricingImportExport\\": ""
27+
}
2528
}
26-
}
2729
}

0 commit comments

Comments
 (0)