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

Conflicts:
	templates/admin/default/categories.html
	templates/admin/default/includes/add-category-dialog.html
	templates/admin/default/includes/delete-category-dialog.html

2013-09-06 16:18:54 +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

change module routing priority to 1

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

Event

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

2013-09-06 16:18:54 +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

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

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

Routing

rewriting router

2013-09-06 08:59:06 +02:00

Security

add address create controller and event

2013-09-03 16:13:17 +02:00

Template

Fixed minor visual glitches

2013-09-06 10:41:19 +02:00

Translation

Categories refactoring

2013-09-06 15:56:06 +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

Categories refactoring

2013-09-06 15:56:06 +02:00