* 2.0:
Change application's version to v1.13.0-DEV
Generate changelog for v1.13.0-RC.1
Change application's version to v1.13.0-RC.1
[Documentation] Update release dates for 1.13 and 2.0 versions
[ECS] Fix nullable type declarations in the codebase
[ECS] Fix nullable type declarations in Behat namespace
[ECS] Add the NullableTypeDeclarationForDefaultNullValueFixer rule
Add default label template in ShopBundle extending the UiBundle one
Use extends instead of include in ShopBundle flashes template
Manage confirmation modal for ShopBundle extending UiBundle
Use Shop pagination macro in templates
Use Shop messages macro in templates
Use Shop flags macro in templates
Use Shop headers macro in templates
Use Shop buttons macro in templates
[Documentation] Remove duplicated callback from state machine
Update docs/book/architecture/state_machine.rst
Add upmerging from 2.0 to api-platform-3
Update php-entrypoint to give www-data permissions to public/media
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 |
| 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.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
Commits
-------
[Documentation] Update release dates for 1.13 and 2.0 versions
* 1.13:
[ECS] Fix nullable type declarations in the codebase
[ECS] Fix nullable type declarations in Behat namespace
[ECS] Add the NullableTypeDeclarationForDefaultNullValueFixer rule
Add default label template in ShopBundle extending the UiBundle one
Use extends instead of include in ShopBundle flashes template
Manage confirmation modal for ShopBundle extending UiBundle
Use Shop pagination macro in templates
Use Shop messages macro in templates
Use Shop flags macro in templates
Use Shop headers macro in templates
Use Shop buttons macro in templates
Add upmerging from 2.0 to api-platform-3
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | yes (DX) |
| BC breaks? | no |
| Related tickets |https://github.com/Sylius/Sylius/pull/15850#discussion_r1495941473
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
Another ambiguity ruled out 🕺
Commits
-------
87064b1cd4 [ECS] Add the NullableTypeDeclarationForDefaultNullValueFixer rule
4662a69cee [ECS] Fix nullable type declarations in Behat namespace
9b84a84939 [ECS] Fix nullable type declarations in the codebase
| 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 |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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 was merged into the 1.13 branch.
Discussion
----------
- Use Shop buttons macro in templates
- Use Shop headers macro in templates
- Use Shop flags macro in templates
- Use Shop messages macro in templates
- Use Shop pagination macro in templates
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | yes |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | |
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
Commits
-------
3e4ff1037a Use Shop buttons macro in templates
59f4f76fec Use Shop headers macro in templates
d72e1ebc93 Use Shop flags macro in templates
84d356f8d5 Use Shop messages macro in templates
45a780660b Use Shop pagination macro in templates
5611968986 Manage confirmation modal for ShopBundle extending UiBundle
4350b6a38c Use extends instead of include in ShopBundle flashes template
90b0844912 Add default label template in ShopBundle extending the UiBundle one
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 <!-- 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 | |
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
Update docs/book/architecture/state_machine.rst
Commits
-------
1c530ff698 Update docs/book/architecture/state_machine.rst
7980a4723c [Documentation] Remove duplicated callback from state machine
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/2.0 -m "Resolve conflicts between 1.13 and 2.0"
```
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.
This PR was merged into the bootstrap-admin-panel branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | boostrap-admin-panle <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no <!-- don't forget to update the UPGRADE-*.md file --> |
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
continuation of https://github.com/Sylius/Sylius/pull/16110
Commits
-------
Fix product variant index page breadcrumbs
fix ChannelPricingLogEntry breadrcumbs
This PR was merged into the bootstrap-admin-panel branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | bootstrap-admin-panel
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | N/A
| License | MIT
Based on #16110
Commits
-------
[Admin][ProductVariant] Add MovePositionsController
[Behat][Admin][ProductVariant] Enable moving position tests
[Behat][Admin][ProductVariant] Rename behat step
[Admin][ProductVariant] Rename MovePositionsController to SavePositionsController
