Manuel Raynaud 7bf5ee31c9 Merge branch 'refactor_action' ...

Conflicts:
	core/lib/Thelia/Action/Product.php
	core/lib/Thelia/Controller/Admin/CategoryController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Controller/Admin/TemplateController.php

2013-09-30 10:26:59 +02:00

..

Action

Merge branch 'refactor_action'

2013-09-30 10:26:59 +02:00

Cart

refactor cart events

2013-09-30 10:15:22 +02:00

Command

Merge branch 'master' into template

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

Condition

WIP : Condition : Fix unit text

2013-09-25 18:15:48 +02:00

Config

Merge branch 'master' into tax

2013-09-27 13:35:39 +02:00

Controller

Merge branch 'refactor_action'

2013-09-30 10:26:59 +02:00

Core

Merge branch 'refactor_action'

2013-09-30 10:26:59 +02:00

Coupon

WIP : coupon refactor + fix

2013-09-26 18:18:45 +02:00

Exception

WIP : Refactor contraint/rule becomes conditions (more generic)

2013-09-25 16:36:14 +02:00

Form

Merge branch 'master' into tax

2013-09-27 13:35:39 +02:00

Install

test if cache directory exists before launching debug bar

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

Log

…

Mailer

fix typo

2013-09-16 19:08:01 +02:00

Model

Merge branch 'refactor_action'

2013-09-30 10:26:59 +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 'refactor_action'

2013-09-30 10:26:59 +02:00

Tools

Working : upload file/image : fix sanitizeFileName

2013-09-27 10:21:49 +02:00

Type

…