Commit Graph

3220 Commits

Author SHA1 Message Date
Rémi Gaillard 23733e0158 // delete useless commented code 2013-02-19 14:45:25 +01:00
gRoussac 3b4978af36 [-] CORE : Fix too big query for lastNoneOrderedCart 2013-02-18 17:44:09 +01:00
Rémi Gaillard 7c26ea32e7 [-] BO: Fix #PSCFV-7851 - shop logo and name should depend of the order shop and from the context 2013-02-18 15:43:37 +01:00
Rémi Gaillard 8ab6c87df0 [-] Core: Change cache key name of objectmodel now using classname against table name #PSCFV-7795 2013-02-18 10:56:00 +01:00
Rémi Gaillard f593ec5b8a [-] MO: regenerate the class_index after adding a new override 2013-02-15 18:41:06 +01:00
vAugagneur 6ade01adaa //small fix 2013-02-15 17:06:16 +01:00
Rémi Gaillard 36c23c54cc [-] BO: Fix #PSCFV-7734 multiple order delivery number for the same order 2013-02-15 16:24:46 +01:00
gRoussac 1db843334a [-] FO : Fix warning #PSCFV-7805 2013-02-15 14:51:47 +01:00
vAugagneur 88a8140c59 [-] CORE : fixed bug #PSCFV-6545 - ImageManager::resize() error 2013-02-15 12:13:13 +01:00
Rémi Gaillard 05a64b9d66 [-] FO: Fix categories and products restriction for unidentified customers after upgrade 2013-02-14 16:04:36 +01:00
Damien Metzger 2d0f54e0ee // Fixed warning and wrong cart rule total 2013-02-14 09:46:18 +01:00
Damien Metzger 849c2da9eb [*] BO : the option for accented URLs is now available in the backend 2013-02-14 09:15:01 +01:00
gRoussac 876b4c09bc [-] CORE : Fix warning when result from query is not a ressource 2013-02-13 19:53:48 +01:00
Rémi Gaillard 7402d7b93d [-] Core: Fix rounding price computation with and without taxes #PSCFV-7796 2013-02-13 17:48:40 +01:00
Rémi Gaillard 9dcb75e572 [*] BO: you can now export listing of some tabs in CSV 2013-02-13 16:15:37 +01:00
Damien Metzger dc5526c84c [-] 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
gRoussac d9fbe89270 [-] 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
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 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 7e8d0a27ff [-] 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
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 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
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
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
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
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
Damien Metzger 063e6597e3 [-] 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 d2ba246a08 [-] 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
vAugagneur 5330f4da40 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 14:16:58 +01:00
vAugagneur 64764c4c1e //added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit 2013-02-05 14:16:47 +01:00
Rémi Gaillard a84e91f973 // Fix merge bug 2013-02-05 11:02:05 +01:00
vAugagneur 0ceab34c5e //failed to delete buffer. No buffer to delete in PDF 2013-02-05 10:12:00 +01:00
Vincent Augagneur f8c97d8814 Merge pull request #134 from PrestaEdit/patch-2
[-] FO: need id_product_attribute to know quantity
2013-02-05 00:52:50 -08:00
vAugagneur 4ef61eb8f8 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
vAugagneur b23aa76d6b Merge branch 'dispatch_modules' into development 2013-02-04 18:20:24 +01:00
vAugagneur 0de5c242ca [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
Damien Metzger a9106be306 Merge pull request #243 from burhanbvk/patch-3
[-] FO : Fixed a typo for ui.droppable dependencies
2013-02-04 09:14:20 -08:00
Rémi Gaillard d4667abc63 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-04 16:05:17 +01:00
Rémi Gaillard 1dbf4855cc [-] BO: Fix id_shop for configuration variables in global context for orders 2013-02-04 16:05:01 +01:00