Commit Graph

2224 Commits

Author SHA1 Message Date
vAugagneur
d2fedaf40d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-17 16:51:36 +01:00
vAugagneur
f127d22ba0 //added more details in some error messages 2012-12-17 16:51:21 +01:00
Damien Metzger
4c873cf61d [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 2012-12-17 15:45:40 +01:00
Damien Metzger
b391fc176a // Cleaned modules call 2012-12-13 13:35:33 +01:00
Vincent Augagneur
ebff913250 Merge pull request #69 from PrestaEdit/mails
[+] Project: add the possibility to change the default color (#db3484)
2012-12-12 06:59:04 -08:00
vAugagneur
42f3587e8e //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
Damien Metzger
6180cb1fa9 // And another 2012-12-12 14:33:54 +01:00
Damien Metzger
6532868e1d // Fixed duplicated lines #PSCFV-6109 2012-12-12 14:31:46 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Damien Metzger
575983a52e // Fixed stripos !== false in module search 2012-12-11 15:36:51 +01:00
Rémi Gaillard
a0041364a1 // replace bad attribute name 2012-12-11 12:11:47 +01:00
Rémi Gaillard
e8718ec42f [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +01:00
Rémi Gaillard
a8096c2800 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +01:00
vAugagneur
1db4c7875e //added more check on module upload part 2 2012-12-10 14:45:14 +01:00
vAugagneur
401b3dd41d //added more check on module upload 2012-12-10 14:44:11 +01:00
vAugagneur
25229b51ae [-] BO : fixed bug #PSCFV-6000 - added check if zip uploaded is a real module in AdminModules 2012-12-10 11:16:33 +01:00
vAugagneur
221667a80d [-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied 2012-12-10 10:51:46 +01:00
vAugagneur
ae7569bde3 [-] BO : added import button on listing 2012-12-10 10:14:03 +01:00
vAugagneur
cc7c40d4e9 [-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline 2012-12-07 17:22:06 +01:00
vAugagneur
61c23c7e75 [-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called 2012-12-06 12:16:37 +01:00
Rémi Gaillard
6cad7c2bf4 // Fix PHP notice #PSCFV-5967 2012-12-04 14:33:12 +01:00
Rémi Gaillard
7d05a6d8e9 [-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0 2012-12-04 11:38:47 +01:00
Rémi Gaillard
e5ec07f95a [-] BO: Add display of modules errors on reset #PSCFV-2077 2012-12-04 11:13:06 +01:00
Rémi Gaillard
7d9057a476 // Fix PHP warning 2012-12-03 19:11:37 +01:00
Jonathan Danse
edd6bf7b7e [+] Project: add the possibility to change the default color (#db3484)
Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes)
2012-12-03 16:11:43 +01:00
Rémi Gaillard
38044ad2cf [-] BO: Fix #PSCFV-5345 quotes in translations of languages packs imported 2012-12-03 15:03:32 +01:00
vAugagneur
13ebd3afef Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-03 14:14:54 +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
4a106e51bb [-] BO: Fix category association in global context #PSCFV-5551 2012-12-03 11:25:59 +01:00
vAugagneur
2d30a966c3 [*] FO : improve SEO and http error code 2012-12-02 19:46:09 +01:00
Vincent Augagneur
539011c057 Merge pull request #55 from PrestaEdit/mobile_logo
[+] FO: Mobile logo
2012-11-30 02:06:19 -08: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
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
a6389cb7ef [+] BO: modifiy width and height configuration for the mobile logo 2012-11-28 01:26:53 +01:00
PrestaEdit
bbdef58492 [+] BO: add updateOptionPsLogoMobile() 2012-11-28 01:19:45 +01:00
PrestaEdit
2a65bab40e [+] BO: add posibility to set a Mobile Header logo 2012-11-28 01:10:42 +01:00
DamienMetzger
ded3b0cd5e [-] BO : improved error display on admincarriers #PSCFV-5660 2012-11-27 12:01:27 +01:00
Rémi Gaillard
1812937933 [-] BO: Fix product image link for admin orders #PSCFV-5163 2012-11-27 11:55:58 +01:00
Vincent Augagneur
c76af96415 [-] BO : fixed bug #PSCFV-5838 Advanced Parameters - E-mail - Custom SMTP does not work if the password contains symbols '<' or '>' 2012-11-26 10:45:32 +01:00
vAugagneur
0e0ca2a473 [-] CORE : fixed some bad include of jquery plugin 2012-11-23 16:35:57 +01:00
DamienMetzger
89e207bc4e [-] BO : you can now remove the english language by whatever mean you like most #PSCFV-5815 2012-11-23 15:13:47 +01:00
DamienMetzger
7fc19de6d3 [-] BO : fixed duplicated rows with free order in dashboard stats #PSCFV-5626 2012-11-23 10:41:34 +01:00
DamienMetzger
fc7d62eddf [*] BO : added backup of the settings file whenever there is a modification #PSCFV-5676 2012-11-23 10:16:48 +01:00
DamienMetzger
edf3a3b10e [-] BO : fixed filters on statuses tab #PSCFV-5763 2012-11-22 19:49:20 +01:00
Rémi Gaillard
a717e79a07 [-] BO: Fix #PSCFV-5207 update of some fields on multishop with deleted property 2012-11-22 19:02:55 +01:00
vAugagneur
eb44c1d707 //small fix in adminThemeController 2012-11-22 18:27:07 +01:00
DamienMetzger
849b96ab9c [*] BO : the global search now looks into the modules 2012-11-22 17:41:12 +01:00
DamienMetzger
f973d2e3e4 [-] BO : image regeneration now gives a better reporting and crash less #PSCFV-5519 2012-11-22 15:15:43 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
DamienMetzger
9beba74704 [-] BO : check the folder permissions before writing PDF translations in the theme 2012-11-21 11:34:05 +01:00