-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from magento/2.4-develop
upd
- Loading branch information
Showing
4,724 changed files
with
159,723 additions
and
113,788 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,31 +15,31 @@ However, for those who need a full-featured eCommerce solution, we recommend [Ad | |
|
||
## Get started | ||
|
||
- [Quick start install](https://devdocs.magento.com/guides/v2.4/install-gde/composer.html) | ||
- [System requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html) | ||
- [Prerequisites](https://devdocs.magento.com/guides/v2.4/install-gde/prereq/prereq-overview.html) | ||
- [More installation options](https://devdocs.magento.com/guides/v2.4/install-gde/bk-install-guide.html) | ||
- [Quick start install](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/composer.html) | ||
- [System requirements](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/system-requirements.html) | ||
- [Prerequisites](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/prerequisites/overview.html) | ||
- [More installation options](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/overview.html) | ||
|
||
## Get help | ||
|
||
- [Help center](https://support.magento.com/hc/en-us) | ||
|
||
## Contribute | ||
|
||
Our [Community](https://opensource.magento.com/) is large and diverse, and our project is enormous. As a contributor, you have countless opportunities to impact product development and delivery by introducing new features or improving existing ones, enhancing test coverage, updating documentation for [developers](https://devdocs.magento.com/) and [end-users](https://docs.magento.com/user-guide/), catching and fixing code bugs, suggesting points for optimization, and sharing your great ideas. | ||
Our [Community](https://opensource.magento.com/) is large and diverse, and our project is enormous. As a contributor, you have countless opportunities to impact product development and delivery by introducing new features or improving existing ones, enhancing test coverage, updating documentation for [developers](https://developer.adobe.com/commerce/docs/) and [end-users](https://docs.magento.com/user-guide/), catching and fixing code bugs, suggesting points for optimization, and sharing your great ideas. | ||
|
||
- [Contribute to the code](https://devdocs.magento.com/contributor-guide/contributing.html) | ||
- [Report an issue](https://devdocs.magento.com/contributor-guide/contributing.html#report) | ||
- [Contribute to the code](https://developer.adobe.com/commerce/contributor/guides/code-contributions/) | ||
- [Report an issue](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report) | ||
- [Improve the developer documentation](https://github.com/magento/devdocs) | ||
- [Improve the end-user documentation](https://github.com/magento/merchdocs) | ||
- [Shape the future of Magento Open Source](https://developer.adobe.com/open/magento) | ||
|
||
### Maintainers | ||
|
||
We encourage experts from the Community to help us with GitHub routines such as accepting, merging, or rejecting pull requests and reviewing issues. Adobe has granted the Community Maintainers permission to accept, merge, and reject pull requests, as well as review issues. Thanks to invaluable input from the Community Maintainers team, we can significantly improve contribution quality and accelerate the time to deliver your updates to production. | ||
We encourage experts from the Community to help us with GitHub routines such as accepting, merging, or rejecting pull requests and reviewing issues. Adobe has granted the Community Maintainers permission to accept, merge, and reject pull requests, as well as review issues. Thanks to invaluable input from the Community Maintainers team, we can significantly improve contribution quality and accelerate the time to deliver your updates to production. | ||
|
||
- [Learn more about the Maintainer role](https://devdocs.magento.com/contributor-guide/maintainers.html) | ||
- [Maintainer's Handbook](https://devdocs.magento.com/contributor-guide/maintainer-handbook.html) | ||
- [Learn more about the Maintainer role](https://developer.adobe.com/commerce/contributor/guides/maintainers/) | ||
- [Maintainer's Handbook](https://developer.adobe.com/commerce/contributor/guides/maintainers/handbook/) | ||
|
||
[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png)](https://magento.com/magento-contributors#maintainers) | ||
|
||
|
@@ -53,25 +53,25 @@ Adobe highly appreciates contributions that help us to improve the code, clarify | |
|
||
We use labels in the GitHub issues and pull requests to help the participants retrieve additional information such as progress, component assignments, or release lines. | ||
|
||
- [Labels applied by the Community Engineering team](https://devdocs.magento.com/contributor-guide/contributing.html#labels) | ||
- [Labels applied by the Community Engineering team](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#labels) | ||
|
||
## Security | ||
|
||
[Security](https://devdocs.magento.com/guides/v2.4/architecture/security_intro.html) is one of the highest priorities at Adobe. To learn more about reporting security concerns, visit the [Adobe Bug Bounty Program](https://hackerone.com/adobe). | ||
[Security](https://developer.adobe.com/commerce/php/architecture/basics/security/) is one of the highest priorities at Adobe. To learn more about reporting security concerns, visit the [Adobe Bug Bounty Program](https://hackerone.com/adobe). | ||
|
||
Stay up-to-date on the latest security news and patches by signing up for [Security Alert Notifications](https://magento.com/security/sign-up). | ||
|
||
## Licensing | ||
|
||
Each Magento source file included in this distribution is licensed under OSL 3.0 or the terms and conditions of the applicable ordering document between Licensee/Customer and Adobe (or Magento). | ||
|
||
[Open Software License (OSL 3.0)](https://opensource.org/licenses/osl-3.0.php) – Please see [LICENSE.txt](LICENSE.txt) for the full text of the OSL 3.0 license. | ||
|
||
Subject to Licensee's/Customer's payment of fees and compliance with the terms and conditions of the applicable ordering document between Licensee/Customer and Adobe (or Magento), the terms and conditions of the applicable ordering between Licensee/Customer and Adobe (or Magento) supersede the OSL 3.0 license for each source file. | ||
|
||
## Communications | ||
|
||
We are dedicated to our Community and encourage your contributions and welcome feedback through [events](https://www.adobe.io/open/magento/calendar), our [DevBlog](https://community.magento.com/t5/Magento-DevBlog/bg-p/devblog), Twitter and YouTube channels, and [other Community resources](https://devdocs.magento.com/community/resources.html). | ||
We are dedicated to our Community and encourage your contributions and welcome feedback through [events](https://www.adobe.io/open/magento/calendar), our [DevBlog](https://community.magento.com/t5/Magento-DevBlog/bg-p/devblog), Twitter and YouTube channels, and [other Community resources](https://developer.adobe.com/commerce/contributor/community/). | ||
|
||
To connect with people from the Community and Adobe engineering, [join us in Slack](https://magentocommeng.slack.com). We have a channel for every project. To join a particular channel, send us a request at [[email protected]](mailto:[email protected]), or [sign up](https://opensource.magento.com/slack). | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
144 changes: 0 additions & 144 deletions
144
app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiInterface.php
This file was deleted.
Oops, something went wrong.
34 changes: 0 additions & 34 deletions
34
app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiSearchResultsInterface.php
This file was deleted.
Oops, something went wrong.
78 changes: 0 additions & 78 deletions
78
app/code/Magento/AdminAdobeIms/Api/ImsWebapiRepositoryInterface.php
This file was deleted.
Oops, something went wrong.
26 changes: 0 additions & 26 deletions
26
app/code/Magento/AdminAdobeIms/Api/SaveImsUserInterface.php
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.