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

4478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Perche
83cf3b59e0 Finish implementing and testing zip 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/TarArchiveException.php
	renommé:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveException.php -> core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/ZipArchiveException.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.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
6af18cd3e7 Define archive builders and formatters 
nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveException.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/FormatInterface.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatter/AbstractFormatter.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatter/Exception/BadFormattedStringException.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/bad_formatted.zip
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/test_file
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/well_formatted.zip
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilderManagerTest.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Formatter/FormatterManagerTest.php
	nouveau fichier: core/lib/Thelia/Tests/Tools/FakeFileDownloader.php
	nouveau fichier: core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
	nouveau fichier: core/lib/Thelia/Tools/FileDownload/FileDownloader.php
	nouveau fichier: core/lib/Thelia/Tools/FileDownload/FileDownloaderAwareTrait.php
	nouveau fichier: core/lib/Thelia/Tools/FileDownload/FileDownloaderInterface.php
	modifié:         core/lib/Thelia/Tools/URL.php
 2014-08-01 12:48:00 +02:00
Benjamin Perche
50adcecc27 End formatter data and refactor Thelia\Core\FileFormat\Formatter 
renommé:         core/lib/Thelia/Core/FileFormat/Formatter/AbstractFormatter.php -> core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	renommé:         core/lib/Thelia/Core/FileFormat/Formatter/Exception/BadFormattedStringException.php -> core/lib/Thelia/Core/FileFormat/Formatting/Exception/BadFormattedStringException.php
	renommé:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterData.php -> core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	renommé:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterInterface.php -> core/lib/Thelia/Core/FileFormat/Formatting/FormatterInterface.php
	renommé:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php -> core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php
	renommé:         core/lib/Thelia/Tests/FileFormat/Formatter/FormatterDataTest.php -> core/lib/Thelia/Tests/FileFormat/Formatting/FormatterDataTest.php
	renommé:         core/lib/Thelia/Tests/FileFormat/Formatter/FormatterManagerTest.php -> core/lib/Thelia/Tests/FileFormat/Formatting/FormatterManagerTest.php
 2014-08-01 12:48:00 +02:00
Benjamin Perche
962c2eb7ad Add some tests 
modifié:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterData.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatter/FormatterDataTest.php
 2014-08-01 12:48:00 +02:00
Benjamin Perche
314a064f11 Begin FormatterData 
modifié:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterData.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Formatter/FormatterDataTest.php
 2014-08-01 12:48:00 +02:00
Benjamin Perche
8418974e8e Add getNames methods to managers 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php
 2014-08-01 12:48:00 +02:00
Benjamin Perche
d120e57684 Fix Test 
modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
 2014-08-01 12:48:00 +02:00
Benjamin Perche
d9db2adfc8 Add filename in build archive response 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
 2014-08-01 12:47:59 +02:00
Benjamin Perche
dd77d27892 Fix cs and add get method in managers 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterData.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php
	modifié:         core/lib/Thelia/Tools/FileDownload/FileDownloader.php
	modifié:         core/lib/Thelia/Tools/FileDownload/FileDownloaderAwareTrait.php
	modifié:         core/lib/Thelia/Tools/FileDownload/FileDownloaderInterface.php
 2014-08-01 12:47:59 +02:00
Benjamin Perche
671b0f3d73 Fix cs 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/TarArchiveException.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/ZipArchiveException.php
	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é:         core/lib/Thelia/Core/FileFormat/FormatInterface.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatter/AbstractFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatter/Exception/BadFormattedStringException.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatter/FormatterData.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatter/FormatterInterface.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilderManagerTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatter/FormatterManagerTest.php
	modifié:         core/lib/Thelia/Tests/Tools/FakeFileDownloader.php
	modifié:         core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
 2014-08-01 12:47:59 +02:00
Benjamin Perche
2702c20014 Fix Zip add file, we must first commit and then delete the temporary file 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
 2014-08-01 12:47:59 +02:00
Benjamin Perche
ef75863342 revert file to ccd16dc 
modifié:         core/lib/Thelia/Tests/Tools/FileManagerTest.php
 2014-08-01 12:47:59 +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
c4d22b8c79 Finish Tar archive builder 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/bad_formatted.tar
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/well_formatted.tar
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
 2014-08-01 12:47:59 +02:00
Benjamin Perche
4b78f23fa3 Fix FileDownloader test 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tools/FileDownload/FileDownloader.php
	modifié:         core/lib/Thelia/Tools/URL.php
 2014-08-01 12:47:59 +02:00
Benjamin Perche
9e66c4759a Fix FileDownloader test 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
 2014-08-01 12:47:59 +02:00
Benjamin Perche
21bf9fd0e2 Complete zip tests 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
 2014-08-01 12:47:59 +02:00
Benjamin Perche
e72d3bfb60 Finish implementing and testing zip 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/TarArchiveException.php
	renommé:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveException.php -> core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/ZipArchiveException.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.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
ce3089e106 Add exceptions 
nouveau fichier: core/lib/Thelia/Exception/FileNotFoundException.php
	nouveau fichier: core/lib/Thelia/Exception/FileNotReadableException.php
	nouveau fichier: core/lib/Thelia/Exception/HttpUrlException.php
 2014-08-01 12:47:59 +02:00
Benjamin Perche
5f298aac75 Add compiler pass for archive builders and formatters managers 
modifié:         core/lib/Thelia/Core/Bundle/TheliaBundle.php
	nouveau fichier: core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterArchiveBuilderPass.php
	nouveau fichier: core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterFormatterPass.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
d82fb479cf Define archive builders and formatters 
nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveException.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/FormatInterface.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatter/AbstractFormatter.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatter/Exception/BadFormattedStringException.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/bad_formatted.zip
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/test_file
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/well_formatted.zip
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilderManagerTest.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Formatter/FormatterManagerTest.php
	nouveau fichier: core/lib/Thelia/Tests/Tools/FakeFileDownloader.php
	nouveau fichier: core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
	nouveau fichier: core/lib/Thelia/Tools/FileDownload/FileDownloader.php
	nouveau fichier: core/lib/Thelia/Tools/FileDownload/FileDownloaderAwareTrait.php
	nouveau fichier: core/lib/Thelia/Tools/FileDownload/FileDownloaderInterface.php
	modifié:         core/lib/Thelia/Tools/URL.php
 2014-08-01 12:47:58 +02:00
Julien Chanséaume
3699fb0c10 fixed import 2014-08-01 10:58:25 +02:00
Julien Chanséaume
3c30d0a767 php cs fixer 2014-08-01 10:52:49 +02:00
Julien Chanséaume
20dbe2f8c1 Saves previous url in session, to be used by navigate (to previous) function 2014-08-01 10:43:01 +02:00
Julien
1d526b437f Merge pull request #560 from roadster31/coupon-fix 
Coupon fix
 2014-08-01 10:19:47 +02:00
Julien
905a764caa Merge pull request #558 from jodeq/master 
Fixes : cannot see cart page #552
 2014-07-31 05:15:43 +02:00
Franck Allimant
833cebb248 Using taxed cart total instead of untaxed price 2014-07-30 16:57:58 +02:00
Franck Allimant
24589a7142 Updated order discount when clearing order coupons 2014-07-30 16:57:42 +02:00
jodeq
217ab12f18 Merge branch 'master' of https://github.com/thelia/thelia 2014-07-30 14:56:41 +02:00
Julien
9d1dfcb61c Merge pull request #556 from lovenunu/fix-database 
Add foreign key constraints for order_address
 2014-07-30 10:29:15 +02:00
jodeq
d706b41a19 Cannot see cart page #552 
Fix
 2014-07-29 16:18:50 +02:00
Benjamin Perche
c39e6bcf85 Add foreign key constraints for order_address 
modifié:         core/lib/Thelia/Model/Base/Country.php
	modifié:         core/lib/Thelia/Model/Base/CountryQuery.php
	modifié:         core/lib/Thelia/Model/Base/CustomerTitle.php
	modifié:         core/lib/Thelia/Model/Base/CustomerTitleQuery.php
	modifié:         core/lib/Thelia/Model/Base/OrderAddress.php
	modifié:         core/lib/Thelia/Model/Base/OrderAddressQuery.php
	modifié:         core/lib/Thelia/Model/Map/CountryTableMap.php
	modifié:         core/lib/Thelia/Model/Map/CustomerTitleTableMap.php
	modifié:         core/lib/Thelia/Model/Map/OrderAddressTableMap.php
	modifié:         local/config/schema.xml
	modifié:         setup/thelia.sql
	modifié:         setup/update/2.0.3.sql
 2014-07-29 14:14:46 +02:00
Julien
968a02c082 Merge pull request #555 from lovenunu/fix-order 
Fix method that prevents orders to be set as Paid in the BO
 2014-07-29 13:11:05 +02:00
Benjamin Perche
b4eb12f12a Fix method that prevents orders to be set as Paid in the BO 
modifié:         core/lib/Thelia/Model/Order.php
 2014-07-29 11:34:57 +02:00
Julien
6963754d62 Merge pull request #545 from Yochima/yochima-branch 
Use now the dispatcher to delete feature_product when we change the temp...
fixed : elseloop executed even if loop is empty
 2014-07-28 11:42:53 +02:00
Julien
efd1d871fd Merge pull request #549 from roadster31/update-fix 
Added missing coupon_customer_count table to the 2.0.3.sql update file
 2014-07-25 16:46:59 +02:00
Julien
e4e36efb4d Merge pull request #547 from alexian530/alexian530-branch 
Add pagination to customer-edit
 2014-07-25 16:43:13 +02:00
Guillaume Barral
86b3d12e99 Merge branch 'yochima-branch' of https://github.com/yochima/thelia into yochima-branch 2014-07-25 16:16:19 +02:00
Guillaume Barral
a0b78502d6 Block the smarty interpretation in the elseloop 2014-07-25 16:14:14 +02:00
Guillaume Barral
1b2cbe6746 Respect of the good standards 2014-07-25 16:14:14 +02:00
Guillaume Barral
fdb68d6b95 Use now the dispatcher to delete feature_product when we change the template of a product 2014-07-25 16:14:14 +02:00
Guillaume Barral
d63932fcbd Block the smarty interpretation in the elseloop 2014-07-25 16:10:09 +02:00
Guillaume Barral
cea6491d77 Respect of the good standards 2014-07-25 10:33:52 +02:00
Franck Allimant
79b0e20523 Added missing coupon_customer_count table 2014-07-24 16:26:30 +02:00
alexian dugour
91161ab695 Add pagination to customer-edit 
modified:   templates/backOffice/default/customer-edit.html
 2014-07-24 12:47:27 +02:00