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 |
|