kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity
17,313 Commits 4 Branches 737 Tags
1a3720bfaaadfa29f90cdad77ae1a91ed676cb65
Commit Graph

17313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole
1a3720bfaa Merge branch 'release/v6.0.0' v6.0.0 2023-03-02 21:21:11 +01:00
James Cole
1ddcc51c48 Merge pull request #7102 from firefly-iii/final-60 
Final 60
 2023-03-02 21:19:40 +01:00
James Cole
9f43ea3118 Update packages. 2023-03-02 21:19:17 +01:00
James Cole
0fe4ac9ef5 Update files for 6.0.0 2023-03-02 21:18:06 +01:00
James Cole
d6d395eccd Merge pull request #7101 from firefly-iii/fix-liabilities 
Fix liabilities
 2023-03-02 21:08:20 +01:00
James Cole
a26f5e2e6d Do not remove liabilities. 2023-03-02 21:06:53 +01:00
James Cole
849e006eda Merge pull request #7094 from firefly-iii/fix-7093 
Fix https://github.com/firefly-iii/firefly-iii/issues/7093
 2023-03-01 07:32:39 +01:00
James Cole
f70a4511c6 Fix https://github.com/firefly-iii/firefly-iii/issues/7093 2023-03-01 07:32:19 +01:00
James Cole
21ba311ecf Merge pull request #7092 from firefly-iii/fix-broken-chart 
Fix broken chart
 2023-03-01 06:41:16 +01:00
James Cole
fb0a100a7f Fix broken chart 2023-03-01 06:40:58 +01:00
James Cole
2295110cf1 Merge pull request #7090 from firefly-iii/dependabot/composer/develop/laravel/framework-10.1.5 
Bump laravel/framework from 10.1.4 to 10.1.5
 2023-02-27 06:05:10 +01:00
James Cole
3c82c9af8b Merge pull request #7089 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.10.3 
Bump phpstan/phpstan from 1.10.2 to 1.10.3
 2023-02-27 06:05:01 +01:00
James Cole
df78aa2f0d Merge pull request #7091 from firefly-iii/dark-mode-arrow 
Dark mode arrow
 2023-02-27 06:04:49 +01:00
James Cole
1ac18909b4 Dark mode arrow 2023-02-27 06:04:32 +01:00
dependabot[bot]
07d793e9f7 Bump laravel/framework from 10.1.4 to 10.1.5 
Bumps [laravel/framework](https://github.com/laravel/framework) from 10.1.4 to 10.1.5.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/10.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v10.1.4...v10.1.5)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-27 03:56:47 +00:00
dependabot[bot]
2a7b540a95 Bump phpstan/phpstan from 1.10.2 to 1.10.3 
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.10.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.2...1.10.3)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-27 03:56:30 +00:00
James Cole
5cdecf7d04 Merge pull request #7088 from firefly-iii/fix-7079 
Update translations.
 2023-02-26 19:49:16 +01:00
James Cole
1a0e6ffffb Update translations. 2023-02-26 19:48:15 +01:00
James Cole
c0cfc60da6 Merge pull request #7087 from firefly-iii/fix-7079 
Date fix for https://github.com/firefly-iii/firefly-iii/issues/7079
 2023-02-26 19:41:59 +01:00
James Cole
9f831a8b3d Date fix for https://github.com/firefly-iii/firefly-iii/issues/7079 2023-02-26 19:41:01 +01:00
James Cole
ec3ee2f995 Merge pull request #7084 from firefly-iii/fix-7083 
Fix https://github.com/firefly-iii/firefly-iii/issues/7083
 2023-02-26 13:30:57 +01:00
James Cole
25ca02f541 Fix https://github.com/firefly-iii/firefly-iii/issues/7083 2023-02-26 13:30:14 +01:00
James Cole
776c59faea Merge pull request #7080 from firefly-iii/six 
Six
 2023-02-25 09:08:47 +01:00
James Cole
a4b1587a78 Fix week number 2023-02-25 09:08:10 +01:00
James Cole
1d79eea69e Update changelog. 2023-02-25 08:42:19 +01:00
James Cole
b369b6e7b8 Fix https://github.com/firefly-iii/firefly-iii/issues/7079 2023-02-25 08:38:50 +01:00
James Cole
3832297d69 Merge pull request #7075 from firefly-iii/six 
Fix audit processor
 2023-02-24 06:04:04 +01:00
James Cole
a7e64a130e Fix audit processor 2023-02-24 06:03:41 +01:00
James Cole
73715dc0b9 Merge pull request #7074 from firefly-iii/six 
Six
 2023-02-24 05:55:21 +01:00
James Cole
8f66c93ad0 Upgrade to Laravel 10 2023-02-24 05:53:32 +01:00
James Cole
bcaf6402b5 Final files for 6.0.0 2023-02-24 05:30:15 +01:00
James Cole
16b0ee0c79 Merge pull request #7071 from firefly-iii/fix-prune 
Update prune workflow.
 2023-02-23 07:04:09 +01:00
James Cole
1033655615 Update prune workflow. 2023-02-23 07:03:47 +01:00
James Cole
6d327b98d4 Merge pull request #7070 from firefly-iii/fix-translations 
Update translations and fix some code.
 2023-02-22 19:55:29 +01:00
James Cole
585cfddfd7 Update translations and fix some code. 2023-02-22 19:54:19 +01:00
James Cole
a18cd23154 Merge pull request #7068 from firefly-iii/cleanup-comments 
Cleanup comments
 2023-02-22 18:16:02 +01:00
James Cole
e421b29b01 Clean up code and comments. 2023-02-22 18:14:14 +01:00
James Cole
e6dc881f56 Clean up comments 2023-02-22 18:03:31 +01:00
James Cole
01308e2076 Merge pull request #7067 from firefly-iii/code-cleanup 
Various code cleanup, see if Qodana picks them up
 2023-02-22 17:12:51 +01:00
James Cole
26ab65c5aa Various code cleanup, see if Qodana picks them up 2023-02-22 17:11:59 +01:00
James Cole
68f398f97c Merge pull request #7062 from firefly-iii/JC5-patch-1 
Update session.php
 2023-02-20 12:46:36 +01:00
James Cole
eb04b11c30 Update session.php 
Signed-off-by: James Cole <james@firefly-iii.org>
 2023-02-20 12:46:21 +01:00
James Cole
29ff1648e2 Merge pull request #7061 from firefly-iii/dependabot/composer/develop/nunomaduro/collision-7.0.5 
Bump nunomaduro/collision from 7.0.3 to 7.0.5
 2023-02-20 06:25:13 +01:00
dependabot[bot]
13a1e45fc5 Bump nunomaduro/collision from 7.0.3 to 7.0.5 
Bumps [nunomaduro/collision](https://github.com/nunomaduro/collision) from 7.0.3 to 7.0.5.
- [Release notes](https://github.com/nunomaduro/collision/releases)
- [Changelog](https://github.com/nunomaduro/collision/blob/v7.x/CHANGELOG.md)
- [Commits](https://github.com/nunomaduro/collision/compare/v7.0.3...v7.0.5)

---
updated-dependencies:
- dependency-name: nunomaduro/collision
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-20 03:56:32 +00:00
James Cole
2ac3e130ec Merge tag 'v6.0.0-beta.2' into develop 
v6.0.0-beta.2
 2023-02-19 11:32:49 +01:00
James Cole
0436614643 Merge branch 'release/v6.0.0-beta.2' v6.0.0-beta.2 2023-02-19 11:32:48 +01:00
James Cole
427e11dac9 Merge pull request #7058 from firefly-iii/beta-2 
New and updated files for beta 2
 2023-02-19 11:32:14 +01:00
James Cole
c3a4656e22 New and updated files for beta 2 2023-02-19 11:16:15 +01:00
James Cole
aab8eb467c Merge pull request #7057 from firefly-iii/missing-indexes 
Missing indexes
 2023-02-19 10:52:24 +01:00
James Cole
84987dbe02 Add missing key indexes. 2023-02-19 10:50:43 +01:00