Etienne Roudeix 622e1ca3b6 Merge branch 'master' into tax ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/thelia.sql
	local/config/schema.xml

2013-09-27 10:29:51 +02:00

..

Bundle

WIP

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

Controller

creating new ContainerAware class fixing context on it

2013-08-12 10:07:37 +02:00

DependencyInjection

WIP

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

Event

Merge branch 'master' into tax

2013-09-27 10:29:51 +02:00

EventListener

begin working with http cache header

2013-09-19 09:07:53 +02:00

Factory

add some phpdoc

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

HttpFoundation

Started price tab

2013-09-23 00:57:03 +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' into tax

2013-09-27 10:29:51 +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