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

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Loop/Product.php

2013-08-01 10:56:54 +02:00

..

Action

manu le bossu's backup

2013-07-30 09:04:41 +02:00

Admin/Controller

Product loop adjustements

2013-08-01 10:53:35 +02:00

Command

Fix source header alignment

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

Config

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

2013-08-01 10:56:54 +02:00

Controller

Fix source header alignment

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

Core

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

2013-08-01 10:56:54 +02:00

Exception

create InvalidCartException

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

Form

remove references to stock table

2013-07-30 17:25:16 +02:00

Log

Fix source header alignment

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

Model

Merge branch 'cart'

2013-08-01 10:52:17 +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

manu le bossu's backup

2013-07-30 09:04:41 +02:00

Tools

Product loop adjustements

2013-08-01 10:53:35 +02:00

Type

Merge branch 'master' into loops

2013-07-23 10:44:41 +02:00