Commit Graph

6559 Commits

Author SHA1 Message Date
vAugagneur
c769a2599c [-] BO : fixed bug when toggle status on product listing, redirect_type was not good 2012-12-03 15:23:25 +01:00
vAugagneur
f6b1e86449 [-] BO : fixed bug when toggle status on product listing, redirect_type was not good 2012-12-03 15:23:25 +01:00
vAugagneur
c2f31109e4 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-03 14:14:54 +01:00
vAugagneur
13ebd3afef Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-03 14:14:54 +01:00
vAugagneur
2195f9bdcb [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
vAugagneur
ed3e0e1a58 [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
Rémi Gaillard
4a94d54f6d [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image 2012-12-03 12:26:27 +01:00
Rémi Gaillard
428c1fa99b [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image 2012-12-03 12:26:27 +01:00
Rémi Gaillard
c73be7904a [-] BO: Fix category association in global context #PSCFV-5551 2012-12-03 11:25:59 +01:00
Rémi Gaillard
4a106e51bb [-] BO: Fix category association in global context #PSCFV-5551 2012-12-03 11:25:59 +01:00
vAugagneur
0de7579f58 //remove debug 2012-12-02 20:05:39 +01:00
vAugagneur
12cb5316ee //remove debug 2012-12-02 20:05:39 +01:00
vAugagneur
49e1a536e3 [*] FO : improve SEO and http error code 2012-12-02 19:46:09 +01:00
vAugagneur
2d30a966c3 [*] FO : improve SEO and http error code 2012-12-02 19:46:09 +01:00
Vincent Augagneur
7c04885560 Merge pull request #55 from PrestaEdit/mobile_logo
[+] FO: Mobile logo
2012-11-30 02:06:19 -08:00
Vincent Augagneur
539011c057 Merge pull request #55 from PrestaEdit/mobile_logo
[+] FO: Mobile logo
2012-11-30 02:06:19 -08:00
vAugagneur
f1b36279cf //small cookie expire fix 2012-11-30 09:35:42 +01:00
vAugagneur
b8e93d8c44 //small cookie expire fix 2012-11-30 09:35:42 +01:00
PrestaEdit
68c3f18f16 Merge pull request #1 from PrestaEdit/mobile
[-] FO : show mobile theme if you have click "Broswe the mobile site" on...
2012-11-29 13:01:22 -08:00
PrestaEdit
1286cd3a89 Merge pull request #1 from PrestaEdit/mobile
[-] FO : show mobile theme if you have click "Broswe the mobile site" on...
2012-11-29 13:01:22 -08:00
PrestaEdit
291431fc49 [*] FO: use initLogoAndFavicon() function 2012-11-29 21:57:04 +01:00
PrestaEdit
99b97d9bb7 [*] FO: use initLogoAndFavicon() function 2012-11-29 21:57:04 +01:00
PrestaEdit
b433db02b1 [*] FO: add initLogoAndFavicon() 2012-11-29 21:56:03 +01:00
PrestaEdit
f7b40b24b9 [*] FO: add initLogoAndFavicon() 2012-11-29 21:56:03 +01:00
vAugagneur
ab66251968 //wrong define unsing _MAIL_DIR_ instead of _PS_MAIL_DIR_ 2012-11-29 18:44:51 +01:00
vAugagneur
dbda08099a //wrong define unsing _MAIL_DIR_ instead of _PS_MAIL_DIR_ 2012-11-29 18:44:51 +01:00
vAugagneur
f563e12912 [-] BO : fixed bug #PSCFV-5501 - Can't edit Guest AccountAddress in Custumer -> Addresses 2012-11-29 18:16:56 +01:00
vAugagneur
c8d63a7819 [-] BO : fixed bug #PSCFV-5501 - Can't edit Guest AccountAddress in Custumer -> Addresses 2012-11-29 18:16:56 +01:00
vAugagneur
f6c8af26cc //small fix in Context::getMobileDevice() 2012-11-29 17:20:18 +01:00
vAugagneur
2bddec6089 //small fix in Context::getMobileDevice() 2012-11-29 17:20:18 +01:00
Vincent Augagneur
5199b81b50 Merge pull request #54 from PrestaEdit/mobile
[-] FO : show mobile theme if you have click "Broswe the mobile site"
2012-11-29 07:13:29 -08:00
Vincent Augagneur
ce58891b02 Merge pull request #54 from PrestaEdit/mobile
[-] FO : show mobile theme if you have click "Broswe the mobile site"
2012-11-29 07:13:29 -08:00
Vincent Augagneur
cb4bf6251f Merge pull request #57 from oleacorner/patch-1
[*] PDF : Update /PDFGenerator::render()
2012-11-29 05:46:38 -08:00
Vincent Augagneur
12971aa769 Merge pull request #57 from oleacorner/patch-1
[*] PDF : Update /PDFGenerator::render()
2012-11-29 05:46:38 -08:00
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
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
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
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
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
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
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