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

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/admin-layout.tpl

2013-09-12 13:04:12 +02:00

..

Action

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

2013-09-12 13:04:12 +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-12 13:04:12 +02:00

Constraint

WIP

2013-09-10 20:00:43 +02:00

Controller

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

2013-09-12 13:04:12 +02:00

Core

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

2013-09-12 13:04:12 +02:00

Coupon

WIP

2013-09-09 16:40:53 +02:00

Exception

tax engine

2013-09-11 16:56:16 +02:00

Form

add missing files

2013-09-11 17:24:26 +02:00

Install

create task for reloaded database

2013-09-03 11:07:32 +02:00

Log

apply cs-fixer

2013-08-14 09:29:04 +02:00

Model

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

2013-09-12 13:04:12 +02:00

Module

fix cs

2013-09-11 08:27:40 +02:00

Rewriting

rewriting router

2013-09-06 08:59:06 +02:00

TaxEngine

fix taxengine tests

2013-09-11 20:18:34 +02:00

Tests

loop tests

2013-09-12 11:35:27 +02:00

Tools

use ROUTER::ABSOLUTE_URL by default

2013-09-11 11:03:35 +02:00

Type

tax engine

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