Grzegorz Sadowski
87de9289f0
[Composer] Remove conflict to doctrine/orm
2024-10-08 10:33:15 +02:00
Michał Pysiak
8288159df8
Fix note
2024-10-07 07:07:11 +02:00
Michał Pysiak
5f3f7ad4fb
Add CONFLICTS.md note
2024-10-07 06:59:04 +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
a5afa245a3
Add conflicts
2024-04-17 09:47:46 +02: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
36fb484864
Remove unnecessary Symfony conflicts
2024-02-09 12:44:02 +01:00
Jacob Tobiasz
7ece6725ef
Remove Psalm
2023-12-04 11:10:34 +01:00
Grzegorz Sadowski
336682edb5
Merge branch '1.12' into 1.13
...
* 1.12:
Add ignore parse errors to composer require checker
2023-11-15 06:50:42 +01:00
Wojdylak
303b43063d
Add ignore parse errors to composer require checker
2023-11-14 16:09:33 +01:00
Grzegorz Sadowski
88c508e4cd
Merge branch '1.12' into 1.13
...
* 1.12:
Add a conflict for "doctrine/doctrine-bundle": "2.11.0"
Disable check for security vulnerabilites step
2023-11-14 13:36:33 +01:00
Wojdylak
5a1f03c171
Add a conflict for "doctrine/doctrine-bundle": "2.11.0"
2023-11-14 11:09:13 +01:00
Grzegorz Sadowski
6eb12e9e75
Merge branch '1.12' into 1.13
...
* 1.12:
Remove the conflict for doctrine/orm 2.15.*
2023-08-11 13:20:56 +02:00
Jacob Tobiasz
f01bf57303
Remove the conflict for doctrine/orm 2.15.*
2023-08-11 12:12:01 +02:00
Jacob Tobiasz
6b650ade4d
Resolve conflicts between 1.12 and 1.13
2023-08-02 11:07:39 +02:00
Jacob Tobiasz
1d6208074d
Add a conflict for doctrine/orm 2.15.2 and higher
2023-08-02 07:53:31 +02:00
Grzegorz Sadowski
b19481b2cb
Merge branch '1.12' into 1.13
...
* 1.12:
Add a conflict for doctrine/orm:2.15.4
[CS][DX] Refactor
2023-07-28 11:24:45 +02:00
Grzegorz Sadowski
549bf8b866
Add a conflict for doctrine/orm:2.15.4
2023-07-28 09:00:03 +02:00
Jakub Tobiasz
39340f9001
Resolve conflicts between 1.12 and 1.13
2023-07-11 13:58:44 +02:00
Jakub Tobiasz
210754fe1a
Add a conflict for "stof/doctrine-extensions-bundle": "1.8.0"
2023-07-10 16:28:11 +02:00
Jakub Tobiasz
7b04f77408
Merge changes from 1.12
2023-06-28 07:12:42 +02:00
TheMilek
21bca41a1c
Update conflicts file
2023-06-27 12:15:25 +02:00
Grzegorz Sadowski
70107318d0
Merge branch '1.12' into 1.13
...
* 1.12:
Add a conflict for doctrine/orm:2.15.3
Ignore ApiPlatform\Core\Api\IriConverterInterface DeprecatedInterface Psalm error
Ignore ApiPlatform\Core\Api\IriConverterInterface DeprecatedClass Psalm error
Fix misleading signing in the admin panel feature description
Update PHPStan baseline file
[PHPStan] Upgrade to level 6 (#14019 )
[Maintenance] Update the copyright block
[Docs] Update Vision role
[Fixture] Improve LazyOption performance
[CS][DX] Refactor
2023-06-23 08:11:04 +02:00
Jakub Tobiasz
c6eab12107
Add a conflict for doctrine/orm:2.15.3
2023-06-23 07:03:40 +02:00
Jakub Tobiasz
2bff13ddc4
Add a conflict for doctrine/orm:2.15.2
2023-06-03 09:48:04 +02:00
Jakub Tobiasz
b812ff2ff1
Add a conflict for doctrine/orm:2.15.2
2023-06-03 08:24:59 +02:00
Jakub Tobiasz
51188508a4
Drop support for DBAL 2.7
2023-04-26 13:24:37 +02:00
Jakub Tobiasz
d7f2080625
Clean up conflicts for sylius/sylius
2023-04-21 10:39:38 +02:00
Grzegorz Sadowski
96401164d4
Merge branch '1.12' into 1.13
...
* 1.12:
Revert "Add conflict for doctrine/orm:2.14.2"
2023-04-14 15:14:11 +02:00
Jakub Tobiasz
057960f4ac
Revert "Add conflict for doctrine/orm:2.14.2"
...
This reverts commit de58169f58
2023-04-14 14:03:54 +02:00
Grzegorz Sadowski
b6c348ffa1
Merge branch '1.12' into 1.13
...
* 1.12:
Do not hardcode checking cart state in processors
Determine Order being processable on itself
Add conflict for doctrine/orm:2.14.2
[CS][DX] Refactor
[Tasks] Improve Robo task
[Product][Association] Fix attaching association with numeric code
2023-04-14 09:18:08 +02:00
Jakub Tobiasz
de58169f58
Add conflict for doctrine/orm:2.14.2
2023-04-13 08:31:27 +02:00
Grzegorz Sadowski
873226538c
Merge branch '1.12' into 1.13
...
* 1.12:
[Conflict] Add conflict with symfony/framework-bundle:6.2.8
2023-04-03 06:44:15 +02:00
Rafikooo
3805e7eb75
[Conflict] Add conflict with symfony/framework-bundle:6.2.8
2023-03-31 16:44:33 +02:00
Grzegorz Sadowski
a7ed10c01f
[Dependencies] Bump up API Platform to 2.7.10
2023-03-10 12:19:05 +01:00
Jakub Tobiasz
7cbf19a2f4
Fix CI
2023-02-09 16:59:18 +01:00
Rafikooo
c765d68271
Merge branch '1.11' into 1.12
...
* 1.11:
Add a conflict for doctrine/migrations:3.5.3
2023-01-11 15:58:17 +01:00
Jakub Tobiasz
fbb2227b1d
Add a conflict for doctrine/migrations:3.5.3
2023-01-11 14:56:03 +01:00
Jakub Tobiasz
92f8ea3f2d
Precise symfony/framework-bundle and dependency-injection conflict versions
2022-11-18 16:22:42 +01:00
Rafikooo
38db9df646
[Maintenance] Outdated Symfony 6 conflicts removed
2022-11-02 00:19:08 +01:00
Łukasz Chruściel
efcf21713c
[Maintenance] Removal of direct unneeded dependency on proxy manager LTS #14318
2022-10-31 20:29:23 +01:00
Grzegorz Sadowski
e2b2a1748d
Merge branch '1.11' into 1.12
...
* 1.11:
[Maintenance] Allow APIP 2.7.2
2022-10-26 08:26:33 +02:00
Jan Goralski
55ee86e038
[Maintenance] Allow APIP 2.7.2
2022-10-25 08:33:22 +02:00
Grzegorz Sadowski
d054f18586
[Hot-fix] Conflict with the SymfonyMockerContainer 1.0.6 due to incompatible version with Symfony 4.x
2022-10-14 13:46:12 +02:00
Grzegorz Sadowski
dbc9c04618
[Hot-fix] Conflict with the newest AP that changes a Customer->User response
2022-10-13 13:39:51 +02:00
Rafikooo
b8e3bc6826
[Maintenance] Removed conflicts in the composer related to unsupported versions of Symfony
2022-10-10 12:31:02 +02:00
Mateusz Zalewski
02f9862c06
[Hot-fix] Conflict with newest AP that changes a Customer->User response
2022-10-07 15:27:33 +02:00
