 vAugagneur
|
89f5fcf52e
|
[-] BO : fixed bug #PSCFV-4925 - duplicate subject in SAV
|
2013-01-07 17:55:17 +01:00 |
|
|
vAugagneur
|
7a942164b7
|
//merge pull request
|
2013-01-07 10:15:47 +01:00 |
|
|
djfm
|
714a5e08cc
|
//Changed English strings using the translationsenglish module.
|
2013-01-04 16:58:58 +01:00 |
|
|
Rémi Gaillard
|
cb818d1ece
|
[-] BO: Fix #PSCFV-6386 recyclable should be init to 0 on BO orders
|
2013-01-04 15:06:07 +01:00 |
|
|
Rémi Gaillard
|
091459bde6
|
[-] BO: Fix #PSCFV-6120 display of shipping price on BO order summary detail with freeshipping
|
2013-01-04 14:51:01 +01:00 |
|
|
Francois Gaillard
|
8baf87eef5
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
|
vAugagneur
|
5703e67c96
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-03 15:18:06 +01:00 |
|
|
vAugagneur
|
707340b665
|
[-] BO : fixed import images
|
2013-01-03 15:18:00 +01:00 |
|
|
Rémi Gaillard
|
0229dad1f6
|
[-] BO: Fix #PSCFV-6118 display of product image for git on BackOffice orders
|
2013-01-03 11:38:39 +01:00 |
|
|
vAugagneur
|
f9c12ad564
|
//small fix when disabled language with bulk action
|
2013-01-02 17:47:49 +01:00 |
|
|
vAugagneur
|
9cdd7c8a0d
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-02 17:09:44 +01:00 |
|
|
vAugagneur
|
dd49bfb464
|
[-] BO : fixed bug #PSCFV-6130 - Wrong currency in product specific prices administration
|
2013-01-02 17:09:39 +01:00 |
|
|
Rémi Gaillard
|
1900700f1b
|
[-] BO: Fix #PSCFV-6415 php notice
|
2013-01-02 16:21:54 +01:00 |
|
|
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 |
|