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.13 -m "Resolve conflicts between 1.12 and 1.13"
```
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
change the commit title to
```
Resolve conflicts between 1.12 and 1.13
```
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
git merge upstream/1.13 --no-commit
```
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
change the commit title to
```
Resolve conflicts between 1.12 and 1.13
```
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
git merge upstream/1.13 --no-commit
```
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
change the commit title to
```
Resolve conflicts between 1.12 and 1.13
```
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
git merge upstream/1.13 --no-commit
```
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
change the commit title to
```
Resolve conflicts between 1.12 and 1.13
```
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A
| --------------- | -----
| Branch? | 1.11
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| License | MIT
Following this PR: #13708
Commits
-------
[Locale] Change language negotiation from simple string comparison to RFC 4647 based
[Locale] Add some more tests for header languange negotiation
[Unit] Fix JsonApiTestCase constructor arguments
[Behat][API] Allow setting no accept-language in header
* 1.12:
Move note about PasswordHasherAwareInterface to the newest patch in the UPGRADE file
doc: adds note on the PasswordHasherAwareInterface in User class
fix(user): make compatible sf6 sylius user to use encoder_name on login
[API] Improve normalizing value of select attribute
Add if_array check in ProductAttributeValueNormalizer.php
[Documentation] Minor improvement for note about tax calculators
Update catalog_promotions.rst
Update bootstrap-theme.rst
Update bootstrap-theme.rst
Update taxation.rst
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 |
| Related tickets | fixes #X, partially #Y, mentioned in #Z |
| 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
-------
c724593223 Update taxation.rst
568d8422bb [Documentation] Minor improvement for note about tax calculators
This PR was merged into the 1.12 branch.
Discussion
----------
I was trying to install the BootstrapTheme, but it wasn't working because the `legacy_mode` part was not documented. Hope it's helpful :)
Commits
-------
24148df10a Update bootstrap-theme.rst
6ba56f8bce Update bootstrap-theme.rst
This PR was merged into the 1.13 branch.
Discussion
----------
Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- 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
-->
We need to sort out the deprecations as only one way is currently supported
Commits
-------
[Maintenance] Change trigger_error to trigger_deprecation in component classes
[Maintenance] Change trigger_error to trigger_deprecation in bundle classes
[Maintenance] Change trigger_error to trigger_deprecation in rest of the classes
[Docs] Update Deprecations section
[Maintenance] Remove testing occurance of deprecations in spec classes
[Maintenance] Remove redundant Sylius version information in deprecation messages
[Maintenance] Unify deprecation descriptions
Maintenance] Remove usage of sprinf in trigger_deprecation calls
* 1.12:
Change application's version to v1.12.12-dev
Generate changelog for v1.12.11
Change application's version to v1.12.11
[CS][DX] Refactor
Update cart-promotions.rst
fix prefix url on order api path
fix prefix url on locale api path
Update docs/book/orders/cart-promotions.rst
Update default Rules of cart promotion
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 or 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | fixes #X, partially #Y, mentioned in #Z |
| 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
-------
Update default Rules of cart promotion
Update docs/book/orders/cart-promotions.rst
Update cart-promotions.rst
This PR was merged into the 1.13 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
-------
doc plugin naming - new plugin structure
