kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-04-28 10:33:00 +00:00
Code Issues Projects Releases Wiki Activity
22,851 Commits 8 Branches 1,028 Tags
f5dea9ac09def69fc689e56d2829cbcd5e92cf1c
Commit Graph

22851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
f5dea9ac09 Merge pull request #11999 from firefly-iii/develop 
🤖 Automatically merge the PR into the main branch.
v6.5.8 		2026-03-21 11:54:49 +01:00
github-actions[bot]
4ef7944147 Merge pull request #11998 from firefly-iii/release-1774090477 
🤖 Automatically merge the PR into the develop branch.
 2026-03-21 11:54:45 +01:00
JC5
4e1c84944c 🤖 Auto commit for release 'v6.5.8' on 2026-03-21 2026-03-21 11:54:37 +01:00
github-actions[bot]
f36da26cc3 Merge pull request #11997 from firefly-iii/release-1774090121 
🤖 Automatically merge the PR into the develop branch.
develop-20260321.1 		2026-03-21 11:48:48 +01:00
JC5
5983a8eb6d 🤖 Auto commit for release 'develop' on 2026-03-21 2026-03-21 11:48:41 +01:00
James Cole
b4a8a219ff Fix https://github.com/firefly-iii/firefly-iii/issues/11995 2026-03-21 11:42:55 +01:00
github-actions[bot]
4190c4d243 Merge pull request #11994 from firefly-iii/develop 
🤖 Automatically merge the PR into the main branch.
v6.5.7 		2026-03-21 07:44:44 +01:00
github-actions[bot]
70cbbc1523 Merge pull request #11993 from firefly-iii/release-1774075474 
🤖 Automatically merge the PR into the develop branch.
 2026-03-21 07:44:40 +01:00
JC5
c724f13501 🤖 Auto commit for release 'v6.5.7' on 2026-03-21 2026-03-21 07:44:34 +01:00
James Cole
5f01a83b43 Fix phpstan issues. 2026-03-21 07:36:52 +01:00
James Cole
53c13d221d Clean up API routes. 2026-03-21 07:27:10 +01:00
James Cole
266cd7d8d0 Update changelog and html rendering. 2026-03-21 07:01:42 +01:00
github-actions[bot]
7c09278c8e Merge pull request #11992 from firefly-iii/release-1774047683 
🤖 Automatically merge the PR into the develop branch.
develop-20260321 		2026-03-21 00:01:32 +01:00
JC5
21af34c65a 🤖 Auto commit for release 'develop' on 2026-03-21 2026-03-21 00:01:23 +01:00
James Cole
594c04b121 Add date. 2026-03-20 23:55:46 +01:00
James Cole
c50408249b Update changelog for the next release. 2026-03-20 23:52:53 +01:00
James Cole
b05a38c0e2 So let's make this absolutely clear. 2026-03-20 23:48:42 +01:00
James Cole
0bb1afdf6c Fuck these AI agents. 2026-03-20 23:36:57 +01:00
James Cole
547b83b36e Call dedicated method. 2026-03-20 15:43:04 +01:00
James Cole
134d8c8cf6 Merge branch 'main' into develop 2026-03-20 10:42:05 +01:00
James Cole
94144a407d Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 
# Conflicts:
#	app/Services/Internal/Recalculate/PrimaryAmountRecalculationService.php
 2026-03-20 08:49:29 +01:00
James Cole
15e29d133a Expand the pull request template 2026-03-20 08:48:18 +01:00
github-actions[bot]
889ba9f3e6 Merge pull request #11990 from firefly-iii/release-1773991497 
🤖 Automatically merge the PR into the develop branch.
develop-20260320 		2026-03-20 08:25:08 +01:00
JC5
32fe62df03 🤖 Auto commit for release 'develop' on 2026-03-20 2026-03-20 08:24:57 +01:00
James Cole
21f9be6504 Rewrite calculation service for #11982 
- moved reset methods to this class
- Add method `recalculateForGroupAndCurrency` that accepts a $limitCurrency as third argument.
- Add `recalculateAccountsForCurrency` and `calculateTransactionsForCurrency`

`recalculateForGroupAndCurrency` can recalculate any foreign amount back to the primary currency (just like the class was already capable of) BUT limits the action to foreign amounts in $limitCurrency. This greatly reduces the rework necessary. This means the method can be safely called when changing currency exchange rates.

Not all methods in `recalculateForGroupAndCurrency` actually care about the given $limitCurrency but the methods that don't aren't doing much anyway, so it's OK to recalculate everything even though its not necessary.
 2026-03-20 07:17:33 +01:00
James Cole
d514792f4d Add new handler for currency exchange rate events #11982 2026-03-20 07:14:34 +01:00
James Cole
5894695ad6 Can also collect budgets for user groups #11982 2026-03-20 07:14:19 +01:00
James Cole
7004c9aaf5 Add missing link to user group in currency exchange rate #11982 2026-03-20 07:14:10 +01:00
James Cole
1893a33d84 Move methods to calculation service for #11982 2026-03-20 07:13:54 +01:00
James Cole
d345b31cd4 Catch missing keys in old data for #11982 2026-03-20 07:13:38 +01:00
James Cole
a27642024d Add events for #11982 2026-03-20 07:13:26 +01:00
James Cole
c23ad831d0 New events for https://github.com/firefly-iii/firefly-iii/issues/11982 2026-03-20 06:35:39 +01:00
James Cole
d50c283973 Merge pull request #11988 from firefly-iii/dependabot/composer/composer-bc2e42b409 
Bump league/commonmark from 2.8.1 to 2.8.2 in the composer group across 1 directory
 2026-03-20 06:04:05 +01:00
dependabot[bot]
9ea3519585 Bump league/commonmark in the composer group across 1 directory 
Bumps the composer group with 1 update in the / directory: [league/commonmark](https://github.com/thephpleague/commonmark).


Updates `league/commonmark` from 2.8.1 to 2.8.2
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.8/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.8.1...2.8.2)

---
updated-dependencies:
- dependency-name: league/commonmark
  dependency-version: 2.8.2
  dependency-type: direct:production
  dependency-group: composer
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-20 05:02:47 +00:00
James Cole
ddb5bc6038 Merge pull request #11985 from firefly-iii/dependabot/composer/composer-9e6dd9d4c4 
Bump phpseclib/phpseclib from 3.0.49 to 3.0.50 in the composer group across 1 directory
 2026-03-20 06:02:02 +01:00
James Cole
b3d048eb67 Fix https://github.com/orgs/firefly-iii/discussions/11977 2026-03-20 06:01:23 +01:00
dependabot[bot]
caadef7c64 Bump phpseclib/phpseclib in the composer group across 1 directory 
Bumps the composer group with 1 update in the / directory: [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib).


Updates `phpseclib/phpseclib` from 3.0.49 to 3.0.50
- [Release notes](https://github.com/phpseclib/phpseclib/releases)
- [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md)
- [Commits](https://github.com/phpseclib/phpseclib/compare/3.0.49...3.0.50)

---
updated-dependencies:
- dependency-name: phpseclib/phpseclib
  dependency-version: 3.0.50
  dependency-type: indirect
  dependency-group: composer
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-19 17:14:44 +00:00
James Cole
f7c01e6821 Restore v2 layout in dev. 2026-03-18 06:10:21 +01:00
James Cole
3a971d738c Fix https://github.com/firefly-iii/firefly-iii/issues/11976 2026-03-18 05:33:42 +01:00
James Cole
1eb4ae3a2c Fix a variety of Mago issues. 2026-03-18 05:26:50 +01:00
James Cole
0f30eb59a4 Fix https://github.com/firefly-iii/firefly-iii/issues/11978 2026-03-18 05:10:25 +01:00
James Cole
9c10b01e8b Small code fixes. 2026-03-17 20:43:32 +01:00
James Cole
7c4f80a360 Small changes based on Mago rule 2026-03-17 17:29:24 +01:00
James Cole
e5c19f6088 Fix https://github.com/firefly-iii/firefly-iii/issues/11969 2026-03-17 16:26:57 +01:00
James Cole
b067215ba8 Merge pull request #11974 from NorskNoobing/patch-1 2026-03-17 10:57:44 +01:00
Daniel Holøien
a17d10b064 Fix typo in SMTP server comment in .env.example 
Signed-off-by: Daniel Holøien <39239702+NorskNoobing@users.noreply.github.com>
 2026-03-17 07:52:36 +01:00
github-actions[bot]
859fea532d Merge pull request #11967 from firefly-iii/release-1773691728 
🤖 Automatically merge the PR into the develop branch.
develop-20260316.1 		2026-03-16 21:10:01 +01:00
JC5
75261a46d9 🤖 Auto commit for release 'develop' on 2026-03-16 2026-03-16 21:08:48 +01:00
James Cole
a4a99310ea Fix bad comparison. 2026-03-16 21:02:52 +01:00
James Cole
8de0844e55 Remove old fields for tag 2026-03-16 20:54:57 +01:00