dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

6950 Commits

Author SHA1 Message Date
Damien Metzger d346307c97 // Small fix 2013-03-18 11:49:45 +01:00
Damien Metzger a0f97f5425 // Clean code 2013-03-18 11:08:57 +01:00
Damien Metzger 83b6c3bbab // Clean code 2013-03-18 11:08:57 +01:00
Rémi Gaillard f6674417cb [-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293 2013-03-18 11:05:06 +01:00
Rémi Gaillard f483feb53d [-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293 2013-03-18 11:05:06 +01:00
Rémi Gaillard 27ef057564 [*] WS: Add contact entity 2013-03-15 14:36:26 +01:00
Rémi Gaillard e3ea401fe0 [*] WS: Add contact entity 2013-03-15 14:36:26 +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
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 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 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 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
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
Damien Metzger 44a0afa34b // Added lock to class_index generation 2013-03-14 11:00:23 +01:00
Damien Metzger 1f540553b2 // Added lock to class_index generation 2013-03-14 11:00:23 +01:00
gRoussac be6ad7855a [-] FO : Check for cart rules before diplaying shopping cart in OPC 2013-03-13 18:42:40 +01:00
gRoussac 76c06ec8c6 [-] FO : Check for cart rules before diplaying shopping cart in OPC 2013-03-13 18:42:40 +01:00
Rémi Gaillard b76b263ab0 [-] FO: Fix separated packages 2013-03-13 18:02:54 +01:00
Rémi Gaillard 09f70a0020 [-] FO: Fix separated packages 2013-03-13 18:02:54 +01:00
vAugagneur 149407f72d //added russian installer and changed english strings 2013-03-13 16:28:19 +01:00
vAugagneur ee53bc4aea //added russian installer and changed english strings 2013-03-13 16:28:19 +01:00
François Gaillard 81fbca919e [-] FO : Mobile theme updated, templates added/improved 2013-03-13 15:28:42 +01:00
Francois Gaillard 9f2de77e36 [-] FO : Mobile theme updated, templates added/improved 2013-03-13 15:28:42 +01:00
gRoussac b994136939 [-] CORE : Preserve carrier reference integrity in cart rules when updating a carrier 2013-03-13 14:31:26 +01:00
gRoussac 7591efd6d6 [-] CORE : Preserve carrier reference integrity in cart rules when updating a carrier 2013-03-13 14:31:26 +01:00
fram ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram 77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard fc6c4067a7 Merge pull request #318 from djfm/release 
// fixed Bulgarian PDF generation
 2013-03-12 02:34:28 -07:00
Rémi Gaillard 4aca474377 Merge pull request #318 from djfm/release 
// fixed Bulgarian PDF generation
 2013-03-12 02:34:28 -07:00
Rémi Gaillard 024fbfe068 // small installer fix 2013-03-12 10:30:44 +01:00
Rémi Gaillard 5441a97c28 // small installer fix 2013-03-12 10:30:44 +01:00
fram c1cd8c777f // fixed Bulgarian PDF generation 2013-03-12 10:28:35 +01:00