Manuel Raynaud 7e5c296fb2 Merge branch 'cart' ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php

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

..

Action

Merge branch 'cart'

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

Admin/Controller

Added category creation and deletion

2013-08-08 02:39:42 +02:00

Command

Fix source header alignment

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

Config

Merge branch 'cart'

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

Controller

Fix source header alignment

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

Core

Merge branch 'cart'

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

Exception

create InvalidCartException

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

Form

Merge branch 'cart'

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

Log

Fix source header alignment

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

Model

Merge branch 'cart'

2013-08-08 10:11:22 +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

try to test form

2013-08-07 14:55:27 +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