Commit Graph

6559 Commits

Author SHA1 Message Date
Damien Metzger
9b3965425e [-] FO : changed behavior of the cart rules when the carrier and the address are not determined yet 2012-12-20 17:13:11 +01:00
Damien Metzger
6970bf57d9 [-] FO : changed behavior of the cart rules when the carrier and the address are not determined yet 2012-12-20 17:13:11 +01:00
Damien Metzger
0312d520e6 [-] FO : fixed wrong variable 2012-12-20 17:07:20 +01:00
Damien Metzger
5c1ac36f27 [-] FO : fixed wrong variable 2012-12-20 17:07:20 +01:00
Damien Metzger
fb4777d536 [-] BO : fixed warnings on the anti-XSS page 2012-12-20 16:04:01 +01:00
Damien Metzger
caf96db460 [-] BO : fixed warnings on the anti-XSS page 2012-12-20 16:04:01 +01:00
vAugagneur
6ff4fe73d7 //small fix 2012-12-20 15:49:45 +01:00
vAugagneur
7646ab35fa //small fix 2012-12-20 15:49:45 +01:00
Rémi Gaillard
2a14176055 [*] Core: conversion_rate of currencies are now multishop 2012-12-20 11:35:20 +01:00
Rémi Gaillard
1be7a98655 [*] Core: conversion_rate of currencies are now multishop 2012-12-20 11:35: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
vAugagneur
13425aff53 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:20 +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
66f58dfbd9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:20 +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
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
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
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
Rémi Gaillard
c9ef2c44ae [-] FO: Fix cache product features #PSCFV-6138 2012-12-17 15:52:52 +01:00
Rémi Gaillard
5b7069f0bf [-] FO: Fix cache product features #PSCFV-6138 2012-12-17 15:52:52 +01:00
Damien Metzger
a0f51e20c2 [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 2012-12-17 15:49:40 +01:00
Damien Metzger
ffa72b0b93 [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 2012-12-17 15:49:40 +01:00
Damien Metzger
3d1663279a [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 2012-12-17 15:45:40 +01:00
Damien Metzger
4c873cf61d [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 2012-12-17 15:45:40 +01:00
vAugagneur
4785acb7f9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-17 15:26:00 +01:00
vAugagneur
1c181b7c20 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-17 15:26:00 +01:00
vAugagneur
20b87785e3 [-] FO : fixed loop redirect when pagination have 0 product 2012-12-17 15:25:56 +01:00
vAugagneur
e472ff7239 [-] FO : fixed loop redirect when pagination have 0 product 2012-12-17 15:25:56 +01:00
Rémi Gaillard
4320f4c30c [-] Core: Fix #PSCFV-6162 - can't add no tax for specific zip code or state 2012-12-17 12:29:29 +01:00
Rémi Gaillard
3e89821b1d [-] Core: Fix #PSCFV-6162 - can't add no tax for specific zip code or state 2012-12-17 12:29:29 +01:00
Damien Metzger
2b06e54e78 [-] MO : fixed override deployment from module #PSCFV-5999 2012-12-14 14:58:35 +01:00
Damien Metzger
02b4df024b [-] MO : fixed override deployment from module #PSCFV-5999 2012-12-14 14:58:35 +01:00
Damien Metzger
c3c29e3abd [-] Core : cannot throw an exception in the autoload #PSCFV-6018 2012-12-14 14:28:33 +01:00
Damien Metzger
310eac9f69 [-] Core : cannot throw an exception in the autoload #PSCFV-6018 2012-12-14 14:28:33 +01:00