Franck Allimant 5bf51dd47e Merge branch 'catalog' ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml

2013-10-24 00:16:33 +02: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 'catalog'

2013-10-24 00:16:33 +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

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

administrators management

2013-10-23 16:31:37 +02:00

Template

Merge branch 'catalog'

2013-10-24 00:16:33 +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