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

1589 Commits

Author SHA1 Message Date
Jim Jagielski
141e1e9c7d Merge branch 'master' of https://github.com/jimjag/PHPMailer 2018-06-20 11:15:40 -04:00
Jim Jagielski
34cb106597 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-06-20 11:15:39 -04:00
Jim Jagielski
52be836f78 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-06-16 10:23:16 -04:00
Marcus Bointon
7f7baf5436
Update ISSUE_TEMPLATE.md 2018-06-11 16:32:06 +02:00
Jim Jagielski
743cba5d07 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-05-29 08:02:57 -04:00
Adriane Justine Tan
ef62353d07 New language ang updated README.md (#1464)
* Create new language file: Tagalog (Philippines)

* Rename phpmailer.lang-tg.php to phpmailer.lang-tl.php

* Update README.md

Change 47 to 48 languages
2018-05-28 18:11:23 +02:00
Jim Jagielski
7ae22574f8 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-05-18 08:33:56 -04:00
Marcus Bointon
d145514f10
Add Campaign Monitor transaction ID pattern
Prefer \d to 0-9 in regexes
2018-05-17 09:37:33 +02:00
Jim Jagielski
2c86083b7b Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-04-27 09:15:59 -04:00
Maximilian Beckers
bbdfa96b95 Add mail header constants, fixes #1428 (#1429)
* add mail header constants, fixes #1428
2018-04-27 10:25:28 +02:00
Jim Jagielski
262705fd90 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-04-04 08:18:24 -04:00
Victualia // Loquere
ce9b49b825 Added extension_missing (#1403) 2018-04-04 03:35:59 -04:00
Jim Jagielski
81572b12d0 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-03-27 11:48:51 -04:00
Marcus Bointon
cb3ea134d4
6.0.5 2018-03-27 15:49:45 +02:00
Jim Jagielski
4e32baff78 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-03-27 08:57:15 -04:00
Marcus Bointon
3050a4ae75
6.0.4 2018-03-27 11:55:57 +02:00
Marcus Bointon
54ab7a754d
Changelog 2018-03-27 11:54:12 +02:00
Marcus Bointon
ddb8eebf1e
Clarify auth method debug output 2018-03-27 11:51:56 +02:00
notian
58fa10db27 Updated default language path (#1390)
* Updated default language path

* Calculated path instead of building string version

* Removed whitespace in function call
2018-03-26 13:03:10 -04:00
Jim Jagielski
eded594d18 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-03-21 12:39:03 -04:00
Marcus Bointon
4fd6207768
Fix for #1361 2018-03-21 14:39:59 +01:00
Jim Jagielski
6da6d40a80 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-03-19 08:13:00 -04:00
Niklas
d7a4babcfd Readme composer (#1378)
* Link to Composer's site and capitalise the Composer name

* Removes odd line break
2018-03-16 07:26:12 -04:00
Jim Jagielski
9f1fac5a9c Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-01-16 07:45:46 -05:00
Marcus Bointon
63e2c71ea1
Changelog 2018-01-15 15:04:43 +01:00
Yash Karanke
8ec3dc9876 Hindi translations for php mailer (#1331)
* Hindi translations for php mailer

I directly uploaded to GitHub, because my fork is a legacy version now and I am having merge conflicts now

* updated hindi language

updated last missing translation and removed comment
2018-01-15 15:01:54 +01:00
Marcus Bointon
2834867b0f
Minor output cleanup, implements same as #1290 2018-01-15 14:26:53 +01:00
Jim Jagielski
dbd67bfd7c Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-01-15 07:54:22 -05:00
dknacht
2a1dc5ce2e Update README.md (#1292)
* Update README.md

Added links to the recommended optional libraries.
Changed order of "Upgrading from 5.2" and "Legacy versions", i think this way is more logical to read.
Updated language quantity in the "Localization" section.

* Update README.md

Corrected review

* Update README.md

* Update phpmailer.lang-es.php

Added missing point to make grammatically correct and consistent with the other translations.
2018-01-15 11:42:49 +01:00
Jim Jagielski
784d5e23f8 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-01-11 09:21:20 -05:00
Marcus Bointon
da9fede584
Changelog 2018-01-11 00:29:45 +01:00
Marcus Bointon
978d97e370
Add some modern MIME types 2018-01-11 00:24:40 +01:00
Jim Jagielski
dea95a4e60 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2018-01-05 10:22:29 -05:00
Marcus Bointon
44d49bab5a
6.0.3 2018-01-05 14:19:58 +01:00
Gaith
f06d08f6a6 fix code redundancy. (#1317) 2018-01-05 10:37:19 +01:00
Jim Jagielski
7168b0a361 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2017-12-22 11:03:38 -05:00
Michael Orlitzky
c8613a447b composer.json: add dependency on the PHP "filter" extension. (#1301)
Many of the PHP extensions used by PHPMailer are optional, in one of
two senses. Either there is a fallback if the extension is not
present, or the use of the extension is avoidable entirely. For
example, there is a fallback parser if "imap_rfc822_parse_adrlist" is
not available, and OpenSSL is not needed unless encryption is used;
therefore neither are hard dependencies.

The filter extension, on the other hand, is unavoidable. It is used
unconditionally, with no fallbacks, in (for example) the "isValidHost"
function. This commit adds "ext-filter" to composer.json, to document
the dependency and to help out composer users.

Closes: https://github.com/PHPMailer/PHPMailer/issues/1298
2017-12-22 11:40:15 +01:00
Jim Jagielski
4f62497920 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2017-12-12 13:50:56 -05:00
Marcus Bointon
9d9021ebc3
Changelog 2017-12-12 13:58:39 +01:00
Marcus Bointon
ce68ba5f44
Correct canonicalization of header & body for DKIM, fixes #1285 2017-12-12 13:56:21 +01:00
Jim Jagielski
508e3ffa15 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2017-12-01 09:48:39 -05:00
François B
b0c7223f65 Keep lines sorted: easier to read and maintain (#1262) 2017-12-01 11:02:33 +01:00
Marcus Bointon
7a4459cff6
6.0.2 2017-11-30 18:20:24 +01:00
Jim Jagielski
68f7d5570d Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2017-11-30 11:54:28 -05:00
dknacht
2b82166547 Update phpmailer.lang-eo.php (#1259)
Adding the missing translation.
Due to the flexibility of Esperanto, there is actually many ways of saying "Extension missing". I selected this one, even tho it's not the literal translation (what would rather be more like "Manki etendo" as the "missing" is used as an adjective, not as a verb), because I think this way is much more understandable.
2017-11-30 09:44:03 +01:00
Jim Jagielski
42f6b65c55 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2017-11-17 12:30:44 -05:00
Marcus Bointon
dd2b4bc5fb
Code style 2017-11-17 12:24:17 +01:00
Marcus Bointon
8a0914cfc2
Changelog 2017-11-17 12:00:51 +01:00
Marcus Bointon
57f5d8e6cc
Hide SMTP credentials in all but lowest level debug output, fixes #1223 2017-11-17 12:00:42 +01:00
Marcus Bointon
f88dc863f6
Add donations pointers, fixes #1246 2017-11-17 11:19:04 +01:00