IntenseFinance/firefly-iii
3
0 Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-10-04 04:36:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
17,061 Commits 11 Branches 1,252 Tags
e7a1ad23f4eff01452934e0c631288fc2b13d0d3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole e7a1ad23f4 Merge pull request #6863 from firefly-iii/fix-improper-escaoe 
Fix improper escape.
 2023-01-15 17:24:37 +01:00
James Cole afd3fd9f88 Fix improper escape. 2023-01-15 17:05:21 +01:00
James Cole f2251d7bfa Merge pull request #6862 from firefly-iii/main 
Merge back into develop
 2023-01-15 16:11:18 +01:00
James Cole 700ccaa853 Merge pull request #6861 from firefly-iii/release/6.0.0-alpha.1 
Release/6.0.0 alpha.1
 2023-01-15 16:10:06 +01:00
James Cole 0fcdcf0f01 Final updates 2023-01-15 16:09:02 +01:00
James Cole fa347a5ee4 Merge pull request #6860 from firefly-iii/six-alpha1 
Update files for 6.0.0-alpha.1
 2023-01-15 15:55:31 +01:00
James Cole d412c2407a Merge pull request #6859 from firefly-iii/debug-6831 
Add debug for https://github.com/firefly-iii/firefly-iii/issues/6831
 2023-01-15 15:54:59 +01:00
James Cole dea86242fd Add debug for https://github.com/firefly-iii/firefly-iii/issues/6831 2023-01-15 15:54:41 +01:00
James Cole 973c175213 Update files for 6.0.0-alpha.1 2023-01-15 15:47:25 +01:00
James Cole e135d01655 Merge pull request #6857 from firefly-iii/fix-liabilities 
Fix liabilities
 2023-01-15 15:15:35 +01:00
James Cole 9b37d5ab8d Clean up logging. 2023-01-15 13:49:28 +01:00
James Cole 84c3868c9b Add destructive upgrade routine. 2023-01-15 09:22:34 +01:00
James Cole 3c0b23aaed Add another case for deposits. 2023-01-15 07:52:05 +01:00
James Cole 7e6ce7c3e8 Also in create form. 2023-01-15 07:21:51 +01:00
James Cole 7111aec101 Make sure edit of liability always works. 2023-01-15 07:20:58 +01:00
James Cole 1f9e0b48c9 Fix withdrawals away from liabilities, cleanup debug logs 2023-01-15 06:58:09 +01:00
James Cole 63a7aad44c Merge pull request #6855 from eps90/fix-bulk-validator-for-expenses 
Do not validate currency if account has no currency configured
 2023-01-14 17:44:55 +01:00
James Cole 618e70748c Merge pull request #6853 from firefly-iii/add-catalan 
Enable and include Catalan.
 2023-01-14 15:49:55 +01:00
James Cole 68e4f26656 Enable and include Catalan. 2023-01-14 15:49:13 +01:00
James Cole 5124a5eba9 Merge pull request #6851 from firefly-iii/translation-warnings 
Translation warnings
 2023-01-14 15:48:31 +01:00
James Cole 708cd014c5 Add warning to files. 2023-01-14 15:47:51 +01:00
James Cole 9654f631c5 Give all files the standard warning (to be replaced). 2023-01-14 15:43:25 +01:00
James Cole 65027d7832 Add placeholder to en_US files. 2023-01-14 15:32:51 +01:00
James Cole db0500dcf0 Merge pull request #6850 from firefly-iii/fix-auth-issue 
Expand authentication validation in API.
 2023-01-14 07:55:11 +01:00
James Cole 89d4a34acf Merge pull request #6848 from firefly-iii/fix-deposit-issue 
Add feature: Firefly III can create account of the right type if you …
 2023-01-14 07:54:21 +01:00
James Cole 23bbebb80e Expand authentication validation in API. 2023-01-14 07:53:00 +01:00
James Cole 4ccdd8f322 Add feature: Firefly III can create account of the right type if you submit ID of the wrong type. 2023-01-14 07:39:51 +01:00
James Cole 3033b0fa7f Fix https://github.com/firefly-iii/firefly-iii/issues/6834 2023-01-11 18:02:24 +01:00
James Cole abc7bfb54c Fix transformer 2023-01-11 17:41:03 +01:00
James Cole 1fede6b802 Add debug 2023-01-11 17:39:48 +01:00
James Cole 6e3381844e Catch things that should be NULL 2023-01-11 17:38:17 +01:00
James Cole 3f2560c8e5 Check debug 2023-01-11 17:34:05 +01:00
James Cole abdbb86d05 Remove debug logs 2023-01-11 17:30:39 +01:00
James Cole 9008d19494 Add include 2023-01-11 17:30:20 +01:00
James Cole 929513c220 Remove thing 2023-01-11 17:29:54 +01:00
James Cole 566a303650 Add some debug. 2023-01-11 17:29:19 +01:00
James Cole e783b8dba4 Remove debug 2023-01-11 17:28:09 +01:00
James Cole bb6cbe884e Remove various logging. 2023-01-11 17:14:35 +01:00
James Cole 3be4c07848 Add JSON 2023-01-11 08:13:52 +01:00
James Cole 732a87f051 Fix capitalisation. 2023-01-11 06:58:59 +01:00
James Cole 124d3aaf96 Fix bad cache call. 2023-01-11 06:18:42 +01:00
James Cole 65df355440 Fix login box in dark mode. 2023-01-11 06:17:03 +01:00
James Cole 29e07c6604 Fix enum 2023-01-11 06:10:57 +01:00
James Cole c0af63e59e update packages 2023-01-11 06:06:18 +01:00
James Cole 772f0f5ba4 Merge pull request #6830 from firefly-iii/test-pr-6829 2023-01-10 20:45:33 +01:00
James Cole 6db3e3d75e Fix https://github.com/firefly-iii/firefly-iii/issues/6829 2023-01-10 19:56:38 +01:00
James Cole 9290c2247e Merge pull request #6826 from jstebenne/js/hide-2fa-qr-in-print 
Hide sensitive information in 2FA setup page when printing
 2023-01-10 05:53:06 +01:00
James Cole 5845ba0daf Merge pull request #6818 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.9.8 
Bump phpstan/phpstan from 1.9.7 to 1.9.8
 2023-01-09 07:28:33 +01:00
James Cole 81ce2c1b3e Merge pull request #6819 from firefly-iii/dependabot/composer/develop/gdbots/query-parser-3.0.0 
Bump gdbots/query-parser from 2.0.2 to 3.0.0
 2023-01-09 06:30:19 +01:00
James Cole fe9620a438 Switch opening balance. 2023-01-08 19:47:39 +01:00
James Cole d90321aa1e Catch bad upgrade command. 2023-01-08 19:24:28 +01:00
James Cole c26667ebc7 Add some extra text. 2023-01-08 19:17:54 +01:00
James Cole 862140a9fc Expand net worth calculation. TODO in three places. 2023-01-08 18:51:24 +01:00
James Cole 8447670ed5 Add new upgrade command. 2023-01-08 18:41:56 +01:00
James Cole 7a2c52531a Fix bad spelling 2023-01-08 16:34:34 +01:00
James Cole cb4e5a80b2 Fix piggy action. 2023-01-08 08:36:35 +01:00
James Cole c976149bf1 Fix issue with liability upgrades. 2023-01-08 07:43:16 +01:00
James Cole 4917f40abf Merge tag '5.8.0-alpha.1' into develop 
5.8.0-alpha.1
 2023-01-07 08:51:45 +01:00
James Cole 4c27bbf069 Merge branch 'release/5.8.0-alpha.1' 2023-01-07 08:51:43 +01:00
James Cole a90214273b Small textual changes to changelog. 2023-01-07 08:50:25 +01:00
James Cole 5167f53fd5 Update meta files for new alpha release. 2023-01-07 08:41:16 +01:00
James Cole 40083230fd Update meta files for new alpha release. 2023-01-07 08:12:53 +01:00
James Cole ca57942b38 Force PHP 8.2 2023-01-07 07:53:25 +01:00
James Cole ef58d5b1b2 Update meta data for first alpha release. 2023-01-07 07:52:55 +01:00
James Cole cc218e203f Some small fixes in UI 2023-01-07 05:53:48 +01:00
James Cole 9fdaf1cee8 Fix https://github.com/firefly-iii/firefly-iii/issues/6810 2023-01-06 21:12:10 +01:00
James Cole 770d092e93 Rebuild frontend 2023-01-06 06:13:55 +01:00
James Cole 6d4e45b89f Make sure rules are consistent and catch more errors. 2023-01-06 06:12:39 +01:00
James Cole 1fee2092d6 Clear up webhooks 2023-01-05 19:05:23 +01:00
James Cole 7bd824e8cb Update packages and meta data. 2023-01-04 20:40:57 +01:00
James Cole fa588db1a9 Enable webhooks. 2023-01-04 20:11:56 +01:00
James Cole c3e0ce0c08 Merge branch 'develop' into 5.8-dev 2023-01-03 08:45:04 +01:00
James Cole 6a629a7da3 Add a little sort and active filter. 2023-01-03 08:44:54 +01:00
James Cole 07e4e93632 Various code cleanup 2023-01-03 06:48:53 +01:00
James Cole 6784fe4436 Fix incompatible function declaration. 2023-01-02 16:24:35 +01:00
James Cole af8c127106 Fix incompatible function declaration. 2023-01-02 16:21:18 +01:00
James Cole ebd32e0e08 Update code style. 2023-01-02 16:18:17 +01:00
James Cole b56acf36c5 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Events/ChangedPiggyBankAmount.php
#	app/Handlers/Events/PiggyBankEventHandler.php
#	changelog.md
#	composer.lock
#	config/firefly.php
 2023-01-02 16:17:52 +01:00
James Cole 4daaa44ba8 Merge branch 'release/5.7.18' 2023-01-02 16:10:17 +01:00
James Cole 93ae82691b Merge tag '5.7.18' into develop 
5.7.18
 2023-01-02 16:10:17 +01:00
James Cole c3e739cd6f Update packages. 2023-01-02 16:08:46 +01:00
James Cole 851da6a0a1 Update meta files for new release. 2023-01-02 07:03:36 +01:00
James Cole a99f68fd17 Merge pull request #6789 from firefly-iii/dependabot/composer/develop/ramsey/uuid-4.7.1 
Bump ramsey/uuid from 4.7.0 to 4.7.1
 2023-01-02 06:54:11 +01:00
James Cole 1266eff7f6 Add strict_types 2023-01-02 06:52:18 +01:00
James Cole e5d5e774dc Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Models/AvailableBudget.php
 2023-01-02 06:46:05 +01:00
James Cole 0429f50e5c Add attributes 2023-01-02 06:44:52 +01:00
James Cole e4db5f5a21 Merge branch 'develop' into 5.8-dev 2023-01-01 15:30:38 +01:00
James Cole 3c1f44f554 Fix https://github.com/firefly-iii/firefly-iii/issues/6788 2023-01-01 15:27:14 +01:00
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