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
17,367 Commits 9 Branches 1,163 Tags
591e3ab3ec00d350ac9973f167631171539022f6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
James Cole 6912e05677 Fix #7159 2023-03-06 21:00:27 +01:00
James Cole c78fa8eaea Merge pull request #7151 from firefly-iii/fix-7144 
Fix #7144
 2023-03-06 05:55:20 +01:00
James Cole 5a06e3523b Merge pull request #7150 from firefly-iii/fix-7140 
Fix #7140 by better validating header content.
 2023-03-06 05:54:36 +01:00
James Cole b34cb0428b Merge pull request #7149 from firefly-iii/mail-provider 
Make sure default mail provider is "log", not smtp
 2023-03-06 05:53:11 +01:00
James Cole ce3c866168 Make sure default mail provider is "log", not smtp 2023-03-06 05:52:41 +01:00
James Cole 4ada2f3e3c Merge pull request #7147 from firefly-iii/dependabot/composer/develop/nunomaduro/collision-7.1.0 
Bump nunomaduro/collision from 7.0.5 to 7.1.0
 2023-03-06 05:47:14 +01:00
James Cole 60af2c4232 Merge pull request #7146 from firefly-iii/dependabot/composer/develop/nunomaduro/larastan-2.5.1 2023-03-06 05:45:29 +01:00
James Cole 0f57094b17 Fix #7144 2023-03-05 19:26:33 +01:00
James Cole dad738ae42 Fix #7140 by better validating header content. 2023-03-05 17:07:27 +01:00
James Cole 3df05eb63c Merge pull request #7136 from firefly-iii/fix-7130 
Fix #7130
 2023-03-05 08:00:11 +01:00
James Cole 57b83dd239 Fix #7130 2023-03-05 07:59:48 +01:00
James Cole 1539dcffd5 Revert "Fix #7130" 
This reverts commit b4a09efb8b.
 2023-03-05 07:57:40 +01:00
James Cole b4a09efb8b Fix #7130 2023-03-05 07:56:37 +01:00
James Cole e82b372f75 Merge pull request #7134 from firefly-iii/fix-7131 
Fix #7131 by expanding the global ajaxSetup instructions.
 2023-03-05 07:52:09 +01:00
James Cole 83a89181bc Add JSON.stringify 2023-03-05 07:00:04 +01:00
James Cole b1e08b1084 Fix #7131 by expanding the global ajaxSetup instructions. 2023-03-05 06:09:25 +01:00
James Cole 0eb582ab3b Merge pull request #7129 from firefly-iii/common-mail-errors 
Catch common mail errors
 2023-03-04 22:26:43 +01:00
James Cole 07b58b4200 Catch common mail errors 2023-03-04 22:26:09 +01:00
James Cole 8807f04599 Merge pull request #7128 from firefly-iii/fix-7127 
Fix 7127
 2023-03-04 22:19:17 +01:00
James Cole 4657d34ae4 Fix request 2023-03-04 22:18:37 +01:00
James Cole 79951453cd Switch the button 2023-03-04 22:17:19 +01:00
James Cole 5291f485ac Fix #7127 by adding an option to the API 2023-03-04 22:16:59 +01:00
James Cole ed75d84376 Merge pull request #7116 from firefly-iii/fix-6985 
Fix 6985
 2023-03-04 07:36:10 +01:00
James Cole a7011376cb Add package. 2023-03-04 07:35:51 +01:00
James Cole 6c4bd84b66 Fix #6985 2023-03-04 07:35:30 +01:00
James Cole c4418857e6 Merge pull request #7114 from firefly-iii/fix-7112 
Fix https://github.com/firefly-iii/firefly-iii/issues/7112
 2023-03-04 07:18:55 +01:00
James Cole 5d316ea26a Fix https://github.com/firefly-iii/firefly-iii/issues/7112 2023-03-04 07:18:20 +01:00
James Cole 4a0887c978 Merge pull request #7109 from firefly-iii/css-fixes 
CSS fixes for subdirectories. Full credits to @GaneshKandu
 2023-03-03 09:15:11 +01:00
James Cole dbfceafb02 CSS fixes for subdirectories. Full credits to @GaneshKandu 2023-03-03 09:14:44 +01:00
James Cole 4db73285b7 Merge branch 'main' into develop 2023-03-03 06:22:08 +01:00
James Cole 876ea8bb07 Merge pull request #7103 from firefly-iii/dependabot/npm_and_yarn/frontend/dns-packet-5.4.0 
Bump dns-packet from 5.3.1 to 5.4.0 in /frontend
 2023-03-03 06:21:40 +01:00
James Cole f1223a5a3f Merge tag 'v6.0.0' into develop 
v6.0.0
 2023-03-02 21:21:12 +01:00
James Cole 1a3720bfaa Merge branch 'release/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
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
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' 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
James Cole b7c2576970 Merge pull request #7056 from firefly-iii/update-actions 
Update various actions
 2023-02-19 08:53:05 +01:00
James Cole 57f32ec987 Update various actions 2023-02-19 08:52:46 +01:00