Commit Graph

17498 Commits

Author SHA1 Message Date
James Cole
8e56fa4ef8
Fix https://github.com/firefly-iii/firefly-iii/issues/7221 2023-03-14 18:09:44 +01:00
James Cole
f56de6e719
Merge pull request #7218 from firefly-iii/develop
Release v6.0.4
2023-03-12 18:25:25 +01:00
James Cole
86ba1d151a
Merge pull request #7217 from firefly-iii/v604
v604 into develop
2023-03-12 18:24:40 +01:00
James Cole
8d24db14e9
Update packages. 2023-03-12 18:23:18 +01:00
James Cole
cead122d96
Meta files for new release 2023-03-12 18:22:56 +01:00
James Cole
b7dd335fb7
Meta files for release v6.0.4 2023-03-12 18:18:02 +01:00
James Cole
20a7092fe3
Merge pull request #7213 from marcoil/catalan_name
Update Catalan description
2023-03-12 16:09:24 +01:00
James Cole
1d3da33e1d
Merge pull request #7216 from firefly-iii/fix-7214
Possible fix for #7214
2023-03-12 16:06:31 +01:00
James Cole
e36675e232
Possible fix for #7214 2023-03-12 16:06:12 +01:00
Marc Ordinas i Llopis
aa8588758a
Update Catalan description
Signed-off-by: Marc Ordinas i Llopis <mail@marcoil.org>
2023-03-12 13:48:06 +01:00
James Cole
47a58738d4
Merge pull request #7211 from firefly-iii/develop
Release v6.0.3
2023-03-12 11:04:35 +01:00
James Cole
e0a31d29a4
Merge pull request #7210 from firefly-iii/603
chore: Meta data for 603
2023-03-12 11:00:24 +01:00
James Cole
45369868ad
chore: Meta data for 603 2023-03-12 10:59:35 +01:00
James Cole
639c51d651
Merge pull request #7202 from firefly-iii/fix-7201
Fix #7201
2023-03-11 15:05:31 +01:00
James Cole
3d424972cc
Fix #7201 2023-03-11 15:04:16 +01:00
James Cole
96fd4da6d8
Merge pull request #7198 from firefly-iii/develop
Release v6.0.2
2023-03-11 08:32:53 +01:00
James Cole
a97a0d461d
Merge pull request #7197 from firefly-iii/602
update meta files for 602
2023-03-11 08:32:04 +01:00
James Cole
8d3170785e
update meta files for 602 2023-03-11 08:31:27 +01:00
James Cole
ae373a15c5
Merge pull request #7195 from firefly-iii/fix-7142
Fix #7142
2023-03-11 07:45:47 +01:00
James Cole
1f342ed592
Fix #7142 2023-03-11 07:44:45 +01:00
James Cole
3e04f14665
Merge pull request #7194 from firefly-iii/fix-7192
Extra code for #7192
2023-03-11 07:13:59 +01:00
James Cole
dbf83df363
Extra code for #7192 2023-03-11 07:13:39 +01:00
James Cole
15bfc0d6fa
Merge pull request #7193 from firefly-iii/fix-7189
Fix #7189
2023-03-11 07:09:50 +01:00
James Cole
f3fc1d8382
Fix #7189 2023-03-11 07:09:27 +01:00
James Cole
07cb7dd06e
Merge pull request #7191 from firefly-iii/fix-7188
Fix #7188
2023-03-11 05:50:29 +01:00
James Cole
38624442d1
Fix #7188 2023-03-11 05:50:10 +01:00
James Cole
258dfb3d11
Merge pull request #7190 from firefly-iii/fix-7186
Fix #7186
2023-03-11 05:48:41 +01:00
James Cole
51ddfcdaaa
Fix #7186 2023-03-11 05:38:54 +01:00
James Cole
2a0acdbb27
Merge pull request #7185 from firefly-iii/develop
Develop
2023-03-10 19:15:44 +01:00
James Cole
99bd28f21e
Merge pull request #7184 from firefly-iii/metadata
Meta data for new release.
2023-03-10 19:12:08 +01:00
James Cole
643ae91bb5
Meta data for new release. 2023-03-10 19:11:27 +01:00
James Cole
591e3ab3ec
Merge pull request #7178 from firefly-iii/fix-7177
Fix #7177
2023-03-09 08:15:18 +01:00
James Cole
edd7aed691
Fix #7177 2023-03-09 08:14:30 +01:00
James Cole
2e89586559
Merge pull request #7176 from firefly-iii/fix-7175
Fixes #7175
2023-03-09 06:34:09 +01:00
James Cole
173f593a7e
Fixes #7175 2023-03-09 06:33:23 +01:00
James Cole
d4839c8818
Merge pull request #7174 from firefly-iii/fix-7172
Fix 7172
2023-03-08 20:47:18 +01:00
James Cole
a122dba0ad
Fix https://github.com/firefly-iii/firefly-iii/issues/7172 2023-03-08 20:40:51 +01:00
James Cole
ae813a536e
Merge pull request #7171 from firefly-iii/fix-7166
Fix #7166
2023-03-07 19:55:15 +01:00
James Cole
b9d174238b
Fix #7166 2023-03-07 19:54:58 +01:00
James Cole
fbf5adbe79
Merge pull request #7170 from firefly-iii/fix-7165
Fix https://github.com/firefly-iii/firefly-iii/issues/7165
2023-03-07 19:51:36 +01:00
James Cole
c676a65f93
Fix https://github.com/firefly-iii/firefly-iii/issues/7165 2023-03-07 19:50:20 +01:00
James Cole
5ab8fbddcb
Merge pull request #7169 from firefly-iii/fix-7124
Fix https://github.com/firefly-iii/firefly-iii/issues/7124
2023-03-07 19:37:23 +01:00
James Cole
b942fa4b09
Fix https://github.com/firefly-iii/firefly-iii/issues/7124 2023-03-07 19:36:54 +01:00
James Cole
8ee358551c
Merge pull request #7168 from firefly-iii/fix-7120
Fix https://github.com/firefly-iii/firefly-iii/issues/7120
2023-03-07 19:14:48 +01:00
James Cole
a5f3b4533b
Fix https://github.com/firefly-iii/firefly-iii/issues/7120 2023-03-07 19:14:15 +01:00
James Cole
e258efe1bf
Merge pull request #7167 from firefly-iii/fix-7104
Fix https://github.com/firefly-iii/firefly-iii/issues/7104
2023-03-07 19:11:00 +01:00
James Cole
f9a213e06f
Fix https://github.com/firefly-iii/firefly-iii/issues/7104 2023-03-07 19:10:32 +01:00
James Cole
05bd732e7c
Merge pull request #7163 from firefly-iii/issue-template-updates
Small issue template updates
2023-03-07 05:23:04 +01:00
James Cole
70050678c5
Small issue template updates 2023-03-07 05:22:36 +01:00
James Cole
6a649f2f42
Merge pull request #7160 from firefly-iii/fix-7159
Fix #7159
2023-03-06 21:00:54 +01:00