Commit Graph

7723 Commits

Author SHA1 Message Date
sLorenzini dbe2d7998a [-] FO: fix Image attributes not set - #PSCFV-5957 2012-12-10 11:42:13 +01:00
vAugagneur 1b71add855 [-] BO : fixed bug #PSCFV-6000 - added check if zip uploaded is a real module in AdminModules 2012-12-10 11:16:33 +01:00
vAugagneur eb451604af [-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied 2012-12-10 10:51:46 +01:00
Rémi Gaillard 60e99d6b66 // Display exception in admin regardless mode dev 2012-12-10 10:47:41 +01:00
François Gaillard 6483525900 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-10 10:18:53 +01:00
François Gaillard 312df517fb [*] FO : Cart vouchers style edited 2012-12-10 10:18:41 +01:00
vAugagneur 20187807e1 [-] BO : added import button on listing 2012-12-10 10:14:03 +01:00
Rémi Gaillard db9ff416c0 // small fix 2012-12-07 18:01:32 +01:00
vAugagneur 1d70dad851 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-07 18:01:46 +01:00
vAugagneur e65478a1b4 //small js 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 6dd0a04ed0 [-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline 2012-12-07 17:22: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 78bfcfbaf0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 12:16:47 +01:00
vAugagneur 640ec6d006 [-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called 2012-12-06 12:16:37 +01:00
Rémi Gaillard 0e0f6ee641 [-] FO: Fix cart summary ajax refreshment 2012-12-06 11:58:29 +01:00
vAugagneur 76b435b639 //revert all config.xml 2012-12-06 11:41:52 +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
Rémi Gaillard 2166937cf5 Merge pull request #72 from Milow/development
// Fix mail error, make a little more robust
2012-12-06 01:48:46 -08:00
sLorenzini 2191eec919 [-] FO: improvement on h4/h5 edits (id become class) 2012-12-06 10:06:56 +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
Sarah Lorenzini 8ddafa2568 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-05 11:03:16 +01:00
sLorenzini 4844914b0a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-05 10:59:47 +01:00
sLorenzini babded4d29 //[-] FO: fixed bug #product_list li span.new: IE 6,7,8 bug: New product badge still not correct position - #PSCFV-5921 2012-12-05 10:42:26 +01:00
vAugagneur 6e9ea91ae7 //small variable name fix part 2 2012-12-04 18:47:00 +01:00
vAugagneur 6740906dcb //small variable name fix 2012-12-04 18:35:10 +01: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
Sarah Lorenzini 31efb947ab // change h4, h5 2012-12-04 17:15:49 +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
sLorenzini 52803b40b9 // fixed FO bugs 2012-12-04 15:27:43 +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 a4b6594f9c // Fix PHP notice #PSCFV-5967 2012-12-04 14:33:12 +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 69fbd79eee [-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0 2012-12-04 11:38:47 +01:00
Rémi Gaillard 6e87020ddf [-] BO: Add display of modules errors on reset #PSCFV-2077 2012-12-04 11:13:06 +01:00
vAugagneur 8baa2b34b8 //small html fix 2012-12-04 11:07:56 +01:00
Vincent Augagneur 85daf29f87 Merge pull request #63 from Ha99y/blockcms-fix
[*] FO - Update modules/blockcms/blockcms.tpl
2012-12-04 01:37:32 -08:00
Rémi Gaillard 1091d82546 // Fix PHP warning 2012-12-03 19:11:37 +01:00
Rémi Gaillard 627125e1de [-] BO: Fix #PSCFV-5706 save of product availability on global context 2012-12-03 17:53:47 +01:00
Rémi Gaillard f8365220e2 [-] Core: Fix isDate validator 2012-12-03 16:52:22 +01:00