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

Conflicts:
	core/lib/Thelia/Core/Template/Element/BaseLoop.php

2013-07-09 11:45:01 +02:00

..

Action

change compatibility for propel2

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

Admin/Controller

Added Auth loop

2013-07-09 11:42:25 +02:00

Command

complete install command and fix travis file

2013-07-09 10:52:37 +02:00

Config

Added Auth loop

2013-07-09 11:42:25 +02:00

Controller

set execution right // no more troubles

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

Core

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

2013-07-09 11:45:01 +02:00

Exception

set execution right // no more troubles

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

Form

remove unused "use" namespaces

2013-07-09 09:52:13 +02:00

Log

set execution right // no more troubles

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

Model

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

2013-07-09 11:45:01 +02:00

Routing

set execution right // no more troubles

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

Tests

remove break line from regex

2013-07-09 11:41:59 +02:00

Tools

set execution right // no more troubles

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

Type

track composer.lock file

2013-07-09 10:19:35 +02:00