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

Conflicts:
	templates/admin/default/category-edit.html

2013-09-19 17:27:46 +02:00

..

Bundle

WIP

2013-09-05 20:07:17 +02:00

Controller

…

DependencyInjection

WIP

2013-09-09 16:40:53 +02:00

Event

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

2013-09-19 17:27:46 +02:00

EventListener

empty cart or delivery exception

2013-09-17 16:38:16 +02:00

Factory

add some phpdoc

2013-09-01 11:32:05 +02:00

HttpFoundation

empty cart or delivery exception

2013-09-17 16:38:16 +02:00

HttpKernel/Exception

fix test suite

2013-09-12 17:28:02 +02:00

Routing

empty cart or delivery exception

2013-09-17 16:38:16 +02:00

Security

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

Template

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

2013-09-19 17:27:46 +02:00

Translation

fix cs

2013-09-11 08:27:40 +02:00

Application.php

add some phpdoc

2013-09-01 11:32:05 +02:00

Thelia.php

nstall step Please enter the commit message for your changes. Lines starting

2013-09-17 15:43:15 +02:00

TheliaContainerBuilder.php

add some phpdoc

2013-09-01 11:32:05 +02:00

TheliaHttpKernel.php

Merge branch 'master' into template

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