Manuel Raynaud b1517945f4 Merge branch 'modules' ...

Conflicts:
	core/lib/Thelia/Controller/Admin/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Thelia.php

2013-11-06 14:37:31 +01:00

..

Bundle

Finished log configuration. All loggers are currentrly working

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

Controller

Finished log configuration. All loggers are currentrly working

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

DependencyInjection

Implementing translations (still in progress)

2013-11-06 10:49:03 +01:00

Event

Profile and Useful was misspelled

2013-11-04 16:35:01 +01:00

EventListener

refactor render template process

2013-11-06 13:48:32 +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/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

Implementing translations (still in progress)

2013-11-06 10:49:03 +01:00

Template

Merge branch 'modules'

2013-11-06 14:37:31 +01:00

Translation

test if request is an active scope in tra nslator

2013-11-04 14:47:18 +01:00

Application.php

add some phpdoc

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

Thelia.php

Merge branch 'modules'

2013-11-06 14:37:31 +01: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