TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
86d6a0fa053b5489cc7675d905ee575dfb6cec44
sterivein/core/lib/Thelia/Model
History
gmorel 86d6a0fa05 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (18) and others
# Via franck (9) and others
* 'master' of https://github.com/thelia/thelia: (39 commits)
  Working :
  Working :
  Working :
  Working :
  Fixed minor visual glitches
  Working : Resize countries flag + Add bootstrap-switch
  fix test suite
  clear asset cache in cache:cler command
  Added a 'development mode' to assetic smarty plugin
  rewriting router
  use good Request object
  Added Tools\URL test case, and a test case superclass for initializing Tools\URL
  remove unused UrlWritin controller
  create router for rewriting matching
  customer substitutions
  fix typo in front id
  Working : For attributes on labels
  Working : For attributes on labels
  add label_attr attribute to form smarty plugin
  start refactorin rewriting routing
  ...

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/less/thelia/bootstrap-editable.less
	templates/admin/default/categories.html
2013-09-06 19:36:52 +02:00
..
Base
Merge branch 'master' of https://github.com/thelia/thelia into coupon
2013-09-06 19:36: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-06 19:36:52 +02:00
Tools
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-05 23:30:50 +02:00
Accessory.php
set x right to 7
2013-07-09 11:59:37 +02:00
AccessoryQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Address.php
validate create and update address in front context
2013-09-04 17:52:58 +02:00
AddressQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Admin.php
Added command for creating admin users on console
2013-08-28 14:23:50 +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
AreaQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Attribute.php
set x right to 7
2013-07-09 11:59:37 +02:00
AttributeAv.php
set x right to 7
2013-07-09 11:59: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
AttributeCategory.php
set x right to 7
2013-07-09 11:59:37 +02:00
AttributeCategoryQuery.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
Cart.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
CartItem.php
refactor name for updating actions
2013-09-04 10:48:59 +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
Fixed image tests
2013-09-04 17:59:07 +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
Merge branch 'master' into loops
2013-08-21 09:19:56 +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
set x right to 7
2013-07-09 11:59:37 +02:00
CategoryI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
CategoryImage.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +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
refactor name for updating actions
2013-09-04 10:48:59 +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
404 not found management
2013-09-04 10:02:58 +02:00
Content.php
Fixed image tests
2013-09-04 17:59:07 +02:00
ContentDocument.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +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
set x right to 7
2013-07-09 11:59:37 +02:00
ContentI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
ContentImage.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +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
2013-09-06 11:47:00 +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
CouponRule.php
set x right to 7
2013-07-09 11:59:37 +02:00
CouponRuleQuery.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
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-05 23:30:50 +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
validate create and update address in front context
2013-09-04 17:52:58 +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
Delivzone.php
set x right to 7
2013-07-09 11:59:37 +02:00
DelivzoneQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Feature.php
set x right to 7
2013-07-09 11:59:37 +02:00
FeatureAv.php
set x right to 7
2013-07-09 11:59:37 +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
FeatureCategory.php
set x right to 7
2013-07-09 11:59:37 +02:00
FeatureCategoryQuery.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
Merge branch 'master' into loops
2013-08-21 09:19:56 +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
Folder.php
Fixed image tests
2013-09-04 17:59:07 +02:00
FolderDocument.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +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
set x right to 7
2013-07-09 11:59:37 +02:00
FolderI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
FolderImage.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +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
ModuleQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
Order.php
set x right to 7
2013-07-09 11:59:37 +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
set x right to 7
2013-07-09 11:59:37 +02:00
OrderProductQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
OrderQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
OrderStatus.php
set x right to 7
2013-07-09 11:59:37 +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
Fixed image tests
2013-09-04 17:59:07 +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
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
Merge branch 'master' into loops
2013-08-21 09:19:56 +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
set x right to 7
2013-07-09 11:59:37 +02:00
ProductI18nQuery.php
set x right to 7
2013-07-09 11:59:37 +02:00
ProductImage.php
Merge branch 'master' into loops
2013-08-21 09:19:56 +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
Merge branch 'master' into loops
2013-08-21 09:19:56 +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
Rewriting.php
WIP
2013-09-03 11:02:36 +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
RewritingQuery.php
WIP
2013-09-03 11:02:36 +02:00
RewritingUrl.php
rewriting tables
2013-08-28 15:47:47 +02:00
RewritingUrlQuery.php
rewriting
2013-09-03 16:51:41 +02:00
Tax.php
set x right to 7
2013-07-09 11:59:37 +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
set x right to 7
2013-07-09 11:59:37 +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
set x right to 7
2013-07-09 11:59:37 +02:00