Manuel Raynaud 9d794e229d Merge branch 'master' into module_management ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/TaxRuleCountry.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php

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

..

Action

Merge branch 'master' into module_management

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

Cart

refactor cart events

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

Command

fix cs

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

Condition

WIP : Condition : Fix unit text

2013-09-25 18:15:48 +02:00

Config

Merge branch 'master' into module_management

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

Controller

Merge branch 'master' into module_management

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

Core

Merge branch 'master' into module_management

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

Coupon

WIP : coupon refactor + fix

2013-09-26 18:18:45 +02:00

Exception

fix tests

2013-10-07 14:36:20 +02:00

Form

Merge branch 'master' into module_management

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

Install

Merge pull request #8 from thelia/fixtures_for_modules

2013-10-07 00:16:02 -07:00

Log

apply cs-fixer

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

Mailer

fix typo

2013-09-16 19:08:01 +02:00

Model

end tax edition

2013-10-17 11:53:26 +02:00

Module

end module activation

2013-10-18 10:06:42 +02:00

Rewriting

decode url before searching if it's a rewritten url

2013-10-18 11:24:19 +02:00

TaxEngine

end tax edition

2013-10-17 11:53:26 +02:00

Tests

fix cs

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

Tools

fix issue concerning absoluteUrl

2013-10-09 12:44:49 +02:00

Type

end tax edition

2013-10-17 11:53:26 +02:00