mirror/PHPMailer
0
0
Fork 0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 01:52:15 +02:00
Code
1,230 Commits 6 Branches 83 Tags 24 MiB
61d18c4430
Commit Graph

95 Commits

Author SHA1 Message Date
Marcus Bointon
61d18c4430
Update readme to address recent SO questions 2017-09-18 08:35:45 +02:00
Marcus Bointon
727bc7151d
Correct link to test file, fixes #1163 2017-09-14 22:30:23 +02:00
Marcus Bointon
424398579d
Merge changes from master 2017-06-22 18:36:56 +02:00
Marcus Bointon
ffb6be138d
Add dates in history 2017-06-21 14:00:05 +02: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
84c24bf257
Add CVE-2017-5223 references 2017-01-09 10:32:40 +01:00
Marcus Bointon
789e0846ab
Merge branch 'master' into 6.0 
# Conflicts:
#	VERSION
#	extras/htmlfilter.php
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
#	test/phpmailerTest.php
 2016-12-29 14:01:45 +01:00
sikander
efde5edb3d Fixed link to Security (#931) 2016-12-28 14:36:42 +01:00
Marcus Bointon
d73f836c27
Cleanup 2016-12-28 14:14:27 +01:00
Marcus Bointon
8d68507d7b
Minor cleanup, fix 2016-12-28 13:17:21 +01:00
Marcus Bointon
70d041b6f5
Fix security links 2016-12-27 17:44:01 +01:00
Marcus Bointon
46f3177cf1
Note about example inclusion 2016-10-17 18:55:23 +02:00
Marcus Bointon
909c6283e3 Merge branch 'master' into 6.0 2016-07-22 12:49:33 +02:00
Marcus Bointon
97b2ea5ab5 Update security notices 2016-07-22 12:43:58 +02:00
Marcus Bointon
8beacc646a Add security notices 2016-07-22 12:05:21 +02:00
Marcus Bointon
49b8d7e271 Docs cleanup 2016-06-30 16:12:51 +02:00
Marcus Bointon
5b34f25e31 Docs tweaks 2016-05-11 00:00:21 +02:00
Marcus Bointon
7a67a33181 Cleanup 2016-05-01 17:45:39 +02:00
Marcus Bointon
ea42b599cd Clean up documentation and examples 2016-04-26 22:33:02 +02:00
Marcus
6bf687dbc0 Bump version to 6.0 2016-04-21 12:21:25 +02:00
Marcus
28d85344ee Add comment about legacy versions 2016-04-20 00:07:17 +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
3a41f91fe2 Rearrangements for new XOAUTH approach, see #675 2016-04-05 12:13:39 +02:00
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
ece9cb4991 Merge branch '5.4' into xoauth 
# Conflicts:
#	README.md
 2016-03-16 09:55:14 +01:00
Marcus
870bbcb35e Merge branch 'master' into 5.4 
# Conflicts:
#	README.md
 2016-03-05 21:58:23 +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
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
Nicholas Ferrara
e4cb018032 Update README.md 
Fixed broken example folder links
 2016-01-31 02:09:52 -05: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
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
9b3e13dc14 First draft of 5.4 2015-11-09 19:09:13 +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
François B
20112cc8fe Prefer setFrom() over separate From and FromName 2015-09-18 00:06:58 +02:00
Synchro
5dd754112d 5.2.12 release 2015-09-02 12:40:37 +02:00
Marcus Bointon
b4a7c71b67 Merge pull request #457 from royopa/patch-2 
added how to install with composer
 2015-09-02 09:09:17 +02:00
Synchro
57d3d1fee6 Merge remote-tracking branch 'remotes/upstream/master' into xoauth 2015-08-25 17:12:33 +02:00
Rodrigo Prado
49e9f6595b addex how to install with composer in command line 2015-07-14 22:58:53 -03:00
Rodrigo Prado
a378ec7895 addex how to install with composer 2015-07-14 10:02:37 -03:00
Chris Christoff
70af7cc3d7 Wordpress -> WordPress 2015-06-29 00:54:52 -04:00
Synchro
8736a45ae4 Changelog & Readme 2015-05-19 17:52:24 +02:00