Skip to content

Commit e0e44d7

Browse files
committed
Merge remote-tracking branch 'origin/2.4-develop' into ACP2E-1338
2 parents b7638c9 + 62db9c1 commit e0e44d7

File tree

901 files changed

+14945
-23583
lines changed

Some content is hidden

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

901 files changed

+14945
-23583
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This will allow you to collaborate with the Magento 2 development team, fork the
3333
1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
3434
2. Review the [Contributor License Agreement](https://opensource.adobe.com/cla.html) if this is your first time contributing.
3535
3. Create and test your work.
36-
4. Follow the [Forks And Pull Requests Instructions](https://devdocs.magento.com/contributor-guide/contributing.html#forks-and-pull-requests) to fork the Magento 2 repository and send us a pull request.
36+
4. Follow the [Forks And Pull Requests Instructions](https://developer.adobe.com/commerce/contributor/guides/code-contributions/) to fork the Magento 2 repository and send us a pull request.
3737
5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
3838

3939
## Code of Conduct

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ However, for those who need a full-featured eCommerce solution, we recommend [Ad
1515

1616
## Get started
1717

18-
- [Quick start install](https://devdocs.magento.com/guides/v2.4/install-gde/composer.html)
19-
- [System requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html)
20-
- [Prerequisites](https://devdocs.magento.com/guides/v2.4/install-gde/prereq/prereq-overview.html)
21-
- [More installation options](https://devdocs.magento.com/guides/v2.4/install-gde/bk-install-guide.html)
18+
- [Quick start install](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/composer.html)
19+
- [System requirements](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/system-requirements.html)
20+
- [Prerequisites](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/prerequisites/overview.html)
21+
- [More installation options](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/overview.html)
2222

2323
## Get help
2424

@@ -28,8 +28,8 @@ However, for those who need a full-featured eCommerce solution, we recommend [Ad
2828

2929
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.
3030

31-
- [Contribute to the code](https://devdocs.magento.com/contributor-guide/contributing.html)
32-
- [Report an issue](https://devdocs.magento.com/contributor-guide/contributing.html#report)
31+
- [Contribute to the code](https://developer.adobe.com/commerce/contributor/guides/code-contributions/)
32+
- [Report an issue](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report)
3333
- [Improve the developer documentation](https://github.com/magento/devdocs)
3434
- [Improve the end-user documentation](https://github.com/magento/merchdocs)
3535
- [Shape the future of Magento Open Source](https://developer.adobe.com/open/magento)
@@ -38,8 +38,8 @@ Our [Community](https://opensource.magento.com/) is large and diverse, and our p
3838

3939
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.
4040

41-
- [Learn more about the Maintainer role](https://devdocs.magento.com/contributor-guide/maintainers.html)
42-
- [Maintainer's Handbook](https://devdocs.magento.com/contributor-guide/maintainer-handbook.html)
41+
- [Learn more about the Maintainer role](https://developer.adobe.com/commerce/contributor/guides/maintainers/)
42+
- [Maintainer's Handbook](https://developer.adobe.com/commerce/contributor/guides/maintainers/handbook/)
4343

4444
[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png)](https://magento.com/magento-contributors#maintainers)
4545

@@ -53,11 +53,11 @@ Adobe highly appreciates contributions that help us to improve the code, clarify
5353

5454
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.
5555

56-
- [Labels applied by the Community Engineering team](https://devdocs.magento.com/contributor-guide/contributing.html#labels)
56+
- [Labels applied by the Community Engineering team](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#labels)
5757

5858
## Security
5959

60-
[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).
60+
[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).
6161

6262
Stay up-to-date on the latest security news and patches by signing up for [Security Alert Notifications](https://magento.com/security/sign-up).
6363

@@ -71,7 +71,7 @@ Subject to Licensee's/Customer's payment of fees and compliance with the terms a
7171

7272
## Communications
7373

74-
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).
74+
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/).
7575

7676
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 [engcom@adobe.com](mailto:engcom@adobe.com), or [sign up](https://opensource.magento.com/slack).
7777

app/code/Magento/AdminAdobeIms/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiInterface.php

Lines changed: 0 additions & 144 deletions
This file was deleted.

app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiSearchResultsInterface.php

Lines changed: 0 additions & 34 deletions
This file was deleted.

app/code/Magento/AdminAdobeIms/Api/ImsWebapiRepositoryInterface.php

Lines changed: 0 additions & 78 deletions
This file was deleted.

app/code/Magento/AdminAdobeIms/Api/SaveImsUserInterface.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)