Etienne Roudeix 622e1ca3b6 Merge branch 'master' into tax ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/thelia.sql
	local/config/schema.xml

2013-09-27 10:29:51 +02:00

..

Action

Merge branch 'master' into tax

2013-09-27 10:29:51 +02:00

Cart

order creation

2013-09-19 15:11:54 +02:00

Command

Merge branch 'master' into template

2013-09-18 20:03:13 +02:00

Config

Merge branch 'master' into tax

2013-09-27 10:29:51 +02:00

Constraint

Working : Coupon : Fix unit tests @todo refactor

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

Controller

Merge branch 'master' into tax

2013-09-27 10:29:51 +02:00

Core

Merge branch 'master' into tax

2013-09-27 10:29:51 +02:00

Coupon

add abstract getDispatcher method to use CartTrai

2013-09-19 16:06:42 +02:00

Exception

order process

2013-09-20 16:25:46 +02:00

Form

Merge branch 'master' into tax

2013-09-27 10:29:51 +02:00

Install

test if cache directory exists before launching debug bar

2013-09-18 09:34:48 +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 tax

2013-09-27 10:29:51 +02:00

Module

order process

2013-09-20 16:25:46 +02:00

Rewriting

fix current url bug + fix empty loop pagination exception

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

TaxEngine

order process

2013-09-20 16:25:46 +02:00

Tests

Merge branch 'master' into tax

2013-09-27 10:29:51 +02:00

Tools

Working : Fix : Unit test

2013-09-24 19:06:10 +02:00

Type

tax engine

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