Etienne Roudeix 84204cbf05 Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Feed.php

2013-09-16 15:32:17 +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

WIP

2013-09-09 16:40:53 +02:00

Event

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

2013-09-16 12:52:59 +02:00

EventListener

allowing adding product to cart

2013-09-13 19:41:12 +02:00

Factory

add some phpdoc

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

HttpFoundation

Merge branch 'master' into template

2013-09-16 10:19:40 +02:00

HttpKernel/Exception

fix test suite

2013-09-12 17:28:02 +02:00

Routing

fix cs

2013-09-11 08:27:40 +02:00

Security

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

Template

Merge branch 'master' into template

2013-09-16 15:32:17 +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

syntax

2013-09-11 11:14:54 +02:00

TheliaContainerBuilder.php

add some phpdoc

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

TheliaHttpKernel.php

Merge branch 'master' into template

2013-09-16 10:19:40 +02:00