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

1370 Commits

Author SHA1 Message Date
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
Elan Ruusamäe
10999bcb22 update git export ignore with new files (#1240) 2017-11-17 01:14:02 +01:00
Elan Ruusamäe
0d5cb18b8d general code style fixes (#1241)
* use instanceof instead of is_a

is_a is deprecated since 5.0.0 in favour of instanceof operator
http://php.net/is_a

this allows using class aliases instead of strings

* do not assign null to class properties

that is default behaviour of php engine

* use stripos instead of stristr

* use faster $array[]= $value instead of array_push

* add SuspiciousAssignmentsInspection noinspection to shut up ide

* use call_user_func with defined args

* avoid overwriting $error parameter

* apply more yoda-style
2017-11-17 01:10:25 +01:00
Jim Jagielski
51c2ec5e49 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2017-11-15 16:42:49 -05:00
Marcus Bointon
2f874e6b43
Update license file, fixes #1243 2017-11-15 19:39:22 +01:00
Marcus Bointon
788e4cc80a
Update upgrading doc, see #1242 2017-11-15 11:04:18 +01:00
Marcus Bointon
97c1a0e0ec
Clarify params 2017-11-13 09:41:28 +01:00
Jim Jagielski
241497f141 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2017-11-06 07:01:31 -05:00
Marcus Bointon
95a68b6ca7
Remove duplicate require in SMTP example 2017-11-06 12:53:20 +01:00
Jim Jagielski
e03ba97962 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2017-10-30 18:54:06 -04:00
François B
a73d52dbc8 Improve error message for invalid address (#1213)
Adds the address kind (From, Sender, ConfirmReadingTo) instead of word punyEncode which is internal to PHPMailer and not so helpful.
Similarly, removes word addAnAddress (internal) but keeps only address kind (to, cc, bcc, Reply-To).
2017-10-27 22:06:24 +02:00
Jim Jagielski
03734f9ae3 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2017-10-19 09:06:52 -04:00
Marcus Bointon
5af110e3e1
Changelog 2017-10-19 09:20:19 +02:00
Januri D. P
8858381db4 Improved Indonesian localization (#1205)
* Improved Indonesian localization

* uncomment extension_missing and translate it
2017-10-19 09:16:19 +02:00
Jim Jagielski
565e65a5d6 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2017-10-16 08:11:09 -04:00
Marcus Bointon
8b935b2d24
Changelog 2017-10-14 08:25:44 +02:00
François B
10341cc310 Make idnSupported() static (#1203)
Upgrade guide and changelog say that idnSupported() is now static, but it actually isn't.

Probably this PR should wait v6.1 or other version where breaking changes are OK.
2017-10-14 08:22:54 +02:00
Jim Jagielski
19fd4af8a0 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2017-10-10 09:58:08 -04:00
Marcus Bointon
916d68cf17
Tweak PR template to be less potentially destructive 2017-10-10 09:10:40 +02:00
Marcus Bointon
c13513418d
Bah, undo that as it's not supported in the old version of fixer we have to run 2017-10-09 23:12:37 +02:00