1135 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcus Bointon	799ff351ca	Trap low-level SMTP errors, see #1012	2017-03-23 12:37:23 +01:00
Marcus Bointon	863e531de8	Merge remote-tracking branch 'remotes/origin/master' into 6.0 ... # Conflicts: # .travis.yml # VERSION # src/PHPMailer.php # src/POP3.php # src/SMTP.php	2017-03-16 15:35:18 +01:00
Marcus Bointon	7115df4a6f	5.5.23	2017-03-15 20:32:56 +01:00
Marcus Bointon	d306fbdc9f	Move install step to install section	2017-03-15 20:04:43 +01:00
Marcus Bointon	936eaa7770	Downgrade packages for BC with PHP 5.5 tests	2017-03-15 19:49:11 +01:00
Marcus Bointon	8f58d8d494	Travis tweaks, don't update packages on test	2017-03-15 19:06:51 +01:00
Marcus Bointon	bf03eda8f6	Package downgrades to run tests on PHP 5.3	2017-03-15 15:13:09 +01:00
Marcus Bointon	9e87d05c5a	Downgrade packages for BC with PHP 5.3 tests	2017-03-15 15:07:10 +01:00
Marcus Bointon	c385749c11	Downgrade packages for BC with PHP 5.3 tests	2017-03-15 14:55:19 +01:00
Marcus Bointon	d1c84f18a0	Downgrade packages for BC with PHP 5.3 tests	2017-03-15 14:35:08 +01:00
Marcus Bointon	2ceafa2e84	Downgrade packages for BC with PHP 5.3 tests	2017-03-15 14:05:43 +01:00
Marcus Bointon	042ea958cb	Downgrade Zend packages for BC with PHP 5.3 tests	2017-03-15 12:56:46 +01:00
Marcus Bointon	993b100afd	Ensure composer packages are installed	2017-03-15 12:34:39 +01:00
Marcus Bointon	ca9ced078c	Fix phpunit path	2017-03-15 12:22:28 +01:00
Marcus Bointon	adeb6bdd25	Fix phpunit path	2017-03-15 12:17:05 +01:00
Marcus Bointon	aabe7fc692	Restore deleted line	2017-03-15 11:57:56 +01:00
Marcus Bointon	c9a06f1558	Fix phpunit path	2017-03-15 11:51:40 +01:00
Marcus Bointon	b50ac0d2dc	Use phpunit from composer, not travis default	2017-03-14 18:49:37 +01:00
Marcus Bointon	f52d3759ba	Changelog	2017-03-13 12:19:56 +01:00
Marcus Bointon	290c5c1aa4	Merge remote-tracking branch 'remotes/origin/master' into 6.0	2017-03-13 12:15:26 +01:00
Ramon van Belzen	70da1b419d	composer: phpunit 4.8 (#940) ... switch from 4.7 to 4.8 (latest stable) of phpunit	2017-03-06 23:05:44 +01:00
Marcus Bointon	9f99f8aec1	Merge branch 'master' into 6.0 ... # Conflicts: # src/SMTP.php	2017-03-06 19:16:11 +01:00
Marcus Bointon	09728b0649	Formatting	2017-03-06 16:45:19 +01:00
Marcus Bointon	c100b092df	Trap TLS errors	2017-03-06 16:37:58 +01:00
Marcus Bointon	c3aba6d974	Test suite now works on HHVM on Travis-CI	2017-03-02 16:09:45 +01:00
Marcus Bointon	e302e17092	Test suite now works on HHVM on Travis-CI	2017-03-02 15:31:12 +01:00
Marcus Bointon	5b831f7ae7	Avoid HHVM problem with .ini location	2017-03-02 15:01:03 +01:00
Marcus Bointon	e599277376	Merge remote-tracking branch 'origin/master'	2017-03-01 18:49:29 +01:00
Marcus Bointon	4eaed21a6e	Avoid HHVM problem with file:// URL	2017-03-01 18:49:09 +01:00
Marcus Bointon	86af82ceb9	Merge remote-tracking branch 'remotes/origin/master' into 6.0 ... # Conflicts: # extras/htmlfilter.php	2017-03-01 17:54:21 +01:00
Marcus Bointon	9c3ba23563	Generate a warning when using a buggy PHP version, see #953	2017-02-28 11:46:22 +01:00
Marcus Bointon	24b4351a7b	Add ics MIME type mapping, see #175	2017-02-21 14:54:19 +01:00
Marcus Bointon	bb5ca4329b	Clean up	2017-02-14 19:24:45 +01:00
Marcus Bointon	1e267b66a6	Avoid possibility of line length being too short to trigger test if LE is 1 char	2017-02-14 13:46:50 +01:00
Marcus Bointon	ec5661e699	More test feedback	2017-02-14 12:14:19 +01:00
Marcus Bointon	16a060be1a	More test feedback	2017-02-14 01:32:41 +01:00
Marcus Bointon	8e8da27e3d	Fix tests	2017-02-14 00:16:25 +01:00
Marcus Bointon	02332a843f	Attempt solution to line break issue, see #953	2017-02-13 23:55:05 +01:00
Marcus Bointon	d5d811570b	Update deps	2017-02-13 23:54:22 +01:00
Chris Brown	8dc31573d2	Convert use of each() to foreach() for performance (#984) ... and also to avoid triggering deprecation alerts in PHP 7.2	2017-02-01 22:48:00 +01:00
Jakub Kalousek	e94e6477e7	Added missing translation (#975)	2017-01-26 17:44:48 +01:00
Marcus Bointon	7d42f12f1b	Improve upgrade docs, see #959	2017-01-12 19:51:55 +01:00
Marcus Bointon	016cb3395c	Fix INCLUDE_DIR	2017-01-09 12:19:12 +01:00
Marcus Bointon	2963f2b294	Merge branch 'master' into 6.0 ... # Conflicts: # examples/scripts/XRegExp.js # extras/htmlfilter.php	2017-01-09 11:18:14 +01:00
Marcus Bointon	f97b9cd3c2	Update notes	2017-01-09 11:15:21 +01:00
Marcus Bointon	b18cb98131	Merge remote-tracking branch 'origin/master'	2017-01-09 10:33:47 +01:00
Marcus Bointon	84c24bf257	Add CVE-2017-5223 references	2017-01-09 10:32:40 +01:00
Marcus Bointon	96c5d32386	Extend line break tests	2017-01-09 10:19:14 +01:00
Marcus Bointon	8914ec7a4b	Merge branch 'master' into 6.0 ... # Conflicts: # VERSION # examples/contentsutf8.html # src/PHPMailer.php # src/POP3.php # src/SMTP.php # test/bootstrap.php	2017-01-06 23:34:57 +01:00
Marcus Bointon	e9705c17fa	Remove LE property - if you need to change it, override the LE constant instead	2017-01-06 22:50:12 +01:00