Etienne Roudeix 247ed6aa2a Merge branch 'master' into modules ...

Conflicts:
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php

2013-11-28 10:34:57 +01:00

..

Action

Merge branch 'master' into modules

2013-11-28 10:34:57 +01:00

Cart

refactor cart events

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

Command

tweak httpFoundation cache part for compatibility with

2013-11-20 14:45:40 +01:00

Condition

Working cleaning

2013-10-21 23:09:04 +02:00

Config

Merge branch 'backoffice' into frontend

2013-11-25 10:24:29 +01:00

Controller

Merge branch 'master' into modules

2013-11-28 10:34:57 +01:00

Core

Merge branch 'master' into modules

2013-11-28 10:34:57 +01:00

Coupon

Working adding decrementation when coupon is consumed

2013-10-22 23:04:08 +02:00

Exception

Colissimo in progress

2013-11-14 11:21:34 +01:00

Form

Implemented mail messages templates and layouts

2013-11-27 21:21:07 +01:00

Install

fix typo

2013-11-13 15:15:53 +01:00

Log

Added size limitation to the Thelia log file

2013-11-01 16:45:25 +01:00

Mailer

mailing sytem admin

2013-10-28 12:24:59 +01:00

Model

Implemented mail messages templates and layouts

2013-11-27 21:21:07 +01:00

Module

change request class in BaseModule

2013-11-07 16:53:49 +01:00

Rewriting

change place where absolute url is create when rewritten url is enabled

2013-10-21 15:15:17 +02:00

TaxEngine

end tax edition

2013-10-17 11:53:26 +02:00

Tests

Implemented mail messages templates and layouts

2013-11-27 21:21:07 +01:00

Tools

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

Type

fix cs

2013-10-25 10:07:21 +02:00