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

869 Commits

Author SHA1 Message Date
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
Marcus Bointon
d3fb6468e7 Merge pull request #617 from nferrara100/patch-1
Update README.md
2016-02-01 17:22:55 +01:00
Nicholas Ferrara
e4cb018032 Update README.md
Fixed broken example folder links
2016-01-31 02:09:52 -05:00
Synchro
53f9f06cd4 Merge branch 'master' into 5.4 2016-01-30 16:29:34 +01:00
Synchro
b2d7dab3ba Changelog 2016-01-30 16:28:53 +01:00
Synchro
711916966d Merge branch 'master' into 5.4
# Conflicts:
#	README.md
2016-01-30 16:26:05 +01:00
Synchro
059720971b Merge branch 'master' into 5.4
# Conflicts:
#	README.md
2016-01-30 16:25:16 +01:00
Marcus Bointon
cb8bde329a Merge pull request #614 from bertpoort/master
DKIM improvements
2016-01-30 11:15:40 +01:00
bertpoort
38c1e85fcb DKIM improvements
Improve DKIM with SHA-256 hashing and date header signing
2016-01-29 18:43:57 +01:00
Synchro
41aaf63917 Use absolute URLs in readme 2016-01-28 17:53:01 +01:00
Synchro
7dbd31802d Cleanup via #613 2016-01-28 13:56:11 +01:00
Synchro
8cf057efb7 More cleanup 2016-01-28 13:47:36 +01:00
Synchro
9e0bbaa1ae Changelog 2016-01-25 16:40:52 +01:00
Synchro
620388f34f Merge branch '5.4' into xoauth
# Conflicts:
#	changelog.md
#	composer.json
#	composer.lock
#	get_oauth_token.php
2016-01-25 16:08:47 +01:00
Synchro
ffdde9b6a2 Remove deprecated elements
Update changelog
2016-01-25 16:01:59 +01:00
Synchro
7bb65f288b Merge branch 'master' into xoauth 2016-01-07 20:38:58 +01:00
Synchro
9d96b7b362 Suggest generic oauth client 2016-01-07 18:41:01 +01:00
Synchro
bf60c58a01 Merge branch 'master' into 5.4
# Conflicts:
#	composer.lock
#	get_oauth_token.php
2016-01-07 18:39:55 +01:00
Synchro
47f66d3aac Update deps 2016-01-07 18:36:37 +01:00
Synchro
df2a2dfc79 Point at Google-specific OAuth2 lib since that's the only provider supported in 5.2.x 2016-01-07 18:35:00 +01:00
Synchro
9211ba6728 Ensure Message-ID is always valid, fixes #587 2016-01-07 16:28:39 +01:00
Synchro
7850d1806a Use alternativeExists method for consistency 2016-01-07 16:27:50 +01:00
Marcus Bointon
be73e1f8a2 Merge pull request #603 from vuthao/5.4
remove check safe-mode
2016-01-06 18:48:59 +01:00
Vu Thao
62a3740c7b remove check safe-mode
(Safe Mode REMOVED as of PHP 5.4.0
http://php.net/manual/en/features.safe-mode.php)
2016-01-05 22:51:10 +07:00
Synchro
c2bde34e58 Clarify source of invalid addresses, fixes #599 2015-12-28 12:59:47 +01:00
Marcus Bointon
1e677ad78f Merge pull request #594 from Senasum/OSDEN
Added Sinhala to Language Folder
2015-12-25 15:51:47 +01:00
Senasum
22224d8008 Added Sinhala to Language Folder 2015-12-25 19:31:56 +05:30
Marcus Bointon
b380d98a17 Merge branch '5.4' into xoauth 2015-12-22 09:38:33 +01:00