Commit Graph

17570 Commits

Author SHA1 Message Date
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
Damien Metzger 7f21c3e62a // Update profiling tools 2013-03-14 10:47:18 +01:00
Damien Metzger 2523de9a99 // Update profiling tools 2013-03-14 10:47:18 +01:00
François Gaillard 890eefce92 // Profiler, redirect method declaration fixed 2013-03-14 10:20:12 +01:00
Francois Gaillard 2d88f43206 // Profiler, redirect method declaration fixed 2013-03-14 10:20:12 +01:00
vAugagneur ac764f0d81 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 09:36:22 +01:00
vAugagneur a42c34022f Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 09:36:22 +01:00
vAugagneur 9efa51e704 //fixed multi-shipping bug 2013-03-14 09:36:17 +01:00
vAugagneur 2c2a8d552e //fixed multi-shipping bug 2013-03-14 09:36:17 +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
vAugagneur 930e10f87c Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 18:21:40 +01:00
vAugagneur ec757d90c7 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 18:21:40 +01:00
vAugagneur 37f64664d3 //small js fix 2013-03-13 18:21:21 +01:00
vAugagneur 58d08ce1b0 //small js fix 2013-03-13 18:21:21 +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 eae5f2d965 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 16:29:23 +01:00
vAugagneur 324ca85cb8 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 16:29:23 +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
vAugagneur 67e357e447 Merge translations/fr/errors.php 2013-03-13 16:16:01 +01:00
vAugagneur b52462bd14 Merge translations/fr/errors.php 2013-03-13 16:16:01 +01:00
Rémi Gaillard f0c10588d7 // Fix category export without multishop 2 2013-03-13 15:52:25 +01:00
Rémi Gaillard cb811a4e23 // Fix category export without multishop 2 2013-03-13 15:52:25 +01:00
Rémi Gaillard e67cf21b4b // Fix category export without multishop 2013-03-13 15:49:52 +01:00
Rémi Gaillard 0428a16d51 // Fix category export without multishop 2013-03-13 15:49:52 +01:00
gRoussac 2b0612c0eb [-] INSTALLER : Update gender for default customer 2013-03-13 15:43:48 +01:00
gRoussac 22413c0f6c [-] INSTALLER : Update gender for default customer 2013-03-13 15:43:48 +01:00
François Gaillard cd048c6832 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 15:29:21 +01:00
Francois Gaillard ebbf4feb61 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 15:29:21 +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 a6dbe24d28 [-] BO : Avoid warning if img src not defined in controller 2013-03-13 15:27:18 +01:00
gRoussac 3b091fad98 [-] BO : Avoid warning if img src not defined in controller 2013-03-13 15:27:18 +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
gRoussac ee570bbca7 [-] FO : Avoid flashing of availability_statut 2013-03-12 18:34:24 +01:00
gRoussac df2e121a60 [-] FO : Avoid flashing of availability_statut 2013-03-12 18:34:24 +01:00
Rémi Gaillard 5998face6b // Fix iPod nano fixture specific price 2013-03-12 18:11:20 +01:00
Rémi Gaillard d945d0cf11 // Fix iPod nano fixture specific price 2013-03-12 18:11:20 +01:00
gRoussac bb4ec94718 [*] TR: Update translations for errors 2013-03-12 16:18:09 +01:00
gRoussac 1fed482ca0 [*] TR: Update translations for errors 2013-03-12 16:18:09 +01:00
fram f7c76f60fb // added russian installer 2013-03-12 16:05:54 +01:00
fram 09afe53452 // added russian installer 2013-03-12 16:05:54 +01:00
François Gaillard 18bce2ba39 [-] FO : Bug fix #PSCFV-7915 : Mobile theme issue, default attribute 2013-03-12 16:04:03 +01:00
Francois Gaillard 1ae3b67288 [-] FO : Bug fix #PSCFV-7915 : Mobile theme issue, default attribute 2013-03-12 16:04:03 +01:00