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
|
c125984d55
|
Remove cache.
|
2022-12-11 06:20:18 +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
|
f52675068b
|
Use PSR-12 code style
|
2022-10-30 14:24:37 +01:00 |
|
James Cole
|
a9f2741282
|
Add ability to move stuff around, fix spelling.
|
2022-09-24 17:43:49 +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
|
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
|
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
|
1211a5c878
|
Remove log entry.
|
2022-03-30 06:58:41 +02:00 |
|
James Cole
|
123693096c
|
Reformat various code.
|
2022-03-29 15:10:05 +02:00 |
|
James Cole
|
d1a09ff33b
|
Reformat various code.
|
2022-03-29 14:59:58 +02:00 |
|
James Cole
|
8002610234
|
Fix amounts with "e" in them.
|
2022-03-26 18:13:02 +01:00 |
|
James Cole
|
6080dabb56
|
Catch invalid setting
|
2022-02-07 06:19:19 +01:00 |
|
James Cole
|
87ced85657
|
Make sure IBAN's have their spaces removed.
|
2022-01-03 06:34:42 +01:00 |
|
James Cole
|
b3f424fa28
|
Switch to timezone, not UTC
|
2021-10-23 11:21:48 +02:00 |
|
James Cole
|
ab6707b9d9
|
Fix previous url, also in Safari
|
2021-10-03 06:06:49 +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
|
3589c9f60f
|
Various code cleanup.
|
2021-09-18 10:20:19 +02:00 |
|
James Cole
|
ad54163518
|
Various code cleanup.
|
2021-05-24 08:57:02 +02:00 |
|
James Cole
|
f12744ad8c
|
Various code cleanup.
|
2021-04-07 07:28:43 +02:00 |
|
James Cole
|
38d0f0427f
|
Various code cleanup.
|
2021-04-06 17:00:16 +02:00 |
|
James Cole
|
69b1769f22
|
Refactor old methods.
|
2021-04-06 13:30:09 +02:00 |
|
James Cole
|
25dcb73e27
|
Fix #4600
|
2021-04-05 06:14:13 +02:00 |
|
James Cole
|
2c575f3ca5
|
Code cleanup.
|
2021-03-28 11:43:07 +02:00 |
|
James Cole
|
1ecc454f70
|
Fix issue in rule engine.
|
2021-02-12 20:15:23 +01:00 |
|
James Cole
|
ccaf9d31a6
|
Set upload size as "***MB" would give errors.
|
2021-01-26 19:28:35 +01:00 |
|
James Cole
|
045cec4421
|
Fix #3992
|
2020-10-26 06:43:09 +01:00 |
|
James Cole
|
b3f1737495
|
Reverse logic operators.
|
2020-10-24 16:59:56 +02:00 |
|
James Cole
|
ab4bcd3703
|
Clean up code.
|
2020-10-24 07:40:56 +02:00 |
|
James Cole
|
8dbd785ab8
|
Clean up code.
|
2020-10-23 19:11:25 +02:00 |
|
James Cole
|
6d627be679
|
Fix #3638
|
2020-08-08 14:09:30 +02:00 |
|