 Gregory Roussac
|
4b7936bf46
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-22 16:33:56 +01:00 |
|
|
Gregory Roussac
|
7a8fade4b1
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-22 16:33:56 +01:00 |
|
|
gRoussac
|
1ed094abfb
|
[-] FO : Fix bug #PSCFI-6751 for 1.5.X carriers and payments update in OPC
|
2013-01-22 16:32:55 +01:00 |
|
|
gRoussac
|
c0e7444889
|
[-] FO : Fix bug #PSCFI-6751 for 1.5.X carriers and payments update in OPC
|
2013-01-22 16:32:55 +01:00 |
|
|
Benjamin PONGY
|
0461ae3cd6
|
[*] FO oosHook must be a div, not a paragraph
for code validation, oosHook must be a div, not a paragraph.
|
2013-01-22 15:19:52 +01:00 |
|
|
Benjamin PONGY
|
c89ad555df
|
[*] FO oosHook must be a div, not a paragraph
for code validation, oosHook must be a div, not a paragraph.
|
2013-01-22 15:19:52 +01:00 |
|
|
Rémi Gaillard
|
8f80654965
|
[-] BO: Allow override for emails translations on the default theme without MODE_DEV
|
2013-01-22 15:07:25 +01:00 |
|
|
Rémi Gaillard
|
9e45ad974a
|
[-] BO: Allow override for emails translations on the default theme without MODE_DEV
|
2013-01-22 15:07:25 +01:00 |
|
|
Vincent Augagneur
|
d4247f04b8
|
Merge pull request #183 from PrestaEdit/patch-8
[-] Small Fix: change documentation URL
|
2013-01-22 05:49:56 -08:00 |
|
|
Vincent Augagneur
|
377cc5d794
|
Merge pull request #183 from PrestaEdit/patch-8
[-] Small Fix: change documentation URL
|
2013-01-22 05:49:56 -08:00 |
|
|
Vincent Augagneur
|
f64cedc1a0
|
Merge pull request #184 from PrestaEdit/patch-9
// Welcome 2013
|
2013-01-22 05:49:18 -08:00 |
|
|
Vincent Augagneur
|
9c821b3932
|
Merge pull request #184 from PrestaEdit/patch-9
// Welcome 2013
|
2013-01-22 05:49:18 -08:00 |
|
|
Samy Rabih
|
8e80cdb6b7
|
Disable search indexation
Search indexation is very CPU-intensive, it should not be used here
|
2013-01-22 14:34:17 +01:00 |
|
|
Samy Rabih
|
db3be40c06
|
Disable search indexation
Search indexation is very CPU-intensive, it should not be used here
|
2013-01-22 14:34:17 +01:00 |
|
|
Marco Cervellin
|
94ebf82fd5
|
Merge branch 'development' of git://github.com/PrestaShop/PrestaShop into development
|
2013-01-22 12:06:25 +01:00 |
|
|
Marco Cervellin
|
f4c361636e
|
Merge branch 'development' of git://github.com/PrestaShop/PrestaShop into development
|
2013-01-22 12:06:25 +01:00 |
|
|
Vincent Augagneur
|
7cb6f55193
|
Merge pull request #190 from PrestaEdit/patch-13
[-] BO: Standard Norm
|
2013-01-22 03:02:05 -08:00 |
|
|
Vincent Augagneur
|
b4864f83f6
|
Merge pull request #190 from PrestaEdit/patch-13
[-] BO: Standard Norm
|
2013-01-22 03:02:05 -08:00 |
|
|
Marco Cervellin
|
373e7a8c39
|
[-] FO : fixed smarty curly bracket
Signed-off-by: Marco Cervellin <marco@macodev.com>
|
2013-01-22 11:53:29 +01:00 |
|
|
Marco Cervellin
|
1fb06bc07d
|
[-] FO : fixed smarty curly bracket
Signed-off-by: Marco Cervellin <marco@macodev.com>
|
2013-01-22 11:53:29 +01:00 |
|
|
Rémi Gaillard
|
fc547a4ab9
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-22 11:28:05 +01:00 |
|
|
Rémi Gaillard
|
f47031eaaf
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-22 11:28:05 +01:00 |
|
|
Rémi Gaillard
|
f1f8ce993f
|
[-] Core: check the existence of the overriden emails templates before try to sending them
|
2013-01-22 11:27:51 +01:00 |
|
|
Rémi Gaillard
|
f40ae37a24
|
[-] Core: check the existence of the overriden emails templates before try to sending them
|
2013-01-22 11:27:51 +01:00 |
|
|
vAugagneur
|
262431e0e0
|
[-] CORE : email with virtual products info was not send to the customer
|
2013-01-22 11:23:05 +01:00 |
|
|
vAugagneur
|
459ce4fab8
|
[-] CORE : email with virtual products info was not send to the customer
|
2013-01-22 11:23:05 +01:00 |
|
|
Vincent Augagneur
|
691b2039d3
|
Merge pull request #209 from Patanock/patch-3
[-] FO : Fix for automatic modules upgrades
|
2013-01-22 00:19:49 -08:00 |
|
|
Vincent Augagneur
|
268b581953
|
Merge pull request #209 from Patanock/patch-3
[-] FO : Fix for automatic modules upgrades
|
2013-01-22 00:19:49 -08:00 |
|
|
PrestaEdit
|
6903d9ea62
|
[*] BO: we don't need to clik on a line
|
2013-01-21 22:23:51 +01:00 |
|
|
PrestaEdit
|
7f56058619
|
[*] BO: we don't need to clik on a line
|
2013-01-21 22:23:51 +01:00 |
|
|
Patanock
|
7432db7fad
|
Update classes/module/Module.php
|
2013-01-21 20:28:59 +01:00 |
|
|
Patanock
|
1514263b35
|
Update classes/module/Module.php
|
2013-01-21 20:28:59 +01:00 |
|
|
Rémi Gaillard
|
2652130ca4
|
// typo fix
|
2013-01-21 18:42:56 +01:00 |
|
|
Rémi Gaillard
|
378320854c
|
// typo fix
|
2013-01-21 18:42:56 +01:00 |
|
|
Patanock
|
7d1bed8407
|
Update classes/module/Module.php
[-] FO : Fix for automatic modules upgrades
|
2013-01-21 17:53:29 +01:00 |
|
|
Patanock
|
d96d6a46d1
|
Update classes/module/Module.php
[-] FO : Fix for automatic modules upgrades
|
2013-01-21 17:53:29 +01:00 |
|
|
vAugagneur
|
4523f4c849
|
[+] BO : new display of module list in all BO tabs
|
2013-01-21 17:46:40 +01:00 |
|
|
vAugagneur
|
517e90da43
|
[+] BO : new display of module list in all BO tabs
|
2013-01-21 17:46:40 +01:00 |
|
|
Rémi Gaillard
|
dffd143e0f
|
[-] Core: Store partial value in OrderCartRules #PSCFV-6566
|
2013-01-21 17:33:35 +01:00 |
|
|
Rémi Gaillard
|
a70e92dced
|
[-] Core: Store partial value in OrderCartRules #PSCFV-6566
|
2013-01-21 17:33:35 +01:00 |
|
|
Rémi Gaillard
|
935b5b5d02
|
[-] BO: Fix #PSCFV-6383 allow numerics chars on SQL Manager
|
2013-01-21 16:32:31 +01:00 |
|
|
Rémi Gaillard
|
1915ea63a7
|
[-] BO: Fix #PSCFV-6383 allow numerics chars on SQL Manager
|
2013-01-21 16:32:31 +01:00 |
|
|
Gregory Roussac
|
ebc3d2562f
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-21 15:41:42 +01:00 |
|
|
Rémi Gaillard
|
3dbf875923
|
[-] BO: description_short product field validation when the limit is changed #PSCFV-7383
|
2013-01-21 15:42:58 +01:00 |
|
|
Gregory Roussac
|
ad9543fc53
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-21 15:41:42 +01:00 |
|
|
Rémi Gaillard
|
c45345b36a
|
[-] BO: description_short product field validation when the limit is changed #PSCFV-7383
|
2013-01-21 15:42:58 +01:00 |
|
|
gRoussac
|
1de477a77b
|
[*] BO : Fix #PSCFI-6225 for 1.5.X
|
2013-01-21 15:41:13 +01:00 |
|
|
gRoussac
|
17be5368c7
|
[*] BO : Fix #PSCFI-6225 for 1.5.X
|
2013-01-21 15:41:13 +01:00 |
|
|
Gregory Roussac
|
b3868c74d6
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-21 15:31:44 +01:00 |
|
|
Gregory Roussac
|
b6c2532c8f
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-21 15:31:44 +01:00 |
|