github-actions[bot]
|
11c38a599b
|
Merge pull request #10127 from firefly-iii/release-1744600947
🤖 Automatically merge the PR into the develop branch.
develop-20250414
|
2025-04-14 05:22:37 +02:00 |
|
JC5
|
0ce245f480
|
🤖 Auto commit for release 'develop' on 2025-04-14
|
2025-04-14 05:22:27 +02:00 |
|
github-actions[bot]
|
aef15cf3d3
|
Merge pull request #10119 from firefly-iii/release-1744394417
🤖 Automatically merge the PR into the develop branch.
develop-20250411
|
2025-04-11 20:00:28 +02:00 |
|
JC5
|
d1880de30e
|
🤖 Auto commit for release 'develop' on 2025-04-11
|
2025-04-11 20:00:17 +02:00 |
|
James Cole
|
9d900a69ed
|
Merge pull request #10118 from firefly-iii/main
Merge security improvements.
|
2025-04-11 19:45:15 +02:00 |
|
James Cole
|
1653f77b15
|
Merge pull request #10117 from firefly-iii/fix-10114
Possible fix for #10114
|
2025-04-11 19:40:36 +02:00 |
|
James Cole
|
9418436d51
|
Possible fix for #10114
|
2025-04-11 19:38:48 +02:00 |
|
James Cole
|
1c9a6a194a
|
Merge pull request #10115 from firefly-iii/dependabot/npm_and_yarn/npm_and_yarn-b7c6efa8f1
|
2025-04-11 18:59:39 +02:00 |
|
dependabot[bot]
|
11cfb5a962
|
Bump vite in the npm_and_yarn group across 1 directory
Bumps the npm_and_yarn group with 1 update in the / directory: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite).
Updates `vite` from 6.2.5 to 6.2.6
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.2.6/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.2.6/packages/vite)
---
updated-dependencies:
- dependency-name: vite
dependency-version: 6.2.6
dependency-type: direct:development
dependency-group: npm_and_yarn
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2025-04-11 15:37:30 +00:00 |
|
James Cole
|
7d21467447
|
Merge pull request #10110 from firefly-iii/add-ip
Add IP to failed login message.
|
2025-04-09 21:28:34 +02:00 |
|
James Cole
|
5ce9f32deb
|
Add IP to failed login message.
|
2025-04-09 21:26:29 +02:00 |
|
James Cole
|
337440259f
|
Merge pull request #10109 from firefly-iii/fix-9398
Fix #9398
|
2025-04-07 20:43:37 +02:00 |
|
James Cole
|
c483e0768f
|
Fix #9398
|
2025-04-07 20:42:52 +02:00 |
|
James Cole
|
fd9b0d9417
|
Merge pull request #10108 from firefly-iii/fix-9858
Whoops
|
2025-04-07 19:48:52 +02:00 |
|
James Cole
|
c3165f4937
|
Whoops
|
2025-04-07 19:48:30 +02:00 |
|
James Cole
|
a5c9adc872
|
Merge pull request #10107 from firefly-iii/fix-9858
Fix #9858
|
2025-04-07 19:45:33 +02:00 |
|
James Cole
|
59cc007931
|
Fix #9858
|
2025-04-07 19:44:22 +02:00 |
|
github-actions[bot]
|
8b0b12b521
|
Merge pull request #10103 from firefly-iii/release-1743996054
🤖 Automatically merge the PR into the develop branch.
develop-20250407
|
2025-04-07 05:21:01 +02:00 |
|
JC5
|
6ae1cfd82e
|
🤖 Auto commit for release 'develop' on 2025-04-07
|
2025-04-07 05:20:54 +02:00 |
|
github-actions[bot]
|
4d7eb27fd0
|
Merge pull request #10102 from firefly-iii/release-1743913710
🤖 Automatically merge the PR into the develop branch.
develop-20250406
|
2025-04-06 06:28:37 +02:00 |
|
JC5
|
fe0b8d0128
|
🤖 Auto commit for release 'develop' on 2025-04-06
|
2025-04-06 06:28:30 +02:00 |
|
James Cole
|
04f0fcfbf7
|
Merge pull request #10101 from firefly-iii/fix-null-pointer
Fix nullpointer.
|
2025-04-06 06:24:02 +02:00 |
|
James Cole
|
7e182cf070
|
Fix nullpointer.
|
2025-04-06 06:22:32 +02:00 |
|
James Cole
|
ad78c302ef
|
Merge branch 'main' into develop
# Conflicts:
# package-lock.json
|
2025-04-06 06:22:04 +02:00 |
|
James Cole
|
36b4c69491
|
Merge pull request #10097 from firefly-iii/dependabot/npm_and_yarn/npm_and_yarn-2bd33993d4
Bump vite from 6.2.4 to 6.2.5 in the npm_and_yarn group across 1 directory
|
2025-04-05 07:23:09 +02:00 |
|
dependabot[bot]
|
30bd0711f4
|
Bump vite in the npm_and_yarn group across 1 directory
Bumps the npm_and_yarn group with 1 update in the / directory: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite).
Updates `vite` from 6.2.4 to 6.2.5
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.2.5/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.2.5/packages/vite)
---
updated-dependencies:
- dependency-name: vite
dependency-version: 6.2.5
dependency-type: direct:development
dependency-group: npm_and_yarn
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2025-04-04 15:59:25 +00:00 |
|
github-actions[bot]
|
d847827584
|
Merge pull request #10095 from firefly-iii/release-1743669036
🤖 Automatically merge the PR into the develop branch.
develop-20250403.1
|
2025-04-03 10:30:45 +02:00 |
|
JC5
|
786c1fcd58
|
🤖 Auto commit for release 'develop' on 2025-04-03
|
2025-04-03 10:30:36 +02:00 |
|
James Cole
|
90e7f0c0f7
|
Merge pull request #10094 from firefly-iii/fix-more
Fix lint errors
|
2025-04-03 10:26:17 +02:00 |
|
Sander Dorigo
|
63f334abe5
|
Fix lint errors
|
2025-04-03 10:25:24 +02:00 |
|
James Cole
|
2466cd942f
|
Update release.yml
Signed-off-by: James Cole <james@firefly-iii.org>
|
2025-04-03 10:22:09 +02:00 |
|
James Cole
|
ea37db87f4
|
Merge pull request #10093 from firefly-iii/fix-php-error
Fix dumb error
|
2025-04-03 10:13:52 +02:00 |
|
Sander Dorigo
|
c168fb6960
|
Fix dumb error
|
2025-04-03 10:13:06 +02:00 |
|
github-actions[bot]
|
03fb707b93
|
Merge pull request #10092 from firefly-iii/release-1743665835
🤖 Automatically merge the PR into the develop branch.
develop-20250403
|
2025-04-03 09:37:23 +02:00 |
|
JC5
|
db226c2584
|
🤖 Auto commit for release 'develop' on 2025-04-03
|
2025-04-03 09:37:15 +02:00 |
|
James Cole
|
1c6ec82c91
|
Merge pull request #10091 from firefly-iii/better-mute
Better mute
|
2025-04-03 09:33:26 +02:00 |
|
Sander Dorigo
|
40eb77ffde
|
Better mute
|
2025-04-03 09:32:41 +02:00 |
|
github-actions[bot]
|
17ddb01cd1
|
Merge pull request #10089 from firefly-iii/release-1743601357
🤖 Automatically merge the PR into the develop branch.
develop-20250402
|
2025-04-02 15:42:46 +02:00 |
|
JC5
|
ca56c7af70
|
🤖 Auto commit for release 'develop' on 2025-04-02
|
2025-04-02 15:42:37 +02:00 |
|
James Cole
|
55c428070f
|
Merge pull request #10087 from firefly-iii/fix-10025
Fix #10025
|
2025-04-02 12:13:28 +02:00 |
|
Sander Dorigo
|
574eec1c08
|
Fix #10025
|
2025-04-02 12:12:18 +02:00 |
|
James Cole
|
15cde8173e
|
Merge pull request #10081 from firefly-iii/debug-10068
Add debug for #10068
|
2025-04-01 11:29:23 +02:00 |
|
Sander Dorigo
|
ccb581b4ee
|
Add debug for #10068
|
2025-04-01 11:28:12 +02:00 |
|
James Cole
|
c5f8db5b50
|
Merge pull request #10080 from firefly-iii/fix-10069-2
fix #10069
|
2025-04-01 10:54:54 +02:00 |
|
Sander Dorigo
|
611748fbaf
|
fix #10069
|
2025-04-01 10:54:08 +02:00 |
|
James Cole
|
b57dfa9432
|
Merge pull request #10078 from firefly-iii/fix-10069
Fix #10069
|
2025-04-01 10:35:22 +02:00 |
|
Sander Dorigo
|
253982d579
|
Fix #10069
|
2025-04-01 10:33:58 +02:00 |
|
James Cole
|
94c7a19aa0
|
Merge pull request #10076 from firefly-iii/mute-notifications
Fix #10069
|
2025-04-01 07:27:31 +02:00 |
|
Sander Dorigo
|
e9b360a721
|
Fix #10069
|
2025-04-01 07:26:29 +02:00 |
|
github-actions[bot]
|
ebf7f5932a
|
Merge pull request #10075 from firefly-iii/release-1743484026
🤖 Automatically merge the PR into the develop branch.
develop-20250401
|
2025-04-01 07:07:14 +02:00 |
|