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
Marcus
fcecb5872b
Add emoji to UTF-8 content
2016-04-19 17:05:58 +02:00
František Svoboda
fb82f2b9ea
Add unit test that shows how address parser returns its result
2016-04-17 09:49:12 +02:00
Lito
0f7182213a
Use $exception default value if not set on construct. ( #682 )
2016-04-11 15:28:11 +02:00
Marcus
26378e0eca
Fix precedence
2016-04-08 01:41:46 +02:00
Marcus
dca2a72e19
Add Microsoft scope options
2016-04-07 11:35:44 +02:00
Marcus
498204253c
Revert to later version!
2016-04-07 11:33:03 +02:00
Marcus
c4b132e89d
Merge branch '5.4' into xoauth
...
# Conflicts:
# src/OAuthProvider/Google.php
# src/PHPMailerOAuth.php
# src/POP3.php
# src/SMTP.php
2016-04-07 11:07:24 +02:00
Marcus
3d4e3b1a0d
Years & version numbers
2016-04-07 11:04:03 +02:00
Marcus
6b7d61ad76
Merge branch '5.4' into xoauth
...
# Conflicts:
# get_oauth_token.php
# src/OAuthProvider/Google.php
# src/PHPMailerOAuth.php
2016-04-07 10:59:05 +02:00
Marcus
86ea82969e
Merge branch '5.4' into xoauth
...
# Conflicts:
# get_oauth_token.php
# src/OAuthProvider/Google.php
# src/PHPMailerOAuth.php
2016-04-07 10:58:14 +02:00
Marcus
33f82ab517
Merge branch 'master' into 5.4
...
Bump version to 5.5
Clean up code generator
# Conflicts:
# README.md
# examples/send_file_upload.phps
# src/SMTP.php
# test/phpmailerTest.php
2016-04-07 10:52:37 +02:00
Marcus
27501ac7b9
Merge branch 'master' into 5.4
...
Bump version to 5.5
Clean up code generator
# Conflicts:
# README.md
# examples/send_file_upload.phps
# src/SMTP.php
# test/phpmailerTest.php
2016-04-07 10:51:05 +02:00
Marcus
177839e22f
Fix fetching error messages, fixes #679
2016-04-07 09:24:49 +02:00
Marcus
824d229fc4
Reduce possible ambiguity of what we're parsing
2016-04-07 09:24:34 +02:00
Marcus
2b961897bd
PSR-2 cleanup
2016-04-07 08:13:04 +02:00
Marcus
1dd452e9e8
Fix typo
2016-04-07 08:10:31 +02:00
Marcus
05e43f3666
Don't use dynamic classnames in aliased namespaces, see #675
...
Increase PHP version req to 5.5 in composer.json
2016-04-06 20:18:34 +02:00
Marcus
739127f8e9
Code cleanup, see #675
2016-04-05 13:09:53 +02:00
Marcus
3a41f91fe2
Rearrangements for new XOAUTH approach, see #675
2016-04-05 12:13:39 +02:00
Sherryl George
94c7cf4d9e
Xoauth
...
* Cleaner XOAUTH2 Implementation
* Update gmail_xoauth.phps
2016-04-05 11:53:49 +02:00
Marcus
b7151db9b7
Improve Windows compatibility for tests
2016-03-29 15:14:19 +02:00
Marcus
0e992c63ff
Improve SMTP check example
2016-03-29 10:28:12 +02:00
Marcus
f0a6839a05
Improve send file examples
2016-03-29 10:05:36 +02:00
Marcus Bointon
0fe35b0e03
Merge pull request #672 from rishijash/patch-1
...
Example for sending multiple files
2016-03-29 09:52:29 +02:00
Rishi Jash
0f53c79239
Add example of sending multiple files upload
...
Simple example for sending multiple files using PHPMailer
2016-03-29 13:09:24 +05:30
Marcus
fc9f4aa2b9
Fix file links
2016-03-22 18:21:49 +01:00
Marcus
50cf503cd2
Fix file links
2016-03-22 18:19:26 +01:00
Marcus
b5845ebada
Mention that SingleTo doesn't work in SMTP
2016-03-18 11:00:45 +01:00
Marcus
33c33b5332
Improve check for SMTP close on destruct, fixes #658
2016-03-18 10:58:50 +01:00
Marcus
99bf646428
Ignore files created during tests
2016-03-16 10:02:38 +01:00
Marcus
ece9cb4991
Merge branch '5.4' into xoauth
...
# Conflicts:
# README.md
2016-03-16 09:55:14 +01:00
Marcus
a9054a5d61
Merge branch 'master' into 5.4
2016-03-16 09:49:28 +01:00
Marcus
3bf98c2c6f
Merge remote-tracking branch 'upstream/master'
2016-03-16 09:48:43 +01:00
Marcus Bointon
e8717f487f
Merge pull request #656 from MikkelPaulson/fix-regex-issues
...
Fixed issues with regular expressions
2016-03-15 21:53:09 +01:00
Mikkel Paulson
355d9578dd
Fixed issues with regular expressions.
...
1) Normalizing line breaks uselessly replaced `\n` with `\n`.
2) [A-z] matches the range including ``^`[]_\``; corrected to `a-z` and
updated to include full RFC3986-compliant syntax including `+-.`.
3) Collapsing logic uselessly replaced 1 space with 1 space.
2016-03-15 16:36:15 -04:00
Marcus
8635606de4
Update deps
2016-03-08 11:47:57 +01:00
Marcus
7a80c452f3
Merge branch 'master' into xoauth
...
# Conflicts:
# README.md
2016-03-05 22:00:08 +01:00
Marcus
870bbcb35e
Merge branch 'master' into 5.4
...
# Conflicts:
# README.md
2016-03-05 21:58:23 +01:00
Marcus
dd9fc73fc6
Merge remote-tracking branch 'upstream/master'
2016-03-05 21:53:33 +01:00
Marcus
26c676f1e0
Try to clean up get_oauth_token
2016-03-05 21:52:56 +01:00
randomintcreatepretext.py
a1b90c1ee9
Merge remote-tracking branch 'remotes/upstream/master' into xoauth
...
# Conflicts:
# README.md
2016-02-11 00:18:14 +01:00
Marcus Bointon
f0b2877f96
Merge pull request #626 from rfp/patch-1
...
Updating README.md fixing some paths on the links
2016-02-09 18:14:29 +01:00
rfp
a044b74cbb
Updating README.md fixing some paths on the links
2016-02-09 17:07:17 +00:00
randomintcreatepretext.py
487933eb3d
Merge remote-tracking branch 'remotes/upstream/master' into 5.4
...
# Conflicts:
# README.md
2016-02-08 12:50:22 +01:00
randomintcreatepretext.py
75550adfa3
Merge remote-tracking branch 'remotes/upstream/master' into 5.4
...
# Conflicts:
# README.md
2016-02-08 12:49:34 +01:00
