Commit graph

1389 commits

Author SHA1 Message Date
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
4ef7dda046
Merge branch '2.0' into bootstrap-admin-panel
* 2.0:
  Add conflicts
  Add twig/intl-extra conflict
  Add conflicts in bundles
  Add twig 3.9.0 conflict
2024-04-17 10:29:59 +02:00
Grzegorz Sadowski
7ea0d7d253
Merge branch '1.13' into 2.0
* 1.13:
  Add conflicts
  Add twig/intl-extra conflict
  Add conflicts in bundles
  Add twig 3.9.0 conflict
2024-04-17 10:27:27 +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
Jacob Tobiasz
91fc06543d Bump the symfony ux packages minimal versions to 2.16 2024-04-10 12:10:16 +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
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
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
6a01f67f6c
Resolve conflicts between 2.0 and bootstrap-admin-panel 2024-03-22 15:35:24 +01:00
Rafikooo
dd4fcc4366
Resolve conflicts between 1.13 and 2.0 2024-03-21 15:12:59 +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
d762417c68
Add >=2.15 conflict for live components 2024-03-08 13:05:52 +01:00
Rafikooo
4ce30bf2b6
Resolve conflicts between 2.0 and bootstrap-admin-panel 2024-03-08 10:00:12 +01:00
Rafikooo
a2dd31d4db
Add symfony/cache-contracts dependency in ^2.5 version 2024-03-07 10:00:17 +01:00
Rafikooo
41aaa444e6
Resolve conflicts between 1.13 and 2.0 2024-03-07 09:29:25 +01:00
Jacob Tobiasz
b09315dd2c
Add "symfony/cache-contracts": "^2.5 || ^3.0" as a dependency 2024-02-29 15:34:38 +01:00
Rafikooo
5d22dd8b74
[Composer] Require symfonycasts/dynamic-forms 2024-02-28 12:13:25 +01:00
Jacob Tobiasz
ae5415b93c
Add a conflict for the Live Components 2.15.0 2024-02-25 14:33:05 +01:00
Jacob Tobiasz
f34799dfa3
Bump symfony/ux-autocomplete to ^2.15 2024-02-25 14:33:05 +01:00
Jacob Tobiasz
13d24369cb
Add a basic add an attribute mechanism 2024-02-25 14:33:04 +01:00
Jacob Tobiasz
83bb8a1b7d
Resolve conflicts between 2.0 and bootstrap-admin-panel 2024-02-25 13:19:22 +01:00
Grzegorz Sadowski
30f27d8714
Merge branch '1.13' into 2.0
* 1.13: (77 commits)
  Resolve comments
  Update upgrade file
  Fix serialization groups config formatting
  Move all the contract tests to parent catalog Responses and remove expected catalog
  [Shop][Taxon] unify contract tests catalog
  [Shop][Product] unify contract tests catalog
  [Shop][ShippingMethods] unify contract tests catalog
  [Shop][Channel] unify contract tests catalog
  [Shop][Order] unify contract tests catalog
  [Shop][Country] unify contract tests catalog
  [Shop][ExchangeRate] unify contract tests catalog
  [Shop][Locale] unify contract tests catalog
  [Shop][Payment] unify contract tests catalog
  [Admin][ShopBillingData] unify contract tests catalog
  [Admin][Payment] unify contract tests catalog
  [Admin][Locale] unify contract tests catalog
  [Admin][Order] unify contract tests catalog
  [Admin][PriceHistory] unify contract tests catalog
  [Admin][AdminUser] unify contact tests catalog
  Update upgrade api file
  ...
2024-02-16 11:41:12 +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
a9f88ff77b
Merge branch '1.13' into 2.0
* 1.13:
  Bump up symfony/flex version
2024-02-09 08:59:49 +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
Grzegorz Sadowski
4281187414
Bump up symfony/flex version 2024-02-09 07:19:43 +01:00
Jacob Tobiasz
4906081bd9
Install the sylius/twig-hooks package 2024-02-08 16:49:53 +01:00
Grzegorz Sadowski
07ce60fe72
Change application's version to v1.13.0-DEV 2024-02-05 13:07:55 +01:00
Grzegorz Sadowski
2ba8a036a6
Change application's version to v1.13.0-ALPHA.1 2024-02-05 12:55:46 +01:00
Grzegorz Sadowski
1ea9b54b2d
Merge branch '1.13' into 2.0
* 1.13:
  Update upgrade file
  [Admin] Add Sylius certification to menu
  [UpgradeFile] update upgrade file
  move parameters to separate file
  Add clear cache command
  Improve locale setup command
  [Behat] Change to assert error message
  [ApiBundle] Remove unnecessary checking from validators
  [ApiBundle] Remove nullable from ChangeShopUserPassword constructor
  [ApiBundle] Remove nullable from AddProductReview constructor
  [ApiBundle] Remove nullable from AddItemToCart and ChangeItemQuantityInCart constructors
  [CS][DX] Refactor
  Change the COMPOSER_ROOT_VERSION for the CI
  Update the branch-aliases and inter-dependencies versions
2024-01-25 14:42:53 +01:00
Jacob Tobiasz
e0d8391f55
Update the branch-aliases and inter-dependencies versions 2024-01-23 07:45:00 +01:00
Grzegorz Sadowski
1e943288a6
Merge branch '1.13' into 2.0
* 1.13: (82 commits)
  CreateAdminUserCommandTest class - sorting of used classes
  InformAboutGUSCommand class - fix a typo
  Update upgrade file
  [AdminBundle] Change namespace of CreateAdminUser
  [CoreBundle] Move classes from Command to Console/Command
  [UserBundle] Move classes from Command to Console/Command
  [UiBundle] Move classes from Command to Console/Command
  [PromotionBundle] Move classes from Command to Console/Command
  [OrderBundle] Move classes from Command to Console/Command
  [AdminBundle] Move classes from Command to Console/Command
  [ECS] Apply ecs fixes
  [Addressing] Support BC for ZoneMatcher
  [Upgrade] Note ZoneRepository addition and ZoneMatcher constructor changes
  [DX] Update OrderRepository
  [Statistics] Refactor GetStatisticsAction
  Change new orders name to paid orders to not mix up names
  fix unit test
  Apply changes from comments and improve outdated StatisticsModifier
  fix behat tests
  Remove specs for unexisting classes and add existing ones
  ...
2024-01-19 14:50:54 +01:00
Jacob Tobiasz
97fef09fa7
Extract StateMachine abstraction into its own package 2024-01-15 15:40:07 +01:00
Jacob Tobiasz
3bccc3ee7d
Resolve conflicts between 2.0 and bootstrap-admin-panel 2024-01-04 16:23:43 +01:00