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

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/admin-layout.tpl

2013-09-12 13:04:12 +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-12 13:04:12 +02:00

EventListener

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

2013-09-04 17:34:23 +02:00

Factory

add some phpdoc

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

HttpFoundation

change some getters

2013-09-11 08:57:59 +02:00

Routing

fix cs

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

Security

fix cs

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

Template

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

2013-09-12 13:04:12 +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

fix cs

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