TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
1766951389aee27e5592e97ce8a6bc220138dfef
sterivein/core/lib/Thelia/Model/Map
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
..
AccessoryTableMap.php
WIP
2013-09-03 11:02:36 +02:00
AddressTableMap.php
Merge branch 'master' of https://github.com/thelia/thelia into coupon
2013-09-04 15:42:38 +02:00
AdminGroupTableMap.php
WIP
2013-09-03 11:02:36 +02:00
AdminLogTableMap.php
WIP
2013-09-03 11:02:36 +02:00
AdminTableMap.php
Implemented "Remember Me" feature on admin. Started template management
2013-09-16 09:23:44 +02:00
AreaDeliveryModuleTableMap.php
delivery process
2013-09-17 12:38:23 +02:00
AreaTableMap.php
delivery process
2013-09-17 12:38:23 +02:00
AttributeAvI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
AttributeAvTableMap.php
WIP
2013-09-03 11:02:36 +02:00
AttributeCombinationTableMap.php
Finished product feature values
2013-09-20 23:10:31 +02:00
AttributeI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
AttributeTableMap.php
Implemented "Remember Me" feature on admin. Started template management
2013-09-16 09:23:44 +02:00
AttributeTemplateTableMap.php
Merge branch 'master' of https://github.com/thelia/thelia into coupon
2013-09-27 10:39:52 +02:00
CartItemTableMap.php
add promo column in cart_item
2013-09-16 10:16:54 +02:00
CartTableMap.php
update cart model
2013-09-12 15:40:49 +02:00
CategoryAssociatedContentTableMap.php
associated content for categories and product tables + loop
2013-08-23 10:55:59 +02:00
CategoryDocumentI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
CategoryDocumentTableMap.php
WIP
2013-09-03 11:02:36 +02:00
CategoryI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
CategoryImageI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
CategoryImageTableMap.php
WIP
2013-09-03 11:02:36 +02:00
CategoryTableMap.php
Implemented "Remember Me" feature on admin. Started template management
2013-09-16 09:23:44 +02:00
CategoryVersionTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ConfigI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ConfigTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ContentDocumentI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ContentDocumentTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ContentFolderTableMap.php
delivery process
2013-09-17 12:38:23 +02:00
ContentI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ContentImageI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ContentImageTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ContentTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ContentVersionTableMap.php
WIP
2013-09-03 11:02:36 +02:00
CountryI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
CountryTableMap.php
default country
2013-09-16 15:30:46 +02:00
CouponI18nTableMap.php
update address model
2013-09-03 14:01:07 +02:00
CouponOrderTableMap.php
update address model
2013-09-03 14:01:07 +02:00
CouponTableMap.php
WIP : coupon refactor + fix
2013-09-26 17:47:41 +02:00
CouponVersionTableMap.php
WIP : coupon refactor + fix
2013-09-26 17:47:41 +02:00
CurrencyI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
CurrencyTableMap.php
delivery form
2013-09-17 11:05:29 +02:00
CustomerTableMap.php
delivery form
2013-09-17 11:05:29 +02:00
CustomerTitleI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
CustomerTitleTableMap.php
WIP
2013-09-03 11:02:36 +02:00
FeatureAvI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
FeatureAvTableMap.php
WIP
2013-09-03 11:02:36 +02:00
FeatureI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
FeatureProductTableMap.php
WIP : coupon refactor + fix
2013-09-26 17:47:41 +02:00
FeatureTableMap.php
WIP : coupon refactor + fix
2013-09-26 17:47:41 +02:00
FeatureTemplateTableMap.php
WIP : coupon refactor + fix
2013-09-26 17:47:41 +02:00
FolderDocumentI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
FolderDocumentTableMap.php
WIP
2013-09-03 11:02:36 +02:00
FolderI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
FolderImageI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
FolderImageTableMap.php
WIP
2013-09-03 11:02:36 +02:00
FolderTableMap.php
WIP
2013-09-03 11:02:36 +02:00
FolderVersionTableMap.php
WIP
2013-09-03 11:02:36 +02:00
GroupI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
GroupModuleTableMap.php
WIP
2013-09-03 11:02:36 +02:00
GroupResourceTableMap.php
WIP
2013-09-03 11:02:36 +02:00
GroupTableMap.php
WIP
2013-09-03 11:02:36 +02:00
LangTableMap.php
delivery form
2013-09-17 11:05:29 +02:00
MessageI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
MessageTableMap.php
WIP
2013-09-03 11:02:36 +02:00
MessageVersionTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ModuleI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ModuleImageI18nTableMap.php
module image
2013-09-18 11:20:29 +02:00
ModuleImageTableMap.php
module image
2013-09-18 11:20:29 +02:00
ModuleTableMap.php
module image
2013-09-18 11:20:29 +02:00
OrderAddressTableMap.php
delivery form
2013-09-17 11:05:29 +02:00
OrderFeatureTableMap.php
WIP
2013-09-03 11:02:36 +02:00
OrderProductAttributeCombinationTableMap.php
WIP : coupon refactor + fix
2013-09-26 17:47:41 +02:00
OrderProductTableMap.php
Working catalog branch
2013-09-20 15:54:50 +02:00
OrderProductTaxTableMap.php
WIP : coupon refactor + fix
2013-09-26 17:47:41 +02:00
OrderStatusI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
OrderStatusTableMap.php
order creation
2013-09-19 15:11:54 +02:00
OrderTableMap.php
order creation
2013-09-19 15:11:54 +02:00
ProductAssociatedContentTableMap.php
associated content for categories and product tables + loop
2013-08-23 10:55:59 +02:00
ProductCategoryTableMap.php
delivery process
2013-09-17 12:38:23 +02:00
ProductDocumentI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ProductDocumentTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ProductI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ProductImageI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ProductImageTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ProductPriceTableMap.php
product price
2013-09-10 12:04:33 +02:00
ProductSaleElementsTableMap.php
WIP : coupon refactor + fix
2013-09-26 17:47:41 +02:00
ProductTableMap.php
template is not mandatory in product table.
2013-09-17 19:19:52 +02:00
ProductVersionTableMap.php
template is not mandatory in product table.
2013-09-17 19:19:52 +02:00
ResourceI18nTableMap.php
WIP
2013-09-03 11:02:36 +02:00
ResourceTableMap.php
WIP
2013-09-03 11:02:36 +02:00
RewritingArgumentTableMap.php
rewriting tables
2013-08-28 15:47:47 +02:00
RewritingUrlTableMap.php
Completed mailing templates management
2013-09-02 16:21:49 +02:00
TaxI18nTableMap.php
Working catalog branch
2013-09-20 15:54:50 +02:00
TaxRuleCountryTableMap.php
Merge branch 'tax'
2013-09-09 16:28:32 +02:00
TaxRuleI18nTableMap.php
Working catalog branch
2013-09-20 15:54:50 +02:00
TaxRuleTableMap.php
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-18 00:35:48 +02:00
TaxTableMap.php
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-17 23:51:31 +02:00
TemplateI18nTableMap.php
Implemented "Remember Me" feature on admin. Started template management
2013-09-16 09:23:44 +02:00
TemplateTableMap.php
Implemented "Remember Me" feature on admin. Started template management
2013-09-16 09:23:44 +02:00