Commit Graph

18638 Commits

Author SHA1 Message Date
Rémi Gaillard 9cb3db42ff [-] WS: Fix #PSCFV-6559 deletion of category images 2013-01-23 15:25:33 +01:00
Rémi Gaillard 79860bfa12 [-] WS: Fix #PSCFV-6559 deletion of category images 2013-01-23 15:25:33 +01:00
Rémi Gaillard e660265a1c [-] BO: Fix translations for overridden templates #PSCFV-7391 2013-01-23 14:58:37 +01:00
Rémi Gaillard 150f8ae528 [-] BO: Fix translations for overridden templates #PSCFV-7391 2013-01-23 14:58:37 +01:00
Vincent Augagneur 9f876f9300 Merge pull request #223 from djfm/877e85cb315be5bae73bada00fd10f756a29b07a
Synchronize the localization files in the solution with those on the PrestaShop server
2013-01-23 05:10:20 -08:00
Vincent Augagneur 6b2fab87d2 Merge pull request #223 from djfm/877e85cb315be5bae73bada00fd10f756a29b07a
Synchronize the localization files in the solution with those on the PrestaShop server
2013-01-23 05:10:20 -08:00
djfm 877e85cb31 // Synchronized localization files between server and solution 2013-01-23 10:33:32 +01:00
djfm 5c1f5b0f23 // Synchronized localization files between server and solution 2013-01-23 10:33:32 +01:00
sLorenzini bbb1ee896e [-] FO: fixed Solutions for authentication.tpl and address.tpl about dni field - #PSCFV-6619 2013-01-23 09:44:54 +01:00
sLorenzini 60c4d09948 [-] FO: fixed Solutions for authentication.tpl and address.tpl about dni field - #PSCFV-6619 2013-01-23 09:44:54 +01:00
Vincent Augagneur 88b6502488 //fixed bug with images when theme don't have associate image type 2013-01-23 09:30:49 +01:00
Vincent Augagneur 9cf577ff0d //fixed bug with images when theme don't have associate image type 2013-01-23 09:30:49 +01:00
PrestaEdit 94c84b41cf [-] MO: fix a problem with the wishlist_link
With @ArtDesign, we see that if you put the module "Block MyAccount" before the "Wishlist", the wishlist_link var is not declare yet, so the link is empty. If you put the var in the header, it can be accessed by the other tpl.

Or, we can put this in a {$link->getModuleLink(...)} in TPL
2013-01-22 23:50:52 +01:00
PrestaEdit 3b2b718f84 [-] MO: fix a problem with the wishlist_link
With @ArtDesign, we see that if you put the module "Block MyAccount" before the "Wishlist", the wishlist_link var is not declare yet, so the link is empty. If you put the var in the header, it can be accessed by the other tpl.

Or, we can put this in a {$link->getModuleLink(...)} in TPL
2013-01-22 23:50:52 +01:00
gRoussac f5c2d8e826 [-] FO : Try to fix "phone required" bug once again when only signing in 2013-01-22 18:33:14 +01:00
gRoussac caf95de092 [-] FO : Try to fix "phone required" bug once again when only signing in 2013-01-22 18:33:14 +01:00
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