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
7143 commits 61 branches 355 tags 443 MiB
Commit graph

210 commits

Author SHA1 Message Date
Arnaud Langlade
c7d7c03859 PhpSpec config has been added with ps4 support 2015-01-03 21:01:33 +01:00
Paweł Jędrzejewski
190d744c24 Update composer.lock and fix specs 2015-01-02 11:09:07 +01:00
Matthieu Blottière
1eeb2995a2 Improve composer consistency 2014-12-30 11:40:44 +01:00
Adam Elsodaney
54b3457a8e Merge branch 'master' into feature/archetype 
Conflicts:
	composer.lock
	src/Sylius/Bundle/ProductBundle/DependencyInjection/Configuration.php
	src/Sylius/Bundle/ProductBundle/Resources/config/doctrine/model/Attribute.orm.xml
	src/Sylius/Bundle/ProductBundle/Resources/config/doctrine/model/Option.orm.xml
 2014-12-17 18:37:01 +00:00
Paweł Jędrzejewski
790ee2f392 Remove outdated specs, update composer.lock 2014-12-17 09:49:53 +01:00
Gonzalo Vilaseca
bb22cc3f22 Sylius i18n 2014-12-16 13:22:31 +00:00
Adam Elsodaney
de7d000c9b Create Archetype component and bundle to replace the product prototype 2014-12-14 13:48:19 +00:00
stloyd
ed0b8224e9 Replace doctrine-bundle with stable version & adjust some other deps 2014-11-28 09:56:30 +01:00
Argyrios Gounaris
33280a06a0 composer.lock update, another fix for doctrine lower case 2014-11-07 09:59:06 +00:00
Maksim Kotlyar
d6dab13d6f [payum] make compatible with payum 0.12 2014-11-03 19:25:34 +00:00
Antonio Peric
8282702a93 Update liipimaginebundle 1.0 completed 2014-10-30 12:54:16 +01:00
Alexandre
cd043ed3de Update state machine 
Fix callback args overriding
 2014-10-29 15:27:06 +08:00
stloyd
a8171ecd56 Cleanup API code 2014-10-27 23:02:05 +01:00
Raynald
1b71eed2c5 [ContentBundle,WebBundle] Resolve conflicts 2014-10-07 14:19:34 +02:00
Raynald
1aba21bfc2 Latest fix for ContentBundle 2014-10-07 13:54:29 +02:00
Raynald
7908247f3d [ContentBundle,WebBundle] Improve ContentBundle to use the power of 
Symfony-CMF

Added possibility to add from backend :
- menus, 
- slideshow (with liipImagine filter), 
- routes to static content,

Added 3 slideshow location in layout. Display slideshow in top, content
and sidebar positions with sonata_block_render.

Menus could be displayed in frontend by simply calling knp_menu_render
and menu name (eg: {{ knp_menu_render('main') }})

Fixed some typos from previous ContentBundle commit, and create all
translations strings

Reorganize route and template by grouping them in a content dir for
better future maintenance
 2014-10-07 13:54:06 +02:00
Raynald
c82e4a2788 Latest fix for ContentBundle 2014-10-06 23:35:32 +02:00
stloyd
10612a995c Fix composer.json files + CHANGELOGs 2014-10-02 10:05:30 +02:00
Raynald
a1d087bb7b [ContentBundle,WebBundle] Improve ContentBundle to use the power of 
Symfony-CMF

Added possibility to add from backend :
- menus, 
- slideshow (with liipImagine filter), 
- routes to static content,

Added 3 slideshow location in layout. Display slideshow in top, content
and sidebar positions with sonata_block_render.

Menus could be displayed in frontend by simply calling knp_menu_render
and menu name (eg: {{ knp_menu_render('main') }})

Fixed some typos from previous ContentBundle commit, and create all
translations strings

Reorganize route and template by grouping them in a content dir for
better future maintenance
 2014-10-02 00:17:50 +02:00
Paweł Jędrzejewski
339a107744 Initial content bundle 
Conflicts:
	composer.lock
	src/Sylius/Bundle/CoreBundle/Kernel/Kernel.php
	src/Sylius/Bundle/CoreBundle/Resources/config/app/sylius.yml
	src/Sylius/Bundle/FixturesBundle/DataFixtures/PHPCR/LoadPagesData.php
 2014-09-30 12:28:08 +02:00
stloyd
7faf7c77a5 Updated composer.lock file + fixed random CS issues 2014-09-04 11:00:13 +02:00
Paweł Jędrzejewski
070b568c8c Initial api bundle 2014-07-04 12:45:21 +02:00
Paweł Jędrzejewski
3bc6ccb47b Update composer.lock 2014-07-04 12:23:39 +02:00
Joseph Bielawski
7bc0df94f8 Update dependencies to be less restrict 2014-07-03 09:53:08 +02:00
Kotlyar Maksim
55856547fb [payum] upgrade up to 0.9 2014-06-26 08:44:17 +00:00
Paweł Jędrzejewski
0dfff11dd2 Revert "Merge pull request #1620 from formapro-forks/payum-09-upgrade" 
This reverts commit d4b294b68a, reversing
changes made to a525a7eb48.
 2014-06-21 13:42:25 +02:00
Kotlyar Maksim
232f764d08 [payum] update payum to 0.9 2014-06-17 14:01:09 +00:00
Joseph Bielawski
61bf57ef39 Some changes: 
- update dependencies,
- lock for Doctrine <2.4.3 due to BC break with Doctrine Extensions,
- adjust some fixtures
 2014-06-10 23:17:22 +02:00
Alexandre
9bf31993c5 Move from Finite to SM 2014-06-09 21:24:33 +07:00
Kotlyar Maksim
5ecda09f37 update composer.lock 2014-05-26 13:59:24 +00:00
Kotlyar Maksim
2da24e19ec fix composer lock 2014-05-26 12:28:17 +00:00
Kotlyar Maksim
8d8c7894c8 some impr that comes with payum 0.8 
* TokenFactoryInterface
* return url and cancel url set in payums capture action.
 2014-05-26 12:28:17 +00:00
Lukas Kahwe Smith
6f03a03092 updated CMF to 1.1 and fixed behat dependency 2014-05-16 16:13:32 +02:00
Alexandre
4a7b6a36b3 Use own fork of Finite 
As a temporary solution to move forward
 2014-05-15 19:21:28 +08:00
Joseph Bielawski
4a293f5c63 Adjust code after review: 
- Remove left-overs from Behat v2
- Update `composer.json` & `composer.lock` files
 2014-05-14 20:34:18 +02:00
Lukas Kahwe Smith
44c00689fb sylius does not provide a phpcr implementation, jackalope-* does 2014-05-14 14:10:26 +02:00
Alexandre
5592df94e1 Use Finite with Payment as well 2014-04-27 12:02:03 +08:00
Alexandre
0e4d31a7fc Add Finite dependency 2014-04-27 12:00:45 +08:00
Paweł Jędrzejewski
628966440b Add DoctrineMigrations and auto-generated migration 2014-04-10 14:21:46 +02:00
Paweł Jędrzejewski
b0efb897f7 Rework the address section of account panel 2014-04-10 14:21:45 +02:00
Alexandre
480f8a717c Update to Payum 0.8 2014-04-08 15:24:39 +08:00
jjanvier
350020aa8f Migrating LiipCacheBundle to stable version of DoctrineCacheBundle 2014-03-25 09:32:53 +01:00
Joseph Bielawski
6cfc03d6a5 Update phpspec to stable version, fix failing spec of PurchaseStep 2014-03-20 11:40:37 +01:00
Antonio Peric
8834d0e92b Issue #1137 resolved. Update composer fails because of CMF component 2014-03-18 12:41:33 +01:00
Patrik Karisch
c2b57f4481 Update doctrine dependencies to newest version and add cache-bundle at dev 2014-03-03 18:03:15 +01:00
jjanvier
73df452da1 Updating SF and its main bundles 2014-02-28 00:24:25 +01:00
Paweł Jędrzejewski
dbe8e0d38d Fix specs & remove duplicated scenarios for deleting resources 2014-02-04 14:05:58 +01:00
Paweł Jędrzejewski
bbefdd0937 Introduce basic factory support 2014-02-04 14:05:57 +01:00
Paweł Jędrzejewski
6d694b8dc3 Revert "Initial routing for the api" 
This reverts commit f1fbb8b086a8eb072ce09ce92eca627043829885.

Conflicts:

	src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Address.yml
	src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Province.yml
	src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Zone.yml
	src/Sylius/Bundle/PaymentsBundle/Resources/config/serializer/Model.Payment.yml
	src/Sylius/Bundle/PaymentsBundle/Resources/config/serializer/Model.PaymentMethod.yml
	src/Sylius/Bundle/ResourceBundle/Controller/ResourceController.php
 2014-02-04 14:05:57 +01:00
Paweł Jędrzejewski
8725ee5750 Initial routing for the api 2014-02-04 14:05:06 +01:00