Benjamin Perche e94f8e9591 Fix error while rebasing ...

modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php

2014-08-01 12:48:03 +02:00

..

AbstractCrudController.php

change license header

2014-04-18 09:36:41 +02:00

AbstractSeoCrudController.php

change license header

2014-04-18 09:36:41 +02:00

AddressController.php

change license header

2014-04-18 09:36:41 +02:00

AdminController.php

change license header

2014-04-18 09:36:41 +02:00

AdministratorController.php

change license header

2014-04-18 09:36:41 +02:00

AdminLogsController.php

Fixed missing constant

2014-04-24 12:31:20 +02:00

AdvancedConfigurationController.php

change price if needed when customer log in or log out

2014-04-29 11:35:10 +02:00

AreaController.php

areai_id -> area_id in removeCountry()

2014-04-22 15:25:37 +02:00

AttributeAvController.php

change license header

2014-04-18 09:36:41 +02:00

AttributeController.php

change license header

2014-04-18 09:36:41 +02:00

BaseAdminController.php

Refactoring of images and documents management

2014-06-26 10:36:12 +02:00

BrandController.php

Added brand logo image selection

2014-06-27 21:07:51 +02:00

CategoryController.php

Add pagination to the product list (backOffice)

2014-06-03 12:35:52 +02:00

ConfigController.php

change license header

2014-04-18 09:36:41 +02:00

ConfigStoreController.php

Add store_description field for SEO

2014-06-26 14:25:04 +02:00

ConfigurationController.php

fix cart item prices when not on default currency

2014-04-25 16:55:20 +02:00

ContentController.php

change license header

2014-04-18 09:36:41 +02:00

CountryController.php

various fixes from insight

2014-06-18 09:33:32 +02:00

CouponController.php

remove unused use statement

2014-06-24 10:29:17 +02:00

CurrencyController.php

change license header

2014-04-18 09:36:41 +02:00

CustomerController.php

add discount input on customer form

2014-04-29 10:56:07 +02:00

CustomerExportController.php

Add XML export and export_category definition and Fix CS

2014-08-01 12:48:03 +02:00

ExportController.php

Add XML export and export_category definition and Fix CS

2014-08-01 12:48:03 +02:00

FeatureAvController.php

change license header

2014-04-18 09:36:41 +02:00

FeatureController.php

change license header

2014-04-18 09:36:41 +02:00

FileController.php

Fixed "with the close or save and close button you get an exception"

2014-07-07 22:44:39 +02:00

FolderController.php

change license header

2014-04-18 09:36:41 +02:00

HomeController.php

change license header

2014-04-18 09:36:41 +02:00

ImportExportController.php

Fix error while rebasing

2014-08-01 12:48:03 +02:00

LangController.php

complete lang form including money format

2014-05-06 10:53:16 +02:00

LanguageController.php

change license header

2014-04-18 09:36:41 +02:00

MailingSystemController.php

change license header

2014-04-18 09:36:41 +02:00

MessageController.php

change license header

2014-04-18 09:36:41 +02:00

ModuleController.php

change license header

2014-04-18 09:36:41 +02:00

OrderController.php

Fixed Thelia\Model\Base uses.

2014-05-18 20:19:48 +02:00

ProductController.php

PHP-CS fixer pass

2014-07-01 01:07:56 +02:00

ProfileController.php

fix minor bug

2014-05-09 10:55:50 +02:00

SessionController.php

fix minor bug

2014-05-09 10:55:50 +02:00

ShippingZoneController.php

change license header

2014-04-18 09:36:41 +02:00

SystemLogController.php

change license header

2014-04-18 09:36:41 +02:00

TaxController.php

change license header

2014-04-18 09:36:41 +02:00

TaxRuleController.php

fix minor bug

2014-05-09 10:55:50 +02:00

TemplateController.php

change license header

2014-04-18 09:36:41 +02:00

ToolsController.php

fix cart item prices when not on default currency

2014-04-25 16:55:20 +02:00

TranslationsController.php

remove commented code

2014-06-24 10:30:46 +02:00