touffies 9d5aa5e077 Merge branch 'master' into frontend ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

2013-10-22 11:55:58 +02:00

..

Action

complete controller and newsletter listener

2013-10-22 10:01:02 +02:00

Cart

refactor cart events

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

Command

permissions

2013-10-21 19:11:42 +02:00

Condition

WIP : Condition : Fix unit text

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

Config

Merge branch 'master' into frontend

2013-10-22 11:55:58 +02:00

Controller

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

2013-10-22 11:33:24 +02:00

Core

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

2013-10-22 11:33:24 +02:00

Coupon

WIP : coupon refactor + fix

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

Exception

fix tests

2013-10-07 14:36:20 +02:00

Form

Merge branch 'master' into frontend

2013-10-22 11:55:58 +02:00

Install

Merge pull request #8 from thelia/fixtures_for_modules

2013-10-07 00:16:02 -07:00

Log

…

Mailer

…

Model

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

2013-10-22 11:33:24 +02:00

Module

end module removal

2013-10-21 11:30:19 +02: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-10-22 11:33:01 +02:00

Tools

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

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

Type

permission management

2013-10-22 11:09:24 +02:00