Commit Graph

17570 Commits

Author SHA1 Message Date
oleacorner 81931f40a0 Update classes/pdf/PDFGenerator.php 2012-11-29 13:05:05 +01:00
oleacorner 25ff95741b Update classes/pdf/PDFGenerator.php 2012-11-29 13:05:05 +01:00
Vincent Augagneur 0c0e3ab9ce Merge pull request #41 from jessylenne/patch-1
[-] CORE : lang.php inclusion path correction in classes/Mail.php
2012-11-29 03:08:24 -08:00
Vincent Augagneur 5f8b5c1527 Merge pull request #41 from jessylenne/patch-1
[-] CORE : lang.php inclusion path correction in classes/Mail.php
2012-11-29 03:08:24 -08:00
vAugagneur 562c49163e //small fix in controllers/front/OrderController.php thanks to @Butterback 2012-11-29 09:07:02 +01:00
vAugagneur 30b8f81e36 //small fix in controllers/front/OrderController.php thanks to @Butterback 2012-11-29 09:07:02 +01:00
vAugagneur c180b82627 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-28 18:52:17 +01:00
vAugagneur 853515ebf0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-28 18:52:17 +01:00
vAugagneur cff5661690 [-] BO : fixed bug #PSCFV-5743 - modify status Preparation in progress and remove the delivery flag 2012-11-28 18:52:01 +01:00
vAugagneur 72464dc9b7 [-] BO : fixed bug #PSCFV-5743 - modify status Preparation in progress and remove the delivery flag 2012-11-28 18:52:01 +01:00
Sarah Lorenzini eb65e76252 [-] FO: Bug CSS on SAFARI with iphone or ipad - #PSCFV-5704 2012-11-28 17:01:56 +01:00
Sarah Lorenzini d7ecc8bb99 [-] FO: Bug CSS on SAFARI with iphone or ipad - #PSCFV-5704 2012-11-28 17:01:56 +01:00
vAugagneur 0b10428124 //remove useless comment 2012-11-28 16:27:21 +01:00
vAugagneur b35e0fd519 //remove useless comment 2012-11-28 16:27:21 +01:00
Sarah Lorenzini f9fb4b7f8d [-] FO: fix #product_list li span.new: IE 6,7,8 bug: New product badge not correct position - #PSCFV-5898 2012-11-28 16:07:36 +01:00
Sarah Lorenzini 813d28bda9 [-] FO: fix #product_list li span.new: IE 6,7,8 bug: New product badge not correct position - #PSCFV-5898 2012-11-28 16:07:36 +01:00
Sarah Lorenzini bb3ede3aed [-] FO: added border-right on product-comparison table 2012-11-28 15:13:14 +01:00
Sarah Lorenzini f3cde47048 [-] FO: added border-right on product-comparison table 2012-11-28 15:13:14 +01:00
vAugagneur 585841909f //bad link in CONTRIBUTING.md :p 2012-11-28 14:45:52 +01:00
vAugagneur ce427a91d4 //bad link in CONTRIBUTING.md :p 2012-11-28 14:45:52 +01:00
vAugagneur 86bbb06360 //bad link in CONTRIBUTING.md 2012-11-28 14:38:19 +01:00
vAugagneur f07d918867 //bad link in CONTRIBUTING.md 2012-11-28 14:38:19 +01:00
oleacorner 6d0d0bab1f Update classes/pdf/PDFGenerator.php
Proposal to enhance the $display parameter.

The proposal supports the true/false value, but also the 'D', 'I' and 'S' of fpdf.

The behavior of the true value is changed to 'D' instead of 'I'.
So, in fornt or back office, while cliking on a button to retrieve a PDF, the download windows is proposed instead of displaying the PDF inside the navigator.
2012-11-28 13:55:08 +01:00
oleacorner 7834f1e274 Update classes/pdf/PDFGenerator.php
Proposal to enhance the $display parameter.

The proposal supports the true/false value, but also the 'D', 'I' and 'S' of fpdf.

The behavior of the true value is changed to 'D' instead of 'I'.
So, in fornt or back office, while cliking on a button to retrieve a PDF, the download windows is proposed instead of displaying the PDF inside the navigator.
2012-11-28 13:55:08 +01:00
Damon Skelhorn 3420085113 Another instance of cart_quantity_button set as ID 2012-11-28 10:33:25 +00:00
Damon Skelhorn da8fcf7d0e Another instance of cart_quantity_button set as ID 2012-11-28 10:33:25 +00:00
vAugagneur 358c0c168f [-] BO : fixed bug #PSCFV-5610 Credit slip reference is too short
[*] BO : added prefix on credit slip reference
2012-11-28 10:56:43 +01:00
vAugagneur 8d6433f48f [-] BO : fixed bug #PSCFV-5610 Credit slip reference is too short
[*] BO : added prefix on credit slip reference
2012-11-28 10:56:43 +01:00
Damon Skelhorn d8bd1f7ca6 Removed ID from repeating product rows in shopping cart table. 2012-11-28 09:35:23 +00:00
Damon Skelhorn 56b49e9681 Removed ID from repeating product rows in shopping cart table. 2012-11-28 09:35:23 +00:00
PrestaEdit 06ca6d2576 [+] FO: modifiy width and height smarty vars for the mobile logo 2012-11-28 01:31:43 +01:00
PrestaEdit 36851aaa58 [+] FO: modifiy width and height smarty vars for the mobile logo 2012-11-28 01:31:43 +01:00
PrestaEdit 9c51161cfa [+] BO: modifiy width and height configuration for the mobile logo 2012-11-28 01:26:53 +01:00
PrestaEdit a6389cb7ef [+] BO: modifiy width and height configuration for the mobile logo 2012-11-28 01:26:53 +01:00
PrestaEdit d6cf7278cf [+] BO: modifiy smarty var $logo_url to have the mobile logo image if mobile version 2012-11-28 01:23:24 +01:00
PrestaEdit 59035bd99a [+] BO: modifiy smarty var $logo_url to have the mobile logo image if mobile version 2012-11-28 01:23:24 +01:00
PrestaEdit 238475c097 [+] BO: add updateOptionPsLogoMobile() 2012-11-28 01:19:45 +01:00
PrestaEdit bbdef58492 [+] BO: add updateOptionPsLogoMobile() 2012-11-28 01:19:45 +01:00
PrestaEdit 905e6ce611 [+] BO: add posibility to set a Mobile Header logo 2012-11-28 01:10:42 +01:00
PrestaEdit 2a65bab40e [+] BO: add posibility to set a Mobile Header logo 2012-11-28 01:10:42 +01:00
PrestaEdit d16cd5a3bf [-] FO : show mobile theme if you have click "Broswe the mobile site" on a PC 2012-11-27 22:55:57 +01:00
PrestaEdit 19e14c976a [-] FO : show mobile theme if you have click "Broswe the mobile site" on a PC 2012-11-27 22:55:57 +01:00
vAugagneur 01eef37db5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-27 18:39:36 +01:00
vAugagneur 09ce9b2870 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-27 18:39:36 +01:00
vAugagneur e555e679eb //added modules/statssales/config.xml 2012-11-27 18:39:32 +01:00
vAugagneur 3b28e532fe //added modules/statssales/config.xml 2012-11-27 18:39:32 +01:00
Vincent Augagneur eb80e9fcf5 Merge pull request #50 from PrestaEdit/PSCFV-5880
[-] CORE : fixed bug #PSCFV-5880: add Cart ID into $cache_id
2012-11-27 09:21:44 -08:00
Vincent Augagneur 1d45d66370 Merge pull request #50 from PrestaEdit/PSCFV-5880
[-] CORE : fixed bug #PSCFV-5880: add Cart ID into $cache_id
2012-11-27 09:21:44 -08:00
vAugagneur 21fd4d5eaa [-] FO : fixed bug #PSCFV-5871 - URL rewrite with layered disabled 2012-11-27 17:07:59 +01:00
vAugagneur 4a05ddd0a2 [-] FO : fixed bug #PSCFV-5871 - URL rewrite with layered disabled 2012-11-27 17:07:59 +01:00