Manuel Raynaud b1517945f4 Merge branch 'modules' ...

Conflicts:
	core/lib/Thelia/Controller/Admin/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Thelia.php

2013-11-06 14:37:31 +01:00

..

AbstractCrudController.php

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

AddressController.php

admin logs

2013-10-29 12:22:34 +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

datepicker in admin logs

2013-10-30 12:00:48 +01:00

AreaController.php

admin logs

2013-10-29 12:22:34 +01:00

AttributeAvController.php

new permission system in controllers

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

AttributeController.php

added timestamp parameter to format_date sparty plugin

2013-10-30 19:52:47 +01:00

BaseAdminController.php

Merge branch 'modules'

2013-11-06 14:37:31 +01:00

CategoryController.php

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

ConfigController.php

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

ContentController.php

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

CountryController.php

change http code status on different context

2013-10-23 12:38:32 +02:00

CouponController.php

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

CurrencyController.php

Implemented prices conversion management

2013-10-24 12:34:44 +02:00

CustomerController.php

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

FeatureAvController.php

new permission system in controllers

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

FeatureController.php

Combination creation management

2013-10-30 15:44:32 +01:00

FileController.php

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

FolderController.php

fix minor admin bugs

2013-10-23 19:23:29 +02:00

HomeController.php

admin home stats and information

2013-11-04 16:15:48 +01:00

LangController.php

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

LanguageController.php

fix cs

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

MailingSystemController.php

mailing sytem admin

2013-10-28 12:24:59 +01:00

MessageController.php

fix cs

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

ModuleController.php

fix cs

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

OrderController.php

Implementing translations (still in progress)

2013-11-06 10:49:03 +01:00

ProductController.php

Implementing translations (still in progress)

2013-11-06 10:49:03 +01:00

ProfileController.php

admin logs

2013-10-29 12:22:34 +01:00

SessionController.php

admin logs

2013-10-29 12:22:34 +01:00

ShippingZoneController.php

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

SystemLogController.php

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

TaxController.php

fix cs

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

TaxRuleController.php

admin logs

2013-10-29 12:22:34 +01:00

TemplateController.php

permission management

2013-10-22 11:09:24 +02:00

TranslationsController.php

Implementing translations (still in progress)

2013-11-06 10:49:03 +01:00