franck abdff9bc1a Merge branch 'admin' ...

Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php

2013-07-08 11:27:37 +02:00

..

Action

change compatibility for propel2

2013-07-05 15:59:41 +02:00

Admin/Controller

Merge branch 'admin'

2013-07-08 11:27:37 +02:00

Command

Merge branch 'admin'

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

Config

Merge branch 'admin'

2013-07-08 11:27:37 +02:00

Controller

set execution right // no more troubles

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

Core

Merge branch 'admin'

2013-07-08 11:27:37 +02:00

Exception

set execution right // no more troubles

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

Form

Merge branch 'admin'

2013-07-08 11:27:37 +02:00

Log

set execution right // no more troubles

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

Model

Merge branch 'admin'

2013-07-08 11:27:37 +02:00

Routing

set execution right // no more troubles

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

Tests

Merge branch 'admin'

2013-07-08 11:27:37 +02:00

Tools

set execution right // no more troubles

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

Type

new types

2013-07-03 10:52:24 +02:00