Skip to content

Commit d95c3ea

Browse files
eddielaueddielau
committed
Merge branch 'develop_mainline' into PR_Branch
Conflicts: composer.lock
2 parents f0bbf2e + 09cadae commit d95c3ea

File tree

104 files changed

+1001
-816
lines changed

Some content is hidden

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

104 files changed

+1001
-816
lines changed

‎CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
0.74.0-beta3
2+
=============
3+
* API
4+
* The orders were extended with the gift messages
5+
* The page and block data and repository interfaces
6+
* Updated the public API list
7+
* Framework improvements
8+
* Improved the profile generator
9+
* Introduced the new environment for Jasmine tests
10+
* Design
11+
* Inverted the new admin area styles scope, clean up the old styles
12+
* New Side Panels on Admin Area
13+
* Various
14+
* Asynchronous indexing for sales grids
15+
* Advanced Mini Cart
16+
* The HTML minification management on Admin Area
17+
* Minor UI improvements
18+
* The GitHub contribution process was updated in the README.md file
19+
* Fixed bugs
20+
* Fixed the assets deployment tool with the minification
21+
* Fixed the JMeter scenario for the performance toolkit
22+
* Fixed the static files caching on Varnish
23+
* Fixed Admin user creation with the duplicated email or name (incorrect URL)
24+
* Fixed the link on Reset password email for secure URL case
25+
* Fixed the configured product adding from the wish-list to shopping cart
26+
* Fixed the long labels display on Admin Area
27+
* Fixed the Navigation Menu items on Admin Area
28+
* Various unit and integration tests bugs
29+
* GitHub issues and requests
30+
[#675] (https://github.com/magento/magento2/issues/675) -- Fix for Textarea element cols and rows #675
31+
132
0.74.0-beta2
233
=============
334
* Fixed bugs

‎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-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",
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.74.0-beta2",
14+
"version": "0.74.0-beta3",
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-beta2",
7-
"magento/framework": "0.74.0-beta2",
6+
"magento/module-backend": "0.74.0-beta3",
7+
"magento/framework": "0.74.0-beta3",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta2",
11+
"version": "0.74.0-beta3",
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-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",
6+
"magento/module-store": "0.74.0-beta3",
7+
"magento/module-directory": "0.74.0-beta3",
8+
"magento/module-developer": "0.74.0-beta3",
9+
"magento/module-eav": "0.74.0-beta3",
10+
"magento/module-cron": "0.74.0-beta3",
11+
"magento/module-theme": "0.74.0-beta3",
12+
"magento/module-reports": "0.74.0-beta3",
13+
"magento/module-sales": "0.74.0-beta3",
14+
"magento/module-quote": "0.74.0-beta3",
15+
"magento/module-catalog": "0.74.0-beta3",
16+
"magento/module-user": "0.74.0-beta3",
17+
"magento/module-backup": "0.74.0-beta3",
18+
"magento/module-customer": "0.74.0-beta3",
19+
"magento/module-translation": "0.74.0-beta3",
20+
"magento/module-require-js": "0.74.0-beta3",
21+
"magento/module-config": "0.74.0-beta3",
22+
"magento/framework": "0.74.0-beta3",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta2",
26+
"version": "0.74.0-beta3",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,6 @@
154154
<label>Developer</label>
155155
<tab>advanced</tab>
156156
<resource>Magento_Backend::dev</resource>
157-
<group id="restrict" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
158-
<label>Developer Client Restrictions</label>
159-
<field id="allow_ips" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
160-
<label>Allowed IPs (comma separated)</label>
161-
<comment>Leave empty for access from any location.</comment>
162-
</field>
163-
</group>
164157
<group id="debug" translate="label" type="text" sortOrder="20" showInDefault="0" showInWebsite="1" showInStore="1">
165158
<label>Debug</label>
166159
<field id="template_hints" translate="label" type="select" sortOrder="20" showInDefault="0" showInWebsite="1" showInStore="1">

‎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-beta2",
7-
"magento/module-backend": "0.74.0-beta2",
8-
"magento/module-cron": "0.74.0-beta2",
9-
"magento/framework": "0.74.0-beta2",
6+
"magento/module-store": "0.74.0-beta3",
7+
"magento/module-backend": "0.74.0-beta3",
8+
"magento/module-cron": "0.74.0-beta3",
9+
"magento/framework": "0.74.0-beta3",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.74.0-beta2",
13+
"version": "0.74.0-beta3",
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-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",
6+
"magento/module-store": "0.74.0-beta3",
7+
"magento/module-catalog": "0.74.0-beta3",
8+
"magento/module-tax": "0.74.0-beta3",
9+
"magento/module-backend": "0.74.0-beta3",
10+
"magento/module-sales": "0.74.0-beta3",
11+
"magento/module-checkout": "0.74.0-beta3",
12+
"magento/module-catalog-inventory": "0.74.0-beta3",
13+
"magento/module-customer": "0.74.0-beta3",
14+
"magento/module-catalog-rule": "0.74.0-beta3",
15+
"magento/module-eav": "0.74.0-beta3",
16+
"magento/module-config": "0.74.0-beta3",
17+
"magento/module-gift-message": "0.74.0-beta3",
18+
"magento/framework": "0.74.0-beta3",
19+
"magento/module-quote": "0.74.0-beta3",
20+
"magento/module-media-storage": "0.74.0-beta3",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "0.74.0-beta2"
24+
"magento/module-webapi": "0.74.0-beta3"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.74.0-beta2",
27+
"version": "0.74.0-beta3",
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-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",
6+
"magento/module-store": "0.74.0-beta3",
7+
"magento/module-customer": "0.74.0-beta3",
8+
"magento/module-checkout": "0.74.0-beta3",
9+
"magento/module-backend": "0.74.0-beta3",
10+
"magento/framework": "0.74.0-beta3",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta2",
14+
"version": "0.74.0-beta3",
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-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",
6+
"magento/module-store": "0.74.0-beta3",
7+
"magento/module-eav": "0.74.0-beta3",
8+
"magento/module-cms": "0.74.0-beta3",
9+
"magento/module-indexer": "0.74.0-beta3",
10+
"magento/module-customer": "0.74.0-beta3",
11+
"magento/module-theme": "0.74.0-beta3",
12+
"magento/module-checkout": "0.74.0-beta3",
13+
"magento/module-log": "0.74.0-beta3",
14+
"magento/module-backend": "0.74.0-beta3",
15+
"magento/module-widget": "0.74.0-beta3",
16+
"magento/module-wishlist": "0.74.0-beta3",
17+
"magento/module-tax": "0.74.0-beta3",
18+
"magento/module-msrp": "0.74.0-beta3",
19+
"magento/module-catalog-inventory": "0.74.0-beta3",
20+
"magento/module-directory": "0.74.0-beta3",
21+
"magento/module-catalog-rule": "0.74.0-beta3",
22+
"magento/module-product-alert": "0.74.0-beta3",
23+
"magento/module-url-rewrite": "0.74.0-beta3",
24+
"magento/module-catalog-url-rewrite": "0.74.0-beta3",
25+
"magento/module-page-cache": "0.74.0-beta3",
26+
"magento/module-quote": "0.74.0-beta3",
27+
"magento/module-config": "0.74.0-beta3",
28+
"magento/module-media-storage": "0.74.0-beta3",
29+
"magento/framework": "0.74.0-beta3",
3030
"magento/magento-composer-installer": "*"
3131
},
3232
"suggest": {
33-
"magento/module-cookie": "0.74.0-beta2"
33+
"magento/module-cookie": "0.74.0-beta3"
3434
},
3535
"type": "magento2-module",
36-
"version": "0.74.0-beta2",
36+
"version": "0.74.0-beta3",
3737
"license": [
3838
"OSL-3.0",
3939
"AFL-3.0"

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-catalog": "0.74.0-beta2",
7-
"magento/module-eav": "0.74.0-beta2",
8-
"magento/module-import-export": "0.74.0-beta2",
9-
"magento/module-indexer": "0.74.0-beta2",
10-
"magento/module-store": "0.74.0-beta2",
11-
"magento/module-catalog-inventory": "0.74.0-beta2",
12-
"magento/module-media-storage": "0.74.0-beta2",
13-
"magento/module-customer": "0.74.0-beta2",
14-
"magento/framework": "0.74.0-beta2",
6+
"magento/module-catalog": "0.74.0-beta3",
7+
"magento/module-eav": "0.74.0-beta3",
8+
"magento/module-import-export": "0.74.0-beta3",
9+
"magento/module-indexer": "0.74.0-beta3",
10+
"magento/module-store": "0.74.0-beta3",
11+
"magento/module-catalog-inventory": "0.74.0-beta3",
12+
"magento/module-media-storage": "0.74.0-beta3",
13+
"magento/module-customer": "0.74.0-beta3",
14+
"magento/framework": "0.74.0-beta3",
1515
"ext-ctype": "*",
1616
"magento/magento-composer-installer": "*"
1717
},
1818
"type": "magento2-module",
19-
"version": "0.74.0-beta2",
19+
"version": "0.74.0-beta3",
2020
"license": [
2121
"OSL-3.0",
2222
"AFL-3.0"

0 commit comments

Comments
 (0)