Benjamin Perche 7ccb32badb Remove conflicts ...

modifié:         core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/FormatterDataTest.php

2014-08-01 12:48:01 +02:00

..

Action

fixed position tests on brands

2014-07-16 18:39:10 +02:00

Cart

change license header

2014-04-18 09:36:41 +02:00

Command

Code review following pull request comments

2014-06-10 11:43:06 +02:00

Condition

Using taxed cart total instead of untaxed price

2014-07-30 16:57:58 +02:00

Controller

change license header

2014-04-18 09:36:41 +02:00

Core

Added brand loop test

2014-07-01 01:07:03 +02:00

Coupon

Written coupons unit tests

2014-06-17 19:58:56 +02:00

FileFormat

Remove conflicts

2014-08-01 12:48:01 +02:00

Files

Fixed unit tests

2014-06-26 11:26:49 +02:00

Form

Add auto delete to keep the table small

2014-07-16 15:28:10 +02:00

Log

change license header

2014-04-18 09:36:41 +02:00

Model

change license header

2014-04-18 09:36:41 +02:00

Module

change license header

2014-04-18 09:36:41 +02:00

Rewriting

change license header

2014-04-18 09:36:41 +02:00

TaxEngine

change license header

2014-04-18 09:36:41 +02:00

Tools

Fix cs

2014-08-01 12:48:01 +02:00

Type

change license header

2014-04-18 09:36:41 +02:00

bootstrap.php

integrate web test case

2014-06-20 09:09:06 +02:00

TestCaseWithURLToolSetup.php

change license header

2014-04-18 09:36:41 +02:00

WebTestCase.php

integrate web test case

2014-06-20 09:09:06 +02:00