Synchro
a0407c6630
Travis & PHPUnit tweaks
2015-11-10 19:09:08 +01:00
Synchro
75dd5453b2
Travis & PHPUnit tweaks
2015-11-10 15:31:23 +01:00
Synchro
12805da50a
Travis & PHPUnit tweaks
2015-11-10 15:17:46 +01:00
Synchro
abc34907f1
Merge remote-tracking branch 'remotes/upstream/5.4' into xoauth
2015-11-10 14:45:22 +01:00
Synchro
a139b96368
Tell Travis to install composer packages
2015-11-10 14:44:38 +01:00
Synchro
fbe62ff9b5
Tidy up copyright notices
2015-11-10 14:44:16 +01:00
Synchro
feea6358c6
Merge branch '5.4' into xoauth
...
# Conflicts:
# get_oauth_token.php
2015-11-10 13:48:39 +01:00
Synchro
14e8ef03eb
Short array syntax
2015-11-10 13:45:13 +01:00
Synchro
016e6330d4
xoauth stuff
2015-11-10 13:09:29 +01:00
Synchro
466264810a
Merge remote-tracking branch 'remotes/upstream/5.4' into xoauth
...
# Conflicts:
# composer.json
# composer.lock
# examples/gmail_xoauth.phps
# get_oauth_token.php
# src/OAuthProvider/Google.php
# src/PHPMailerOAuth.php
2015-11-10 10:25:37 +01:00
Synchro
9b3e13dc14
First draft of 5.4
2015-11-09 19:09:13 +01:00
Marcus Bointon
37d3550706
Merge pull request #554 from aranaur/patch-1
...
grammar
2015-11-09 08:21:34 +01:00
Drew Gates
56bac7f161
Update README.md
2015-11-06 09:51:38 -05:00
Drew Gates
485e685f1e
grammar
2015-11-04 12:19:54 -05:00
Synchro
e774bc9152
Merge remote-tracking branch 'upstream/master'
2015-11-01 11:15:28 +01:00
Synchro
1102fd37ae
Bump version to 5.2.14
2015-11-01 11:14:44 +01:00
Synchro
6687a96a18
Add test for line breaks in addresses vulnerability
...
Don't allow line breaks in addresses
Don't allow line breaks in SMTP commands
Rearrange tests so slowest tests run last
2015-11-01 11:12:04 +01:00
Marcus Bointon
5de0a5246c
Merge pull request #548 from phelipealves/master
...
Brazilian Portuguese updated
2015-11-01 10:01:02 +00:00
Phelipe Alves de Souza
18ef11685a
Brazilian Portuguese updated
2015-10-31 23:00:13 -02:00
Marcus Bointon
1cd906ba05
Merge pull request #545 from Forst/master
...
Updated Russian localization
2015-10-28 22:34:41 +00:00
Foster Forst Snowhill
3b660771d0
Updated Russian localization
...
* Translated "Extension missing: "
* Removed duplicate "Extension missing: " stub in Galician
* Added "Extension missing: " stub to Hebrew
2015-10-28 18:27:41 +03:00
Marcus Bointon
fe1e8699f0
Don't try to set accessType, at least until upstream fixes access to it
2015-10-23 21:25:23 +01:00
Marcus Bointon
c24f242d9b
Fix xoauth package suggestions
2015-10-23 14:59:55 +02:00
Marcus Bointon
a4b8b91027
Partial fix for #539
2015-10-23 13:32:43 +02:00
Marcus Bointon
45bb9a3636
Merge pull request #536 from Jonadabe/patch-2
...
Update phpmailer.lang-pt.php
2015-10-21 20:11:20 +02:00
Jonadabe
6f94d76d23
Update phpmailer.lang-pt.php
2015-10-21 18:39:15 +01:00
Synchro
0f24d1e679
Version checks are no use for language constructs
2015-10-21 14:47:35 +02:00
Synchro
19fcea0556
Cleanup
2015-10-20 13:52:29 +02:00
Marcus Bointon
dc0e0935ab
Merge pull request #534 from fbonzon/patch-1
...
Fix a typo in comment
2015-10-19 17:11:10 +02:00
François B
5a17d6a1fc
Fix a typo in comment
2015-10-19 17:09:43 +02:00
Synchro
65244ee9dc
Merge remote-tracking branch 'upstream/master' into xoauth
...
# Conflicts:
# class.phpmaileroauth.php
# class.phpmaileroauthgoogle.php
# class.smtp.php
# examples/gmail_xoauth.phps
# get_oauth_token.php
2015-10-15 09:29:01 +02:00
Synchro
881289ba64
Changelog
2015-10-14 23:33:44 +02:00
Synchro
8e02d00823
Correct documented type of OAuth property. Will probably need to change this when merging xoauth banch.
2015-10-14 23:29:11 +02:00
Marcus Bointon
efd91ea796
Merge pull request #529 from fbonzon/master
...
Allow addresses with IDN
2015-10-14 23:10:52 +02:00
Marcus Bointon
aeae681c99
Merge pull request #530 from fbonzon/scrutinizer
...
Fix comments, suggested by scrutinizer
2015-10-14 23:08:16 +02:00
François B
65c213ae70
Fix comments, suggested by scrutinizer
2015-10-14 22:33:01 +02:00
François B
0fa9518609
Allow addresses with IDN
...
Accepts Internationalized Domain Name everywhere PHPMailler expects
email addresses (To, CC, BCC, Reply-To, From, Sender and
ConfirmReadingTo).
Requires PHP >= 5.3 with "intl" extension installed and "mbstring"
extension enabled. Earlier versions don't see a change, i.e. specifying
an address with IDN still fails validation.
Follow-up to PR #516 . Ran test/phpmailerTest.php
Other changes:
- From, Sender and ConfirmReadingTo addresses are now validated in
send(). Previously, only From and Sender addresses would be validated
only if specified via the setFrom() method. ConfirmReadingTo was never
validated.
- Half language strings for the 'invalid_address' message used colon at
the end and half didn't. Harmonized messages to always include colon,
and not add a second one with PHP code.
2015-10-14 22:02:07 +02:00
Marcus Bointon
6b12c212c4
Merge pull request #527 from fbonzon/array_key_exists
...
Prefer array_key_exists() over isset()
2015-10-13 23:18:14 +02:00
François B
c2447dcf97
Prefer array_key_exists() over isset()
2015-10-13 23:16:06 +02:00
Marcus Bointon
23c3589624
Merge pull request #526 from fbonzon/comments
...
Improve some comments and minor improvements
2015-10-13 22:53:18 +02:00
François B
4532cec50d
Improve some comments and minor improvements
...
- Define an $error_message and reuse it, instead of recreating the
error message 3 times
- Use in_array() check instead of a regex
2015-10-13 22:38:15 +02:00
Marcus Bointon
8bea0ad20c
Merge pull request #520 from fbonzon/master
...
Change line endings from CRLF to LF
2015-10-02 18:55:09 +02:00
François B
b87462979b
Change line endings from CRLF to LF
...
All files in PHPMailer have LF line endings, except those two.
Harmonize line endings to LF for consistency.
2015-10-02 18:52:29 +02:00
Marcus Bointon
e2a9ec16bd
Merge pull request #515 from dnepro/master
...
[TASK] replace "@type" annotation in favor of "@var" as proposed by phpdoc.org
2015-09-28 12:19:31 +02:00
Roman Minchyn
870350756b
[TASK]
...
replace "@type" annotation in favor of "@var" as proposed by phpdoc.org
Issue #513
2015-09-28 11:35:42 +02:00
Synchro
8a922619bb
Merge branch 'master' of https://github.com/hayageek/PHPMailer into xoauth, PR #507
2015-09-25 14:43:10 +02:00
Synchro
40a0a1b160
Allow retrieving POP3 errors
...
Move private properties to protected
2015-09-24 10:23:39 +02:00
Ravishanker Kusuma
c71721636e
XOAuth Providers support Google,Yahoo,Microsoft
...
Added token expiry check
2015-09-24 15:22:48 +08:00
Synchro
b6f421c5ff
Clean up
2015-09-22 08:16:40 +02:00
Synchro
d6d7a8d17c
Avoid IDE warnings in a mixed PHP version project
2015-09-22 08:11:09 +02:00
