0
0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 10:02:14 +02:00
Commit Graph

9 Commits

Author SHA1 Message Date
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
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
a39c742bd7
Example cleanup 2017-01-05 13:06:20 +01:00
Marcus Bointon
2acd2eff9c Update examples, add contact form example 2016-06-29 18:26:55 +02:00
Marcus
f0ed47850c Sort out namespaces and imports in examples 2016-04-22 19:13:15 +02:00
Marcus
27501ac7b9 Merge branch 'master' into 5.4
Bump version to 5.5
Clean up code generator
# Conflicts:
#	README.md
#	examples/send_file_upload.phps
#	src/SMTP.php
#	test/phpmailerTest.php
2016-04-07 10:51:05 +02:00
Marcus
f0a6839a05 Improve send file examples 2016-03-29 10:05:36 +02:00
Synchro
9b3e13dc14 First draft of 5.4 2015-11-09 19:09:13 +01:00
Synchro
cee5e9b442 Add example of sending a file upload 2014-12-24 10:40:13 +01:00