franck d02f13f021 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php

2013-09-18 00:35:48 +02:00

..

Action

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-18 00:35:48 +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' of https://github.com/thelia/thelia

2013-09-18 00:35:48 +02:00

Constraint

Working : Coupon : Fix unit tests @todo refactor

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

Controller

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-18 00:35:48 +02:00

Core

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-18 00:35:48 +02:00

Coupon

WIP : Coupon event dispatcher + action

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

Exception

empty cart or delivery exception

2013-09-17 16:38:16 +02:00

Form

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-18 00:35:48 +02:00

Install

nstall step Please enter the commit message for your changes. Lines starting

2013-09-17 15:43:15 +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' of https://github.com/thelia/thelia

2013-09-18 00:35:48 +02:00

Module

postage + invoice step

2013-09-17 19:47:10 +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

add covers annotation in ProductRewriteTest

2013-09-17 20:16:51 +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