TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
1766951389aee27e5592e97ce8a6bc220138dfef
sterivein/core/lib/Thelia/Model
History
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
..
Base
Merge branch 'master' of https://github.com/thelia/thelia into coupon
2013-09-27 10:39:52 +02:00
Exception
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
Map
Merge branch 'master' of https://github.com/thelia/thelia into coupon
2013-09-27 10:39:52 +02:00
Tools
Finished product features management
2013-09-21 14:14:56 +02:00
Accessory.php
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-19 17:27:46 +02:00
AccessoryQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Address.php
allow to create a new address
2013-09-13 10:55:45 +02:00
AddressQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Admin.php
nstall step Please enter the commit message for your changes. Lines starting
2013-09-17 15:43:15 +02:00
AdminGroup.php
set x right to 7
2013-07-09 11:59:37 +02:00
AdminGroupQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
AdminLog.php
Merge branch 'master' of https://github.com/thelia/thelia
2013-07-12 14:22:58 +02:00
AdminLogQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
AdminQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Area.php
set x right to 7
2013-07-09 11:59:37 +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
set x right to 7
2013-07-09 11:59:37 +02:00
Attribute.php
Created AbstractCrudController, and refactored existing controllers
2013-09-12 13:02:40 +02:00
AttributeAv.php
AttributesAv management
2013-09-12 15:43:37 +02:00
AttributeAvI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
AttributeAvI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
AttributeAvQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
AttributeCombination.php
set x right to 7
2013-07-09 11:59:37 +02:00
AttributeCombinationQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
AttributeI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
AttributeI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
AttributeQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
AttributeTemplate.php
Aded feature_template and category_template position management
2013-09-21 11:46:09 +02:00
AttributeTemplateQuery.php
Implemented "Remember Me" feature on admin. Started template management
2013-09-16 09:23:44 +02:00
Cart.php
Merge branch 'master' into template
2013-09-16 15:32:17 +02:00
CartItem.php
cart integration
2013-09-16 13:15:35 +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
fix typo and remove url generation in postInsert model
2013-09-17 20:29:09 +02:00
CategoryAssociatedContent.php
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-19 17:27:46 +02:00
CategoryAssociatedContentQuery.php
associated content for categories and product tables + loop
2013-08-23 10:55:59 +02:00
CategoryDocument.php
WIP : upload documents : add action, ctrl, event
2013-09-24 10:54:52 +02:00
CategoryDocumentI18n.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
CategoryDocumentI18nQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
CategoryDocumentQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
CategoryI18n.php
move url generation to I18n entity
2013-09-17 20:45:29 +02:00
CategoryI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
CategoryImage.php
Working : Image management set on Category
2013-09-22 20:50:42 +02:00
CategoryImageI18n.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
CategoryImageI18nQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
CategoryImageQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
CategoryQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
CategoryVersion.php
set x right to 7
2013-07-09 11:59:37 +02:00
CategoryVersionQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Config.php
create cache for config entity
2013-09-16 08:56:44 +02:00
ConfigI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
ConfigI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
ConfigQuery.php
create helper for retrieving passed url view
2013-09-18 12:10:56 +02:00
Content.php
fire event on insert content in createmethod
2013-09-21 17:04:05 +02:00
ContentDocument.php
WIP : upload documents : add action, ctrl, event
2013-09-24 10:54:52 +02:00
ContentDocumentI18n.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ContentDocumentI18nQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ContentDocumentQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ContentFolder.php
set x right to 7
2013-07-09 11:59:37 +02:00
ContentFolderQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
ContentI18n.php
move url generation to I18n entity
2013-09-17 20:45:29 +02:00
ContentI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
ContentImage.php
Working : Image management set on Category
2013-09-22 20:50:42 +02:00
ContentImageI18n.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ContentImageI18nQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ContentImageQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ContentQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
ContentVersion.php
set x right to 7
2013-07-09 11:59:37 +02:00
ContentVersionQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Country.php
set x right to 7
2013-07-09 11:59:37 +02:00
CountryI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
CountryI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
CountryQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Coupon.php
WIP : coupon refactor + fix
2013-09-26 18:18:45 +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
set x right to 7
2013-07-09 11:59:37 +02:00
CouponOrderQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
CouponQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
CouponVersion.php
associated content for categories and product tables + loop
2013-08-23 10:55:59 +02:00
CouponVersionQuery.php
associated content for categories and product tables + loop
2013-08-23 10:55:59 +02:00
Currency.php
bug fix
2013-09-10 19:13:28 +02:00
CurrencyI18n.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
CurrencyI18nQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
CurrencyQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Customer.php
Implemented "Remember Me" feature on admin. Started template management
2013-09-16 09:23:44 +02:00
CustomerQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
CustomerTitle.php
set x right to 7
2013-07-09 11:59:37 +02:00
CustomerTitleI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
CustomerTitleI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
CustomerTitleQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Feature.php
Finished Features management
2013-09-16 10:40:52 +02:00
FeatureAv.php
Finished Features management
2013-09-16 10:40:52 +02:00
FeatureAvI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
FeatureAvI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
FeatureAvQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
FeatureI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
FeatureI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
FeatureProduct.php
Working catalog branch
2013-09-20 15:54:50 +02:00
FeatureProductQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
FeatureQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
FeatureTemplate.php
Aded feature_template and category_template position management
2013-09-21 11:46:09 +02:00
FeatureTemplateQuery.php
Implemented "Remember Me" feature on admin. Started template management
2013-09-16 09:23:44 +02:00
Folder.php
add dispatcher before/after for folder crud management
2013-09-20 19:57:25 +02:00
FolderDocument.php
WIP : upload documents : add action, ctrl, event
2013-09-24 10:54:52 +02:00
FolderDocumentI18n.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
FolderDocumentI18nQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
FolderDocumentQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
FolderI18n.php
fix typo and remove url generation in postInsert model
2013-09-17 20:29:09 +02:00
FolderI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
FolderImage.php
Working : Image management set on Category
2013-09-22 20:50:42 +02:00
FolderImageI18n.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
FolderImageI18nQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
FolderImageQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
FolderQuery.php
folder and content fake
2013-08-02 16:18:45 +02:00
FolderVersion.php
set x right to 7
2013-07-09 11:59:37 +02:00
FolderVersionQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Group.php
set x right to 7
2013-07-09 11:59:37 +02:00
GroupI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
GroupI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
GroupModule.php
set x right to 7
2013-07-09 11:59:37 +02:00
GroupModuleQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
GroupQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
GroupResource.php
set x right to 7
2013-07-09 11:59:37 +02:00
GroupResourceQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Lang.php
fix issue in Lang Model
2013-09-05 08:35:47 +02:00
LangQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Message.php
refactor name for updating actions
2013-09-04 10:48:59 +02:00
MessageI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
MessageI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
MessageQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
MessageVersion.php
set x right to 7
2013-07-09 11:59:37 +02:00
MessageVersionQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Module.php
set x right to 7
2013-07-09 11:59:37 +02:00
ModuleI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
ModuleI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +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
set x right to 7
2013-07-09 11:59:37 +02:00
Order.php
action order tests
2013-09-23 14:44:52 +02:00
OrderAddress.php
set x right to 7
2013-07-09 11:59:37 +02:00
OrderAddressQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
OrderFeature.php
set x right to 7
2013-07-09 11:59:37 +02:00
OrderFeatureQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
OrderProduct.php
order creation
2013-09-19 19:56:59 +02:00
OrderProductAttributeCombination.php
push model
2013-09-20 17:02:19 +02:00
OrderProductAttributeCombinationQuery.php
push model
2013-09-20 17:02:19 +02:00
OrderProductQuery.php
order creation
2013-09-19 19:56:59 +02:00
OrderProductTax.php
push model
2013-09-20 17:02:19 +02:00
OrderProductTaxQuery.php
push model
2013-09-20 17:02:19 +02:00
OrderQuery.php
order process
2013-09-20 16:25:46 +02:00
OrderStatus.php
order creation
2013-09-19 15:11:54 +02:00
OrderStatusI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
OrderStatusI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
OrderStatusQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Product.php
Impemented combination creation
2013-09-23 17:03:36 +02:00
ProductAssociatedContent.php
Finished product multiple categories attachment
2013-09-22 22:14:39 +02:00
ProductAssociatedContentQuery.php
associated content for categories and product tables + loop
2013-08-23 10:55:59 +02:00
ProductCategory.php
set x right to 7
2013-07-09 11:59:37 +02:00
ProductCategoryQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
ProductDocument.php
WIP : upload documents : add action, ctrl, event
2013-09-24 10:54:52 +02:00
ProductDocumentI18n.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ProductDocumentI18nQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ProductDocumentQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ProductI18n.php
fix typo and remove url generation in postInsert model
2013-09-17 20:29:09 +02:00
ProductI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
ProductImage.php
Working : Image management set on Category
2013-09-22 20:50:42 +02:00
ProductImageI18n.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ProductImageI18nQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ProductImageQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ProductPrice.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ProductPriceQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ProductQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
ProductSaleElements.php
cart page
2013-09-16 11:14:23 +02:00
ProductSaleElementsQuery.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
ProductVersion.php
set x right to 7
2013-07-09 11:59:37 +02:00
ProductVersionQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Resource.php
set x right to 7
2013-07-09 11:59:37 +02:00
ResourceI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
ResourceI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
ResourceQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
RewritingArgument.php
rewriting tables
2013-08-28 15:47:47 +02:00
RewritingArgumentQuery.php
rewriting tables
2013-08-28 15:47:47 +02:00
RewritingUrl.php
create test for UrlRewritingTrait
2013-09-17 20:15:28 +02:00
RewritingUrlQuery.php
rewriting
2013-09-03 16:51:41 +02:00
Tax.php
tax engine
2013-09-11 19:01:23 +02:00
TaxI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
TaxI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
TaxQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
TaxRule.php
order process
2013-09-20 16:25:46 +02:00
TaxRuleCountry.php
set x right to 7
2013-07-09 11:59:37 +02:00
TaxRuleCountryQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
TaxRuleI18n.php
set x right to 7
2013-07-09 11:59:37 +02:00
TaxRuleI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
TaxRuleQuery.php
order process
2013-09-20 16:25:46 +02:00
Template.php
Implemented "Remember Me" feature on admin. Started template management
2013-09-16 09:23:44 +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
Implemented "Remember Me" feature on admin. Started template management
2013-09-16 09:23:44 +02:00