Commit Graph

22163 Commits

Author SHA1 Message Date
github-actions[bot]
62c676157f Merge pull request #11565 from firefly-iii/release-1768939166
🤖 Automatically merge the PR into the develop branch.
develop-20260120.2
2026-01-20 20:59:34 +01:00
JC5
24df659ecb 🤖 Auto commit for release 'develop' on 2026-01-20 2026-01-20 20:59:26 +01:00
James Cole
9180cdbc66 Add error box. 2026-01-20 20:55:35 +01:00
github-actions[bot]
7a6245f246 Merge pull request #11564 from firefly-iii/release-1768934499
🤖 Automatically merge the PR into the develop branch.
develop-20260120.1
2026-01-20 19:41:46 +01:00
JC5
e156a4eedc 🤖 Auto commit for release 'develop' on 2026-01-20 2026-01-20 19:41:39 +01:00
James Cole
c63fead216 Add jquery. 2026-01-20 19:37:11 +01:00
github-actions[bot]
d9c09fe566 Merge pull request #11562 from firefly-iii/release-1768885025
🤖 Automatically merge the PR into the develop branch.
develop-20260120
2026-01-20 05:57:12 +01:00
JC5
0686d86ef8 🤖 Auto commit for release 'develop' on 2026-01-20 2026-01-20 05:57:05 +01:00
James Cole
7c2aea31fe Update jquery 2026-01-20 05:49:14 +01:00
James Cole
bb0af2396e Merge pull request #11551 from firefly-iii/dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-20 05:08:52 +01:00
mergify[bot]
4718ee9723 Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-19 19:24:23 +00:00
github-actions[bot]
55c762d55a Merge pull request #11558 from firefly-iii/release-1768850616
🤖 Automatically merge the PR into the develop branch.
develop-20260119.1
2026-01-19 20:23:44 +01:00
JC5
734df18f4e 🤖 Auto commit for release 'develop' on 2026-01-19 2026-01-19 20:23:36 +01:00
mergify[bot]
11537c4922 Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-19 19:20:14 +00:00
James Cole
30205d828a Merge pull request #11552 from firefly-iii/dependabot/npm_and_yarn/develop/jquery-4.0.0
Bump jquery from 3.7.1 to 4.0.0
2026-01-19 20:19:30 +01:00
mergify[bot]
6b2d724a5b Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-19 19:18:17 +00:00
mergify[bot]
9c0eb8a028 Merge branch 'develop' into dependabot/npm_and_yarn/develop/jquery-4.0.0 2026-01-19 19:18:01 +00:00
James Cole
103a6d1b15 Expand events for #11544 2026-01-19 20:17:16 +01:00
mergify[bot]
99403ab9f6 Merge branch 'develop' into dependabot/npm_and_yarn/develop/jquery-4.0.0 2026-01-19 19:11:10 +00:00
mergify[bot]
5980ac0b64 Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-19 19:11:07 +00:00
James Cole
b9e5851e38 Remove unused class #11411 2026-01-19 20:09:53 +01:00
mergify[bot]
6da02065b7 Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-19 19:08:57 +00:00
mergify[bot]
eab18ed2f2 Merge branch 'develop' into dependabot/npm_and_yarn/develop/jquery-4.0.0 2026-01-19 19:08:53 +00:00
James Cole
67d18e4b62 Clean up latest MFA handler #11455 2026-01-19 20:08:15 +01:00
mergify[bot]
41da3a014f Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-19 19:02:51 +00:00
mergify[bot]
71774905b0 Merge branch 'develop' into dependabot/npm_and_yarn/develop/jquery-4.0.0 2026-01-19 19:02:47 +00:00
James Cole
48f886d17c Replace multiple failures alert #11544 2026-01-19 20:02:20 +01:00
James Cole
e28df272b5 Replace multiple failures alert #11544 2026-01-19 20:02:08 +01:00
mergify[bot]
c7f4c40435 Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-19 18:57:51 +00:00
mergify[bot]
95e98cfeca Merge branch 'develop' into dependabot/npm_and_yarn/develop/jquery-4.0.0 2026-01-19 18:57:47 +00:00
James Cole
095d31fbe1 Replace multiple failures alert #11544 2026-01-19 19:57:09 +01:00
mergify[bot]
8db08cc623 Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-19 18:50:19 +00:00
mergify[bot]
27044aeecf Merge branch 'develop' into dependabot/npm_and_yarn/develop/jquery-4.0.0 2026-01-19 18:50:15 +00:00
James Cole
8bd7752e2b Clean up more MFA event handlers #11544 2026-01-19 19:49:50 +01:00
James Cole
ee24d55554 Clean up more MFA event handlers #11544 2026-01-19 19:49:34 +01:00
mergify[bot]
8e8e0ab67d Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-19 18:43:54 +00:00
mergify[bot]
740a14972a Merge branch 'develop' into dependabot/npm_and_yarn/develop/jquery-4.0.0 2026-01-19 18:43:44 +00:00
James Cole
c6667c2293 Continued. #11544 2026-01-19 19:43:23 +01:00
James Cole
8327a3d670 Enabled MFA notifications #11544 2026-01-19 19:43:06 +01:00
mergify[bot]
4278d59d05 Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-19 18:37:08 +00:00
mergify[bot]
5534bedde0 Merge branch 'develop' into dependabot/npm_and_yarn/develop/jquery-4.0.0 2026-01-19 18:37:02 +00:00
James Cole
83fe7f6f6d MFA disabled #11544 2026-01-19 19:36:21 +01:00
mergify[bot]
669bb20228 Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-19 18:33:07 +00:00
mergify[bot]
e41dbdc3a7 Merge branch 'develop' into dependabot/npm_and_yarn/develop/jquery-4.0.0 2026-01-19 18:33:03 +00:00
James Cole
670f98eb66 Merge branch 'main' into develop 2026-01-19 19:32:21 +01:00
mergify[bot]
3229011035 Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-chained-backend-5.0.0 2026-01-19 06:56:35 +00:00
mergify[bot]
7e02bee90b Merge branch 'develop' into dependabot/npm_and_yarn/develop/jquery-4.0.0 2026-01-19 06:56:31 +00:00
github-actions[bot]
be6801654f Merge pull request #11555 from firefly-iii/release-1768805748
🤖 Automatically merge the PR into the develop branch.
develop-20260119
2026-01-19 07:55:56 +01:00
JC5
93fe1f5558 🤖 Auto commit for release 'develop' on 2026-01-19 2026-01-19 07:55:48 +01:00
James Cole
d12fd40a57 Merge pull request #11554 from firefly-iii/JC5-patch-2
Update PHP version setup in release workflow
2026-01-19 07:52:00 +01:00