Commit Graph
6365 Commits
Author SHA1 Message Date
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
Damien Metzger 3c2ae9efa7 [-] FO : fixed default order by manufacturer #PSCFV-6105 2012-12-14 10:30:13 +01:00
Damien Metzger 689a10d9bd [-] FO : fixed default order by manufacturer #PSCFV-6105 2012-12-14 10:30:13 +01:00
Damien Metzger ee19d3d62b // Cleaned modules call 2012-12-13 14:38:55 +01:00
Damien Metzger 6e2ebf1c07 // Cleaned modules call 2012-12-13 14:38:55 +01:00
Damien Metzger 2bf6b3a82e // Cleaned modules call 2012-12-13 13:35:33 +01:00
Damien Metzger b391fc176a // Cleaned modules call 2012-12-13 13:35:33 +01:00
vAugagneur c1bbd15fb0 [-] FO : small fix on mobile logo url 2012-12-13 09:30:55 +01:00
vAugagneur cfa1359c87 [-] FO : small fix on mobile logo url 2012-12-13 09:30:55 +01:00
Rémi Gaillard 1c5f8b968c [-] BO: Fix catalog price rules creation with mysql strict mod #PSCFV-5916 2012-12-12 19:38:40 +01:00
Rémi Gaillard e0aa292a69 [-] BO: Fix catalog price rules creation with mysql strict mod #PSCFV-5916 2012-12-12 19:38:40 +01:00
Rémi Gaillard d4ba675273 // fix js arg missing for translations in javascript 2012-12-12 19:07:29 +01:00
Rémi Gaillard 91ba2bfa2e // fix js arg missing for translations in javascript 2012-12-12 19:07:29 +01:00
Vincent Augagneur 6445fea198 Merge pull request #69 from PrestaEdit/mails
[+] Project: add the possibility to change the default color (#db3484)
2012-12-12 06:59:04 -08:00
Vincent Augagneur ebff913250 Merge pull request #69 from PrestaEdit/mails
[+] Project: add the possibility to change the default color (#db3484)
2012-12-12 06:59:04 -08:00
vAugagneur 4cbf8d380f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-12 14:37:40 +01:00
vAugagneur 39f108d79d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-12 14:37:40 +01:00
vAugagneur ed836e081c //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
vAugagneur 42f3587e8e //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
Rémi Gaillard 07c47f7001 [-] BO: useSSL global does not exist anymore #PSCFV-6113 2012-12-12 14:33:42 +01:00
Rémi Gaillard ed65ab64de [-] BO: useSSL global does not exist anymore #PSCFV-6113 2012-12-12 14:33:42 +01:00
Damien Metzger 51dff4de4e // Merged 4 lignes of code in the Configuration class 2012-12-12 14:29:37 +01:00
Damien Metzger 0f6b60a3af // Merged 4 lignes of code in the Configuration class 2012-12-12 14:29:37 +01:00
Rémi Gaillard d49b13579b [-] FO: The dispatcher now load the custom routes prior the defaults to avoid infinite loops 2012-12-12 11:46:19 +01:00
Rémi Gaillard 1d909b1248 [-] FO: The dispatcher now load the custom routes prior the defaults to avoid infinite loops 2012-12-12 11:46:19 +01:00
vAugagneur 768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Rémi Gaillard 82a230aa70 [-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination 2012-12-11 17:45:06 +01:00
Rémi Gaillard b3b5f7a1e9 [-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination 2012-12-11 17:45:06 +01:00
sLorenzini 0727da6aeb [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 2012-12-11 17:43:30 +01:00
sLorenzini 05a6f856da [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 2012-12-11 17:43:30 +01:00
Rémi Gaillard c9cb49d5a1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 16:59:56 +01:00
Rémi Gaillard bf1b491e94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 16:59:56 +01:00
vAugagneur fab1c02443 [-] CORE : fixed bug #PSCFV-6084 2012-12-11 16:59:35 +01:00
vAugagneur ec05f5e384 [-] CORE : fixed bug #PSCFV-6084 2012-12-11 16:59:35 +01:00
Rémi Gaillard 4c026fe0fc [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 2012-12-11 16:59:26 +01:00
Rémi Gaillard 8d2f5d6e42 [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 2012-12-11 16:59:26 +01:00
Rémi Gaillard 5891143e5b [-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes 2012-12-11 16:05:29 +01:00
Rémi Gaillard ef4b3576fc [-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes 2012-12-11 16:05:29 +01:00
vAugagneur a4e48ccc7d [-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO 2012-12-11 15:44:32 +01:00
vAugagneur 5698e05f63 [-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO 2012-12-11 15:44:32 +01:00
Damien Metzger 8e8c1bee81 [-] FO : jquery mobile was not compatible with js minifier, I updated both 2012-12-11 14:01:40 +01:00
Damien Metzger e6ad7ec815 [-] FO : jquery mobile was not compatible with js minifier, I updated both 2012-12-11 14:01:40 +01:00
Rémi Gaillard 7cd629b15b [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +01:00
Rémi Gaillard e8718ec42f [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +01:00