Skip to content

Commit e6d2d0b

Browse files
author
Stanislav Idolov
committed
Merge remote-tracking branch 'elachino/2.1-develop' into MAGETWO-82598-magento-magento2-11576
2 parents 0d6e312 + 66ac3e0 commit e6d2d0b

File tree

23,831 files changed

+96746
-39496
lines changed

Some content is hidden

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

23,831 files changed

+96746
-39496
lines changed

‎.htaccess

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# All explanations you could find in .htaccess.sample file
22
DirectoryIndex index.php
33
<IfModule mod_php5.c>
4-
php_value memory_limit 768M
4+
php_value memory_limit 756M
55
php_value max_execution_time 18000
66
php_flag session.auto_start off
77
php_flag suhosin.session.cryptua off
88
</IfModule>
99
<IfModule mod_php7.c>
10-
php_value memory_limit 768M
10+
php_value memory_limit 756M
1111
php_value max_execution_time 18000
1212
php_flag session.auto_start off
1313
php_flag suhosin.session.cryptua off
@@ -106,6 +106,10 @@ DirectoryIndex index.php
106106
order allow,deny
107107
deny from all
108108
</Files>
109+
<Files auth.json>
110+
order allow,deny
111+
deny from all
112+
</Files>
109113
<Files magento_umask>
110114
order allow,deny
111115
deny from all

‎.htaccess.sample

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ DirectoryIndex index.php
3636
############################################
3737
## adjust memory limit
3838

39-
php_value memory_limit 768M
39+
php_value memory_limit 756M
4040
php_value max_execution_time 18000
4141

4242
############################################
@@ -59,7 +59,7 @@ DirectoryIndex index.php
5959
############################################
6060
## adjust memory limit
6161

62-
php_value memory_limit 768M
62+
php_value memory_limit 756M
6363
php_value max_execution_time 18000
6464

6565
############################################
@@ -270,6 +270,10 @@ DirectoryIndex index.php
270270
order allow,deny
271271
deny from all
272272
</Files>
273+
<Files auth.json>
274+
order allow,deny
275+
deny from all
276+
</Files>
273277
<Files magento_umask>
274278
order allow,deny
275279
deny from all

‎.php_cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ language: php
1111
php:
1212
- 5.6
1313
- 7.0
14+
- 7.1
1415
env:
1516
global:
1617
- COMPOSER_BIN_DIR=~/bin

‎.user.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
memory_limit = 768M
1+
memory_limit = 756M
22
max_execution_time = 18000
33
session.auto_start = off
44
suhosin.session.cryptua = off

‎CHANGELOG.md

Lines changed: 265 additions & 3 deletions
Large diffs are not rendered by default.

‎COPYING.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
Copyright © 2013-present Magento, Inc.
2+
13
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
24

35
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)

‎Gruntfile.js.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55

‎README.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=develop)](https://travis-ci.org/magento/magento2)
1+
[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.1-develop)](https://travis-ci.org/magento/magento2)
2+
[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
23
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
34
<h2>Welcome</h2>
4-
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
5+
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
56

67
The installation instructions that used to be here are now published on our GitHub site. Use the information on this page to get started or go directly to the <a href="http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html" target="_blank">guide</a>.
78

@@ -73,9 +74,22 @@ To suggest documentation improvements, click [here][4].
7374
[3]: <https://github.com/magento/magento2/issues>
7475
[4]: <http://devdocs.magento.com>
7576

77+
<h3>Community Maintainers</h3>
78+
The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
79+
80+
<a href="https://magento.com/magento-contributors#maintainers">
81+
<img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
82+
</a>
83+
84+
<h3>Top Contributors</h3>
85+
Magento is thankful for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
86+
<a href="https://magento.com/magento-contributors">
87+
<img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
88+
</a>
89+
7690
<h2>Reporting security issues</h2>
7791

78-
To report security vulnerabilities in Magento software or web sites, please e-mail <a href="mailto:security@magento.com">security@magento.com</a>. Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our <a href="https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc">encryption key</a> if it includes sensitive information. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.
92+
To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account <a href="https://bugcrowd.com/magento">there</a> to submit and follow-up your issue. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.
7993

8094
Stay up-to-date on the latest vulnerabilities and patches for Magento by signing up for <a href="https://magento.com/security/sign-up">Security Alert Notifications</a>.
8195

‎app/autoload.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Register basic autoloader that uses include path
44
*
5-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
5+
* Copyright © Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88
use Magento\Framework\Autoload\AutoloaderRegistry;
@@ -35,6 +35,3 @@
3535
}
3636

3737
AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
38-
39-
// Sets default autoload mappings, may be overridden in Bootstrap::create
40-
\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);

0 commit comments

Comments
 (0)