Commit Graph

8168 Commits

Author SHA1 Message Date
Gregory Roussac d38ed338bf [-] BO : Fix warnings when importing #PSCFV-6648 again 2013-01-29 12:33:15 +01:00
Gregory Roussac b51bf1af25 [-] BO : Fiw warning on $current_order_state 2013-01-29 12:21:33 +01:00
Gregory Roussac 54fb5b7eb7 [-] Bo : Fix warnings #PSCFV-6648 2013-01-29 11:55:51 +01:00
Rémi Gaillard 3f8e52d3f8 [-] BO: Fix warning when image is uploaded with PHP < 5.3 #PSCFV-7425 2013-01-29 11:53:53 +01:00
Rémi Gaillard a97843353b [-] FO: Fix Product::getProductName for multilang and multishop 2013-01-29 11:40:39 +01:00
Gregory Roussac 5832c576a0 [-] FO : 'undefined' is undefined =) 2013-01-29 10:56:28 +01:00
sLorenzini dca10cc17d [-] FO: fixed bug Change a little css code of global.css to solve a little issue on authentication page - #PSCFV-7527 2013-01-29 10:30:53 +01:00
Damien Metzger 25a64e9098 [-] BO : reduced error catching severity in the module tab 2013-01-29 10:16:02 +01:00
Damien Metzger 6f7e8cb741 // Added comments in a function 2013-01-29 10:16:02 +01:00
Rémi Gaillard 734b227a7f // Tools::simplexml_load_file now use curl if allow_url_fopen is disabled 2013-01-29 10:13:34 +01:00
Rémi Gaillard d920c050b4 // Tools::file_get_contents load with file_get_content for local paths 2013-01-28 19:01:54 +01:00
Rémi Gaillard 2da4ae138e [-] Core: Fix Tools::file_get_contents for post and curl 2013-01-28 18:51:02 +01:00
Gregory Roussac d788a4517b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-28 18:33:43 +01:00
Gregory Roussac 310de3da54 [-] FO : Fix #PSCFV-6356 recall adresses in cart after login 2013-01-28 18:29:35 +01:00
vAugagneur 178d2dede2 [-] CORE : fixed bug #PSCFV-6238 2013-01-28 18:14:22 +01:00
vAugagneur 97a425d749 [-] MO : fixed bug #PSCFV-6407 - module follow up client 2013-01-28 17:53:38 +01:00
vAugagneur 26bdd35e87 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-28 17:47:31 +01:00
vAugagneur a6dca20f52 [-] FO : fixed bug #PSCFV-7508 - broken links to images in jquery.fancybox.css 2013-01-28 17:47:18 +01:00
Gregory Roussac 64f0579f6f [-] FO : Fix bug #PSCFV-6516 when not same address to process 2013-01-28 17:00:54 +01:00
Gregory Roussac 882f3c4a86 [-] CORE : Bad placement of overrided Stock files 2013-01-28 16:18:39 +01:00
Gregory Roussac 50285b1e0e [-] MO : Fix warning on nbProducts 2013-01-28 16:08:56 +01:00
Gregory Roussac 74ba37a7bc Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-28 15:59:19 +01:00
Gregory Roussac d0b6d8d838 [-] MO : Fix bug #PNM-985 bad zone for carrier listing update 2013-01-28 15:57:07 +01:00
Gregory Roussac 25e0506b8f [-] MO : Fix bug #PNM-985 bad zone for cariier listing update 2013-01-28 15:55:13 +01:00
vAugagneur 69ec687d63 [-] INSTALLER : fixed bug #PSCFV-5702 - error javascript when password have a simple quote 2013-01-28 15:06:38 +01:00
Rémi Gaillard 8a5f5222f1 // Too many bugs on PDO with PHP < 5.2 2013-01-28 14:23:15 +01:00
sLorenzini 42f8289d3d [-] FO: fixed bug Block Cart in columns disappear if product is removed - #PSCFV-7495 2013-01-28 11:54:06 +01:00
Gregory Roussac f66a450e97 [-] MO : Update cart function was not functionning + optis 2013-01-28 11:23:40 +01:00
Vincent Augagneur 5598d38f38 Merge pull request #214 from macodev/development
[-] FO : fixed smarty curly bracket
2013-01-28 01:50:27 -08:00
Vincent Augagneur 34f67ec5e5 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 f56d10a4d8 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 1cff484c3d Merge pull request #229 from PrestaEdit/patch-18
[*] Class Tools: enhance fd method
2013-01-28 01:29:43 -08:00
Gregory Roussac 2723595e10 // not commited sorry 2013-01-28 09:51:33 +01:00
Rémi Gaillard 3354db0f64 [-] 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 1629e68c68 [-] BO: Fix SQL request on downloadable product duplication 2013-01-25 15:47:09 +01:00
Rémi Gaillard d10daeedbb [-] BO: Fix possible PHP notice on AdminGroups #PSCFV-7412 2013-01-25 15:27:37 +01:00
sLorenzini 21e9a2c5a2 [-] 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 6e1f4a7bc7 [-] FO: fixed bug PSCFV-6644 2013-01-25 13:42:32 +01:00
Gregory Roussac 69771bc402 [-] BO : Do not display country formatting twice, neither in FO 2013-01-25 12:13:13 +01:00
Gregory Roussac c042a0b71b [-] FO : Fix bug #PSCFV-6655 2013-01-25 11:11:47 +01:00
vAugagneur fb2ec6349a [-] FO : fixed bug #PSCFV-7381 - free shipping when no carrier available 2013-01-25 09:54:08 +01:00
Gregory Roussac 3630c4e9c8 //fix warnings 2013-01-25 01:00:38 +01:00
Gregory Roussac f5678d31c2 [-] CORE : Missing displayError for alias q 2013-01-25 00:55:04 +01:00
PrestaEdit 909c124e69 [*] 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 79c494aa90 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 18:51:13 +01:00
vAugagneur 8cedf1c43a [-] 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 8b8451831e [-] Core: Fix #PSCFV-7484 cache in Product::priceCalculation 2013-01-24 18:45:55 +01:00
vAugagneur dfad6d21a3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 18:26:33 +01:00
vAugagneur 210cc1ed01 [-] 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 955e2c378d [-] FO: Fix #PSCFV-7322 Product::getProductProperties quantity cache 2013-01-24 18:25:42 +01:00