dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

6950 Commits

Author SHA1 Message Date
Damien Metzger 7fc33eb01c [-] Catch JSMin exception and return uncompressed js #PSCFV-7686 #PSCFV-5785 2013-02-13 15:16:17 +01:00
Damien Metzger 0986c1f594 // mod_filter is required with mod_deflate from apache 2.4 2013-02-13 14:46:34 +01:00
Damien Metzger ce9da19b49 // mod_filter is required with mod_deflate from apache 2.4 2013-02-13 14:46:34 +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
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 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 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
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
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
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
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
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
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
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
Daniel 6c7c571381 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
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
Damien Metzger 063e6597e3 [-] FO : you need to execute CartRule::autoAddToCart() after CartRule::autoRemoveFromCart(), everytime #PSCFV-7674 2013-02-05 18:19:22 +01:00
Damien Metzger d30677ef8b [-] FO : you need to execute CartRule::autoAddToCart() after CartRule::autoRemoveFromCart(), everytime #PSCFV-7674 2013-02-05 18:19:22 +01:00
Rémi Gaillard 3e0e22f25a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 15:28:28 +01:00
Rémi Gaillard 66f82b119c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 15:28:28 +01:00
Rémi Gaillard d2ba246a08 [-] BO: Don't display delete icon for order carts 2013-02-05 15:28:09 +01:00
Rémi Gaillard c80e0f48be [-] BO: Don't display delete icon for order carts 2013-02-05 15:28:09 +01:00
Damien Metzger 0052a9a94a [*] Core : added automatic conversion of ',' into '.' for floating values 2013-02-05 15:02:41 +01:00
Damien Metzger 49d310fe49 [*] Core : added automatic conversion of ',' into '.' for floating values 2013-02-05 15:02:41 +01:00
vAugagneur 5330f4da40 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 14:16:58 +01:00