Commit Graph
8157 Commits
Author SHA1 Message Date
Rémi Gaillard dfb39b8f15 [-] Core: Fix Tools::file_get_contents for post and curl 2013-01-28 18:51:02 +01:00
Gregory Roussac 3504ac95b3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-28 18:33:43 +01:00
Gregory Roussac dce6247c0c [-] FO : Fix #PSCFV-6356 recall adresses in cart after login 2013-01-28 18:29:35 +01:00
vAugagneur c2162a274f [-] CORE : fixed bug #PSCFV-6238 2013-01-28 18:14:22 +01:00
vAugagneur 985888104d [-] MO : fixed bug #PSCFV-6407 - module follow up client 2013-01-28 17:53:38 +01:00
vAugagneur 1f636051d8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-28 17:47:31 +01:00
vAugagneur a0bc26c22c [-] FO : fixed bug #PSCFV-7508 - broken links to images in jquery.fancybox.css 2013-01-28 17:47:18 +01:00
Gregory Roussac 715ccbcf72 [-] FO : Fix bug #PSCFV-6516 when not same address to process 2013-01-28 17:00:54 +01:00
Gregory Roussac 90708ad38e [-] CORE : Bad placement of overrided Stock files 2013-01-28 16:18:39 +01:00
Gregory Roussac bc5df7a5fc [-] MO : Fix warning on nbProducts 2013-01-28 16:08:56 +01:00
Gregory Roussac b0c2b00028 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-28 15:59:19 +01:00
Gregory Roussac 9bd0480249 [-] MO : Fix bug #PNM-985 bad zone for carrier listing update 2013-01-28 15:57:07 +01:00
Gregory Roussac e17c9950e9 [-] MO : Fix bug #PNM-985 bad zone for cariier listing update 2013-01-28 15:55:13 +01:00
vAugagneur 0a26e74671 [-] INSTALLER : fixed bug #PSCFV-5702 - error javascript when password have a simple quote 2013-01-28 15:06:38 +01:00
Rémi Gaillard ca90f634c3 // Too many bugs on PDO with PHP < 5.2 2013-01-28 14:23:15 +01:00
sLorenzini 15f41a4125 [-] FO: fixed bug Block Cart in columns disappear if product is removed - #PSCFV-7495 2013-01-28 11:54:06 +01:00
Gregory Roussac 3001090919 [-] MO : Update cart function was not functionning + optis 2013-01-28 11:23:40 +01:00
Vincent Augagneur 532ffa2116 Merge pull request #214 from macodev/development
[-] FO : fixed smarty curly bracket
2013-01-28 01:50:27 -08:00
Vincent Augagneur 27b21e35b6 Merge pull request #219 from redpik/patch-1
[*] FO : oosHook must be a div, not a paragraph
2013-01-28 01:49:01 -08:00
Vincent Augagneur f596d0be8b Merge pull request #222 from PrestaEdit/patch-17
[-] MO: fix a problem with the wishlist_link
2013-01-28 01:48:03 -08:00
Vincent Augagneur 8f711169c7 Merge pull request #229 from PrestaEdit/patch-18
[*] Class Tools: enhance fd method
2013-01-28 01:29:43 -08:00
Gregory Roussac 64fdd5b8b5 // not commited sorry 2013-01-28 09:51:33 +01:00
Rémi Gaillard 484d0fae7f [-] BO: the attached file of downloadable products duplicated should not be the same than the original #PSCFV-7460 2013-01-25 15:57:54 +01:00
Rémi Gaillard 4af26ada0c [-] BO: Fix SQL request on downloadable product duplication 2013-01-25 15:47:09 +01:00
Rémi Gaillard 2de82a404f [-] BO: Fix possible PHP notice on AdminGroups #PSCFV-7412 2013-01-25 15:27:37 +01:00
sLorenzini 3d01f90d72 [-] FO: fixed bug Blocknewsletter.css has an extra bracket on the last line and when corrected override still won't work - #PSCFV-7436 2013-01-25 14:00:47 +01:00
sLorenzini 947c295d39 [-] FO: fixed bug PSCFV-6644 2013-01-25 13:42:32 +01:00
Gregory Roussac da0c18ad68 [-] BO : Do not display country formatting twice, neither in FO 2013-01-25 12:13:13 +01:00
Gregory Roussac 987ee5c527 [-] FO : Fix bug #PSCFV-6655 2013-01-25 11:11:47 +01:00
vAugagneur 42c150e2a7 [-] FO : fixed bug #PSCFV-7381 - free shipping when no carrier available 2013-01-25 09:54:08 +01:00
Gregory Roussac b2a10179be //fix warnings 2013-01-25 01:00:38 +01:00
Gregory Roussac efd02c7a7f [-] CORE : Missing displayError for alias q 2013-01-25 00:55:04 +01:00
PrestaEdit 9ceb2ab6e9 [*] Class Tools: enhance fd method
Add the posibilities to set an error, warning, info or assert.

Usage:
Tools::fd('test');
		Tools::fd('test', 'debug');
		Tools::fd('test', 'info');
		Tools::fd('test', 'warn');
		Tools::fd('test', 'error');
		Tools::fd('test', 'assert');
2013-01-24 20:12:38 +01:00
vAugagneur 8834e532c7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 18:51:13 +01:00
vAugagneur 578139a462 [-] BO - fixed bug #PSCFV-6248 don't delete product when delete category and choose option to delete products 2013-01-24 18:51:09 +01:00
Rémi Gaillard 1c22a76a3b [-] Core: Fix #PSCFV-7484 cache in Product::priceCalculation 2013-01-24 18:45:55 +01:00
vAugagneur fa3faf5369 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 18:26:33 +01:00
vAugagneur b27b9337b2 [-] BO - fixed bug #PSCFV-6195 - Currency format not re-writing in product tab shipping 2013-01-24 18:26:29 +01:00
Rémi Gaillard 24273960cc [-] FO: Fix #PSCFV-7322 Product::getProductProperties quantity cache 2013-01-24 18:25:42 +01:00
Rémi Gaillard 80fb4e7b0e [-] MO: Fix #PSCFV-7416 product name in blocklayered listing with multishop 2013-01-24 17:29:53 +01:00
vAugagneur f97b73a6c5 [-] FO - fixed bug #PSCFV-6620 - reply to customer thread not working properly 2013-01-24 16:24:04 +01:00
Rémi Gaillard 56fe86e76c [-] BO: Fix #PSCFV-7377 second part 2013-01-24 15:14:47 +01:00
sLorenzini 7c97700138 [-] FO: updated css product_list 2013-01-24 13:47:53 +01:00
Gregory Roussac 6a6fd9925d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 10:23:39 +01:00
gRoussac 31e3d9d388 [-] FO : No error on first consultation of shopping cart with minimum purchase 2013-01-24 10:22:29 +01:00
sLorenzini 5741d450c0 [-] FO: added a new line for better display on IE9 for the "new" on homefeatured and product list 2013-01-24 10:11:41 +01:00
gRoussac 290c9fa75c // parse error in last commit sorry 2013-01-24 09:41:35 +01:00
gRoussac 3c6c352df2 [-] FO : Fix bug #PSCFV-7388 Guest checkout & state validation thankx to Sergio 2013-01-24 09:28:06 +01:00
gRoussac 7d1e6d993d [-] BO : fix css for iframe of custom products when creating order in BO 2013-01-23 18:38:00 +01:00
gRoussac f81e0c51fa [-] FO : adding values to empty parameters in ajax of cart-summary.js 2013-01-23 18:36:20 +01:00