Commit Graph

200 Commits

Author SHA1 Message Date
Marcus Bointon 5af110e3e1
Changelog 2017-10-19 09:20:19 +02:00
Marcus Bointon 8b935b2d24
Changelog 2017-10-14 08:25:44 +02:00
Marcus Bointon c944cc830e
Match SendGrid transaction IDs, trim all IDs, fixes #1193 2017-10-09 15:39:17 +02:00
Marcus Bointon 0605a0e96e
Changelog 2017-10-05 15:44:36 +02:00
Marcus Bointon 617df94ffb
6.0.1 2017-09-14 14:50:11 +02:00
Marcus Bointon f4a8efadfd
Merge remote-tracking branch 'remotes/origin/5.2-stable' 2017-08-28 18:07:42 +02:00
Remi Collet 31f18d8633 Fix date (#1138) 2017-08-28 17:45:27 +02:00
Marcus Bointon b91bf9267e
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	VERSION
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
2017-08-28 13:36:44 +02:00
Marcus Bointon 2baf20b016
v5.2.25 2017-08-28 13:12:07 +02:00
Marcus Bointon 496e0a7178
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	README.md
#	examples/gmail.phps
#	src/SMTP.php
2017-08-28 12:20:50 +02:00
Marcus Bointon 7a037c1eaa
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	README.md
#	examples/gmail.phps
#	src/SMTP.php
2017-08-28 12:15:27 +02:00
Marcus Bointon f4d37028af
Merge branch '6.0' into 6.0-ical
# Conflicts:
#	changelog.md
2017-08-24 13:51:06 +02:00
Marcus Bointon b296b18656
Changelog 2017-08-11 14:53:57 +02:00
Marcus Bointon c205d94136
Changelog 2017-08-11 14:52:39 +02:00
Marcus Bointon 33a6286b7b
Changelog 2017-08-11 14:48:43 +02:00
Marcus Bointon 1e3f4e4062
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	VERSION
#	changelog.md
#	examples/code_generator.phps
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
#	test/phpmailerTest.php
2017-07-26 23:10:42 +02:00
Marcus Bointon 22d04c6a58
5.2.24 2017-07-26 23:00:20 +02:00
Marcus Bointon 424398579d
Merge changes from master 2017-06-22 18:36:56 +02:00
Marcus Bointon cd2f977899
Allow injecting an SMTP instance 2017-05-29 14:07:11 +02:00
Marcus Bointon 4896adc0a1
Changelog 2017-05-29 08:55:06 +02:00
Marcus Bointon b25f93eb2d
More reliable folding of message headers 2017-05-22 18:53:00 +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 e194b97409
Changelog 2017-05-15 10:01:49 +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 d798b197ed
Incorporate file-reading changes from #500
Update changelog
2017-05-11 01:56:57 +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 6525e86940
Handle bare codes (an RFC contravention) in SMTP replies, fixes #1017 2017-03-30 15:08:20 +02:00
Marcus Bointon 799ff351ca
Trap low-level SMTP errors, see #1012 2017-03-23 12:37:23 +01:00
Marcus Bointon 863e531de8
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	.travis.yml
#	VERSION
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
2017-03-16 15:35:18 +01:00
Marcus Bointon 7115df4a6f
5.5.23 2017-03-15 20:32:56 +01:00
Marcus Bointon f52d3759ba
Changelog 2017-03-13 12:19:56 +01:00
Marcus Bointon 9c3ba23563
Generate a warning when using a buggy PHP version, see #953 2017-02-28 11:46:22 +01:00
Marcus Bointon 02332a843f
Attempt solution to line break issue, see #953 2017-02-13 23:55:05 +01:00
Marcus Bointon 2963f2b294
Merge branch 'master' into 6.0
# Conflicts:
#	examples/scripts/XRegExp.js
#	extras/htmlfilter.php
2017-01-09 11:18:14 +01:00
Marcus Bointon f97b9cd3c2
Update notes 2017-01-09 11:15:21 +01:00
Marcus Bointon 84c24bf257
Add CVE-2017-5223 references 2017-01-09 10:32:40 +01:00
Marcus Bointon 8914ec7a4b
Merge branch 'master' into 6.0
# Conflicts:
#	VERSION
#	examples/contentsutf8.html
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
#	test/bootstrap.php
2017-01-06 23:34:57 +01:00
Marcus Bointon 5d88839afc
5.2.22 2017-01-06 22:35:54 +01:00
Marcus Bointon 38fdcb6ef5
Note about VERP addressing when using mail() 2017-01-05 10:34:00 +01:00
Marcus Bointon 789e0846ab
Merge branch 'master' into 6.0
# Conflicts:
#	VERSION
#	extras/htmlfilter.php
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
#	test/phpmailerTest.php
2016-12-29 14:01:45 +01:00
Marcus Bointon 1d51856b76
v5.2.21
Fix missed version number update
2016-12-28 16:35:48 +01:00
Marcus Bointon 8d68507d7b
Minor cleanup, fix 2016-12-28 13:17:21 +01:00
Marcus Bointon 9e4b8fb3de
Minor cleanup, fixes #918, broken version file
Remove duplicate check for Sender address
2016-12-26 11:09:10 +01:00
Marcus Bointon ed4e7ce8ad
Remove broken check 2016-12-24 16:43:41 +01:00
Marcus Bointon 0f1cb846cc
5.2.18 2016-12-24 15:21:45 +01:00
Marcus Bointon e0fefda64b
5.2.18 2016-12-24 01:06:31 +01:00
Marcus Bointon d0c1d1abbd
5.2.18 2016-12-24 00:49:54 +01:00