Skip to content

Commit 840d539

Browse files
SmolyarOSmolyarO
committed
Merge branch 'develop' of github.com:magento-qmt/magento2ce into MTA-3333
2 parents 4d916f9 + a5fa3af commit 840d539

File tree

225 files changed

+3817
-3433
lines changed

Some content is hidden

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

225 files changed

+3817
-3433
lines changed

‎.htaccess

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
# Insert filter on all content
102102
###SetOutputFilter DEFLATE
103103
# Insert filter on selected content types only
104-
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
104+
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript application/json image/svg+xml
105105

106106
# Netscape 4.x has some problems...
107107
#BrowserMatch ^Mozilla/4 gzip-only-text/html
@@ -190,6 +190,7 @@
190190

191191
AddDefaultCharset Off
192192
#AddDefaultCharset UTF-8
193+
AddType 'text/html; charset=UTF-8' html
193194

194195
<IfModule mod_expires.c>
195196

@@ -285,3 +286,38 @@
285286
## http://developer.yahoo.com/performance/rules.html#etags
286287

287288
#FileETag none
289+
290+
# ######################################################################
291+
# # INTERNET EXPLORER #
292+
# ######################################################################
293+
294+
# ----------------------------------------------------------------------
295+
# | Document modes |
296+
# ----------------------------------------------------------------------
297+
298+
# Force Internet Explorer 8/9/10 to render pages in the highest mode
299+
# available in the various cases when it may not.
300+
#
301+
# https://hsivonen.fi/doctype/#ie8
302+
#
303+
# (!) Starting with Internet Explorer 11, document modes are deprecated.
304+
# If your business still relies on older web apps and services that were
305+
# designed for older versions of Internet Explorer, you might want to
306+
# consider enabling `Enterprise Mode` throughout your company.
307+
#
308+
# https://msdn.microsoft.com/en-us/library/ie/bg182625.aspx#docmode
309+
# http://blogs.msdn.com/b/ie/archive/2014/04/02/stay-up-to-date-with-enterprise-mode-for-internet-explorer-11.aspx
310+
311+
<IfModule mod_headers.c>
312+
313+
Header set X-UA-Compatible "IE=edge"
314+
315+
# `mod_headers` cannot match based on the content-type, however,
316+
# the `X-UA-Compatible` response header should be send only for
317+
# HTML documents and not for the other resources.
318+
319+
<FilesMatch "\.(appcache|atom|bbaw|bmp|crx|css|cur|eot|f4[abpv]|flv|geojson|gif|htc|ico|jpe?g|js|json(ld)?|m4[av]|manifest|map|mp4|oex|og[agv]|opus|otf|pdf|png|rdf|rss|safariextz|svgz?|swf|topojson|tt[cf]|txt|vcard|vcf|vtt|webapp|web[mp]|webmanifest|woff2?|xloc|xml|xpi)$">
320+
Header unset X-UA-Compatible
321+
</FilesMatch>
322+
323+
</IfModule>

‎.htaccess.sample

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
# Insert filter on all content
101101
###SetOutputFilter DEFLATE
102102
# Insert filter on selected content types only
103-
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
103+
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript application/json image/svg+xml
104104

105105
# Netscape 4.x has some problems...
106106
#BrowserMatch ^Mozilla/4 gzip-only-text/html
@@ -189,6 +189,7 @@
189189

190190
AddDefaultCharset Off
191191
#AddDefaultCharset UTF-8
192+
AddType 'text/html; charset=UTF-8' html
192193

193194
<IfModule mod_expires.c>
194195

@@ -284,3 +285,38 @@
284285
## http://developer.yahoo.com/performance/rules.html#etags
285286

286287
#FileETag none
288+
289+
# ######################################################################
290+
# # INTERNET EXPLORER #
291+
# ######################################################################
292+
293+
# ----------------------------------------------------------------------
294+
# | Document modes |
295+
# ----------------------------------------------------------------------
296+
297+
# Force Internet Explorer 8/9/10 to render pages in the highest mode
298+
# available in the various cases when it may not.
299+
#
300+
# https://hsivonen.fi/doctype/#ie8
301+
#
302+
# (!) Starting with Internet Explorer 11, document modes are deprecated.
303+
# If your business still relies on older web apps and services that were
304+
# designed for older versions of Internet Explorer, you might want to
305+
# consider enabling `Enterprise Mode` throughout your company.
306+
#
307+
# https://msdn.microsoft.com/en-us/library/ie/bg182625.aspx#docmode
308+
# http://blogs.msdn.com/b/ie/archive/2014/04/02/stay-up-to-date-with-enterprise-mode-for-internet-explorer-11.aspx
309+
310+
<IfModule mod_headers.c>
311+
312+
Header set X-UA-Compatible "IE=edge"
313+
314+
# `mod_headers` cannot match based on the content-type, however,
315+
# the `X-UA-Compatible` response header should be send only for
316+
# HTML documents and not for the other resources.
317+
318+
<FilesMatch "\.(appcache|atom|bbaw|bmp|crx|css|cur|eot|f4[abpv]|flv|geojson|gif|htc|ico|jpe?g|js|json(ld)?|m4[av]|manifest|map|mp4|oex|og[agv]|opus|otf|pdf|png|rdf|rss|safariextz|svgz?|swf|topojson|tt[cf]|txt|vcard|vcf|vtt|webapp|web[mp]|webmanifest|woff2?|xloc|xml|xpi)$">
319+
Header unset X-UA-Compatible
320+
</FilesMatch>
321+
322+
</IfModule>

‎.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ addons:
99
- postfix
1010
language: php
1111
php:
12-
- 5.5
1312
- 5.6
1413
- 7.0
1514
env:
@@ -26,8 +25,6 @@ cache:
2625
directories: $HOME/.composer/cache
2726
matrix:
2827
exclude:
29-
- php: 5.6
30-
env: TEST_SUITE=static
3128
- php: 7.0
3229
env: TEST_SUITE=static
3330
before_install: ./dev/travis/before_install.sh

‎app/code/Magento/AdminNotification/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.22|~5.6.0|~7.0.0",
6-
"magento/module-store": "100.0.*",
7-
"magento/module-backend": "100.0.*",
8-
"magento/module-media-storage": "100.0.*",
9-
"magento/framework": "100.0.*",
6+
"magento/module-store": "100.1.*",
7+
"magento/module-backend": "100.1.*",
8+
"magento/module-media-storage": "100.1.*",
9+
"magento/framework": "100.1.*",
1010
"lib-libxml": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.0.2",
13+
"version": "100.1.0-rc1",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.22|~5.6.0|~7.0.0",
6-
"magento/module-catalog": "100.0.*",
7-
"magento/module-catalog-inventory": "100.0.*",
8-
"magento/module-eav": "100.0.*",
9-
"magento/module-import-export": "100.0.*",
10-
"magento/module-catalog-import-export": "100.0.*",
11-
"magento/module-customer": "100.0.*",
12-
"magento/module-store": "100.0.*",
13-
"magento/framework": "100.0.*"
6+
"magento/module-catalog": "101.0.*",
7+
"magento/module-catalog-inventory": "100.1.*",
8+
"magento/module-eav": "100.1.*",
9+
"magento/module-import-export": "100.1.*",
10+
"magento/module-catalog-import-export": "100.1.*",
11+
"magento/module-customer": "100.1.*",
12+
"magento/module-store": "100.1.*",
13+
"magento/framework": "100.1.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.0.2",
16+
"version": "100.1.0-rc1",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.22|~5.6.0|~7.0.0",
6-
"magento/module-backend": "100.0.*",
7-
"magento/framework": "100.0.*"
6+
"magento/module-backend": "100.1.*",
7+
"magento/framework": "100.1.*"
88
},
99
"type": "magento2-module",
10-
"version": "100.0.2",
10+
"version": "100.1.0-rc1",
1111
"license": [
1212
"OSL-3.0",
1313
"AFL-3.0"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.22|~5.6.0|~7.0.0",
6-
"magento/module-sales": "100.0.*",
7-
"magento/module-store": "100.0.*",
8-
"magento/module-quote": "100.0.*",
9-
"magento/module-checkout": "100.0.*",
10-
"magento/module-backend": "100.0.*",
11-
"magento/module-payment": "100.0.*",
12-
"magento/module-catalog": "100.0.*",
13-
"magento/framework": "100.0.*"
6+
"magento/module-sales": "100.1.*",
7+
"magento/module-store": "100.1.*",
8+
"magento/module-quote": "100.1.*",
9+
"magento/module-checkout": "100.1.*",
10+
"magento/module-backend": "100.1.*",
11+
"magento/module-payment": "100.1.*",
12+
"magento/module-catalog": "101.0.*",
13+
"magento/framework": "100.1.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.0.2",
16+
"version": "100.1.0-rc1",
1717
"license": [
1818
"proprietary"
1919
],

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.22|~5.6.0|~7.0.0",
6-
"magento/module-store": "100.0.*",
7-
"magento/module-directory": "100.0.*",
8-
"magento/module-developer": "100.0.*",
9-
"magento/module-eav": "100.0.*",
10-
"magento/module-theme": "100.0.*",
11-
"magento/module-reports": "100.0.*",
12-
"magento/module-sales": "100.0.*",
13-
"magento/module-quote": "100.0.*",
14-
"magento/module-catalog": "100.0.*",
15-
"magento/module-user": "100.0.*",
16-
"magento/module-security": "100.0.*",
17-
"magento/module-backup": "100.0.*",
18-
"magento/module-customer": "100.0.*",
19-
"magento/module-translation": "100.0.*",
20-
"magento/module-require-js": "100.0.*",
21-
"magento/module-config": "100.0.*",
22-
"magento/framework": "100.0.*"
6+
"magento/module-store": "100.1.*",
7+
"magento/module-directory": "100.1.*",
8+
"magento/module-developer": "100.1.*",
9+
"magento/module-eav": "100.1.*",
10+
"magento/module-theme": "100.1.*",
11+
"magento/module-reports": "100.1.*",
12+
"magento/module-sales": "100.1.*",
13+
"magento/module-quote": "100.1.*",
14+
"magento/module-catalog": "101.0.*",
15+
"magento/module-user": "100.1.*",
16+
"magento/module-security": "100.1.*",
17+
"magento/module-backup": "100.1.*",
18+
"magento/module-customer": "100.1.*",
19+
"magento/module-translation": "100.1.*",
20+
"magento/module-require-js": "100.1.*",
21+
"magento/module-config": "100.1.*",
22+
"magento/framework": "100.1.*"
2323
},
2424
"type": "magento2-module",
25-
"version": "100.0.2",
25+
"version": "100.1.0-rc1",
2626
"license": [
2727
"OSL-3.0",
2828
"AFL-3.0"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.22|~5.6.0|~7.0.0",
6-
"magento/module-store": "100.0.*",
7-
"magento/module-backend": "100.0.*",
8-
"magento/module-cron": "100.0.*",
9-
"magento/framework": "100.0.*"
6+
"magento/module-store": "100.1.*",
7+
"magento/module-backend": "100.1.*",
8+
"magento/module-cron": "100.1.*",
9+
"magento/framework": "100.1.*"
1010
},
1111
"type": "magento2-module",
12-
"version": "100.0.2",
12+
"version": "100.1.0-rc1",
1313
"license": [
1414
"OSL-3.0",
1515
"AFL-3.0"

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.22|~5.6.0|~7.0.0",
6-
"magento/framework": "*",
6+
"magento/framework": "100.1.*",
77
"magento/magento-composer-installer": "*",
8-
"magento/module-config": "*",
9-
"magento/module-directory": "*",
10-
"magento/module-payment": "*",
11-
"magento/module-checkout": "*",
12-
"magento/module-sales": "*",
13-
"magento/module-backend": "*",
14-
"magento/module-vault": "*",
15-
"magento/module-customer": "*",
16-
"magento/module-catalog": "*",
17-
"magento/module-quote": "*",
18-
"magento/module-paypal": "*",
19-
"magento/module-theme": "*",
8+
"magento/module-config": "100.1.*",
9+
"magento/module-directory": "100.1.*",
10+
"magento/module-payment": "100.1.*",
11+
"magento/module-checkout": "100.1.*",
12+
"magento/module-sales": "100.1.*",
13+
"magento/module-backend": "100.1.*",
14+
"magento/module-vault": "100.1.*",
15+
"magento/module-customer": "100.1.*",
16+
"magento/module-catalog": "101.0.*",
17+
"magento/module-quote": "100.1.*",
18+
"magento/module-paypal": "100.1.*",
19+
"magento/module-theme": "100.1.*",
2020
"braintree/braintree_php": "3.7.0"
2121
},
2222
"suggest": {
23-
"magento/module-checkout-agreements": "100.0.*"
23+
"magento/module-checkout-agreements": "100.1.*"
2424
},
2525
"type": "magento2-module",
26-
"version": "100.0.2",
26+
"version": "100.1.0-rc1",
2727
"license": [
2828
"proprietary"
2929
],

0 commit comments

Comments
 (0)