Etienne Roudeix d0ff5260f7 Merge branch 'cleanmaster' into modules ...

Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php

2013-12-20 11:16:35 +01:00

..

AbstractCrudController.php

fix cs

2013-12-18 10:04:13 +01:00

AbstractSeoCrudController.php

fix cs

2013-12-18 10:04:13 +01:00

AddressController.php

fix cs

2013-12-18 10:04:13 +01:00

AdminController.php

fix cs

2013-09-30 10:35:34 +02:00

AdministratorController.php

fix cs

2013-10-25 10:07:21 +02:00

AdminLogsController.php

change signature

2013-11-08 14:35:29 +01:00

AreaController.php

change signature

2013-11-08 14:35:29 +01:00

AttributeAvController.php

new permission system in controllers

2013-10-25 08:59:09 +02:00

AttributeController.php

fix cs

2013-12-18 10:04:13 +01:00

BaseAdminController.php

Merge branch 'cleanmaster' into modules

2013-12-20 11:16:35 +01:00

CategoryController.php

fix cs

2013-12-18 10:04:13 +01:00

ConfigController.php

change signature

2013-11-08 14:35:29 +01:00

ConfigStoreController.php

fix cs

2013-12-18 10:04:13 +01:00

ContentController.php

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

2013-12-09 15:00:51 +01:00

CountryController.php

change signature

2013-11-08 14:35:29 +01:00

CouponController.php

Coupon : Fix namespace issues

2013-11-24 22:05:58 +01:00

CurrencyController.php

change signature

2013-11-08 14:35:29 +01:00

CustomerController.php

fix cs

2013-12-18 10:04:13 +01:00

FeatureAvController.php

new permission system in controllers

2013-10-25 08:59:09 +02:00

FeatureController.php

fix cs

2013-12-18 10:04:13 +01:00

FileController.php

fix cs

2013-12-18 10:04:13 +01:00

FolderController.php

fix missing id in folder-edit.html template

2013-12-16 17:06:15 +01:00

HomeController.php

fix cs

2013-12-18 10:04:13 +01:00

LangController.php

change signature

2013-11-08 14:35:29 +01:00

LanguageController.php

change signature

2013-11-08 14:35:29 +01:00

MailingSystemController.php

change signature

2013-11-08 14:35:29 +01:00

MessageController.php

fix cs

2013-12-18 10:04:13 +01:00

ModuleController.php

Merge branch 'cleanmaster' into modules

2013-12-20 11:16:35 +01:00

OrderController.php

fix cs

2013-12-18 10:04:13 +01:00

ProductController.php

Merge branch 'cleanmaster' into modules

2013-12-20 11:16:35 +01:00

ProfileController.php

change signature

2013-11-08 14:35:29 +01:00

SessionController.php

Change AdminLog logging request behavior, fixing issue #145

2013-12-14 14:16:45 +01:00

ShippingZoneController.php

change signature

2013-11-08 14:35:29 +01:00

SystemLogController.php

fix cs

2013-12-18 10:04:13 +01:00

TaxController.php

fix cs

2013-10-25 10:07:21 +02:00

TaxRuleController.php

change signature

2013-11-08 14:35:29 +01:00

TemplateController.php

change signature

2013-11-08 14:35:29 +01:00

TranslationsController.php

fix cs

2013-12-18 10:04:13 +01:00