Skip to content

Commit 313173f

Browse files
author
Yu Tang
committed
Merge branch 'develop' into FearlessKiwis-MAGETWO-28256-bundle-integration
2 parents 184ed16 + 4163e30 commit 313173f

File tree

1,796 files changed

+31555
-25974
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,796 files changed

+31555
-25974
lines changed

‎.htaccess

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
############################################
2+
## uncomment the line below to enable developer mode
3+
4+
# SetEnv MAGE_MODE developer
5+
16
############################################
27
## uncomment these lines for CGI mode
38
## make sure to specify the correct cgi php binary file name
@@ -167,6 +172,8 @@
167172
## http://developer.yahoo.com/performance/rules.html#expires
168173

169174
ExpiresDefault "access plus 1 year"
175+
ExpiresByType text/html A0
176+
ExpiresByType text/plain A0
170177

171178
</IfModule>
172179

‎.htaccess.sample

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
############################################
2+
## uncomment the line below to enable developer mode
3+
4+
# SetEnv MAGE_MODE developer
5+
16
############################################
27
## uncomment these lines for CGI mode
38
## make sure to specify the correct cgi php binary file name
@@ -164,6 +169,8 @@
164169
## http://developer.yahoo.com/performance/rules.html#expires
165170

166171
ExpiresDefault "access plus 1 year"
172+
ExpiresByType text/html A0
173+
ExpiresByType text/plain A0
167174

168175
</IfModule>
169176

‎CHANGELOG.md

Lines changed: 253 additions & 41 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/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.42.0-beta11",
7-
"magento/module-backend": "0.42.0-beta11",
8-
"magento/module-media-storage": "0.42.0-beta11",
9-
"magento/framework": "0.42.0-beta11",
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",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta11",
14+
"version": "0.74.0-beta3",
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);?>">

‎app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ define([
2020
},
2121

2222
open: function (severity) {
23-
var superMethod = $.proxy(this._super, this),
24-
listTemplate,
25-
fullTemplate;
23+
var superMethod = $.proxy(this._super, this);
2624

2725
$.ajax({
2826
url: this.options.ajaxUrl,
@@ -38,12 +36,12 @@ define([
3836
});
3937

4038
tmpl = $(tmpl);
41-
listTemplate = $('<ul class="message-system-list"></ul>').append(tmpl);
42-
fullTemplate = $('<div class="admin__scope"></div>').append(listTemplate);
4339

44-
this.element
45-
.html(fullTemplate)
46-
.trigger('contentUpdated');
40+
this.element.html(
41+
$('<ul />', {
42+
'class': 'message-system-list'
43+
}).append(tmpl)
44+
).trigger('contentUpdated');
4745

4846
superMethod();
4947
}, this));

0 commit comments

Comments
 (0)