Franck Allimant ca862b07e4 Merge branch 'master' into brands ...

Conflicts:
	core/lib/Thelia/Tools/FileManager.php
	setup/update/2.0.3.sql

2014-06-26 16:35:08 +02:00

..

routing

Merge branch 'master' into brands

2014-06-26 16:35:08 +02:00

action.xml

Added brands management

2014-06-26 10:52:13 +02:00

command.xml

Register refresh command to Thelia core

2014-06-10 10:34:19 +02:00

config.xml

Refactoring of images and documents management

2014-06-26 10:36:12 +02:00

coupon.xml

Added free product coupon.

2014-06-17 00:38:18 +02:00

form.xml

Added brands management

2014-06-26 10:52:13 +02:00

loop.xml

Added brands management

2014-06-26 10:52:13 +02:00

routing.xml

fix psr

2014-01-22 12:52:36 +01:00

smarty-plugin.xml

add estimated shipping functionnality in cart

2014-04-28 12:24:43 +02:00

test.xml

import test config

2014-06-20 09:11:09 +02:00

translation.xml

refactor validator translation in a listener

2014-02-21 17:53:49 +01:00