Commit Graph
18608 Commits
Author SHA1 Message Date
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
gRoussac 0763774707 [-] FO : Fix bug #PSCFI-6686 when url param has no value set 1 to valuePSCFI-6686 2013-02-11 16:13:46 +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 7e8d0a27ff [-] BO: Fix #PSCFV-7462 bad sql request for ordering by price in adminproducts 2013-02-11 15:54:53 +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 9dc31dd415 [-] FO: Fix product restriction by shop 2013-02-11 15:21:54 +01:00
Rémi Gaillard 3cf99fe042 [-] FO: Fix product restriction by shop 2013-02-11 15:21:54 +01:00
gRoussac 069814051d [-] FO : Fix bug #PSCFV-7491 special characters in direct search 2013-02-11 15:07:43 +01:00
gRoussac 387c124a6d [-] FO : Fix bug #PSCFV-7491 special characters in direct search 2013-02-11 15:07:43 +01:00
gRoussac dfb917ef6d [*] TR : update translations for FR and DE 2013-02-11 14:32:19 +01:00
gRoussac cd11ab288e [*] TR : update translations for FR and DE 2013-02-11 14:32:19 +01:00
gRoussac e17874cc55 [-] FO : Fix bug #PSCFV-7562 no availability date in tempalte 2013-02-11 14:31:08 +01:00
gRoussac c5d3c6e293 [-] FO : Fix bug #PSCFV-7562 no availability date in tempalte 2013-02-11 14:31:08 +01:00
gRoussac 3bd56273ef [-] CORe : Fix #PSCFV-7314 unregisterHook and unregisterExceptions in module::uninstall 2013-02-11 12:00:54 +01:00
gRoussac ea2a1eb122 [-] CORe : Fix #PSCFV-7314 unregisterHook and unregisterExceptions in module::uninstall 2013-02-11 12:00:54 +01:00