Commit Graph

18638 Commits

Author SHA1 Message Date
François Gaillard 9a4f6a468f [-] FO : Mobile, data-ajax added on vouchers form 2012-12-18 17:45:04 +01:00
Francois Gaillard a9b8511f3f [-] FO : Mobile, data-ajax added on vouchers form 2012-12-18 17:45:04 +01:00
François Gaillard 363999c1d8 [-] FO : Mobile, bug fix (JS page reload on OPC) 2012-12-18 16:26:40 +01:00
Francois Gaillard 0679572a87 [-] FO : Mobile, bug fix (JS page reload on OPC) 2012-12-18 16:26:40 +01:00
vAugagneur b390a51333 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:14:26 +01:00
vAugagneur 683e8eb149 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:14:26 +01:00
vAugagneur f07b96f3d8 [-] FO : fixed bug #PSCFV-4878 - When disable show prices for default group don't show product accessories 2012-12-18 16:14:22 +01:00
vAugagneur 14789a0d67 [-] FO : fixed bug #PSCFV-4878 - When disable show prices for default group don't show product accessories 2012-12-18 16:14:22 +01:00
Damien Metzger 200ae7527d [-] MO : fixed total quantity in statsforecast #PSCFV-5986 2012-12-18 16:06:00 +01:00
Damien Metzger 8d1adde9d8 [-] MO : fixed total quantity in statsforecast #PSCFV-5986 2012-12-18 16:06:00 +01:00
vAugagneur 13425aff53 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:20 +01:00
vAugagneur 66f58dfbd9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:20 +01:00
Rémi Gaillard 49c3a3ab29 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:12 +01:00
Rémi Gaillard dec0cf5177 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:12 +01:00
vAugagneur a91fafe05a [-] CORE : fixed bug #PSCFV-5116 Horizontal top menu cache 2012-12-18 16:00:10 +01:00
vAugagneur 9b0dbae730 [-] CORE : fixed bug #PSCFV-5116 Horizontal top menu cache 2012-12-18 16:00:10 +01:00
Rémi Gaillard ee4534a548 // small change 2012-12-18 15:59:57 +01:00
Rémi Gaillard 85b1127be2 // small change 2012-12-18 15:59:57 +01:00
Damien Metzger 96d6abe2af [-] BO : Fixed warning in helper #PSCFV-6183 2012-12-18 15:47:09 +01:00
Damien Metzger 62e70850fb [-] BO : Fixed warning in helper #PSCFV-6183 2012-12-18 15:47:09 +01:00
Rémi Gaillard 26d95d1ea4 [-] Core: The emails can now be sent with amazon SES when logo is in png 2012-12-18 15:45:43 +01:00
Rémi Gaillard d431802e7e [-] Core: The emails can now be sent with amazon SES when logo is in png 2012-12-18 15:45:43 +01:00
Damon Skelhorn 144081ae9e [-] MO : crossselling - Added in condition to test element is present. 2012-12-18 14:38:48 +00:00
Damon Skelhorn ef9e58a27c [-] MO : crossselling - Added in condition to test element is present. 2012-12-18 14:38:48 +00:00
vAugagneur 17350c6149 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes 2012-12-18 14:59:34 +01:00
vAugagneur ef0eb49ba9 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes 2012-12-18 14:59:34 +01:00
Damien Metzger c138e2dc5b [-] BO : fixed weight and distance units validation 2012-12-18 14:40:58 +01:00
Damien Metzger 270ae41d15 [-] BO : fixed weight and distance units validation 2012-12-18 14:40:58 +01:00
Damien Metzger 86547e0b79 // Grumpf 2012-12-18 14:35:28 +01:00
Damien Metzger a80a5414cc // Grumpf 2012-12-18 14:35:28 +01:00
Damien Metzger bd17218001 // Not enough 2012-12-18 14:34:33 +01:00
Damien Metzger d581396b0f // Not enough 2012-12-18 14:34:33 +01:00
Damien Metzger c24da4aafc [-] BO : fixed weight and distance units validation 2012-12-18 14:27:11 +01:00
Damien Metzger 975310f18b [-] BO : fixed weight and distance units validation 2012-12-18 14:27:11 +01:00
Damon Skelhorn 403ce760b2 [*] MO : crossselling - moved javascript include into header hook. 2012-12-18 11:52:25 +00:00
Damon Skelhorn 985062f56f [*] MO : crossselling - moved javascript include into header hook. 2012-12-18 11:52:25 +00:00
Damien Metzger 7869a43d16 [-] Core : do not die in production mode! #PSCFV-5751 2012-12-18 11:48:50 +01:00
Damien Metzger 4aa5655613 [-] Core : do not die in production mode! #PSCFV-5751 2012-12-18 11:48:50 +01:00
Damien Metzger 122c3e5a86 [-] FO : fixed CSS compression when using inline images #PSCFV-5326 2012-12-18 11:15:18 +01:00
Damien Metzger a8c86f09e7 [-] FO : fixed CSS compression when using inline images #PSCFV-5326 2012-12-18 11:15:18 +01:00
vAugagneur 06345eab9a Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-17 18:05:25 +01:00
vAugagneur 3954d7381d Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-17 18:05:25 +01:00
vAugagneur a7ad0d9b30 revert modif on product.js 2012-12-17 18:05:22 +01:00
vAugagneur fde175ac4f revert modif on product.js 2012-12-17 18:05:22 +01:00
vAugagneur 8d6de37870 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-17 16:51:36 +01:00
vAugagneur d2fedaf40d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-17 16:51:36 +01:00
vAugagneur 3a55ff9ee9 //added more details in some error messages 2012-12-17 16:51:21 +01:00
vAugagneur f127d22ba0 //added more details in some error messages 2012-12-17 16:51:21 +01:00
Damien Metzger c705d1eb4b [-] FO : fixed multishipping crash when too many products and addresses 2012-12-17 16:27:47 +01:00
Damien Metzger 12be2627f2 [-] FO : fixed multishipping crash when too many products and addresses 2012-12-17 16:27:47 +01:00