sterivein

Files

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

# By gmorel (24) and others
# Via gmorel (12) and others
* 'master' of https://github.com/thelia/thelia: (43 commits)
  Working : upload file/image : fix sanitizeFileName
  Working : images : enhance display
  Working : Fix : Unit test
  Working : Fix : Unit test
  Working : Fix : Image Management + Document Management
  Working : FileManager :Add some more unit tests
  Working : Add a link on documents
  Working : fix url document + refactor : naming conventions
  Working : refactor : naming conventions
  Working : upload : fix unit test
  WIP : upload documents : add action, ctrl, event
  Finished product combination basic function
  WIP : upload document : add forms
  Working : upload image : fix return URL to images tab
  Working : upload image : fix fallback and delete links on refresh
  Formatted combination table
  Impemented combination creation
  Working : Upload image : Fix upload validation
  - Image format allowed - manual-reverse order on image loop
  Upload allow only for images
  ...

Conflicts:
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/faker.php
	install/thelia.sql
	local/config/schema.xml
	templates/admin/default/assets/js/coupon.js
	tests/functionnal/casperjs/exe/00_parameters.js
	tests/functionnal/casperjs/exe/31_coupons_rule.js

2013-09-27 10:39:52 +02:00

Accessory.php

WIP

2013-09-03 11:02:36 +02:00

AccessoryQuery.php

WIP

2013-09-03 11:02:36 +02:00

Address.php

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

2013-09-04 15:42:38 +02:00

AddressQuery.php

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

2013-09-04 15:42:38 +02:00

Admin.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

AdminGroup.php

WIP

2013-09-03 11:02:36 +02:00

AdminGroupQuery.php

WIP

2013-09-03 11:02:36 +02:00

AdminLog.php

WIP

2013-09-03 11:02:36 +02:00

AdminLogQuery.php

WIP

2013-09-03 11:02:36 +02:00

AdminQuery.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

Area.php

delivery process

2013-09-17 12:38:23 +02:00

AreaDeliveryModule.php

delivery process

2013-09-17 12:38:23 +02:00

AreaDeliveryModuleQuery.php

delivery process

2013-09-17 12:38:23 +02:00

AreaQuery.php

delivery process

2013-09-17 12:38:23 +02:00

Attribute.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

AttributeAv.php

WIP

2013-09-03 11:02:36 +02:00

AttributeAvI18n.php

WIP

2013-09-03 11:02:36 +02:00

AttributeAvI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

AttributeAvQuery.php

WIP

2013-09-03 11:02:36 +02:00

AttributeCombination.php

Finished product feature values

2013-09-20 23:10:31 +02:00

AttributeCombinationQuery.php

Finished product feature values

2013-09-20 23:10:31 +02:00

AttributeI18n.php

WIP

2013-09-03 11:02:36 +02:00

AttributeI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

AttributeQuery.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

AttributeTemplate.php

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

2013-09-27 10:39:52 +02:00

AttributeTemplateQuery.php

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

2013-09-27 10:39:52 +02:00

Cart.php

update cart model

2013-09-12 15:40:49 +02:00

CartItem.php

add promo column in cart_item

2013-09-16 10:16:54 +02:00

CartItemQuery.php

add promo column in cart_item

2013-09-16 10:16:54 +02:00

CartQuery.php

update cart model

2013-09-12 15:40:49 +02:00

Category.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

CategoryAssociatedContent.php

WIP

2013-09-03 11:02:36 +02:00

CategoryAssociatedContentQuery.php

associated content for categories and product tables + loop

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

CategoryDocument.php

WIP

2013-09-03 11:02:36 +02:00

CategoryDocumentI18n.php

WIP

2013-09-03 11:02:36 +02:00

CategoryDocumentI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

CategoryDocumentQuery.php

WIP

2013-09-03 11:02:36 +02:00

CategoryI18n.php

WIP

2013-09-03 11:02:36 +02:00

CategoryI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

CategoryImage.php

WIP

2013-09-03 11:02:36 +02:00

CategoryImageI18n.php

WIP

2013-09-03 11:02:36 +02:00

CategoryImageI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

CategoryImageQuery.php

WIP

2013-09-03 11:02:36 +02:00

CategoryQuery.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

CategoryVersion.php

WIP

2013-09-03 11:02:36 +02:00

CategoryVersionQuery.php

WIP

2013-09-03 11:02:36 +02:00

Config.php

WIP

2013-09-03 11:02:36 +02:00

ConfigI18n.php

WIP

2013-09-03 11:02:36 +02:00

ConfigI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

ConfigQuery.php

WIP

2013-09-03 11:02:36 +02:00

Content.php

WIP

2013-09-03 11:02:36 +02:00

ContentDocument.php

WIP

2013-09-03 11:02:36 +02:00

ContentDocumentI18n.php

WIP

2013-09-03 11:02:36 +02:00

ContentDocumentI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

ContentDocumentQuery.php

WIP

2013-09-03 11:02:36 +02:00

ContentFolder.php

delivery process

2013-09-17 12:38:23 +02:00

ContentFolderQuery.php

delivery process

2013-09-17 12:38:23 +02:00

ContentI18n.php

WIP

2013-09-03 11:02:36 +02:00

ContentI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

ContentImage.php

WIP

2013-09-03 11:02:36 +02:00

ContentImageI18n.php

WIP

2013-09-03 11:02:36 +02:00

ContentImageI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

ContentImageQuery.php

WIP

2013-09-03 11:02:36 +02:00

ContentQuery.php

WIP

2013-09-03 11:02:36 +02:00

ContentVersion.php

WIP

2013-09-03 11:02:36 +02:00

ContentVersionQuery.php

WIP

2013-09-03 11:02:36 +02:00

Country.php

default country

2013-09-16 15:30:46 +02:00

CountryI18n.php

WIP

2013-09-03 11:02:36 +02:00

CountryI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

CountryQuery.php

default country

2013-09-16 15:30:46 +02:00

Coupon.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

CouponI18n.php

update address model

2013-09-03 14:01:07 +02:00

CouponI18nQuery.php

update address model

2013-09-03 14:01:07 +02:00

CouponOrder.php

update address model

2013-09-03 14:01:07 +02:00

CouponOrderQuery.php

update address model

2013-09-03 14:01:07 +02:00

CouponQuery.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

CouponVersion.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

CouponVersionQuery.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

Currency.php

delivery form

2013-09-17 11:05:29 +02:00

CurrencyI18n.php

WIP

2013-09-03 11:02:36 +02:00

CurrencyI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

CurrencyQuery.php

delivery form

2013-09-17 11:05:29 +02:00

Customer.php

delivery form

2013-09-17 11:05:29 +02:00

CustomerQuery.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

CustomerTitle.php

WIP

2013-09-03 11:02:36 +02:00

CustomerTitleI18n.php

WIP

2013-09-03 11:02:36 +02:00

CustomerTitleI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

CustomerTitleQuery.php

WIP

2013-09-03 11:02:36 +02:00

Feature.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

FeatureAv.php

WIP

2013-09-03 11:02:36 +02:00

FeatureAvI18n.php

WIP

2013-09-03 11:02:36 +02:00

FeatureAvI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

FeatureAvQuery.php

WIP

2013-09-03 11:02:36 +02:00

FeatureI18n.php

WIP

2013-09-03 11:02:36 +02:00

FeatureI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

FeatureProduct.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

FeatureProductQuery.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

FeatureQuery.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

FeatureTemplate.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

FeatureTemplateQuery.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

Folder.php

WIP

2013-09-03 11:02:36 +02:00

FolderDocument.php

WIP

2013-09-03 11:02:36 +02:00

FolderDocumentI18n.php

WIP

2013-09-03 11:02:36 +02:00

FolderDocumentI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

FolderDocumentQuery.php

WIP

2013-09-03 11:02:36 +02:00

FolderI18n.php

WIP

2013-09-03 11:02:36 +02:00

FolderI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

FolderImage.php

WIP

2013-09-03 11:02:36 +02:00

FolderImageI18n.php

WIP

2013-09-03 11:02:36 +02:00

FolderImageI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

FolderImageQuery.php

WIP

2013-09-03 11:02:36 +02:00

FolderQuery.php

WIP

2013-09-03 11:02:36 +02:00

FolderVersion.php

WIP

2013-09-03 11:02:36 +02:00

FolderVersionQuery.php

WIP

2013-09-03 11:02:36 +02:00

Group.php

WIP

2013-09-03 11:02:36 +02:00

GroupI18n.php

WIP

2013-09-03 11:02:36 +02:00

GroupI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

GroupModule.php

WIP

2013-09-03 11:02:36 +02:00

GroupModuleQuery.php

WIP

2013-09-03 11:02:36 +02:00

GroupQuery.php

WIP

2013-09-03 11:02:36 +02:00

GroupResource.php

WIP

2013-09-03 11:02:36 +02:00

GroupResourceQuery.php

WIP

2013-09-03 11:02:36 +02:00

Lang.php

delivery form

2013-09-17 11:05:29 +02:00

LangQuery.php

delivery form

2013-09-17 11:05:29 +02:00

Message.php

WIP

2013-09-03 11:02:36 +02:00

MessageI18n.php

WIP

2013-09-03 11:02:36 +02:00

MessageI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

MessageQuery.php

WIP

2013-09-03 11:02:36 +02:00

MessageVersion.php

WIP

2013-09-03 11:02:36 +02:00

MessageVersionQuery.php

WIP

2013-09-03 11:02:36 +02:00

Module.php

module image

2013-09-18 11:20:29 +02:00

ModuleI18n.php

WIP

2013-09-03 11:02:36 +02:00

ModuleI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

ModuleImage.php

module image

2013-09-18 11:20:29 +02:00

ModuleImageI18n.php

module image

2013-09-18 11:20:29 +02:00

ModuleImageI18nQuery.php

module image

2013-09-18 11:20:29 +02:00

ModuleImageQuery.php

module image

2013-09-18 11:20:29 +02:00

ModuleQuery.php

module image

2013-09-18 11:20:29 +02:00

Order.php

add abstract getDispatcher method to use CartTrai

2013-09-19 16:06:42 +02:00

OrderAddress.php

delivery form

2013-09-17 11:05:29 +02:00

OrderAddressQuery.php

delivery form

2013-09-17 11:05:29 +02:00

OrderFeature.php

WIP

2013-09-03 11:02:36 +02:00

OrderFeatureQuery.php

WIP

2013-09-03 11:02:36 +02:00

OrderProduct.php

Working catalog branch

2013-09-20 15:54:50 +02:00

OrderProductAttributeCombination.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

OrderProductAttributeCombinationQuery.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

OrderProductQuery.php

Working catalog branch

2013-09-20 15:54:50 +02:00

OrderProductTax.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

OrderProductTaxQuery.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

OrderQuery.php

delivery form

2013-09-17 11:05:29 +02:00

OrderStatus.php

delivery form

2013-09-17 11:05:29 +02:00

OrderStatusI18n.php

WIP

2013-09-03 11:02:36 +02:00

OrderStatusI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

OrderStatusQuery.php

delivery form

2013-09-17 11:05:29 +02:00

Product.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

ProductAssociatedContent.php

WIP

2013-09-03 11:02:36 +02:00

ProductAssociatedContentQuery.php

associated content for categories and product tables + loop

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

ProductCategory.php

delivery process

2013-09-17 12:38:23 +02:00

ProductCategoryQuery.php

delivery process

2013-09-17 12:38:23 +02:00

ProductDocument.php

WIP

2013-09-03 11:02:36 +02:00

ProductDocumentI18n.php

WIP

2013-09-03 11:02:36 +02:00

ProductDocumentI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

ProductDocumentQuery.php

WIP

2013-09-03 11:02:36 +02:00

ProductI18n.php

WIP

2013-09-03 11:02:36 +02:00

ProductI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

ProductImage.php

WIP

2013-09-03 11:02:36 +02:00

ProductImageI18n.php

WIP

2013-09-03 11:02:36 +02:00

ProductImageI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

ProductImageQuery.php

WIP

2013-09-03 11:02:36 +02:00

ProductPrice.php

product price

2013-09-10 12:04:33 +02:00

ProductPriceQuery.php

product price

2013-09-10 12:04:33 +02:00

ProductQuery.php

template is not mandatory in product table.

2013-09-17 19:19:52 +02:00

ProductSaleElements.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

ProductSaleElementsQuery.php

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

ProductVersion.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

ProductVersionQuery.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

Resource.php

WIP

2013-09-03 11:02:36 +02:00

ResourceI18n.php

WIP

2013-09-03 11:02:36 +02:00

ResourceI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

ResourceQuery.php

WIP

2013-09-03 11:02:36 +02:00

RewritingArgument.php

WIP

2013-09-03 11:02:36 +02:00

RewritingArgumentQuery.php

rewriting tables

2013-08-28 15:47:47 +02:00

RewritingUrl.php

WIP

2013-09-03 11:02:36 +02:00

RewritingUrlQuery.php

rewriting tables

2013-08-28 15:47:47 +02:00

Tax.php

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-17 23:51:31 +02:00

TaxI18n.php

WIP

2013-09-03 11:02:36 +02:00

TaxI18nQuery.php

WIP

2013-09-03 11:02:36 +02:00

TaxQuery.php

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-17 23:51:31 +02:00

TaxRule.php

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-18 00:35:48 +02:00

TaxRuleCountry.php

Merge branch 'tax'

2013-09-09 16:28:32 +02:00

TaxRuleCountryQuery.php

Merge branch 'tax'

2013-09-09 16:28:32 +02:00

TaxRuleI18n.php

Merge branch 'tax'

2013-09-09 16:28:32 +02:00

TaxRuleI18nQuery.php

Merge branch 'tax'

2013-09-09 16:28:32 +02:00

TaxRuleQuery.php

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-18 00:35:48 +02:00

Template.php

template is not mandatory in product table.

2013-09-17 19:19:52 +02:00

TemplateI18n.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

TemplateI18nQuery.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

TemplateQuery.php

template is not mandatory in product table.

2013-09-17 19:19:52 +02:00