Commit Graph

17570 Commits

Author SHA1 Message Date
Rémi Gaillard 915244d1b7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-15 10:20:50 +01:00
Rémi Gaillard 4bad5fa3b1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-15 10:20:50 +01:00
Rémi Gaillard 433a446a35 // clean the output buffer before print PDF in BO 2013-01-15 10:20:37 +01:00
Rémi Gaillard 95ab473198 // clean the output buffer before print PDF in BO 2013-01-15 10:20:37 +01:00
nturato de9e75cc0d [WS] images are only shown as jpg or gif
If you enable BO to also use the PNG file you can not use these images in WS because there are no controls on the image type
2013-01-15 10:17:02 +01:00
nturato 1348291415 [WS] images are only shown as jpg or gif
If you enable BO to also use the PNG file you can not use these images in WS because there are no controls on the image type
2013-01-15 10:17:02 +01:00
vAugagneur 4af9ddd83f //fixed bug #PSCFV-6645 missing translation 2013-01-15 10:01:29 +01:00
vAugagneur 2b54d38f70 //fixed bug #PSCFV-6645 missing translation 2013-01-15 10:01:29 +01:00
vAugagneur 8e43f1e38f //recovered View my shop button 2013-01-14 17:59:18 +01:00
vAugagneur 9a933d8818 //recovered View my shop button 2013-01-14 17:59:18 +01:00
vAugagneur 5f490483d1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 17:44:54 +01:00
vAugagneur 71e863c6f5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 17:44:54 +01:00
vAugagneur cbb87e4bbc //clean duplicate css in BO 2013-01-14 17:44:34 +01:00
vAugagneur ffbc326454 //clean duplicate css in BO 2013-01-14 17:44:34 +01:00
Damien Metzger 4efaad145f [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
Damien Metzger 886f6d864b [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
Rémi Gaillard bfffc48b82 [-] FO: Fix #PSCFV-6456 price of default attribute with specific price on product comparison 2013-01-14 15:16:50 +01:00
Rémi Gaillard 6d748d46d2 [-] FO: Fix #PSCFV-6456 price of default attribute with specific price on product comparison 2013-01-14 15:16:50 +01:00
vAugagneur 451383e4c0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 14:24:14 +01:00
vAugagneur 7e8192280b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 14:24:14 +01:00
vAugagneur 61371b5b4c //BO more compliant with 1024x768 2013-01-14 14:24:05 +01:00
vAugagneur 7e4897034d //BO more compliant with 1024x768 2013-01-14 14:24:05 +01:00
Rémi Gaillard c2261cc7fc // fix php warning 2013-01-14 14:12:14 +01:00
Rémi Gaillard 5cecff7251 // fix php warning 2013-01-14 14:12:14 +01:00
Rémi Gaillard f496b844db Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 12:08:26 +01:00
Rémi Gaillard 968d6b4cfd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 12:08:26 +01:00
Rémi Gaillard 76a12eb369 [-] BO: Fix #PSCFV-5930 #PSCFV-5939 the filters are handled as the same between tabs which can cause sql errors 2013-01-14 12:08:12 +01:00
Rémi Gaillard ef904c9083 [-] BO: Fix #PSCFV-5930 #PSCFV-5939 the filters are handled as the same between tabs which can cause sql errors 2013-01-14 12:08:12 +01:00
sLorenzini 6659bdceca [-] FO: improvement shopping cart voucher 2013-01-14 11:25:50 +01:00
sLorenzini 3f4bf5f559 [-] FO: improvement shopping cart voucher 2013-01-14 11:25:50 +01:00
Rémi Gaillard f516409fc0 // small fix for smarty pre-compile 2013-01-14 11:05:42 +01:00
Rémi Gaillard 556955a7f0 // small fix for smarty pre-compile 2013-01-14 11:05:42 +01:00
vAugagneur 60260c4757 [-] CORE : fixed bug #PSCFV-6555 - Custom theme not working properly with image size 2013-01-14 10:38:41 +01:00
vAugagneur 4dad9522e5 [-] CORE : fixed bug #PSCFV-6555 - Custom theme not working properly with image size 2013-01-14 10:38:41 +01:00
Rémi Gaillard 2c855558cd [*] Installer: pre-compile the smarty templates to improve the loading time of first connection 2013-01-11 18:13:28 +01:00
Rémi Gaillard 3f4f5f5df0 [*] Installer: pre-compile the smarty templates to improve the loading time of first connection 2013-01-11 18:13:28 +01:00
sLorenzini 52a6a67f74 [-] FO: fixed bug CSS 2013-01-10 17:23:32 +01:00
sLorenzini 542d3aa1da [-] FO: fixed bug CSS 2013-01-10 17:23:32 +01:00
sLorenzini 6ca6a83412 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
sLorenzini c2a1e1f150 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
Rémi Gaillard 2b9f64b790 [-] FO: Fix add to cart for product packs with no quantity and out of stock allowed #PSCFV-4788 2013-01-10 11:30:41 +01:00
Rémi Gaillard 90b3c7c467 [-] FO: Fix add to cart for product packs with no quantity and out of stock allowed #PSCFV-4788 2013-01-10 11:30:41 +01:00
vAugagneur 74774be65e [-] FO : fixed bug #PSCFV-5569 - Trying to get property of non-object in SitemapController 2013-01-10 09:31:46 +01:00
vAugagneur 6e3c743948 [-] FO : fixed bug #PSCFV-5569 - Trying to get property of non-object in SitemapController 2013-01-10 09:31:46 +01:00
Vincent Augagneur 195c2c48f8 [-] FO : fixed bug #PSCFV-6529 2013-01-09 23:18:09 +01:00
Vincent Augagneur 2fad90640d [-] FO : fixed bug #PSCFV-6529 2013-01-09 23:18:09 +01:00
vAugagneur 796b02bb68 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl 2013-01-09 23:03:20 +01:00
vAugagneur d72a5d4d94 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl 2013-01-09 23:03:20 +01:00
Rémi Gaillard c740199e4f [-] BO: Disallow advanced stock management if the product become a pa 2013-01-09 19:09:49 +01:00
Rémi Gaillard c0d35d6d28 [-] BO: Disallow advanced stock management if the product become a pa 2013-01-09 19:09:49 +01:00