Rémi Gaillard
|
30c516619d
|
// Something was missing in commit ee62ed8d27
|
2013-01-17 17:27:59 +01:00 |
|
Rémi Gaillard
|
3fe27697a8
|
// Something was missing in commit ee62ed8d27
|
2013-01-17 17:27:59 +01:00 |
|
François Gaillard
|
b9dde1d50e
|
Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development
|
2013-01-16 18:47:39 +01:00 |
|
Francois Gaillard
|
1060bb3141
|
Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development
|
2013-01-16 18:47:39 +01:00 |
|
François Gaillard
|
338ba1ce85
|
// AdminHomeController, syntax changed
|
2013-01-16 18:47:29 +01:00 |
|
Francois Gaillard
|
9390dd63af
|
// AdminHomeController, syntax changed
|
2013-01-16 18:47:29 +01:00 |
|
vAugagneur
|
94a45b0572
|
[-] 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
|
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
|
f7124f6cee
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-16 10:36:29 +01:00 |
|
vAugagneur
|
1c6a4c842c
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-16 10:36:29 +01:00 |
|
vAugagneur
|
46aa9eeca7
|
[-] BO : fixed bug #PSCFV-6623 - fixed Parse error
|
2013-01-16 10:36:24 +01:00 |
|
vAugagneur
|
3e0081a5d1
|
[-] BO : fixed bug #PSCFV-6623 - fixed Parse error
|
2013-01-16 10:36:24 +01:00 |
|
Rémi Gaillard
|
e5e62ba00b
|
[-] 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 |
|
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
|
61b3135f6b
|
[-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding
|
2013-01-15 17:15:30 +01:00 |
|
vAugagneur
|
6724491cfe
|
[-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding
|
2013-01-15 17:15:30 +01:00 |
|
Damien Metzger
|
9f99ec01b5
|
[-] FO : fixed shipping number in e-mail #PSCFV-6584
|
2013-01-15 13:56:39 +01:00 |
|
Damien Metzger
|
49f8b7c7af
|
[-] FO : fixed shipping number in e-mail #PSCFV-6584
|
2013-01-15 13:56:39 +01:00 |
|
Damien Metzger
|
e48c0cfc67
|
// Fixed typo
|
2013-01-15 13:54:06 +01:00 |
|
Damien Metzger
|
710feb595a
|
// Fixed typo
|
2013-01-15 13:54:06 +01:00 |
|
Damien Metzger
|
4efaad145f
|
[+] BO : Added customer language on the customer page
|
2013-01-14 16:45:21 +01:00 |
|
Damien Metzger
|
886f6d864b
|
[+] BO : Added customer language on the customer page
|
2013-01-14 16:45:21 +01:00 |
|
vAugagneur
|
61371b5b4c
|
//BO more compliant with 1024x768
|
2013-01-14 14:24:05 +01:00 |
|
vAugagneur
|
7e4897034d
|
//BO more compliant with 1024x768
|
2013-01-14 14:24:05 +01:00 |
|
Rémi Gaillard
|
c740199e4f
|
[-] BO: Disallow advanced stock management if the product become a pa
|
2013-01-09 19:09:49 +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
|
3d6b3d2cb0
|
// Fix PHP warning
|
2013-01-09 16:55:28 +01:00 |
|
Rémi Gaillard
|
554dd4aba4
|
// Fix PHP warning
|
2013-01-09 16:55:28 +01:00 |
|
vAugagneur
|
66974a05e0
|
[-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories
|
2013-01-09 13:44:19 +01:00 |
|
vAugagneur
|
108dfb292c
|
[-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories
|
2013-01-09 13:44:19 +01:00 |
|
vAugagneur
|
b64098f3f2
|
//small fix part 2
|
2013-01-09 12:06:00 +01:00 |
|
vAugagneur
|
39e4dc96d4
|
//small fix part 2
|
2013-01-09 12:06:00 +01:00 |
|
vAugagneur
|
26055c26e7
|
//small fix
|
2013-01-09 11:58:48 +01:00 |
|
vAugagneur
|
107295e570
|
//small fix
|
2013-01-09 11:58:48 +01:00 |
|
vAugagneur
|
58100276a6
|
[-] BO : fixed bug #PSCFV-4668 - added check if module folder is writable before upgrade it
|
2013-01-09 11:37:02 +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
|
f37758605c
|
[-] BO : fixed bug #PSCFV-4925 - duplicate subject in SAV
|
2013-01-07 17:55:17 +01:00 |
|
vAugagneur
|
89f5fcf52e
|
[-] BO : fixed bug #PSCFV-4925 - duplicate subject in SAV
|
2013-01-07 17:55:17 +01:00 |
|
vAugagneur
|
9615de5dca
|
//merge pull request
|
2013-01-07 10:15:47 +01:00 |
|
vAugagneur
|
7a942164b7
|
//merge pull request
|
2013-01-07 10:15:47 +01:00 |
|
djfm
|
385c593129
|
//Changed English strings using the translationsenglish module.
|
2013-01-04 16:58:58 +01:00 |
|
djfm
|
714a5e08cc
|
//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
|
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
|
3fbd7dc55c
|
[-] BO: Fix #PSCFV-6120 display of shipping price on BO order summary detail with freeshipping
|
2013-01-04 14:51:01 +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 |
|
François Gaillard
|
064ba453e6
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
Francois Gaillard
|
8baf87eef5
|
// 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
|
5703e67c96
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-03 15:18:06 +01:00 |
|