This PR was merged into the 1.13 branch.
Discussion
----------
fix typo
| Q | A
|-----------------|-----
| Branch? | 1.12, 1.13, 1.14 or 2.0 <!-- see the comment below -->
| Bug fix? | no/yes
| New feature? | no/yes
| BC breaks? | no/yes
| Deprecations? | no/yes <!-- don't forget to update the UPGRADE-*.md file -->
| Related tickets | fixes #X, partially #Y, mentioned in #Z
| 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
-->
Commits
-------
cfcbd05dec Update repository.rst
This PR was merged into the 1.13 branch.
Discussion
----------
fix typo
| Q | A
|-----------------|-----
| Branch? | 1.12, 1.13, 1.14 or 2.0 <!-- see the comment below -->
| Bug fix? | no/yes
| New feature? | no/yes
| BC breaks? | no/yes
| Deprecations? | no/yes <!-- don't forget to update the UPGRADE-*.md file -->
| Related tickets | fixes #X, partially #Y, mentioned in #Z
| 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
-->
Commits
-------
74a900caa8 Update model.rst
* 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.12 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.12
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Related tickets |
| License | MIT
Since the introduction of the Sylius Plus modular approach, we haven't updated the installation instructions on the official documentation.
Commits
-------
b7abd9ccc4 Sylius Plus modular installation and upgrading
* 1.12:
[Behat] Minor scenarios improvements
Fixes after CR
Test adding similar products
Test adding new simple product
Test adding new taxon
[Behat] Minor scenarios improvements after code review
[Checkout] Add scenario for preventing from a potential XSS attack
[AddressBook] Add scenario for preventing from a potential XSS attack
Use function from UIBundle
Add sanitizer function to UIBundle
Add js sanitizeInput function
Fix product-auto-complete
Use function from UIBundle
Fix potential xss in admin panel
[Maintenance] Remove unnecessary line
[Maintenance] Update docker docs
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
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/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 was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| License | MIT |
Commits
-------
[Docs] Improve visibility of Sylius Plus
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
```
