Rémi Gaillard
|
3fe27697a8
|
// Something was missing in commit ee62ed8d27
|
2013-01-17 17:27:59 +01:00 |
|
Francois Gaillard
|
1060bb3141
|
Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development
|
2013-01-16 18:47:39 +01:00 |
|
Francois Gaillard
|
9390dd63af
|
// AdminHomeController, syntax changed
|
2013-01-16 18:47:29 +01:00 |
|
vAugagneur
|
6d46644cc4
|
[-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format
|
2013-01-16 18:24:11 +01:00 |
|
vAugagneur
|
1c6a4c842c
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-16 10:36:29 +01:00 |
|
vAugagneur
|
3e0081a5d1
|
[-] BO : fixed bug #PSCFV-6623 - fixed Parse error
|
2013-01-16 10:36:24 +01:00 |
|
Rémi Gaillard
|
eed3f3453b
|
[-] BO: Fix #PSCFV-6616 id_shop should be loaded from cart when no order is created on Admin Carts
|
2013-01-15 19:31:21 +01:00 |
|
vAugagneur
|
6724491cfe
|
[-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding
|
2013-01-15 17:15:30 +01:00 |
|
Damien Metzger
|
49f8b7c7af
|
[-] FO : fixed shipping number in e-mail #PSCFV-6584
|
2013-01-15 13:56:39 +01:00 |
|
Damien Metzger
|
710feb595a
|
// Fixed typo
|
2013-01-15 13:54:06 +01:00 |
|
Damien Metzger
|
886f6d864b
|
[+] BO : Added customer language on the customer page
|
2013-01-14 16:45:21 +01:00 |
|
vAugagneur
|
7e4897034d
|
//BO more compliant with 1024x768
|
2013-01-14 14:24:05 +01:00 |
|
Rémi Gaillard
|
c0d35d6d28
|
[-] BO: Disallow advanced stock management if the product become a pa
|
2013-01-09 19:09:49 +01:00 |
|
Rémi Gaillard
|
554dd4aba4
|
// Fix PHP warning
|
2013-01-09 16:55:28 +01:00 |
|
vAugagneur
|
108dfb292c
|
[-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories
|
2013-01-09 13:44:19 +01:00 |
|
vAugagneur
|
39e4dc96d4
|
//small fix part 2
|
2013-01-09 12:06:00 +01:00 |
|
vAugagneur
|
107295e570
|
//small fix
|
2013-01-09 11:58:48 +01:00 |
|
vAugagneur
|
e9726f2463
|
[-] BO : fixed bug #PSCFV-4668 - added check if module folder is writable before upgrade it
|
2013-01-09 11:37:02 +01:00 |
|
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 |
|