franck 162084140e Merge remote-tracking branch 'origin/master' into admin ...

Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php

2013-07-06 10:34:09 +02:00

..

Action

manage lang for customer

2013-07-04 18:21:24 +02:00

Admin/Controller

Merge remote-tracking branch 'origin/master' into admin

2013-07-06 10:34:09 +02:00

Command

Merge branch 'admin'

2013-06-26 11:05:48 +02:00

Config

Merge remote-tracking branch 'origin/master' into admin

2013-07-06 10:34:09 +02:00

Controller

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

Core

Merge remote-tracking branch 'origin/master' into admin

2013-07-06 10:34:09 +02:00

Exception

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

Form

Merge remote-tracking branch 'origin/master' into admin

2013-07-06 10:34:09 +02:00

Log

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

Model

Merge remote-tracking branch 'origin/master' into admin

2013-07-06 10:34:09 +02:00

Routing

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

Tests

Merge remote-tracking branch 'origin/master' into admin

2013-07-06 10:34:09 +02:00

Tools

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

Type

correct use of type and argument collections

2013-06-25 08:55:08 +02:00