Commit Graph

63 Commits

Author SHA1 Message Date
gRoussac
d55f31d3b5 Merge branch 'tools-fileAttachment' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-tools-fileAttachment
Conflicts:
	classes/Tools.php
	controllers/front/ContactController.php
2013-07-17 15:35:18 +02:00
Damien Metzger
d772d97bfa [-] BO : you can now have different mail topic for one mail template #PSCFV-9617 2013-07-11 14:27:40 +02:00
Vincent Augagneur
56e75d0e9a [-] CORE : fixed bug #PSCFV-8745 Contact form e-mail template with incomplete information 2013-06-26 18:01:26 +02:00
djfm
da2db7d799 // parse error 2013-05-22 11:11:37 +02:00
vAugagneur
3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
PrestaEdit
b6fbbe6187 [*] FO: use Tools::fileAttachment() in ContactController 2013-04-30 20:46:34 +02:00
Rémi Gaillard
24947d3ae6 [-] FO: Extension test on file attachment for contact form should not be case sensitive #PSCFV-8616 2013-04-04 19:03:27 +02:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard
022464c578 [*] BO: Improvements on customer services - you are now able to create new threads for synced emails 2013-02-06 15:28:57 +01:00
vAugagneur
4a9c3df77c [-] FO - fixed bug #PSCFV-6620 - reply to customer thread not working properly 2013-01-24 16:24:04 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
DamienMetzger
fdfe27dcd8 [-] FO : fixed parse error on ContactController.php #PSCFV-5803 2012-11-22 19:30:05 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
dMetzger
bc4ebdc6cb [-] FO : replaced order id by order reference in the contact form (but kept the id_order for retrocompatibility) #PSCFV-5491 2012-11-14 14:54:36 +00:00
dMetzger
4d2ebaa0f5 [-] FO : replaced order id by order reference in the contact form (but kept the id_order for retrocompatibility) #PSCFV-5491 2012-11-14 14:54:36 +00:00
dMetzger
0d2aed15be [-] FO : replaced order id by order reference in the contact form (but kept the id_order for retrocompatibility) #PSCFV-5491 2012-11-14 14:47:26 +00:00
dMetzger
3166887d0e [-] FO : replaced order id by order reference in the contact form (but kept the id_order for retrocompatibility) #PSCFV-5491 2012-11-14 14:47:26 +00:00
dMetzger
3f93a729c1 [-] FO : missing vars in contact email replaced #PSCFV-4852 2012-11-08 13:33:12 +00:00
dMetzger
613e934900 [-] FO : missing vars in contact email replaced #PSCFV-4852 2012-11-08 13:33:12 +00:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
75543168ac [-] BO : #PSCFV-3834 : Check if file upload exist when use the contact form 2012-08-31 09:05:25 +00:00
lLefevre
15bf9d4244 [-] BO : #PSCFV-3834 : Check if file upload exist when use the contact form 2012-08-31 09:05:25 +00:00
vAugagneur
1f2254b9df [-] INSTALLER : fixed bug #PSCFV-2979 2012-08-08 08:39:32 +00:00
vAugagneur
50d71ab08c [-] INSTALLER : fixed bug #PSCFV-2979 2012-08-08 08:39:32 +00:00
mDeflotte
cbc47f9b26 [-] BO : #PSCFV-3146 - Customer Thread, fix encoding chars bugs 2012-07-11 14:17:19 +00:00
mDeflotte
25aefa5a6b [-] BO : #PSCFV-3146 - Customer Thread, fix encoding chars bugs 2012-07-11 14:17:19 +00:00
mDeflotte
70ab1c8b43 [-] BO : #PSCFV-3146 - Customer Thread, fix encoding chars bugs 2012-07-11 14:17:03 +00:00
mDeflotte
08620d451c [-] BO : #PSCFV-3146 - Customer Thread, fix encoding chars bugs 2012-07-11 14:17:03 +00:00
vAugagneur
424a256c91 [-] BO : fixed #PSCFV-3058 SAV multi fix 2012-07-05 10:27:26 +00:00
vAugagneur
8369f48c5d [-] BO : fixed #PSCFV-3058 SAV multi fix 2012-07-05 10:27:26 +00:00
lLefevre
24eaf58092 [-] BO : fix #PSCFV-3027 2012-07-05 08:30:17 +00:00
lLefevre
abf356af2b [-] BO : fix #PSCFV-3027 2012-07-05 08:30:17 +00:00
mDeflotte
100b210d22 [-] FO : #PSCFV-2920 - Hidding order number, use order reference instead 2012-06-26 15:19:35 +00:00
mDeflotte
f981d8f37b [-] FO : #PSCFV-2920 - Hidding order number, use order reference instead 2012-06-26 15:19:35 +00:00
vAugagneur
d18746402a //remove mobile theme 2012-05-09 20:57:15 +00:00
vAugagneur
ee8b8df66a //remove mobile theme 2012-05-09 20:57:15 +00:00
lLefevre
1998bb56d4 // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
nPellicari
e0902253fd [*] FO : Add mobile detection and mobile theme dispatcher 2012-03-06 09:00:25 +00:00
nPellicari
f7b97fee7a [*] FO : Add mobile detection and mobile theme dispatcher 2012-03-06 09:00:25 +00:00
rMalie
8a24c0a741 // Retro-compatibility fix of front controllers 2012-03-05 15:32:06 +00:00
rMalie
ac3a322d95 // Retro-compatibility fix of front controllers 2012-03-05 15:32:06 +00:00
vAugagneur
047d6b1569 [-] BO : fixed bug in contact message with html 2012-02-28 11:05:21 +00:00
vAugagneur
e061e9a49c [-] BO : fixed bug in contact message with html 2012-02-28 11:05:21 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
91aae3e665 // Improve multishop API 2012-02-23 15:39:44 +00:00