Etienne Roudeix dffbf76cfd Merge branch 'master' into rewrite ...

Conflicts:
	core/lib/Thelia/Controller/BaseController.php
	install/insert.sql

2013-09-04 10:06:22 +02:00

..

Bundle

allow possibility to use as many Router as we want

2013-08-14 08:22:08 +02:00

Controller

creating new ContainerAware class fixing context on it

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

DependencyInjection

add some phpdoc

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

Event

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

2013-09-03 19:03:27 +02:00

EventListener

add some phpdoc

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

Factory

add some phpdoc

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

HttpFoundation

create new smarty function for displaying date in expected format

2013-09-02 23:36:34 +02:00

Security

Fixed customer front controller, events, addec admion config.

2013-08-30 19:46:12 +02:00

Template

Merge branch 'master' into rewrite

2013-09-04 10:06:22 +02:00

Translation

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Application.php

add some phpdoc

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

Thelia.php

add some phpdoc

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

TheliaContainerBuilder.php

add some phpdoc

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

TheliaHttpKernel.php

create new smarty function for displaying date in expected format

2013-09-02 23:36:34 +02:00