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

Conflicts:
	core/lib/Thelia/Action/Category.php
	core/lib/Thelia/Action/Customer.php

2013-08-09 10:25:03 +02:00

..

Bundle

fix CS and add start Form plugin for smarty

2013-06-24 10:21:59 +02:00

Controller

fix CS and add start Form plugin for smarty

2013-06-24 10:21:59 +02:00

DependencyInjection

Fix source header alignment

2013-07-17 15:06:53 +02:00

Event

change Request namespace in ActionEvent

2013-08-09 09:57:43 +02:00

EventListener

In an Action, errored forms are propagated via the ActionEvent

2013-07-24 20:08:00 +02:00

Factory

Added category creation and deletion

2013-08-08 02:39:42 +02:00

HttpFoundation

Merge branch 'cart'

2013-08-08 10:11:22 +02:00

Security

Categories ordrering in the catalog

2013-08-09 10:18:08 +02:00

Template

Categories ordrering in the catalog

2013-08-09 10:18:08 +02:00

Translation

Initiated translation system

2013-07-12 14:24:55 +02:00

Application.php

Fix source header alignment

2013-07-17 15:06:53 +02:00

Thelia.php

Fix source header alignment

2013-07-17 15:06:53 +02:00

TheliaContainerBuilder.php

Fix source header alignment

2013-07-17 15:06:53 +02:00

TheliaHttpKernel.php

missing use statement

2013-07-23 16:18:02 +02:00