franck 162084140e Merge remote-tracking branch 'origin/master' into admin ...

Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php

2013-07-06 10:34:09 +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

generate a FormView

2013-06-24 14:50:06 +02:00

Event

add untrack file for before commit

2013-07-02 17:19:13 +02:00

EventListener

retrieve form error in front office

2013-07-01 11:10:52 +02:00

Factory

fix CS and add start Form plugin for smarty

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

Security

Added Feed loop to retreive feeds using SimplePie

2013-07-06 10:18:19 +02:00

Template

Merge remote-tracking branch 'origin/master' into admin

2013-07-06 10:34:09 +02:00

Application.php

fix CS and add start Form plugin for smarty

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

Thelia.php

change getting propel connection

2013-07-05 12:57:04 +02:00

TheliaContainerBuilder.php

fix CS and add start Form plugin for smarty

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

TheliaHttpKernel.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00