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
21,082 Commits 4 Branches 760 Tags
76e91be4dc7a9d1a2d6c54d6aea463419a419fbf
Commit Graph

21082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JC5
883994de19 🤖 Auto commit for release 'develop' on 2025-08-01 2025-08-01 13:10:11 +02:00
Sander Dorigo
62d72516ba Fix calls 2025-08-01 13:08:37 +02:00
Sander Dorigo
cfb86c683e Replace native with primary 2025-08-01 12:40:54 +02:00
Sander Dorigo
6278662014 Replace native with primary where possible 2025-08-01 12:31:01 +02:00
Sander Dorigo
65dcad6898 remove a quote 2025-08-01 07:42:45 +02:00
Sander Dorigo
8e7bcbdd7b Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop 2025-08-01 07:41:28 +02:00
James Cole
084ce02c21 Rename "native" to "primary". 2025-08-01 06:12:36 +02:00
James Cole
ea6addafe6 Rename references to native amounts 2025-07-31 20:55:30 +02:00
James Cole
da36d84b79 Rename "native" references to "primary" or "pc". 2025-07-31 20:47:20 +02:00
James Cole
d6d9f665c7 Rename references to "native". 2025-07-31 20:38:57 +02:00
James Cole
73d2621255 Remove v2 api 2025-07-31 20:36:16 +02:00
James Cole
4299ba033c Remove v2 transformers. 2025-07-31 20:36:06 +02:00
James Cole
6007687bcc Rename from "native" to "primary". 2025-07-31 20:35:44 +02:00
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
Sander Dorigo
166d4bd842 Add quote 2025-07-31 15:55:43 +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