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

991 Commits

Author SHA1 Message Date
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
Avtandil Kikabidze
b04ab34d77 Added 'extension_missing' translation for ka locale (#693)
* Added 'extension_missing' translation for ka locale

* Fixed string
2016-04-25 11:01:04 +02:00
Marcus
f0ed47850c Sort out namespaces and imports in examples 2016-04-22 19:13:15 +02:00
Marcus
baf343dab3 Fix misnamed property, fixes #688 2016-04-21 13:21:19 +02:00
Marcus
338f992055 Provide links for League packages 2016-04-21 12:51:31 +02:00
Marcus
f4ab7db9fa Remove unneeded state property, see #687
Provide links for League packages
2016-04-21 12:51:15 +02:00
Marcus
6bf687dbc0 Bump version to 6.0 2016-04-21 12:21:25 +02:00
Marcus
9254275d0b phpdoc cleanup 2016-04-21 12:19:52 +02:00
Marcus
ad74f67968 Update generatedocs script for new file locations 2016-04-21 12:19:20 +02:00
Marcus
5dbf14e7f0 Debugformat info 2016-04-21 11:01:55 +02:00
Marcus
28d85344ee Add comment about legacy versions 2016-04-20 00:07:17 +02:00
Marcus
952e7630c1 Don't use is_readable - it breaks on windows with shared volumes - use file_exists instead, see #500 2016-04-19 23:22:20 +02:00
Marcus
3abcab1936 Clean up TODOs
Switch SingleToArray to protected
Update Readme
Update composer deps
2016-04-19 18:26:33 +02:00
Marcus
57c1b25d00 Use and/or in preference to &&/|| consistently - the improvement in readability far outweights the risks of incorrect precedence
Flip some tests for defence
2016-04-19 17:36:16 +02:00
Marcus
a8b44e9a8e Merge remote-tracking branch 'remotes/upstream/master' into xoauth
# Conflicts:
#	src/PHPMailer.php
2016-04-19 17:30:13 +02:00
Marcus
9741c04ed8 Improve gmail xoauth example 2016-04-19 17:12:33 +02:00
Marcus
78467895e5 Rely on default debug output setting 2016-04-19 17:08:56 +02:00
Marcus
a81898ca95 Set default debug output format automatically 2016-04-19 17:06:53 +02:00