Marcus Bointon
b60c8df85e
Merge remote-tracking branch 'remotes/upstream/master' into 6.0
2017-06-14 14:49:06 +02:00
Marcus Bointon
7ee66b9b39
Move issue_template to .github folder
2017-06-14 14:48:50 +02:00
Marcus Bointon
45fee1c2b4
Tweak issue_template
2017-06-14 14:46:09 +02:00
Manzoor Wani
29b2042fd1
Correct the attribute description ( #1073 )
...
doCallback() receives $to, $cc and $bcc as arrays and passes them as such to the action function
2017-06-13 13:59:32 +02:00
Teddysun
699d57dc01
Improved Simplified Chinese PHPMailer language ( #1063 )
...
Completed new language key $PHPMAILER_LANG['extension_missing'].
Signed-off-by: Teddysun <i@teddysun.com>
2017-05-31 06:26:14 +01:00
Marcus Bointon
9e548ffaf7
Merge remote-tracking branch 'remotes/origin/master' into 6.0
2017-05-29 14:07:35 +02:00
Marcus Bointon
cd2f977899
Allow injecting an SMTP instance
2017-05-29 14:07:11 +02:00
Ogün Karakuş
a255f16a0e
Update phpmailer.lang-tr.php ( #1060 )
...
Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>
2017-05-29 07:24:35 +01:00
Marcus Bointon
262dc4997a
Merge remote-tracking branch 'remotes/origin/master' into 6.0
2017-05-26 12:09:15 +02:00
Marcus Bointon
b25f93eb2d
More reliable folding of message headers
2017-05-22 18:53:00 +02:00
Niklas
c2f17ba471
Markdown needs a space between #:s and the heading ( #1054 )
2017-05-22 14:16:25 +01:00
Marcus Bointon
d95ef498e2
Trim subject consistently
2017-05-22 10:13:28 +02:00
Marcus Bointon
eb96b30775
Speak Yoda
2017-05-22 10:08:37 +02:00
Marcus Bointon
799a156ea7
Speak Yoda
2017-05-22 09:48:23 +02:00
Marcus Bointon
7c6ce49757
Remove duplicate mbstring check
2017-05-22 09:38:56 +02:00
Marcus Bointon
cee3af5c29
Merge remote-tracking branch 'remotes/origin/master' into 6.0
...
# Conflicts:
# changelog.md
2017-05-20 23:45:01 +02:00
Marcus Bointon
5e172d2f59
Changelog
2017-05-20 23:35:46 +02:00
Marcus Bointon
8df08db8b7
Merge remote-tracking branch 'origin/master'
2017-05-20 23:34:11 +02:00
Marcus Bointon
ad33c20d06
Include timestamps in HTML-format debug output
2017-05-20 23:33:59 +02:00
Marcus Bointon
e194b97409
Changelog
2017-05-15 10:01:49 +02:00
Marcus Bointon
82cbbc2ab2
Merge remote-tracking branch 'remotes/origin/master' into 6.0
2017-05-15 10:00:12 +02:00
Велимир Мајсторов
56f072f57a
Update for phpmailer.lang-sr.php ( #1049 )
...
Added and fixed missing translation.
Use this one, please.
2017-05-15 08:59:33 +01:00
Marcus Bointon
192c84a87e
Better detection & reporting of bad SMTP host strings
2017-05-15 09:35:15 +02:00
Marcus Bointon
57c9951a47
Merge remote-tracking branch 'remotes/origin/master' into 6.0
...
# Conflicts:
# .travis.yml
2017-05-14 22:00:06 +02:00
ravo10
e3303ffa40
Update phpmailer.lang-nb.php ( #1047 )
...
Correct translation (2) (05.14.17)
2017-05-14 20:56:40 +01:00
Marcus Bointon
25eb651519
Merge remote-tracking branch 'origin/master'
2017-05-14 21:41:38 +02:00
Marcus Bointon
706f817330
Workaround for broken default HHVM config on Travis-CI ( https://github.com/travis-ci/travis-ci/issues/7712 )
2017-05-14 21:40:24 +02:00
Marcus Bointon
1003010d93
Workaround for broken default HHVM config on Travis-CI ( https://github.com/travis-ci/travis-ci/issues/7712 )
2017-05-14 21:38:40 +02:00
Marcus Bointon
70e35cc9da
Rewrite host checks to be more predictable, add more test cases
2017-05-12 15:13:08 +02:00
Marcus Bointon
5175bdabe9
Allow HHVM build failures until Travis fixes it
2017-05-12 13:47:27 +02:00
Marcus Bointon
9f08355ed3
Add host validation tests
...
Improve host validator
2017-05-12 09:43:46 +02:00
Marcus Bointon
7481f418f2
Add hostname validation function
...
Improve serverHostname, mainly to combat IDEs that set $_SERVER['SERVER_NAME'] to invalid hostnames
2017-05-11 19:00:01 +02:00
Marcus Bointon
1f9a66492a
Replace all uses of MD5 and SHA1 with SHA256
...
Use more secure method of generating IDs
2017-05-11 18:41:34 +02:00
Marcus Bointon
5807c1fcbe
Merge remote-tracking branch 'remotes/origin/master' into 6.0
...
# Conflicts:
# composer.json
# src/PHPMailer.php
2017-05-11 16:09:52 +02:00
Marcus Bointon
b6598a155f
Merge remote-tracking branch 'origin/6.0' into 6.0
2017-05-11 01:57:45 +02:00
Marcus Bointon
d798b197ed
Incorporate file-reading changes from #500
...
Update changelog
2017-05-11 01:56:57 +02:00
lewa
7280a55d58
low-level SMTP error handling from 6.0 branch ( #1012 ) ( #1041 )
2017-05-11 00:27:15 +01:00
Elan Ruusamäe
afb1302611
composer: indicate ctype ext being used ( #937 )
2017-05-11 00:25:01 +01:00
Kirill Voronov
a3b4f6b281
add specific chars for matching of ipv6 addresses ( #1040 )
...
when validating servers in the `Host` property.
2017-05-11 00:22:50 +01:00
Fabio Beneditto
4f6255858f
Update pt_BR translation ( #1038 )
...
Adjust on strings: correct sender (remetente, not rementente)
2017-05-07 18:32:26 +01:00
Marcus Bointon
4826199276
Merge remote-tracking branch 'upstream/master'
2017-04-18 17:47:46 +02:00
Marcus Bointon
f42de0d01b
Add issue_template
2017-04-18 17:47:32 +02:00
Marcus Bointon
819beca5ab
Name issue template correctly
2017-04-18 17:45:29 +02:00
Marcus Bointon
c33a3a7824
Merge remote-tracking branch 'remotes/origin/master' into 6.0
...
# Conflicts:
# examples/gmail_xoauth.phps
# src/PHPMailer.php
2017-04-13 12:31:40 +02:00
Marcus Bointon
9a0e074e10
Changelog
2017-04-13 12:24:19 +02:00
Marcus Bointon
349350bc71
Changelog
2017-04-13 12:23:28 +02:00
Marcus Bointon
21f1f3f151
Merge remote-tracking branch 'remotes/origin/master' into 5.2-stable
2017-04-13 12:20:47 +02:00
rsdifu
42c7591bb5
Date header should be more dynamic ( #1023 )
...
When a message is sent, unless the MessageDate is explicitly set, the Date header should always be set to the current rfcDate() value.
This is necessary for long-running processes that create a single PHPMailer instance, so all emails sent during the lifetime of the process don't have the same Date header value of the first email sent from the process.
This is important because Gmail in particular, uses the Date header value to show how long ago an email was sent when viewing the email. (The list view in Gmail, however, uses the Received header value to show when an email was sent.)
These differing times will lead to confusion for users, often resulting in them trying to do several things like updating their timezone in Google's settings, or on their computers, which would result in no resolution.
2017-04-09 08:25:43 +02:00
Haci Murat Yaman
1f974d0ab3
updated misleading comment on sample for smtp/google via xoauth2 #890 ( #1019 )
...
* updated misleading comment on sample code for smtp.google.com via xoauth2
* undo change on gitignore
2017-04-03 19:25:48 +02:00
Marcus Bointon
6525e86940
Handle bare codes (an RFC contravention) in SMTP replies, fixes #1017
2017-03-30 15:08:20 +02:00
