mirror/PHPMailer
0
0
Fork 0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 10:02:14 +02:00
Code
1,108 Commits 6 Branches 83 Tags 24 MiB
1003010d93
Commit Graph

1108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Bointon
20314a574c Fix merge error 2016-06-06 14:35:15 +02:00
Marcus Bointon
f5cea12dbd Improve DKIM examples 2016-06-06 14:33:29 +02:00
Marcus Bointon
78ef24e9f6 Merge branch 'master' into 6.0 
# Conflicts:
#	.gitignore
#	VERSION
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
 2016-06-06 14:23:33 +02:00
Marcus Bointon
1d85f9ef3e Bump version to 5.2.16 2016-06-06 11:09:37 +02:00
Marcus Bointon
1361047a5d Add DKIM example 2016-06-06 10:54:56 +02:00
Marcus Bointon
7d341c105b Don't set mail() additional_parameters to space when not being used, fixes #582 2016-06-06 10:36:56 +02:00
Marcus Bointon
60a645358f Platform/IDE-specific entries should not be in project .gitignore 2016-06-06 10:35:40 +02:00
Marcus Bointon
e9fa534975 Fix version number, fixes #742 2016-06-02 16:17:11 +02:00
Marcus Bointon
e4bc252320 Add issue template 2016-06-02 11:15:05 +02:00
Marcus Bointon
b79d34e97d Add notes on sendmail -f option 2016-05-31 18:43:03 +02:00
Marcus Bointon
ec4c2ee867 Standardise on CRLF line breaks 
Better auth mechanism selection
 2016-05-23 10:30:31 +02:00
Marcus Bointon
e61b522f2d Merge branch 'master' into 6.0 
# Conflicts:
#	src/PHPMailer.php
#	src/SMTP.php
 2016-05-22 21:11:00 +02:00
Marcus Bointon
d3c73b1739 Reset encoding on simple bodies, hopefully will fix #728! 2016-05-22 10:26:48 +02:00
Marcus Bointon
c27c1597bc Fix build 
Actually changes the test to test a different thing, still need to deal with what it was originally testing.
 2016-05-22 01:25:10 +02:00
Marcus Bointon
59663fd25a Don't set overall encoding just because we're changing a sub-part - quoted-printable and base64 are not valid encodings for a multipart container anyway. 2016-05-21 22:06:07 +02:00
Marcus Bointon
352dd7622f Merge branch 'master' into 6.0 
# Conflicts:
#	src/PHPMailer.php
 2016-05-13 09:33:12 +02:00
Marcus Bointon
7b9fd07309 Use SMTPOptions in smtpConnect(), see #718 2016-05-13 09:30:56 +02:00
Marcus Bointon
5b34f25e31 Docs tweaks 2016-05-11 00:00:21 +02:00
Marcus Bointon
f2d4156b65 Merge branch 'master' into 6.0 
# Conflicts:
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
 2016-05-10 23:09:01 +02:00
Marcus Bointon
268fc16c69 Fix date! 2016-05-10 20:49:40 +02:00
Marcus Bointon
d0186171b2 Bump version to 5.2.15 2016-05-10 20:39:36 +02:00
Marcus Bointon
e4af742397 Removed corrupt language file 2016-05-10 20:36:50 +02:00
Marcus Bointon
1a7f380457 Fix test case 2016-05-09 11:36:15 +02:00
Marcus Bointon
86d2b069d8 Merge branch 'master' into 6.0 
# Conflicts:
#	changelog.md
#	test/phpmailerTest.php
 2016-05-09 11:34:42 +02:00
Marcus Bointon
444a355bc3 Changelog 2016-05-09 11:19:21 +02:00
Marcus Bointon
77c0bc8d28 Add ability to inject custom validator and set custom default validator, fixes #573 2016-05-09 11:18:50 +02:00
Imam
d30b95bc4d Update phpmailer.lang-ru.php (#709) 
Incorrect translation was changed
 2016-05-08 18:32:03 +02:00
miedziu
c5e5be0529 Update phpmailer.lang-pl.php (#707) 
Added missing translation
 2016-05-07 08:30:24 +02:00
Marcus Bointon
384609cc83 Coding standards 2016-05-03 10:06:48 +02:00
Marcus Bointon
c2816d47cb Add DNS entry generator, fixes #644 2016-05-03 10:06:15 +02:00
Marcus Bointon
f77a91ede7 Coding standards 2016-05-03 08:58:13 +02:00
Marcus Bointon
db25db78e4 Don't talk about old versions 2016-05-03 08:55:10 +02:00
Marcus Bointon
51bbe8f7a2 Use late static calls on things that should be overridable 2016-05-03 08:49:57 +02:00
Marcus Bointon
f7033d68b6 Remove obsolete QP-encode function 
Improve & fix data URL handling
Remove old class loader from phpunit bootstrap
Improve test coverage
Remove some unnecessary trailing line breaks from attachment MIME structure
 2016-05-02 18:27:44 +02:00
Marcus Bointon
a46689bed8 Make DKIM canonicalization stricter, add unit tests 2016-05-02 15:18:22 +02:00
Marcus Bointon
2f63fcd3da Defensive comparisons 2016-05-02 12:01:25 +02:00
Marcus Bointon
10d1a2ea3f Don't ignore docs folder, just its contents 2016-05-01 18:01:10 +02:00
Marcus Bointon
7a67a33181 Cleanup 2016-05-01 17:45:39 +02:00
Marcus Bointon
9b784d23b0 Simplify phpdocs generation 2016-05-01 17:30:19 +02:00
Marcus Bointon
da739aa763 Fix callback example 2016-05-01 17:06:51 +02:00
Marcus Bointon
d3eabffd0c Fix callback example 2016-05-01 17:06:20 +02:00
Marcus Bointon
b1ec3ebc50 Docs 2016-05-01 17:02:40 +02:00
Marcus Bointon
efbcfa97c0 Callback cleanup, examples 2016-05-01 17:00:48 +02:00
Marcus Bointon
558bcdc269 DKIM cleanup, examples 2016-05-01 13:09:24 +02:00
Marcus Bointon
316321bbce Merge branch 'master' into 6.0 2016-04-28 13:06:00 +02:00
Marcus Bointon
703410e39f Allow TLS 1.2, fixes #696 2016-04-28 12:54:42 +02:00
Marcus Bointon
ea42b599cd Clean up documentation and examples 2016-04-26 22:33:02 +02:00
Marcus Bointon
25ed54e97e Clean up documentation and examples 2016-04-26 22:22:52 +02:00
Marcus Bointon
84d6af5b95 Clean up documentation and examples 2016-04-26 22:16:17 +02:00
Marcus
665e964f66 Merge branch 'master' into 6.0 2016-04-25 11:02:17 +02:00