mirror/PHPMailer
0
0
Fork 0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 18:03:04 +02:00
Code
900 Commits 6 Branches 83 Tags 24 MiB
e4bc252320
Commit Graph

900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Synchro
5c3f73586b Merge remote-tracking branch 'remotes/upstream/master' into 5.4 2015-11-23 23:10:26 +01:00
Synchro
c86a860423 Standards 2015-11-23 23:09:18 +01:00
Synchro
703266cc29 Merge branch 'master' into 5.4 2015-11-23 10:34:55 +01:00
Marcus Bointon
0363a3000c Merge pull request #566 from PHPMailer/revert-565-back-compat 
Revert "Fix PHP <5.4 compatibility"
 2015-11-23 08:56:13 +01:00
Marcus Bointon
6d7f16a9c9 Revert "Fix PHP <5.4 compatibility" 2015-11-23 08:55:57 +01:00
Synchro
f8ed4eba2a PHPUnit again 2015-11-23 08:54:21 +01:00
Synchro
da9666e893 PHPUnit tweaks 2015-11-12 14:43:19 +01:00
Synchro
428949a697 PHPUnit tweaks 2015-11-12 12:51:29 +01:00
Synchro
2ea088ecc5 PHPUnit tweaks 2015-11-12 12:30:31 +01:00
Synchro
6a7ed78618 PHPUnit tweaks 2015-11-12 12:18:21 +01:00
Synchro
eaebda7d66 PHPUnit tweaks 2015-11-12 11:47:10 +01:00
Synchro
1f3a204d70 PHPUnit tweaks 2015-11-12 11:29:23 +01:00
Synchro
f66899617a PHPUnit tweaks 2015-11-12 10:45:16 +01:00
Synchro
0c116a6287 PHPUnit tweaks 2015-11-12 10:13:28 +01:00
Synchro
c9f2347300 PHPUnit tweaks 2015-11-12 10:12:55 +01:00
Synchro
545febf0cf PHPUnit tweaks 2015-11-12 09:43:56 +01:00
Synchro
7a55a752b3 PHPUnit tweaks 2015-11-12 09:37:41 +01:00
Synchro
6bcb0f8f8d PHPUnit tweaks 2015-11-12 08:43:23 +01:00
Synchro
2b632a71be PHPUnit tweaks 2015-11-11 19:20:16 +01:00
Synchro
bcfd59bc6f PHPUnit tweaks 2015-11-11 18:13:28 +01:00
Synchro
ea1c3b1b0e PHPUnit tweaks 2015-11-11 18:11:34 +01:00
Synchro
9a65420d1a PHPUnit tweaks 2015-11-11 18:05:38 +01:00
Synchro
2101e1654b PHPUnit tweaks 2015-11-11 18:04:02 +01:00
Synchro
e817e299ff Merge branch '5.4' of https://github.com/PHPMailer/PHPMailer into xoauth 
# Conflicts:
#	composer.json
#	composer.lock
 2015-11-11 18:01:53 +01:00
Synchro
1baa71ae58 PHPUnit tweaks 2015-11-11 17:37:53 +01:00
Synchro
be760f6551 PHPUnit tweaks 2015-11-11 17:31:50 +01:00
Synchro
0dae3451c6 Downgrade to PHPUnit 4.7 to avoid 4.8 bug 2015-11-11 17:08:35 +01:00
Synchro
f2a08a26c0 Coding standards 2015-11-11 17:04:35 +01:00
Marcus Bointon
5443a5ce02 Merge pull request #557 from fbonzon/5.4 
Use a closure now that PHP 5.4 is min requirement
 2015-11-11 15:24:41 +01:00
François B
28e566da00 Use a closure now that PHP 5.4 is min requirement 
Resurrects
https://github.com/PHPMailer/PHPMailer/commit/0f24d1e67974926fd5fa316c3b
13f89a73a3d8c1
 2015-11-11 14:51:57 +01:00
Synchro
758eb3fe8e Travis & PHPUnit tweaks 2015-11-10 19:38:14 +01:00
Synchro
a0407c6630 Travis & PHPUnit tweaks 2015-11-10 19:09:08 +01:00
Synchro
75dd5453b2 Travis & PHPUnit tweaks 2015-11-10 15:31:23 +01:00
Synchro
12805da50a Travis & PHPUnit tweaks 2015-11-10 15:17:46 +01:00
Synchro
abc34907f1 Merge remote-tracking branch 'remotes/upstream/5.4' into xoauth 2015-11-10 14:45:22 +01:00
Synchro
a139b96368 Tell Travis to install composer packages 2015-11-10 14:44:38 +01:00
Synchro
fbe62ff9b5 Tidy up copyright notices 2015-11-10 14:44:16 +01:00
Synchro
feea6358c6 Merge branch '5.4' into xoauth 
# Conflicts:
#	get_oauth_token.php
 2015-11-10 13:48:39 +01:00
Synchro
14e8ef03eb Short array syntax 2015-11-10 13:45:13 +01:00
Synchro
016e6330d4 xoauth stuff 2015-11-10 13:09:29 +01:00
Synchro
466264810a Merge remote-tracking branch 'remotes/upstream/5.4' into xoauth 
# Conflicts:
#	composer.json
#	composer.lock
#	examples/gmail_xoauth.phps
#	get_oauth_token.php
#	src/OAuthProvider/Google.php
#	src/PHPMailerOAuth.php
 2015-11-10 10:25:37 +01:00
Synchro
9b3e13dc14 First draft of 5.4 2015-11-09 19:09:13 +01:00
Marcus Bointon
37d3550706 Merge pull request #554 from aranaur/patch-1 
grammar
 2015-11-09 08:21:34 +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
Synchro
e774bc9152 Merge remote-tracking branch 'upstream/master' 2015-11-01 11:15:28 +01:00
Synchro
1102fd37ae Bump version to 5.2.14 2015-11-01 11:14:44 +01:00
Synchro
6687a96a18 Add test for line breaks in addresses vulnerability 
Don't allow line breaks in addresses
Don't allow line breaks in SMTP commands
Rearrange tests so slowest tests run last
 2015-11-01 11:12:04 +01:00
Marcus Bointon
5de0a5246c Merge pull request #548 from phelipealves/master 
Brazilian Portuguese updated
 2015-11-01 10:01:02 +00:00
Phelipe Alves de Souza
18ef11685a Brazilian Portuguese updated 2015-10-31 23:00:13 -02:00