Etienne Roudeix 99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules"" ...

This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php

2014-01-06 11:25:25 +01:00

..

Output

Merge branch 'master' into loops

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

Skeleton/Module

fix class name in module generation

2013-11-15 11:49:51 +01:00

AdminUpdatePasswordCommand.php

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

BaseModuleGenerate.php

refactor how to assign template to parser

2013-11-06 11:12:39 +01:00

CacheClear.php

Fixed typo

2013-11-19 15:35:15 +01:00

ClearImageCache.php

refactor order and image events

2013-09-30 10:34:08 +02:00

ContainerAwareCommand.php

apply cs-fixer

2013-08-14 09:29:04 +02:00

CreateAdminUser.php

start creating admin password recovery

2013-10-30 15:35:11 +01:00

GenerateResources.php

fix cs

2013-10-25 10:07:21 +02:00

Install.php

Optimisation of THELIA_* constants usage

2013-11-08 11:22:26 +01:00

ModuleActivateCommand.php

tweak httpFoundation cache part for compatibility with

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

ModuleGenerateCommand.php

start validating module.xml file

2013-10-17 11:32:29 +02:00

ModuleGenerateModelCommand.php

add some phpdoc

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

ModuleGenerateSqlCommand.php

add some phpdoc

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

ReloadDatabaseCommand.php

fix cs

2013-09-30 10:35:34 +02:00