Commit Graph

17570 Commits

Author SHA1 Message Date
Rémi Gaillard a994efc0f1 // small fix 2013-02-13 11:32:02 +01:00
Rémi Gaillard 8f5f202d60 // small fix 2013-02-13 11:32:02 +01:00
Rémi Gaillard 2671b43dbd // List only module categories which contains at least 1 module 2013-02-13 11:26:18 +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 1fbfa80e43 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-13 11:04:49 +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 b82461d6b3 [-] FO : Fix bug #PSCFV-7467 no email in post data 2013-02-13 11:03:59 +01:00
gRoussac a0ab0cc444 [-] FO : Fix bug #PSCFV-7467 no email in post data 2013-02-13 11:03:59 +01:00
vAugagneur 00b6e9ff20 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-13 10:47:19 +01:00
vAugagneur dfb4aedbde Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-13 10:47:19 +01:00
gRoussac fa878720f6 [*] FO : Fix #PSCFV-7463 No Add to favorite for Chrome 2013-02-13 10:44:06 +01:00
gRoussac 787648f2c7 [*] FO : Fix #PSCFV-7463 No Add to favorite for Chrome 2013-02-13 10:44:06 +01:00
gRoussac 8effbd8c68 [-] FO : Fix Bug #PSCFV-7439 radio input css 2013-02-13 09:58:24 +01:00
gRoussac 718ae699ac [-] FO : Fix Bug #PSCFV-7439 radio input css 2013-02-13 09:58:24 +01:00
vAugagneur fa34534654 [+] BO : added new marketing tab 2013-02-13 09:57:30 +01:00
vAugagneur d6f5566e65 [+] BO : added new marketing tab 2013-02-13 09:57:30 +01:00
vAugagneur 43269e594d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-13 09:51:24 +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 2ee34ebda6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-12 16:40:56 +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 d9fbe89270 [-] FO : Fix Bug #PSCFV-7339 available date on product page 2013-02-12 16:40:26 +01:00
gRoussac 3e9d0dda55 [-] FO : Fix Bug #PSCFV-7339 available date on product page 2013-02-12 16:40:26 +01:00
gRoussac 5c4613a74a [-] FO : Fix Bug PSCFI-7016 available date on product page 2013-02-12 16:37:44 +01:00
gRoussac 51e458bccc [-] FO : Fix Bug PSCFI-7016 available date on product page 2013-02-12 16:37:44 +01:00
vAugagneur cca3f642fd //remove modules_list.xml 2013-02-12 14:36:43 +01:00
vAugagneur 0ab55781ee //remove modules_list.xml 2013-02-12 14:36:43 +01:00
Rémi Gaillard 6b6e3a5ba1 // php notice 2013-02-12 12:06:09 +01:00
Rémi Gaillard ba3f3b88b5 // php notice 2013-02-12 12:06:09 +01:00
Damien Metzger 6a5565e28b [-] MO : applied unachieved patch on blockbestsellers 2013-02-12 12:03:17 +01:00
Damien Metzger d007136149 [-] MO : applied unachieved patch on blockbestsellers 2013-02-12 12:03:17 +01:00
Rémi Gaillard 887092d292 [*] 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 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 61e691d3a6 // small fix for change position 2013-02-12 10:46:48 +01:00
Rémi Gaillard d6f21bd9f9 // small fix for change position 2013-02-12 10:46:48 +01:00
Rémi Gaillard 5e5cbb0d65 // Fix SQL error 2013-02-11 18:45:00 +01:00
Rémi Gaillard 9709339084 // Fix SQL error 2013-02-11 18:45:00 +01:00
Rémi Gaillard 1197d9248b [-] FO: Fix PHP warning on update quantity in cart with customizables products 2013-02-11 18:04:23 +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 372ec5e940 Merge pull request #266 from anat/development
[+] WS : Add product bundle retrieval from Web services
2013-02-11 08:53:31 -08: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 8400eb53e5 [+] WS : Add product bundle retrieval from Web services 2013-02-11 17:51:18 +01:00
anat 4990028dc2 [+] WS : Add product bundle retrieval from Web services 2013-02-11 17:51:18 +01:00
Rémi Gaillard adecde6ee1 [-] 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 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 03842da02d [-] FO: Fix Cart::getDeliveryOption() cache 2013-02-11 16:59:16 +01:00
Rémi Gaillard cc15bf0243 [-] FO: Fix Cart::getDeliveryOption() cache 2013-02-11 16:59:16 +01:00
Rémi Gaillard 41069dc231 [-] MO: Clear blockcategories_footer.tpl cache 2013-02-11 16:30:04 +01:00
Rémi Gaillard d2ce6050d2 [-] MO: Clear blockcategories_footer.tpl cache 2013-02-11 16:30:04 +01:00
Gregory Roussac 2fe55e3eb0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 16:14:22 +01:00
Gregory Roussac 498904d22a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 16:14:22 +01:00