kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-06-09 03:44:57 +00:00
Code Issues Projects Releases Wiki Activity
23,182 Commits 9 Branches 1,051 Tags
develop-20260525
Commit Graph

23182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
bd2e830637 Merge pull request #12293 from firefly-iii/release-1779690884 
🤖 Automatically merge the PR into the develop branch.
develop-20260525 		2026-05-25 08:34:52 +02:00
JC5
b1bb0b1e84 🤖 Auto commit for release 'develop' on 2026-05-25 2026-05-25 08:34:45 +02:00
James Cole
673e3a21f9 Had the case right the first time, duh. 2026-05-25 08:29:33 +02:00
James Cole
a240074343 Fix case 2026-05-25 08:22:26 +02:00
James Cole
a86039aa78 Merge branch 'main' into develop 2026-05-21 14:59:59 +02:00
James Cole
2c14a605e4 Remove AI assistance disclosure comments 
Removed AI assistance disclosure comments from the workflow.

Signed-off-by: James Cole <james@firefly-iii.org>
 2026-05-21 12:32:32 +02:00
James Cole
3b94e0479a Merge branch 'main' into develop 2026-05-21 12:16:04 +02:00
James Cole
c08e3c8797 Add debug for the notification channel thing. 2026-05-21 12:15:48 +02:00
github-actions[bot]
1678c15905 Merge pull request #12276 from firefly-iii/develop 
🤖 Automatically merge the PR into the main branch.
v6.6.3 		2026-05-21 06:59:51 +02:00
github-actions[bot]
37a3444816 Merge pull request #12275 from firefly-iii/release-1779339576 
🤖 Automatically merge the PR into the develop branch.
 2026-05-21 06:59:45 +02:00
JC5
008c9b4d8f 🤖 Auto commit for release 'v6.6.3' on 2026-05-21 2026-05-21 06:59:36 +02:00
github-actions[bot]
1c21154799 Merge pull request #12274 from firefly-iii/release-1779338975 
🤖 Automatically merge the PR into the develop branch.
develop-20260521.1 		2026-05-21 06:49:43 +02:00
JC5
b8c05d6f26 🤖 Auto commit for release 'develop' on 2026-05-21 2026-05-21 06:49:35 +02:00
James Cole
85998cd3d7 Fix mago issues. 2026-05-21 06:44:16 +02:00
James Cole
67a048c279 Fix issues. 2026-05-21 06:38:35 +02:00
James Cole
b81943fad6 Lots of mago fixes applied. 2026-05-21 06:31:24 +02:00
github-actions[bot]
9ee1b4587c Merge pull request #12273 from firefly-iii/release-1779337714 
🤖 Automatically merge the PR into the develop branch.
develop-20260521 		2026-05-21 06:28:41 +02:00
JC5
7579ae2615 🤖 Auto commit for release 'develop' on 2026-05-21 2026-05-21 06:28:34 +02:00
James Cole
c002cb795d Fix date fns 2026-05-21 06:23:17 +02:00
James Cole
f00852aa6a Merge branch 'main' into develop 2026-05-21 06:22:28 +02:00
James Cole
3e26f21bc4 Fix patch and lock version. 2026-05-21 06:22:15 +02:00
James Cole
195fb6cdb7 Update pr-reply-no-disclosure.yml 
Signed-off-by: James Cole <james@firefly-iii.org>
 2026-05-21 06:07:37 +02:00
James Cole
034280ca17 Update changelog. 2026-05-20 20:53:55 +02:00
github-actions[bot]
c5ce9fd1e2 Merge pull request #12272 from firefly-iii/release-1779302299 
🤖 Automatically merge the PR into the develop branch.
develop-20260520 		2026-05-20 20:38:28 +02:00
JC5
3d64f7fe08 🤖 Auto commit for release 'develop' on 2026-05-20 2026-05-20 20:38:20 +02:00
James Cole
f2efb69b76 Fix broken if statement 2026-05-20 20:30:30 +02:00
James Cole
7499a414f4 Expand changelog 2026-05-20 20:24:50 +02:00
James Cole
8b0f790a56 Merge branch 'main' into develop 2026-05-20 20:18:10 +02:00
James Cole
b70ed32952 Merge pull request #12271 from alanturing881/fix/stored-xss-ale-piggy-name 
Fix stored XSS in audit log view via piggy bank name (ale.twig)
 2026-05-20 20:16:16 +02:00
James Cole
9e511c822e Update pr-reply-no-disclosure.yml 
Signed-off-by: James Cole <james@firefly-iii.org>
 2026-05-20 20:12:40 +02:00
iaohkut
fa6c123595 Fix stored XSS in ALE view by HTML-escaping piggy bank name 
The Twig template ale.twig rendered the piggy bank name from
AuditLogEntry.after.piggy using |raw, bypassing auto-escaping.
A user-controlled name containing HTML (e.g. <img onerror=...>)
would execute as JavaScript in any browser viewing the transaction
audit log (CWE-79).

Apply |e filter to escape only the user-controlled `name` parameter
before substitution into the trans() string. The |raw filter is
preserved because the `amount` parameter legitimately contains
<span> tags for currency styling.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-20 11:07:57 -04:00
James Cole
ec1dfca2b5 Enhance PR workflow to check for author 
Added logic to check for the author of the pull request.

Signed-off-by: James Cole <james@firefly-iii.org>
 2026-05-19 08:15:40 +02:00
James Cole
bebd3b189e Merge pull request #12265 from firefly-iii/dependabot/npm_and_yarn/develop/vite-8.0.13 
Bump vite from 8.0.11 to 8.0.13
 2026-05-18 08:11:34 +02:00
github-actions[bot]
e3319dca5d Merge pull request #12266 from firefly-iii/release-1779078811 
🤖 Automatically merge the PR into the develop branch.
develop-20260518 		2026-05-18 06:33:40 +02:00
JC5
a38cb85f55 🤖 Auto commit for release 'develop' on 2026-05-18 2026-05-18 06:33:31 +02:00
dependabot[bot]
0226673a01 Bump vite from 8.0.11 to 8.0.13 
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 8.0.11 to 8.0.13.
- [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/v8.0.13/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 8.0.13
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-05-18 04:27:29 +00:00
github-actions[bot]
7816f1be9b Merge pull request #12263 from firefly-iii/release-1779030686 
🤖 Automatically merge the PR into the develop branch.
develop-20260517.1 		2026-05-17 17:11:33 +02:00
JC5
5878173e80 🤖 Auto commit for release 'develop' on 2026-05-17 2026-05-17 17:11:26 +02:00
github-actions[bot]
45c30f11bc Merge pull request #12260 from firefly-iii/release-1778986654 
🤖 Automatically merge the PR into the develop branch.
develop-20260517 		2026-05-17 04:57:40 +02:00
JC5
fea97efdbf 🤖 Auto commit for release 'develop' on 2026-05-17 2026-05-17 04:57:34 +02:00
James Cole
fe0e8796ca Merge branch 'main' into develop 2026-05-17 04:50:57 +02:00
James Cole
e83c5b9f86 New workflow. 2026-05-17 04:50:34 +02:00
James Cole
9558f05947 Merge branch 'main' into develop 2026-05-17 04:29:39 +02:00
James Cole
f3d6bb0fb5 Possible fix for https://github.com/firefly-iii/firefly-iii/issues/12258 2026-05-17 04:28:06 +02:00
James Cole
57010cd2e0 Fix https://github.com/firefly-iii/firefly-iii/issues/12257 2026-05-17 04:26:45 +02:00
James Cole
9436eeacaf Update warning about AI-generated security advisories 
Clarified consequences of reporting AI-generated security advisories.

Signed-off-by: James Cole <james@firefly-iii.org>
 2026-05-17 03:44:01 +02:00
github-actions[bot]
7ddf395ea9 Merge pull request #12256 from firefly-iii/release-1778958406 
🤖 Automatically merge the PR into the develop branch.
develop-20260516.1 		2026-05-16 21:06:52 +02:00
JC5
492c55bd76 🤖 Auto commit for release 'develop' on 2026-05-16 2026-05-16 21:06:46 +02:00
James Cole
894dea5c9c Fix https://github.com/firefly-iii/firefly-iii/issues/12254 as suggested by @imjuzcy 2026-05-16 21:01:50 +02:00
github-actions[bot]
fecf12790d Merge pull request #12255 from firefly-iii/release-1778957079 
🤖 Automatically merge the PR into the develop branch.
develop-20260516 		2026-05-16 20:44:49 +02:00