dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,516 Commits 9 Branches 19 Tags
70641cdc4e2e70ca64ef0ea0f5bd948dcf326613
Commit Graph

47 Commits

Author SHA1 Message Date
Rémi Gaillard
c6d9d9c94e [-] Core: Fix #PSCFV-8119 logos/shop_name for orders emails was not depend of the shop 2013-03-05 10:59:04 +01:00
Rémi Gaillard
74b4fd398f [-] Core: Fix #PSCFV-7813 override of modules email templates not working because of directory separator 2013-03-04 16:43:51 +01:00
Damien Metzger
0e3f3ed462 [*] Core : added the possibility to disable the emails (i.e. for test purpose) 2013-02-21 17:12:04 +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
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Rémi Gaillard
d431802e7e [-] Core: The emails can now be sent with amazon SES when logo is in png 2012-12-18 15:45:43 +01:00
Vincent Augagneur
ebff913250 Merge pull request #69 from PrestaEdit/mails 
[+] Project: add the possibility to change the default color (#db3484)
 2012-12-12 06:59:04 -08:00
Rémi Gaillard
a68e5c1cfb [-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function 2012-12-10 15:06:03 +01:00
Milow
cf7aebd029 Fix typo 2012-12-05 21:27:37 -06:00
Milow
c87fb469fd Fix mail error 
This changes two things in the mail class.

1. If the html template was missing, it would tell you the txt template
was missing. It now tells you that the html template is missing.

2. If the type is set to only text or html, don't fail if the other
template is missing. Example, if set to only use text templates, don't
fail if the html template does not exist. If the type is set to both,
or if the specific type of template is missing, it will still complain.
 2012-12-05 21:26:07 -06:00
Jonathan Danse
edd6bf7b7e [+] Project: add the possibility to change the default color (#db3484) 
Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes)
 2012-12-03 16:11:43 +01:00
vAugagneur
dbda08099a //wrong define unsing _MAIL_DIR_ instead of _PS_MAIL_DIR_ 2012-11-29 18:44:51 +01:00
jessylenne
f4d53784f6 Update classes/Mail.php 
lang.php inclusion path correction
- In case of theme directory use
- In case of override/classes/Mail.php use
 2012-11-24 18:08:27 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
vAugagneur
0d0cc3f7c1 [-] CORE : fixed bug #PSCFV-4595 2012-10-12 14:59:26 +00:00
lLefevre
3166948171 [-] TR : Mail : #PSCFV-3987 : add stripslashes for email object 2012-09-11 07:31:25 +00:00
lLefevre
26193aad2a // When mail object are not translated, now use the default object 2012-09-10 09:11:36 +00:00
dMetzger
3df7d9a131 [-] Core : Swift exception(s) handled #PSCFI-6121 2012-08-02 08:34:05 +00:00
lLefevre
74529c94af // small fix 2012-07-24 15:04:27 +00:00
lLefevre
ed19ef4b67 [-] BO : fix #PSCFV-3278 : add a parameter id_shop in a method Mail::send() && normalize 2012-07-24 14:13:11 +00:00
dMetzger
ff9d7cd786 [*] BO : sending a mail is a little less strict with wrong parameters - it tries to send the e-mail, not to die! 2012-07-24 08:23:25 +00:00
lLefevre
3ccc4c5013 // Fix translations mails errors for each languages 
// Now, Subject for reply_msg.html is translated
// Now use sprintf() in subject mails
 2012-05-24 09:57:48 +00:00
aFolletete
a52a8f6d3d // fix issue on link in email 2012-05-19 13:31:10 +00:00
Francois Gaillard
7aa0ed4593 [-] Classes : #PSCFI-4973 : Bug fix mail receiver was null 2012-05-10 15:02:19 +00:00
aNiassy
23f78d0aee [-] FO : #PSCFI-5343 : Fixed a problem of E-mail subject encoding 2012-04-19 13:43:54 +00:00
mDeflotte
421ea9456f [-] Project : #PSFV-816 - Allow to attach multiple files to an email with the function Mail::send 2012-04-19 13:00:41 +00:00
lLefevre
d81a1be0d5 [-] BO : #PSTEST-1130 : fix bug object mail virtual product 2012-04-04 13:57:00 +00:00
mDeflotte
df78dc663f [-] MO : #PSFV-636 - Remove warnings lile "Warning: Function displayHeader() is deprecated" with module blockwishlist 2012-03-15 17:22:59 +00:00
lLefevre
4f86c0d0ac // Fix replace \\" by " in english keys and change french keys for errors files 2012-03-15 08:31:12 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
Francois Gaillard
ad478dfc09 [-] Classes : #PSCFI-4931 : BugFix Better encoding for accentuated chars in mails headers 2012-03-13 09:48:04 +00:00
vAugagneur
e061e9a49c [-] BO : fixed bug in contact message with html 2012-02-28 11:05:21 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mDeflotte
375bb8eaac // Fix bug with new logo working 2012-02-07 15:30:23 +00:00
mDeflotte
74c779f3ae [-] BO : #PSTEST-667 - Fix bug with logo and multishop 2012-02-07 09:20:01 +00:00
Francois Gaillard
ecb38d851f [-] Classes : #PSCFI-4688 : Added a base64_encode() for the mail receiver name. Needed for names with accentuated chars 2012-01-17 16:56:51 +00:00
aNiassy
41f5061309 [-] #PSCFI-3773 : Changed the treatment which validate the email and added a condition for receivers 2011-10-24 09:49:57 +00:00
aNiassy
00e8ad5821 [-] #PSCFI-3773 : Added conditions in order to test the var $toName (to know if it's a string or an array) 2011-10-24 08:22:48 +00:00
rMalie
468306a3ca // Merge -> revision 8952 2011-10-03 09:14:01 +00:00
rMalie
c17e7c236d // MERGE with 1.4 r7770 2011-07-28 09:20:57 +00:00
rMalie
ba2922a823 // Context part 13 2011-07-19 09:44:10 +00:00
tDidierjean
e7ea230525 // Context part 3 2011-07-12 16:25:27 +00:00
rGaillard
8fc7f11014 2011-07-06 10:54:11 +00:00
rGaillard
d1a13007b9 2011-07-06 10:10:43 +00:00
aFolletete
05a58f53e6 // 1.5 branche creation 2011-04-12 18:24:40 +00:00