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
nezenmoins
70be828219
[-] PDF : Fixed unecessary slash in manufacturer image path test
...
In the file_exists test of the manufacturer image path there is an unecessary slash after the constant _PS_MANU_IMG_DIR_, and then we can't display a specific manufacturer image.
2013-02-11 11:33:06 +01:00
Michel Courtade
3c00b28107
[-] PDF : Fixed unecessary slash in overriden template path
2013-02-11 10:53:46 +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
ldecoker
3a5dd223a4
Update modules/blocksupplier/blocksupplier.php
...
Missing uninstall function for blocksupplier to clean the configuration table.
2013-02-08 11:37:14 +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
Rémi Gaillard
7ad5729b06
// AdminRequestSql::returnBytes is useless
2013-02-07 14:19:08 +01:00
vAugagneur
e46aa10991
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-02-07 10:46:37 +01:00
vAugagneur
6d18f2e7f4
//small fix
2013-02-07 10:46:31 +01:00
Rémi Gaillard
655ab84d07
[-] BO: Forbid to add a pack into a pack
2013-02-06 20:10:59 +01:00
gRoussac
c6c27548f4
[-] 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
c1d8f7ee00
[+] CORE : Add .txt extention to CHANGELOG
2013-02-06 16:46:01 +01:00
Rémi Gaillard
435519dee7
// 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
d2954b17f6
// something missing in the last commit
2013-02-06 15:48:16 +01:00
Rémi Gaillard
022464c578
[*] BO: Improvements on customer services - you are now able to create new threads for synced emails
2013-02-06 15:28:57 +01:00
Damien Metzger
4eef24de19
// Changed default phone number
2013-02-06 14:13:50 +01:00
Rémi Gaillard
588276cfb1
[-] FO: Fix fatal error when a customer is deleted and still logged
2013-02-06 11:56:23 +01:00
Damien Metzger
7b7b964f6a
Merge pull request #253 from Prestaworks/patch-7
...
[-] BO : no error message when deleting a manufacturer without address
2013-02-06 01:14:43 -08:00
Daniel
09f5879851
Update classes/Manufacturer.php
...
Fixed issue with not being able to remove manufacturers if they where missing an address. (Possible after an upgrade)
2013-02-06 11:35:15 +08:00
Gregory Roussac