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

946 Commits

Author SHA1 Message Date
Marcus Bointon
b67f5491f4 Ignore all .pem files 2016-08-31 09:48:30 +02:00
Marcus Bointon
71f42aac45 Merge remote-tracking branch 'origin/6.0' into 6.0 2016-08-31 09:40:17 +02:00
Marcus Bointon
11522f877f Update docblock (#815) 2016-08-31 09:38:49 +02:00
Marcus Bointon
109826c898 Merge remote-tracking branch 'origin/6.0' into 6.0 2016-08-31 09:34:35 +02:00
Adeniyi Ibraheem
5faa708103 Update docblock 2016-08-30 00:21:08 +01:00
Marcus Bointon
a2300734d7 Merge branch 'master' into 6.0 2016-08-29 15:23:27 +02:00
Marcus Bointon
7c1154b63c errorHandler is not static 2016-08-29 15:22:56 +02:00
Marcus Bointon
66fd2b89ea Don't need to check for SHA256 algo in PHP 5.5 2016-08-29 15:16:46 +02:00
Marcus Bointon
0bc8fd383e Merge branch 'master' into 6.0
Don't need to check for SHA256 algo in PHP 5.5
2016-08-29 14:57:45 +02:00
Marcus Bointon
eadcf14b3f PHPCBF phpdoc cleanup 2016-08-29 11:05:47 +02:00
Marcus Bointon
51e8e91c20 PHPCBF phpdoc cleanup 2016-08-29 11:04:27 +02:00
Marcus Bointon
63e0a2c1db PHPCBF phpdoc cleanup 2016-08-29 10:29:13 +02:00
Marcus Bointon
593a0c586a Remove unneeded PHPDoc tags: @static, @access, @return void, @private
@link -> @see (PSR-5)
Always use `boolean`
2016-08-29 10:21:39 +02:00
Jason Flatt
d941270950 Improve error handling and reporting for connection failures (including updates from code review). (#791)
Just right, thanks
2016-08-10 21:00:56 +02:00
Marcus Bointon
4f7967ac91 Implement fallback for DKIM signing on old versions of PHP and OpenSSL, see #785 2016-07-28 11:56:21 +02:00
Marcus Bointon
dec8422c6c Merge branch 'master' into 6.0 2016-07-26 08:52:26 +02:00
Marcus Bointon
df30d764f2 Merge remote-tracking branch 'origin/master' 2016-07-26 08:52:01 +02:00
Marcus Bointon
6a6165f576 Fix language code check 2016-07-26 08:51:48 +02:00
Marcus Bointon
ac23dd971a Update deps 2016-07-22 16:38:46 +02:00
Marcus Bointon
6c81a27688 Merge remote-tracking branch 'remotes/origin/master' into 6.0 2016-07-22 15:15:54 +02:00
Rolf Pedro Ernst
b7cb3c0180 Add extension translation for: german, spanish (#779) 2016-07-22 15:14:56 +02:00
Marcus Bointon
909c6283e3 Merge branch 'master' into 6.0 2016-07-22 12:49:33 +02:00
Marcus Bointon
90f1924694 Merge remote-tracking branch 'origin/master' 2016-07-22 12:44:16 +02:00
Marcus Bointon
97b2ea5ab5 Update security notices 2016-07-22 12:43:58 +02:00
Marcus Bointon
134a31892c Validate language code 2016-07-22 12:35:06 +02:00
Marcus Bointon
8beacc646a Add security notices 2016-07-22 12:05:21 +02:00
Arne Jørgensen
fcf9cb7ae5 Fix ISO-639-1 code for Danish (#764)
The ISO-639-1 code for Danish is `da` (`dk` is the ISO 3166-1 alpha-2 for Denmark).
2016-07-08 11:09:34 +02:00
Marcus Bointon
d188cdc2e3 Merge branch 'master' into 6.0 2016-07-06 09:31:40 +02:00
Bruno Ribeiro
39a2e3a620 fix warning (#761)
fix message <b>Warning</b>:  array_key_exists() expects parameter 2 to be array when is bad auth
2016-07-06 09:29:37 +02:00
Marcus Bointon
3a503d34aa Make idnSupported() static 2016-06-30 16:18:56 +02:00
Marcus Bointon
415873c6c8 Use less patronising default message in plain text body 2016-06-30 16:17:38 +02:00
Marcus Bointon
51be6c7ee2 Remove excess line breaks in message structure 2016-06-30 16:16:14 +02:00
Marcus Bointon
49b8d7e271 Docs cleanup 2016-06-30 16:12:51 +02:00
Marcus Bointon
b8ee3d52e3 Import class names, avoid FQCNs 2016-06-30 16:11:25 +02:00
Marcus Bointon
2acd2eff9c Update examples, add contact form example 2016-06-29 18:26:55 +02:00
Marcus Bointon
11b2dd5198 Merge branch 'master' into 6.0 2016-06-29 16:01:06 +02:00
Marcus Bointon
7fdb51369b Update deps 2016-06-29 11:49:27 +02:00
Marcus Bointon
d7c9ad524c Update deps 2016-06-29 10:14:29 +02:00
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