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

refactor cart events

2013-09-30 10:15:22 +02:00

Command

fix cs

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

Condition

Coupon : Fix namespace issues

2013-11-24 22:05:58 +01:00

Config

Merge branch 'cleanmaster' into modules

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

Controller

Merge branch 'cleanmaster' into modules

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

Core

Merge branch 'cleanmaster' into modules

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

Coupon

coupon management in order and cart process

2013-12-19 14:17:22 +01:00

Exception

rewritten url update

2013-12-06 16:35:14 +01:00

Form

fix cs

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

Install

change memory_limit value, 128 MB is enough

2013-12-18 09:39:23 +01:00

Log

fix cs

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

Mailer

mailing sytem admin

2013-10-28 12:24:59 +01:00

Model

Merge branch 'cleanmaster' into modules

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

Module

fix cs

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

Rewriting

fix urls in loops

2013-12-10 15:48:22 +01:00

TaxEngine

refacto getTaxCountry which is actually getDeliveryCountry

2013-12-20 11:13:08 +01:00

Tests

Merge branch 'cleanmaster' into modules

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

Tools

fix cs

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

Type

fix cs

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