This PR was merged into the 1.14 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.14
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | #15883
| License | MIT
Based on #15883
Commits
-------
b40fc8a9d1 Add services naming convention ADR
e4f99b323f Mirror improvement
10f14f6535 Add more examples
| Q | A
|-----------------|-----
| Branch? | 2.0
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | #17133
| License | MIT
* 1.14:
[PromotionBundle] Unification of service names - fix
[CI] Remove currently unneeded custom build
[API] Add default sorting order for customers admin GET endpoint
Change fixtures - add createdAt different time for customers
[Review] Change ReviewChangeListener doctrine event from postRemove to preRemove
[Composer] Remove conflict to doctrine/orm
* 1.13:
[CI] Remove currently unneeded custom build
[API] Add default sorting order for customers admin GET endpoint
Change fixtures - add createdAt different time for customers
[Review] Change ReviewChangeListener doctrine event from postRemove to preRemove
[Composer] Remove conflict to doctrine/orm
This PR was merged into the 1.14 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.14
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | #17133
| License | MIT
Commits
-------
f06344041a [PromotionBundle] Unification of service names - fix
| Q | A
|-----------------|-----
| Branch? | 1.13
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets |
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the
documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
| Q | A
|-----------------|-----
| Branch? | 2.0 <!-- see the comment below -->
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no <!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets | https://github.com/Sylius/Sylius/pull/17036
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the
documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
| Q | A
|-----------------|-----
| Branch? | 1.13
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets |
| License | MIT
After releasing stable versions of Grid and Resource bundles, the
`custom` build is currently unneeded. We will probably introduce in the
future the build for Sylius dev dependencies.
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the
documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
| Q | A
|-----------------|-----
| Branch? | 2.0
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets |
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the
documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
| Q | A
|-----------------|-----
| Branch? | 2.0
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets |
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the
documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).
**Remember!** The upmerge should always be merged with using `Merge pull
request` button.
In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/payment-request -m "Resolve conflicts between 2.0 and payment-request"
```
If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.
Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
| Q | A
|-----------------|-----
| Branch? | 2.0
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets |
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the
documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
@GSadee we are now sure that the new Twig hooks branch is fixed.
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).
**Remember!** The upmerge should always be merged with using `Merge pull
request` button.
In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/payment-request -m "Resolve conflicts between 2.0 and payment-request"
```
If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.
Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
* 1.14:
Move aliases to CoreBundle
Revert extended type for tags
Fix GenerateCouponsCommandTest
Mirror improvements
Mirror improvements
Update upgrade file
[PromotionBundle] Unification of service names
This PR was merged into the 1.14 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.14
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | yes
| Related tickets | https://github.com/Sylius/Sylius/pull/17093
| License | MIT
Commits
-------
5d0014799f [PromotionBundle] Unification of service names
42533ade2f Update upgrade file
10829c1aa3 Mirror improvements
695310999d Mirror improvements
b28105c850 Fix GenerateCouponsCommandTest
d396c04c37 Revert extended type for tags
c8fef88e0d Move aliases to CoreBundle
| Q | A
|-----------------|-----
| Branch? | 2.0
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | #17112
| License | MIT
| Q | A
|-----------------|-----
| Branch? | 2.0
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | #17111
| License | MIT
| Q | A
|-----------------|-----
| Branch? | 2.0
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | #17104#17125
| License | MIT
This PR was merged into the 1.14 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.14
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | n/a
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted against the 2.0 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
Bump `gedmo/doctrine-extensions` to 3.17.1 with fixed bug and remove conflict
Commits
-------
8dab39254a Resolve gedmo/doctrine-extension conflict
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.13
| License | MIT
Fix the failing readthedocs build according to this [blog post](https://about.readthedocs.com/blog/2024/07/addons-by-default/).
Commits
-------
c43beed158 [Docs] Fix readthedocs configuration files
