TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,198 Commits 1 Branch 0 Tags
0cb0e893824b8c69f413eeda0b58c2980ad8f090
Commit Graph

662 Commits

Author SHA1 Message Date
Benjamin Perche
0cb0e89382 Continue import export management 
modifié:         core/lib/Thelia/Config/Resources/loop.xml
	nouveau fichier: core/lib/Thelia/Core/Template/Loop/ImportExportCategory.php
	nouveau fichier: core/lib/Thelia/Core/Template/Loop/ImportExportType.php
	nouveau fichier: core/lib/Thelia/Form/ExportForm.php
	modifié:         core/lib/Thelia/Model/Base/ImportExportType.php
	modifié:         core/lib/Thelia/Model/Base/ImportExportTypeQuery.php
	modifié:         core/lib/Thelia/Model/Map/ImportExportTypeTableMap.php
	modifié:         local/config/schema.xml
	modifié:         setup/thelia.sql
	modifié:         templates/backOffice/default/export.html
 2014-08-01 12:48:01 +02:00
Benjamin Perche
d1f5087d00 Begin import export management 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Config/Resources/form.xml
	modifié:         core/lib/Thelia/Config/Resources/loop.xml
	modifié:         core/lib/Thelia/Config/Resources/routing/admin.xml
	renommé:         core/lib/Thelia/Form/ImportExport/BaseExportForm.php -> core/lib/Thelia/Controller/Admin/CustomerExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterArchiveBuilderPass.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterFormatterPass.php
	nouveau fichier: core/lib/Thelia/Core/Template/Loop/ArchiveBuilder.php
	nouveau fichier: core/lib/Thelia/Core/Template/Loop/Formatter.php
	nouveau fichier: core/lib/Thelia/Model/Base/ImportExportCategory.php
	nouveau fichier: core/lib/Thelia/Model/Base/ImportExportCategoryI18n.php
	nouveau fichier: core/lib/Thelia/Model/Base/ImportExportCategoryI18nQuery.php
	nouveau fichier: core/lib/Thelia/Model/Base/ImportExportCategoryQuery.php
	nouveau fichier: core/lib/Thelia/Model/Base/ImportExportType.php
	nouveau fichier: core/lib/Thelia/Model/Base/ImportExportTypeI18n.php
	nouveau fichier: core/lib/Thelia/Model/Base/ImportExportTypeI18nQuery.php
	nouveau fichier: core/lib/Thelia/Model/Base/ImportExportTypeQuery.php
	nouveau fichier: core/lib/Thelia/Model/ImportExportCategory.php
	nouveau fichier: core/lib/Thelia/Model/ImportExportCategoryI18n.php
	nouveau fichier: core/lib/Thelia/Model/ImportExportCategoryI18nQuery.php
	nouveau fichier: core/lib/Thelia/Model/ImportExportCategoryQuery.php
	nouveau fichier: core/lib/Thelia/Model/ImportExportType.php
	nouveau fichier: core/lib/Thelia/Model/ImportExportTypeI18n.php
	nouveau fichier: core/lib/Thelia/Model/ImportExportTypeI18nQuery.php
	nouveau fichier: core/lib/Thelia/Model/ImportExportTypeQuery.php
	nouveau fichier: core/lib/Thelia/Model/Map/ImportExportCategoryI18nTableMap.php
	nouveau fichier: core/lib/Thelia/Model/Map/ImportExportCategoryTableMap.php
	nouveau fichier: core/lib/Thelia/Model/Map/ImportExportTypeI18nTableMap.php
	nouveau fichier: core/lib/Thelia/Model/Map/ImportExportTypeTableMap.php
	modifié:         local/config/schema.xml
	modifié:         setup/thelia.sql
	modifié:         templates/backOffice/default/export.html
	nouveau fichier: templates/backOffice/default/includes/export-form-definition.html
 2014-08-01 12:48:01 +02:00
Benjamin Perche
df0ba3676c Readd services 2014-08-01 12:48:01 +02:00
Benjamin Perche
d1a6d55a72 Fix services 
modifié:         core/lib/Thelia/Config/Resources/config.xml
 2014-08-01 12:48:00 +02:00
Benjamin Perche
ed3a932f92 Finish tar, tar.gz, tar.bz2 and tests 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilderTest.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
 2014-08-01 12:48:00 +02:00
Benjamin Perche
9eecad5658 Begin tar, tar.bz2 and tar.gz formatter, fix zip test resources 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/bad_formatted.zip
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/well_formatted.zip
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
 2014-08-01 12:48:00 +02:00
Benjamin Perche
d5188bfe3c Add archive builder manager and formatter manager services 
modifié:         core/lib/Thelia/Config/Resources/config.xml
 2014-08-01 12:48:00 +02:00
Benjamin Perche
66a0beddb1 Fix services 
modifié:         core/lib/Thelia/Config/Resources/config.xml
 2014-08-01 12:47:59 +02:00
Benjamin Perche
f62b14b842 Finish tar, tar.gz, tar.bz2 and tests 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilderTest.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
 2014-08-01 12:47:59 +02:00
Benjamin Perche
50fb4b0dd8 Begin tar, tar.bz2 and tar.gz formatter, fix zip test resources 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/bad_formatted.zip
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/well_formatted.zip
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
 2014-08-01 12:47:59 +02:00
Benjamin Perche
8ddec1a21e Add archive builder manager and formatter manager services 
modifié:         core/lib/Thelia/Config/Resources/config.xml
 2014-08-01 12:47:59 +02:00
Benjamin Perche
b424fb2750 Add translation 
modifié:         core/lib/Thelia/Config/I18n/en_US.php
	modifié:         core/lib/Thelia/Config/I18n/fr_FR.php
 2014-07-16 11:09:35 +02:00
lovenunu
ee11915feb Add french and english translation 
modified:   core/lib/Thelia/Config/I18n/en_US.php
	modified:   core/lib/Thelia/Config/I18n/fr_FR.php
 2014-07-16 08:28:53 +02:00
Julien
f7c5e96e2e Merge pull request #503 from mespeche/mespeche 
Added store_description
 2014-07-08 15:21:33 +02:00
Franck Allimant
c0541e3aa2 Added getTemplateDirectories method to ParserInterface 2014-07-03 16:25:50 +02:00
Franck Allimant
7ab306cb6c Tra,slations of strings moved from templates to form definitions 2014-06-30 14:51:04 +02:00
Franck Allimant
ca862b07e4 Merge branch 'master' into brands 
Conflicts:
	core/lib/Thelia/Tools/FileManager.php
	setup/update/2.0.3.sql
 2014-06-26 16:35:08 +02:00
Michaël Espeche
202969fde9 Add store_description field for SEO 2014-06-26 14:25:04 +02:00
Franck Allimant
0dde8b888a Added brands management 2014-06-26 10:52:13 +02:00
Franck Allimant
114a55c1e8 Refactoring of images and documents management 2014-06-26 10:36:12 +02:00
Manuel Raynaud
84c2432507 remove unused variable 2014-06-24 10:38:43 +02:00
Manuel Raynaud
51313ea430 import test config 2014-06-20 09:11:09 +02:00
Franck Allimant
0d8f9f3c6e Fixed minor typos 2014-06-19 01:51:39 +02:00
Franck Allimant
c87c6e2793 Added free product coupon. 2014-06-17 00:38:18 +02:00
Franck Allimant
f3ccf8ec15 Updated translation after finishing coupons 2014-06-17 00:36:23 +02:00
Franck Allimant
db29505fee Added Attribute value related coupons 2014-06-12 13:14:07 +02:00
Manuel Raynaud
6084d9ac00 implement new breadcrumb on image and document edition in the catalog. Fix #460 2014-06-11 14:50:19 +02:00
Manuel Raynaud
476bda3d4a implement new breadcrumb on image and document edition in the catalog 2014-06-11 14:50:19 +02:00
Franck Allimant
6e7d54c0aa Added new coupon types 2014-06-11 09:43:21 +02:00
Franck Allimant
5c61c9c093 Added new coupon types translations 2014-06-11 09:43:20 +02:00
Franck Allimant
0683d20d2c Improved and simplified coupon form management 2014-06-11 09:43:09 +02:00
Jérôme Billiras
76b08ddca9 Register refresh command to Thelia core 2014-06-10 10:34:19 +02:00
Manuel Raynaud
ad469298bc Merge pull request #428 from roadster31/coupon-types 
Temporary fix for #427
 2014-05-23 00:32:26 +02:00
Franck Allimant
e4029c9fdd Temporary fix for #427 2014-05-22 23:39:34 +02:00
Manuel Raynaud
2ace0796e8 session is now initialize using dispatcher 2014-05-20 09:44:04 +02:00
Franck Allimant
f8ccea1899 Added per-user coupon maximum usage count 2014-05-17 10:56:19 +02:00
Franck Allimant
9cdac6d50e Fixes french translation. 2014-05-16 11:12:24 +02:00
Franck Allimant
392abff271 Free shipping for selected countries and/or shipping methods 2014-05-15 20:25:22 +02:00
Franck Allimant
112cb8eeb0 Added ForSomeCustomer condition 2014-05-12 23:37:43 +02:00
Franck Allimant
07411b95a1 Added more conditions 2014-05-10 12:13:02 +02:00
Franck Allimant
de9547fc8e Updated translations 2014-05-10 02:55:17 +02:00
Franck Allimant
6632eba9f4 Added countries and start date conditions 2014-05-10 02:39:24 +02:00
Manuel Raynaud
85d80d1d77 fix minor bug 2014-05-09 10:55:50 +02:00
Manuel Raynaud
d4ade9afc0 integration of Czech translation 2014-05-06 11:07:09 +02:00
Manuel Raynaud
fa71c8c4d5 integration of russian translation 2014-05-06 11:01:32 +02:00
Manuel Raynaud
fcceef8ab8 add missing english translations 2014-05-05 12:42:50 +02:00
Franck Allimant
457f5dba7c Completed french translation 2014-05-03 12:39:29 +02:00
Franck Allimant
aa48a73343 Removed the useless coupon read function 2014-05-02 17:10:25 +02:00
Manuel Raynaud
171d388c41 change error message on image upload 2014-04-30 14:14:26 +02:00
Manuel Raynaud
158ebc7ead complete changelog and add missing translations 2014-04-29 11:42:10 +02:00