Commit Graph

8324 Commits

Author SHA1 Message Date
Gregory Roussac 1fbfa80e43 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
vAugagneur 00b6e9ff20 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 8effbd8c68 [-] 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 43269e594d 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
gRoussac d9fbe89270 [-] 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
vAugagneur cca3f642fd //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
Damien Metzger 6a5565e28b [-] 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 61e691d3a6 // 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 1197d9248b [-] 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
anat 8400eb53e5 [+] 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 03842da02d [-] 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
Gregory Roussac 2fe55e3eb0 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
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 9dc31dd415 [-] 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 dfb917ef6d [*] 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 3bd56273ef [-] CORe : Fix #PSCFV-7314 unregisterHook and unregisterExceptions in module::uninstall 2013-02-11 12:00:54 +01:00
Rémi Gaillard c94bf2a823 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 11:46:02 +01:00
Rémi Gaillard 7ed1a548a2 [-] FO: Fix infinite loop on overriding Module::getPaymentModules and executing hook on it #PSCFV-7760 2013-02-11 11:45:42 +01:00
vAugagneur becee63434 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 10:30:38 +01:00
vAugagneur 9e342d5183 [-] 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 ba11328cec [-] BO: Fix #PSCFV-7427 group id used for price computation on order edition 2013-02-08 15:02:15 +01:00
gRoussac c83a0fda3f // small fix on displayError in Admincountries 2013-02-07 18:40:20 +01:00
Damien Metzger 4ab7b7eff4 // Translations 2013-02-07 18:20:19 +01:00
Rémi Gaillard 90462ad746 [-] BO: Fix connection with Addons on AdminModules 2013-02-07 18:01:53 +01:00
Rémi Gaillard 40a81674ba [-] FO: Fix #PSCFV-7714 quantity discounts displaying in product page for specific customer 2013-02-07 16:57:56 +01:00
Rémi Gaillard a6a46e3cce // Disallow click to install steps during process 2013-02-07 16:40:19 +01:00
Rémi Gaillard f6d9771de8 [-] 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
Rémi Gaillard 5ba95dddc9 // AdminRequestSql::returnBytes is useless 2013-02-07 14:19:08 +01:00
vAugagneur 97481cbe84 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-07 10:46:37 +01:00
vAugagneur 34870f6c40 //small fix 2013-02-07 10:46:31 +01:00
Rémi Gaillard 76c80680a2 [-] BO: Forbid to add a pack into a pack 2013-02-06 20:10:59 +01:00
gRoussac 5e98812e19 [-] CORE : file_put_contents() returns the number of bytes that were written to the file, or FALSE on failure. 2013-02-06 19:21:23 +01:00
gRoussac a7588f5cc0 [+] CORE : Add .txt extention to CHANGELOG 2013-02-06 16:46:01 +01:00
Rémi Gaillard ac686b6b48 // use curl against file_get_contents if allow_url_fopen is disabled for contextual help 2013-02-06 16:36:07 +01:00
Rémi Gaillard 08d5440c7f // something missing in the last commit 2013-02-06 15:48:16 +01:00
Rémi Gaillard fbf48fadf8 [*] BO: Improvements on customer services - you are now able to create new threads for synced emails 2013-02-06 15:28:57 +01:00