| Q | A
|-----------------|-----
| Branch? | api-platform-3
| 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
-->
* 2.0:
[CS][DX] Refactor
[CS][DX] Refactor
[CS][DX] Refactor
[CI] Update Sylius branches in refactor workflow
[Behat] Switch another random JS failed scenarios to Chromedriver
[Behat] Switch another random JS failed scenarios to Chromedriver
[Behat] Switch random JS failed scenarios to Chromedriver
[CS][DX] Refactor
* 1.14:
Minor CS fix in workflow
[Resource] Add validation for translatable interface with new namespace
Apply suggestions from code review
Both resource and grid unstable versions
Try SyliusGridBundle 1.13
[Core] Move validation of translation classes to Core
* 1.13:
Minor CS fix in workflow
[Resource] Add validation for translatable interface with new namespace
Apply suggestions from code review
Both resource and grid unstable versions
Try SyliusGridBundle 1.13
[Core] Move validation of translation classes to Core
* 2.0: (64 commits)
[Admin] Rename parameter
[Admin] Change command handlers and console command ids to dotted notation
[Core] Change command handlers and console command ids to dotted notation
[Core] Use new services
[Core] Rename Message to Command
[Admin] Rename Message to Command
[Promotion] Remove deprecated commands
[Ui] Remove deprecated commands
[User] Remove deprecated commands
[Admin] Configure and use anonymous view in store component
[Admin] Add missing order notes information
[Behat] Use test attribute to retrieve order notes
[Admin] Render pagination and enabled filter test attributes
[Behat] Enable scenarios and improve implementation for filtered pages redirections
[Admin] Render view in store button in the variant edit page
[CS][DX] Refactor
[Behat] Improve view product in store action
[Behat] Enable viewing product in store from variant edit page scenarios
[Behat] Enable deleting multiple product variants scenario
[Behat] Enable remaining managing users scenario
...
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/1.14 -m "Resolve conflicts between 1.13 and 1.14"
```
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 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.14 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.
* 2.0: (48 commits)
Minor fixes after PR review
Fix products grid for mobile
[Admin][Taxon][Behat] Separate TreeElement from CreatePage
[Admin][Taxon] Split tree to more hooks
Fix phpstan
[Admin][Taxon] Enable behat tests
[Admin][Taxon] Remove old script
[Admin] Taxon index
Update PR template
[Documentation] Update Sylius 1.12 version on the release cycle page
Add upmerge from 2.0 to symfony-7 branch
Minor changes
Skip not working api scenarios
Enable tests
[Behat][Admin] Cover product attribute filtering
[ProductAttribute] Update ProductBundle repository config
[Admin][ProductAttribute] Upgrade index
[Admin] Rename RenderEntity to RenderEntityWithTemplate
Review fixes [Admin] Fix ux_autocomplete filters ignoring custom labels
[Admin][Shipment] Minor index improvements [Admin][Shipment] Change channel and method filters to autocompletes
...
* 1.14:
Minor fixes after PR review
Fix products grid for mobile
Update PR template
[Documentation] Update Sylius 1.12 version on the release cycle page
Add upmerge from 2.0 to symfony-7 branch
Fix ProductTaxons' positioning logic
* 1.13:
Minor fixes after PR review
Fix products grid for mobile
Update PR template
[Documentation] Update Sylius 1.12 version on the release cycle page
Fix ProductTaxons' positioning logic
* 1.12:
Minor fixes after PR review
Fix products grid for mobile
Update PR template
[Documentation] Update Sylius 1.12 version on the release cycle page
Fix ProductTaxons' positioning logic
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.13 <!-- see the comment below -->
| Bug fix? | yes
| 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 or 1.13 branches
- 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
-->
We've opened the 1.14 branch and merged the bootstrap-admin-panel feature branch into 2.0 branch, so some upmerge configuration update is required.
Commits
-------
505960b894 [CI] Update upmerge strategy
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/api-platform-3 -m "Resolve conflicts between 2.0 and api-platform-3"
```
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 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/bootstrap-admin-panel -m "Resolve conflicts between 2.0 and bootstrap-admin-panel"
```
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 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.14 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.
