Commit Graph

7578 Commits

Author SHA1 Message Date
James Cole
23a8835758 Add some debug info 2022-12-11 10:32:25 +01:00
James Cole
034647a5ca Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
2022-12-11 10:29:01 +01:00
James Cole
a5f4793e81 Add strict type. 2022-12-11 10:21:35 +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
344cbe4fb7 Pass on the journal and update rules. 2022-12-11 07:29:06 +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
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
90c9fdaf55 Fix https://github.com/firefly-iii/firefly-iii/issues/6610 2022-11-06 18:15:53 +01:00
James Cole
60d8bb2aab Better header catch 2022-11-06 18:14:21 +01:00
James Cole
acd9685578 Merge branch 'develop' into 5.8-dev 2022-11-04 05:50:12 +01:00
James Cole
b942f351f8 Fix https://github.com/firefly-iii/firefly-iii/issues/6597 2022-11-04 05:49:32 +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
817a9f57c4 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	config/firefly.php
#	frontend/src/i18n/bg_BG/index.js
#	frontend/src/i18n/cs_CZ/index.js
#	frontend/src/i18n/da_DK/index.js
#	frontend/src/i18n/de_DE/index.js
#	frontend/src/i18n/el_GR/index.js
#	frontend/src/i18n/en_GB/index.js
#	frontend/src/i18n/en_US/index.js
#	frontend/src/i18n/es_ES/index.js
#	frontend/src/i18n/fi_FI/index.js
#	frontend/src/i18n/fr_FR/index.js
#	frontend/src/i18n/hu_HU/index.js
#	frontend/src/i18n/id_ID/index.js
#	frontend/src/i18n/it_IT/index.js
#	frontend/src/i18n/ja_JP/index.js
#	frontend/src/i18n/nb_NO/index.js
#	frontend/src/i18n/nl_NL/index.js
#	frontend/src/i18n/pl_PL/index.js
#	frontend/src/i18n/pt_BR/index.js
#	frontend/src/i18n/pt_PT/index.js
#	frontend/src/i18n/ro_RO/index.js
#	frontend/src/i18n/ru_RU/index.js
#	frontend/src/i18n/sk_SK/index.js
#	frontend/src/i18n/sl_SI/index.js
#	frontend/src/i18n/sv_SE/index.js
#	frontend/src/i18n/tr_TR/index.js
#	frontend/src/i18n/uk_UA/index.js
#	frontend/src/i18n/vi_VN/index.js
#	frontend/src/i18n/zh_CN/index.js
#	frontend/src/i18n/zh_TW/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/da.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/id.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.json
#	resources/assets/js/locales/ro.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sk.json
#	resources/assets/js/locales/sl.json
#	resources/assets/js/locales/sv.json
#	resources/assets/js/locales/tr.json
#	resources/assets/js/locales/uk.json
#	resources/assets/js/locales/vi.json
#	resources/assets/js/locales/zh-cn.json
#	resources/assets/js/locales/zh-tw.json
#	yarn.lock
2022-11-02 05:00:59 +01:00
James Cole
8f15bd716d Fix https://github.com/firefly-iii/firefly-iii/issues/6592 2022-11-02 04:46:06 +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
ebcf9b3be1 Update error catch 2022-11-01 19:24:34 +01:00
James Cole
249b0c3377 Various code fixes. 2022-10-31 05:53:36 +01:00
James Cole
0059ed7bde Fix some phpstan issues. 2022-10-31 05:50:44 +01:00
James Cole
4e618a4d0b Remove phpstan comments. 2022-10-31 05:40:59 +01:00
James Cole
b57785a234 Various code fixes. 2022-10-31 05:39:22 +01:00
James Cole
33f370359c Replace phpstan suggestions 2022-10-30 14:44:49 +01:00
James Cole
c032ffd4f9 Fix phpstan issues. 2022-10-30 14:34:36 +01:00
James Cole
f52675068b Use PSR-12 code style 2022-10-30 14:24:37 +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
64ff5eed27 Use PSR-12 code style 2022-10-30 14:24:10 +01:00
James Cole
1667b88dcd Use PSR-12 code style 2022-10-30 14:23:00 +01:00
James Cole
b27fe59ab4 Use PSR-12 code style 2022-10-30 12:24:51 +01:00
James Cole
bdcd9825ec Use PSR-12 code style 2022-10-30 12:23:16 +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
e3181e90df Fix https://github.com/firefly-iii/firefly-iii/issues/6130 2022-10-30 06:45:56 +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
abdb717b37 Can no longer set currency of expense / revenue accounts. 2022-10-23 14:46:26 +02:00
James Cole
4ad666d964 Add button to remove unused accounts. 2022-10-19 19:57:22 +02:00
James Cole
f3566c609a Meta files for new release. 2022-10-18 21:13:14 +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