Commit Graph

213 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
8d8f81c27d Various code cleanup and phpstan suggestions 2022-11-02 06:25:37 +01:00
James Cole
249b0c3377 Various code fixes. 2022-10-31 05:53:36 +01:00
James Cole
4e618a4d0b Remove phpstan comments. 2022-10-31 05:40:59 +01:00
James Cole
33f370359c Replace phpstan suggestions 2022-10-30 14:44:49 +01:00
James Cole
f52675068b Use PSR-12 code style 2022-10-30 14:24:37 +01:00
James Cole
914dc8596b remove old inspections 2022-10-30 12:12:35 +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
39654249e4 Merge branch 'develop' into 5.8-dev 2022-10-11 11:07:11 +02:00
James Cole
a39553256e Merge branch 'develop' into 5.8-dev 2022-10-06 06:18:25 +02:00
Nathan PERIER
5b43a2e99f Added options for month to date and year to date 2022-10-04 15:17:11 +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
6b6107fb00 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	config/firefly.php
#	frontend/src/i18n/nb_NO/index.js
#	frontend/src/i18n/nl_NL/index.js
#	frontend/src/i18n/ru_RU/index.js
2022-07-17 08:18:18 +02:00
James Cole
2bd068211b Fix #6168 2022-07-16 16:59:17 +02:00
James Cole
9493046212 Add strict types, add debug info 2022-07-16 09:25:10 +02:00
James Cole
70ddbd743c Small change in conversion 2022-06-10 17:39:00 +02:00
James Cole
86d4549874 Updated code. 2022-06-07 19:46:09 +02:00
James Cole
c3bd46d7c0 Preference can be turned on and off (is always off now) 2022-06-07 19:24:08 +02:00
James Cole
d007db166a Various code for currency exchange rate support 2022-06-06 14:40:19 +02:00
James Cole
50f87a210a Replace uri with url 2022-04-12 18:19:30 +02:00
James Cole
123693096c Reformat various code. 2022-03-29 15:10:05 +02:00
James Cole
d04efb8325 Reformat various code. 2022-03-29 15:00:29 +02:00
James Cole
d1a09ff33b Reformat various code. 2022-03-29 14:59:58 +02:00
James Cole
abb1095cef Fix summary and dates, also fix #5770 2022-03-28 12:24:16 +02:00
James Cole
cbf14f541c Replace deprecated method. 2022-03-27 20:24:13 +02:00
James Cole
ba10aa5ca5 Move search operators to dedicated file and add lots of new ones. 2022-03-20 07:42:39 +01:00
James Cole
ddabfbc1ad Remove references to help 2022-02-03 10:32:20 +01:00
James Cole
003d8ba02a Remove reference to a method no longer used. 2022-01-29 14:11:12 +01:00
James Cole
4d8d9cb87d Code for #5179 2021-10-19 06:32:10 +02:00
James Cole
4e7a27dd65 Refer to steam method 2021-10-03 06:05:47 +02:00
James Cole
8662dfa4c0 Fix unsecure redirect code. 2021-10-02 13:28:56 +02:00
James Cole
2e3877f770 Refuse unsecure redirect urls 2021-10-02 12:50:21 +02: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
e829d79589 Various code cleanup. 2021-09-18 10:21:29 +02:00
James Cole
5eca404866 Fix issue in number formatting. 2021-07-04 19:19:31 +02:00
James Cole
a09d831613 Fix #4894 2021-07-04 07:58:11 +02:00
James Cole
70da5917c9 Refactor findNull to find 2021-06-30 06:17:38 +02:00
James Cole
10597e3bef Clean up code. 2021-06-12 08:40:35 +02:00
James Cole
8832387b84 Remove TODO's. 2021-06-11 20:39:01 +02:00
James Cole
40bbed2a8b Limit some collection features. 2021-05-29 11:30:13 +02:00
James Cole
ad54163518 Various code cleanup. 2021-05-24 08:57:02 +02:00
James Cole
53dffc961f Merge branch 'feature/credit_calc' into develop 2021-05-13 05:35:07 +02:00
James Cole
06a5b60aaf No longer create a default rule. 2021-05-09 07:58:09 +02:00
James Cole
d0622dbcd3 Merge branch 'develop' into feature/credit_calc
# Conflicts:
#	app/Repositories/Account/AccountRepository.php
2021-05-02 06:27:32 +02:00
James Cole
54d5f9a9c3 Fix #4707 and fix #4732 2021-05-01 18:54:11 +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