kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7116 from firefly-iii/fix-6985

Browse Source 
Fix 6985
This commit is contained in:
James Cole
2023-03-04 07:36:10 +01:00
committed by GitHub
parent c4418857e6 a7011376cb
commit ed75d84376
3 changed files with 123 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@@ -105,7 +105,8 @@
"rcrowe/twigbridge": "^0.14",
"spatie/laravel-ignition": "^2",
"symfony/http-client": "^6.0",
"symfony/mailgun-mailer": "^6.0"
"symfony/mailgun-mailer": "^6.0",
"therobfonz/laravel-mandrill-driver": "^5.0"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "2.*",

118
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "7de460f25e29fa2bf56806de51c5ab1a",
"content-hash": "5222cd3e809043ea947cebe3a19cf938",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -3480,6 +3480,60 @@
],
"time": "2021-06-28T04:27:21+00:00"
},
{
"name": "mailchimp/transactional",
"version": "1.0.50",
"source": {
"type": "git",
"url": "https://github.com/mailchimp/mailchimp-transactional-php.git",
"reference": "701b00f538f36a2a5b138f880ab5eebbfeff4b7d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mailchimp/mailchimp-transactional-php/zipball/701b00f538f36a2a5b138f880ab5eebbfeff4b7d",
"reference": "701b00f538f36a2a5b138f880ab5eebbfeff4b7d",
"shasum": ""
},
"require": {
"ext-curl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"guzzlehttp/guzzle": "^6.4 || ^7.2",
"php": ">=7.2"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2.12",
"phpunit/phpunit": "^7",
"squizlabs/php_codesniffer": "~2.6"
},
"type": "library",
"autoload": {
"psr-4": {
"MailchimpTransactional\\": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"proprietary"
],
"authors": [
{
"name": "Mailchimp",
"homepage": "https://github.com/mailchimp/mailchimp-transactional-php"
}
],
"homepage": "http://swagger.io",
"keywords": [
"api",
"php",
"sdk",
"swagger"
],
"support": {
"source": "https://github.com/mailchimp/mailchimp-transactional-php/tree/v1.0.50"
},
"time": "2022-11-07T20:12:03+00:00"
},
{
"name": "monolog/monolog",
"version": "3.3.1",
@@ -8251,6 +8305,68 @@
],
"time": "2023-02-24T10:42:00+00:00"
},
{
"name": "therobfonz/laravel-mandrill-driver",
"version": "5.0.0",
"source": {
"type": "git",
"url": "https://github.com/luisdalmolin/laravel-mandrill-driver.git",
"reference": "a492a580e984c9bae5d59bbc2660f75af4ea2c0d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/luisdalmolin/laravel-mandrill-driver/zipball/a492a580e984c9bae5d59bbc2660f75af4ea2c0d",
"reference": "a492a580e984c9bae5d59bbc2660f75af4ea2c0d",
"shasum": ""
},
"require": {
"illuminate/support": "^10.0",
"mailchimp/transactional": "^1.0",
"php": "^8.1",
"symfony/mailer": "^6.0"
},
"require-dev": {
"mockery/mockery": "^1.4.4",
"phpunit/phpunit": "^9.5.10"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"LaravelMandrill\\MandrillServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"LaravelMandrill\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Rob Fonseca",
"email": "robfonseca@gmail.com"
},
{
"name": "Brandon Ferens",
"email": "brandon@kirschbaumdevelopment.com"
}
],
"description": "Mandrill Driver for Laravel 9+",
"keywords": [
"laravel",
"mandrill"
],
"support": {
"issues": "https://github.com/luisdalmolin/laravel-mandrill-driver/issues",
"source": "https://github.com/luisdalmolin/laravel-mandrill-driver/tree/5.0.0"
},
"time": "2023-01-31T13:48:27+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
"version": "2.2.6",

4
config/mail.php
View File

@@ -55,6 +55,10 @@ return [
'transport' => 'mailgun',
],
'mandrill' => [
'transport' => 'mandrill',
],
'postmark' => [
'transport' => 'postmark',
],