From c9dba81f3608f9e251777350ac17a0562e4e7966 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 06:49:32 +0200 Subject: [PATCH] Auto commit for release 'v1.5.0' on 2024-04-17 --- changelog.md | 10 ++++---- composer.lock | 60 +++++++++++++++++++++------------------------ config/importer.php | 2 +- package-lock.json | 6 ++--- 4 files changed, 37 insertions(+), 41 deletions(-) diff --git a/changelog.md b/changelog.md index bc392b43..5dcdf193 100644 --- a/changelog.md +++ b/changelog.md @@ -6,17 +6,17 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added - The data importer has a release flow just like Firefly III, dropping generated JS files and other dependencies from the repository. -- #8665 -- #8691 +- [Issue 8665](https://github.com/firefly-iii/firefly-iii/issues/8665) (API exception if transaction is deleted by rule) reported by @Medformatik +- [Issue 8691](https://github.com/firefly-iii/firefly-iii/issues/8691) (Import gocardless "merchantCategoryCode") reported by @tboby ### Changed - Rewrote front-end layout to AlpineJS + Laravel Blade, moving away from Twig + Vue. - Some rules in the PR template ### Fixed -- #8709 -- #8736 -- #8771 +- [Discussion 8709](https://github.com/orgs/firefly-iii/discussions/8709) (Data importer imports duplicates of deleted transactions when detection is set to external id) started by @kesot +- [Issue 8736](https://github.com/firefly-iii/firefly-iii/issues/8736) (Error importing CAMT.053 XML with data-importer) reported by @Gamesh +- [Issue 8771](https://github.com/firefly-iii/firefly-iii/issues/8771) (Typo on Data Importer log) reported by @jemtz-deleon - [PR 575](https://github.com/firefly-iii/data-importer/pull/575) (Update `.env.example`, `ASSET_URL` moved, example given) by @stevewasiura ## 1.4.5 - 2024-03-21 diff --git a/composer.lock b/composer.lock index ccb7bcbf..1371898b 100644 --- a/composer.lock +++ b/composer.lock @@ -1257,16 +1257,16 @@ }, { "name": "laravel/framework", - "version": "v11.3.1", + "version": "v11.4.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "3b87d0767e9cbddec46480d883010ba720e50dea" + "reference": "c1dc67c28811dc5be524a30b18f29ce62126716a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/3b87d0767e9cbddec46480d883010ba720e50dea", - "reference": "3b87d0767e9cbddec46480d883010ba720e50dea", + "url": "https://api.github.com/repos/laravel/framework/zipball/c1dc67c28811dc5be524a30b18f29ce62126716a", + "reference": "c1dc67c28811dc5be524a30b18f29ce62126716a", "shasum": "" }, "require": { @@ -1285,7 +1285,7 @@ "fruitcake/php-cors": "^1.3", "guzzlehttp/guzzle": "^7.8", "guzzlehttp/uri-template": "^1.0", - "laravel/prompts": "^0.1.15", + "laravel/prompts": "^0.1.18", "laravel/serializable-closure": "^1.3", "league/commonmark": "^2.2.1", "league/flysystem": "^3.8.0", @@ -1458,20 +1458,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-04-10T15:13:49+00:00" + "time": "2024-04-16T14:38:51+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.18", + "version": "v0.1.19", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "3b5e6b03f1f1175574b5a32331d99c9819da9848" + "reference": "0ab75ac3434d9f610c5691758a6146a3d1940c18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/3b5e6b03f1f1175574b5a32331d99c9819da9848", - "reference": "3b5e6b03f1f1175574b5a32331d99c9819da9848", + "url": "https://api.github.com/repos/laravel/prompts/zipball/0ab75ac3434d9f610c5691758a6146a3d1940c18", + "reference": "0ab75ac3434d9f610c5691758a6146a3d1940c18", "shasum": "" }, "require": { @@ -1513,9 +1513,9 @@ ], "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.18" + "source": "https://github.com/laravel/prompts/tree/v0.1.19" }, - "time": "2024-04-04T17:41:50+00:00" + "time": "2024-04-16T14:20:35+00:00" }, { "name": "laravel/serializable-closure", @@ -6932,16 +6932,16 @@ }, { "name": "larastan/larastan", - "version": "v2.9.4", + "version": "v2.9.5", "source": { "type": "git", "url": "https://github.com/larastan/larastan.git", - "reference": "3e7b1217c0021c29727a6df078830d4ef908f3bf" + "reference": "101f1a4470f87326f4d3995411d28679d8800abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/larastan/larastan/zipball/3e7b1217c0021c29727a6df078830d4ef908f3bf", - "reference": "3e7b1217c0021c29727a6df078830d4ef908f3bf", + "url": "https://api.github.com/repos/larastan/larastan/zipball/101f1a4470f87326f4d3995411d28679d8800abe", + "reference": "101f1a4470f87326f4d3995411d28679d8800abe", "shasum": "" }, "require": { @@ -7010,7 +7010,7 @@ ], "support": { "issues": "https://github.com/larastan/larastan/issues", - "source": "https://github.com/larastan/larastan/tree/v2.9.4" + "source": "https://github.com/larastan/larastan/tree/v2.9.5" }, "funding": [ { @@ -7030,7 +7030,7 @@ "type": "patreon" } ], - "time": "2024-04-14T14:47:58+00:00" + "time": "2024-04-16T19:13:34+00:00" }, { "name": "laravel/ui", @@ -7870,16 +7870,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.66", + "version": "1.10.67", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "94779c987e4ebd620025d9e5fdd23323903950bd" + "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/94779c987e4ebd620025d9e5fdd23323903950bd", - "reference": "94779c987e4ebd620025d9e5fdd23323903950bd", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/16ddbe776f10da6a95ebd25de7c1dbed397dc493", + "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493", "shasum": "" }, "require": { @@ -7922,13 +7922,9 @@ { "url": "https://github.com/phpstan", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", - "type": "tidelift" } ], - "time": "2024-03-28T16:17:31+00:00" + "time": "2024-04-16T07:22:02+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -8455,12 +8451,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "26c93a86d619bca3122e9c2d5be82578ba5ef843" + "reference": "db80e362f762211062612ae92774a7ea93bb713e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/26c93a86d619bca3122e9c2d5be82578ba5ef843", - "reference": "26c93a86d619bca3122e9c2d5be82578ba5ef843", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/db80e362f762211062612ae92774a7ea93bb713e", + "reference": "db80e362f762211062612ae92774a7ea93bb713e", "shasum": "" }, "conflict": { @@ -9039,7 +9035,7 @@ "thinkcmf/thinkcmf": "<=5.1.7", "thorsten/phpmyfaq": "<3.2.2", "tikiwiki/tiki-manager": "<=17.1", - "timber/timber": "<=2", + "timber/timber": "<=1.23|==1.24|==2", "tinymce/tinymce": "<7", "tinymighty/wiki-seo": "<1.2.2", "titon/framework": "<9.9.99", @@ -9194,7 +9190,7 @@ "type": "tidelift" } ], - "time": "2024-04-15T19:04:12+00:00" + "time": "2024-04-16T20:05:01+00:00" }, { "name": "sebastian/cli-parser", diff --git a/config/importer.php b/config/importer.php index 09646fe1..2bc65965 100644 --- a/config/importer.php +++ b/config/importer.php @@ -23,7 +23,7 @@ declare(strict_types=1); return [ - 'version' => 'develop/2024-04-16', + 'version' => '1.5.0', 'flows' => ['nordigen', 'spectre', 'file'], 'flow_titles' => [ 'file' => 'File', diff --git a/package-lock.json b/package-lock.json index 01c57dd6..cf0714f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1113,9 +1113,9 @@ "link": true }, "node_modules/vite": { - "version": "5.2.8", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz", - "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==", + "version": "5.2.9", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.9.tgz", + "integrity": "sha512-uOQWfuZBlc6Y3W/DTuQ1Sr+oIXWvqljLvS881SVmAj00d5RdgShLcuXWxseWPd4HXwiYBFW/vXHfKFeqj9uQnw==", "dev": true, "dependencies": { "esbuild": "^0.20.1",