Manuel Raynaud 715e7ac294 Merge branch 'customer' ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html

2013-07-04 19:46:08 +02:00

..

Accessory.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AccessoryQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Address.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AddressQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Admin.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AdminGroup.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AdminGroupQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AdminLog.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AdminLogQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AdminQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Area.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AreaQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Attribute.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AttributeAv.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AttributeAvI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AttributeAvI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AttributeAvQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AttributeCategory.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AttributeCategoryQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AttributeCombination.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AttributeCombinationQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AttributeI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AttributeI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

AttributeQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Category.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CategoryI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CategoryI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CategoryQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CategoryVersion.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CategoryVersionQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Combination.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CombinationQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Config.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ConfigI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ConfigI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ConfigQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Content.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ContentAssoc.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ContentAssocQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ContentFolder.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ContentFolderQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ContentI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ContentI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ContentQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ContentVersion.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ContentVersionQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Country.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CountryI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CountryI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CountryQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Coupon.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CouponOrder.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CouponOrderQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CouponQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CouponRule.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CouponRuleQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Currency.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CurrencyQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Customer.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CustomerQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CustomerTitle.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CustomerTitleI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CustomerTitleI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

CustomerTitleQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Delivzone.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

DelivzoneQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Document.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

DocumentI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

DocumentI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

DocumentQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Feature.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FeatureAv.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FeatureAvI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FeatureAvI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FeatureAvQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FeatureCategory.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FeatureCategoryQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FeatureI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FeatureI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FeatureProd.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FeatureProdQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FeatureQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Folder.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FolderI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FolderI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FolderQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FolderVersion.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

FolderVersionQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Group.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

GroupI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

GroupI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

GroupModule.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

GroupModuleQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

GroupQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

GroupResource.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

GroupResourceQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Image.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ImageI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ImageI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ImageQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Lang.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

LangQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Message.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

MessageI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

MessageI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

MessageQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

MessageVersion.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

MessageVersionQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Module.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ModuleI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ModuleI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ModuleQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Order.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

OrderAddress.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

OrderAddressQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

OrderFeature.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

OrderFeatureQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

OrderProduct.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

OrderProductQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

OrderQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

OrderStatus.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

OrderStatusI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

OrderStatusI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

OrderStatusQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Product.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ProductCategory.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ProductCategoryQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ProductI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ProductI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ProductQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ProductVersion.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ProductVersionQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Resource.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ResourceI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ResourceI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

ResourceQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Rewriting.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

RewritingQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Stock.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

StockQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

Tax.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

TaxI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

TaxI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

TaxQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

TaxRule.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

TaxRuleCountry.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

TaxRuleCountryQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

TaxRuleI18n.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

TaxRuleI18nQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00

TaxRuleQuery.php

Merge branch 'customer'

2013-07-04 19:46:08 +02:00