Commit Graph

21096 Commits

Author SHA1 Message Date
github-actions[bot]
04cbff4b9a Merge pull request #10684 from firefly-iii/release-1754070963
🤖 Automatically merge the PR into the develop branch.
develop-20250801.4
2025-08-01 19:56:12 +02:00
JC5
0c2ca4b97c 🤖 Auto commit for release 'develop' on 2025-08-01 2025-08-01 19:56:03 +02:00
James Cole
3918665cd1 Move all endpoints to v1. 2025-08-01 19:41:36 +02:00
James Cole
9eb8869649 Fix files. 2025-08-01 19:33:30 +02:00
github-actions[bot]
62221af591 Merge pull request #10683 from firefly-iii/release-1754069211
🤖 Automatically merge the PR into the develop branch.
develop-20250801.3
2025-08-01 19:26:58 +02:00
JC5
4d013a44ce 🤖 Auto commit for release 'develop' on 2025-08-01 2025-08-01 19:26:51 +02:00
Sander Dorigo
c55cfd1acf Rename file 2025-08-01 15:30:45 +02:00
github-actions[bot]
b2652b83ce Merge pull request #10682 from firefly-iii/release-1754049870
🤖 Automatically merge the PR into the develop branch.
develop-20250801.2
2025-08-01 14:04:37 +02:00
JC5
3d28932216 🤖 Auto commit for release 'develop' on 2025-08-01 2025-08-01 14:04:30 +02:00
Sander Dorigo
87567d5a31 Rename default to primary 2025-08-01 13:48:32 +02:00
github-actions[bot]
37d45f4f87 Merge pull request #10681 from firefly-iii/release-1754047488
🤖 Automatically merge the PR into the develop branch.
develop-20250801.1
2025-08-01 13:24:57 +02:00
JC5
4acf0828e4 🤖 Auto commit for release 'develop' on 2025-08-01 2025-08-01 13:24:48 +02:00
Sander Dorigo
b5bab53e7a Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop 2025-08-01 13:08:41 +02:00
github-actions[bot]
60b0dc6279 Merge pull request #10680 from firefly-iii/release-1754046611
🤖 Automatically merge the PR into the develop branch.
develop-20250801
2025-08-01 13:10:21 +02:00
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