IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -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 2021-03-30 06:11:04 +02:00
commit abeff39829
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelog.md
View File

@ -17,7 +17,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Initial release. - Initial release.
### Fixed ### Fixed
- #4547 Call to bad function breaks several reports - #4547 Call to bad function breaks several report.
- #4545 Migration error in some cases, fixed with an if-statement.
- #4557 LDAP configuration error in Docker image.
### Security ### Security
- Initial release. - Initial release.

23
composer.lock generated
View File

@ -2152,16 +2152,16 @@
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
"version": "1.5.7", "version": "1.5.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/commonmark.git", "url": "https://github.com/thephpleague/commonmark.git",
"reference": "11df9b36fd4f1d2b727a73bf14931d81373b9a54" "reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/11df9b36fd4f1d2b727a73bf14931d81373b9a54", "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf",
"reference": "11df9b36fd4f1d2b727a73bf14931d81373b9a54", "reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2249,7 +2249,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-10-31T13:49:32+00:00" "time": "2021-03-28T18:51:39+00:00"
}, },
{ {
"name": "league/csv", "name": "league/csv",
@ -11351,16 +11351,16 @@
}, },
{ {
"name": "vimeo/psalm", "name": "vimeo/psalm",
"version": "4.6.4", "version": "4.7.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/vimeo/psalm.git", "url": "https://github.com/vimeo/psalm.git",
"reference": "97fe86c4e158b5a57c5150aa5055c38b5a809aab" "reference": "d4377c0baf3ffbf0b1ec6998e8d1be2a40971005"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/vimeo/psalm/zipball/97fe86c4e158b5a57c5150aa5055c38b5a809aab", "url": "https://api.github.com/repos/vimeo/psalm/zipball/d4377c0baf3ffbf0b1ec6998e8d1be2a40971005",
"reference": "97fe86c4e158b5a57c5150aa5055c38b5a809aab", "reference": "d4377c0baf3ffbf0b1ec6998e8d1be2a40971005",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11402,6 +11402,7 @@
"slevomat/coding-standard": "^6.3.11", "slevomat/coding-standard": "^6.3.11",
"squizlabs/php_codesniffer": "^3.5", "squizlabs/php_codesniffer": "^3.5",
"symfony/process": "^4.3", "symfony/process": "^4.3",
"weirdan/phpunit-appveyor-reporter": "^1.0.0",
"weirdan/prophecy-shim": "^1.0 || ^2.0" "weirdan/prophecy-shim": "^1.0 || ^2.0"
}, },
"suggest": { "suggest": {
@ -11449,9 +11450,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/vimeo/psalm/issues", "issues": "https://github.com/vimeo/psalm/issues",
"source": "https://github.com/vimeo/psalm/tree/4.6.4" "source": "https://github.com/vimeo/psalm/tree/4.7.0"
}, },
"time": "2021-03-16T23:28:18+00:00" "time": "2021-03-29T03:54:38+00:00"
}, },
{ {
"name": "webmozart/path-util", "name": "webmozart/path-util",