Commit Graph
18608 Commits
Author SHA1 Message Date
gRoussac 049d00a9db [-] INSTALLER : Fix bug #PSCFV-8605 first part, do not affect memeory limit when upgrading if set to -1 2013-05-02 19:02:48 +02:00
gRoussac 5a922391e2 [-] INSTALLER : Fix bug #PSCFV-8605 first part, do not affect memeory limit when upgrading if set to -1 2013-05-02 19:02:48 +02:00
Rémi Gaillard 32a11677e7 // small fix 2013-05-02 18:58:05 +02:00
Rémi Gaillard 7eb318b0b0 // small fix 2013-05-02 18:58:05 +02:00
Edouard Gaulué fdb931e3e8 [-] BO : don't show unecessary tpl module translations - complience with documentation 2013-05-02 18:46:13 +02:00
Edouard Gaulué 0442bee919 [-] BO : don't show unecessary tpl module translations - complience with documentation 2013-05-02 18:46:13 +02:00
Rémi Gaillard 4d4eb9df19 [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
Rémi Gaillard 41786587ba [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
Edouard Gaulué 467c183564 [-] BO : don't show translation for class/controler overrides when on modules translation page 2013-05-02 18:21:54 +02:00
Edouard Gaulué 444a99f564 [-] BO : don't show translation for class/controler overrides when on modules translation page 2013-05-02 18:21:54 +02:00
gRoussac 63fe5b8d4a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 17:10:49 +02:00
gRoussac 4b59516a52 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 17:10:49 +02:00
gRoussac 311ad3087c // small fix when rel of big pic is empty 2013-05-02 17:06:32 +02:00
gRoussac b4547fbd83 // small fix when rel of big pic is empty 2013-05-02 17:06:32 +02:00
Damien Metzger 87be8bd39e [-] BO : fixed infinite loop in the categories #PSCFV-8965 2013-05-02 16:06:26 +02:00
Damien Metzger fb604492b7 [-] BO : fixed infinite loop in the categories #PSCFV-8965 2013-05-02 16:06:26 +02:00
sLorenzini e67965e6bc // FO: improve jqzoom product 2013-05-02 15:56:55 +02:00
sLorenzini f1c2d431a9 // FO: improve jqzoom product 2013-05-02 15:56:55 +02:00
gRoussac 15a4d1c60f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 15:41:34 +02:00
gRoussac 5c7f3e256d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 15:41:34 +02:00
gRoussac 605f95eb88 [-] INSTALLER : Fix bug #PSCFV-8750 do not activate disabled module during upgrade 2013-05-02 15:41:21 +02:00
gRoussac a1ce0fda13 [-] INSTALLER : Fix bug #PSCFV-8750 do not activate disabled module during upgrade 2013-05-02 15:41:21 +02:00
sLorenzini e158ea1227 [-] FO: fixed bug: Solved a javascript problem on the new 1.5.4.1 with the full image on product page - PSCFV-8967 2013-05-02 15:06:57 +02:00
sLorenzini 9e78586d2b [-] FO: fixed bug: Solved a javascript problem on the new 1.5.4.1 with the full image on product page - PSCFV-8967 2013-05-02 15:06:57 +02:00
vAugagneur 77b8e106f7 [-] MO : fixed hug #PSCFV-8994 - clear cache when truncate catalog 2013-05-02 11:41:49 +02:00
vAugagneur 0ba4d91c43 [-] MO : fixed hug #PSCFV-8994 - clear cache when truncate catalog 2013-05-02 11:41:49 +02:00
Grégoire Bélorgey 20babaf68e Merge last developments from Prestashop 2013-05-01 09:17:51 +02:00
Grégoire Bélorgey 7cd6ab4218 gb/mailcolor 2013-05-01 09:01:39 +02:00
PrestaEdit b6fbbe6187 [*] FO: use Tools::fileAttachment() in ContactController 2013-04-30 20:46:34 +02:00
PrestaEdit 757f740037 // fix </description> 2013-04-30 20:40:03 +02:00
PrestaEdit 2d1c6514f3 // fix </description> 2013-04-30 20:40:03 +02:00
Rémi Gaillard 46f7922a8f // id_product_attribute is not necessary in the cache name of Product::getPriceStatic for cart_quantity 2013-04-30 12:33:52 +02:00
Rémi Gaillard fb3291a08f // id_product_attribute is not necessary in the cache name of Product::getPriceStatic for cart_quantity 2013-04-30 12:33:52 +02:00
sLorenzini e0a16977ef [-] FO: improve some css for RTL language 2013-04-30 11:34:13 +02:00
sLorenzini ad8291353b [-] FO: improve some css for RTL language 2013-04-30 11:34:13 +02:00
sLorenzini 4d961564f7 [-] FO: replace logo on the left (fixed bug RTL language - #PSCFV-8891) 2013-04-30 11:23:18 +02:00
sLorenzini 6b178752ff [-] FO: replace logo on the left (fixed bug RTL language - #PSCFV-8891) 2013-04-30 11:23:18 +02:00
sLorenzini 00bd78e843 // BO: Improve product display on supplier page 2013-04-30 11:09:08 +02:00
sLorenzini dc2b69f699 // BO: Improve product display on supplier page 2013-04-30 11:09:08 +02:00
Gregory Roussac cb29f20f1e // remove unused .show() 2013-04-29 23:14:57 +02:00
Gregory Roussac 028bffd363 // remove unused .show() 2013-04-29 23:14:57 +02:00
Gregory Roussac 1e4e8d6a13 [-] FO : Jqzoom must be enabled to add class jqzoom 2013-04-29 22:05:01 +02:00
Gregory Roussac 5c02334aab [-] FO : Jqzoom must be enabled to add class jqzoom 2013-04-29 22:05:01 +02:00
Gregory Roussac d618c8618a //norms 2013-04-29 21:55:30 +02:00
Gregory Roussac 2051b925a1 //norms 2013-04-29 21:55:30 +02:00
Gregory Roussac a8698d9e59 [-] Bo : Admin login loop under Firefox 2013-04-29 21:54:26 +02:00
Gregory Roussac 93d5016848 [-] Bo : Admin login loop under Firefox 2013-04-29 21:54:26 +02:00
Rémi Gaillard 9fc4bce500 [-] Core: Fix specific prices if they are configured to count quantity per product and not per combination 2013-04-29 18:49:42 +02:00
Rémi Gaillard 8996690a65 [-] Core: Fix specific prices if they are configured to count quantity per product and not per combination 2013-04-29 18:49:42 +02:00
Damien Metzger 548ef7691a // BO : Changed product display on supplier page 2013-04-29 18:34:34 +02:00