dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,898 Commits 9 Branches 19 Tags
fc7ea8ef1436dc73c020a047ea63cbc59e1b4e5d
Commit Graph

2244 Commits

Author SHA1 Message Date
vAugagneur
a4eb2cc7a9 //Merge branch release 2013-01-02 09:56:20 +01:00
vAugagneur
289a203bce //Merge controllers/admin/AdminTranslationsController.php 2012-12-28 10:23:37 +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
vAugagneur
321eaa191b //added translation 2012-12-28 09:27:12 +01:00
vAugagneur
6e7b462317 //added check in translation pack import 2012-12-28 09:19:54 +01:00
Damien Metzger
25ea171202 // Clean covers in multishop 2012-12-28 09:17:16 +01:00
Damien Metzger
a31a9170cc [-] BO : better error management for translation packs 2012-12-26 18:19:36 +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
366475f844 [-] BO : fixed translations on templates 2012-12-26 11:56:36 +01:00
Damien Metzger
45bca9a189 [-] BO : fixed image settings form #PSCFV-5458 2012-12-26 10:07:56 +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
1be7a98655 [*] Core: conversion_rate of currencies are now multishop 2012-12-20 11:35:20 +01:00
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
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
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
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
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
3d35871fd5 //small fix in admin modules 2012-12-17 09:58:33 +01:00
vAugagneur
fff026ca7d //display import button only on listing 2012-12-17 09:55:31 +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
ec760c6eef // Handle fatal error in modules (after an upgrade for example) 2012-12-13 19:06:10 +01:00
Damien Metzger
6e2ebf1c07 // Cleaned modules call 2012-12-13 14:38:55 +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