gmorel 47106f562d Merge branch 'coupon' of https://github.com/thelia/thelia into coupon ...

Conflicts:
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponI18n.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/ProductAssociatedContent.php
	core/lib/Thelia/Model/Map/CouponTableMap.php
	core/lib/Thelia/Model/Map/CouponVersionTableMap.php
	install/faker.php
	install/thelia.sql
	local/config/schema.xml

2013-08-28 10:11:57 +02:00

..

Accessory.php

WIP Coupon

2013-08-22 20:02:03 +02:00

AccessoryQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Address.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

AddressQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Admin.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

AdminGroup.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

AdminGroupQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

AdminLog.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

AdminLogQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

AdminQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Area.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

AreaQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Attribute.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

AttributeAv.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

AttributeAvI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

AttributeAvI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

AttributeAvQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

AttributeCategory.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

AttributeCategoryQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

AttributeCombination.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

AttributeCombinationQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

AttributeI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

AttributeI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

AttributeQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

Cart.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CartItem.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CartItemQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

CartQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Category.php

WIP Coupon

2013-08-22 20:02:03 +02:00

CategoryAssociatedContent.php

associated content for categories and product tables + loop

2013-08-23 10:55:59 +02:00

CategoryAssociatedContentQuery.php

associated content for categories and product tables + loop

2013-08-23 10:55:59 +02:00

CategoryDocument.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CategoryDocumentI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CategoryDocumentI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

CategoryDocumentQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CategoryI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CategoryI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

CategoryImage.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CategoryImageI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CategoryImageI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

CategoryImageQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CategoryQuery.php

WIP Coupon

2013-08-22 20:02:03 +02:00

CategoryVersion.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CategoryVersionQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Config.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ConfigI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ConfigI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ConfigQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

Content.php

WIP Coupon

2013-08-22 20:02:03 +02:00

ContentDocument.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ContentDocumentI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ContentDocumentI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ContentDocumentQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ContentFolder.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ContentFolderQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ContentI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ContentI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ContentImage.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ContentImageI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ContentImageI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ContentImageQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ContentQuery.php

WIP Coupon

2013-08-22 20:02:03 +02:00

ContentVersion.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ContentVersionQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Country.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CountryI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CountryI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

CountryQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

Coupon.php

Merge branch 'coupon' of https://github.com/thelia/thelia into coupon

2013-08-28 10:11:57 +02:00

CouponI18n.php

associated content for categories and product tables + loop

2013-08-23 10:55:59 +02:00

CouponI18nQuery.php

associated content for categories and product tables + loop

2013-08-23 10:55:59 +02:00

CouponOrder.php

associated content for categories and products tables

2013-08-22 17:54:19 +02:00

CouponOrderQuery.php

associated content for categories and products tables

2013-08-22 17:54:19 +02:00

CouponQuery.php

Merge branch 'coupon' of https://github.com/thelia/thelia into coupon

2013-08-28 10:11:57 +02:00

CouponRule.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CouponRuleQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

CouponVersion.php

WIP Coupon

2013-08-23 20:00:32 +02:00

CouponVersionQuery.php

WIP Coupon

2013-08-23 20:00:32 +02:00

Currency.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CurrencyI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CurrencyI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

CurrencyQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

Customer.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CustomerQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

CustomerTitle.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CustomerTitleI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

CustomerTitleI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

CustomerTitleQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

Delivzone.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

DelivzoneQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Feature.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FeatureAv.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FeatureAvI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FeatureAvI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

FeatureAvQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FeatureCategory.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FeatureCategoryQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

FeatureI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FeatureI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

FeatureProduct.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FeatureProductQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

FeatureQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

Folder.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FolderDocument.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FolderDocumentI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FolderDocumentI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

FolderDocumentQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FolderI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FolderI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

FolderImage.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FolderImageI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FolderImageI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

FolderImageQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FolderQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FolderVersion.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

FolderVersionQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Group.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

GroupI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

GroupI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

GroupModule.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

GroupModuleQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

GroupQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

GroupResource.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

GroupResourceQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Lang.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

LangQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Message.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

MessageI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

MessageI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

MessageQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

MessageVersion.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

MessageVersionQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Module.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ModuleI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ModuleI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ModuleQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

Order.php

associated content for categories and products tables

2013-08-22 17:54:19 +02:00

OrderAddress.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

OrderAddressQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

OrderFeature.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

OrderFeatureQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

OrderProduct.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

OrderProductQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

OrderQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

OrderStatus.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

OrderStatusI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

OrderStatusI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

OrderStatusQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

Product.php

WIP Coupon

2013-08-22 20:02:03 +02:00

ProductAssociatedContent.php

associated content for categories and product tables + loop

2013-08-23 10:55:59 +02:00

ProductAssociatedContentQuery.php

associated content for categories and product tables + loop

2013-08-23 10:55:59 +02:00

ProductCategory.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ProductCategoryQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ProductDocument.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ProductDocumentI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ProductDocumentI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ProductDocumentQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ProductI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ProductI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ProductImage.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ProductImageI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ProductImageI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ProductImageQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ProductPrice.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ProductPriceQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ProductQuery.php

WIP Coupon

2013-08-22 20:02:03 +02:00

ProductSaleElements.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ProductSaleElementsQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ProductVersion.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ProductVersionQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Resource.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ResourceI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

ResourceI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

ResourceQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

Rewriting.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

RewritingQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Tax.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

TaxI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

TaxI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

TaxQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

TaxRule.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

TaxRuleCountry.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

TaxRuleCountryQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

TaxRuleI18n.php

front end translation management in loops

2013-08-22 15:03:31 +02:00

TaxRuleI18nQuery.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

TaxRuleQuery.php

front end translation management in loops

2013-08-22 15:03:31 +02:00