Benjamin Perche cb75c13716 Working import stock ...

modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/Event/ImportExport.php
	modifié:         core/lib/Thelia/Core/Event/TheliaEvents.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/JsonFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	modifié:         templates/backOffice/default/ajax/import-modal.html
	modifié:         templates/backOffice/default/import-page.html

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

..

Bundle

Add compiler pass for archive builders and formatters managers

2014-08-01 12:47:59 +02:00

Controller

change license header

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

DependencyInjection

Refactor ImportExportController into two logical controllers

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

Event

Working import stock

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

EventListener

various fixes from insight

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

FileFormat

Working import stock

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

Form/Type

change license header

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

HttpFoundation

Added a default value for getConsumedCoupons()

2014-07-22 18:58:55 +02:00

HttpKernel

add missing class. Fix #493

2014-06-21 13:15:41 +02:00

Routing

change license header

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

Security

Fix import loop and a resource

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

Template

Refactor and fix CS

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

Translation

various fixes from insight

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

Application.php

change license header

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

Thelia.php

Merge branch 'master' into tinymce

2014-06-19 00:16:21 +02:00

TheliaContainerBuilder.php

change license header

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

TheliaHttpKernel.php

various fixes from insight

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

TheliaKernelEvents.php

Fix cs

2014-06-04 13:43:03 +02:00