Commit Graph

3461 Commits

Author SHA1 Message Date
James Cole
8447670ed5
Add new upgrade command. 2023-01-08 18:41:56 +01:00
James Cole
7a2c52531a
Fix bad spelling 2023-01-08 16:34:34 +01:00
James Cole
40083230fd
Update meta files for new alpha release. 2023-01-07 08:12:53 +01:00
James Cole
1fee2092d6
Clear up webhooks 2023-01-05 19:05:23 +01:00
James Cole
7bd824e8cb
Update packages and meta data. 2023-01-04 20:40:57 +01:00
James Cole
07e4e93632
Various code cleanup 2023-01-03 06:48:53 +01:00
James Cole
e4db5f5a21
Merge branch 'develop' into 5.8-dev 2023-01-01 15:30:38 +01:00
James Cole
3c1f44f554
Fix https://github.com/firefly-iii/firefly-iii/issues/6788 2023-01-01 15:27:14 +01:00
James Cole
67434bb8a5
Merge branch 'develop' into 5.8-dev
# Conflicts:
#	app/Http/Middleware/Authenticate.php
#	app/Models/Account.php
#	app/Support/Authentication/RemoteUserGuard.php
2023-01-01 15:14:15 +01:00
James Cole
c3ce9e896e
Fix https://github.com/firefly-iii/firefly-iii/issues/6788 2023-01-01 14:25:52 +01:00
James Cole
c60120ac20
Fix https://github.com/firefly-iii/firefly-iii/issues/6787 2023-01-01 13:55:14 +01:00
James Cole
7722ca2bf0
Various code fixes 2022-12-31 13:32:42 +01:00
James Cole
24696bf800
Clean up some code 2022-12-31 07:33:44 +01:00
James Cole
27a576ae8a
Various bug fixes and code cleanup. 2022-12-31 06:57:05 +01:00
James Cole
742c84269b
Code cleanup should trigger scan. 2022-12-30 20:38:54 +01:00
James Cole
445804a7f1
Fix phpstan messages. 2022-12-30 20:25:04 +01:00
James Cole
ee0116f112
Various code cleanup. 2022-12-30 09:28:03 +01:00
James Cole
6cfdc58cb1
Various PSR12 code cleanup 2022-12-29 19:42:26 +01:00
James Cole
dbf3e76ecc
Various PSR12 code cleanup 2022-12-29 19:41:57 +01:00
James Cole
2a61633ab9
Clean up code and update packages 2022-12-29 15:44:13 +01:00
James Cole
8c320fd199
Implement custom trigger for recurring transactions 2022-12-29 15:42:02 +01:00
James Cole
85a2a87806
Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
2022-12-29 11:36:07 +01:00
James Cole
e4db21f0c0
Update packages, fix rule 2022-12-29 07:26:14 +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
bb11e61034
Clean up liability overview. 2022-12-27 07:01:13 +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
5f6772260d
Remove null exceptions 2022-12-24 05:48:04 +01:00
James Cole
c47980a737
Remove many references to (float) 2022-12-24 05:06:39 +01:00
James Cole
e43372b2ce
Fix error 2022-12-21 19:12:47 +01:00
James Cole
395b6ecb76
Make sure cache is cleared after transaction deletion. 2022-12-21 19:11:52 +01:00
James Cole
33f764088e
Script and code cleanup. 2022-12-11 10:43:52 +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
44af5473a8
Unify piggy bank events. Does not save a link to the journal (yet) 2022-12-11 07:17:59 +01:00
James Cole
60d8bb2aab
Better header catch 2022-11-06 18:14:21 +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
a702662e88
Merge branch 'develop' into 5.8-dev
# Conflicts:
#	.gitignore
2022-11-01 19:34:12 +01:00
James Cole
0c6e00666b
Fix https://github.com/firefly-iii/firefly-iii/issues/6589 2022-11-01 19:33:43 +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
f53923f16c
Use PSR-12 code style 2022-10-30 14:24:28 +01:00
James Cole
2eebcb21f1
Use PSR-12 code style 2022-10-30 14:24:19 +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
b21461c824
Merge branch 'develop' into 5.8-dev
# Conflicts:
#	resources/views/auth/login.twig
#	resources/views/auth/mfa.twig
#	resources/views/auth/passwords/email.twig
#	resources/views/auth/passwords/reset.twig
#	resources/views/auth/register.twig
2022-10-24 19:35:47 +02:00
James Cole
2f66315416
Fix #6556 2022-10-23 14:53:13 +02:00
James Cole
f4af19e121
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
#	resources/assets/js/locales/pt-br.json
#	resources/lang/pt_BR/firefly.php
#	yarn.lock
2022-10-23 14:49:54 +02:00
James Cole
904320b9b8
Fix bulk update rules 2022-10-18 20:41:48 +02:00
James Cole
35c1ce6504
Fix negative budget limits 2022-10-18 20:37:33 +02:00
James Cole
b3740e643a
Update copyright statements 2022-10-16 19:29:53 +02:00
James Cole
05fe503456
Merge branch 'develop' into 5.8-dev
# Conflicts:
#	frontend/src/i18n/tr_TR/index.js
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
#	resources/assets/js/locales/bg.json
#	resources/assets/js/locales/cs.json
#	resources/assets/js/locales/de.json
#	resources/assets/js/locales/el.json
#	resources/assets/js/locales/en-gb.json
#	resources/assets/js/locales/en.json
#	resources/assets/js/locales/es.json
#	resources/assets/js/locales/fi.json
#	resources/assets/js/locales/fr.json
#	resources/assets/js/locales/hu.json
#	resources/assets/js/locales/it.json
#	resources/assets/js/locales/ja.json
#	resources/assets/js/locales/nb.json
#	resources/assets/js/locales/nl.json
#	resources/assets/js/locales/pl.json
#	resources/assets/js/locales/pt-br.json
#	resources/assets/js/locales/pt.json
#	resources/assets/js/locales/ro.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sk.json
#	resources/assets/js/locales/sv.json
#	resources/assets/js/locales/tr.json
#	resources/assets/js/locales/vi.json
#	resources/assets/js/locales/zh-cn.json
#	resources/assets/js/locales/zh-tw.json
#	resources/lang/bg_BG/firefly.php
#	resources/lang/fr_FR/firefly.php
#	resources/lang/nl_NL/firefly.php
#	resources/lang/ru_RU/firefly.php
2022-10-08 07:03:40 +02:00
James Cole
b176308dbd
Higher amounts. 2022-10-08 06:05:59 +02:00
James Cole
da71d6172c
Fix rule booboo 2022-10-08 05:57:12 +02:00
James Cole
a39553256e
Merge branch 'develop' into 5.8-dev 2022-10-06 06:18:25 +02:00
James Cole
553a9be3d5
Fix https://github.com/firefly-iii/firefly-iii/issues/6510 2022-10-06 06:17:49 +02:00
James Cole
44637dfaab
Merge 2022-10-04 20:31:57 +02:00
James Cole
bab4c05e5f
Fix https://github.com/firefly-iii/firefly-iii/issues/6471 2022-10-04 19:12:57 +02:00
James Cole
ca8a65af60
Display audit logs 2022-10-02 14:37:50 +02:00
James Cole
5f11272d49
Merge branch 'develop' into 5.8-dev 2022-10-01 19:06:55 +02:00
James Cole
c4e46bf89b
Fix issue in budget limits 2022-10-01 16:35:29 +02:00
James Cole
ee9b651f0f
Add ability to invite users 2022-10-01 12:21:42 +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
45d7042405
Add slack support to Firefly III 2022-09-24 12:14:27 +02:00
James Cole
665b78ebf5
Expand notifications. 2022-09-24 08:23:07 +02:00
James Cole
d2c52b47f1
Allow setting of notifications. 2022-09-18 16:49:15 +02:00
James Cole
c25b63d87b
Fix #4198 2022-09-18 16:28:04 +02:00
James Cole
67126e46b9
Add webhook code and rebuild. 2022-09-18 10:45:38 +02:00
James Cole
d9245f06f7
Add option to delete webhooks. 2022-09-18 05:49:56 +02:00
James Cole
625ad14d7d
Add code to create webhook. 2022-09-17 16:54:13 +02:00
James Cole
ad9efde2d0
Expand webhook code. 2022-09-17 07:08:30 +02:00
James Cole
f0416f5322
Merge branch 'develop' into 5.8-dev
# Conflicts:
#	config/firefly.php
2022-09-11 08:59:34 +02:00
James Cole
9c2f771bae
Fix https://github.com/firefly-iii/firefly-iii/issues/6333 2022-09-11 07:08:02 +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
3e96bb526c
Store secret correctly. 2022-09-05 05:39:47 +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
52e83c2ec2
Fix https://github.com/firefly-iii/firefly-iii/issues/6379 2022-08-28 06:37:03 +02:00
James Cole
70c08d6b50
Basic amount fix 2022-08-23 05:46:59 +02:00
James Cole
0b49e9b8a8
Basic amount fix 2022-08-23 05:46:43 +02:00
James Cole
4d12e6b58b
New migration command. 2022-08-23 05:43:40 +02:00
James Cole
39a928d7f4 Merge branch 'develop' into 5.8-dev 2022-07-26 20:28:32 +02:00
James Cole
242fb3b498
Remove debug. 2022-07-25 05:57:11 +02:00
James Cole
c50a4ae993
Add debug 2022-07-25 05:52:51 +02:00
James Cole
38b505d036
Skip empty foreign currency 2022-07-25 05:50:02 +02:00
James Cole
b03a36b87f
Add some debug info 2022-07-25 05:48:59 +02:00
James Cole
fa72912349
Add some debug to function 2022-07-25 05:47:26 +02:00
James Cole
7e98fac3b7
Better check on foreign currency. 2022-07-25 05:46:32 +02:00
James Cole
f14c8a2ec2
Add some debug 2022-07-25 05:44:41 +02:00
James Cole
4e394d6017 Merge branch 'develop' into 5.8-dev 2022-07-24 08:16:27 +02:00
James Cole
d8506c4361
Fix https://github.com/firefly-iii/firefly-iii/issues/6260 2022-07-23 21:50:16 +02:00
James Cole
d49809c939
Fix https://github.com/firefly-iii/firefly-iii/issues/6260 2022-07-23 20:15:55 +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
Sander Dorigo
b12d72bef6 New code for API 2 2022-06-23 09:33:43 +02:00