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

4454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Raynaud
d67c973460 Merge pull request #570 from lovenunu/fix-update 
Fix update and CS
 2014-08-06 09:52:44 +02:00
Benjamin Perche
eae1acba81 Fix cs 
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Form/CustomerUpdateForm.php
	modifié:         core/lib/Thelia/Model/Export.php
 2014-08-06 09:08:48 +02:00
Benjamin Perche
74ec51b06e Log insertion error instead of throwing them 
modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
 2014-08-06 09:07:37 +02:00
Manuel Raynaud
710bb47990 update thelia version in sql files 2014-08-05 16:44:08 +02:00
Manuel Raynaud
341e2a769f Merge pull request #569 from lovenunu/readme 
Add archive builders' dependencies in readme
 2014-08-05 16:23:31 +02:00
Benjamin Perche
1cc904b107 Add line return 
modifié:         Readme.md
 2014-08-05 16:12:55 +02:00
Benjamin Perche
1b6154cdc0 Add archive builders' dependencies 
modifié:         Readme.md
 2014-08-05 16:11:34 +02:00
Manuel Raynaud
f69878b623 Merge pull request #566 from griotteau/patch-reseller 
Add the reseller field in the customer form
 2014-08-05 16:02:12 +02:00
Manuel Raynaud
bd26e3da9a Merge pull request #568 from lovenunu/fix-archiving 
Fix archiving
 2014-08-05 15:57:51 +02:00
Benjamin Perche
8de8939b2f Fix cs 
modifié:         core/lib/Thelia/Action/Export.php
	modifié:         core/lib/Thelia/Action/Import.php
	modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Controller/Admin/FileController.php
 2014-08-05 15:51:44 +02:00
Benjamin Perche
606ad49316 Fix tests 
modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilderManagerTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
 2014-08-05 15:32:51 +02:00
Benjamin Perche
45aaedc81f Fix bz2 extension name 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
 2014-08-05 15:14:31 +02:00
Benjamin Perche
d1a07b883b Add checks for archive building libraries 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	modifié:         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/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         templates/backOffice/default/ajax/export-modal.html
	modifié:         templates/backOffice/default/export-page.html
 2014-08-05 15:10:19 +02:00
Benjamin Perche
b5dbf08bb7 Fix cs 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
 2014-08-05 14:36:37 +02:00
Benjamin Perche
370bf94f40 Add don't use phar based archive builders if modules not enabled 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
 2014-08-05 14:34:27 +02:00
root
f5318df219 Add the reseller field in the customer form 2014-08-05 11:40:49 +02:00
Manuel Raynaud
b72a7a5c08 Merge pull request #565 from lovenunu/fix 
Fix imports and exports
 2014-08-05 10:36:45 +02:00
Benjamin Perche
718ed2ae2d hide category if no export/import and add module category 
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Config/Resources/import.xml
	modifié:         templates/backOffice/default/export.html
	modifié:         templates/backOffice/default/import.html
 2014-08-05 10:30:57 +02:00
Benjamin Perche
c453981d5a Fix translation domain in modales 
modifié:         templates/backOffice/default/ajax/export-modal.html
	modifié:         templates/backOffice/default/ajax/import-modal.html
 2014-08-05 10:02:42 +02:00
Benjamin Perche
37d8a2d9e2 Fix 404 usage 
modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
 2014-08-05 09:58:34 +02:00
Benjamin Perche
318341b702 Add translation 
modifié:         core/lib/Thelia/Config/I18n/en_US.php
	modifié:         core/lib/Thelia/Config/I18n/fr_FR.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         templates/backOffice/default/I18n/en_US.php
	modifié:         templates/backOffice/default/I18n/fr_FR.php
 2014-08-05 09:50:01 +02:00
Benjamin Perche
9967fbdd6c Add import positionning 
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         templates/backOffice/default/import.html
 2014-08-05 09:25:49 +02:00
Benjamin Perche
3e51e62241 Fix import and import category parsing 
modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
 2014-08-05 09:19:33 +02:00
Benjamin Perche
f3c4d15163 Add position management with categories for imports and exports 
modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/Import.php
 2014-08-05 09:17:38 +02:00
Benjamin Perche
394edf8fdc Add preInsert method for positions 
modifié:         core/lib/Thelia/Model/ExportCategory.php
	modifié:         core/lib/Thelia/Model/Import.php
	modifié:         core/lib/Thelia/Model/ImportCategory.php
 2014-08-05 09:07:18 +02:00
Julien
1bbf34e8a2 Merge pull request #564 from bibich/thelia-203-beta 
Thelia 203 beta
 2014-08-05 08:36:30 +02:00
Julien
6640abc7b6 Merge pull request #554 from lovenunu/security-fix 
Security fix
 2014-08-05 08:35:57 +02:00
Benjamin Perche
967dbc15d4 Fix point usage in regex 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
 2014-08-05 08:26:56 +02:00
Benjamin Perche
b8a9518deb Add missing points in extensions 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
 2014-08-05 08:26:56 +02:00
Benjamin Perche
29c0aa0368 Remove MimeTypeTools tests 
supprimé:        core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
 2014-08-05 08:26:56 +02:00
Benjamin Perche
008f94fe66 Add translation 
modifié:         core/lib/Thelia/Config/I18n/en_US.php
	modifié:         core/lib/Thelia/Config/I18n/fr_FR.php
 2014-08-05 08:26:56 +02:00
Benjamin Perche
b01a6d9871 Change extension checking method 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Controller/Admin/FileController.php
	supprimé:        core/lib/Thelia/Tools/MimeTypeTools.php
	supprimé:        local/config/mime.types
 2014-08-05 08:26:56 +02:00
Benjamin Perche
ddcaf9fbab Fix tests 
modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
 2014-08-05 08:26:17 +02:00
Benjamin Perche
b26c61be96 Refactor MimeTypeTools as a service 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Controller/Admin/FileController.php
	modifié:         core/lib/Thelia/Tools/MimeTypeTools.php
 2014-08-05 08:26:17 +02:00
Benjamin Perche
d541b56429 Fix tests 
modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
 2014-08-05 08:25:28 +02:00
Benjamin Perche
5d9f120c81 Fix tests and add translation 
modifié:         core/lib/Thelia/Config/I18n/en_US.php
	modifié:         core/lib/Thelia/Config/I18n/fr_FR.php
	modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
	modifié:         core/lib/Thelia/Tools/MimeTypeTools.php
	modifié:         local/config/mime.types
 2014-08-05 08:25:28 +02:00
Benjamin Perche
172d7c06ca Fix URLTest namespace 
modifié:         core/lib/Thelia/Tests/Tools/URLTest.php
 2014-08-05 08:23:15 +02:00
Benjamin Perche
d1a9115626 Fix cs 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
	modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
	modifié:         core/lib/Thelia/Tools/MimeTypeTools.php
 2014-08-05 08:23:15 +02:00
Benjamin Perche
4b2ee0d357 Fix tests 
modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
 2014-08-05 08:23:15 +02:00
Benjamin Perche
d186ec4320 Fix security breaches 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
	nouveau fichier: core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
	nouveau fichier: core/lib/Thelia/Tools/MimeTypeTools.php
	nouveau fichier: local/config/mime.types
 2014-08-05 08:23:15 +02:00
Julien Chanseaume
8b685e1818 Fixed update sql for coupon and export 2014-08-05 06:32:15 +02:00
Julien Chanseaume
94a2952b36 fixed typo 2014-08-04 22:38:06 +02:00
Julien Chanseaume
2e830a25dd added extra version 2014-08-04 22:22:00 +02:00
Julien Chanseaume
b2cf836353 prepared release 2.0.3-beta 2014-08-04 22:17:00 +02:00
Julien
d30dc2c30b Merge pull request #561 from bibich/improvements 
Improvements
 2014-08-04 21:33:25 +02:00
Julien Chanseaume
88ec8bc661 fixed rebase conflictssssss 2014-08-04 21:21:57 +02:00
Julien Chanséaume
a3021a0768 Added fallback method to product page when pse use differrents attributes. 2014-08-04 20:31:27 +02:00
Julien Chanséaume
18b3a12771 removed tax when there is no tax 2014-08-04 20:31:27 +02:00
Julien Chanséaume
a50f79a9f4 removed debug values 2014-08-04 20:31:27 +02:00
Julien Chanséaume
2b2a5690a7 php-cs-fixer 2014-08-04 20:31:27 +02:00