Commit Graph
17850 Commits
Author SHA1 Message Date
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 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 947c295d39 [-] FO: fixed bug PSCFV-6644 2013-01-25 13:42:32 +01:00
sLorenzini 6e1f4a7bc7 [-] 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 69771bc402 [-] 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
Gregory Roussac c042a0b71b [-] 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
vAugagneur fb2ec6349a [-] 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 3630c4e9c8 //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
Gregory Roussac f5678d31c2 [-] 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
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 8834e532c7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 18:51:13 +01:00
vAugagneur 79c494aa90 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
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 1c22a76a3b [-] Core: Fix #PSCFV-7484 cache in Product::priceCalculation 2013-01-24 18:45:55 +01:00
Rémi Gaillard 8b8451831e [-] 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 dfad6d21a3 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
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 24273960cc [-] FO: Fix #PSCFV-7322 Product::getProductProperties quantity cache 2013-01-24 18:25:42 +01:00
Rémi Gaillard 955e2c378d [-] 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
Rémi Gaillard 9fd52c56e2 [-] 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
vAugagneur 4a9c3df77c [-] FO - fixed bug #PSCFV-6620 - reply to customer thread not working properly 2013-01-24 16:24:04 +01:00
vAugagneur bc203bfc3a [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
vAugagneur ab3226d9d2 [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
Rémi Gaillard 56fe86e76c [-] BO: Fix #PSCFV-7377 second part 2013-01-24 15:14:47 +01:00
Rémi Gaillard 9f2b4acf2f [-] 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
sLorenzini 808657f443 [-] 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
Gregory Roussac 496999fb1c 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
gRoussac 33f27c2c0b [-] 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
sLorenzini f11faead01 [-] 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 4b73d72a65 // 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 7b48cdd068 [-] FO : Fix bug #PSCFV-7388 Guest checkout & state validation thankx to Sergio 2013-01-24 09:28:06 +01:00
emily-d 82cb9f8ba9 [-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Redirects) on pages served by https.
See http://www.prestashop.com/forums/topic/217724-activer-le-ssl-url-simplifiee-mod-rewrite-ne-marche-pas-erreur-301-sur-les-pages-commandes for more info.
2013-01-23 22:30:18 +01:00
emily-d 812f2f1232 [-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Redirects) on pages served by https.
See http://www.prestashop.com/forums/topic/217724-activer-le-ssl-url-simplifiee-mod-rewrite-ne-marche-pas-erreur-301-sur-les-pages-commandes for more info.
2013-01-23 22:30:18 +01:00