IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-08 07:03:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

Browse Source
This commit is contained in:
James Cole 2018-10-23 18:54:31 +02:00
commit 864a6883d4
3 changed files with 59 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -70,7 +70,7 @@
"league/flysystem-replicate-adapter": "^1.0",
"league/flysystem-sftp": "^1.0",
"league/fractal": "^0.17.0",
"litipk/flysystem-fallback-adapter": "^0.1.3",
"litipk/flysystem-fallback-adapter": "0.1.2",
"mschindler83/fints-hbci-php": "^1.0",
"pragmarx/google2fa": "3.*",
"pragmarx/google2fa-laravel": "0.*",

103
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": "f28fdf6ec034460c012d2734231029b7",
"content-hash": "a24c113aaca8cbdc1d0b0074c6e61392",
"packages": [
{
"name": "adldap2/adldap2",
@ -219,7 +219,7 @@
"payment",
"sepa"
],
"time": "2018-10-05T13:50:22+00:00"
"time": "2018-09-01T12:54:04+00:00"
},
{
"name": "danhunsaker/laravel-flysystem-others",
@ -1299,16 +1299,16 @@
},
{
"name": "laravel/framework",
"version": "v5.7.9",
"version": "v5.7.10",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "172f69f86bb86e107fb9fafff293b4b01291cf05"
"reference": "7d748c33b8c409b9b0c96704d6493853de41754d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/172f69f86bb86e107fb9fafff293b4b01291cf05",
"reference": "172f69f86bb86e107fb9fafff293b4b01291cf05",
"url": "https://api.github.com/repos/laravel/framework/zipball/7d748c33b8c409b9b0c96704d6493853de41754d",
"reference": "7d748c33b8c409b9b0c96704d6493853de41754d",
"shasum": ""
},
"require": {
@ -1390,6 +1390,7 @@
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
"ext-pcntl": "Required to use all features of the queue worker.",
"ext-posix": "Required to use all features of the queue worker.",
"filp/whoops": "Required for friendly error pages in development (^2.1.4).",
"fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).",
"guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (^6.0).",
"laravel/tinker": "Required to use the tinker console command (^1.0).",
@ -1437,7 +1438,7 @@
"framework",
"laravel"
],
"time": "2018-10-09T13:28:28+00:00"
"time": "2018-10-23T14:05:19+00:00"
},
{
"name": "laravel/passport",
@ -1822,16 +1823,16 @@
},
{
"name": "league/flysystem",
"version": "1.0.47",
"version": "1.0.48",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "a11e4a75f256bdacf99d20780ce42d3b8272975c"
"reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a11e4a75f256bdacf99d20780ce42d3b8272975c",
"reference": "a11e4a75f256bdacf99d20780ce42d3b8272975c",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a6ded5b2f6055e2db97b4b859fdfca2b952b78aa",
"reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa",
"shasum": ""
},
"require": {
@ -1902,7 +1903,7 @@
"sftp",
"storage"
],
"time": "2018-09-14T15:30:29+00:00"
"time": "2018-10-15T13:53:10+00:00"
},
{
"name": "league/flysystem-replicate-adapter",
@ -1952,16 +1953,16 @@
},
{
"name": "league/flysystem-sftp",
"version": "1.0.16",
"version": "1.0.17",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem-sftp.git",
"reference": "322839636847e0dba0f714e9ad0db813d65efcf2"
"reference": "49e216f1074b42e3ff344809e700672c2a3264ed"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem-sftp/zipball/322839636847e0dba0f714e9ad0db813d65efcf2",
"reference": "322839636847e0dba0f714e9ad0db813d65efcf2",
"url": "https://api.github.com/repos/thephpleague/flysystem-sftp/zipball/49e216f1074b42e3ff344809e700672c2a3264ed",
"reference": "49e216f1074b42e3ff344809e700672c2a3264ed",
"shasum": ""
},
"require": {
@ -1990,7 +1991,7 @@
}
],
"description": "Flysystem adapter for SFTP",
"time": "2018-07-08T21:01:51+00:00"
"time": "2018-10-14T21:07:28+00:00"
},
{
"name": "league/fractal",
@ -2128,16 +2129,16 @@
},
{
"name": "litipk/flysystem-fallback-adapter",
"version": "0.1.3",
"version": "0.1.2",
"source": {
"type": "git",
"url": "https://github.com/Litipk/flysystem-fallback-adapter.git",
"reference": "1fdeb9352990deb8cba2a2c57cc94e2ff7e1381b"
"reference": "9f3c35099a52c9f5339ab71ef6a7055fdab5243d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Litipk/flysystem-fallback-adapter/zipball/1fdeb9352990deb8cba2a2c57cc94e2ff7e1381b",
"reference": "1fdeb9352990deb8cba2a2c57cc94e2ff7e1381b",
"url": "https://api.github.com/repos/Litipk/flysystem-fallback-adapter/zipball/9f3c35099a52c9f5339ab71ef6a7055fdab5243d",
"reference": "9f3c35099a52c9f5339ab71ef6a7055fdab5243d",
"shasum": ""
},
"require": {
@ -2165,7 +2166,7 @@
}
],
"description": "Flysystem adapter for fallback filesystems",
"time": "2016-06-23T00:18:01+00:00"
"time": "2015-10-22T21:39:15+00:00"
},
{
"name": "monolog/monolog",
@ -4529,16 +4530,16 @@
},
{
"name": "composer/ca-bundle",
"version": "1.1.2",
"version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
"reference": "46afded9720f40b9dc63542af4e3e43a1177acb0"
"reference": "8afa52cd417f4ec417b4bfe86b68106538a87660"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0",
"reference": "46afded9720f40b9dc63542af4e3e43a1177acb0",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/8afa52cd417f4ec417b4bfe86b68106538a87660",
"reference": "8afa52cd417f4ec417b4bfe86b68106538a87660",
"shasum": ""
},
"require": {
@ -4581,7 +4582,7 @@
"ssl",
"tls"
],
"time": "2018-08-08T08:57:40+00:00"
"time": "2018-10-18T06:09:13+00:00"
},
{
"name": "composer/composer",
@ -4886,16 +4887,16 @@
},
{
"name": "filp/whoops",
"version": "2.2.1",
"version": "2.3.1",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
"reference": "e79cd403fb77fc8963a99ecc30e80ddd885b3311"
"reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/e79cd403fb77fc8963a99ecc30e80ddd885b3311",
"reference": "e79cd403fb77fc8963a99ecc30e80ddd885b3311",
"url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
"reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
"shasum": ""
},
"require": {
@ -4943,7 +4944,7 @@
"throwable",
"whoops"
],
"time": "2018-06-30T13:14:06+00:00"
"time": "2018-10-23T09:00:00+00:00"
},
{
"name": "fzaninotto/faker",
@ -5672,16 +5673,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "6.0.8",
"version": "6.1.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "848f78b3309780fef7ec8c4666b7ab4e6b09b22f"
"reference": "4d3ae9b21a7d7e440bd0cf65565533117976859f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/848f78b3309780fef7ec8c4666b7ab4e6b09b22f",
"reference": "848f78b3309780fef7ec8c4666b7ab4e6b09b22f",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4d3ae9b21a7d7e440bd0cf65565533117976859f",
"reference": "4d3ae9b21a7d7e440bd0cf65565533117976859f",
"shasum": ""
},
"require": {
@ -5692,7 +5693,7 @@
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-token-stream": "^3.0",
"sebastian/code-unit-reverse-lookup": "^1.0.1",
"sebastian/environment": "^3.1",
"sebastian/environment": "^3.1 || ^4.0",
"sebastian/version": "^2.0.1",
"theseer/tokenizer": "^1.1"
},
@ -5705,7 +5706,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.1-dev"
}
},
"autoload": {
@ -5731,7 +5732,7 @@
"testing",
"xunit"
],
"time": "2018-10-04T03:41:23+00:00"
"time": "2018-10-23T05:59:32+00:00"
},
{
"name": "phpunit/php-file-iterator",
@ -5924,16 +5925,16 @@
},
{
"name": "phpunit/phpunit",
"version": "7.4.0",
"version": "7.4.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "f3837fa1e07758057ae06e8ddec6d06ba183f126"
"reference": "c151651fb6ed264038d486ea262e243af72e5e64"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3837fa1e07758057ae06e8ddec6d06ba183f126",
"reference": "f3837fa1e07758057ae06e8ddec6d06ba183f126",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c151651fb6ed264038d486ea262e243af72e5e64",
"reference": "c151651fb6ed264038d486ea262e243af72e5e64",
"shasum": ""
},
"require": {
@ -5954,7 +5955,7 @@
"phpunit/php-timer": "^2.0",
"sebastian/comparator": "^3.0",
"sebastian/diff": "^3.0",
"sebastian/environment": "^3.1",
"sebastian/environment": "^3.1 || ^4.0",
"sebastian/exporter": "^3.1",
"sebastian/global-state": "^2.0",
"sebastian/object-enumerator": "^3.0.3",
@ -6004,7 +6005,7 @@
"testing",
"xunit"
],
"time": "2018-10-05T04:05:24+00:00"
"time": "2018-10-23T05:57:41+00:00"
},
{
"name": "roave/security-advisories",
@ -6040,12 +6041,14 @@
"doctrine/mongodb-odm-bundle": ">=2,<3.0.1",
"doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1",
"dompdf/dompdf": ">=0.6,<0.6.2",
"drupal/core": ">=7,<7.59|>=8,<8.4.8|>=8.5,<8.5.3",
"drupal/drupal": ">=7,<7.59|>=8,<8.4.8|>=8.5,<8.5.3",
"drupal/core": ">=7,<7.60|>=8,<8.5.8|>=8.6,<8.6.2",
"drupal/drupal": ">=7,<7.60|>=8,<8.5.8|>=8.6,<8.6.2",
"erusev/parsedown": "<1.7",
"ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.3|>=5.4,<5.4.11.3|>=2017.8,<2017.8.1.1|>=2017.12,<2017.12.2.1",
"ezyang/htmlpurifier": "<4.1.1",
"firebase/php-jwt": "<2",
"fooman/tcpdf": "<6.2.22",
"fossar/tcpdf-parser": "<6.2.22",
"friendsofsymfony/rest-bundle": ">=1.2,<1.2.2",
"friendsofsymfony/user-bundle": ">=1.2,<1.3.5",
"fuel/core": "<1.8.1",
@ -6062,6 +6065,7 @@
"jsmitty12/phpwhois": "<5.1",
"kazist/phpwhois": "<=4.2.6",
"kreait/firebase-php": ">=3.2,<3.8.1",
"la-haute-societe/tcpdf": "<6.2.22",
"laravel/framework": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30",
"laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10",
"magento/magento1ce": "<1.9.3.9",
@ -6100,6 +6104,7 @@
"slim/slim": "<2.6",
"smarty/smarty": "<3.1.33",
"socalnick/scn-social-auth": "<1.15.2",
"spoonity/tcpdf": "<6.2.22",
"squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1",
"stormpath/sdk": ">=0,<9.9.99",
"swiftmailer/swiftmailer": ">=4,<5.4.5",
@ -6124,6 +6129,7 @@
"symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3",
"symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4",
"symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7",
"tecnickcom/tcpdf": "<6.2.22",
"thelia/backoffice-default-template": ">=2.1,<2.1.2",
"thelia/thelia": ">=2.1,<2.1.2|>=2.1.0-beta1,<2.1.3",
"theonedemon/phpwhois": "<=4.2.5",
@ -6134,6 +6140,7 @@
"typo3/cms-core": ">=8,<8.7.17|>=9,<9.3.2",
"typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5",
"typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4",
"wallabag/tcpdf": "<6.2.22",
"willdurand/js-translation-bundle": "<2.1.1",
"yiisoft/yii": ">=1.1.14,<1.1.15",
"yiisoft/yii2": "<2.0.15",
@ -6181,7 +6188,7 @@
}
],
"description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
"time": "2018-10-12T22:19:58+00:00"
"time": "2018-10-21T18:01:48+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",

6
config/filesystems.php
View File

@ -28,13 +28,13 @@ $uploadDisk = [
$exportDisk = [
'driver' => 'mirror',
'disks' => ['local-upload'],
'disks' => ['local-export'],
];
// setting the SFTP host is enough to trigger the SFTP option.
if ('' !== env('SFTP_HOST', '')) {
array_unshift($uploadDisk['disks'], 'sftp-upload');
array_unshift($exportDisk['disks'], 'sftp-export');
array_push($uploadDisk['disks'], 'sftp-upload');
array_push($exportDisk['disks'], 'sftp-export');
}
return [