kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity
20,968 Commits 4 Branches 760 Tags
6d3f2bd5e77a42bcba5019a22fc03c6b56c7eea9
Commit Graph

20968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole
6d3f2bd5e7 Rename many references from native to primary. 2025-07-31 20:24:19 +02:00
James Cole
210bd83bd4 Rename method. 2025-07-31 20:17:46 +02:00
James Cole
65a926874b Rename "native" to "primary". 2025-07-31 20:16:16 +02:00
James Cole
d0e7681e56 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2025-07-31 18:17:02 +02:00
James Cole
33bde854ec Add conversion 2025-07-31 18:16:54 +02:00
github-actions[bot]
da874c97f4 Merge pull request #10677 from firefly-iii/release-1753977340 
🤖 Automatically merge the PR into the develop branch.
develop-20250731.4 		2025-07-31 17:55:52 +02:00
JC5
aa7ec95a59 🤖 Auto commit for release 'develop' on 2025-07-31 2025-07-31 17:55:40 +02:00
James Cole
4dd77303f7 Fix filtered list. 2025-07-31 17:51:07 +02:00
github-actions[bot]
54bf56bbb0 Merge pull request #10676 from firefly-iii/release-1753963346 
🤖 Automatically merge the PR into the develop branch.
develop-20250731.3 		2025-07-31 14:02:37 +02:00
JC5
3d8c6671f4 🤖 Auto commit for release 'develop' on 2025-07-31 2025-07-31 14:02:26 +02:00
Sander Dorigo
4e33de9c29 Fix missing filter 2025-07-31 13:54:12 +02:00
Sander Dorigo
27d46eb3fa Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop 2025-07-31 11:32:36 +02:00
Sander Dorigo
e1e7a2e497 Update file 2025-07-31 11:32:31 +02:00
github-actions[bot]
a476b4259c Merge pull request #10675 from firefly-iii/release-1753950988 
🤖 Automatically merge the PR into the develop branch.
develop-20250731.2 		2025-07-31 10:36:37 +02:00
JC5
0c03ec5ddd 🤖 Auto commit for release 'develop' on 2025-07-31 2025-07-31 10:36:28 +02:00
Sander Dorigo
2d95b7f8ef Update bill transformers with enrichments 2025-07-31 10:00:05 +02:00
github-actions[bot]
34cc79ce4f Merge pull request #10674 from firefly-iii/release-1753940049 
🤖 Automatically merge the PR into the develop branch.
develop-20250731.1 		2025-07-31 07:34:18 +02:00
JC5
6ff9943fe0 🤖 Auto commit for release 'develop' on 2025-07-31 2025-07-31 07:34:09 +02:00
James Cole
a0166b45e4 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 
# Conflicts:
#	app/Api/V1/Controllers/Models/Bill/ShowController.php
#	app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
#	app/Transformers/BillTransformer.php
 2025-07-31 07:30:25 +02:00
James Cole
d27b035b20 Clean up transformer. 2025-07-31 07:28:25 +02:00
github-actions[bot]
f3b387fc22 Merge pull request #10673 from firefly-iii/release-1753936796 
🤖 Automatically merge the PR into the develop branch.
develop-20250731 		2025-07-31 06:40:05 +02:00
JC5
03904ffcde 🤖 Auto commit for release 'develop' on 2025-07-31 2025-07-31 06:39:56 +02:00
James Cole
a7973190c2 Start improving bill overview. 2025-07-30 20:35:28 +02:00
James Cole
671ff95f22 Improved subscription overview 2025-07-30 18:57:32 +02:00
github-actions[bot]
01181ceea9 Merge pull request #10672 from firefly-iii/release-1753879077 
🤖 Automatically merge the PR into the develop branch.
develop-20250730.1 		2025-07-30 14:38:08 +02:00
JC5
97643639d1 🤖 Auto commit for release 'develop' on 2025-07-30 2025-07-30 14:37:57 +02:00
James Cole
424783c47b Add convertToNative to cache key. 2025-07-30 14:33:26 +02:00
James Cole
ea0ced70b2 Clean up sankey. 2025-07-30 11:24:00 +02:00
James Cole
1a633e64ef Category chart will also convert. 2025-07-30 10:20:35 +02:00
James Cole
30da3f4399 Also include budget in currency conversion. 2025-07-30 09:59:52 +02:00
github-actions[bot]
6bdff95d87 Merge pull request #10671 from firefly-iii/release-1753858574 
🤖 Automatically merge the PR into the develop branch.
develop-20250730 		2025-07-30 08:56:22 +02:00
JC5
895ae279d5 🤖 Auto commit for release 'develop' on 2025-07-30 2025-07-30 08:56:14 +02:00
James Cole
8b57f45963 Return the promise. 2025-07-30 08:37:19 +02:00
James Cole
a2d2b7edd3 Add warning to translations. 2025-07-30 07:27:00 +02:00
James Cole
3d65f00c6e Correct tag date and add warning. 2025-07-30 07:26:50 +02:00
James Cole
333004c4d9 Upgrade to font awesome 7, make sure chart includes currencies outside of limits. 2025-07-30 06:59:58 +02:00
James Cole
7451659824 Merge pull request #10661 from firefly-iii/dependabot/npm_and_yarn/develop/cross-env-10.0.0 
Bump cross-env from 7.0.3 to 10.0.0
 2025-07-28 20:44:31 +02:00
mergify[bot]
ec89c23ace Merge branch 'develop' into dependabot/npm_and_yarn/develop/cross-env-10.0.0 2025-07-28 05:08:38 +00:00
James Cole
92d07d346f Merge pull request #10660 from firefly-iii/dependabot/npm_and_yarn/develop/fortawesome/fontawesome-free-7.0.0 
Bump @fortawesome/fontawesome-free from 6.7.2 to 7.0.0
 2025-07-28 07:08:02 +02:00
mergify[bot]
a7ac894af2 Merge branch 'develop' into dependabot/npm_and_yarn/develop/cross-env-10.0.0 2025-07-28 04:39:49 +00:00
dependabot[bot]
20f89e3a7c Bump cross-env from 7.0.3 to 10.0.0 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 7.0.3 to 10.0.0.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v7.0.3...v10.0.0)

---
updated-dependencies:
- dependency-name: cross-env
  dependency-version: 10.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-07-28 04:39:15 +00:00
mergify[bot]
5d2f11c3c7 Merge branch 'develop' into dependabot/npm_and_yarn/develop/fortawesome/fontawesome-free-7.0.0 2025-07-28 04:38:58 +00:00
dependabot[bot]
1eea79e431 Bump @fortawesome/fontawesome-free from 6.7.2 to 7.0.0 
Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 6.7.2 to 7.0.0.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/7.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.7.2...7.0.0)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-07-28 04:38:22 +00:00
James Cole
1aaaac67ca Merge pull request #10659 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-2.1.20 
Bump phpstan/phpstan from 2.1.19 to 2.1.20
 2025-07-28 06:38:11 +02:00
mergify[bot]
1eb86639c9 Merge branch 'develop' into dependabot/composer/develop/phpstan/phpstan-2.1.20 2025-07-28 04:31:47 +00:00
dependabot[bot]
28b911c4ee Bump phpstan/phpstan from 2.1.19 to 2.1.20 
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 2.1.19 to 2.1.20.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/2.1.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/2.1.19...2.1.20)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-version: 2.1.20
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-07-28 04:31:06 +00:00
github-actions[bot]
c525c70ec0 Merge pull request #10657 from firefly-iii/release-1753673814 
🤖 Automatically merge the PR into the develop branch.
develop-20250728 		2025-07-28 05:37:03 +02:00
JC5
1f7d6e218b 🤖 Auto commit for release 'develop' on 2025-07-28 2025-07-28 05:36:54 +02:00
James Cole
a69b6d9ce2 Respond to "convert to native". 2025-07-27 20:45:08 +02:00
James Cole
28b2ddde18 Account chart can do live update 2025-07-27 07:36:23 +02:00