IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-09-03 20:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
23,460 Commits 9 Branches 1,163 Tags
adminlte
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole bdf2026673 Merge branch 'develop' into adminlte 2026-07-09 19:29:07 +02:00
James Cole f579a59474 Build last views. 2026-07-09 19:21:52 +02:00
James Cole e948fa0964 Fix views. 2026-07-09 19:10:33 +02:00
James Cole 6377eab984 Fix lint errors 2026-07-09 18:58:26 +02:00
James Cole 74c6ee0351 Fix progress bars in views. 2026-07-09 16:57:50 +02:00
James Cole 5328c1446f Replace icons 2026-07-09 07:37:05 +02:00
James Cole d5ad06c885 Replace a bunch of icons. 2026-07-09 06:53:09 +02:00
James Cole 8368dde204 Remove unused items. 2026-07-09 06:35:33 +02:00
James Cole b9a603fea8 Fix various view issues. 2026-07-09 06:32:25 +02:00
James Cole 0524afaf93 Fix variables 2026-07-09 06:22:42 +02:00
James Cole 3b32c61ffe Delete unused views. 2026-07-08 19:33:53 +02:00
James Cole 9d52db3351 Fix debug view. 2026-07-08 19:33:19 +02:00
James Cole 702a8fc3d7 Fix the final views. 2026-07-08 18:56:07 +02:00
James Cole f6755473dd Fix https://github.com/firefly-iii/firefly-iii/issues/12455 2026-07-07 11:11:24 +02:00
James Cole 84ee071cab Merge branch 'develop' into adminlte 
# Conflicts:
#	package-lock.json
 2026-07-07 11:10:49 +02:00
James Cole 3ce56b5206 Catch access issues in installer. 2026-07-07 11:09:05 +02:00
James Cole aa303027a3 Merge pull request #12447 from firefly-iii/dependabot/npm_and_yarn/develop/vite-8.1.3 
Bump vite from 8.1.0 to 8.1.3
 2026-07-07 05:41:34 +02:00
James Cole 069b2af8ce Merge branch 'develop' into adminlte 2026-07-04 06:29:51 +02:00
James Cole b4dcbc2d94 Expand security policy 2026-07-04 06:29:10 +02:00
James Cole 133cb90225 Expand some views. 2026-07-04 06:28:57 +02:00
James Cole bea334f159 Several reports of a possible unescaped data situation, thanks all. 2026-07-03 06:26:38 +02:00
James Cole 6fb8ef925d Merge branch 'develop' into adminlte 2026-07-03 06:25:42 +02:00
James Cole b48a40f1e2 Update pr-reply-no-disclosure.yml 
Signed-off-by: James Cole <james@firefly-iii.org>
 2026-07-03 05:51:49 +02:00
James Cole 1b8bb452c3 Enhance PR reply workflow to include github-actions check 
Added check for 'github-actions' author to prevent processing.

Signed-off-by: James Cole <james@firefly-iii.org>
 2026-07-03 05:48:05 +02:00
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
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
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
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
James Cole d005bb6f5d Fix changelog. 2026-06-30 15:09:21 +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
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
James Cole f87ba9ad07 Merge branch 'develop' into adminlte 
# Conflicts:
#	app/Generator/Webhook/StandardMessageGenerator.php
 2026-06-29 06:58:15 +02:00
James Cole 2b037ebb9b Fix mago issues. 2026-06-29 06:57:39 +02:00
James Cole 90ecac87cb Fix more views 2026-06-29 06:56:39 +02:00
James Cole d7dd34a5cf more updated views and help functions. 2026-06-28 22:46:29 +02:00
James Cole 3bb48c587d Expand views. 2026-06-28 17:18:02 +02:00
James Cole 23dc005d9f Merge branch 'develop' into adminlte 2026-06-28 04:29:45 +02:00
James Cole 7a412f7b74 Fix https://github.com/firefly-iii/firefly-iii/issues/12396 2026-06-28 04:29:24 +02:00
James Cole 829ddaa1d5 Expand views. 2026-06-27 21:29:05 +02:00
James Cole 8e8b8f4f7b Merge branch 'develop' into adminlte 2026-06-27 17:25:22 +02:00
James Cole faa532ec46 Fix https://github.com/firefly-iii/firefly-iii/issues/12401 2026-06-27 17:25:14 +02:00
James Cole 66710ea633 Start last thing 2026-06-27 17:20:47 +02:00
James Cole 42b8b49ed7 Fix monthly report. 2026-06-27 17:12:20 +02:00
James Cole 5bc1f9b1a6 New view 2026-06-27 16:47:20 +02:00
James Cole c276268a93 Expand views. 2026-06-27 12:33:34 +02:00
James Cole e5f48b9863 Expand view. 2026-06-27 07:33:24 +02:00
James Cole fca0f5bf66 New views and helpers. 2026-06-27 07:22:36 +02:00
James Cole 14c87917e7 New views and updates. 2026-06-26 22:34:12 +02:00
James Cole 42aac97e5b Merge branch 'develop' into adminlte 
# Conflicts:
#	.ci/php-cs-fixer/composer.lock
#	composer.lock
#	config/firefly.php
#	package-lock.json
 2026-06-25 22:43:27 +02:00
James Cole 53233fc3e2 Merge branch 'main' into develop 
# Conflicts:
#	composer.lock
 2026-06-25 22:42:16 +02:00
James Cole bd41dd48d6 Merge pull request #12381 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-13.2.1 
Bump phpunit/phpunit from 13.2.0 to 13.2.1
 2026-06-22 06:11:56 +02:00
James Cole e3da2fe03f Merge pull request #12372 from firefly-iii/dependabot/npm_and_yarn/npm_and_yarn-09fa3c0cf9 
Bump launch-editor from 2.13.2 to 2.14.1 in the npm_and_yarn group across 1 directory
 2026-06-19 06:04:31 +02:00
James Cole 8529c71765 Merge pull request #12371 from firefly-iii/dependabot/composer/composer-c962567817 
Bump the composer group across 1 directory with 2 updates
 2026-06-19 06:04:10 +02:00
James Cole 6a5f086bf2 Merge pull request #12373 from firefly-iii/release-1781841027 
🤖 Automatically merge the PR into the  branch.
 2026-06-19 06:02:53 +02:00
James Cole ea51e47a66 Update release.yml 
Signed-off-by: James Cole <james@firefly-iii.org>
 2026-06-19 05:44:41 +02:00
James Cole d2d94bdc38 Add JSON generation step for v3 in release workflow 
Signed-off-by: James Cole <james@firefly-iii.org>
 2026-06-19 05:17:08 +02:00
James Cole 91ab6ec55b Fix branch checkout logic in release workflow 
Signed-off-by: James Cole <james@firefly-iii.org>
 2026-06-19 05:01:21 +02:00
James Cole 4229196713 Fix branch checkout logic in release workflow 
Signed-off-by: James Cole <james@firefly-iii.org>
 2026-06-19 04:56:37 +02:00
James Cole 515522cbb1 Update release.yml 
Signed-off-by: James Cole <james@firefly-iii.org>
 2026-06-19 04:53:23 +02:00
James Cole 63da24e4b8 Merge pull request #12368 from firefly-iii/dependabot/npm_and_yarn/npm_and_yarn-bc202e64bb 2026-06-16 07:47:56 +02:00
James Cole 4c1e678f1b Merge pull request #12367 from firefly-iii/dependabot/composer/composer-79e1974b6b 2026-06-16 07:47:43 +02:00
James Cole 2701d35048 Merge pull request #12351 from firefly-iii/dependabot/composer/composer-27792971ae 
Bump guzzlehttp/psr7 from 2.10.1 to 2.11.0 in the composer group across 1 directory
 2026-06-16 06:35:33 +02:00
James Cole 23aa88cae0 Merge branch 'develop' into adminlte 2026-06-13 16:12:41 +02:00
James Cole 2e75c24b45 Fix https://github.com/firefly-iii/firefly-iii/issues/12354 2026-06-13 15:09:34 +02:00
James Cole 18ad04ae84 Expand layout 2026-06-13 15:09:11 +02:00
James Cole 9bf2a98806 Fix subscriptions. 2026-06-12 09:11:34 +02:00
James Cole a0f510f38a Fix and clean up subscriptions. 2026-06-12 06:01:28 +02:00
James Cole e8194a685b Add view for bills. 2026-06-11 18:08:28 +02:00
James Cole 7443302d50 Budget overview migrated. 2026-06-11 18:00:56 +02:00
James Cole ec7c52f97e Add custom CSS, fix some views. 2026-06-11 06:05:06 +02:00
James Cole 09e45c8e7f Fix error pages and registration etc. 2026-06-11 01:24:03 +02:00
James Cole 38ebbecdb2 Fix flashes and tracking. 2026-06-10 21:50:14 +02:00
James Cole cbdbf55887 Add things. 2026-06-10 20:51:07 +02:00
James Cole 9f307f5d53 Merge branch 'develop' into adminlte 2026-06-10 20:37:42 +02:00
James Cole 677e952b45 Merge branch 'main' into develop 2026-06-10 20:37:32 +02:00
James Cole 28d1a14a39 Merge branch 'main' into adminlte 2026-06-10 20:37:21 +02:00
James Cole 9cd91729ac Expand v3 layout. 2026-06-10 20:37:05 +02:00
James Cole ff5a7a8d22 Merge pull request #12350 from firefly-iii/dependabot/npm_and_yarn/npm_and_yarn-47c4268404 
Bump shell-quote from 1.8.3 to 1.8.4 in the npm_and_yarn group across 1 directory
 2026-06-10 20:05:35 +02:00