mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,701 Commits 10 Branches 92 Tags 63 MiB
Commit Graph

2701 Commits

Author SHA1 Message Date
Marcus Bointon a39e1db862
Merge pull request #3268 from PHPMailer/dependabot/github_actions/action-runners-cf016e0bec 
GH Actions: Bump JamesIves/github-pages-deploy-action from 4.7.3 to 4.7.4 in the action-runners group
 2025-11-10 08:41:13 +01:00
dependabot[bot] 25658b754f
GH Actions: Bump JamesIves/github-pages-deploy-action 
Bumps the action-runners group with 1 update: [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action).


Updates `JamesIves/github-pages-deploy-action` from 4.7.3 to 4.7.4
- [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases)
- [Commits](6c2d9db40f...4a3abc783e)

---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
  dependency-version: 4.7.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: action-runners
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-11-10 06:03:18 +00:00
Robin van der Vliet d616c7fc76
Update Dutch translations 2025-11-07 23:25:43 +01:00
Marcus Bointon 15c3d21fa1
Merge pull request #3266 from RobinvanderVliet/patch-1 
Recreate Esperanto translations
 2025-11-07 23:05:03 +01:00
Robin van der Vliet b336ed18b5
Recreate Esperanto translations 2025-11-07 22:12:02 +01:00
Marcus Bointon 37d628dd22
Merge pull request #3264 from PHPMailer/dependabot/github_actions/action-runners-02cf758a13 
GH Actions: Bump github/codeql-action from 4.31.0 to 4.31.2 in the action-runners group
 2025-11-05 15:11:07 +01:00
dependabot[bot] 9aa8367be6
GH Actions: Bump github/codeql-action in the action-runners group 
Bumps the action-runners group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 4.31.0 to 4.31.2
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](4e94bd11f7...0499de31b9)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: action-runners
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-11-03 06:03:34 +00:00
Marcus Bointon 4384c206d3
Merge pull request #3262 from greew/add-missing-da-lang 
Added missing Danish translations
 2025-10-29 10:46:09 +01:00
Jesper Skytte 8b7828d3b0
Added missing Danish translations 2025-10-29 09:42:18 +01:00
Marcus Bointon 8a06a2ddd1
Merge pull request #3261 from greew/master 
Add XOAUTH2 token exception handling
 2025-10-29 09:39:27 +01:00
Jesper Skytte 8f59b82488
Add XOAUTH2 token exception handling 
If generating an OAuth2 token fails in the provider and an exception is thrown, we never catch that exception, but just let exception propagate up to whatever.

I suggest this change, such that we can handle errors when generating oauth tokens. It is based on the fact that ^League\OAuth2\Client\Provider\AbstractProvider` can throw exceptions during getting the oauth token, but we are nowhere near to knowing why.

I have decided on catching all exception (`\Exception`) because if someone uses another OAuthTokenProvider (it's just an interface, so it's possible), we won't know specifically which exceptions can be thrown here, so we need to catch them all.

By throwing a PHPMailer exception and adding the existing exception as the `$previous` variable, we can show a generic error message to regular users and advice how developers can get actually meaningful error messages from the previous exception.
 2025-10-29 09:04:06 +01:00
Marcus Bointon eec5710309
Merge pull request #3252 from wera-as/master 
Update phpmailer.lang-nb.php
 2025-10-27 10:33:49 +01:00
Marcus Bointon a231b7d4c4 Fix missing newline at end of file in language file 2025-10-27 10:19:00 +01:00
Adrian Thomassen 74e7f4c72a Update phpmailer.lang-nb.php 
Add missing strings without whitespace changes
 2025-10-27 10:19:00 +01:00
Adrian Thomassen 07db4a7a0f Revert "Update phpmailer.lang-nb.php" 
This reverts commit 102f7bfa4d.
 2025-10-27 10:19:00 +01:00
Adrian Thomassen 6f42027abe Update phpmailer.lang-nb.php 
Refined the current translation and added missing strings
 2025-10-27 10:19:00 +01:00
Marcus Bointon 494e8d60e4
Merge pull request #3259 from PHPMailer/dependabot/github_actions/action-runners-499cb248b3 
GH Actions: Bump github/codeql-action from 4.30.9 to 4.31.0 in the action-runners group
 2025-10-27 09:58:54 +01:00
Marcus Bointon ad20fe54b9
Merge pull request #3258 from PHPMailer/dependabot/github_actions/actions/upload-artifact-5.0.0 
GH Actions: Bump actions/upload-artifact from 4.6.2 to 5.0.0
 2025-10-27 09:58:31 +01:00
dependabot[bot] d9cf457a92
GH Actions: Bump github/codeql-action in the action-runners group 
Bumps the action-runners group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 4.30.9 to 4.31.0
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](16140ae1a1...4e94bd11f7)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: action-runners
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-10-27 06:32:22 +00:00
dependabot[bot] 060cf931c3
GH Actions: Bump actions/upload-artifact from 4.6.2 to 5.0.0 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 5.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](ea165f8d65...330a01c490)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-10-27 06:15:15 +00:00
Marcus Bointon 54a5a950dd
Merge pull request #3253 from PHPMailer/dependabot/github_actions/action-runners-ff6e0617b3 
GH Actions: Bump github/codeql-action from 4.30.8 to 4.30.9 in the action-runners group
 2025-10-20 10:15:39 +02:00
dependabot[bot] effe349964
GH Actions: Bump github/codeql-action in the action-runners group 
Bumps the action-runners group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 4.30.8 to 4.30.9
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](f443b600d9...16140ae1a1)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.30.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: action-runners
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-10-20 06:11:04 +00:00
Marcus Bointon 22b1e59f53
Merge pull request #3248 from KaminskiDaniell/patch-3 
Corrected Polish translation
 2025-10-15 19:27:26 +02:00
Daniel Kamiński 5ef071ed30
Remove extra line 2025-10-15 19:21:14 +02:00
Daniel Kamiński e75e5ee3e3
Merge branch 'master' into patch-3 2025-10-15 19:19:38 +02:00
Marcus Bointon 36ea61cf21
Merge changes from 6.12.0 2025-10-15 19:01:55 +02:00
Marcus Bointon 8bc8f15714
Merge changes from 7.0.0 2025-10-15 19:01:45 +02:00
Marcus Bointon c523ee67a8
Merge changes from 7.0.0 2025-10-15 18:59:43 +02:00
Marcus Bointon c7111310c6
7.0.0 2025-10-15 18:40:02 +02:00
Daniel Kamiński d49feed6fd
Corrected Polish translation 2025-10-13 16:06:28 +02:00
Marcus Bointon b17101946b
Merge pull request #3247 from PHPMailer/dependabot/github_actions/github/codeql-action-4.30.8 
GH Actions: Bump github/codeql-action from 3.30.6 to 4.30.8
 2025-10-13 09:40:24 +02:00
dependabot[bot] 1cf86b0762
GH Actions: Bump github/codeql-action from 3.30.6 to 4.30.8 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.6 to 4.30.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](64d10c1313...f443b600d9)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.30.8
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-10-13 06:03:01 +00:00
Marcus Bointon 97ccd46848
Merge pull request #3036 from mariuszkrzaczkowski/patch-1 
Add cid default domain
 2025-10-06 09:55:06 +02:00
Mariusz Krzaczkowski 86b9838806
Merge branch 'PHPMailer:master' into patch-1 2025-10-06 09:38:53 +02:00
Marcus Bointon 46f72568d5
Changelog 2025-10-06 09:33:42 +02:00
Marcus Bointon ad2821203f
Unset From address to check default CID behaviour 2025-10-06 09:28:56 +02:00
Marcus Bointon 54b2ab00d3
Fix $cid assembly 2025-10-06 09:21:07 +02:00
Marcus Bointon 73afb4a8b1
Merge remote-tracking branch 'cid/patch-1' into patch-1 2025-10-06 09:11:15 +02:00
Marcus Bointon c09730a7d7
CS 2025-10-06 09:10:51 +02:00
Mariusz Krzaczkowski 306ea7022f
Update PHPMailer.php 2025-10-06 09:10:51 +02:00
Mariusz Krzaczkowski 0f9ebf7c3c
Update PHPMailerTest.php 2025-10-06 09:10:51 +02:00
Mariusz Krzaczkowski 6aad52aa06
Update PHPMailerTest.php 2025-10-06 09:10:51 +02:00
Mariusz Krzaczkowski 7a18c0bc98
Update PHPMailerTest.php 2025-10-06 09:10:51 +02:00
Mariusz Krzaczkowski 9489d4c5c3
Update PHPMailer.php 2025-10-06 09:10:51 +02:00
Mariusz Krzaczkowski 2e38fff8f3
Add cid default domain 2025-10-06 09:10:51 +02:00
Mariusz Krzaczkowski 9a5f46f747
Add cid default domain 2025-10-06 09:10:51 +02:00
Marcus Bointon 7251db8b19
CS 2025-10-06 09:07:54 +02:00
Marcus Bointon 27e89fabc3
Merge pull request #3245 from PHPMailer/dependabot/github_actions/action-runners-2eaf09b135 
GH Actions: Bump the action-runners group with 2 updates
 2025-10-06 08:44:48 +02:00
dependabot[bot] c60f5ab888
GH Actions: Bump the action-runners group with 2 updates 
Bumps the action-runners group with 2 updates: [ossf/scorecard-action](https://github.com/ossf/scorecard-action) and [github/codeql-action](https://github.com/github/codeql-action).


Updates `ossf/scorecard-action` from 2.4.2 to 2.4.3
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](05b42c6244...4eaacf0543)

Updates `github/codeql-action` from 3.30.5 to 3.30.6
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](3599b3baa1...64d10c1313)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-version: 2.4.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: action-runners
- dependency-name: github/codeql-action
  dependency-version: 3.30.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: action-runners
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-10-06 06:02:48 +00:00
Mariusz Krzaczkowski e8f4d86c66
Update PHPMailer.php 2025-10-02 11:18:08 +02:00