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

..

Action

Merge branch 'cleanmaster' into modules

2013-12-20 11:16:35 +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

fix cs

2013-12-18 10:04:13 +01:00

Controller

fix cs

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

Core

fix cs

2013-12-18 10:04:13 +01:00

Coupon

add coupon tests

2013-12-19 15:37:15 +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

fix cs

2013-12-18 10:04:13 +01:00

Module

fix cs

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

Rewriting

fix rewrinting tests

2013-12-10 15:56:59 +01:00

TaxEngine

fix cs

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

Tools

fix cs

2013-10-25 10:07:21 +02: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

fix tests

2013-12-09 15:31:27 +01:00