Skip to content

Commit fb919f7

Browse files
author
Bogdan Plieshka
committed
Merge branch 'develop' into UI
2 parents 528d001 + dbd56db commit fb919f7

File tree

211 files changed

+1300
-1327
lines changed

Some content is hidden

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

211 files changed

+1300
-1327
lines changed

‎CHANGELOG.md

Lines changed: 101 additions & 91 deletions
Large diffs are not rendered by default.

‎Gruntfile.js

Lines changed: 21 additions & 25 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
});
@@ -70,24 +76,6 @@ module.exports = function (grunt) {
7076
'clean:pub'
7177
],
7278

73-
spec: [
74-
'specRunner:lib',
75-
'specRunner:backend',
76-
'specRunner:frontend'
77-
],
78-
79-
unit: [
80-
'jasmine:lib-unit',
81-
'jasmine:backend-unit',
82-
'jasmine:frontend-unit'
83-
],
84-
85-
integration: [
86-
'jasmine:lib-integration',
87-
'jasmine:backend-integration',
88-
'jasmine:frontend-integration'
89-
],
90-
9179
'legacy-build': [
9280
'mage-minify:legacy'
9381
],
@@ -96,7 +84,15 @@ module.exports = function (grunt) {
9684
'usebanner:documentationCss',
9785
'usebanner:documentationLess',
9886
'usebanner:documentationHtml'
99-
]
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+
}
10096
}, function (task, name) {
10197
grunt.registerTask(name, task);
10298
});

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.74.0-beta1",
7-
"magento/framework": "0.74.0-beta1",
6+
"magento/module-backend": "0.74.0-beta2",
7+
"magento/framework": "0.74.0-beta2",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta1",
11+
"version": "0.74.0-beta2",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
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-directory": "0.74.0-beta1",
8-
"magento/module-developer": "0.74.0-beta1",
9-
"magento/module-eav": "0.74.0-beta1",
10-
"magento/module-cron": "0.74.0-beta1",
11-
"magento/module-theme": "0.74.0-beta1",
12-
"magento/module-reports": "0.74.0-beta1",
13-
"magento/module-sales": "0.74.0-beta1",
14-
"magento/module-quote": "0.74.0-beta1",
15-
"magento/module-catalog": "0.74.0-beta1",
16-
"magento/module-user": "0.74.0-beta1",
17-
"magento/module-backup": "0.74.0-beta1",
18-
"magento/module-customer": "0.74.0-beta1",
19-
"magento/module-translation": "0.74.0-beta1",
20-
"magento/module-require-js": "0.74.0-beta1",
21-
"magento/module-config": "0.74.0-beta1",
22-
"magento/framework": "0.74.0-beta1",
6+
"magento/module-store": "0.74.0-beta2",
7+
"magento/module-directory": "0.74.0-beta2",
8+
"magento/module-developer": "0.74.0-beta2",
9+
"magento/module-eav": "0.74.0-beta2",
10+
"magento/module-cron": "0.74.0-beta2",
11+
"magento/module-theme": "0.74.0-beta2",
12+
"magento/module-reports": "0.74.0-beta2",
13+
"magento/module-sales": "0.74.0-beta2",
14+
"magento/module-quote": "0.74.0-beta2",
15+
"magento/module-catalog": "0.74.0-beta2",
16+
"magento/module-user": "0.74.0-beta2",
17+
"magento/module-backup": "0.74.0-beta2",
18+
"magento/module-customer": "0.74.0-beta2",
19+
"magento/module-translation": "0.74.0-beta2",
20+
"magento/module-require-js": "0.74.0-beta2",
21+
"magento/module-config": "0.74.0-beta2",
22+
"magento/framework": "0.74.0-beta2",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta1",
26+
"version": "0.74.0-beta2",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
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-cron": "0.74.0-beta1",
9-
"magento/framework": "0.74.0-beta1",
6+
"magento/module-store": "0.74.0-beta2",
7+
"magento/module-backend": "0.74.0-beta2",
8+
"magento/module-cron": "0.74.0-beta2",
9+
"magento/framework": "0.74.0-beta2",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.74.0-beta1",
13+
"version": "0.74.0-beta2",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
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-catalog": "0.74.0-beta1",
8-
"magento/module-tax": "0.74.0-beta1",
9-
"magento/module-backend": "0.74.0-beta1",
10-
"magento/module-sales": "0.74.0-beta1",
11-
"magento/module-checkout": "0.74.0-beta1",
12-
"magento/module-catalog-inventory": "0.74.0-beta1",
13-
"magento/module-customer": "0.74.0-beta1",
14-
"magento/module-catalog-rule": "0.74.0-beta1",
15-
"magento/module-eav": "0.74.0-beta1",
16-
"magento/module-config": "0.74.0-beta1",
17-
"magento/module-gift-message": "0.74.0-beta1",
18-
"magento/framework": "0.74.0-beta1",
19-
"magento/module-quote": "0.74.0-beta1",
20-
"magento/module-media-storage": "0.74.0-beta1",
6+
"magento/module-store": "0.74.0-beta2",
7+
"magento/module-catalog": "0.74.0-beta2",
8+
"magento/module-tax": "0.74.0-beta2",
9+
"magento/module-backend": "0.74.0-beta2",
10+
"magento/module-sales": "0.74.0-beta2",
11+
"magento/module-checkout": "0.74.0-beta2",
12+
"magento/module-catalog-inventory": "0.74.0-beta2",
13+
"magento/module-customer": "0.74.0-beta2",
14+
"magento/module-catalog-rule": "0.74.0-beta2",
15+
"magento/module-eav": "0.74.0-beta2",
16+
"magento/module-config": "0.74.0-beta2",
17+
"magento/module-gift-message": "0.74.0-beta2",
18+
"magento/framework": "0.74.0-beta2",
19+
"magento/module-quote": "0.74.0-beta2",
20+
"magento/module-media-storage": "0.74.0-beta2",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "0.74.0-beta1"
24+
"magento/module-webapi": "0.74.0-beta2"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.74.0-beta1",
27+
"version": "0.74.0-beta2",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

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

Lines changed: 6 additions & 6 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-customer": "0.74.0-beta1",
8-
"magento/module-checkout": "0.74.0-beta1",
9-
"magento/module-backend": "0.74.0-beta1",
10-
"magento/framework": "0.74.0-beta1",
6+
"magento/module-store": "0.74.0-beta2",
7+
"magento/module-customer": "0.74.0-beta2",
8+
"magento/module-checkout": "0.74.0-beta2",
9+
"magento/module-backend": "0.74.0-beta2",
10+
"magento/framework": "0.74.0-beta2",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta1",
14+
"version": "0.74.0-beta2",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
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-eav": "0.74.0-beta1",
8-
"magento/module-cms": "0.74.0-beta1",
9-
"magento/module-indexer": "0.74.0-beta1",
10-
"magento/module-customer": "0.74.0-beta1",
11-
"magento/module-theme": "0.74.0-beta1",
12-
"magento/module-checkout": "0.74.0-beta1",
13-
"magento/module-log": "0.74.0-beta1",
14-
"magento/module-backend": "0.74.0-beta1",
15-
"magento/module-widget": "0.74.0-beta1",
16-
"magento/module-wishlist": "0.74.0-beta1",
17-
"magento/module-tax": "0.74.0-beta1",
18-
"magento/module-msrp": "0.74.0-beta1",
19-
"magento/module-catalog-inventory": "0.74.0-beta1",
20-
"magento/module-directory": "0.74.0-beta1",
21-
"magento/module-catalog-rule": "0.74.0-beta1",
22-
"magento/module-product-alert": "0.74.0-beta1",
23-
"magento/module-url-rewrite": "0.74.0-beta1",
24-
"magento/module-catalog-url-rewrite": "0.74.0-beta1",
25-
"magento/module-page-cache": "0.74.0-beta1",
26-
"magento/module-quote": "0.74.0-beta1",
27-
"magento/module-config": "0.74.0-beta1",
28-
"magento/module-media-storage": "0.74.0-beta1",
29-
"magento/framework": "0.74.0-beta1",
6+
"magento/module-store": "0.74.0-beta2",
7+
"magento/module-eav": "0.74.0-beta2",
8+
"magento/module-cms": "0.74.0-beta2",
9+
"magento/module-indexer": "0.74.0-beta2",
10+
"magento/module-customer": "0.74.0-beta2",
11+
"magento/module-theme": "0.74.0-beta2",
12+
"magento/module-checkout": "0.74.0-beta2",
13+
"magento/module-log": "0.74.0-beta2",
14+
"magento/module-backend": "0.74.0-beta2",
15+
"magento/module-widget": "0.74.0-beta2",
16+
"magento/module-wishlist": "0.74.0-beta2",
17+
"magento/module-tax": "0.74.0-beta2",
18+
"magento/module-msrp": "0.74.0-beta2",
19+
"magento/module-catalog-inventory": "0.74.0-beta2",
20+
"magento/module-directory": "0.74.0-beta2",
21+
"magento/module-catalog-rule": "0.74.0-beta2",
22+
"magento/module-product-alert": "0.74.0-beta2",
23+
"magento/module-url-rewrite": "0.74.0-beta2",
24+
"magento/module-catalog-url-rewrite": "0.74.0-beta2",
25+
"magento/module-page-cache": "0.74.0-beta2",
26+
"magento/module-quote": "0.74.0-beta2",
27+
"magento/module-config": "0.74.0-beta2",
28+
"magento/module-media-storage": "0.74.0-beta2",
29+
"magento/framework": "0.74.0-beta2",
3030
"magento/magento-composer-installer": "*"
3131
},
3232
"suggest": {
33-
"magento/module-cookie": "0.74.0-beta1"
33+
"magento/module-cookie": "0.74.0-beta2"
3434
},
3535
"type": "magento2-module",
36-
"version": "0.74.0-beta1",
36+
"version": "0.74.0-beta2",
3737
"license": [
3838
"OSL-3.0",
3939
"AFL-3.0"

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ $categoryId = $block->getCategoryId();
5252

5353
<div data-id="information-dialog-category" class="messages" style="display: none;">
5454
<div class="message message-notice">
55-
<div><?php echo __('This operation can take much time'); ?></div>
55+
<div><?php echo __('This operation can take a long time'); ?></div>
5656
</div>
5757
</div>
5858

0 commit comments

Comments
 (0)