Commit Graph

17570 Commits

Author SHA1 Message Date
vAugagneur d10bf0620a Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-28 10:23:52 +01:00
vAugagneur a5568e8196 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-28 10:23:52 +01:00
vAugagneur ef46d41800 //Merge controllers/admin/AdminTranslationsController.php 2012-12-28 10:23:37 +01:00
vAugagneur 289a203bce //Merge controllers/admin/AdminTranslationsController.php 2012-12-28 10:23:37 +01:00
vAugagneur aae9aa82c4 //added methode to write default content in index.php file && added check in translation pack import 2012-12-28 10:18:14 +01:00
vAugagneur e8920c859d //added methode to write default content in index.php file && added check in translation pack import 2012-12-28 10:18:14 +01:00
Damien Metzger 1dde9b6f2a // Fixed deleteDirectory function (is_dir is cached and must not be used, because use the result of scandir) 2012-12-28 09:47:09 +01:00
Damien Metzger 7bebdb5eb5 // Fixed deleteDirectory function (is_dir is cached and must not be used, because use the result of scandir) 2012-12-28 09:47:09 +01:00
vAugagneur a35469768f //added translation 2012-12-28 09:27:12 +01:00
vAugagneur 321eaa191b //added translation 2012-12-28 09:27:12 +01:00
vAugagneur d4ba087158 //added check in translation pack import 2012-12-28 09:19:54 +01:00
vAugagneur 6e7b462317 //added check in translation pack import 2012-12-28 09:19:54 +01:00
Damien Metzger 434c0c43a9 // Clean covers in multishop 2012-12-28 09:17:16 +01:00
Damien Metzger 25ea171202 // Clean covers in multishop 2012-12-28 09:17:16 +01:00
Gregory Roussac d0eb31f3d6 [-] FO : Fix #PSCFV-6209 required phone with Guest Checkout 2012-12-27 18:05:26 +01:00
Gregory Roussac 33f09fb92f [-] FO : Fix #PSCFV-6209 required phone with Guest Checkout 2012-12-27 18:05:26 +01:00
Damien Metzger c4d8bff01c [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Damien Metzger 7a8adaec25 [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Damien Metzger 070a4b013b [-] FO : vouchers created in the backend order creation are not displayed in the frontend anymore 2012-12-27 17:44:24 +01:00
Damien Metzger 691932f2bd [-] FO : vouchers created in the backend order creation are not displayed in the frontend anymore 2012-12-27 17:44:24 +01:00
Gregory Roussac 3e9e765a5a [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
Gregory Roussac dbb8a9f2e0 [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
sLorenzini 304a95f2aa [-] FO : fixed bug Create account button - #PSCFV-6290 2012-12-27 11:27:02 +01:00
sLorenzini 83cceb1ac7 [-] FO : fixed bug Create account button - #PSCFV-6290 2012-12-27 11:27:02 +01:00
sLorenzini 8bca84f0bf [-] FO : fixed bug Load homefeatured css file in head. - #PSCFV-6316 2012-12-27 10:51:43 +01:00
sLorenzini 49eb256575 [-] FO : fixed bug Load homefeatured css file in head. - #PSCFV-6316 2012-12-27 10:51:43 +01:00
sLorenzini 54e291b749 [-] FO : fixed bug [HomeSlider] module homeslider.tpl double slash in image url - #PSCFV-6349 2012-12-27 10:38:12 +01:00
sLorenzini 21eb77fd8f [-] FO : fixed bug [HomeSlider] module homeslider.tpl double slash in image url - #PSCFV-6349 2012-12-27 10:38:12 +01:00
Gregory Roussac 4ed4905f1a [-] FO : Fixed message & entity 2012-12-26 18:58:17 +01:00
Gregory Roussac 021e0d8f98 [-] FO : Fixed message & entity 2012-12-26 18:58:17 +01:00
Damien Metzger ebdb6fc74e [-] BO : better error management for translation packs 2012-12-26 18:19:36 +01:00
Damien Metzger a31a9170cc [-] BO : better error management for translation packs 2012-12-26 18:19:36 +01:00
Damien Metzger e4c38f73f5 // Added a sandbox in order to check files before doing anything with them 2012-12-26 15:52:21 +01:00
Damien Metzger 03c91b2fb9 // Added a sandbox in order to check files before doing anything with them 2012-12-26 15:52:21 +01:00
Damien Metzger 8d1a66c0c1 // Small fixes, same module 2012-12-26 14:42:58 +01:00
Damien Metzger b8fbcd27c9 // Small fixes, same module 2012-12-26 14:42:58 +01:00
Damien Metzger ba2099a161 [-] MO : statsbestvouchers small fix (but great difference) 2012-12-26 14:35:27 +01:00
Damien Metzger 6eb8c435cd [-] MO : statsbestvouchers small fix (but great difference) 2012-12-26 14:35:27 +01:00
Damien Metzger 532583b3ab [-] FO : fixed usage of "&" in the order messages added by the customers 2012-12-26 12:50:34 +01:00
Damien Metzger c9a29f8b2a [-] FO : fixed usage of "&" in the order messages added by the customers 2012-12-26 12:50:34 +01:00
Damien Metzger d0487a95ca [-] MO : fixed bad path in productcomments 2012-12-26 12:04:57 +01:00
Damien Metzger f3fd6f9009 [-] MO : fixed bad path in productcomments 2012-12-26 12:04:57 +01:00
Damien Metzger 404f366748 [-] MO : fixed bad character in the statsbestvouchers module 2012-12-26 12:01:08 +01:00
Damien Metzger 0a3a294a7b [-] MO : fixed bad character in the statsbestvouchers module 2012-12-26 12:01:08 +01:00
Damien Metzger d02d595e84 [-] BO : fixed translations on templates 2012-12-26 11:56:36 +01:00
Damien Metzger 366475f844 [-] BO : fixed translations on templates 2012-12-26 11:56:36 +01:00
Damien Metzger e442785fe7 [-] MO : fixed bugs on RSS modules 2012-12-26 11:32:59 +01:00
Damien Metzger 9dd5bd4098 [-] MO : fixed bugs on RSS modules 2012-12-26 11:32:59 +01:00
Damien Metzger 56980cb396 [-] FO : fixed CR/LF on supplier/manufacturer description #PSCFV-6001 2012-12-26 10:25:53 +01:00
Damien Metzger d26616f769 [-] FO : fixed CR/LF on supplier/manufacturer description #PSCFV-6001 2012-12-26 10:25:53 +01:00