dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,608 Commits 9 Branches 19 Tags
a07733fcec16f471ec447789631804a0a33b94de
Commit Graph
18608 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 c3ad73cd2c 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
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 64915d390c [-] 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
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 01de5920c3 [-] PDF : Fixed unecessary slash in overriden template path 2013-02-11 10:53:46 +01:00
Michel Courtade 3c00b28107 [-] PDF : Fixed unecessary slash in overriden template path 2013-02-11 10:53:46 +01:00
vAugagneur becee63434 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 10:30:38 +01:00
vAugagneur b1c39da837 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
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 ba11328cec [-] BO: Fix #PSCFV-7427 group id used for price computation on order edition 2013-02-08 15:02:15 +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 5eb63feecc Update modules/blocksupplier/blocksupplier.php 
Missing uninstall function for blocksupplier to clean the configuration table.
 2013-02-08 11:37:14 +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 c83a0fda3f // small fix on displayError in Admincountries 2013-02-07 18:40:20 +01:00
gRoussac 1127dc35b4 // 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
Damien Metzger 26a01f0a41 // 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 623ba4e7c7 [-] 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 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 a6a46e3cce // Disallow click to install steps during process 2013-02-07 16:40:19 +01:00
Rémi Gaillard f013fdbc2d // 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 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 5ba95dddc9 // AdminRequestSql::returnBytes is useless 2013-02-07 14:19:08 +01:00
Rémi Gaillard 7ad5729b06 // 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 e46aa10991 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
vAugagneur 6d18f2e7f4 //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
Rémi Gaillard 655ab84d07 [-] 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 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 a7588f5cc0 [+] CORE : Add .txt extention to CHANGELOG 2013-02-06 16:46:01 +01:00
gRoussac c1d8f7ee00 [+] 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 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 08d5440c7f // something missing in the last commit 2013-02-06 15:48:16 +01:00
Rémi Gaillard d2954b17f6 // 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
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 85e09e2a0a // Changed default phone number 2013-02-06 14:13:50 +01:00
Damien Metzger 4eef24de19 // Changed default phone number 2013-02-06 14:13:50 +01:00
Rémi Gaillard 19795c1cea [-] FO: Fix fatal error when a customer is deleted and still logged 2013-02-06 11:56:23 +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