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

..

Action

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

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

Cart

add some phpdoc

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

Command

Fixed Issue #97

2013-11-07 20:01:10 +01:00

Condition

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

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

Controller

fix cs

2013-09-11 08:27:40 +02:00

Core

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

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

Coupon

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

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

Fixtures/Dumper/Config

apply cs-fixer

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

Form

order tests

2013-09-23 15:00:13 +02:00

Log

apply cs-fixer

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

Model

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

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

Module

Coupon : Fix mistake with chmod, file mode set as 644 as it originally was

2013-12-30 00:50:04 +01:00

Rewriting

Coupon : Fix mistake with chmod, file mode set as 644 as it originally was

2013-12-30 00:50:04 +01:00

TaxEngine

fix cs

2013-10-18 09:28:17 +02:00

Tools

Coupon : Fix mistake with chmod, file mode set as 644 as it originally was

2013-12-30 00:50:04 +01:00

Type

fix tests

2013-10-22 11:24:33 +02:00

bootstrap.php

apply cs-fixer

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

TestCaseWithURLToolSetup.php

Coupon : Fix mistake with chmod, file mode set as 644 as it originally was

2013-12-30 00:50:04 +01:00