Etienne Roudeix 66536d0b31 Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Product.php

2013-09-18 20:03:13 +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

Merge branch 'master' into template

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

Config

Merge branch 'master' into template

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

Constraint

Working : Coupon : Fix unit tests @todo refactor

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

Controller

Shipping zones views and routes creation

2013-09-18 19:20:51 +02:00

Core

Merge branch 'master' into template

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

Coupon

WIP : Coupon event dispatcher + action

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

Exception

module image

2013-09-18 15:58:58 +02:00

Form

WIP : Setting Folders management

2013-09-18 15:38:08 +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 template

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

Module

fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar

2013-09-18 19:51:01 +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

Merge branch 'master' into template

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

Tools

module image

2013-09-18 15:58:58 +02:00

Type

tax engine

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