Skip to content

Commit e1e69aa

Browse files
mazhalaimazhalai
committed
Merge remote-tracking branch 'mainline/develop' into develop
Conflicts: setup/pub/magento/setup/css/setup.css
2 parents fcc9689 + 8e14d42 commit e1e69aa

File tree

339 files changed

+12361
-11799
lines changed

Some content is hidden

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

339 files changed

+12361
-11799
lines changed

‎CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
0.42.0-beta9
2+
=============
3+
* Framework Improvements:
4+
* Layout Models are moved from Core module to appropriate modules
5+
* View components are moved from Core to Theme module
6+
* Rest of theme related configuration files are refactored
7+
* StoreManagerInterface is moved from Framework to App folder
8+
* ZF1 controller libraries are updated
9+
* Class definitions in multi-tenant mode are removed
10+
* DI configuration became more optimal: OM cached configuration uses the general pattern for all argument types in application
11+
* Varnish 4 configuration is updated
12+
* Layout Processing became more fast
13+
* HTML response minified
14+
* App Components and Specific Helper Components are moved from the Magento_Core Module
15+
* UI improvements:
16+
* Add to cart operation became asynchronous and doesn`t reload page (AJAX call)
17+
* Fixed Defects:
18+
* When Inline Translation is enabled, JQuery buttons for translate were broken
19+
* Base URL has invalid place inside Magento Admin Address on "Web Configuration" step of installation wizard
20+
* Inability of submit Product from keyboard while Product Creation
21+
* Sold products aren't displayed in Bestsellers
22+
* Compiled definitions can cause unexpected errors compared to runtime definitions
23+
* Accessibility improvements:
24+
* WAI-ARIA attributes are added to Frontend Layered Navigation and Customer Dropdown, Frontend Product Page Tabs, Frontend Cart Summary collapsible panels, Frontend forms and notifications, Frontend Checkout pages
25+
* Tests improvements:
26+
* Added mechanism of replacing 3-rd party credentials in functional tests
27+
* Update of end-to-end tests for create product, update product, promoted product, out of stock product, create product with new category, unassign products on category, create backend customer with injectable test
28+
* Various improvements:
29+
* JS template engine became unified on Backend and Frontend
30+
* Increased unit test coverage for Magento/Indexer module
31+
* Version number info became accessible at a public URL
32+
* GitHub requests:
33+
* [#1027](https://github.com/magento/magento2/issues/1027) -- Can't add new subctegory
34+
* [#921](https://github.com/magento/magento2/issues/921) -- Change resource ids from Magento_Adminhtml::* to Magento_Backend
35+
136
0.42.0-beta8
237
=============
338
* Various improvements:

‎Gruntfile.js

Lines changed: 59 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,23 @@ module.exports = function (grunt) {
126126
}
127127
};
128128

129+
// Banners
130+
// ---------------------------------------------
131+
132+
var banner = {
133+
firstLine: 'Copyright © <%= grunt.template.today("yyyy") %> Magento. All rights reserved.',
134+
secondLine: 'See COPYING.txt for license details.',
135+
css: function(){
136+
return '/**\n * ' + this.firstLine + '\n * ' + this.secondLine + '\n */\n';
137+
},
138+
less: function(){
139+
return '// /**\n// * ' + this.firstLine + '\n// * ' + this.secondLine + '\n// */\n';
140+
},
141+
html: function(){
142+
return '<!--\n/**\n * ' + this.firstLine + '\n * ' + this.secondLine + '\n */\n-->\n';
143+
}
144+
};
145+
129146
// Tasks
130147
// _____________________________________________
131148

@@ -135,6 +152,7 @@ module.exports = function (grunt) {
135152
path: path,
136153
theme: theme,
137154
combo: combo,
155+
banner: banner,
138156

139157
// Execution into cmd
140158
// ---------------------------------------------
@@ -343,21 +361,48 @@ module.exports = function (grunt) {
343361
}
344362
},
345363

346-
// Concatenation
364+
// Banners
347365
// ---------------------------------------------
348366

349-
concat: {
367+
usebanner: {
350368
options: {
351-
stripBanners: true,
352-
banner: '/**\n * Copyright © <%= grunt.template.today("yyyy") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n'
369+
position: 'top',
370+
linebreak: true
353371
},
354372
setup: {
355-
src: '<%= path.css.setup %>/setup.css',
356-
dest: '<%= path.css.setup %>/setup.css'
373+
options: {
374+
banner: banner.css()
375+
},
376+
files: {
377+
src: '<%= path.css.setup %>/*.css'
378+
}
379+
},
380+
documentationCss: {
381+
options: {
382+
banner: banner.css()
383+
},
384+
files: {
385+
src: '<%= path.doc %>/**/*.css'
386+
}
387+
},
388+
documentationLess: {
389+
options: {
390+
banner: banner.less()
391+
},
392+
files: {
393+
src: '<%= path.doc %>/**/*.less'
394+
}
395+
},
396+
documentationHtml: {
397+
options: {
398+
banner: banner.html()
399+
},
400+
files: {
401+
src: '<%= path.doc %>/**/*.html'
402+
}
357403
}
358404
},
359405

360-
361406
// Watches files for changes and runs tasks based on the changed files
362407
// ---------------------------------------------
363408

@@ -552,6 +597,12 @@ module.exports = function (grunt) {
552597
'clean:pub'
553598
]);
554599

600+
grunt.registerTask('documentation-banners', [
601+
'usebanner:documentationCss',
602+
'usebanner:documentationLess',
603+
'usebanner:documentationHtml'
604+
]);
605+
555606
// Production
556607
// ---------------------------------------------
557608

@@ -561,7 +612,7 @@ module.exports = function (grunt) {
561612
'less:' + component,
562613
'autoprefixer:' + component,
563614
'cssmin:' + component,
564-
'concat:' + component
615+
'usebanner:' + component
565616
]);
566617
}
567618
if (component == undefined) {

‎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-beta8",
7-
"magento/module-core": "0.42.0-beta8",
8-
"magento/module-backend": "0.42.0-beta8",
9-
"magento/framework": "0.42.0-beta8",
6+
"magento/module-store": "0.42.0-beta9",
7+
"magento/module-core": "0.42.0-beta9",
8+
"magento/module-backend": "0.42.0-beta9",
9+
"magento/framework": "0.42.0-beta9",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta8",
14+
"version": "0.42.0-beta9",
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.42.0-beta8",
7-
"magento/framework": "0.42.0-beta8",
6+
"magento/module-backend": "0.42.0-beta9",
7+
"magento/framework": "0.42.0-beta9",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta8",
11+
"version": "0.42.0-beta9",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

Lines changed: 19 additions & 19 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.42.0-beta8",
7-
"magento/module-directory": "0.42.0-beta8",
8-
"magento/module-core": "0.42.0-beta8",
9-
"magento/module-developer": "0.42.0-beta8",
10-
"magento/module-eav": "0.42.0-beta8",
11-
"magento/module-cron": "0.42.0-beta8",
12-
"magento/module-theme": "0.42.0-beta8",
13-
"magento/module-reports": "0.42.0-beta8",
14-
"magento/module-sales": "0.42.0-beta8",
15-
"magento/module-quote": "0.42.0-beta8",
16-
"magento/module-catalog": "0.42.0-beta8",
17-
"magento/module-user": "0.42.0-beta8",
18-
"magento/module-backup": "0.42.0-beta8",
19-
"magento/module-email": "0.42.0-beta8",
20-
"magento/module-customer": "0.42.0-beta8",
21-
"magento/module-translation": "0.42.0-beta8",
22-
"magento/module-require-js": "0.42.0-beta8",
23-
"magento/framework": "0.42.0-beta8",
6+
"magento/module-store": "0.42.0-beta9",
7+
"magento/module-directory": "0.42.0-beta9",
8+
"magento/module-core": "0.42.0-beta9",
9+
"magento/module-developer": "0.42.0-beta9",
10+
"magento/module-eav": "0.42.0-beta9",
11+
"magento/module-cron": "0.42.0-beta9",
12+
"magento/module-theme": "0.42.0-beta9",
13+
"magento/module-reports": "0.42.0-beta9",
14+
"magento/module-sales": "0.42.0-beta9",
15+
"magento/module-quote": "0.42.0-beta9",
16+
"magento/module-catalog": "0.42.0-beta9",
17+
"magento/module-user": "0.42.0-beta9",
18+
"magento/module-backup": "0.42.0-beta9",
19+
"magento/module-email": "0.42.0-beta9",
20+
"magento/module-customer": "0.42.0-beta9",
21+
"magento/module-translation": "0.42.0-beta9",
22+
"magento/module-require-js": "0.42.0-beta9",
23+
"magento/framework": "0.42.0-beta9",
2424
"magento/magento-composer-installer": "*"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.42.0-beta8",
27+
"version": "0.42.0-beta9",
2828
"license": [
2929
"OSL-3.0",
3030
"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.42.0-beta8",
7-
"magento/module-backend": "0.42.0-beta8",
8-
"magento/module-cron": "0.42.0-beta8",
9-
"magento/framework": "0.42.0-beta8",
6+
"magento/module-store": "0.42.0-beta9",
7+
"magento/module-backend": "0.42.0-beta9",
8+
"magento/module-cron": "0.42.0-beta9",
9+
"magento/framework": "0.42.0-beta9",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.42.0-beta8",
13+
"version": "0.42.0-beta9",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta8",
7-
"magento/module-catalog": "0.42.0-beta8",
8-
"magento/module-tax": "0.42.0-beta8",
9-
"magento/module-core": "0.42.0-beta8",
10-
"magento/module-backend": "0.42.0-beta8",
11-
"magento/module-sales": "0.42.0-beta8",
12-
"magento/module-checkout": "0.42.0-beta8",
13-
"magento/module-catalog-inventory": "0.42.0-beta8",
14-
"magento/module-customer": "0.42.0-beta8",
15-
"magento/module-catalog-rule": "0.42.0-beta8",
16-
"magento/module-eav": "0.42.0-beta8",
17-
"magento/module-gift-message": "0.42.0-beta8",
18-
"magento/framework": "0.42.0-beta8",
19-
"magento/module-webapi": "0.42.0-beta8",
20-
"magento/module-quote": "0.42.0-beta8",
6+
"magento/module-store": "0.42.0-beta9",
7+
"magento/module-catalog": "0.42.0-beta9",
8+
"magento/module-tax": "0.42.0-beta9",
9+
"magento/module-core": "0.42.0-beta9",
10+
"magento/module-backend": "0.42.0-beta9",
11+
"magento/module-sales": "0.42.0-beta9",
12+
"magento/module-checkout": "0.42.0-beta9",
13+
"magento/module-catalog-inventory": "0.42.0-beta9",
14+
"magento/module-customer": "0.42.0-beta9",
15+
"magento/module-catalog-rule": "0.42.0-beta9",
16+
"magento/module-eav": "0.42.0-beta9",
17+
"magento/module-gift-message": "0.42.0-beta9",
18+
"magento/framework": "0.42.0-beta9",
19+
"magento/module-webapi": "0.42.0-beta9",
20+
"magento/module-quote": "0.42.0-beta9",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"type": "magento2-module",
24-
"version": "0.42.0-beta8",
24+
"version": "0.42.0-beta9",
2525
"license": [
2626
"OSL-3.0",
2727
"AFL-3.0"

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta8",
7-
"magento/module-customer": "0.42.0-beta8",
8-
"magento/module-checkout": "0.42.0-beta8",
9-
"magento/module-core": "0.42.0-beta8",
10-
"magento/module-backend": "0.42.0-beta8",
11-
"magento/framework": "0.42.0-beta8",
6+
"magento/module-store": "0.42.0-beta9",
7+
"magento/module-customer": "0.42.0-beta9",
8+
"magento/module-checkout": "0.42.0-beta9",
9+
"magento/module-core": "0.42.0-beta9",
10+
"magento/module-backend": "0.42.0-beta9",
11+
"magento/framework": "0.42.0-beta9",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "0.42.0-beta8",
15+
"version": "0.42.0-beta9",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,36 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta8",
7-
"magento/module-eav": "0.42.0-beta8",
8-
"magento/module-cms": "0.42.0-beta8",
9-
"magento/module-indexer": "0.42.0-beta8",
10-
"magento/module-customer": "0.42.0-beta8",
11-
"magento/module-core": "0.42.0-beta8",
12-
"magento/module-theme": "0.42.0-beta8",
13-
"magento/module-checkout": "0.42.0-beta8",
14-
"magento/module-log": "0.42.0-beta8",
15-
"magento/module-backend": "0.42.0-beta8",
16-
"magento/module-widget": "0.42.0-beta8",
17-
"magento/module-wishlist": "0.42.0-beta8",
18-
"magento/module-tax": "0.42.0-beta8",
19-
"magento/module-msrp": "0.42.0-beta8",
20-
"magento/module-catalog-inventory": "0.42.0-beta8",
21-
"magento/module-directory": "0.42.0-beta8",
22-
"magento/module-catalog-rule": "0.42.0-beta8",
23-
"magento/module-product-alert": "0.42.0-beta8",
24-
"magento/module-url-rewrite": "0.42.0-beta8",
25-
"magento/module-catalog-url-rewrite": "0.42.0-beta8",
26-
"magento/module-page-cache": "0.42.0-beta8",
27-
"magento/module-quote": "0.42.0-beta8",
28-
"magento/framework": "0.42.0-beta8",
6+
"magento/module-store": "0.42.0-beta9",
7+
"magento/module-eav": "0.42.0-beta9",
8+
"magento/module-cms": "0.42.0-beta9",
9+
"magento/module-indexer": "0.42.0-beta9",
10+
"magento/module-customer": "0.42.0-beta9",
11+
"magento/module-core": "0.42.0-beta9",
12+
"magento/module-theme": "0.42.0-beta9",
13+
"magento/module-checkout": "0.42.0-beta9",
14+
"magento/module-log": "0.42.0-beta9",
15+
"magento/module-backend": "0.42.0-beta9",
16+
"magento/module-widget": "0.42.0-beta9",
17+
"magento/module-wishlist": "0.42.0-beta9",
18+
"magento/module-tax": "0.42.0-beta9",
19+
"magento/module-msrp": "0.42.0-beta9",
20+
"magento/module-catalog-inventory": "0.42.0-beta9",
21+
"magento/module-directory": "0.42.0-beta9",
22+
"magento/module-catalog-rule": "0.42.0-beta9",
23+
"magento/module-product-alert": "0.42.0-beta9",
24+
"magento/module-url-rewrite": "0.42.0-beta9",
25+
"magento/module-catalog-url-rewrite": "0.42.0-beta9",
26+
"magento/module-page-cache": "0.42.0-beta9",
27+
"magento/module-quote": "0.42.0-beta9",
28+
"magento/framework": "0.42.0-beta9",
2929
"magento/magento-composer-installer": "*"
3030
},
3131
"suggest": {
32-
"magento/module-cookie": "0.42.0-beta8"
32+
"magento/module-cookie": "0.42.0-beta9"
3333
},
3434
"type": "magento2-module",
35-
"version": "0.42.0-beta8",
35+
"version": "0.42.0-beta9",
3636
"license": [
3737
"OSL-3.0",
3838
"AFL-3.0"

0 commit comments

Comments
 (0)