Compare commits

..

20 Commits

Author SHA1 Message Date
github-actions[bot]
a3e7fa008d Merge pull request #12025 from firefly-iii/release-1774347937
🤖 Automatically merge the PR into the develop branch.
2026-03-24 11:25:46 +01:00
JC5
205b5bd3bf 🤖 Auto commit for release 'develop' on 2026-03-24 2026-03-24 11:25:37 +01:00
Sander Dorigo
21c3dc3f56 Some demo user protections 2026-03-24 10:35:35 +01:00
github-actions[bot]
9c1f79110c Merge pull request #12021 from firefly-iii/release-1774251172
🤖 Automatically merge the PR into the develop branch.
2026-03-23 08:33:01 +01:00
JC5
bd62957908 🤖 Auto commit for release 'v6.5.9' on 2026-03-23 2026-03-23 08:32:53 +01:00
github-actions[bot]
a7e4252b46 Merge pull request #12020 from firefly-iii/release-1774249889
🤖 Automatically merge the PR into the develop branch.
2026-03-23 08:11:38 +01:00
JC5
c18691d6b3 🤖 Auto commit for release 'develop' on 2026-03-23 2026-03-23 08:11:29 +01:00
github-actions[bot]
b4dbcdcfba Merge pull request #12018 from firefly-iii/release-1774249482
🤖 Automatically merge the PR into the develop branch.
2026-03-23 08:04:52 +01:00
JC5
b0a6acb334 🤖 Auto commit for release 'v6.5.9' on 2026-03-23 2026-03-23 08:04:42 +01:00
github-actions[bot]
a0c423b9ed Merge pull request #12017 from firefly-iii/release-1774238341
🤖 Automatically merge the PR into the develop branch.
2026-03-23 04:59:09 +01:00
JC5
2844929351 🤖 Auto commit for release 'develop' on 2026-03-23 2026-03-23 04:59:01 +01:00
James Cole
c0d4a70d46 Update changelog for next release. 2026-03-22 17:10:47 +01:00
James Cole
a62f8bbaff Fix https://github.com/firefly-iii/firefly-iii/issues/12014 2026-03-22 17:05:31 +01:00
James Cole
b115b4ad92 Improve PR template. 2026-03-22 13:38:04 +01:00
github-actions[bot]
dc60025097 Merge pull request #12012 from firefly-iii/release-1774166607
🤖 Automatically merge the PR into the develop branch.
2026-03-22 09:03:34 +01:00
JC5
d77769b2f4 🤖 Auto commit for release 'develop' on 2026-03-22 2026-03-22 09:03:27 +01:00
James Cole
c6497960f8 Try updating package lock/ 2026-03-22 08:58:15 +01:00
James Cole
4eee0c79cd Go to vite plugin 3. 2026-03-22 08:36:43 +01:00
James Cole
e333c3254b Merge pull request #11961 from firefly-iii/dependabot/npm_and_yarn/develop/vite-8.0.0
Bump vite from 7.3.1 to 8.0.0
2026-03-22 07:21:07 +01:00
dependabot[bot]
974c84a877 Bump vite from 7.3.1 to 8.0.0
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 7.3.1 to 8.0.0.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/create-vite@8.0.0/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 8.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-03-16 03:52:51 +00:00
7 changed files with 566 additions and 807 deletions

View File

@@ -6,6 +6,8 @@
2. If your PR is more than 25 lines, talk to me FIRST.
3. If you fix spelling or code comments, talk to me FIRST.
This is to prevent AI bots, low-effort PRs and spam. Sorry about that.
Wanna talk to me? Open a GitHub Issue, Discussion, or email me: james@firefly-iii.org
👀 Please ensure you have taken a look at the contribution guidelines:
@@ -17,7 +19,9 @@ Remember that your PR may be CLOSED:
2. If you open a PR on the main branch, your PR will be CLOSED.
3. If you only fix a spelling error or code comment, your PR will be CLOSED.
Thanks again, and happy developing!
Again, this is to prevent AI bots, low-effort PRs and spam. I apologize for the harsh tone.
But if you made it this far thanks again for contributing, and happy developing!
-->
@@ -48,3 +52,6 @@ I used AI assistance for:
<!--
Thanks for contributing!
-->
@JC5

View File

@@ -246,14 +246,14 @@ final class PreferencesController extends Controller
$all = $request->only($keys);
foreach (config('notifications.notifications.user') as $key => $info) {
$key = sprintf('notification_%s', $key);
if (array_key_exists($key, $all)) {
if (array_key_exists($key, $all) && false === auth()->user()->hasRole('demo')) {
Log::debug(sprintf('update notification to true: %s', $key));
Preferences::set($key, true);
continue;
}
if (!array_key_exists($key, $all)) {
Log::debug(sprintf('update notification to false: %s', $key));
Preferences::set($key, false);
}
Log::debug(sprintf('update notification to false: %s', $key));
Preferences::set($key, false);
}
unset($all);
@@ -369,6 +369,12 @@ final class PreferencesController extends Controller
$all = $request->only(['channel']);
$channel = $all['channel'] ?? '';
if (true === auth()->user()->hasRole('demo')) {
session()->flash('error', (string) trans('firefly.not_available_demo_user'));
return redirect(route('preferences.index'));
}
switch ($channel) {
default:
session()->flash('error', (string) trans('firefly.notification_test_failed', ['channel' => $channel]));

View File

@@ -774,8 +774,8 @@ class JournalUpdateService
$this->transactionJournal,
'update_foreign_amount',
[
'currency_symbol' => $oldForeignCurrency->symbol,
'decimal_places' => $oldForeignCurrency->decimal_places,
'currency_symbol' => $oldForeignCurrency?->symbol,
'decimal_places' => $oldForeignCurrency?->decimal_places,
'amount' => $originalSourceAmount,
],
[

View File

@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## v6.5.9 - 2026-03-23
<!-- summary: Bug fixes mainly, but also updated dependencies and new wording in the instructions you see when you open a PR. -->
### Fixed
- [Issue 12004](https://github.com/firefly-iii/firefly-iii/issues/12004) (Test notification buttons always generate an error) reported by @IDevJoe
- [Issue 12014](https://github.com/firefly-iii/firefly-iii/issues/12014) (Converting a transaction to a transfer and setting the destination account to one with a different currency breaks the audit log) reported by @avee87
# Changed
- [Issue 12000](https://github.com/firefly-iii/firefly-iii/issues/12000) (Improved transaction pagination for large data sets) reported by @christiaanderidder
## v6.5.8 - 2026-03-22
<!-- summary: This release fixes a regression bug in user registration. -->

View File

@@ -78,8 +78,8 @@ return [
'running_balance_column' => (bool)envDefaultWhenEmpty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2026-03-22',
'build_time' => 1774159352,
'version' => 'develop/2026-03-24',
'build_time' => 1774347749,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.

1325
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -9,10 +9,10 @@
},
"devDependencies": {
"axios": "^1",
"laravel-vite-plugin": "^2",
"laravel-vite-plugin": "^3",
"patch-package": "^8",
"sass": "^1",
"vite": "^7",
"vite": "^8",
"vite-plugin-manifest-sri": "^0.2.0"
},
"dependencies": {