Etienne Roudeix 338ec5fce6 Merge branch 'loops' ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

2013-07-31 13:56:05 +02:00

..

Action

Merge branch 'cart'

2013-07-26 15:59:32 +02:00

Admin/Controller

Added DataAccess plugin, admin header completed

2013-07-25 22:59:46 +02:00

Command

Fix source header alignment

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

Config

Merge branch 'loops'

2013-07-31 13:56:05 +02:00

Controller

Fix source header alignment

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

Core

Merge branch 'loops'

2013-07-31 13:56:05 +02:00

Exception

create InvalidCartException

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

Form

Fixed form names

2013-07-24 20:11:28 +02:00

Log

Fix source header alignment

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

Model

Merge branch 'loops'

2013-07-31 13:56:05 +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

Merge branch 'cart'

2013-07-26 15:59:32 +02:00

Tools

Implemented front-office login

2013-07-17 18:49:23 +02:00

Type

Merge branch 'master' into loops

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