Etienne Roudeix fa66f3423f Merge branch 'master' of github.com:thelia/thelia ...

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

2013-07-09 09:38:37 +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

HttpFoundation

Merge

2013-07-08 13:25:08 +02:00

Security

Working on security

2013-07-08 13:22:11 +02:00

Template

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

2013-07-09 09:38:37 +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

2013-07-08 13:25:08 +02:00