Manuel Raynaud d213278fe3 Merge branch 'master' into actions ...

Conflicts:
	core/lib/Thelia/Action/BaseAction.php
	core/lib/Thelia/Action/Category.php
	core/lib/Thelia/Action/Customer.php

2013-08-09 16:46:56 +02:00

..

Action

Merge branch 'master' into actions

2013-08-09 16:46:56 +02:00

Admin/Controller

Categories ordrering in the catalog

2013-08-09 10:18:08 +02:00

Cart

Fixed cart tests

2013-08-09 10:53:38 +02:00

Command

Fix source header alignment

2013-07-17 15:06:53 +02:00

Config

Categories ordrering in the catalog

2013-08-09 10:18:08 +02:00

Controller

Fix source header alignment

2013-07-17 15:06:53 +02:00

Core

Merge branch 'master' into actions

2013-08-09 16:46:56 +02:00

Exception

create InvalidCartException

2013-07-25 11:08:18 +02:00

Form

Categories ordrering in the catalog

2013-08-09 10:18:08 +02:00

Log

Fix source header alignment

2013-07-17 15:06:53 +02:00

Model

continue refactoring dispatching event on model modification

2013-08-09 10:24:38 +02:00

Module

initialize module part

2013-07-11 10:28:58 +02:00

Routing

Fix source header alignment

2013-07-17 15:06:53 +02:00

Tests

Beautified cart test

2013-08-09 10:54:28 +02:00

Tools

Merge branch 'cart'

2013-08-08 10:11:22 +02:00

Type

Added a new loop argument type to pass either true (1), false (0) or

2013-08-07 22:41:57 +02:00