Commit graph

1217 commits

Author SHA1 Message Date
Grzegorz Sadowski
8dfedae34c
Merge branch '1.13' into 1.14
* 1.13:
  Fix note
  Fix rebase
  Add CONFLICTS.md note
  Add gedmo/doctrine-extensions conflict
2024-10-07 08:21:13 +02:00
Michał Pysiak
913e35e76d
Fix rebase 2024-10-07 07:02:44 +02:00
Michał Pysiak
57a3f9ba2e
Add gedmo/doctrine-extensions conflict 2024-10-07 06:58:37 +02:00
Grzegorz Sadowski
049445e3e5
Change application's version to v1.14.0-DEV 2024-09-24 13:18:24 +02:00
Grzegorz Sadowski
46ebd02cee
Change application's version to v1.14.0-ALPHA.1 2024-09-24 13:14:08 +02:00
Grzegorz Sadowski
aa50b60421
Change application's version to v1.13.7-dev 2024-09-24 13:03:21 +02:00
Grzegorz Sadowski
fa29546f7e
Change application's version to v1.13.6 2024-09-24 13:02:09 +02:00
Jan Goralski
0718d5babd
[Maintenance] Bumped Sylius resource packages to ^1.11 2024-09-04 09:08:58 +02:00
Grzegorz Sadowski
739876071b
Change application's version to v1.13.6-dev 2024-08-22 12:45:04 +02:00
Grzegorz Sadowski
d86206d97e
Change application's version to v1.13.5 2024-08-22 12:43:16 +02:00
Grzegorz Sadowski
0f23e4aeaa
Change application's version to v1.13.5-dev 2024-07-17 10:14:41 +02:00
Grzegorz Sadowski
d7e41382a3
Change application's version to v1.13.4 2024-07-17 10:13:05 +02:00
Grzegorz Sadowski
19dacea52c
Change application's version to v1.13.4-dev 2024-07-02 10:31:36 +02:00
Grzegorz Sadowski
33c1cf8da3
Change application's version to v1.13.3 2024-07-02 10:30:28 +02:00
Grzegorz Sadowski
68e43c60d9
Change application's version to v1.13.3-dev 2024-06-07 13:11:50 +02:00
Grzegorz Sadowski
8dd388ce24
Change application's version to v1.13.2 2024-06-07 13:10:54 +02:00
Grzegorz Sadowski
a3b89100ac
Merge branch '1.13' into 1.14
* 1.13:
  Add the "sylius/state-machine-abstraction" package to the replace section in the root composer.json
2024-05-13 07:49:02 +02:00
Jacob Tobiasz
58d4cfea69
Add the "sylius/state-machine-abstraction" package to the replace section in the root composer.json 2024-05-10 15:52:53 +02:00
Grzegorz Sadowski
a80837e99e
[Maintenance] Adjust Sylius version on 1.14 branch 2024-05-10 12:07:38 +02:00
Grzegorz Sadowski
b260046abb
Merge branch '1.13' into 1.14
* 1.13:
  Change application's version to v1.13.2-dev
  Generate changelog for v1.13.1
  Change application's version to v1.13.1
2024-05-10 10:49:03 +02:00
Grzegorz Sadowski
4244cfc671
Change application's version to v1.13.2-dev 2024-05-10 10:47:39 +02:00
Grzegorz Sadowski
22bc3d9e31
Change application's version to v1.13.1 2024-05-10 10:45:56 +02:00
Grzegorz Sadowski
6154b8cff2
Merge branch '1.13' into 1.14
* 1.13:
  [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
  Add wider support for deprecation contract
  [Maintenance] Remove unnecessary line
  [Maintenance] Update docker docs
2024-05-10 10:28:35 +02:00
Jibé Barth
ac1d727985
Add wider support for deprecation contract 2024-05-08 10:42:29 +02:00
dependabot[bot]
f924276c07
Update phpstan/phpstan-doctrine requirement from 1.3.43 to 1.3.69
Updates the requirements on [phpstan/phpstan-doctrine](https://github.com/phpstan/phpstan-doctrine) to permit the latest version.
- [Release notes](https://github.com/phpstan/phpstan-doctrine/releases)
- [Commits](https://github.com/phpstan/phpstan-doctrine/compare/1.3.43...1.3.69)

---
updated-dependencies:
- dependency-name: phpstan/phpstan-doctrine
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-26 13:14:29 +00:00
Grzegorz Sadowski
fb80a1337c
Change application's version to v1.13.1-dev 2024-04-23 12:52:01 +02:00
Grzegorz Sadowski
d1edb432c7
Change application's version to v1.13.0 2024-04-23 12:46:00 +02:00
Grzegorz Sadowski
e97863ba1d
Merge branch '1.12' into 1.13
* 1.12:
  Revert conflict to twig/intl-extra
2024-04-19 07:33:43 +02:00
Grzegorz Sadowski
5eacd99ca2
Revert conflict to twig/intl-extra 2024-04-17 15:44:09 +02:00
Grzegorz Sadowski
6c535a98af
Merge branch '1.12' into 1.13
* 1.12:
  Add conflicts
  Add twig/intl-extra conflict
  Add conflicts in bundles
  Add twig 3.9.0 conflict
2024-04-17 10:26:07 +02:00
Michał Pysiak
0c6f855817
Add twig/intl-extra conflict 2024-04-17 08:36:15 +02:00
Michał Pysiak
8d4dd01be0
Add twig 3.9.0 conflict 2024-04-17 07:45:57 +02:00
Grzegorz Sadowski
01381f326b
Change application's version to v1.13.0-DEV 2024-04-16 13:32:26 +02:00
Grzegorz Sadowski
58732baeb2
Change application's version to v1.13.0-RC.1 2024-04-16 13:26:10 +02:00
Grzegorz Sadowski
f4b8d4df8b
Change application's version to v1.13.0-DEV 2024-04-02 13:12:32 +02:00
Grzegorz Sadowski
af0e408993
Change application's version to v1.13.0-BETA.1 2024-04-02 12:54:54 +02:00
Grzegorz Sadowski
6e89ee1763
Change application's version to v1.12.15-dev 2024-03-25 12:25:54 +01:00
Grzegorz Sadowski
a6c7a8fd3c
Change application's version to v1.12.14 2024-03-25 12:25:21 +01:00
Jacob Tobiasz
3780629ab8
Remove the scienta/doctrine-json-functions dependency 2024-03-19 11:12:05 +01:00
Jacob Tobiasz
ede149de90
Fix finding json by choice in the Postgres 2024-03-19 11:12:05 +01:00
Jacob Tobiasz
e06115dd3e
Resolve conflicts between 1.12 and 1.13 2024-03-18 10:43:41 +01:00
Wojdylak
a93b5c5972
[Maintenance] Add conflict to api-platform/core 2.7.17 2024-03-18 09:53:36 +01:00
Grzegorz Sadowski
a9b191cabd
Change application's version to v1.13.0-DEV 2024-03-11 11:36:08 +01:00
Grzegorz Sadowski
a3717cb55f
Change application's version to v1.13.0-ALPHA.2 2024-03-11 11:26:49 +01:00
Jacob Tobiasz
b09315dd2c
Add "symfony/cache-contracts": "^2.5 || ^3.0" as a dependency 2024-02-29 15:34:38 +01:00
Grzegorz Sadowski
36fb484864
Remove unnecessary Symfony conflicts 2024-02-09 12:44:02 +01:00
Grzegorz Sadowski
cf34842a84
Bump up dev Symfony requirement to 6.4 2024-02-09 12:43:58 +01:00
Grzegorz Sadowski
1c5a1af285
Bump up Symfony 6 to 6.4 2024-02-09 12:43:58 +01:00
Grzegorz Sadowski
d29ec36041
Bump up PHP to 8.1 2024-02-09 10:32:40 +01:00
Grzegorz Sadowski
5c02786199
Merge branch '1.12' into 1.13
* 1.12:
  Bump up symfony/flex version
2024-02-09 08:57:30 +01:00