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
15,816 Commits 9 Branches 1,163 Tags
bedfcb5c5d97de1fe78fe2ea88c9da861318bf55
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole bedfcb5c5d Updated translations. 2021-12-19 06:59:10 +01:00
James Cole 19461020ef Various layout fixes. 2021-12-19 06:56:11 +01:00
James Cole 36ecf25804 Refactor account search. 2021-12-18 12:35:17 +01:00
James Cole 0229fc243a Add new transactions. 2021-12-17 20:13:07 +01:00
James Cole a2f09b305c Possible fix for https://github.com/firefly-iii/firefly-iii/issues/5405 2021-12-17 17:27:29 +01:00
James Cole 32d7a0fd1b Fix some code quality things. 2021-12-17 17:27:01 +01:00
James Cole 26e3157ae7 Merge tag '5.6.6' into develop 
5.6.6

# Conflicts:
 2021-12-10 19:26:48 +01:00
James Cole b592528318 Merge branch 'release/5.6.6' 2021-12-10 19:26:29 +01:00
James Cole 936d55d7de Update changelog. 2021-12-10 18:04:49 +01:00
James Cole 6df45fccc5 Update packages. 2021-12-10 18:00:38 +01:00
James Cole f43ebcce87 Rebuild frontend. 2021-12-10 16:58:30 +01:00
James Cole 23fc261a82 Rebuild v1 2021-12-10 16:55:10 +01:00
James Cole 344db19232 Update translations. 2021-12-10 16:44:36 +01:00
James Cole 5f777845a3 Update version. 2021-12-10 16:42:15 +01:00
James Cole f32bdd6c76 Fix various issues and remove debug comments. 2021-12-10 16:42:02 +01:00
James Cole 219c3c11f9 Expand API 2021-12-10 16:40:22 +01:00
James Cole b3b367fcb3 Fix https://github.com/firefly-iii/firefly-iii/issues/5296 2021-12-10 16:37:30 +01:00
James Cole 52a43e7f30 Fix https://github.com/firefly-iii/firefly-iii/issues/5327 2021-12-10 16:31:26 +01:00
James Cole 04f5098d06 Fix https://github.com/firefly-iii/firefly-iii/issues/5335 2021-12-10 16:27:12 +01:00
James Cole 9731503826 Fix https://github.com/firefly-iii/firefly-iii/issues/5352 2021-12-10 15:43:42 +01:00
James Cole b431351a22 Fix https://github.com/firefly-iii/firefly-iii/issues/5108 2021-12-10 15:32:14 +01:00
James Cole 089097a41c Fix https://github.com/firefly-iii/firefly-iii/issues/5297 2021-12-10 15:08:23 +01:00
James Cole 4468fdd76b Fix https://github.com/firefly-iii/firefly-iii/issues/5375 2021-12-10 15:01:41 +01:00
James Cole 79c70c59e3 Fix #5371 in other places as well. 2021-12-07 06:15:27 +01:00
James Cole c8ffc81527 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-12-07 06:14:18 +01:00
James Cole 048db14a08 Merge pull request #5371 from weimdall/bugfix/auto_budget_value 
Bugfix: Empty pre-filled value in auto-budgets
 2021-12-07 05:12:52 +00:00
James Cole 775492b391 Minor fixes. 2021-12-03 18:39:45 +01:00
James Cole 1419176094 Validate key existence more strictly. 2021-12-02 18:14:43 +01:00
James Cole aa0ca5fdcf Flush cache after transaction destruction. 2021-12-01 16:57:55 +01:00
James Cole f6d58191b2 Merge branch 'release/5.6.5' 
# Conflicts:
#	routes/web.php
 2021-11-26 06:41:09 +01:00
James Cole 89fbf0869a Fix some lines. 2021-11-26 06:40:14 +01:00
James Cole b1e453438e Update meta files for new release. 2021-11-26 06:28:04 +01:00
James Cole 284c6033d3 Update meta files for new release. 2021-11-26 06:24:10 +01:00
James Cole b85b32560c Fix https://github.com/firefly-iii/firefly-iii/issues/5325 2021-11-26 06:16:21 +01:00
James Cole 35bc92bb49 Update meta files for new release. 2021-11-25 07:16:05 +01:00
James Cole 243a5217e7 Fix redirect. 2021-11-25 06:26:38 +01:00
James Cole b2eeeed0af Fix #5245 2021-11-24 20:27:57 +01:00
James Cole afd4700758 Switch things. 2021-11-24 20:20:47 +01:00
James Cole 03a1601bf3 Fix. 2021-11-24 20:04:39 +01:00
James Cole edfff4ec57 Fix. 2021-11-24 20:03:28 +01:00
James Cole 7b5bc3a25e Revert "Fix CSRF issues" 
This reverts commit 518b4ba5a7.
 2021-11-24 19:23:57 +01:00
James Cole d98ca0bb44 Merge branch 'main' into develop 2021-11-24 19:23:45 +01:00
James Cole 518b4ba5a7 Fix CSRF issues 2021-11-24 19:22:07 +01:00
James Cole 0f9c1b9427 Remove mergify file 2021-11-22 06:40:23 +01:00
James Cole c273f309d4 Add mergify 2021-11-22 06:34:03 +01:00
James Cole 17fd2f9909 Remove config 2021-11-22 06:33:28 +01:00
James Cole 9c8b31fdbb Add log messages and catch exception 2021-11-19 15:47:19 +01:00
James Cole bda1413da4 Merge pull request #5294 from firefly-iii/dependabot/composer/doctrine/dbal-3.1.4 
Bump doctrine/dbal from 3.1.3 to 3.1.4
 2021-11-16 18:37:28 +01:00
James Cole babf462bcf Fix https://github.com/firefly-iii/firefly-iii/issues/5288 2021-11-15 23:16:30 +01:00
James Cole dba24d2dee Merge pull request #5280 from StillLoading/develop 
Drop default case. OpenLDAP is already the default (see #5279)
 2021-11-13 18:39:00 +01:00
James Cole 32e550c8e0 Merge pull request #5279 from StillLoading/develop 
Develop
 2021-11-13 17:17:29 +01:00
James Cole 547caadeb2 Fix #5231 as suggested. 2021-11-13 15:38:11 +01:00
James Cole 2469e1e811 Merge branch 'release/5.6.4' 2021-11-13 11:11:53 +01:00
James Cole ded267c9ac Merge tag '5.6.4' into develop 
5.6.4
 2021-11-13 11:11:53 +01:00
James Cole 2c9733e739 Update meta files for new release. 2021-11-13 11:11:32 +01:00
James Cole 72fd263ddf Update version 2021-11-13 11:05:57 +01:00
James Cole 8b84a4b336 Add changelog. 2021-11-13 11:04:42 +01:00
James Cole 3caf1f2d36 Add return statement 2021-11-13 11:00:42 +01:00
James Cole 16391fe99c Fix #5276 2021-11-13 10:54:04 +01:00
James Cole 6d3c858cbe Merge tag '5.6.3' into develop 
5.6.3
 2021-11-12 20:27:12 +01:00
James Cole 7afe9fac0a Merge branch 'release/5.6.3' 2021-11-12 20:27:11 +01:00
James Cole e6a2c10a19 Merge branch 'main' into develop 2021-11-12 20:26:10 +01:00
James Cole cc9867bcc4 Update meta files for new release. 2021-11-12 20:24:52 +01:00
James Cole ba7ae19533 Update meta data for new release. 2021-11-12 20:07:09 +01:00
James Cole 47fa9e3956 Fix huntr.dev logout issue. 2021-11-09 18:46:49 +01:00
James Cole 0b739b0e3f Merge pull request #5262 from firefly-iii/mergify/JC5/config-update 
ci(Mergify): configuration update
 2021-11-08 07:24:40 +01:00
James Cole 221e912645 ci(Mergify): configuration update 
Signed-off-by: James Cole <james@firefly-iii.org>
 2021-11-08 07:24:04 +01:00
James Cole 81f4e92231 Merge pull request #5253 from firefly-iii/dependabot/composer/develop/laravel/ui-3.3.2 2021-11-08 06:13:26 +01:00
James Cole 04a6b09861 Merge pull request #5252 from firefly-iii/dependabot/composer/develop/laravel/passport-10.2.0 2021-11-08 06:11:55 +01:00
James Cole e31842d768 Merge pull request #5251 from firefly-iii/dependabot/composer/develop/laravel/framework-8.69.0 2021-11-08 06:11:41 +01:00
James Cole e99efae839 Merge pull request #5257 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.62.1 2021-11-08 06:11:31 +01:00
James Cole 36f91aa11b Merge pull request #5254 from firefly-iii/dependabot/npm_and_yarn/develop/uiv-1.4.1 2021-11-08 06:11:22 +01:00
James Cole 140658c1a3 Merge pull request #5256 from firefly-iii/dependabot/npm_and_yarn/develop/vue-i18n-8.26.7 2021-11-08 06:11:12 +01:00
James Cole 38be52d12f Merge pull request #5255 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.21 2021-11-08 06:11:02 +01:00
James Cole a7fd8069c2 Merge pull request #5259 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/vue-i18n-8.26.7 2021-11-08 06:10:51 +01:00
James Cole 2df57bf684 Merge pull request #5258 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/uiv-1.4.1 2021-11-08 06:10:38 +01:00
James Cole 4a6cac96f6 Merge pull request #5260 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/laravel-mix-6.0.38 2021-11-08 06:10:24 +01:00
James Cole 16ee3df31f Fix https://github.com/firefly-iii/firefly-iii/issues/5226 2021-11-05 07:48:22 +01:00
James Cole 341478db73 Simplify code for https://github.com/firefly-iii/firefly-iii/issues/5229 2021-11-05 07:34:58 +01:00
James Cole ef1bf7c3e6 Catch null pointer 2021-11-04 20:16:35 +01:00
James Cole ee5b64904d Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-11-01 06:40:18 +01:00
James Cole 0ff3b95f89 Merge pull request #5220 from firefly-iii/dependabot/composer/develop/psr/log-2.0.0 
Bump psr/log from 1.1.4 to 2.0.0
 2021-11-01 06:32:26 +01:00
James Cole b70c904ec3 Merge pull request #5221 from firefly-iii/dependabot/npm_and_yarn/develop/axios-0.24.0 
Bump axios from 0.23.0 to 0.24.0
 2021-11-01 06:32:19 +01:00
James Cole 4de2512b34 Remove old files. 2021-10-31 17:50:25 +01:00
James Cole 90d4545a1f Fix https://github.com/firefly-iii/firefly-iii/issues/5218 2021-10-30 21:32:02 +02:00
James Cole 8561f3e177 Fix https://github.com/firefly-iii/firefly-iii/issues/5116 2021-10-30 17:26:05 +02:00
James Cole 51b5b3a846 Fix some v2 issues. 2021-10-30 17:06:40 +02:00
James Cole 1401282aa0 Fix #5200 2021-10-30 15:41:29 +02:00
James Cole 8b81526e54 Various improvs to the report generator. 2021-10-30 11:42:35 +02:00
James Cole a16b6cb2b8 Slightly different info popup. 2021-10-30 10:48:16 +02:00
James Cole 7876030737 Fix https://github.com/firefly-iii/firefly-iii/issues/5178 2021-10-30 07:37:05 +02:00
James Cole 402d5748e4 Rename variable https://github.com/firefly-iii/firefly-iii/issues/5133 2021-10-30 06:53:21 +02:00
James Cole 280975b81a Improvements for https://github.com/firefly-iii/firefly-iii/issues/5133 2021-10-30 06:50:04 +02:00
James Cole 6f8778d87f Catch groups that are in use. 2021-10-26 06:25:41 +02:00
James Cole fbf7578fb0 Make sure user group is deleted as well when empty. 2021-10-26 06:20:33 +02:00
James Cole 7dd560a2e3 Merge pull request #5201 from firefly-iii/dependabot/composer/develop/barryvdh/laravel-debugbar-3.6.4 
Bump barryvdh/laravel-debugbar from 3.6.2 to 3.6.4
 2021-10-25 06:59:04 +02:00
James Cole baea455fde Merge pull request #5203 from firefly-iii/dependabot/composer/develop/laravel/passport-10.1.4 2021-10-25 06:45:00 +02:00
James Cole eb303157ca Merge pull request #5206 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/postcss-8.3.11 2021-10-25 06:44:50 +02:00
James Cole 733b0d183f Merge pull request #5207 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/chart.js-3.6.0 2021-10-25 06:44:31 +02:00
James Cole 66233b7b00 Merge pull request #5208 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.43.3 2021-10-25 06:44:20 +02:00