Commit graph

1559 commits

Author SHA1 Message Date
Grzegorz Sadowski
a90d41c9bf
Change application's version to v2.2.7-dev 2026-06-02 12:48:34 +02:00
Grzegorz Sadowski
1da96abc9c
Change application's version to v2.2.6 2026-06-02 12:47:08 +02:00
TheMilek
11373d8bf9
Change application's version to v2.2.6-dev 2026-04-10 10:59:14 +02:00
TheMilek
7ed1f4eda6
Change application's version to v2.2.5 2026-04-10 10:56:17 +02:00
TheMilek
668e6e84e2
Change application's version to v2.2.5-dev 2026-03-18 20:28:54 +01:00
TheMilek
2c53b603d7
Change application's version to v2.2.4 2026-03-18 20:25:24 +01:00
TheMilek
d74860c3d5
Change application's version to v2.2.4-dev 2026-03-09 14:18:00 +01:00
TheMilek
b6c367e447
Change application's version to v2.2.3 2026-03-09 14:09:49 +01:00
Kamil Grygierzec
a1cd184a61
[UPMERGE] 2.1 -> 2.2 (#18873)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.3/.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.2 -m "Resolve conflicts between 2.1 and 2.2"
```

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.
2026-02-26 08:39:42 +01:00
TheMilek
430cd0e286
Add conflict to api-platform/serializer 4.2.17 2026-02-25 15:18:01 +01:00
Grzegorz Sadowski
4d180fe195
Change application's version to v2.2.3-dev 2026-01-20 12:55:04 +01:00
Grzegorz Sadowski
443e263770
Change application's version to v2.2.2 2026-01-20 12:52:56 +01:00
Grzegorz Sadowski
3f8d0c1906
Change application's version to v2.1.12-dev 2026-01-20 12:51:00 +01:00
Grzegorz Sadowski
8cd3f79a25
Change application's version to v2.1.11 2026-01-20 12:49:05 +01:00
Kamil Grygierzec
d2dd2011fd
[UPMERGE] 2.1 -> 2.2 (#18695)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.1/.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.2 -m "Resolve conflicts between 2.1 and 2.2"
```

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 is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Chores**
* Removed an unused import and broadened PSR HTTP Message compatibility
in project manifests.
* **Tests**
  * Minor formatting adjustments in test files; no behavioral changes.

<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2026-01-13 12:59:39 +01:00
Rafikooo
c4303d3faf
Resolve conflicts between 1.14 and 2.1 2026-01-06 23:52:55 +01:00
Rafikooo
9998fa4140
[Deps] Allow psr/http-message ^2.0 2026-01-05 13:49:08 +01:00
Grzegorz Sadowski
2496e95495
Change application's version to v2.2.2-dev 2025-12-18 17:06:14 +01:00
Grzegorz Sadowski
47d39a04a6
Change application's version to v2.2.1 2025-12-18 17:04:14 +01:00
Grzegorz Sadowski
8a15fa8ba0
Change application's version to v2.1.11-dev 2025-12-18 17:02:06 +01:00
Grzegorz Sadowski
5c71f126a8
Change application's version to v2.1.10 2025-12-18 16:59:54 +01:00
Grzegorz Sadowski
ab1f18baea
Change application's version to v1.14.16-dev 2025-12-18 16:53:25 +01:00
Grzegorz Sadowski
52c2f5a194
Change application's version to v1.14.15 2025-12-18 16:52:07 +01:00
Grzegorz Sadowski
07db78a6ec
Change application's version to v2.2.1-DEV 2025-12-17 13:08:34 +01:00
Grzegorz Sadowski
4910f91043
Change application's version to v2.2.0 2025-12-17 12:57:22 +01:00
Grzegorz Sadowski
5493b5bc94
[Composer] Change Symfony require to ^7.4 2025-12-17 12:52:51 +01:00
Grzegorz Sadowski
a450fae150
[Composer] Change branch alias to 2.2-dev 2025-12-17 12:52:11 +01:00
Grzegorz Sadowski
1f902a43e6
[UPMERGE] 2.1 -> 2.2 (#18653)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.1/.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.2 -m "Resolve conflicts between 2.1 and 2.2"
```

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 is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

## Release Notes

* **New Features**
* Added anonymous telemetry feature to collect system and business
metrics for improved product insights.
* Introduced telemetry configuration options to enable/disable data
collection by category (technical, business, plugins).
* Added informational notices about telemetry collection upon console
termination.

* **Chores**
  * Version bumped to 2.1.10.
  * Database indexes optimized for telemetry queries.

<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2025-12-17 07:39:10 +01:00
Grzegorz Sadowski
41221ab7c1
Change application's version to v2.1.10-dev 2025-12-16 16:53:16 +01:00
Grzegorz Sadowski
27b3057e17
Change application's version to v2.1.9 2025-12-16 16:51:04 +01:00
Grzegorz Sadowski
178e5e8f3e
Change application's version to v1.14.15-dev 2025-12-16 16:41:52 +01:00
Grzegorz Sadowski
21ba431ea9
Change application's version to v1.14.14 2025-12-16 15:19:37 +01:00
Grzegorz Sadowski
23cb4fab2f
[Composer] Remove unused dev dependencies 2025-12-16 14:51:10 +01:00
Grzegorz Sadowski
ec4514cb79
[Composer] Bump dependencies 2025-12-16 14:51:10 +01:00
Rafikooo
03be312e6a
[DX] Bump Symfony to ^6.4 || ^7.4 2025-12-08 13:29:41 +01:00
Rafikooo
ebda67c620
Resolve conflicts between 2.1 and 2.2 2025-11-28 18:09:31 +01:00
Grzegorz Sadowski
68a12b0ae7
Change application's version to v2.1.9-dev 2025-11-27 13:14:06 +01:00
Grzegorz Sadowski
7c7a599d8c
Change application's version to v2.1.8 2025-11-27 13:10:15 +01:00
Grzegorz Sadowski
14d25f6256
Change application's version to v1.14.14-dev 2025-11-27 13:03:48 +01:00
Grzegorz Sadowski
30d464ab06
Change application's version to v1.14.13 2025-11-27 13:02:10 +01:00
Michal Kaczmarek
97fdc9f544 Add md file with description ignored CVE and fix format 2025-11-17 13:05:07 +01:00
Michal Kaczmarek
5ecf8c421f Add filtering cve 2025-11-14 14:13:55 +01:00
Rafał Jaskulski
b112d9feea
[UPMERGE] 2.1 -> 2.2 (#18486)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.1/.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.2 -m "Resolve conflicts between 2.1 and 2.2"
```

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.
2025-10-30 10:19:20 +01:00
Rafikooo
fd01a0d1a4
Resolve conflicts between 1.14 and 2.1 2025-10-29 10:33:46 +01:00
Rafikooo
1bfa928797
Add conflict for broken Doctrine ORM versions 2025-10-29 08:58:38 +01:00
Grzegorz Sadowski
4f79c4ab3a
Merge branch '2.1' into 2.2
* 2.1:
  Change application's version to v2.1.8-dev
  Generate changelog for v2.1.7
  Change application's version to v2.1.7
2025-10-22 14:35:04 +02:00
Grzegorz Sadowski
b8c9e5be0a
Change application's version to v2.1.8-dev 2025-10-22 14:34:34 +02:00
Grzegorz Sadowski
66c4930cb7
Change application's version to v2.1.7 2025-10-22 14:31:32 +02:00
Grzegorz Sadowski
076fe107eb
Change application's version to v1.14.13-dev 2025-10-22 14:28:02 +02:00
Grzegorz Sadowski
4bbcee52cb
Change application's version to v1.14.12 2025-10-22 14:27:06 +02:00