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
TheMilek
28ff41d514
Resolve conflicts between 2.0 and 2.1
2025-08-21 14:48:31 +02:00
TheMilek
1cc094f609
Add conflict to symfony-ux ^2.29
2025-08-19 15:20:48 +02:00
Grzegorz Sadowski
86dcac7869
Resolve conflicts between 2.0 and 2.1
2025-07-31 10:00:57 +02:00
Grzegorz Sadowski
7c21f6aa18
[Composer] Limit conflict with symfony/ux
2025-07-30 15:30:27 +02:00
Grzegorz Sadowski
005c598dcf
[Composer] Temporarily add conflict with symfony/ux
2025-07-29 12:11:59 +02:00
Grzegorz Sadowski
d0e5982534
Adjust CONFLICTS files after upmerge from 1.14
2025-07-03 07:27:04 +02:00
Grzegorz Sadowski
7d4942ea39
Resolve conflicts between 1.14 and 2.0
2025-07-02 14:24:03 +02:00
Grzegorz Sadowski
bc79567469
[ApiBundle][Composer] Conflict with symfony/serializer:^6.4.23 because of a fatal error in APIP 2.7
2025-06-30 12:30:01 +02:00
Grzegorz Sadowski
4af685f309
[Composer] Conflict with symfony/serializer:^6.4.23 because of a fatal error in APIP 2.7
2025-06-30 12:19:38 +02:00
Grzegorz Sadowski
756f140e06
[Composer] Bump APIP to 4.1 and remove conflict to api-platform/json-ld
2025-05-23 08:56:09 +02:00
Grzegorz Sadowski
cc72354f51
[Composer] Remove conflict with behat/gherkin after bumping behat and phparkitect
2025-05-20 14:28:27 +02:00
Grzegorz Sadowski
3dd2f6d496
Resolve conflicts between 1.14 and 2.0
2025-05-07 08:46:24 +02:00
Grzegorz Sadowski
a6c2f94ade
[Composer] Add conflict to behat/gherkin
2025-05-07 06:46:27 +02:00
Michał Pysiak
a12507db4c
Add CONFLICT.md file
2025-03-25 06:40:03 +01:00
Grzegorz Sadowski
59df63caa5
[Composer] Update main composer
2024-10-21 14:29:50 +02:00
Grzegorz Sadowski
f1118eae44
Merge branch '1.13' into 1.14
...
* 1.13:
[CI] Remove currently unneeded custom build
[API] Add default sorting order for customers admin GET endpoint
Change fixtures - add createdAt different time for customers
[Review] Change ReviewChangeListener doctrine event from postRemove to preRemove
[Composer] Remove conflict to doctrine/orm
2024-10-09 06:52:00 +02:00
Grzegorz Sadowski
43dfc6b3cc
Merge branch '1.14' into 2.0
...
* 1.14:
Resolve gedmo/doctrine-extension conflict
2024-10-08 13:47:35 +02:00
Grzegorz Sadowski
87de9289f0
[Composer] Remove conflict to doctrine/orm
2024-10-08 10:33:15 +02:00
Michał Pysiak
8dab39254a
Resolve gedmo/doctrine-extension conflict
2024-10-08 08:06:05 +02:00
Grzegorz Sadowski
f8e5b83e61
Merge branch '1.14' into 2.0
...
* 1.14:
Fix note
Fix rebase
Add CONFLICTS.md note
Add gedmo/doctrine-extensions conflict
Update upgrade file
[MoneyBundle] Unification of service names
Update upgrade file
[LocaleBundle] Unification of service names
[InventoryBundle] Unification of service names
Mirror improvements
Update upgrade file
[CurrencyBundle] Unification of service names
2024-10-07 08:32:08 +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
2e61eac40a
[Composer] Try to remove conflict to doctrine/orm
2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
f6f3a3f679
Remove note about twig/twig from CONFLICTS.md file
2024-09-11 11:12:36 +02:00
Grzegorz Sadowski
968a1c0afb
Merge branch '2.0' into api-platform-3
...
* 2.0:
Add empty array check
Revert conflict to twig/intl-extra
2024-04-19 07:37:08 +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
a2a5bd9c33
Merge branch '2.0' into api-platform-3
...
* 2.0:
Add conflicts
Add twig/intl-extra conflict
Add conflicts in bundles
Add twig 3.9.0 conflict
2024-04-17 10:31:48 +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
Grzegorz Sadowski
c964849bce
[ApiBundle] Remove conflict to lexik/jwt-authentication-bundle
2024-04-05 09:11:32 +02:00
Grzegorz Sadowski
d13ebb94d8
Merge branch '2.0' into api-platform-3
...
* 2.0: (776 commits)
Add missing validation for the customers first and last name
[CS][DX] Refactor
Bring back all Sylius' state machines to Winzou
Add overriding the Resource's state machine with the one from the Sylius abstraction
Add missing locales to contract test
[Taxon][Behat] validate translations with unexisting locales
[ShippingMethod][Behat] validate translations with unexisting locales
[Promotion][Behat] validate translations with unexisting locales
[Product][Behat] validate translations with unexisting locales
[PaymentMethod][Behat] validate translations with unexisting locales
Validate all translatable objects for unexisiting locales
Validate customer's password reset
Validate customer creation and edit
Make the validation trait more generic
[Api] Change namespace of TaxonImagesTest class
[Api] Remove _response suffix
[Behat] Minor improvments of viewing_taxon_image scenario
[Api][ProductImage] Add https prefix check
[Api][Admin] Allow using float for ratio in exchange rate
SYL-3329 Fix behat test for SyliusPayPalPlugin
...
2024-03-29 14:49:47 +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
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
6d3290f613
Merge branch '2.0' into api-platform-3
...
* 2.0:
Add ignore parse errors to composer require checker
Update README.md
2023-11-15 06:51:01 +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
398a14b12f
Merge branch '2.0' into api-platform-3
...
* 2.0: (69 commits)
Add a conflict for "doctrine/doctrine-bundle": "2.11.0"
Disable check for security vulnerabilites step
[CS][DX] Refactor
[API] Adjust contract tests after changes with translations
[API] Disallow removing the translation in default locale
[API] Improve contract test of creating a product with invalid translation locale
[Maintenance] Fix other possibly invalid route attribute getting
[Maintenance] Fix AdminFilterSubscriber failing when no _route attribute present
[ApiBundle] Fix ProductAssociationTypesTest
[ApiBundle] Remove unnecessary method in TranslatableLocaleKeyDenormalizer
[ApiBundle] Translation key as locale
[ApiBundle] Fix type-hint
[PromotionBundle] Remove unnecessary constraint
[AttributeBundle] Standardize locale validation translations
Standardize locale validation translations
[ApiBundle] Improve readability
[ApiBundle] Add contract test to check validation of locale
[TaxonomyBundle] Add validation on locale of translation
[ShippingBundle] Add validation on locale of translation
[PromotionBundle] Add validation on locale of translation
...
2023-11-14 13:44:48 +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
9d5a1b3604
[API] Bump APIP to 3.1 and configure admin authentication
2023-09-28 15:10:20 +02: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
