dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,570 Commits 9 Branches 19 Tags
94de4d3d2f35403b5de1c10a4a02503f11ca1c2b
Commit Graph

17570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vAugagneur f4537c022f //added _PS_CREATION_DATE_ in rewriteSettingsFile function 2013-03-15 12:04:31 +01:00
vAugagneur 905eca2fd0 //added _PS_CREATION_DATE_ in rewriteSettingsFile function 2013-03-15 12:04:31 +01:00
vAugagneur 16badbd45d //removed moneybookers during install 2013-03-15 12:02:16 +01:00
vAugagneur 24602d3fd1 //removed moneybookers during install 2013-03-15 12:02:16 +01:00
Rémi Gaillard d4d0661ff8 // Clean order_detail_tax table after deleting an order detail #PSCFV-8278 2013-03-15 11:51:19 +01:00
Rémi Gaillard e1bb55dbba // Clean order_detail_tax table after deleting an order detail #PSCFV-8278 2013-03-15 11:51:19 +01:00
Rémi Gaillard 564aafd10d // Clean Language::checkAndAddLanguage() 2013-03-15 11:14:29 +01:00
Rémi Gaillard 8244e15408 // Clean Language::checkAndAddLanguage() 2013-03-15 11:14:29 +01:00
gRoussac f9feec981a // remove warning in multishop 2013-03-14 17:49:07 +01:00
gRoussac 96afbb53cf // remove warning in multishop 2013-03-14 17:49:07 +01:00
François Gaillard 7dc7de6ba7 Merge branch 'release' into development 2013-03-14 17:02:40 +01:00
Francois Gaillard 82d81ed58c Merge branch 'release' into development 2013-03-14 17:02:40 +01:00
François Gaillard 138c225845 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 17:01:55 +01:00
Francois Gaillard 3599958b5c Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 17:01:55 +01:00
François Gaillard ad7c73348d Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler" 
This reverts commit da77ce1029.
 2013-03-14 17:01:16 +01:00
Francois Gaillard 70d79c5983 Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler" 
This reverts commit da77ce1029.
 2013-03-14 17:01:16 +01:00
gRoussac d3324ef6e8 // again remove additional \t 2013-03-14 16:58:28 +01:00
gRoussac 28285efb31 // again remove additional \t 2013-03-14 16:58:28 +01:00
gRoussac 66239416ec // remove additionnal \t 2013-03-14 16:55:06 +01:00
gRoussac 99fc6fb857 // remove additionnal \t 2013-03-14 16:55:06 +01:00
gRoussac df90cab2db [-] FO : Fix bug #PSCFV-6595, fancybox images for IE and AlphaImageLoader 2013-03-14 16:53:26 +01:00
gRoussac 094c12f991 [-] FO : Fix bug #PSCFV-6595, fancybox images for IE and AlphaImageLoader 2013-03-14 16:53:26 +01:00
François Gaillard e08945de6b Merge branch 'release' into development 2013-03-14 16:39:47 +01:00
Francois Gaillard 7f3678a776 Merge branch 'release' into development 2013-03-14 16:39:47 +01:00
François Gaillard da77ce1029 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler 2013-03-14 16:37:22 +01:00
Francois Gaillard 505d3be5c3 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler 2013-03-14 16:37:22 +01:00
Rémi Gaillard 83729b3cef Merge pull request #315 from PrestaEdit/followup 
[-] MO: followup - fix bug in template vars
 2013-03-14 07:52:15 -07:00
Rémi Gaillard 395192f603 Merge pull request #315 from PrestaEdit/followup 
[-] MO: followup - fix bug in template vars
 2013-03-14 07:52:15 -07:00
Rémi Gaillard 987977ecbb [-] BO: Fix update of delivery address on backoffice orders 2013-03-14 15:25:38 +01:00
Rémi Gaillard 0da58b215c [-] BO: Fix update of delivery address on backoffice orders 2013-03-14 15:25:38 +01:00
Rémi Gaillard d9bf697625 [-] BO: Fix auto-selection of default category when you have choosen one on the listing 2013-03-14 15:04:54 +01:00
Rémi Gaillard 8b4bd8e471 [-] BO: Fix auto-selection of default category when you have choosen one on the listing 2013-03-14 15:04:54 +01:00
Rémi Gaillard 441c334f09 // Fix 404 img path on pagenotfoundcontroller 2013-03-14 14:58:44 +01:00
Rémi Gaillard c7a4c4d84d // Fix 404 img path on pagenotfoundcontroller 2013-03-14 14:58:44 +01:00
Rémi Gaillard 3d8f3f9ca9 Merge pull request #299 from samy-r/dev-import-time 
Import time improvment
 2013-03-14 14:29:20 +01:00
Rémi Gaillard 26f0608071 Merge pull request #299 from samy-r/dev-import-time 
Import time improvment
 2013-03-14 14:29:20 +01:00
Rémi Gaillard 313f2a5392 Merge pull request #316 from ldecoker/patch-4 
[*][FO]Missing php_self variable
 2013-03-14 14:28:38 +01:00
Rémi Gaillard 1c114ad4b9 Merge pull request #316 from ldecoker/patch-4 
[*][FO]Missing php_self variable
 2013-03-14 14:28:38 +01:00
Rémi Gaillard 37e6846aab Merge pull request #317 from Shagshag/patch-2 
[-] SQL error in Combination::setAttributes
 2013-03-14 14:26:51 +01:00
Rémi Gaillard d8b31d6a4f Merge pull request #317 from Shagshag/patch-2 
[-] SQL error in Combination::setAttributes
 2013-03-14 14:26:51 +01:00
Rémi Gaillard f620645169 [-] Core: Fix search indexation when nb languages * nb shops > 50 2013-03-14 14:16:31 +01:00
Rémi Gaillard 3e8e0fe7a4 [-] Core: Fix search indexation when nb languages * nb shops > 50 2013-03-14 14:16:31 +01:00
Rémi Gaillard 13e9de16e1 Merge pull request #299 from samy-r/dev-import-time 
Import time improvment
 2013-03-14 05:58:37 -07:00
Rémi Gaillard 84b5b1ee26 Merge pull request #299 from samy-r/dev-import-time 
Import time improvment
 2013-03-14 05:58:37 -07:00
Rémi Gaillard b3e699f9a6 Merge pull request #316 from ldecoker/patch-4 
[*][FO]Missing php_self variable
 2013-03-14 05:56:02 -07:00
Rémi Gaillard a774550067 Merge pull request #316 from ldecoker/patch-4 
[*][FO]Missing php_self variable
 2013-03-14 05:56:02 -07:00
Rémi Gaillard 974a7987d0 Merge pull request #317 from Shagshag/patch-2 
[-] SQL error in Combination::setAttributes
 2013-03-14 05:55:11 -07:00
Rémi Gaillard b7b1b6c3e4 Merge pull request #317 from Shagshag/patch-2 
[-] SQL error in Combination::setAttributes
 2013-03-14 05:55:11 -07:00
gRoussac 3ed335e80f [-] FO : Do no try to add empty css or js file name 2013-03-14 11:15:49 +01:00
gRoussac 2bb4c6c08a [-] FO : Do no try to add empty css or js file name 2013-03-14 11:15:49 +01:00