 sLorenzini
|
b53b7479ab
|
[-] FO: fixed bug rendering Problems in IE6 with default theme - #PSCFV-7628
|
2013-02-05 15:53:54 +01:00 |
|
|
sLorenzini
|
7013babeda
|
[-] FO: fixed bug rendering Problems in IE6 with default theme - #PSCFV-7628
|
2013-02-05 15:53:54 +01:00 |
|
|
vAugagneur
|
2f8f1bf745
|
//fix small css bug
|
2013-02-05 15:44:02 +01:00 |
|
|
vAugagneur
|
ec7ca41c3e
|
//fix small css bug
|
2013-02-05 15:44:02 +01:00 |
|
|
Rémi Gaillard
|
3e0e22f25a
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-05 15:28:28 +01:00 |
|
|
Rémi Gaillard
|
66f82b119c
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-05 15:28:28 +01:00 |
|
|
Rémi Gaillard
|
d2ba246a08
|
[-] BO: Don't display delete icon for order carts
|
2013-02-05 15:28:09 +01:00 |
|
|
Rémi Gaillard
|
c80e0f48be
|
[-] BO: Don't display delete icon for order carts
|
2013-02-05 15:28:09 +01:00 |
|
|
Damien Metzger
|
0052a9a94a
|
[*] Core : added automatic conversion of ',' into '.' for floating values
|
2013-02-05 15:02:41 +01:00 |
|
|
Damien Metzger
|
49d310fe49
|
[*] Core : added automatic conversion of ',' into '.' for floating values
|
2013-02-05 15:02:41 +01:00 |
|
|
gRoussac
|
2d31bd19e8
|
[-] TR : Fix #PSCFI-6818 increase input vars in french
|
2013-02-05 14:18:34 +01:00 |
|
|
gRoussac
|
5156081b0d
|
[-] TR : Fix #PSCFI-6818 increase input vars in french
|
2013-02-05 14:18:34 +01:00 |
|
|
vAugagneur
|
5330f4da40
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-05 14:16:58 +01:00 |
|
|
vAugagneur
|
df860f1f47
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-05 14:16:58 +01:00 |
|
|
vAugagneur
|
64764c4c1e
|
//added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit
|
2013-02-05 14:16:47 +01:00 |
|
|
vAugagneur
|
b73ca29b58
|
//added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit
|
2013-02-05 14:16:47 +01:00 |
|
|
Rémi Gaillard
|
0836efb02f
|
[-] BO: Not allow to give an existing email when editing an employee
|
2013-02-05 12:20:46 +01:00 |
|
|
Rémi Gaillard
|
64d7655c6e
|
[-] BO: Not allow to give an existing email when editing an employee
|
2013-02-05 12:20:46 +01:00 |
|
|
gRoussac
|
6721387e7b
|
[-] CORE : Set default customer group to old default group when upgrading from 1.4.X
|
2013-02-05 11:53:44 +01:00 |
|
|
gRoussac
|
d336c05164
|
[-] CORE : Set default customer group to old default group when upgrading from 1.4.X
|
2013-02-05 11:53:44 +01:00 |
|
|
Rémi Gaillard
|
9c31710092
|
[-] BO: Fix #PSCFV-6497 display of list when deleting customers
|
2013-02-05 11:27:17 +01:00 |
|
|
Rémi Gaillard
|
a28d23211a
|
[-] BO: Fix #PSCFV-6497 display of list when deleting customers
|
2013-02-05 11:27:17 +01:00 |
|
|
Rémi Gaillard
|
a84e91f973
|
// Fix merge bug
|
2013-02-05 11:02:05 +01:00 |
|
|
Rémi Gaillard
|
b9fec8eb0c
|
// Fix merge bug
|
2013-02-05 11:02:05 +01:00 |
|
|
vAugagneur
|
3f8fce6720
|
[-] TR : now you can use " or ' in tpl files
|
2013-02-05 10:59:29 +01:00 |
|
|
vAugagneur
|
4c87ee0fb0
|
[-] TR : now you can use " or ' in tpl files
|
2013-02-05 10:59:29 +01:00 |
|
|
Vincent Augagneur
|
83183a7ee0
|
Merge pull request #103 from damonsk/patch4
[*] MO : crossselling - moved javascript include into header hook.
|
2013-02-05 01:42:46 -08:00 |
|
|
Vincent Augagneur
|
57eaeb5efd
|
Merge pull request #103 from damonsk/patch4
[*] MO : crossselling - moved javascript include into header hook.
|
2013-02-05 01:42:46 -08:00 |
|
|
vAugagneur
|
fb7a82786c
|
[-] CORE : order state preparation now generate delivery slip
|
2013-02-05 10:15:53 +01:00 |
|
|
vAugagneur
|
973c8d8d4f
|
[-] CORE : order state preparation now generate delivery slip
|
2013-02-05 10:15:53 +01:00 |
|
|
vAugagneur
|
0ceab34c5e
|
//failed to delete buffer. No buffer to delete in PDF
|
2013-02-05 10:12:00 +01:00 |
|
|
vAugagneur
|
0d9eb664d4
|
//failed to delete buffer. No buffer to delete in PDF
|
2013-02-05 10:12:00 +01:00 |
|
|
Vincent Augagneur
|
fdf5a4c3e1
|
Merge pull request #129 from PrestaEdit/Forum-#213412
[-] BO: don't have the delivery PDF - User can define which statuses sho...
|
2013-02-05 00:59:48 -08:00 |
|
|
Vincent Augagneur
|
2aa0f3e93c
|
Merge pull request #129 from PrestaEdit/Forum-#213412
[-] BO: don't have the delivery PDF - User can define which statuses sho...
|
2013-02-05 00:59:48 -08:00 |
|
|
Vincent Augagneur
|
f8c97d8814
|
Merge pull request #134 from PrestaEdit/patch-2
[-] FO: need id_product_attribute to know quantity
|
2013-02-05 00:52:50 -08:00 |
|
|
Vincent Augagneur
|
288c3e1323
|
Merge pull request #134 from PrestaEdit/patch-2
[-] FO: need id_product_attribute to know quantity
|
2013-02-05 00:52:50 -08:00 |
|
|
vAugagneur
|
7ffa731761
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Conflicts:
controllers/admin/AdminLogsController.php
|
2013-02-05 09:44:13 +01:00 |
|
|
vAugagneur
|
e1213badf8
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Conflicts:
controllers/admin/AdminLogsController.php
|
2013-02-05 09:44:13 +01:00 |
|
|
vAugagneur
|
4ef61eb8f8
|
[-] BO : error message on install module
|
2013-02-05 09:41:34 +01:00 |
|
|
vAugagneur
|
606b3eedd5
|
[-] BO : error message on install module
|
2013-02-05 09:41:34 +01:00 |
|
|
Vincent Augagneur
|
d39fb8a8e6
|
Merge pull request #210 from PrestaEdit/patch-15
[*] BO: we don't need to clik on a line
|
2013-02-05 00:36:54 -08:00 |
|
|
Vincent Augagneur
|
63da844138
|
Merge pull request #210 from PrestaEdit/patch-15
[*] BO: we don't need to clik on a line
|
2013-02-05 00:36:54 -08:00 |
|
|
Rémi Gaillard
|
fdf7eeb629
|
[-] Core: Fix #PSCFV-6067 stock was not reserved sometimes because of time
|
2013-02-04 19:54:14 +01:00 |
|
|
Rémi Gaillard
|
35e5912def
|
[-] Core: Fix #PSCFV-6067 stock was not reserved sometimes because of time
|
2013-02-04 19:54:14 +01:00 |
|
|
vAugagneur
|
b23aa76d6b
|
Merge branch 'dispatch_modules' into development
|
2013-02-04 18:20:24 +01:00 |
|
|
vAugagneur
|
d0d3180509
|
Merge branch 'dispatch_modules' into development
|
2013-02-04 18:20:24 +01:00 |
|
|
vAugagneur
|
0de5c242ca
|
[+] BO : new display of payment modules in payment tab
|
2013-02-04 18:18:50 +01:00 |
|
|
vAugagneur
|
947397c69b
|
[+] BO : new display of payment modules in payment tab
|
2013-02-04 18:18:50 +01:00 |
|
|
Damien Metzger
|
a9106be306
|
Merge pull request #243 from burhanbvk/patch-3
[-] FO : Fixed a typo for ui.droppable dependencies
|
2013-02-04 09:14:20 -08:00 |
|
|
Damien Metzger
|
168ccb2687
|
Merge pull request #243 from burhanbvk/patch-3
[-] FO : Fixed a typo for ui.droppable dependencies
|
2013-02-04 09:14:20 -08:00 |
|