Etienne Roudeix abe45c5798 Merge branch 'master' into tax ...

Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php

2013-10-21 17:48:13 +02:00

..

Action

Merge branch 'master' into tax

2013-10-21 17:48:13 +02:00

Cart

refactor cart events

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

Command

Merge branch 'master' into tax

2013-10-21 17:48:13 +02:00

Condition

WIP : Condition : Fix unit text

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

Config

Merge branch 'master' into tax

2013-10-21 17:48:13 +02:00

Controller

Merge branch 'master' into tax

2013-10-21 17:48:13 +02:00

Core

Merge branch 'master' into tax

2013-10-21 17:48:13 +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 tax

2013-10-21 17:48:13 +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

Merge branch 'master' into tax

2013-10-21 17:48:13 +02:00

Module

end module removal

2013-10-21 11:30:19 +02:00

Rewriting

change place where absolute url is create when rewritten url is enabled

2013-10-21 15:15:17 +02:00

TaxEngine

end tax edition

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

Tests

fiw test suite

2013-10-21 11:40:45 +02:00

Tools

change place where absolute url is create when rewritten url is enabled

2013-10-21 15:15:17 +02:00

Type

end tax edition

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