Etienne Roudeix 86b11096ba Merge branch 'master' into loops ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php

2013-08-21 09:19:56 +02:00

..

assets

Implemented front-office login

2013-07-17 18:49:23 +02:00

i18n

Implemented front-office login

2013-07-17 18:49:23 +02:00

includes

changed role names to XXXX instead of ROLE_XXXX

2013-07-18 13:01:33 +02:00

cart.html

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

category.html

feature product loop + improve faker

2013-08-20 17:59:22 +02:00

connexion.html

refactor action process to controller process

2013-08-12 16:42:23 +02:00

customer.html

country loop

2013-07-29 11:10:16 +02:00

debug.html

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

folder.html

folder and content fake

2013-08-02 16:18:45 +02:00

images.html

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

included.html

Implemented front-office login

2013-07-17 18:49:23 +02:00

index.html

changed role names to XXXX instead of ROLE_XXXX

2013-07-18 13:01:33 +02:00

login.html

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

myaccount.html

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

pagination.html

Implemented front-office login

2013-07-17 18:49:23 +02:00