Etienne Roudeix 233c952b4e Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	core/lib/Thelia/Model/Base/Module.php
	core/lib/Thelia/Model/Base/ModuleQuery.php
	core/lib/Thelia/Model/Map/ModuleTableMap.php
	install/thelia.sql
	local/config/schema.xml

2013-09-17 12:44:34 +02:00

..

Action

Merge branch 'master' into template

2013-09-17 12:44:34 +02:00

Cart

fix cs

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

Command

fix cs

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

Config

Merge branch 'master' into template

2013-09-17 12:44:34 +02:00

Constraint

Working : Coupon : Fix unit tests @todo refactor

2013-09-16 11:26:37 +02:00

Controller

Merge branch 'master' into template

2013-09-17 12:44:34 +02:00

Core

Merge branch 'master' into template

2013-09-17 12:44:34 +02:00

Coupon

WIP : Coupon event dispatcher + action

2013-09-12 17:21:49 +02:00

Exception

Added documents action and loop

2013-09-17 01:07:42 +02:00

Form

Merge branch 'master' into template

2013-09-17 12:44:34 +02:00

Install

First version of installation wizard

2013-09-13 18:03:45 +02: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 template

2013-09-17 12:44:34 +02:00

Module

delivery process

2013-09-16 15:24:08 +02:00

Rewriting

fix current url bug + fix empty loop pagination exception

2013-09-12 17:20:33 +02:00

TaxEngine

tax engine retriever

2013-09-13 13:59:16 +02:00

Tests

Added documents action and loop

2013-09-17 01:07:42 +02:00

Tools

Added documents action and loop

2013-09-17 01:07:42 +02:00

Type

tax engine

2013-09-11 16:21:51 +02:00