Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.3-develop' into 2.3-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
lfolco committed Sep 26, 2019
2 parents 5a6deee + bf6b166 commit 6406d93
Show file tree
Hide file tree
Showing 2,779 changed files with 80,907 additions and 14,106 deletions.
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false
206 changes: 206 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
/app/code/Magento/AdminNotification/ @paliarush
/app/code/Magento/Backend/ @paliarush
/app/code/Magento/User/ @paliarush
/lib/internal/Magento/Framework/App/ @buskamuza
/lib/internal/Magento/Framework/Controller/ @buskamuza
/lib/internal/Magento/Framework/Flag/ @buskamuza
/lib/internal/Magento/Framework/HTTP/ @buskamuza
/lib/internal/Magento/Framework/Logger/ @buskamuza
/lib/internal/Magento/Framework/Message/ @buskamuza
/lib/internal/Magento/Framework/Notification/ @buskamuza
/lib/internal/Magento/Framework/Session/ @buskamuza
/lib/internal/Magento/Framework/Url/ @buskamuza
/app/code/Magento/Cms/ @melnikovi
/app/code/Magento/CmsUrlRewrite/ @melnikovi
/app/code/Magento/Contact/ @melnikovi
/app/code/Magento/Email/ @melnikovi
/app/code/Magento/Variable/ @melnikovi
/app/code/Magento/Widget/ @melnikovi
/lib/internal/Magento/Framework/Cache/ @kokoc
/app/code/Magento/CacheInvalidate/ @kokoc
/app/code/Magento/CatalogInventory/ @tariqjawed83 @maghamed
/app/code/Magento/Bundle/ @akaplya
/app/code/Magento/BundleImportExport/ @akaplya
/app/code/Magento/Catalog/ @akaplya
/app/code/Magento/CatalogAnalytics/ @akaplya
/app/code/Magento/CatalogImportExport/ @akaplya
/app/code/Magento/CatalogSearch/ @kokoc
/app/code/Magento/CatalogUrlRewrite/ @akaplya
/app/code/Magento/ConfigurableImportExport/ @akaplya
/app/code/Magento/ConfigurableProduct/ @akaplya
/app/code/Magento/Downloadable/ @akaplya
/app/code/Magento/DownloadableImportExport/ @akaplya
/app/code/Magento/GroupedImportExport/ @akaplya
/app/code/Magento/GroupedProduct/ @akaplya
/app/code/Magento/LayeredNavigation/ @kokoc
/app/code/Magento/ProductVideo/ @akaplya
/app/code/Magento/Review/ @akaplya
/app/code/Magento/Swatches/ @akaplya
/app/code/Magento/SwatchesLayeredNavigation/ @kokoc
/app/code/Magento/Checkout/ @paliarush
/app/code/Magento/CheckoutAgreements/ @paliarush
/app/code/Magento/GiftMessage/ @paliarush
/app/code/Magento/InstantPurchase/ @paliarush
/app/code/Magento/Multishipping/ @joni-jones
/app/code/Magento/Quote/ @paliarush
/app/code/Magento/QuoteAnalytics/ @paliarush
/lib/internal/Magento/Framework/Code/ @joni-jones
/lib/internal/Magento/Framework/Reflection/ @joni-jones
/lib/internal/Magento/Framework/Component/ @buskamuza
/app/code/Magento/Version/ @buskamuza
/lib/internal/Magento/Framework/Config/ @paliarush
/app/code/Magento/Config/ @paliarush
/lib/internal/Magento/Framework/Console/ @joni-jones
/lib/internal/Magento/Framework/Process/ @joni-jones
/lib/internal/Magento/Framework/Shell/ @joni-jones
/app/code/Magento/Cookie/ @kokoc
/lib/internal/Magento/Framework/Crontab/ @tariqjawed83 @buskamuza
/app/code/Magento/Cron/ @tariqjawed83 @buskamuza
/app/code/Magento/Customer/ @paliarush
/app/code/Magento/CustomerAnalytics/ @paliarush
/app/code/Magento/CustomerImportExport/ @paliarush
/app/code/Magento/Persistent/ @paliarush
/app/code/Magento/Wishlist/ @paliarush
/lib/internal/Magento/Framework/DB/ @akaplya
/lib/internal/Magento/Framework/EntityManager/ @akaplya
/lib/internal/Magento/Framework/Indexer/ @akaplya
/lib/internal/Magento/Framework/Model/ @akaplya
/lib/internal/Magento/Framework/Mview/ @akaplya
/app/code/Magento/Eav/ @akaplya
/app/code/Magento/Indexer/ @akaplya
/lib/internal/Magento/Framework/Archive/ @joni-jones
/lib/internal/Magento/Framework/Convert/ @joni-jones
/lib/internal/Magento/Framework/Data/ @joni-jones
/lib/internal/Magento/Framework/DomDocument/ @joni-jones
/lib/internal/Magento/Framework/Json/ @joni-jones
/lib/internal/Magento/Framework/Math/ @joni-jones
/lib/internal/Magento/Framework/Parse/ @joni-jones
/lib/internal/Magento/Framework/Serialize/ @joni-jones
/lib/internal/Magento/Framework/Simplexml/ @joni-jones
/lib/internal/Magento/Framework/Stdlib/ @joni-jones
/lib/internal/Magento/Framework/Unserialize/ @joni-jones
/lib/internal/Magento/Framework/Xml/ @joni-jones
/lib/internal/Magento/Framework/XsltProcessor/ @joni-jones
/app/code/Magento/Deploy/ @kandy @buskamuza
/lib/internal/Magento/Framework/Profiler/ @kandy
/app/code/Magento/Developer/ @buskamuza
/app/code/Magento/Directory/ @buskamuza
/lib/internal/Magento/Framework/Exception/ @paliarush
/lib/internal/Magento/Framework/File/ @buskamuza
/lib/internal/Magento/Framework/Filesystem/ @buskamuza
/lib/internal/Magento/Framework/System/ @buskamuza
/lib/internal/Magento/Framework/Css/ @DrewML
/lib/internal/Magento/Framework/Option/ @DrewML
/lib/internal/Magento/Framework/RequireJs/ @DrewML
/lib/internal/Magento/Framework/View/ @melnikovi
/dev/tests/js/ @DrewML
/app/code/Magento/RequireJs/ @DrewML
/app/code/Magento/Theme/ @melnikovi
/app/code/Magento/Ui/ @melnikovi
/lib/internal/Magento/Framework/Intl/ @melnikovi
/lib/internal/Magento/Framework/Locale/ @melnikovi
/lib/internal/Magento/Framework/Phrase/ @melnikovi
/lib/internal/Magento/Framework/Translate/ @melnikovi
/app/code/Magento/Translation/ @melnikovi
/app/code/Magento/ImportExport/ @akaplya
/app/code/Magento/GoogleAdwords/ @buskamuza @melnikovi
/app/code/Magento/Newsletter/ @buskamuza @melnikovi
/app/code/Magento/ProductAlert/ @buskamuza @melnikovi
/app/code/Magento/Rss/ @buskamuza @melnikovi
/app/code/Magento/SendFriend/ @buskamuza @melnikovi
/app/code/Magento/Marketplace/ @buskamuza
/app/code/Magento/MediaStorage/ @buskamuza
/lib/internal/Magento/Framework/Amqp/ @tariqjawed83 @paliarush
/lib/internal/Magento/Framework/Bulk/ @tariqjawed83 @paliarush
/lib/internal/Magento/Framework/Communication/ @tariqjawed83 @paliarush
/app/code/Magento/Amqp/ @tariqjawed83 @paliarush
/app/code/Magento/AsynchronousOperations/ @tariqjawed83 @paliarush
/app/code/Magento/MessageQueue/ @tariqjawed83 @paliarush
/app/code/Magento/MysqlMq/ @tariqjawed83 @paliarush
/app/code/Magento/Sales/ @joni-jones
/app/code/Magento/SalesInventory/ @joni-jones
/app/code/Magento/SalesSequence/ @joni-jones
/lib/internal/Magento/Framework/Event/ @buskamuza @kandy
/lib/internal/Magento/Framework/Interception/ @buskamuza @kandy
/lib/internal/Magento/Framework/ObjectManager/ @buskamuza @kandy
/app/code/Magento/PageCache/ @Andrey @kokoc @paliarush
/app/code/Magento/Authorizenet/ @joni-jones
/app/code/Magento/Braintree/ @joni-jones
/app/code/Magento/OfflinePayments/ @joni-jones
/app/code/Magento/Payment/ @joni-jones
/app/code/Magento/Paypal/ @joni-jones
/app/code/Magento/Signifyd/ @joni-jones
/app/code/Magento/Vault/ @joni-jones
/lib/internal/Magento/Framework/Pricing/ @akaplya
/app/code/Magento/AdvancedPricingImportExport/ @akaplya
/app/code/Magento/CurrencySymbol/ @akaplya
/app/code/Magento/Msrp/ @akaplya
/app/code/Magento/Tax/ @akaplya
/app/code/Magento/TaxImportExport/ @akaplya
/app/code/Magento/Weee/ @akaplya
/app/code/Magento/CatalogRule/ @kokoc
/app/code/Magento/CatalogRuleConfigurable/ @kokoc
/app/code/Magento/CatalogWidget/ @kokoc
/app/code/Magento/Rule/ @kokoc
/app/code/Magento/SalesRule/ @akaplya
/app/code/Magento/ReleaseNotification/ @paliarush
/app/code/Magento/Analytics/ @tariqjawed83 @buskamuza
/app/code/Magento/GoogleAnalytics/ @tariqjawed83 @buskamuza
/app/code/Magento/NewRelicReporting/ @tariqjawed83 @buskamuza
/app/code/Magento/Reports/ @tariqjawed83 @buskamuza
/app/code/Magento/ReviewAnalytics/ @tariqjawed83 @buskamuza
/app/code/Magento/SalesAnalytics/ @tariqjawed83 @buskamuza
/app/code/Magento/WishlistAnalytics/ @tariqjawed83 @buskamuza
/app/code/Magento/GoogleOptimizer/ @paliarush
/app/code/Magento/Robots/ @paliarush
/app/code/Magento/Sitemap/ @paliarush
/lib/internal/Magento/Framework/Search/ @kokoc
/app/code/Magento/AdvancedSearch/ @kokoc
/app/code/Magento/Elasticsearch/ @kokoc
/app/code/Magento/Search/ @kokoc
/lib/internal/Magento/Framework/Acl/ @kokoc
/lib/internal/Magento/Framework/Authorization/ @kokoc
/lib/internal/Magento/Framework/Encryption/ @kokoc
/app/code/Magento/Authorization/ @kokoc
/app/code/Magento/Captcha/ @kokoc
/app/code/Magento/EncryptionKey/ @kokoc
/app/code/Magento/Security/ @kokoc
/lib/internal/Magento/Framework/Autoload/ @buskamuza
/lib/internal/Magento/Framework/Backup/ @buskamuza
/lib/internal/Magento/Framework/Composer/ @buskamuza
/lib/internal/Magento/Framework/Setup/ @buskamuza
/app/code/Magento/Backup/ @buskamuza
/setup/ @buskamuza
/app/code/Magento/Dhl/ @joni-jones
/app/code/Magento/Fedex/ @joni-jones
/app/code/Magento/OfflineShipping/ @joni-jones
/app/code/Magento/Shipping/ @joni-jones
/app/code/Magento/Ups/ @joni-jones
/app/code/Magento/Usps/ @joni-jones
/app/code/Magento/Store/ @akaplya
/lib/internal/Magento/Framework/TestFramework/ @paliarush
/dev/tests/integration/framework/ @buskamuza
/dev/tests/setup-integration/framework/ @paliarush
/dev/tests/static/framework/ @paliarush
/dev/tests/unit/ @paliarush
/dev/tests/api-functional/ @paliarush
/app/code/Magento/UrlRewrite/ @kokoc
/lib/internal/Magento/Framework/Image/ @buskamuza
/lib/internal/Magento/Framework/Mail/ @melnikovi
/lib/internal/Magento/Framework/Filter/ @melnikovi
/lib/internal/Magento/Framework/Validation/ @melnikovi
/lib/internal/Magento/Framework/Validator/ @melnikovi
/lib/internal/Magento/Framework/Api/ @paliarush
/lib/internal/Magento/Framework/GraphQL/ @paliarush
/lib/internal/Magento/Framework/Oauth/ @paliarush
/lib/internal/Magento/Framework/Webapi/ @paliarush
/app/code/Magento/GraphQL/ @paliarush
/app/code/Magento/Integration/ @paliarush
/app/code/Magento/Swagger/ @paliarush
/app/code/Magento/Webapi/ @paliarush
/app/code/Magento/WebapiSecurity/ @paliarush

composer.json @buskamuza
*.js @DrewML
.htaccess* @akaplya
nginx.conf* @akaplya
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -612,11 +612,11 @@ To get detailed information about changes in Magento 2.3.0, see the [Release Not

2.2.0
=============
To get detailed information about changes in Magento 2.2.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.2/release-notes/bk-release-notes.html)
To get detailed information about changes in Magento 2.2.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)

2.1.0
=============
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](https://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")

2.0.0
=============
Expand Down Expand Up @@ -1637,7 +1637,7 @@ Tests:
* Improved backend menu keyboard accessibility
* Accessibility improvements: WAI-ARIA in a product item on a category page and related products
* Checkout flow code can work with a separate DB storage
* <a href="https://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
* Unit tests moved to module directories
* Addressed naming inconsistencies in REST routes
* Added Advanced Developer workflow for frontend developers
* Setup
Expand Down
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a

* [Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).

## Learn More About GraphQL in Magento 2

* [GraphQL Developer Guide](https://devdocs.magento.com/guides/v2.3/graphql/index.html)

<h2>Contributing to the Magento 2 Code Base</h2>
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.

Expand All @@ -20,10 +24,10 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].

To suggest documentation improvements, click [here][4].

[1]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
[2]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
[3]: <https://github.com/magento/magento2/issues>
[4]: <https://devdocs.magento.com>
[1]: https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html
[2]: https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report
[3]: https://github.com/magento/magento2/issues
[4]: https://devdocs.magento.com

<h3>Community Maintainers</h3>
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.
Expand Down
42 changes: 39 additions & 3 deletions app/code/Magento/AdminNotification/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,40 @@
# Admin Notification
# Magento_AdminNotification module

**Admin Notification** provides the ability to alert administrators via
system messages and provides a message inbox for surveys and notifications.
The Magento_AdminNotification module provides the ability to alert administrators via system messages and provides a message inbox for surveys and notifications.

## Installation details

The Magento_AdminNotification module creates the following tables in the database:
- `adminnotification_inbox`
- `admin_system_messages`

Before disabling or uninstalling this module, note that the Magento_Indexer module depends on this module.

For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).

## Extensibility

Extension developers can interact with the Magento_AdminNotification module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).

[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AdminNotification module.

### Events

This module observes the following events:

- `controller_action_predispatch` event in `Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver` file.

### Layouts

This module introduces the following layouts and layout handles in the `view/adminhtml/layout` directory:

- `adminhtml_notification_index`
- `adminhtml_notification_block`

For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).

### UI components

You can extend admin notifications using the `view/adminhtml/ui_component/notification_area.xml` configuration file.

For information about UI components in Magento 2, see [Overview of UI components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<section name="AdminSystemMessagesSection">
<element name="systemMessagesDropdown" type="button" selector="#system_messages .message-system-action-dropdown"/>
<element name="actionMessageLog" type="button" selector="//*[contains(@class, 'message-system-summary')]/a[contains(text(), '{{textMessage}}')]" parameterized="true"/>
</section>
</sections>
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"sort-packages": true
},
"require": {
"php": "~7.1.3||~7.2.0",
"php": "~7.1.3||~7.2.0||~7.3.0",
"lib-libxml": "*",
"magento/framework": "*",
"magento/module-backend": "*",
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/AdminNotification/etc/db_schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
<table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
<column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
comment="Notification id"/>
comment="Notification ID"/>
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
default="0" comment="Problem type"/>
<column xsi:type="timestamp" name="date_added" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
Expand All @@ -35,7 +35,7 @@
</index>
</table>
<table name="admin_system_messages" resource="default" engine="innodb" comment="Admin System Messages">
<column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message id"/>
<column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message ID"/>
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
default="0" comment="Problem type"/>
<column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
Expand Down
Loading

0 comments on commit 6406d93

Please sign in to comment.