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
|
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 |
|
James Cole
|
1f4ca9c8fe
|
Fix https://github.com/firefly-iii/firefly-iii/issues/6743
|
2022-12-27 17:16:28 +01:00 |
|
James Cole
|
e468d5b892
|
Add some debug for https://github.com/firefly-iii/firefly-iii/issues/6743
|
2022-12-27 13:02:17 +01:00 |
|
James Cole
|
e58cf0d3c9
|
Add some debug for https://github.com/firefly-iii/firefly-iii/issues/6743
|
2022-12-27 13:01:49 +01:00 |
|
James Cole
|
eff631276e
|
Merge branch 'develop' into 5.8-dev
|
2022-12-26 06:24:50 +01:00 |
|
James Cole
|
89ab62fff2
|
Fix #6743
|
2022-12-26 06:23:06 +01:00 |
|
James Cole
|
80762616f3
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# app/Api/V1/Controllers/Models/AvailableBudget/DestroyController.php
# config/firefly.php
# frontend/package.json
# frontend/src/i18n/fr_FR/index.js
# frontend/src/i18n/pt_BR/index.js
# frontend/src/i18n/ru_RU/index.js
# frontend/src/i18n/sl_SI/index.js
# frontend/src/i18n/zh_CN/index.js
# frontend/yarn.lock
# public/v3/index.html
# public/v3/js/1473.9b55dc17.js
# public/v3/js/150.35592a2c.js
# public/v3/js/1501.3980515e.js
# public/v3/js/1543.010ec22e.js
# public/v3/js/1730.207e6e59.js
# public/v3/js/1864.d9ea853e.js
# public/v3/js/1951.a5d70097.js
# public/v3/js/2106.33b7eabd.js
# public/v3/js/2124.bfc4091d.js
# public/v3/js/2194.4baebc21.js
# public/v3/js/2372.f07615ae.js
# public/v3/js/2407.747d87e4.js
# public/v3/js/2476.8af9976c.js
# public/v3/js/2686.5e278d64.js
# public/v3/js/2700.1251f369.js
# public/v3/js/3232.0964e736.js
# public/v3/js/3903.4e461032.js
# public/v3/js/4640.601878ff.js
# public/v3/js/4782.e1382ab6.js
# public/v3/js/4851.3c27e6c7.js
# public/v3/js/5221.fded0f96.js
# public/v3/js/5266.e820dd38.js
# public/v3/js/5348.109b8049.js
# public/v3/js/5439.d75e5cb4.js
# public/v3/js/5724.8b5fcafb.js
# public/v3/js/576.e26ddde9.js
# public/v3/js/6072.21c05085.js
# public/v3/js/6323.69d55ffd.js
# public/v3/js/6676.60b155c0.js
# public/v3/js/6691.80040366.js
# public/v3/js/6719.f9d4744f.js
# public/v3/js/6826.74ed4602.js
# public/v3/js/6882.c5970da7.js
# public/v3/js/6919.cc55656e.js
# public/v3/js/7044.96c481ac.js
# public/v3/js/7083.c223af4f.js
# public/v3/js/7222.86a095eb.js
# public/v3/js/7480.b9bd8fed.js
# public/v3/js/7499.c362f695.js
# public/v3/js/7544.47af6552.js
# public/v3/js/7552.ebdf1aef.js
# public/v3/js/7586.29cf8776.js
# public/v3/js/7697.4338f28d.js
# public/v3/js/773.ff7cb3ef.js
# public/v3/js/7919.910d5ebb.js
# public/v3/js/7956.3e1c81cf.js
# public/v3/js/8044.169b21f8.js
# public/v3/js/8218.966b669d.js
# public/v3/js/8344.119567b0.js
# public/v3/js/8376.477a5508.js
# public/v3/js/8387.a4c1d7d6.js
# public/v3/js/8405.62235b41.js
# public/v3/js/8493.48ada210.js
# public/v3/js/8611.3ab24e6d.js
# public/v3/js/8907.233f4719.js
# public/v3/js/8928.8127fcdf.js
# public/v3/js/9009.d0e97de6.js
# public/v3/js/9038.06ad98ab.js
# public/v3/js/9069.e81f039c.js
# public/v3/js/9287.bc57ab91.js
# public/v3/js/9597.0c124ce8.js
# public/v3/js/9606.ce293dd2.js
# public/v3/js/app.13f6ce91.js
# public/v3/js/chunk-common.98b27fd7.js
# public/v3/js/vendor.92714ea3.js
# resources/assets/js/locales/fr.json
# resources/assets/js/locales/ru.json
# resources/assets/js/locales/sl.json
# resources/assets/js/locales/zh-cn.json
# resources/lang/de_DE/firefly.php
# resources/lang/nl_NL/firefly.php
# resources/lang/pt_BR/firefly.php
# resources/lang/sl_SI/firefly.php
# resources/lang/zh_CN/firefly.php
|
2022-12-24 17:34:20 +01:00 |
|
James Cole
|
fcecd5c85e
|
Accept null values.
|
2022-12-24 17:31:21 +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
|
c47980a737
|
Remove many references to (float)
|
2022-12-24 05:06:39 +01:00 |
|
James Cole
|
9529721368
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# app/Factory/TransactionJournalFactory.php
# app/Providers/EventServiceProvider.php
# app/Repositories/PiggyBank/ModifiesPiggyBanks.php
# app/Support/Search/OperatorQuerySearch.php
# app/Support/Steam.php
# app/TransactionRules/Actions/UpdatePiggybank.php
# composer.json
# composer.lock
# config/search.php
# frontend/yarn.lock
# resources/lang/en_US/firefly.php
|
2022-12-11 07:37:33 +01:00 |
|
James Cole
|
f33f9c797b
|
Merge pull request #6685 from nebulade/patch-2
Also pick email address from apache filtered headers
|
2022-12-11 06:22:08 +01:00 |
|
James Cole
|
352eedb136
|
Fix https://github.com/firefly-iii/firefly-iii/pull/6701
|
2022-12-11 06:21:08 +01:00 |
|
James Cole
|
c8d6ef3782
|
Fix https://github.com/firefly-iii/firefly-iii/pull/6701
|
2022-12-11 06:20:45 +01:00 |
|
James Cole
|
922a5fa9c7
|
Fix https://github.com/firefly-iii/firefly-iii/pull/6701
|
2022-12-11 06:20:27 +01:00 |
|
James Cole
|
c125984d55
|
Remove cache.
|
2022-12-11 06:20:18 +01:00 |
|
Johannes Zellner
|
702f2c3146
|
Also pick email address from apache filtered headers
|
2022-11-30 17:05:39 +01:00 |
|
Janne Heß
|
dcfcbfd9b5
|
Add search support for SEPA CT
|
2022-11-27 19:46:45 +01:00 |
|
James Cole
|
7fcdf85dee
|
Fix https://github.com/firefly-iii/firefly-iii/issues/6625
|
2022-11-09 20:49:27 +01:00 |
|
James Cole
|
f16b679049
|
Various code fixes.
|
2022-11-04 05:11:05 +01:00 |
|
James Cole
|
8d8f81c27d
|
Various code cleanup and phpstan suggestions
|
2022-11-02 06:25:37 +01:00 |
|
James Cole
|
409b4fe4d9
|
Run CS fixer
|
2022-11-02 05:02:09 +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
|
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 |
|
James Cole
|
980120f1bd
|
Update search.
|
2022-03-27 16:03:50 +02:00 |
|
James Cole
|
679e72e5e2
|
Make it possible to search by interest date.
|
2022-03-27 08:48:30 +02:00 |
|
James Cole
|
ff7f4e5bba
|
Merge branch 'develop' into 5.7.0
|
2022-03-27 06:54:15 +02:00 |
|
James Cole
|
8002610234
|
Fix amounts with "e" in them.
|
2022-03-26 18:13:02 +01:00 |
|
James Cole
|
2f50fb38b0
|
New search opts
|
2022-03-24 19:34:32 +01:00 |
|
James Cole
|
aca008c911
|
Expand query search.
|
2022-03-21 06:31:38 +01:00 |
|
James Cole
|
be1d5591c4
|
Continue work on search
|
2022-03-21 06:24:40 +01:00 |
|
James Cole
|
02687dfe53
|
Expand search
|
2022-03-20 17:11:33 +01: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
|
b59723f276
|
Update meta files for 5.7.0 #5757
|
2022-02-28 07:48:58 +01:00 |
|
James Cole
|
fb676a9ad7
|
Update languages, config.
|
2022-02-26 07:55:36 +01:00 |
|
James Cole
|
fbdb7e099c
|
Add new config key
|
2022-02-07 06:19:27 +01:00 |
|
James Cole
|
6080dabb56
|
Catch invalid setting
|
2022-02-07 06:19:19 +01:00 |
|
James Cole
|
ddabfbc1ad
|
Remove references to help
|
2022-02-03 10:32:20 +01:00 |
|
James Cole
|
1c795e71d5
|
Fix https://github.com/firefly-iii/firefly-iii/issues/5695
|
2022-02-02 20:15:28 +01:00 |
|
James Cole
|
30fc0fbf54
|
Various new code.
|
2022-01-30 16:53:57 +01:00 |
|