6672 Commits
Author SHA1 Message Date
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
Rémi Gaillard b2f01058a8 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +01:00
Rémi Gaillard a8096c2800 [-] 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
Damien Metzger b7d4321e5a [-] 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 a68e5c1cfb [-] 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 8b817a4a8c [-] 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 53f1e8fcbb // 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 7e6d94053b // 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 3280bfbeed [-] 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
Rémi Gaillard 3497af985a [-] 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
vAugagneur 7bc49194b7 [-] 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
Rémi Gaillard 1c1fd827da // 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 f40369ef6a [-] 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 adc1197320 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
vAugagneur 048f3cce14 [-] 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
Rémi Gaillard 56819e3573 [-] 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 61c23c7e75 [-] 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 e809f6bfdb 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
vAugagneur 6f37326675 [-] 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 cf7aebd029 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
Milow c87fb469fd 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
vAugagneur 712f0c3d6d [-] 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 da5c5fb4a0 [-] 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