Manuel Raynaud 3c87fa8bd0 Merge branch 'master' into cart ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	install/faker.php

2013-08-07 10:23:44 +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

Merge branch 'master' into cart

2013-08-07 09:44:34 +02:00

EventListener

In an Action, errored forms are propagated via the ActionEvent

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

Factory

Fix source header alignment

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

HttpFoundation

create new method allowing to add paramter to the current query string

2013-08-06 16:13:34 +02:00

Security

Added DataAccess plugin, admin header completed

2013-07-25 22:59:46 +02:00

Template

Merge branch 'master' into cart

2013-08-07 10:23:44 +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