Commit Graph

8333 Commits

Author SHA1 Message Date
Rémi Gaillard e3e38b19e1 [*] BO: you can now export listing of some tabs in CSV 2013-02-13 16:15:37 +01:00
Damien Metzger cc1ff8ef0f // htmlspecialchars on the sql queries in the profiling mode 2013-02-13 15:39:22 +01:00
Damien Metzger 7fc33eb01c [-] Catch JSMin exception and return uncompressed js #PSCFV-7686 #PSCFV-5785 2013-02-13 15:16:17 +01:00
Damien Metzger ce9da19b49 // mod_filter is required with mod_deflate from apache 2.4 2013-02-13 14:46:34 +01:00
Damien Metzger 288021224c // Moved html and js compression from global smarty config to front office smarty config 2013-02-13 14:38:43 +01:00
Rémi Gaillard f9b3174b9c [-] Core: upgrade smarty to 3.1.13 2013-02-13 14:30:45 +01:00
Rémi Gaillard 4b4b4b89f2 // small typo fix 2013-02-13 12:04:42 +01:00
Rémi Gaillard 8f5f202d60 // small fix 2013-02-13 11:32:02 +01:00
Rémi Gaillard 45fddec936 // List only module categories which contains at least 1 module 2013-02-13 11:26:18 +01:00
Gregory Roussac 981d3e8c97 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-13 11:04:49 +01:00
gRoussac a0ab0cc444 [-] FO : Fix bug #PSCFV-7467 no email in post data 2013-02-13 11:03:59 +01:00
vAugagneur dfb4aedbde Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-13 10:47:19 +01:00
gRoussac 787648f2c7 [*] FO : Fix #PSCFV-7463 No Add to favorite for Chrome 2013-02-13 10:44:06 +01:00
gRoussac 718ae699ac [-] FO : Fix Bug #PSCFV-7439 radio input css 2013-02-13 09:58:24 +01:00
vAugagneur d6f5566e65 [+] BO : added new marketing tab 2013-02-13 09:57:30 +01:00
vAugagneur aff0c2e965 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-13 09:51:24 +01:00
Gregory Roussac 8b2868d07b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-12 16:40:56 +01:00
gRoussac 3e9d0dda55 [-] FO : Fix Bug #PSCFV-7339 available date on product page 2013-02-12 16:40:26 +01:00
gRoussac 51e458bccc [-] FO : Fix Bug PSCFI-7016 available date on product page 2013-02-12 16:37:44 +01:00
vAugagneur 0ab55781ee //remove modules_list.xml 2013-02-12 14:36:43 +01:00
Rémi Gaillard ba3f3b88b5 // php notice 2013-02-12 12:06:09 +01:00
Damien Metzger d007136149 [-] MO : applied unachieved patch on blockbestsellers 2013-02-12 12:03:17 +01:00
Rémi Gaillard f5cf54ef3b [*] BO: Add an option to htaccess generator to disable mod_security (some rules reject ajax file upload) 2013-02-12 11:35:10 +01:00
Rémi Gaillard d6f21bd9f9 // small fix for change position 2013-02-12 10:46:48 +01:00
Rémi Gaillard 9709339084 // Fix SQL error 2013-02-11 18:45:00 +01:00
Rémi Gaillard 8348e28cac [-] FO: Fix PHP warning on update quantity in cart with customizables products 2013-02-11 18:04:23 +01:00
Rémi Gaillard 61dbe6a2e2 Merge pull request #266 from anat/development
[+] WS : Add product bundle retrieval from Web services
2013-02-11 08:53:31 -08:00
anat 4990028dc2 [+] WS : Add product bundle retrieval from Web services 2013-02-11 17:51:18 +01:00
Rémi Gaillard 0ec4f02502 [-] FO: don't load medias if error on product page to avoid JS bugs 2013-02-11 17:33:19 +01:00
Rémi Gaillard cc15bf0243 [-] FO: Fix Cart::getDeliveryOption() cache 2013-02-11 16:59:16 +01:00
Rémi Gaillard d2ce6050d2 [-] MO: Clear blockcategories_footer.tpl cache 2013-02-11 16:30:04 +01:00
Gregory Roussac 498904d22a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 16:14:22 +01:00
gRoussac 2c2f67dfa8 [-] FO : Fix bug #PSCFI-6686 when url param has no value set 1 to valuePSCFI-6686 2013-02-11 16:13:46 +01:00
Rémi Gaillard 5154585bb2 [-] BO: Fix #PSCFV-7462 bad sql request for ordering by price in adminproducts 2013-02-11 15:54:53 +01:00
Rémi Gaillard 3cf99fe042 [-] FO: Fix product restriction by shop 2013-02-11 15:21:54 +01:00
gRoussac 387c124a6d [-] FO : Fix bug #PSCFV-7491 special characters in direct search 2013-02-11 15:07:43 +01:00
gRoussac cd11ab288e [*] TR : update translations for FR and DE 2013-02-11 14:32:19 +01:00
gRoussac c5d3c6e293 [-] FO : Fix bug #PSCFV-7562 no availability date in tempalte 2013-02-11 14:31:08 +01:00
gRoussac ea2a1eb122 [-] CORe : Fix #PSCFV-7314 unregisterHook and unregisterExceptions in module::uninstall 2013-02-11 12:00:54 +01:00
Rémi Gaillard c3ad73cd2c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 11:46:02 +01:00
Rémi Gaillard 57d782956d [-] FO: Fix infinite loop on overriding Module::getPaymentModules and executing hook on it #PSCFV-7760 2013-02-11 11:45:42 +01:00
vAugagneur b1c39da837 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 10:30:38 +01:00
vAugagneur 57e883d6b2 [-] BO : fixed bug #PSCFV-7575 - BO shipping price by zones ang weigth error js 2013-02-11 10:30:32 +01:00
Rémi Gaillard 70b4ca535e [-] BO: Fix #PSCFV-7427 group id used for price computation on order edition 2013-02-08 15:02:15 +01:00
gRoussac 1127dc35b4 // small fix on displayError in Admincountries 2013-02-07 18:40:20 +01:00
Damien Metzger 26a01f0a41 // Translations 2013-02-07 18:20:19 +01:00
Rémi Gaillard 623ba4e7c7 [-] BO: Fix connection with Addons on AdminModules 2013-02-07 18:01:53 +01:00
Rémi Gaillard ad5b6b875f [-] FO: Fix #PSCFV-7714 quantity discounts displaying in product page for specific customer 2013-02-07 16:57:56 +01:00
Rémi Gaillard f013fdbc2d // Disallow click to install steps during process 2013-02-07 16:40:19 +01:00
Rémi Gaillard cdde16496e [-] FO: Fix #PSCFV-7627 customer group reduction was applied on combinations for unidentified users on the product page 2013-02-07 16:06:32 +01:00