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

869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Bointon
da739aa763 Fix callback example 2016-05-01 17:06:51 +02:00
Marcus Bointon
d3eabffd0c Fix callback example 2016-05-01 17:06:20 +02:00
Marcus Bointon
b1ec3ebc50 Docs 2016-05-01 17:02:40 +02:00
Marcus Bointon
efbcfa97c0 Callback cleanup, examples 2016-05-01 17:00:48 +02:00
Marcus Bointon
558bcdc269 DKIM cleanup, examples 2016-05-01 13:09:24 +02:00
Marcus Bointon
316321bbce Merge branch 'master' into 6.0 2016-04-28 13:06:00 +02:00
Marcus Bointon
703410e39f Allow TLS 1.2, fixes #696 2016-04-28 12:54:42 +02:00
Marcus Bointon
ea42b599cd Clean up documentation and examples 2016-04-26 22:33:02 +02:00
Marcus Bointon
25ed54e97e Clean up documentation and examples 2016-04-26 22:22:52 +02:00
Marcus Bointon
84d6af5b95 Clean up documentation and examples 2016-04-26 22:16:17 +02:00
Marcus
665e964f66 Merge branch 'master' into 6.0 2016-04-25 11:02:17 +02:00
Avtandil Kikabidze
b04ab34d77 Added 'extension_missing' translation for ka locale (#693) 
* Added 'extension_missing' translation for ka locale

* Fixed string
 2016-04-25 11:01:04 +02:00
Marcus
f0ed47850c Sort out namespaces and imports in examples 2016-04-22 19:13:15 +02:00
Marcus
baf343dab3 Fix misnamed property, fixes #688 2016-04-21 13:21:19 +02:00
Marcus
338f992055 Provide links for League packages 2016-04-21 12:51:31 +02:00
Marcus
f4ab7db9fa Remove unneeded state property, see #687 
Provide links for League packages
 2016-04-21 12:51:15 +02:00
Marcus
6bf687dbc0 Bump version to 6.0 2016-04-21 12:21:25 +02:00
Marcus
9254275d0b phpdoc cleanup 2016-04-21 12:19:52 +02:00
Marcus
ad74f67968 Update generatedocs script for new file locations 2016-04-21 12:19:20 +02:00
Marcus
5dbf14e7f0 Debugformat info 2016-04-21 11:01:55 +02:00
Marcus
28d85344ee Add comment about legacy versions 2016-04-20 00:07:17 +02:00
Marcus
952e7630c1 Don't use is_readable - it breaks on windows with shared volumes - use file_exists instead, see #500 2016-04-19 23:22:20 +02:00
Marcus
3abcab1936 Clean up TODOs 
Switch SingleToArray to protected
Update Readme
Update composer deps
 2016-04-19 18:26:33 +02:00
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