Franck Allimant b7c076445c Merge branch 'optim' of https://github.com/thelia/thelia into optim ...

Conflicts:
	core/lib/Thelia/Action/Order.php
	core/lib/Thelia/Core/Template/Element/BaseLoop.php

2014-01-31 15:49:59 +01:00

..

Bundle

fix psr

2014-01-22 12:52:36 +01:00

Controller

fix psr

2014-01-22 12:52:36 +01:00

DependencyInjection

fix psr

2014-01-22 12:52:36 +01:00

Event

create test for updatePassword event

2014-01-31 12:51:15 +01:00

EventListener

remove some unused variables

2014-01-22 15:50:40 +01:00

Factory

fix psr

2014-01-22 12:52:36 +01:00

Form/Type

Coupon : Fix mistake with chmod, file mode set as 644 as it originally was

2013-12-30 00:50:04 +01:00

HttpFoundation

remove some unused variables

2014-01-22 15:50:40 +01:00

HttpKernel

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Routing

Coupon : Fix mistake with chmod, file mode set as 644 as it originally was

2013-12-30 00:50:04 +01:00

Security

remove some unused variables

2014-01-22 15:50:40 +01:00

Template

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

2014-01-31 15:49:59 +01:00

Translation

fix psr

2014-01-22 12:52:36 +01:00

Application.php

fix psr

2014-01-22 12:52:36 +01:00

Thelia.php

change thelia version in main class

2014-01-29 16:15:07 +01:00

TheliaContainerBuilder.php

fix psr

2014-01-22 12:52:36 +01:00

TheliaHttpKernel.php

fix psr

2014-01-22 12:52:36 +01:00