dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,570 Commits 9 Branches 19 Tags
94de4d3d2f35403b5de1c10a4a02503f11ca1c2b
Commit Graph

4747 Commits

Author SHA1 Message Date
Damien Metzger a17dc139ce [-] BO : fixed image settings form #PSCFV-5458 2012-12-26 10:07:56 +01:00
Damien Metzger 45bca9a189 [-] BO : fixed image settings form #PSCFV-5458 2012-12-26 10:07:56 +01:00
Rémi Gaillard 41ca79cc77 [-] Core: the gift wrapping taxes is now handled by tax rules group 2012-12-21 18:01:43 +01:00
Rémi Gaillard b4217046ae [-] Core: the gift wrapping taxes is now handled by tax rules group 2012-12-21 18:01:43 +01:00
Rémi Gaillard 2a14176055 [*] Core: conversion_rate of currencies are now multishop 2012-12-20 11:35:20 +01:00
Rémi Gaillard 1be7a98655 [*] Core: conversion_rate of currencies are now multishop 2012-12-20 11:35:20 +01:00
vAugagneur 8d6de37870 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-17 16:51:36 +01:00
vAugagneur d2fedaf40d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-17 16:51:36 +01:00
vAugagneur 3a55ff9ee9 //added more details in some error messages 2012-12-17 16:51:21 +01:00
vAugagneur f127d22ba0 //added more details in some error messages 2012-12-17 16:51:21 +01:00
Damien Metzger a0f51e20c2 [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 2012-12-17 15:49:40 +01:00
Damien Metzger ffa72b0b93 [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 2012-12-17 15:49:40 +01:00
Damien Metzger 3d1663279a [-] 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 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
Rémi Gaillard 35013b82fe [-] BO: Fix #PSCFV-6172 don't htmlentities the cart rule name && increase size of name order_cart_rule field 2012-12-17 14:42:24 +01:00
Rémi Gaillard 3a72d1676c [-] BO: Fix #PSCFV-6172 don't htmlentities the cart rule name && increase size of name order_cart_rule field 2012-12-17 14:42:24 +01:00
Rémi Gaillard 4320f4c30c [-] Core: Fix #PSCFV-6162 - can't add no tax for specific zip code or state 2012-12-17 12:29:29 +01:00
Rémi Gaillard 3e89821b1d [-] Core: Fix #PSCFV-6162 - can't add no tax for specific zip code or state 2012-12-17 12:29:29 +01:00
vAugagneur 9f474669e6 //small fix in admin modules 2012-12-17 09:58:33 +01:00
vAugagneur 3d35871fd5 //small fix in admin modules 2012-12-17 09:58:33 +01:00
vAugagneur 1176a0eeb0 //display import button only on listing 2012-12-17 09:55:31 +01:00
vAugagneur fff026ca7d //display import button only on listing 2012-12-17 09:55:31 +01:00
Damien Metzger c13c378418 [-] BO : fixed duplicate code management on cart rules #PSCFV-6119 2012-12-14 09:48:16 +01:00
Damien Metzger eb423f1a09 [-] BO : fixed duplicate code management on cart rules #PSCFV-6119 2012-12-14 09:48:16 +01:00
Damien Metzger be5b678f85 // Handle fatal error in modules (after an upgrade for example) 2012-12-13 19:06:10 +01:00
Damien Metzger ec760c6eef // Handle fatal error in modules (after an upgrade for example) 2012-12-13 19:06:10 +01:00
Damien Metzger ee19d3d62b // Cleaned modules call 2012-12-13 14:38:55 +01:00
Damien Metzger 6e2ebf1c07 // Cleaned modules call 2012-12-13 14:38:55 +01:00
Damien Metzger 2bf6b3a82e // Cleaned modules call 2012-12-13 13:35:33 +01:00
Damien Metzger b391fc176a // Cleaned modules call 2012-12-13 13:35:33 +01:00
Vincent Augagneur 6445fea198 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
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 ed836e081c //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01: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 16b726349f // And another 2012-12-12 14:33:54 +01:00
Damien Metzger 6180cb1fa9 // And another 2012-12-12 14:33:54 +01:00
Damien Metzger 490213a550 // Fixed duplicated lines #PSCFV-6109 2012-12-12 14:31:46 +01:00
Damien Metzger 6532868e1d // Fixed duplicated lines #PSCFV-6109 2012-12-12 14:31:46 +01:00
vAugagneur 768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Damien Metzger 2c06839185 // Fixed stripos !== false in module search 2012-12-11 15:36:51 +01:00
Damien Metzger 575983a52e // Fixed stripos !== false in module search 2012-12-11 15:36:51 +01:00
Rémi Gaillard a5e3bc711b // replace bad attribute name 2012-12-11 12:11:47 +01:00
Rémi Gaillard a0041364a1 // replace bad attribute name 2012-12-11 12:11:47 +01:00
Rémi Gaillard 7cd629b15b [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +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 b2f01058a8 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +01:00
Rémi Gaillard a8096c2800 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +01:00
vAugagneur 83318055ce //added more check on module upload part 2 2012-12-10 14:45:14 +01:00
vAugagneur 1db4c7875e //added more check on module upload part 2 2012-12-10 14:45:14 +01:00