gmorel 23389a87a3 Merge branch 'master' of https://github.com/thelia/thelia ...

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

2014-03-04 12:02:12 +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

fix typo in method name

2014-02-24 15:27:18 +01:00

EventListener

update changelog and fix cs

2014-02-22 19:01:37 +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

allow possibility for payment module to return a response

2014-02-06 12:24:52 +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

update changelog and fix cs

2014-02-22 19:01:37 +01:00

Template

Merge branch 'master' of https://github.com/thelia/thelia

2014-03-04 12:02:12 +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

prepare 2.0.0-RC1 version

2014-03-03 15:09:59 +01:00

TheliaContainerBuilder.php

update changelog and fix cs

2014-02-22 19:01:37 +01:00

TheliaHttpKernel.php

update changelog and fix cs

2014-02-22 19:01:37 +01:00