kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
17696 commits 61 branches 355 tags 443 MiB
Commit graph

17696 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kamil Kokot
9d119320a8
Switch "web" directory to "public" 2018-08-15 14:30:31 +02:00
Kamil Kokot
2760de2a3c
Merge pull request #9621 from bartoszpietrzak1994/taxon-with-children-taxons-behavior-in-listing 
Taxon with children taxons behavior in listing
 2018-08-15 14:12:14 +02:00
Bartosz Pietrzak
8102395cf2 BC break fix 2018-08-14 14:39:53 +02:00
Kamil Kokot
1829d351e0
Merge pull request #9652 from SyliusBot/crowdin/master-2018-08-14-10-43 
[AUTO] Updated translations from Crowdin (master)
 2018-08-14 13:58:39 +02:00
Sylius Bot
7cdcd75503 [Translations] Updated translations from Crowdin 2018-08-14 10:43:14 +00:00
Kamil Kokot
1c96c84f90
Merge branch '1.2' 
* 1.2:
  Change application's version to v1.2.6-DEV
  Generate changelog for v1.2.5
  Change application's version to v1.2.5
  Change application's version to v1.1.13-DEV
  Generate changelog for v1.1.12
  Change application's version to v1.1.12
  improve currency specs
 2018-08-13 08:02:08 +02:00
Kamil Kokot
1b47b854c0
Change application's version to v1.2.6-DEV 2018-08-13 07:56:23 +02:00
Kamil Kokot
2b30f3008c
Generate changelog for v1.2.5 2018-08-13 07:55:41 +02:00
Kamil Kokot
3faf68b9b6
Change application's version to v1.2.5 2018-08-13 07:44:10 +02:00
Kamil Kokot
9731bf5145
Merge branch '1.1' into 1.2 
* 1.1:
  Change application's version to v1.1.13-DEV
  Generate changelog for v1.1.12
  Change application's version to v1.1.12
 2018-08-13 07:43:51 +02:00
Kamil Kokot
7a4e57c4e6
Change application's version to v1.1.13-DEV 2018-08-13 07:42:18 +02:00
Kamil Kokot
0fcacd1310
Generate changelog for v1.1.12 2018-08-13 07:41:40 +02:00
Kamil Kokot
e44f2f507e
Change application's version to v1.1.12 2018-08-13 07:29:57 +02:00
Bartosz Pietrzak
da8f987306 Review fixes 2018-08-10 08:42:27 +02:00
Bartosz Pietrzak
513b6c63f9 Review fixes 2018-08-10 08:42:27 +02:00
Bartosz Pietrzak
9991ba2416 Reproduce taxonomy tree flag added to repository method 2018-08-10 08:42:27 +02:00
Bartosz Pietrzak
f5921e5422 Children taxon products displayed on taxon view 2018-08-10 08:42:27 +02:00
Bartosz Pietrzak
ccf6eaab58 Children taxon not displayed fix 2018-08-10 08:42:27 +02:00
Kamil Kokot
01926dfaa6
Merge pull request #9642 from loic425/features/currency/improve-phpspec 
[Currency] Improve currency specs
 2018-08-09 19:14:26 +02:00
Loïc Frémont
dcf6ca12fb improve currency specs 2018-08-09 17:49:16 +02:00
Kamil Kokot
9b5b5e3698
Merge branch '1.2' 
* 1.2:
  Fix OrderItemNamesSetter specification
 2018-08-08 11:54:46 +02:00
Kamil Kokot
93d933578f
Merge branch '1.1' into 1.2 
* 1.1:
  Fix OrderItemNamesSetter specification
 2018-08-08 11:42:27 +02:00
Łukasz Chruściel
39144019f1
Merge pull request #9634 from Zales0123/make-build-great-again 
[Core] Fix OrderItemNamesSetter specification
 2018-08-08 11:37:09 +02:00
Mateusz Zalewski
7df18babbf
Fix OrderItemNamesSetter specification 2018-08-08 10:50:02 +02:00
Kamil Kokot
831e4bf774
Merge branch '1.2' 
* 1.2:
  Fix missing "required" class on some form fields
  Quote row_number identifier for MySQL queries
 2018-08-02 10:18:34 +02:00
Kamil Kokot
5389f8f5c2
Merge branch '1.1' into 1.2 
* 1.1:
  Fix missing "required" class on some form fields
  Quote row_number identifier for MySQL queries
 2018-08-02 10:17:18 +02:00
Kamil Kokot
4428b33e43
Merge pull request #9437 from JakobTolkemit/payment_authorized_state_transition 
[Payment] Support for authorized state
 2018-08-01 12:36:05 +02:00
Kamil Kokot
94678936eb
Remove "payment" suffix from states and transitions 2018-08-01 10:34:27 +02:00
Kamil Kokot
4d1fe692d1
Merge pull request #9624 from teohhanhui/fix/required-field 
Fix missing "required" class on some form fields
 2018-08-01 10:27:56 +02:00
Teoh Han Hui
3a3cfc5d87
Fix missing "required" class on some form fields 2018-07-30 16:22:44 +02:00
Kamil Kokot
684ffa4860
Merge pull request #9622 from alcaeus/quote-mysql-identifier 
Quote row_number identifier for MySQL queries
 2018-07-30 13:37:08 +02:00
Andreas Braun
131e6881fb
Quote row_number identifier for MySQL queries 2018-07-30 10:05:27 +02:00
Kamil Kokot
c991b2cfa1
Merge branch '1.2' 
* 1.2:
  Change application's version to v1.2.5-DEV
  Change application's version to v1.2.4
  Generate changelog for v1.2.4
  Change application's version to v1.1.12-DEV
  Change application's version to v1.1.11
  Generate changelog for v1.1.11
 2018-07-27 17:04:14 +02:00
Kamil Kokot
edd5ef3e12
Change application's version to v1.2.5-DEV 2018-07-27 17:02:19 +02:00
Kamil Kokot
b937a6d6a2
Change application's version to v1.2.4 2018-07-27 17:01:32 +02:00
Kamil Kokot
e2f9f7af3c
Generate changelog for v1.2.4 2018-07-27 17:01:17 +02:00
Kamil Kokot
4dac1dfee0
Merge branch '1.1' into 1.2 
* 1.1:
  Change application's version to v1.1.12-DEV
  Change application's version to v1.1.11
  Generate changelog for v1.1.11
 2018-07-27 16:51:18 +02:00
Kamil Kokot
b5b13ccc7b
Change application's version to v1.1.12-DEV 2018-07-27 16:47:25 +02:00
Kamil Kokot
32e87a8d33
Change application's version to v1.1.11 2018-07-27 16:46:54 +02:00
Kamil Kokot
86dbf24596
Generate changelog for v1.1.11 2018-07-27 16:46:35 +02:00
Kamil Kokot
0c0a523b45
Apply coding standard fixes 2018-07-27 14:38:38 +02:00
Kamil Kokot
c8d6d63e53
Merge branch '1.2' 
* 1.2: (24 commits)
  Fix CSRF token generation for deleting an user
  updating taxon models documentation
  Reproduce CSRF token validation failure when deleting an user in admin panel
  Fix CS and add tests for ShopBasedCartContext
  Final PR review fixes
  Remove "else" and reduce spec code
  Add spec for oauth userprovider exception if no email provided
  Fix ShopBasedCartContext leak
  Handle null email in oauth login
  Fix service name for custom taxation calculator
  Use "key" instead of "index"
  Explain Test application
  Remove instances of loop.index0
  [Maintenance] Move github templates
  [Behat] Grammar fix
  PR review fixes
  Pull request template fix
  Summary page
  Implementation section + fixes
  Scenario implementation
  ...
 2018-07-27 13:13:20 +02:00
Kamil Kokot
734932ca01
Merge branch '1.1' into 1.2 
* 1.1: (24 commits)
  Fix CSRF token generation for deleting an user
  updating taxon models documentation
  Reproduce CSRF token validation failure when deleting an user in admin panel
  Fix CS and add tests for ShopBasedCartContext
  Final PR review fixes
  Remove "else" and reduce spec code
  Add spec for oauth userprovider exception if no email provided
  Fix ShopBasedCartContext leak
  Handle null email in oauth login
  Fix service name for custom taxation calculator
  Use "key" instead of "index"
  Explain Test application
  Remove instances of loop.index0
  [Maintenance] Move github templates
  [Behat] Grammar fix
  PR review fixes
  Pull request template fix
  Summary page
  Implementation section + fixes
  Scenario implementation
  ...
 2018-07-27 13:06:17 +02:00
Kamil Kokot
4a505fddd6
Merge pull request #9615 from nenadalm/product_images_preview 
Simplify code of `sylius-product-images-preview` module
 2018-07-27 10:20:06 +02:00
Kamil Kokot
9d9074fc1e
Merge pull request #9617 from pamil/shop-cart-context-vol2 
Fix CS and add tests for ShopBasedCartContext
 2018-07-27 10:18:47 +02:00
Kamil Kokot
ae730ca51d
Merge pull request #9620 from loic425/docs/taxon-models 
[docs] updating taxon models documentation
 2018-07-27 10:18:17 +02:00
Kamil Kokot
4581371eb5
Merge pull request #9618 from pamil/1.1-csrf-token-user 
Reproduce CSRF token validation failure when deleting an user in admin panel
 2018-07-27 10:16:19 +02:00
Kamil Kokot
22d4fd1972
Fix CSRF token generation for deleting an user 2018-07-26 19:52:50 +02:00
loic425
f98c1e2ceb updating taxon models documentation 2018-07-26 17:42:13 +02:00
Kamil Kokot
e8ea71d94d
Merge pull request #9592 from Zales0123/plugin-development-guide 
Plugin development guide v1.0
 2018-07-26 14:18:54 +01:00