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 |
|
James Cole
|
b3740e643a
|
Update copyright statements
|
2022-10-16 19:29:53 +02:00 |
|
James Cole
|
55ac76f663
|
Update copyright.
|
2022-10-16 19:22:26 +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
|
e472c3520d
|
Add comments about floats
|
2022-10-16 14:44:11 +02:00 |
|
James Cole
|
39654249e4
|
Merge branch 'develop' into 5.8-dev
|
2022-10-11 11:07:11 +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
|
187e1914e3
|
Merge pull request #6502 from D7032E-Group-6/develop
Issue #5234 fix
|
2022-10-06 06:09:51 +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 |
|
Nathan PERIER
|
5b43a2e99f
|
Added options for month to date and year to date
|
2022-10-04 15:17:11 +02:00 |
|
James Cole
|
38bdd6c36c
|
Final fix, I hope.
|
2022-10-02 20:27:21 +02:00 |
|
James Cole
|
536e054961
|
Fix sloppy variable names
|
2022-10-02 20:23:11 +02:00 |
|
James Cole
|
6dfe93bc19
|
Fix rule
|
2022-10-02 20:18:43 +02:00 |
|
James Cole
|
d8a15e41e6
|
Catch various audit log things
|
2022-10-02 20:13:32 +02:00 |
|