TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
faf2c1de77be796ee4dfca6770bc1844f73bb5d6
sterivein/core/lib/Thelia/Model
History
Etienne Roudeix 55a309c00a Merge branch 'master' into loops 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html
2013-07-05 11:16:55 +02:00
..
Base
Merge branch 'customer'
2013-07-04 19:46:08 +02:00
Map
Merge branch 'customer'
2013-07-04 19:46:08 +02:00
Accessory.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AccessoryQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Address.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AddressQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Admin.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AdminGroup.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AdminGroupQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AdminLog.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AdminLogQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AdminQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Area.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AreaQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Attribute.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AttributeAv.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AttributeAvI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AttributeAvI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AttributeAvQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AttributeCategory.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AttributeCategoryQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AttributeCombination.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AttributeCombinationQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AttributeI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AttributeI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
AttributeQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Category.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CategoryI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CategoryI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CategoryQuery.php
Merge branch 'master' into loops
2013-07-05 11:16:55 +02:00
CategoryVersion.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CategoryVersionQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Combination.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CombinationQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Config.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ConfigI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ConfigI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ConfigQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Content.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ContentAssoc.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ContentAssocQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ContentFolder.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ContentFolderQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ContentI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ContentI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ContentQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ContentVersion.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ContentVersionQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Country.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CountryI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CountryI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CountryQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Coupon.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CouponOrder.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CouponOrderQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CouponQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CouponRule.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CouponRuleQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Currency.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CurrencyQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Customer.php
end propel 2 migration
2013-07-05 09:43:49 +02:00
CustomerQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CustomerTitle.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CustomerTitleI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CustomerTitleI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
CustomerTitleQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Delivzone.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
DelivzoneQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Document.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
DocumentI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
DocumentI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
DocumentQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Feature.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FeatureAv.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FeatureAvI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FeatureAvI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FeatureAvQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FeatureCategory.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FeatureCategoryQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FeatureI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FeatureI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FeatureProd.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FeatureProdQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FeatureQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Folder.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FolderI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FolderI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FolderQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FolderVersion.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
FolderVersionQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Group.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
GroupI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
GroupI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
GroupModule.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
GroupModuleQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
GroupQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
GroupResource.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
GroupResourceQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Image.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ImageI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ImageI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ImageQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Lang.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
LangQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Message.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
MessageI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
MessageI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
MessageQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
MessageVersion.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
MessageVersionQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Module.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ModuleI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ModuleI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ModuleQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Order.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
OrderAddress.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
OrderAddressQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
OrderFeature.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
OrderFeatureQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
OrderProduct.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
OrderProductQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
OrderQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
OrderStatus.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
OrderStatusI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
OrderStatusI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
OrderStatusQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Product.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ProductCategory.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ProductCategoryQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ProductI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ProductI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ProductQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ProductVersion.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ProductVersionQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Resource.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ResourceI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ResourceI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
ResourceQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Rewriting.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
RewritingQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Stock.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
StockQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Tax.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
TaxI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
TaxI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
TaxQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
TaxRule.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
TaxRuleCountry.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
TaxRuleCountryQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
TaxRuleI18n.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
TaxRuleI18nQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
TaxRuleQuery.php
migrte propel to propel 2
2013-07-04 19:31:09 +02:00