Etienne Roudeix 247ed6aa2a Merge branch 'master' into modules ...

Conflicts:
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php

2013-11-28 10:34:57 +01:00

..

Bundle

remove Thelia ResponseListener

2013-11-20 14:45:40 +01:00

Controller

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

DependencyInjection

Implemented mail messages templates and layouts

2013-11-27 21:21:07 +01:00

Event

Implemented mail messages templates and layouts

2013-11-27 21:21:07 +01:00

EventListener

Merge branch 'master' into modules

2013-11-25 10:05:01 +01: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

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

HttpKernel

tweak httpFoundation cache part for compatibility with

2013-11-20 14:45:40 +01:00

Routing

empty cart or delivery exception

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

Security

Add a new admin page to manage the basic store configurations

2013-11-22 17:38:21 +01:00

Template

Merge branch 'master' into modules

2013-11-28 10:34:57 +01:00

Translation

Continued on translations

2013-11-06 14:40:33 +01:00

Application.php

add some phpdoc

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

Thelia.php

Implemented mail messages templates and layouts

2013-11-27 21:21:07 +01:00

TheliaContainerBuilder.php

add some phpdoc

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

TheliaHttpKernel.php

tweak httpFoundation cache part for compatibility with

2013-11-20 14:45:40 +01:00