Commit Graph

2701 Commits

Author SHA1 Message Date
Synchro 7492986b81 Merge remote-tracking branch 'upstream/master' 2013-09-20 09:18:26 +02:00
Synchro 4e1cab46df Changelog 2013-09-20 09:16:38 +02:00
Marcus Bointon 48b6478887 Merge pull request #5 from binaryoung/patch-1
Update phpmailer.lang-zh_cn.php
2013-09-20 00:14:43 -07:00
binaryoung bbb9ede86d Update phpmailer.lang-zh_cn.php 2013-09-20 14:02:24 +08:00
Marcus Bointon 562a35dcee Merge pull request #109 from btafoya/master
If the autoload stack is not activated then the return value is FALSE.
2013-09-15 10:55:49 -07:00
btafoya fa8f517940 If the autoload stack is not activated then the return value is FALSE. 2013-09-15 00:13:34 -07:00
Synchro 3441a6dd54 Increase timeout - fixes #104
Improve debug options
2013-09-12 14:35:29 +02:00
Synchro 8717a79565 Date 5.2.7 release 2013-09-12 09:52:38 +02:00
Synchro 09a978fb1c Tests for messageID
Minor cleanup
2013-08-30 18:51:37 +02:00
Synchro 4075ba4b6b Merge changes from #101 2013-08-30 13:28:49 +02:00
Synchro e16c820e56 Manually merge in changes from #101 2013-08-30 13:28:05 +02:00
Marcus Bointon 86ef725e80 Merge pull request #101 from davidsickmiller/patch-1
Added a function, GetLastMessageID, for accessing the last message ID
2013-08-30 02:58:27 -07:00
davidsickmiller 091e776f16 Added a function, GetLastMessageID, for accessing the last message ID
Added a function, GetLastMessageID, for accessing the last message ID.  It returns whatever message ID was used when the headers were last created, which is also the message ID of the last sent message except in failure cases.  If the client sends multiple messages using the same PHPMailer object, the value returned by GetLastMessageID() will be updated each time.  In issue #57, it was pointed out that a client wanting the message ID could just explicitly set the message ID via $this->MessageID, but that would require the client to understand how to create a good message ID.
2013-08-30 02:23:13 -04:00
Synchro cd4ed6130a Fix POP3 test failures
Fake pop server can now specify a port to run on
2013-08-05 18:12:08 +02:00
Marcus Bointon 9d05b0d8ed Merge pull request #94 from jacroe/patch-1
Fixed some Markdown formatting
2013-08-04 02:26:52 -07:00
Jacob Roeland 33f0ae3f86 Fixed some Markdown formatting
- Wrapped the "git remote set-url" command in Markdown code quotes
 - Added a link directly to the Changelog
2013-08-04 02:50:01 -05:00
Synchro 73093a32a3 Add fake pop server and POP-before-SMTP tests.
Update POP before SMTP example to use new static method.
2013-08-02 16:19:01 +02:00
Synchro 3374536cac Remove excess blank line that triggers spamassassin, see #92 2013-08-02 15:23:21 +02:00
Synchro 331d24bc82 Fix Q-encoding for strings containing '=', fixes #91 2013-08-01 09:55:26 +02:00
Synchro 812985886e Merge remote-tracking branch 'upstream/master' into smtp-refactor 2013-08-01 08:40:43 +02:00
Marcus Bointon 6c1cfe587e Merge pull request #90 from nemelu/patch-1
Update Czech translation, see #24
2013-07-31 23:39:35 -07:00
nemelu 1e953c2d03 Update Czech translation 2013-07-31 20:39:23 +02:00
Synchro e0eeb028d5 Merge branch 'smtp-refactor' of https://github.com/Synchro/PHPMailer into smtp-refactor 2013-07-30 12:52:59 +02:00
Synchro d992ae6dc4 Centralise check for debug output
PSR-2 reformat

Enable debug output for failing test

Fix broken test
Comment clearout

Proper thin spaces before French punctuation

Fix phpdocs for addrAppend and addrFormat, fixes #81
Minor code cleanup, remove some local vars

See changelog.

More phpdoc cleanup
2013-07-30 12:51:15 +02:00
Synchro b9e61c6e09 More phpdoc cleanup 2013-07-30 12:42:50 +02:00
Synchro 6720e98e10 See changelog. 2013-07-30 03:15:16 +02:00
Synchro 6763d1b6ed Fix phpdocs for addrAppend and addrFormat, fixes #81
Minor code cleanup, remove some local vars
2013-07-23 17:34:06 +02:00
Synchro f3a4f75197 Proper thin spaces before French punctuation 2013-07-22 20:29:45 +02:00
Synchro 131057b540 Fix broken test
Comment clearout
2013-07-22 18:26:07 +02:00
Synchro cb42c8b0a6 Enable debug output for failing test 2013-07-22 13:42:54 +02:00
Synchro 03d8f1b498 PSR-2 reformat 2013-07-22 13:05:16 +02:00
Synchro d79afc52c8 Centralise check for debug output 2013-07-09 13:47:57 +02:00
Synchro c5e9f7873f Changelog 2013-07-01 09:31:45 +02:00
Marcus Bointon 4ae1fc3e49 Merge pull request #71 from jaii/patch-1
Create phpmailer.lang-fa.php
2013-07-01 00:29:07 -07:00
Ali Jazayeri c453ed24eb Create phpmailer.lang-fa.php 2013-07-01 11:45:39 +04:30
Jim Jagielski 61863963b5 Allow for bypassing of Content-Disposition header totally. 2013-06-28 10:45:43 -04:00
Marcus Bointon 9831bcd7fe Merge pull request #70 from mrbellek/master
Fixed typo in DKIM_Add function.
2013-06-10 00:58:24 -07:00
Merijn 83bebcc1ff Update class.phpmailer.php
Fixed typo in DKIM_Add function.
2013-06-10 09:51:58 +02:00
Synchro 82cce95c28 Add missing Esperanto translation, thanks to @eliovir 2013-06-06 23:50:59 +02:00
Synchro 2032af0d56 Fix bad return for failed attachment
Add test for failing attachment
2013-06-06 17:31:11 +02:00
Synchro d852751809 Fix wrong filename for image file - thanks to @mauglee 2013-06-06 17:27:12 +02:00
Synchro bd69132c66 Changelog 2013-06-06 09:31:22 +02:00
Synchro f67ac9fa2b Merge remote-tracking branch 'upstream/master' 2013-06-06 08:52:47 +02:00
Synchro 37130df9d8 Update to Hungarian by @dominicus-75
Minor French tweaks
2013-06-06 08:48:28 +02:00
Synchro 6b5cbca34c Set packagist package type 2013-06-06 08:47:17 +02:00
Marcus Bointon 9a2620c3ec Merge pull request #3 from dominicus-75/patch-1
Update phpmailer.lang-hu.php
2013-06-05 23:10:42 -07:00
Marcus Bointon 68ced3e9c8 Merge pull request #68 from vlajos/master
small misspelligs fixes
2013-06-04 17:26:31 -07:00
Veres Lajos 2839fa48cd small misspell fixes 2013-06-04 23:51:17 +01:00
Domokos Endre János c9b88b4f4f Update phpmailer.lang-hu.php 2013-06-04 16:58:32 +03:00
Marcus Bointon 2884355054 Merge pull request #66 from mauglee/master
Lithuanian translation added
2013-06-03 12:30:19 -07:00