991 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcus Bointon	33f658cdb3	Merge branch 'master' into 6.0	2016-10-26 22:10:54 +02:00
Marcus Bointon	af59766173	Merge branch 'e7o-de-master'	2016-10-26 21:43:10 +02:00
Marcus Bointon	d277de0791	Merged translations	2016-10-26 21:42:48 +02:00
Lucas Guima	25ffcc0d11	- Improving Brazilian Portuguese translation. (#865)	2016-10-26 21:34:06 +02:00
Daniel	4b63c61928	Fixed german translation (#866)	2016-10-26 21:33:17 +02:00
Marcus Bointon	a910ebabac	Merge branch 'master' into 6.0 ... # Conflicts: # src/PHPMailer.php	2016-10-24 12:46:07 +02:00
Johannes Tveitan	f622e80372	Added support for php 7.1 in .travis.yml (#863)	2016-10-20 19:47:18 +02:00
Chema	6eaec68260	Closes #861 (#862) ... * Closes #861 * Update class.phpmailer.php	2016-10-20 17:36:26 +02:00
Marcus Bointon	dbee6c266f	Don't include examples in deployments or zip downloads	2016-10-17 19:01:34 +02:00
Marcus Bointon	83f306634d	Merge branch 'master' into 6.0	2016-10-17 19:00:36 +02:00
Marcus Bointon	da1b2fc389	Document dropping examples folder in zip	2016-10-17 19:00:18 +02:00
Marcus Bointon	cf8cd058d4	Don't drop examples from zip downloads - note that this is left in place in 6.0	2016-10-17 18:56:25 +02:00
Marcus Bointon	46f3177cf1	Note about example inclusion	2016-10-17 18:55:23 +02:00
Marcus Bointon	9875dc1faa	Merge branch 'master' into 6.0 ... # Conflicts: # class.phpmaileroauth.php # examples/scripts/shLegacy.js # extras/htmlfilter.php # extras/ntlm_sasl_client.php # src/SMTP.php	2016-10-17 18:37:28 +02:00
Marcus Bointon	a4de1ca5ef	Pass level of current debug message rather than output setting into display function	2016-10-17 18:21:50 +02:00
corentinheadoo	66cf4fbaff	Cleaning js (#858) ... * Clean some js file * Cleaning code	2016-10-17 18:17:18 +02:00
corentinheadoo	a55b67d965	Fix: function call is not case-sensitive (#857)	2016-10-17 16:38:25 +02:00
Marcus Bointon	90532789b6	Merge branch 'master' into 6.0 ... # Conflicts: # src/PHPMailer.php	2016-10-05 18:36:21 +02:00
Marcus Bointon	0de97aba00	Merge remote-tracking branch 'origin/master'	2016-10-04 18:23:19 +02:00
Marcus Bointon	239d0ef38c	Explain message ID format	2016-10-04 18:23:01 +02:00
Vincent Klaiber	5ba58a7bf0	Add .gitattributes (#843) ... This will allow smaller download size in production. https://www.reddit.com/r/PHP/comments/2jzp6k/i_dont_need_your_tests_in_my_production	2016-10-03 10:31:04 +02:00
Marcus Bointon	24e018020b	Update deps	2016-09-30 17:50:13 +02:00
Marcus Bointon	5e7ea2a6d1	Add PSR-3 compatible debug logging	2016-09-30 17:46:39 +02:00
Marcus Bointon	c7650fbdff	Merge branch 'master' into 6.0	2016-09-21 17:29:37 +02:00
Marcus Bointon	26357256d7	Merge remote-tracking branch 'origin/master'	2016-09-21 17:26:42 +02:00
André Pettersson	afbe9433d7	Added new tranlations to Swedish lang file (#832) ... * Added new tranlations to Swedish lang file * Added last two translations * Removed comments	2016-09-21 17:21:49 +02:00
Marcus Bointon	5221cfd1d5	Merge remote-tracking branch 'origin/master'	2016-09-20 22:19:03 +02:00
Marcus Bointon	75c84b9a77	Update Note_for_SMTP_debugging.md	2016-09-19 08:03:38 +02:00
Marcus Bointon	c1d52fe3de	Rename Note_for_SMTP_debugging.txt to Note_for_SMTP_debugging.md	2016-09-19 08:02:46 +02:00
Marcus Bointon	06ba4276fa	Update Note_for_SMTP_debugging.txt	2016-09-19 08:02:21 +02:00
Marcus Bointon	ebfe89a82d	Merge pull request #830 from glensc/lang-code-fixes ... more languages rename	2016-09-16 15:15:58 +02:00
Marcus Bointon	27b6560ef9	Merge pull request #829 from glensc/patch-1 ... Rename SECURITY to SECURITY.md	2016-09-16 15:13:09 +02:00
Elan Ruusamäe	595b45e198	more languages rename ... cz => cs no => nb br => pt_BR se => sv	2016-09-16 15:41:53 +03:00
Elan Ruusamäe	c01b76611e	Rename SECURITY to SECURITY.md ... this way it is rendered properly (github, vim, etc that use file extension to detect file content)	2016-09-16 15:33:58 +03:00
Marcus Bointon	0d0a62681a	Merge branch 'master' into 6.0 ... # Conflicts: # src/PHPMailer.php	2016-09-10 23:02:41 +02:00
Marcus Bointon	7395b076d0	Merge remote-tracking branch 'origin/master'	2016-09-10 22:48:35 +02:00
Marcus Bointon	eeb4be408a	Comments	2016-09-10 22:47:12 +02:00
Marcus Bointon	32be443540	Merge pull request #822 from aflorea/lang-ro ... updated all romanian translations	2016-09-06 23:50:31 +02:00
Alex	7e9b6b2058	updated all romanian translations	2016-09-06 22:21:17 +01:00
Marcus Bointon	6931f31028	Simplify validation options, default to filter_var, see #804	2016-09-03 01:02:38 +02:00
Marcus Bointon	1e53c07286	Minor fixes, code style	2016-08-31 10:26:06 +02:00
Marcus Bointon	abd34cb809	WS	2016-08-31 09:50:12 +02:00
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	0e300ecdc9	Merge remote-tracking branch 'origin/master'	2016-08-31 09:34:56 +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