Skip to content

Commit

Permalink
Merge branch '2.4-develop' into mftf/module-cms-staging
Browse files Browse the repository at this point in the history
  • Loading branch information
lenaorobei authored Feb 25, 2020
2 parents 5cd51d4 + 2d46d98 commit d1a5d56
Show file tree
Hide file tree
Showing 1,686 changed files with 57,982 additions and 12,263 deletions.
206 changes: 0 additions & 206 deletions .github/CODEOWNERS

This file was deleted.

1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/developer-experience-issue.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
name: Developer experience issue
about: Issues related to customization, extensibility, modularity
labels: 'Triage: Dev.Experience'

---

Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
name: Feature request
about: Please consider reporting directly to https://github.com/magento/community-features
labels: 'feature request'

---

Expand Down
3 changes: 3 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
Letting us know what has changed and why it needed changing will help us validate this pull request.
-->

### Related Pull Requests
<!-- related pull request placeholder -->

### Fixed Issues (if relevant)
<!---
If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
Expand Down
20 changes: 17 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
<p align="center">
<a href="https://magento.com">
<img src="https://static.magento.com/sites/all/themes/magento/logo.svg" width="300px" alt="Magento" />
</a>
</p>
<p align="center">
<br /><br />
<a href="https://www.codetriage.com/magento/magento2">
<img src="https://www.codetriage.com/magento/magento2/badges/users.svg" alt="Open Source Helpers" />
</a>
<a href="https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge">
<img src="https://badges.gitter.im/Join%20Chat.svg" alt="Gitter" />
</a>
<a href="https://crowdin.com/project/magento-2">
<img src="https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg" alt="Crowdin" />
</a>
</p>

## Welcome
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/AdminAnalytics/etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
<system>
<section id="admin">
<group id="usage" translate="label" type="text" sortOrder="2000" showInDefault="1" showInWebsite="0" showInStore="0">
<group id="usage" translate="label" type="text" sortOrder="2000" showInDefault="1">
<label>Admin Usage</label>
<field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
<field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1">
<label>Enable Admin Usage Tracking</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<comment>Allow Magento to track admin usage in order to improve the quality and user experience.</comment>
Expand Down
Loading

0 comments on commit d1a5d56

Please sign in to comment.