mirror/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-03 16:00:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
16,968 Commits 8 Branches 1,032 Tags
67434bb8a59d12686d9fec9bc46ec721aed27eec
Commit Graph

16968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 67434bb8a5 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Http/Middleware/Authenticate.php
#	app/Models/Account.php
#	app/Support/Authentication/RemoteUserGuard.php
 2023-01-01 15:14:15 +01:00
James Cole b0b65c3f04 Fix https://github.com/firefly-iii/firefly-iii/issues/6788 2023-01-01 14:52:46 +01:00
James Cole fe724fa1b8 Fix https://github.com/firefly-iii/firefly-iii/issues/6788 2023-01-01 14:50:32 +01:00
James Cole c3ce9e896e Fix https://github.com/firefly-iii/firefly-iii/issues/6788 2023-01-01 14:25:52 +01:00
James Cole c60120ac20 Fix https://github.com/firefly-iii/firefly-iii/issues/6787 2023-01-01 13:55:14 +01:00
James Cole 8bbe519350 Undo code. 2023-01-01 11:25:10 +01:00
James Cole c426ff352c Fix https://github.com/firefly-iii/firefly-iii/issues/6785 2023-01-01 11:23:49 +01:00
James Cole 15605dd163 Fix https://github.com/firefly-iii/firefly-iii/issues/6785 2022-12-31 15:56:36 +01:00
James Cole 4d0ff86bfa Various code cleanup 2022-12-31 15:54:55 +01:00
James Cole 7722ca2bf0 Various code fixes 2022-12-31 13:32:42 +01:00
James Cole 5878b2c427 Merge branch 'develop' into 5.8-dev 2022-12-31 08:59:20 +01:00
James Cole f2499e0a77 Merge branch 'develop' into 5.8-dev 2022-12-31 08:58:54 +01:00
James Cole 81f781a823 Merge branch 'develop' into 5.8-dev 2022-12-31 07:35:34 +01:00
James Cole b5734beb32 Fix https://github.com/orgs/firefly-iii/discussions/6775 2022-12-31 07:34:46 +01:00
James Cole 24696bf800 Clean up some code 2022-12-31 07:33:44 +01:00
James Cole 27a576ae8a Various bug fixes and code cleanup. 2022-12-31 06:57:05 +01:00
James Cole 2b9996b844 Remove some unreachable code. 2022-12-30 20:48:48 +01:00
James Cole 742c84269b Code cleanup should trigger scan. 2022-12-30 20:38:54 +01:00
James Cole 333c348117 Merge branch 'main' into 5.8-dev 2022-12-30 20:31:26 +01:00
James Cole ed4d2ee6ad Update build.yml 2022-12-30 20:30:52 +01:00
James Cole 445804a7f1 Fix phpstan messages. 2022-12-30 20:25:04 +01:00
James Cole ee0116f112 Various code cleanup. 2022-12-30 09:28:03 +01:00
James Cole 03e176bd16 Some warnings. 2022-12-30 06:27:55 +01:00
James Cole a84050a084 Forgot a thing 2022-12-30 06:25:28 +01:00
James Cole bef7887a8d Changelog for 5.8.0 2022-12-30 06:24:43 +01:00
James Cole 5b8e01fbfb Various PSR12 code cleanup 2022-12-29 19:43:43 +01:00
James Cole 56b9b66352 Various PSR12 code cleanup 2022-12-29 19:42:40 +01:00
James Cole 6cfdc58cb1 Various PSR12 code cleanup 2022-12-29 19:42:26 +01:00
James Cole dbf3e76ecc Various PSR12 code cleanup 2022-12-29 19:41:57 +01:00
James Cole 0022009dd5 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	config/firefly.php
#	resources/lang/de_DE/firefly.php
#	resources/lang/de_DE/validation.php
#	resources/lang/pl_PL/firefly.php
 2022-12-29 19:16:24 +01:00
James Cole 6249488f0f Merge tag '5.7.17' into develop 
5.7.17
 2022-12-29 19:13:54 +01:00
James Cole 29bd3a2804 Merge branch 'release/5.7.17' 5.7.17 2022-12-29 19:13:53 +01:00
James Cole ba35c5da0b Update meta data 2022-12-29 19:13:15 +01:00
James Cole 9b242f1a75 Update translations. 2022-12-29 19:06:31 +01:00
James Cole 1acc2ab18b Update meta files 2022-12-29 16:02:28 +01:00
James Cole e031fffe65 Update translations 2022-12-29 15:49:24 +01:00
James Cole 2a61633ab9 Clean up code and update packages 2022-12-29 15:44:13 +01:00
James Cole 5e3f9f9bce Expand search with external ID searches. 2022-12-29 15:42:26 +01:00
James Cole 8c320fd199 Implement custom trigger for recurring transactions 2022-12-29 15:42:02 +01:00
James Cole 85a2a87806 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	composer.lock
 2022-12-29 11:36:07 +01:00
James Cole 3666ef8c59 Fix piggy views. 2022-12-29 11:29:00 +01:00
James Cole e4db21f0c0 Update packages, fix rule 2022-12-29 07:26:14 +01:00
James Cole d137b2938d Remove unused function. 2022-12-29 07:16:31 +01:00
James Cole d3a619cb15 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Http/Requests/RuleFormRequest.php
 2022-12-28 06:51:59 +01:00
James Cole d40fd485ca Update packages 2022-12-28 06:49:50 +01:00
James Cole 32e89155a0 Temp fix for https://github.com/firefly-iii/firefly-iii/issues/6753 2022-12-28 06:49:40 +01:00
James Cole cae0b1798a Merge branch 'develop' into 5.8-dev 2022-12-27 21:13:42 +01:00
James Cole 5e654786be Remove floats. 2022-12-27 21:13:18 +01:00
James Cole 75ce777090 Fix https://github.com/firefly-iii/firefly-iii/issues/6743 2022-12-27 20:00:18 +01:00
James Cole f350948fb2 Fix https://github.com/firefly-iii/firefly-iii/issues/6743 2022-12-27 17:17:00 +01:00