Commit Graph
17850 Commits
Author SHA1 Message Date
gRoussac 61557f2fd0 [-] FO : Fix bug #PSCFV-8589 do not loose max level depth when upgrading 2013-04-11 17:34:15 +02:00
gRoussac 6d869cc804 [-] FO : Fix bug #PSCFV-8589 do not loose max level depth when upgrading 2013-04-11 17:34:15 +02:00
PrestaEdit 60e77597ac [-] Remove / 2013-04-11 18:18:15 +03:00
PrestaEdit 8070739347 [-] Remove / 2013-04-11 18:18:15 +03:00
Vincent Augagneur 239dcb0179 Merge pull request #377 from PrestaEdit/patch-28
[+] BO: show all languages in setting of employee
2013-04-11 07:43:05 -07:00
Vincent Augagneur 710783c066 Merge pull request #377 from PrestaEdit/patch-28
[+] BO: show all languages in setting of employee
2013-04-11 07:43:05 -07:00
Vincent Augagneur 0a0f28ee21 Merge pull request #375 from MrManchot/patch-1
Update blocknewsletter.php
2013-04-11 07:35:04 -07:00
Vincent Augagneur 590b0a6576 Merge pull request #375 from MrManchot/patch-1
Update blocknewsletter.php
2013-04-11 07:35:04 -07:00
vAugagneur f9225cb8c2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 16:31:48 +02:00
vAugagneur a2f137f9de Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 16:31:48 +02:00
vAugagneur b1dc638120 //removed commented code 2013-04-11 16:31:43 +02:00
vAugagneur 2b575e0c96 //removed commented code 2013-04-11 16:31:43 +02:00
PrestaEdit d35cecee10 // too fast 2013-04-11 17:25:44 +03:00
PrestaEdit 6d71b29618 // too fast 2013-04-11 17:25:44 +03:00
PrestaEdit 891c931832 [-] Fix: copy paste a little too fast 2013-04-11 17:24:12 +03:00
PrestaEdit 04d7da802e [-] Fix: copy paste a little too fast 2013-04-11 17:24:12 +03:00
gRoussac 759de67222 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 15:59:58 +02:00
gRoussac f231cd5bd0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 15:59:58 +02:00
gRoussac 4738a15c16 //small change in table creation of linkstopmenu again 2013-04-11 15:59:23 +02:00
gRoussac 467a6f45fd //small change in table creation of linkstopmenu again 2013-04-11 15:59:23 +02:00
vAugagneur 0b7e9827af Merge pull request #65 from Ha99y:mobile-them-HR-fix2 2013-04-11 15:52:07 +02:00
vAugagneur 8bdcaa2c2d Merge pull request #65 from Ha99y:mobile-them-HR-fix2 2013-04-11 15:52:07 +02:00
gRoussac 7222af7466 //small chnage in table creation of linkstopmenu 2013-04-11 15:05:03 +02:00
gRoussac 3ffb2c8c56 //small chnage in table creation of linkstopmenu 2013-04-11 15:05:03 +02:00
gRoussac 2149c2a986 [-] INSTALLER : add counter loop in update_order_messages 2013-04-11 14:18:28 +02:00
gRoussac f4a5305678 [-] INSTALLER : add counter loop in update_order_messages 2013-04-11 14:18:28 +02:00
vAugagneur df1e71fe76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 12:00:49 +02:00
vAugagneur 3f33e17567 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 12:00:49 +02:00
vAugagneur c1518dfcbf [-] CORE : fixed bug #PSCFV-8475 - Email templates with {shop_url} append url with index.php 2013-04-11 12:00:31 +02:00
vAugagneur 63bcd22bc6 [-] CORE : fixed bug #PSCFV-8475 - Email templates with {shop_url} append url with index.php 2013-04-11 12:00:31 +02:00
gRoussac 0b21f0e221 [-] BO : Deactivate backwardcompatibility module 2013-04-11 11:59:32 +02:00
gRoussac 723a77e565 [-] BO : Deactivate backwardcompatibility module 2013-04-11 11:59:32 +02:00
gRoussac b12b6571a1 [-] Installer : Fix bug #PSCFV-8606 bad performance when updating messages 2013-04-11 11:49:29 +02:00
gRoussac 4937f111d1 [-] Installer : Fix bug #PSCFV-8606 bad performance when updating messages 2013-04-11 11:49:29 +02:00
Gregory Roussac 89f5dbcde8 Merge pull request #384 from PrestaEdit/patch-30
[-] MO: homefeatured - numbers are now the same
2013-04-11 02:42:42 -07:00
Gregory Roussac d79c125e92 Merge pull request #384 from PrestaEdit/patch-30
[-] MO: homefeatured - numbers are now the same
2013-04-11 02:42:42 -07:00
PrestaEdit a6dafcfa86 [-] MO: homefeatured - numbers are now the same 2013-04-11 12:40:26 +03:00
PrestaEdit 59570a58ac [-] MO: homefeatured - numbers are now the same 2013-04-11 12:40:26 +03:00
vAugagneur 7a27fa2f64 [-] FO : standardize behavior of selected country in the list when create a new address 2013-04-11 10:30:22 +02:00
vAugagneur f15722858e [-] FO : standardize behavior of selected country in the list when create a new address 2013-04-11 10:30:22 +02:00
François Gaillard 1ae6507973 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 10:28:49 +02:00
Francois Gaillard 8793024d56 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 10:28:49 +02:00
François Gaillard 8125a2e5b4 // Fixed Tools::jsonEncode() on Tools.php 2013-04-11 10:28:38 +02:00
Francois Gaillard 9c3417bfff // Fixed Tools::jsonEncode() on Tools.php 2013-04-11 10:28:38 +02:00
PrestaEdit cb560ce07f [-] MO: fix statsbestvouchers
ocr.code not exist ; this one show the code and name of the cart rule.
2013-04-11 02:39:03 +03:00
PrestaEdit f1dcb365e9 [-] MO: fix statsbestvouchers
ocr.code not exist ; this one show the code and name of the cart rule.
2013-04-11 02:39:03 +03:00
Rémi Gaillard f43aee9a25 [-] BO: PSCFV-7685 parent category for root categories after upgrade 2013-04-10 18:52:59 +02:00
Rémi Gaillard 345ec87993 [-] BO: PSCFV-7685 parent category for root categories after upgrade 2013-04-10 18:52:59 +02:00
gRoussac 17012ea00d [*] Installer : Set context in upgrader 2013-04-10 17:57:33 +02:00
gRoussac ec63aa4064 [*] Installer : Set context in upgrader 2013-04-10 17:57:33 +02:00