Skip to content

Commit cdc79b3

Browse files
viktymviktym
committed
Merge remote-tracking branch 'magento/1.0-develop' into MC-30896
2 parents 62a8c87 + db0456c commit cdc79b3

File tree

70 files changed

+1816
-201
lines changed

Some content is hidden

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

70 files changed

+1816
-201
lines changed

‎COPYING.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Copyright © 2013-present Magento, Inc.
2+
3+
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.
4+
5+
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
6+
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact [email protected] for a copy.
7+
8+
Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
9+
Please see LICENSE_EE.txt for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.

‎Notifier/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "Multiple channel notifier engine for Magento 2",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "102.0.*",
7-
"magento/module-notifier-api": "^1.0"
6+
"magento/framework": "*",
7+
"magento/module-notifier-api": "*"
88
},
99
"support": {
1010
"issues": "https://github.com/magento/security-package/issues"

‎NotifierAdminUi/composer.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"description": "Multiple channel notifier engine for Magento 2",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "102.0.*",
7-
"magento/module-backend": "101.0.*",
8-
"magento/module-ui": "101.1.*",
9-
"magento/module-notifier": "^1.0",
10-
"magento/module-notifier-api": "*",
6+
"magento/framework": "*",
7+
"magento/module-backend": "*",
118
"magento/module-catalog": "*",
12-
"magento/module-cms": "*"
9+
"magento/module-cms": "*",
10+
"magento/module-ui": "*",
11+
"magento/module-notifier": "*",
12+
"magento/module-notifier-api": "*"
1313
},
1414
"support": {
1515
"issues": "https://github.com/magento/security-package/issues"

‎NotifierApi/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Multiple channel notifier engine for Magento 2 API",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "102.0.*"
6+
"magento/framework": "*"
77
},
88
"authors": [
99
{

‎NotifierAsync/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "Asynchronous message send for Magento2 notifier",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "102.0.*",
7-
"magento/module-notifier": "^1.0",
6+
"magento/framework": "*",
7+
"magento/module-notifier": "*",
88
"magento/module-notifier-api": "*"
99
},
1010
"authors": [

‎NotifierAsyncAdminUi/composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"description": "Asynchronous message send backend for Magento2 notifier",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "102.0.*",
7-
"magento/module-notifier-api": "^1.0",
8-
"magento/module-ui": "101.1.*",
9-
"magento/module-notifier-async": "^1.0"
6+
"magento/framework": "*",
7+
"magento/module-ui": "*",
8+
"magento/module-notifier-api": "*",
9+
"magento/module-notifier-async": "*"
1010
},
1111
"support": {
1212
"issues": "https://github.com/magento/security-package/issues"

‎NotifierAsyncAmqp/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "AMQP asynchronous message send for Magento2 notifier",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "102.0.*"
6+
"magento/framework": "*"
77
},
88
"authors": [
99
{

‎NotifierEmailAdapter/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "Email adapter for Notifier framework",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "102.0.*",
7-
"magento/module-notifier-api": "^1.0"
6+
"magento/framework": "*",
7+
"magento/module-notifier-api": "*"
88
},
99
"support": {
1010
"issues": "https://github.com/magento/security-package/issues"

‎NotifierEmailAdapterAdminUi/composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"description": "Email adapter for Notifier framework",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "102.0.*",
7-
"magento/module-ui": "101.1.*",
8-
"magento/module-notifier-admin-ui": "^1.0",
6+
"magento/framework": "*",
7+
"magento/module-ui": "*",
8+
"magento/module-notifier-admin-ui": "*",
99
"magento/module-notifier-email-adapter": "*"
1010
},
1111
"support": {

‎NotifierEvent/composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"description": "Event based rule engine for Magento Notifier",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "102.0.*",
7-
"magento/module-notifier-event-api": "^1.0",
8-
"magento/module-notifier-template-api": "^1.0",
9-
"magento/module-notifier-api": "*"
6+
"magento/framework": "*",
7+
"magento/module-notifier-api": "*",
8+
"magento/module-notifier-event-api": "*",
9+
"magento/module-notifier-template-api": "*"
1010
},
1111
"suggest": {
1212
"magento/module-notifier-async": "Asynchronous messages queue manager for Magento Notifier"

0 commit comments

Comments
 (0)