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

2255 Commits

Author SHA1 Message Date
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Rémi Gaillard
507309ddf5 [-] BO: Fix #PSCFV-6386 recyclable should be init to 0 on BO orders 2013-01-04 15:06:07 +01:00
Rémi Gaillard
3fbd7dc55c [-] BO: Fix #PSCFV-6120 display of shipping price on BO order summary detail with freeshipping 2013-01-04 14:51:01 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
cc32366077 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 15:18:06 +01:00
vAugagneur
8d7196daf3 [-] BO : fixed import images 2013-01-03 15:18:00 +01:00
Rémi Gaillard
df405abfe9 [-] BO: Fix #PSCFV-6118 display of product image for git on BackOffice orders 2013-01-03 11:38:39 +01:00
vAugagneur
a5ab1d5bc2 //small fix when disabled language with bulk action 2013-01-02 17:47:49 +01:00
vAugagneur
13ad25f331 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-02 17:09:44 +01:00
vAugagneur
f7754045fb [-] BO : fixed bug #PSCFV-6130 - Wrong currency in product specific prices administration 2013-01-02 17:09:39 +01:00
Rémi Gaillard
301dc491b4 [-] BO: Fix #PSCFV-6415 php notice 2013-01-02 16:21:54 +01:00
vAugagneur
2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
vAugagneur
ef46d41800 //Merge controllers/admin/AdminTranslationsController.php 2012-12-28 10:23:37 +01:00
vAugagneur
aae9aa82c4 //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
a35469768f //added translation 2012-12-28 09:27:12 +01:00
vAugagneur
d4ba087158 //added check in translation pack import 2012-12-28 09:19:54 +01:00
Damien Metzger
434c0c43a9 // Clean covers in multishop 2012-12-28 09:17:16 +01:00
Damien Metzger
ebdb6fc74e [-] BO : better error management for translation packs 2012-12-26 18:19:36 +01:00
Damien Metzger
e4c38f73f5 // Added a sandbox in order to check files before doing anything with them 2012-12-26 15:52:21 +01:00
Damien Metzger
d02d595e84 [-] BO : fixed translations on templates 2012-12-26 11:56:36 +01:00
Damien Metzger
a17dc139ce [-] 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
2a14176055 [*] 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
3a55ff9ee9 //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
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
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
4320f4c30c [-] 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
1176a0eeb0 //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
be5b678f85 // 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
2bf6b3a82e // 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
vAugagneur
ed836e081c //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
490213a550 // 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
Damien Metzger
2c06839185 // 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
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
b2f01058a8 [-] 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
337437be74 //added more check on module upload 2012-12-10 14:44:11 +01:00
vAugagneur
1b71add855 [-] 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
eb451604af [-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied 2012-12-10 10:51:46 +01:00
vAugagneur
20187807e1 [-] BO : added import button on listing 2012-12-10 10:14:03 +01:00
vAugagneur
6dd0a04ed0 [-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline 2012-12-07 17:22:06 +01:00