Commit Graph

3014 Commits

Author SHA1 Message Date
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 2b06e54e78 [-] 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 3c2ae9efa7 [-] FO : fixed default order by manufacturer #PSCFV-6105 2012-12-14 10:30:13 +01:00
Damien Metzger 2bf6b3a82e // 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
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 d4ba675273 // 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
vAugagneur 4cbf8d380f 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
Rémi Gaillard 07c47f7001 [-] 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
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
vAugagneur 768fcf8f84 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
sLorenzini 0727da6aeb [-] 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
vAugagneur fab1c02443 [-] 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 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
vAugagneur a4e48ccc7d [-] 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
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 b2f01058a8 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +01:00
Damien Metzger 27eaed42bd [-] MO : fixed backslashes in homeslider #PSCFV-5664 2012-12-11 11:16:56 +01:00
Rémi Gaillard 27ae42b086 [-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function 2012-12-10 15:06:03 +01:00
Rémi Gaillard 29b4adb032 [-] Core: Fix search indexation when id_product is forced #PSCFV-6039 2012-12-10 13:52:09 +01:00
Rémi Gaillard 60e99d6b66 // Display exception in admin regardless mode dev 2012-12-10 10:47:41 +01:00
Rémi Gaillard db9ff416c0 // small fix 2012-12-07 18:01:32 +01:00
Rémi Gaillard d274f6d84a [-] WS: Fix #PSCFV-5915 temporary images deletion 2012-12-07 17:58:46 +01:00
Rémi Gaillard cd7cc208e8 [-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution 2012-12-07 17:23:06 +01:00
vAugagneur 006bb7b19a [-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order 2012-12-07 16:23:52 +01:00
Rémi Gaillard 5bcc1417dd // small fix for urls 2012-12-07 11:46:50 +01:00
vAugagneur 4dbb321836 [-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules 2012-12-06 17:05:19 +01:00
vAugagneur accb337006 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 16:53:37 +01:00
vAugagneur 52f4fca6e1 [-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled 2012-12-06 16:53:29 +01:00
Rémi Gaillard 224646ef1f [-] FO: Fix some tax_display_method value for not default customer group 2012-12-06 16:38:31 +01:00
vAugagneur 640ec6d006 [-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called 2012-12-06 12:16:37 +01:00
vAugagneur 12f47a1b9b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 11:32:24 +01:00
vAugagneur d71970d5ff [-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing 2012-12-06 11:32:19 +01:00
Milow 82c7f03119 Fix typo 2012-12-05 21:27:37 -06:00
Milow 55e55689a6 Fix mail error
This changes two things in the mail class.

1. If the html template was missing, it would tell you the txt template
was missing. It now tells you that the html template is missing.

2. If the type is set to only text or html, don't fail if the other
template is missing. Example, if set to only use text templates, don't
fail if the html template does not exist. If the type is set to both,
or if the specific type of template is missing, it will still complain.
2012-12-05 21:26:07 -06:00
vAugagneur 2c095c11a1 [-] FO : fixed bug #PSCFV-5826 #PSCFV-4697 Live edit only works for home page && Live edit can't load module 2012-12-04 18:29:10 +01:00
Rémi Gaillard 4e9c534f1b [-] Core: Locales should be setted anywhere #PSCFV-5953 2012-12-04 15:40:17 +01:00
Rémi Gaillard a1e91bcfa9 [-] Core: Fix #PSCFV-5948 id_warehouse was sometime set to null on validateorder with stock management disabled 2012-12-04 15:32:06 +01:00
Rémi Gaillard b414bd06a4 [-] Core: Fix #PSCFV-5966 the tax rate applied to shipping cost for the visitors was the product tax rate 2012-12-04 15:09:41 +01:00
Rémi Gaillard e70069bdfa [-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists 2012-12-04 11:56:17 +01:00
Rémi Gaillard aac0500c72 [-] WS: Fix #PSCFV-5981 logo path 2012-12-04 11:52:04 +01:00
Rémi Gaillard f8365220e2 [-] Core: Fix isDate validator 2012-12-03 16:52:22 +01:00