kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-20 03:08:11 +00:00
Code Issues Projects Releases Wiki Activity
16,925 Commits 4 Branches 726 Tags
d3a619cb15b3cc3ae429de0431adf1697c1d5abf
Commit Graph

457 Commits

Author SHA1 Message Date
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
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
db478711ed Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Api/V1/Controllers/Chart/AccountController.php
#	app/Api/V1/Controllers/Insight/Expense/AccountController.php
#	app/Api/V1/Controllers/Insight/Expense/BillController.php
#	app/Api/V1/Controllers/Insight/Expense/BudgetController.php
#	app/Api/V1/Controllers/Insight/Expense/CategoryController.php
#	app/Api/V1/Controllers/Insight/Expense/PeriodController.php
#	app/Console/Commands/Upgrade/MigrateToGroups.php
#	app/Http/Controllers/Account/IndexController.php
#	app/Http/Controllers/Budget/AvailableBudgetController.php
#	app/Http/Controllers/Budget/BudgetLimitController.php
#	app/Http/Controllers/Budget/EditController.php
#	app/Http/Controllers/Chart/AccountController.php
#	app/Http/Controllers/Json/FrontpageController.php
#	app/Http/Controllers/PiggyBank/EditController.php
 2022-12-24 06:15:26 +01:00
James Cole
5f6772260d Remove null exceptions 2022-12-24 05:48:04 +01:00
James Cole
f53923f16c Use PSR-12 code style 2022-10-30 14:24:28 +01:00
James Cole
d28326cc89 Restore todo's 2022-10-30 11:43:17 +01:00
James Cole
b3740e643a Update copyright statements 2022-10-16 19:29:53 +02:00
James Cole
44637dfaab Merge 2022-10-04 20:31:57 +02:00
James Cole
bab4c05e5f Fix https://github.com/firefly-iii/firefly-iii/issues/6471 2022-10-04 19:12:57 +02:00
James Cole
5f11272d49 Merge branch 'develop' into 5.8-dev 2022-10-01 19:06:55 +02:00
James Cole
ee9b651f0f Add ability to invite users 2022-10-01 12:21:42 +02:00
James Cole
9bfa52f3ce Merge branch 'develop' into 5.8-dev 
And fix rule creation and edit etc
 2022-10-01 07:34:30 +02:00
James Cole
4474a71e65 Attempted fix for #6475 2022-09-30 20:07:01 +02:00
James Cole
2b615cf757 Fix bad call to method. 2022-05-02 19:35:35 +02:00
James Cole
29bed2547c Reformat various code. 2022-03-29 14:58:06 +02:00
James Cole
f2849c8058 New cron job for bills. 2022-03-28 12:23:46 +02:00
James Cole
8ee4c2ea11 Piggies can have no target amount. 2022-03-27 18:30:46 +02:00
James Cole
55a6cc5cd4 Fix https://github.com/firefly-iii/firefly-iii/issues/5852 2022-03-19 07:34:09 +01:00
James Cole
a56a6df557 Final changes to bills 2022-02-05 08:53:45 +01:00
James Cole
b15b58f099 Fix https://github.com/firefly-iii/firefly-iii/issues/5664 2022-01-30 17:37:44 +01:00
James Cole
374793eb92 Add extra validation. 2022-01-26 18:43:14 +01:00
James Cole
246fa0d6e4 Fix date issue. 2021-12-28 20:42:50 +01:00
James Cole
36ecf25804 Refactor account search. 2021-12-18 12:35:17 +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
4003cea759 Code reordering and reformatting. I should really start employing style CI. 2021-09-18 10:26:12 +02:00
James Cole
6d971e86b1 Various fixes and extensions. 2021-07-18 14:51:30 +02:00
James Cole
70da5917c9 Refactor findNull to find 2021-06-30 06:17:38 +02:00
James Cole
cd9d1cf4ab Fix #4846 2021-06-12 08:46:06 +02:00
James Cole
8832387b84 Remove TODO's. 2021-06-11 20:39:01 +02:00
James Cole
3f1bd6b3f1 Currency code expansion. 2021-05-13 05:52:06 +02:00
James Cole
65c49c7a71 Merge branch 'develop' into feature/credit_calc 
# Conflicts:
#	app/Factory/TransactionJournalMetaFactory.php
#	app/Repositories/Account/AccountRepository.php
#	app/Transformers/AccountTransformer.php
#	config/firefly.php
#	frontend/src/components/accounts/Create.vue
 2021-04-27 06:54:38 +02:00
James Cole
2f9724e7ca Fix nullpointers. 2021-04-13 06:26:51 +02:00
James Cole
39925f8139 Small changes in list 2021-04-12 06:08:21 +02:00
James Cole
0426fa63d0 Make sure the user can create liabilities in the "credit" direction with the right transactions. 2021-04-10 17:26:36 +02:00
James Cole
eddf0c1200 Various code cleanup. 2021-04-07 07:53:05 +02:00
James Cole
f12744ad8c Various code cleanup. 2021-04-07 07:28:43 +02:00
James Cole
69b1769f22 Refactor old methods. 2021-04-06 13:30:09 +02:00
James Cole
b812c2e09f Simplify account creation. 2021-04-05 10:56:08 +02:00
James Cole
d3502c56d3 Fix #4593 2021-04-04 12:48:44 +02:00
James Cole
cbcf251bb3 Fix #4570 2021-03-31 19:36:08 +02:00
James Cole
2c575f3ca5 Code cleanup. 2021-03-28 11:43:07 +02:00
James Cole
206845575c Code cleanup 2021-03-21 09:15:40 +01:00
James Cole
1783f0beb1 Extra content to fix recurrences. 2021-03-15 08:51:21 +01:00
James Cole
8d84dfb3aa Small bugfixes for issues in beta 2 2021-03-15 07:45:46 +01:00
James Cole
321bb33255 Fix #4186 2020-12-30 19:27:09 +01:00
James Cole
b03b0c630b Fix missing method. 2020-10-30 17:13:29 +01:00
James Cole
ca3d836c83 Add notes to category #4002 2020-10-28 06:32:37 +01:00
James Cole
3aa835a985 Fix #4003 2020-10-28 06:14:12 +01:00