Manuel Raynaud b1517945f4 Merge branch 'modules' ...

Conflicts:
	core/lib/Thelia/Controller/Admin/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Thelia.php

2013-11-06 14:37:31 +01:00

..

Action

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

2013-11-06 11:16:27 +01:00

Cart

refactor cart events

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

Command

refactor how to assign template to parser

2013-11-06 11:12:39 +01:00

Condition

Working cleaning

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

Config

Merge branch 'modules'

2013-11-06 14:37:31 +01:00

Controller

Merge branch 'modules'

2013-11-06 14:37:31 +01:00

Core

Merge branch 'modules'

2013-11-06 14:37:31 +01:00

Coupon

Working adding decrementation when coupon is consumed

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

Exception

Finished log configuration. All loggers are currentrly working

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

Form

Missing class Translator

2013-11-05 15:46:38 +01:00

Install

Merge pull request #8 from thelia/fixtures_for_modules

2013-10-07 00:16:02 -07: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

fix tests

2013-11-06 11:07:31 +01:00

Module

complete french translation

2013-11-05 15:59:14 +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

fix tests

2013-11-06 11:07:31 +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