Commit Graph

5872 Commits

Author SHA1 Message Date
Damien Metzger
7c4cabf0f2 Merge pull request #420 from e-gaulue/Module_translation_patch_2
[-] BO : don't show unecessary tpl module translations - complience with documentation
2013-05-06 07:08:41 -07:00
Damien Metzger
f4df47986b Merge pull request #420 from e-gaulue/Module_translation_patch_2
[-] BO : don't show unecessary tpl module translations - complience with documentation
2013-05-06 07:08:41 -07:00
Damien Metzger
2af342c864 [-] BO : fixed potential warning with texture list #PSCFV-9050 2013-05-06 09:27:03 +02:00
Damien Metzger
80b5855006 [-] BO : fixed potential warning with texture list #PSCFV-9050 2013-05-06 09:27:03 +02:00
Edouard Gaulué
4346d9e57c [*] FO : AuthController can now have its own template 2013-05-06 00:32:16 +02:00
Edouard Gaulué
443e22aa72 [*] FO : AuthController can now have its own template 2013-05-06 00:32:16 +02:00
Rémi Gaillard
abcb083cb3 [-] BO: You can now disable the email sent after account creation 2013-05-03 17:01:12 +02:00
Rémi Gaillard
63993a425b [-] BO: You can now disable the email sent after account creation 2013-05-03 17:01:12 +02:00
Edouard Gaulué
fdb931e3e8 [-] BO : don't show unecessary tpl module translations - complience with documentation 2013-05-02 18:46:13 +02:00
Edouard Gaulué
0442bee919 [-] BO : don't show unecessary tpl module translations - complience with documentation 2013-05-02 18:46:13 +02:00
Rémi Gaillard
4d4eb9df19 [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
Rémi Gaillard
41786587ba [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
Edouard Gaulué
467c183564 [-] BO : don't show translation for class/controler overrides when on modules translation page 2013-05-02 18:21:54 +02:00
Edouard Gaulué
444a99f564 [-] BO : don't show translation for class/controler overrides when on modules translation page 2013-05-02 18:21:54 +02:00
Damien Metzger
87be8bd39e [-] BO : fixed infinite loop in the categories #PSCFV-8965 2013-05-02 16:06:26 +02:00
Damien Metzger
fb604492b7 [-] BO : fixed infinite loop in the categories #PSCFV-8965 2013-05-02 16:06:26 +02:00
PrestaEdit
b6fbbe6187 [*] FO: use Tools::fileAttachment() in ContactController 2013-04-30 20:46:34 +02:00
Dragan Skrbic
d00ccdf306 // Fixed image import 2013-04-29 18:07:42 +02:00
Dragan Skrbic
7f8a33763a // Fixed image import 2013-04-29 18:07:42 +02:00
Damien Metzger
989b19d94a [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
Damien Metzger
3600a31862 [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
ccauw
051adc7b36 [-] BO : bug in BO translations when Windows OS
[-] BO : bug in BO translations when Windows OS

Impossible to translate the strings of the back office in the directory override/controllers/admin/...
under windows environment.

The statement " $parent_class = explode(DIRECTORY_SEPARATOR,..) " returns wrong result under windows environment. because the path name has '/' and '\' chars.

$parent_class contains bad values and the string "override" is not found.
2013-04-29 16:00:55 +03:00
Rémi Gaillard
dc7f1ceddf [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen 2013-04-29 13:47:46 +02:00
Rémi Gaillard
bfc8a0ad02 [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen 2013-04-29 13:47:46 +02:00
Damien Metzger
527f87a691 // Fixed directory creation in translation #PSCFV-8212 2013-04-29 12:08:45 +02:00
Damien Metzger
94090e2a39 // Fixed directory creation in translation #PSCFV-8212 2013-04-29 12:08:45 +02:00
Damien Metzger
c587934e25 [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 2013-04-29 11:16:26 +02:00
Damien Metzger
43a897436a [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 2013-04-29 11:16:26 +02:00
Damien Metzger
903b17979c [-] BO : fixed error message in language form #PSCFV-8890 2013-04-29 10:47:59 +02:00
Damien Metzger
459768d1ac [-] BO : fixed error message in language form #PSCFV-8890 2013-04-29 10:47:59 +02:00
Vincent Augagneur
ad17dbc700 Merge pull request #310 from Patanock/patch-5
[*] BO: Customer and carrier need to be send to the hook
2013-04-29 01:31:16 -07:00
Vincent Augagneur
218a76c443 Merge pull request #310 from Patanock/patch-5
[*] BO: Customer and carrier need to be send to the hook
2013-04-29 01:31:16 -07:00
Vincent Augagneur
5438a131b4 Merge pull request #330 from DrySs/patch-5
[-] FO: CMS link to conditions should not be in SSL
2013-04-29 01:22:21 -07:00
Vincent Augagneur
fe05e1cc39 Merge pull request #330 from DrySs/patch-5
[-] FO: CMS link to conditions should not be in SSL
2013-04-29 01:22:21 -07:00
Damien Metzger
6251815c37 [-] BO : Fixed display when you translate modules without theme selected 2013-04-25 17:47:07 +02:00
Damien Metzger
1921668596 [-] BO : Fixed display when you translate modules without theme selected 2013-04-25 17:47:07 +02:00
François Gaillard
6106066ef1 // Release branch merged 2013-04-25 17:00:56 +02:00
Francois Gaillard
8d735b333f // Release branch merged 2013-04-25 17:00:56 +02:00
Cédric Mouleyre
a8b89d7411 Double 'id_image' definition in product getList
Double 'id_image' definition in product getList, the correct on is : MAX('.$alias_image.'.id_image) id_image, I remove the second.

The problem was, sometimes, image product was not display in multi-shop in the BO.
2013-04-25 11:29:01 +02:00
Cédric Mouleyre
d5817a56cc Double 'id_image' definition in product getList
Double 'id_image' definition in product getList, the correct on is : MAX('.$alias_image.'.id_image) id_image, I remove the second.

The problem was, sometimes, image product was not display in multi-shop in the BO.
2013-04-25 11:29:01 +02:00
Rémi Gaillard
cde13e7707 Merge pull request #403 from MrManchot/patch-4
Double 'id_image' definition in product getList
2013-04-25 02:23:16 -07:00
Rémi Gaillard
36b0eae84f Merge pull request #403 from MrManchot/patch-4
Double 'id_image' definition in product getList
2013-04-25 02:23:16 -07:00
vAugagneur
1280152db9 [-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404 2013-04-25 10:59:18 +02:00
vAugagneur
ac9a5c5a41 [-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404 2013-04-25 10:59:18 +02:00
Cédric Mouleyre
e344863a3c Double 'id_image' definition in product getList
Double 'id_image' definition in product getList, the correct on is : MAX('.$alias_image.'.id_image) id_image, I remove the second.

The problem was, sometimes, image product was not display in multi-shop in the BO.
2013-04-25 11:31:10 +03:00
Cédric Mouleyre
89723f9daf Double 'id_image' definition in product getList
Double 'id_image' definition in product getList, the correct on is : MAX('.$alias_image.'.id_image) id_image, I remove the second.

The problem was, sometimes, image product was not display in multi-shop in the BO.
2013-04-25 11:31:10 +03:00
Damien Metzger
b2b17eb041 // Removed deprecated block for new installs 2013-04-25 09:03:32 +02:00
Damien Metzger
7a76b8b6a0 // Removed deprecated block for new installs 2013-04-25 09:03:32 +02:00
Damien Metzger
7cafc7bdf5 // Fixed warning in translations 2013-04-24 16:27:45 +02:00
Damien Metzger
4df54ce743 // Fixed warning in translations 2013-04-24 16:27:45 +02:00