kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 22:48:18 +00:00
Code Issues Projects Releases Wiki Activity
16,739 Commits 4 Branches 732 Tags
4ad666d9640d5c07d4b58db5692cb15dea2ae947
Commit Graph

1424 Commits

Author SHA1 Message Date
James Cole
b3740e643a Update copyright statements 2022-10-16 19:29:53 +02:00
James Cole
49560ca6a6 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	composer.lock
#	config/firefly.php
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
 2022-10-16 19:13:15 +02:00
James Cole
a74d345ac2 Make doubly sure special characters are removed from the notes. 2022-10-16 15:18:11 +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
James Cole
187e1914e3 Merge pull request #6502 from D7032E-Group-6/develop 
Issue #5234 fix
 2022-10-06 06:09:51 +02:00
James Cole
bab4c05e5f Fix https://github.com/firefly-iii/firefly-iii/issues/6471 2022-10-04 19:12:57 +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
5f11272d49 Merge branch 'develop' into 5.8-dev 2022-10-01 19:06:55 +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
749ce2ca9b Merge branch 'develop' into 5.8-dev 2022-10-01 07:15:17 +02:00
James Cole
4474a71e65 Attempted fix for #6475 2022-09-30 20:07:01 +02:00
James Cole
9b7285ea84 Expand search and add operators. 2022-09-28 07:35:57 +02:00
James Cole
3c33ea959e Expand search with negated search options 2022-09-25 15:31:07 +02:00
James Cole
80a732b32b First negative search query 2022-09-24 18:06:01 +02:00
James Cole
a9f2741282 Add ability to move stuff around, fix spelling. 2022-09-24 17:43:49 +02:00
James Cole
9f95d7a76f Fix https://github.com/firefly-iii/firefly-iii/issues/5862 2022-09-18 12:23:20 +02:00
James Cole
7104433a68 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Exceptions/Handler.php
#	config/firefly.php
 2022-09-07 18:35:01 +02:00
James Cole
06b7f18d55 Make 2FA code + validation more robust. Thanks to @jtmoss3991, @timaschew and @Ottega. 2022-09-04 13:32:59 +02:00
James Cole
4e394d6017 Merge branch 'develop' into 5.8-dev 2022-07-24 08:16:27 +02:00
James Cole
76dadd1cab Fix https://github.com/firefly-iii/firefly-iii/issues/6260 2022-07-24 05:44:35 +02:00
James Cole
20ab457222 Various new stuff 2022-07-21 16:41:28 +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
d26a5a6e9c Fix https://github.com/firefly-iii/firefly-iii/issues/6150 2022-07-16 17:15:44 +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
Sander Dorigo
b12d72bef6 New code for API 2 2022-06-23 09:33:43 +02:00
James Cole
70ddbd743c Small change in conversion 2022-06-10 17:39:00 +02:00
James Cole
beed44f065 Add cron job to download transaction currencies from Azure (if enabled by user). 2022-06-09 17:47:01 +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
099fc49c4b Fix #6113 2022-05-30 20:48:56 +02:00
James Cole
610bc9f4bc Add exception code for bad values. 2022-05-04 20:32:51 +02:00
James Cole
2b615cf757 Fix bad call to method. 2022-05-02 19:35:35 +02:00
James Cole
0fea3a5a85 Fix broken query "created_at_before" and "updated_at_before" 2022-04-13 14:11:36 +02:00
James Cole
50f87a210a Replace uri with url 2022-04-12 18:19:30 +02:00
James Cole
3813b7a9e8 Reverse issue until confirmation. 2022-04-12 17:37:34 +02:00
James Cole
86a6e51ebc Add another option, fix https://github.com/firefly-iii/firefly-iii/issues/5992 2022-04-12 16:04:46 +02:00
James Cole
609e911fd6 Make sure the wort things aren't broken. 2022-04-03 16:23:49 +02:00
James Cole
d894ccc9cc Catch missing date ranges. 2022-04-03 14:48:22 +02:00
James Cole
1211a5c878 Remove log entry. 2022-03-30 06:58:41 +02:00
James Cole
3df8c4ff75 Replace deprecated method 2022-03-29 17:01:05 +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
f2849c8058 New cron job for bills. 2022-03-28 12:23:46 +02:00
James Cole
e5a08d2cf1 Search in attachment file names and attachments notes. 2022-03-28 07:54:52 +02:00
James Cole
cbf14f541c Replace deprecated method. 2022-03-27 20:24:13 +02:00