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

..

AccessoryTableMap.php

Merge branch 'cart'

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

AddressTableMap.php

Merge branch 'cart'

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

AdminGroupTableMap.php

Merge branch 'cart'

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

AdminLogTableMap.php

Merge branch 'cart'

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

AdminTableMap.php

Merge branch 'cart'

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

AreaTableMap.php

Merge branch 'cart'

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

AttributeAvI18nTableMap.php

Merge branch 'cart'

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

AttributeAvTableMap.php

Merge branch 'cart'

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

AttributeCategoryTableMap.php

Merge branch 'cart'

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

AttributeCombinationTableMap.php

Merge branch 'cart'

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

AttributeI18nTableMap.php

Merge branch 'cart'

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

AttributeTableMap.php

Merge branch 'cart'

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

CartItemTableMap.php

regenerate modeland sql fixing typo in CartItem table

2013-08-06 09:57:14 +02:00

CartTableMap.php

cart is persist now

2013-07-23 16:01:00 +02:00

CategoryI18nTableMap.php

Merge branch 'cart'

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

CategoryTableMap.php

Merge branch 'cart'

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

CategoryVersionTableMap.php

Merge branch 'cart'

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

ConfigI18nTableMap.php

Merge branch 'cart'

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

ConfigTableMap.php

Merge branch 'cart'

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

ContentAssocTableMap.php

Merge branch 'cart'

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

ContentFolderTableMap.php

Merge branch 'cart'

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

ContentI18nTableMap.php

Merge branch 'cart'

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

ContentTableMap.php

Merge branch 'cart'

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

ContentVersionTableMap.php

Merge branch 'cart'

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

CountryI18nTableMap.php

Merge branch 'cart'

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

CountryTableMap.php

Merge branch 'cart'

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

CouponOrderTableMap.php

Merge branch 'cart'

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

CouponRuleTableMap.php

Merge branch 'cart'

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

CouponTableMap.php

Merge branch 'cart'

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

CurrencyI18nTableMap.php

change stock table name

2013-07-30 17:06:29 +02:00

CurrencyTableMap.php

Added category creation and deletion

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

CustomerTableMap.php

Merge branch 'cart'

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

CustomerTitleI18nTableMap.php

Merge branch 'cart'

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

CustomerTitleTableMap.php

Merge branch 'cart'

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

DelivzoneTableMap.php

Merge branch 'cart'

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

DocumentI18nTableMap.php

Merge branch 'cart'

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

DocumentTableMap.php

Merge branch 'cart'

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

FeatureAvI18nTableMap.php

Merge branch 'cart'

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

FeatureAvTableMap.php

Merge branch 'cart'

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

FeatureCategoryTableMap.php

Merge branch 'cart'

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

FeatureI18nTableMap.php

Merge branch 'cart'

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

FeatureProductTableMap.php

change stock table name

2013-07-30 17:06:29 +02:00

FeatureTableMap.php

Merge branch 'cart'

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

FolderI18nTableMap.php

Merge branch 'cart'

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

FolderTableMap.php

update model

2013-08-06 09:52:41 +02:00

FolderVersionTableMap.php

update model

2013-08-06 09:52:41 +02:00

GroupI18nTableMap.php

Merge branch 'cart'

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

GroupModuleTableMap.php

Merge branch 'cart'

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

GroupResourceTableMap.php

Merge branch 'cart'

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

GroupTableMap.php

Merge branch 'cart'

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

ImageI18nTableMap.php

Merge branch 'cart'

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

ImageTableMap.php

Merge branch 'cart'

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

LangTableMap.php

Added category creation and deletion

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

MessageI18nTableMap.php

Merge branch 'cart'

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

MessageTableMap.php

Merge branch 'cart'

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

MessageVersionTableMap.php

Merge branch 'cart'

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

ModuleI18nTableMap.php

Merge branch 'cart'

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

ModuleTableMap.php

Merge branch 'cart'

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

OrderAddressTableMap.php

Merge branch 'cart'

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

OrderFeatureTableMap.php

Merge branch 'cart'

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

OrderProductTableMap.php

Merge branch 'cart'

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

OrderStatusI18nTableMap.php

Merge branch 'cart'

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

OrderStatusTableMap.php

Merge branch 'cart'

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

OrderTableMap.php

Merge branch 'cart'

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

ProductCategoryTableMap.php

Merge branch 'cart'

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

ProductI18nTableMap.php

Merge branch 'cart'

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

ProductPriceTableMap.php

update schema, changin some relations between tables

2013-08-02 12:40:51 +02:00

ProductSaleElementsTableMap.php

update schema, changin some relations between tables

2013-08-02 12:40:51 +02:00

ProductTableMap.php

Merge branch 'cart'

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

ProductVersionTableMap.php

Merge branch 'cart'

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

ResourceI18nTableMap.php

Merge branch 'cart'

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

ResourceTableMap.php

Merge branch 'cart'

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

RewritingTableMap.php

Merge branch 'cart'

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

TaxI18nTableMap.php

Merge branch 'cart'

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

TaxRuleCountryTableMap.php

Merge branch 'cart'

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

TaxRuleI18nTableMap.php

Merge branch 'cart'

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

TaxRuleTableMap.php

Merge branch 'cart'

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

TaxTableMap.php

Merge branch 'cart'

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