Manuel Raynaud 14bc1663bf Merge branch 'cart' ...

Conflicts:
	composer.lock
	core/lib/Thelia/Model/Base/Attribute.php
	core/lib/Thelia/Model/Base/AttributeAv.php
	core/lib/Thelia/Model/Base/AttributeCombination.php
	core/lib/Thelia/Model/Base/AttributeCombinationQuery.php
	core/lib/Thelia/Model/Base/Cart.php
	core/lib/Thelia/Model/Base/CartItem.php
	core/lib/Thelia/Model/Base/CartItemQuery.php
	core/lib/Thelia/Model/Base/Currency.php
	core/lib/Thelia/Model/Base/CurrencyQuery.php
	core/lib/Thelia/Model/Base/Product.php
	core/lib/Thelia/Model/Base/ProductPrice.php
	core/lib/Thelia/Model/Base/ProductPriceQuery.php
	core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php
	core/lib/Thelia/Model/Map/CartItemTableMap.php
	core/lib/Thelia/Model/Map/CurrencyTableMap.php
	core/lib/Thelia/Model/Map/ProductPriceTableMap.php
	core/lib/Thelia/Model/Map/ProductTableMap.php
	install/thelia.sql
	local/config/schema.xml

2013-08-01 10:52:17 +02:00

..

Action

manu le bossu's backup

2013-07-30 09:04:41 +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 'cart'

2013-08-01 10:52:17 +02:00

Controller

Fix source header alignment

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

Core

Merge branch 'cart'

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

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