Etienne Roudeix d0ff5260f7 Merge branch 'cleanmaster' into modules ...

Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php

2013-12-20 11:16:35 +01:00

..

routing

Merge branch 'master' into modules

2013-12-17 10:48:59 +01:00

action.xml

remove Thelia ResponseListener

2013-11-20 14:45:40 +01:00

command.xml

explode master config file. Now each xml file file presents in master

2013-10-31 11:21:26 +01:00

config.xml

create smarty tag for smarty renderer

2013-11-20 14:45:40 +01:00

coupon.xml

Refactor removing Manager notion

2013-11-23 20:18:04 +01:00

form.xml

Add new SEO form

2013-12-09 14:46:07 +01:00

loop.xml

coupon in orders + model review : backquote use

2013-12-18 17:46:42 +01:00

routing.xml

remove unused config

2013-11-18 10:51:46 +01:00

smarty-plugin.xml

display admin hook if in debug mode and specific parameter in url

2013-12-09 12:12:20 +01:00

translation.xml

create compiler for loading translation.loader tag

2013-10-31 11:48:18 +01:00