kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-07-02 12:34:31 -07:00
Code Issues Projects Releases Wiki Activity
23,432 Commits 9 Branches 1,062 Tags
adminlte
Commit Graph

23432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 6dfdbf71c6 Fix some more views. 2026-07-02 15:52:29 +02:00
James Cole b2b92aa4e6 Merge branch 'develop' into adminlte 
# Conflicts:
#	package-lock.json
 2026-07-02 05:29:16 +02:00
github-actions[bot] a95b82b14c Merge pull request #12429 from firefly-iii/develop 
🤖 Automatically merge the PR into the main branch.
v6.6.6 		2026-07-01 21:08:54 +02:00
github-actions[bot] 950e264628 Merge pull request #12428 from firefly-iii/release-1782932920 
🤖 Automatically merge the PR into the develop branch.
 2026-07-01 21:08:48 +02:00
JC5 849f75abfb 🤖 Auto commit for release 'v6.6.6' on 2026-07-01 2026-07-01 21:08:40 +02:00
github-actions[bot] 86b1a4fb95 Merge pull request #12427 from firefly-iii/release-1782932541 
🤖 Automatically merge the PR into the develop branch.
develop-20260701.1 		2026-07-01 21:02:28 +02:00
JC5 dc9c435e7f 🤖 Auto commit for release 'develop' on 2026-07-01 2026-07-01 21:02:21 +02:00
James Cole 724014b179 Fix phpstan 2026-07-01 20:54:56 +02:00
James Cole 169e639a08 Update changelog 2026-07-01 20:49:55 +02:00
James Cole 537d1ac3a5 Fix https://github.com/firefly-iii/firefly-iii/issues/12426 2026-07-01 20:47:10 +02:00
James Cole 1d230d055b Fix some views 2026-07-01 20:44:53 +02:00
James Cole 7942baf0de Merge branch 'develop' into adminlte 
# Conflicts:
#	resources/views/list/groups.blade.php
 2026-07-01 07:01:42 +02:00
github-actions[bot] 558eeca751 Merge pull request #12425 from firefly-iii/release-1782881976 
🤖 Automatically merge the PR into the develop branch.
develop-20260701 		2026-07-01 06:59:42 +02:00
JC5 5907d877e0 🤖 Auto commit for release 'develop' on 2026-07-01 2026-07-01 06:59:36 +02:00
James Cole 49412cf463 Fix phpstan issues 2026-07-01 06:54:15 +02:00
James Cole 7ff30db9db Should fix phpstan 2026-07-01 06:45:19 +02:00
James Cole 644e720fb9 Merge branch 'main' into develop 2026-07-01 06:31:15 +02:00
James Cole 7945066fde Check locked out status before validation, not after. 2026-07-01 06:30:51 +02:00
github-actions[bot] 6d05c88e84 Merge pull request #12423 from firefly-iii/release-1782840949 
🤖 Automatically merge the PR into the develop branch.
develop-20260630.2 		2026-06-30 19:35:56 +02:00
JC5 ae5ed182b7 🤖 Auto commit for release 'develop' on 2026-06-30 2026-06-30 19:35:49 +02:00
github-actions[bot] 2ffcb2b370 Merge pull request #12422 from firefly-iii/develop 
🤖 Automatically merge the PR into the main branch.
v6.6.5 		2026-06-30 19:27:46 +02:00
github-actions[bot] e82e2f05b0 Merge pull request #12421 from firefly-iii/release-1782840449 
🤖 Automatically merge the PR into the develop branch.
 2026-06-30 19:27:39 +02:00
JC5 2938e3f8a8 🤖 Auto commit for release 'v6.6.5' on 2026-06-30 2026-06-30 19:27:29 +02:00
James Cole 2104595ceb Fix version in changelog. 2026-06-30 19:22:03 +02:00
James Cole c691b820f0 Update changelog. 2026-06-30 19:21:16 +02:00
James Cole 8f71ff061d Fix workflow. 2026-06-30 19:20:24 +02:00
James Cole 1136eb8542 Update security.md to specify SSRF and DNS issues 
Clarified security advisory guidelines regarding SSRF and DNS/hostname issues.

Signed-off-by: James Cole <james@firefly-iii.org>
 2026-06-30 18:42:08 +02:00
github-actions[bot] 6535a3741f Merge pull request #12417 from firefly-iii/develop 
🤖 Automatically merge the PR into the main branch.
v6.6.4 		2026-06-30 15:14:56 +02:00
github-actions[bot] 25d1ce4189 Merge pull request #12416 from firefly-iii/release-1782825282 
🤖 Automatically merge the PR into the develop branch.
 2026-06-30 15:14:49 +02:00
JC5 630418ac4f 🤖 Auto commit for release 'v6.6.4' on 2026-06-30 2026-06-30 15:14:42 +02:00
James Cole d005bb6f5d Fix changelog. 2026-06-30 15:09:21 +02:00
github-actions[bot] 1b926988fc Merge pull request #12415 from firefly-iii/release-1782824754 
🤖 Automatically merge the PR into the develop branch.
develop-20260630.1 		2026-06-30 15:06:03 +02:00
JC5 4b6a0d8050 🤖 Auto commit for release 'develop' on 2026-06-30 2026-06-30 15:05:54 +02:00
James Cole 6d3cea9cad Update changelog. 2026-06-30 15:00:20 +02:00
James Cole 98bebe5b94 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2026-06-30 14:54:16 +02:00
James Cole 89bae1cb3a Fix https://github.com/firefly-iii/firefly-iii/issues/12353 2026-06-30 14:54:07 +02:00
github-actions[bot] 036fa09ea1 Merge pull request #12414 from firefly-iii/release-1782823891 
🤖 Automatically merge the PR into the develop branch.
develop-20260630 		2026-06-30 14:51:42 +02:00
JC5 738829792a 🤖 Auto commit for release 'develop' on 2026-06-30 2026-06-30 14:51:31 +02:00
James Cole 727297ac80 Fix https://github.com/firefly-iii/firefly-iii/issues/12356 2026-06-30 14:43:47 +02:00
James Cole fb3eead982 Fix https://github.com/firefly-iii/firefly-iii/issues/12370 2026-06-30 14:42:20 +02:00
James Cole 86118b4318 Also block command thingie. 2026-06-30 12:12:00 +02:00
James Cole b0c7e827d2 Stop access to install page. 2026-06-30 12:10:32 +02:00
James Cole 3ae10be105 Make some changes to layout 2026-06-30 12:10:09 +02:00
James Cole f9f733f985 Expand more views. 2026-06-29 21:18:22 +02:00
James Cole 1a84869729 Fix some code. 2026-06-29 07:10:23 +02:00
James Cole 1a8761a6dd Merge branch 'develop' into adminlte 
# Conflicts:
#	composer.lock
#	package-lock.json
 2026-06-29 07:06:53 +02:00
James Cole bacd50fe98 Merge pull request #12409 from firefly-iii/dependabot/npm_and_yarn/develop/vite-8.1.0 
Bump vite from 8.0.16 to 8.1.0
 2026-06-29 07:06:16 +02:00
James Cole dbe97c3ccd Merge pull request #12406 from firefly-iii/dependabot/composer/develop/rector/rector-2.5.2 
Bump rector/rector from 2.4.4 to 2.5.2
 2026-06-29 07:05:44 +02:00
github-actions[bot] 66e2759b8f Merge pull request #12412 from firefly-iii/release-1782709367 
🤖 Automatically merge the PR into the develop branch.
develop-20260629 		2026-06-29 07:02:56 +02:00
JC5 f7fb1ea12c 🤖 Auto commit for release 'develop' on 2026-06-29 2026-06-29 07:02:48 +02:00