Skip to content

Commit a2c4e7a

Browse files
kristof-ringleffkristof-ringleff
committed
Merge branch 'develop' of github.com:magento/magento2 into interceptor-as-traits-rc
2 parents 4d98fd6 + ac02b35 commit a2c4e7a

File tree

4,155 files changed

+123989
-72461
lines changed

Some content is hidden

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

4,155 files changed

+123989
-72461
lines changed

‎CHANGELOG.md

Lines changed: 241 additions & 0 deletions
Large diffs are not rendered by default.

‎Gruntfile.js

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,24 @@ module.exports = function (grunt) {
88
'use strict';
99

1010
var _ = require('underscore'),
11-
path = require('path');
11+
path = require('path'),
12+
configDir = './dev/tools/grunt/configs',
13+
taskDir = './dev/tools/grunt/tasks';
1214

13-
require('./dev/tools/grunt/tasks/mage-minify')(grunt);
14-
require('time-grunt')(grunt);
15+
[
16+
taskDir + '/mage-minify',
17+
taskDir + '/deploy',
18+
'time-grunt'
19+
].forEach(function (task) {
20+
require(task)(grunt);
21+
});
1522

1623
require('load-grunt-config')(grunt, {
17-
configPath: path.join(process.cwd(), 'dev/tools/grunt/configs'),
24+
configPath: path.join(__dirname, configDir),
1825
init: true,
1926
loadGruntTasks: {
2027
pattern: [
21-
'grunt-*',
22-
'!grunt-template-jasmine-requirejs'
28+
'grunt-*'
2329
]
2430
}
2531
});
@@ -60,14 +66,6 @@ module.exports = function (grunt) {
6066
'less:luma',
6167
'less:backend'
6268
],
63-
/**
64-
* Styles for backend theme
65-
*/
66-
backend: [
67-
'less:backend',
68-
'replace:escapeCalc',
69-
'less:override'
70-
],
7169
/**
7270
* Documentation
7371
*/
@@ -78,24 +76,6 @@ module.exports = function (grunt) {
7876
'clean:pub'
7977
],
8078

81-
spec: [
82-
'specRunner:lib',
83-
'specRunner:backend',
84-
'specRunner:frontend'
85-
],
86-
87-
unit: [
88-
'jasmine:lib-unit',
89-
'jasmine:backend-unit',
90-
'jasmine:frontend-unit'
91-
],
92-
93-
integration: [
94-
'jasmine:lib-integration',
95-
'jasmine:backend-integration',
96-
'jasmine:frontend-integration'
97-
],
98-
9979
'legacy-build': [
10080
'mage-minify:legacy'
10181
],
@@ -104,7 +84,15 @@ module.exports = function (grunt) {
10484
'usebanner:documentationCss',
10585
'usebanner:documentationLess',
10686
'usebanner:documentationHtml'
107-
]
87+
],
88+
89+
spec: function (theme) {
90+
var runner = require('./dev/tests/js/jasmine/spec_runner');
91+
92+
runner.init(grunt, { theme: theme });
93+
94+
grunt.task.run(runner.getTasks());
95+
}
10896
}, function (task, name) {
10997
grunt.registerTask(name, task);
11098
});

‎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/Setup/InstallSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
4545
'date_added',
4646
\Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
4747
null,
48-
['nullable' => false],
48+
['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
4949
'Create date'
5050
)->addColumn(
5151
'title',
@@ -112,7 +112,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
112112
'created_at',
113113
\Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
114114
null,
115-
['nullable' => false],
115+
['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
116116
'Create date'
117117
)->setComment(
118118
'Admin System Messages'

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

‎app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @see \Magento\AdminNotification\Block\Window
1313
*/
1414
?>
15-
<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification admin__scope">
15+
<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
1616
<div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
1717
<div class="popup-inner">
1818
<div class="popup-header">

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages */ ?>
1111

1212
<?php $lastCritical = $block->getLastCritical();?>
13-
<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?> admin__scope">
13+
<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?>">
1414
<div class="message-system-inner">
1515
<?php if ($lastCritical): ?>
1616
<ul class="message-system-list">

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
?>
1010
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
1111

12-
<div id="system_messages_list" class="admin__scope" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
12+
<div id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
1313
<ul class="message-system-list">
1414
<?php foreach ($block->getUnreadMessages() as $message): ?>
1515
<li class="message message-warning <?php echo $block->getItemClass($message);?>">

0 commit comments

Comments
 (0)