Skip to content

Commit 62c3414

Browse files
author
Oleg Zinoviev
committed
MAGETWO-34929: JS: Smart fixed scroll
- Merge remote-tracking branch 'origin/UI' into MAGETWO-34929 - Conflicts: - app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
2 parents 8d8ce3c + 649b03a commit 62c3414

File tree

1,727 files changed

+36583
-14016
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,727 files changed

+36583
-14016
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ atlassian*
1010
/.gitattributes
1111
/app/config_sandbox
1212
/app/etc/config.php
13+
/app/etc/env.php
1314
/app/code/Magento/TestModule*
1415
/lib/internal/flex/uploader/.actionScriptProperties
1516
/lib/internal/flex/uploader/.flexProperties
@@ -37,6 +38,7 @@ atlassian*
3738
!/pub/media/wysiwyg/.htaccess
3839
/pub/media/tmp/*
3940
!/pub/media/tmp/.htaccess
41+
/pub/media/captcha/*
4042
/pub/static/*
4143
!/pub/static/.htaccess
4244

.htaccess

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,4 @@
188188
## If running in cluster environment, uncomment this
189189
## http://developer.yahoo.com/performance/rules.html#etags
190190

191-
#FileETag none
191+
#FileETag none

CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
0.74.0-beta9
2+
=============
3+
* Framework improvements
4+
* Magento became compatible with MySQL Cluster
5+
* Zend Framework 2 is upgraded up to version 2.4.0
6+
* Various
7+
* Updated payments infrastructure so it can use transparent redirects
8+
* Defined public API for Tax/Pricing components
9+
* Refactored controller actions in the Product area
10+
* Moved commands cache.php, indexer.php, log.php, test.php, compiler.php, singletenant\_compiler.php, generator.php, pack.php, deploy.php and file\_assembler.php to the new bin/magento CLI framework
11+
* Data Migration Tool
12+
* The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce, "Data Migration Tool repository")
13+
* Fixed bugs
14+
* Fixed an issue where error appeared during placing order with virtual product
15+
* Fixed an issue where billing and shipping sections didn't contain address information on order print
16+
* Fixed an issue where fatal error appeared on Catalog page on backend for user with custom role scope
17+
* Fixed an issue where product could not be found in search results when the website was assigned after product creation
18+
* Fixed an issue where shopping cart was empty after attempt to update it
19+
* Fixed an issue where there was no redirect to shopping cart after edit/updating cart product with custom options
20+
* Fixed an issue where environment variables were messed up for different entry points
21+
* Fixed an issue where tax class name was corrupted if containing '<' char
22+
* Fixed an issue where there was no ability to place an order with custom option "file"
23+
* Fixed an issue where sensitive cookies were persistent
24+
* Fixed possible XSS in payment methods
25+
* Fixed an issue with integration test failure when run in default mode
26+
* Fixed an issue with integration tests failure when xdebug is enabled
27+
* Fixed an issue where there was impossible to delete any entity which calls confirmation alert
28+
* GitHub issues and pull requests
29+
* [#904](https://github.com/magento/magento2/issues/904) -- Installation Incomplete with XDebug enabled
30+
* [#1083](https://github.com/magento/magento2/pull/1083) -- Move Topmenu CategoryData creation to a public method to enable plugin
31+
* [#1125](https://github.com/magento/magento2/pull/1125) -- Saving category reset its changes in category tree
32+
* [#1144](https://github.com/magento/magento2/pull/1144) -- Refactor bindRemoveButtons for improved performance
33+
* [#1214](https://github.com/magento/magento2/pull/1214) -- Avoid following error
34+
* [#1216](https://github.com/magento/magento2/issues/1216) -- Can't install sample data
35+
136
0.74.0-beta8
237
=============
338
* Performance Toolkit improvements

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\AdminNotification\Model;
77

8-
use Magento\Framework\Config\ConfigOptionsList;
8+
use Magento\Framework\Config\ConfigOptionsListConstants;
99

1010
/**
1111
* AdminNotification Feed model
@@ -137,7 +137,7 @@ public function checkUpdate()
137137

138138
$feedXml = $this->getFeedData();
139139

140-
$installDate = strtotime($this->_deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE));
140+
$installDate = strtotime($this->_deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE));
141141

142142
if ($feedXml && $feedXml->channel && $feedXml->channel->item) {
143143
foreach ($feedXml->channel->item as $item) {
@@ -239,6 +239,8 @@ public function getFeedData()
239239
}
240240

241241
/**
242+
* Retrieve feed as XML element
243+
*
242244
* @return \SimpleXMLElement
243245
*/
244246
public function getFeedXml()

app/code/Magento/AdminNotification/Model/Inbox.php

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
use Magento\Framework\Notification\MessageInterface;
99
use Magento\Framework\Notification\NotifierInterface;
10+
use Magento\AdminNotification\Model\InboxInterface;
1011

1112
/**
1213
* AdminNotification Inbox model
@@ -30,7 +31,7 @@
3031
*
3132
* @author Magento Core Team <core@magentocommerce.com>
3233
*/
33-
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface
34+
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
3435
{
3536
/**
3637
* @return void
@@ -41,10 +42,7 @@ protected function _construct()
4142
}
4243

4344
/**
44-
* Retrieve Severity collection array
45-
*
46-
* @param int|null $severity
47-
* @return array|string|null
45+
* {@inheritdoc}
4846
*/
4947
public function getSeverities($severity = null)
5048
{
@@ -66,9 +64,7 @@ public function getSeverities($severity = null)
6664
}
6765

6866
/**
69-
* Retrieve Latest Notice
70-
*
71-
* @return $this
67+
* {@inheritdoc}
7268
*/
7369
public function loadLatestNotice()
7470
{
@@ -78,9 +74,7 @@ public function loadLatestNotice()
7874
}
7975

8076
/**
81-
* Retrieve notice statuses
82-
*
83-
* @return array
77+
* {@inheritdoc}
8478
*/
8579
public function getNoticeStatus()
8680
{
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\AdminNotification\Model;
7+
8+
/**
9+
* AdminNotification Inbox interface
10+
*
11+
* @author Magento Core Team <core@magentocommerce.com>
12+
*/
13+
interface InboxInterface
14+
{
15+
/**
16+
* Retrieve Severity collection array
17+
*
18+
* @param int|null $severity
19+
* @return array|string|null
20+
* @api
21+
*/
22+
public function getSeverities($severity = null);
23+
24+
/**
25+
* Retrieve Latest Notice
26+
*
27+
* @return $this
28+
* @api
29+
*/
30+
public function loadLatestNotice();
31+
32+
/**
33+
* Retrieve notice statuses
34+
*
35+
* @return array
36+
* @api
37+
*/
38+
public function getNoticeStatus();
39+
}

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\AdminNotification\Model\System\Message;
108

119
use Magento\Store\Model\Store;
@@ -121,7 +119,9 @@ public function isDisplayed()
121119
public function getText()
122120
{
123121
return __(
124-
'{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href="%1">configuration</a>.',
122+
'{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure '
123+
. 'URL / Base Secure URL. It is highly recommended to change this value in your Magento '
124+
. '<a href="%1">configuration</a>.',
125125
$this->_getConfigUrl()
126126
);
127127
}

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
108

119
class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
@@ -36,7 +34,8 @@ protected function _shouldBeDisplayed()
3634
public function getText()
3735
{
3836
return __(
39-
'One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details.'
37+
'One or more media files failed to be synchronized during the media storages synchronization process. '
38+
. 'Refer to the log file for details.'
4039
);
4140
}
4241
}

app/code/Magento/AdminNotification/Model/System/Message/Security.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\AdminNotification\Model\System\Message;
108

119
use Magento\Store\Model\Store;
@@ -26,6 +24,7 @@ class Security implements \Magento\Framework\Notification\MessageInterface
2624

2725
/**
2826
* Time out for HTTP verification request
27+
*
2928
* @var int
3029
*/
3130
private $_verificationTimeOut = 2;
@@ -136,7 +135,8 @@ public function isDisplayed()
136135
public function getText()
137136
{
138137
return __(
139-
'Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.'
138+
'Your web server is configured incorrectly. As a result, configuration files '
139+
. ' with sensitive information are accessible from the outside. Please contact your hosting provider.'
140140
);
141141
}
142142

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +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;
10+
use Magento\Framework\Config\ConfigOptionsListConstants;
1111

1212
/**
1313
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -141,7 +141,7 @@ public function testCheckUpdate($callInbox, $curlRequest)
141141
$this->backendConfig->expects($this->at(1))->method('getValue')
142142
->will($this->returnValue('http://feed.magento.com'));
143143
$this->deploymentConfig->expects($this->once())->method('get')
144-
->with(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE)
144+
->with(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE)
145145
->will($this->returnValue('Sat, 6 Sep 2014 16:46:11 UTC'));
146146
if ($callInbox) {
147147
$this->inboxFactory->expects($this->once())->method('create')

0 commit comments

Comments
 (0)