Commit Graph
23029 Commits
Author SHA1 Message Date
github-actions[bot] 4799c3c97f Merge pull request #12173 from firefly-iii/release-1776876664
🤖 Automatically merge the PR into the develop branch.
develop-20260422
2026-04-22 18:51:12 +02:00
JC5 0a4d401f57 🤖 Auto commit for release 'develop' on 2026-04-22 2026-04-22 18:51:05 +02:00
James Cole f890f55864 Fix if-statement. 2026-04-22 18:45:45 +02:00
James Cole a2189a8577 Fix thingie. 2026-04-22 18:40:21 +02:00
James Cole e81af7e051 Fix #12169 2026-04-22 18:34:16 +02:00
James Cole 32250ddc1a Fix https://github.com/firefly-iii/firefly-iii/issues/12169 2026-04-22 07:54:53 +02:00
github-actions[bot] a9723a85d1 Merge pull request #12163 from firefly-iii/release-1776658280
🤖 Automatically merge the PR into the develop branch.
develop-20260420
2026-04-20 06:11:26 +02:00
JC5 28fd3600b2 🤖 Auto commit for release 'develop' on 2026-04-20 2026-04-20 06:11:21 +02:00
github-actions[bot] 4df332e0d5 Merge pull request #12156 from firefly-iii/develop
🤖 Automatically merge the PR into the main branch.
v6.6.1
2026-04-19 11:15:56 +02:00
github-actions[bot] f72e168a0d Merge pull request #12155 from firefly-iii/release-1776590142
🤖 Automatically merge the PR into the develop branch.
2026-04-19 11:15:51 +02:00
JC5 a567280d1b 🤖 Auto commit for release 'v6.6.1' on 2026-04-19 2026-04-19 11:15:43 +02:00
James Cole 420f436fb6 Update changelog. 2026-04-19 11:09:52 +02:00
James Cole 10a6d96134 Fix https://github.com/firefly-iii/firefly-iii/issues/12154 2026-04-19 11:07:10 +02:00
github-actions[bot] 9ee2d4d487 Merge pull request #12153 from firefly-iii/develop
🤖 Automatically merge the PR into the main branch.
v6.6.0
2026-04-19 09:59:51 +02:00
github-actions[bot] 66b6e057f2 Merge pull request #12152 from firefly-iii/release-1776585580
🤖 Automatically merge the PR into the develop branch.
2026-04-19 09:59:46 +02:00
JC5 fade8cc41e 🤖 Auto commit for release 'v6.6.0' on 2026-04-19 2026-04-19 09:59:40 +02:00
James Cole 7690042ab7 Add missing fixed issue. 2026-04-19 09:54:22 +02:00
github-actions[bot] ef6ffb6f2d Merge pull request #12150 from firefly-iii/release-1776534459
🤖 Automatically merge the PR into the develop branch.
develop-20260418.7
2026-04-18 19:47:47 +02:00
JC5 a158e4596c 🤖 Auto commit for release 'develop' on 2026-04-18 2026-04-18 19:47:39 +02:00
James Cole e6f616880a Fix call to header. 2026-04-18 19:42:04 +02:00
github-actions[bot] c57233a5f7 Merge pull request #12149 from firefly-iii/release-1776514174
🤖 Automatically merge the PR into the develop branch.
develop-20260418.6
2026-04-18 14:09:41 +02:00
JC5 c1816e2136 🤖 Auto commit for release 'develop' on 2026-04-18 2026-04-18 14:09:34 +02:00
James Cole fdcf73b775 Fix broken oauth controller 2026-04-18 14:04:12 +02:00
github-actions[bot] 502c392331 Merge pull request #12148 from firefly-iii/release-1776513742
🤖 Automatically merge the PR into the develop branch.
develop-20260418.5
2026-04-18 14:02:30 +02:00
JC5 5af66155f8 🤖 Auto commit for release 'develop' on 2026-04-18 2026-04-18 14:02:22 +02:00
James Cole fa9e4be353 Catch missing variable. 2026-04-18 13:52:43 +02:00
github-actions[bot] 7b7cc784d1 Merge pull request #12145 from firefly-iii/release-1776489136
🤖 Automatically merge the PR into the develop branch.
develop-20260418.4
2026-04-18 07:12:23 +02:00
JC5 ee92f3bbe5 🤖 Auto commit for release 'develop' on 2026-04-18 2026-04-18 07:12:16 +02:00
James Cole 30c2625c6a Add warning. 2026-04-18 07:06:30 +02:00
James Cole 2a90258cdb Expand changelog. 2026-04-18 06:40:50 +02:00
github-actions[bot] 929bb0e5f3 Merge pull request #12144 from firefly-iii/release-1776486586
🤖 Automatically merge the PR into the develop branch.
develop-20260418.3
2026-04-18 06:29:54 +02:00
JC5 91ca3f38eb 🤖 Auto commit for release 'develop' on 2026-04-18 2026-04-18 06:29:46 +02:00
James Cole b4b67b0759 Fix button and translations. 2026-04-18 06:24:13 +02:00
github-actions[bot] 0b02800a00 Merge pull request #12143 from firefly-iii/release-1776485897
🤖 Automatically merge the PR into the develop branch.
develop-20260418.2
2026-04-18 06:18:24 +02:00
JC5 9db7bfb797 🤖 Auto commit for release 'develop' on 2026-04-18 2026-04-18 06:18:17 +02:00
James Cole bd92151564 Merge branch 'main' into develop
# Conflicts:
#	composer.lock
2026-04-18 06:13:08 +02:00
James Cole c2a7e35d1e Merge pull request #12141 from firefly-iii/dependabot/composer/composer-c490cd4343
Bump phpunit/phpunit from 12.5.14 to 12.5.22 in the composer group across 1 directory
2026-04-18 06:12:34 +02:00
James Cole 9047ae6e5b Include a missing translation. 2026-04-18 06:12:16 +02:00
github-actions[bot] 1a540b3448 Merge pull request #12142 from firefly-iii/release-1776485131
🤖 Automatically merge the PR into the develop branch.
develop-20260418.1
2026-04-18 06:05:36 +02:00
JC5 b9c800f7cc 🤖 Auto commit for release 'develop' on 2026-04-18 2026-04-18 06:05:31 +02:00
dependabot[bot] 00aafe9f1c Bump phpunit/phpunit in the composer group across 1 directory
Bumps the composer group with 1 update in the / directory: [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit).


Updates `phpunit/phpunit` from 12.5.14 to 12.5.22
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/12.5.22/ChangeLog-12.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/12.5.14...12.5.22)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-version: 12.5.22
  dependency-type: direct:development
  dependency-group: composer
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-04-18 04:00:54 +00:00
James Cole 1983eefe00 Merge branch 'main' into develop 2026-04-18 06:00:08 +02:00
James Cole a9a03fe0d0 Update release.yml
Signed-off-by: James Cole <james@firefly-iii.org>
2026-04-18 05:59:50 +02:00
James Cole 98f233c42e Fix broken route :( 2026-04-18 05:59:12 +02:00
James Cole a8bed2d316 Reorganize build job. 2026-04-18 05:54:41 +02:00
github-actions[bot] 0fbe1c906b Merge pull request #12140 from firefly-iii/release-1776484422
🤖 Automatically merge the PR into the develop branch.
develop-20260418
2026-04-18 05:53:51 +02:00
JC5 f2fc4dd2ed 🤖 Auto commit for release 'develop' on 2026-04-18 2026-04-18 05:53:42 +02:00
James Cole 64509f810f Remove undetected thing. 2026-04-18 05:48:28 +02:00
James Cole d44e1a814b Fix phpstan issue. 2026-04-18 05:41:32 +02:00
James Cole f4bb0da242 Fix mago issues. 2026-04-18 05:32:54 +02:00