Franck Allimant d1c54ea62a Merge branch 'catalog' ...

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php

2013-10-30 19:55:10 +01:00

..

Bundle

WIP : Coupon : Fix condition selection JS + Dependency Injection register

2013-09-27 14:52:38 +02:00

Controller

creating new ContainerAware class fixing context on it

2013-08-12 10:07:37 +02:00

DependencyInjection

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-10-15 22:51:27 +02:00

Event

Merge branch 'master' of https://github.com/thelia/thelia

2013-10-30 15:44:57 +01:00

EventListener

remove http cache

2013-10-24 17:35:17 +02:00

Factory

add some phpdoc

2013-09-01 11:32:05 +02:00

Form/Type

fix cs

2013-10-25 10:07:21 +02:00

HttpFoundation

Working : Missing type inference

2013-10-20 22:46:00 +02:00

HttpKernel/Exception

fix cs

2013-09-30 10:35:34 +02:00

Routing

empty cart or delivery exception

2013-09-17 16:38:16 +02:00

Security

fix cs

2013-10-25 10:07:21 +02:00

Template

Merge branch 'catalog'

2013-10-30 19:55:10 +01:00

Translation

fix cs

2013-09-11 08:27:40 +02:00

Application.php

add some phpdoc

2013-09-01 11:32:05 +02:00

Thelia.php

save thelia version

2013-10-25 09:10:27 +02:00

TheliaContainerBuilder.php

add some phpdoc

2013-09-01 11:32:05 +02:00

TheliaHttpKernel.php

fix cs

2013-09-30 10:35:34 +02:00