Etienne Roudeix abe45c5798 Merge branch 'master' into tax ...

Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php

2013-10-21 17:48:13 +02:00

..

Bundle

WIP

2013-09-05 20:07:17 +02:00

Controller

creating new ContainerAware class fixing context on it

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

DependencyInjection

normalize url generator cache class

2013-10-11 10:57:31 +02:00

Event

Merge branch 'master' into tax

2013-10-21 17:48:13 +02:00

EventListener

fix cs

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

Factory

add some phpdoc

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

Form/Type

end tax edition

2013-10-17 11:53:26 +02:00

HttpFoundation

fix cs

2013-09-30 10:35:34 +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

permission cleanup

2013-10-21 17:44:17 +02:00

Template

Merge branch 'master' into tax

2013-10-21 17:48:13 +02: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

fix cs

2013-09-30 10:35:34 +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