Etienne Roudeix 32f1fb3441 Merge branch 'admin' into loops ...

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	templates/smarty-sample/category.html

2013-07-03 09:52:06 +02:00

..

Action

refactor how to create Form

2013-06-28 11:36:35 +02:00

Admin/Controller

Introduction of loop scopes.

2013-07-02 19:18:41 +02:00

Command

Merge branch 'admin'

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

Config

loop product

2013-07-02 16:33:43 +02:00

Controller

set execution right // no more troubles

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

Core

Merge branch 'admin' into loops

2013-07-03 09:52:06 +02:00

Exception

set execution right // no more troubles

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

Form

Merge branch 'admin' of https://github.com/thelia/thelia into admin

2013-07-02 15:54:24 +02:00

Log

set execution right // no more troubles

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

Model

Merge branch 'admin' into loops

2013-07-03 09:52:06 +02:00

Routing

set execution right // no more troubles

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

Tests

Merge branch 'admin' into loops

2013-07-03 09:52:06 +02:00

Tools

set execution right // no more troubles

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

Type

create type formatter

2013-07-01 17:02:15 +02:00