Commit Graph

16811 Commits

Author SHA1 Message Date
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
e05c174e6d Merge tag '5.7.15' into develop
5.7.15
2022-11-02 04:58:53 +01:00
James Cole
05d461fb88 Merge branch 'release/5.7.15' 2022-11-02 04:58:52 +01:00
James Cole
7bb2f96ae2
Update meta files for new release. 2022-11-02 04:57:15 +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
5ba079e71c
Ignore vendor dir of PHP CS Fixer. 2022-11-01 19:26:00 +01:00
James Cole
ebcf9b3be1
Update error catch 2022-11-01 19:24:34 +01:00
James Cole
e7e3370baa
Fix https://github.com/firefly-iii/firefly-iii/issues/6581 2022-10-31 20:12:19 +01:00
James Cole
21d4b396cc
Merge branch 'develop' into 5.8-dev 2022-10-31 20:11:29 +01:00
James Cole
249b0c3377
Various code fixes. 2022-10-31 05:53:36 +01:00
James Cole
b36f6741ff
Merge pull request #6588 from firefly-iii/dependabot/npm_and_yarn/develop/vue-i18n-8.28.1
Bump vue-i18n from 8.28.0 to 8.28.1
2022-10-31 05:53:10 +01:00
James Cole
0059ed7bde
Fix some phpstan issues. 2022-10-31 05:50:44 +01:00
dependabot[bot]
d7bbc8334e
Bump vue-i18n from 8.28.0 to 8.28.1
Bumps [vue-i18n](https://github.com/intlify/vue-i18n-next/tree/HEAD/packages/vue-i18n) from 8.28.0 to 8.28.1.
- [Release notes](https://github.com/intlify/vue-i18n-next/releases)
- [Changelog](https://github.com/intlify/vue-i18n-next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/intlify/vue-i18n-next/commits/HEAD/packages/vue-i18n)

---
updated-dependencies:
- dependency-name: vue-i18n
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 04:46:08 +00:00
James Cole
bd245d5c92
Update packages 2022-10-31 05:42:12 +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
2b7101e362
Merge pull request #6587 from firefly-iii/dependabot/npm_and_yarn/develop/vue-i18n-8.28.0
Bump vue-i18n from 8.27.2 to 8.28.0
2022-10-31 05:38:10 +01:00
James Cole
e74b629dc2
Merge pull request #6586 from firefly-iii/dependabot/composer/develop/league/commonmark-2.3.6
Bump league/commonmark from 2.3.5 to 2.3.6
2022-10-31 05:38:00 +01:00
James Cole
a4f329cfc3
Merge pull request #6585 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.5.1
Bump doctrine/dbal from 3.5.0 to 3.5.1
2022-10-31 05:37:44 +01:00
James Cole
e993abc8fb
Merge pull request #6584 from firefly-iii/dependabot/composer/develop/laravel/framework-9.37.0 2022-10-31 05:37:07 +01:00
James Cole
6961365a40
Merge pull request #6583 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.15 2022-10-31 05:36:53 +01:00
James Cole
16303515f5
Merge pull request #6582 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.26 2022-10-31 05:36:39 +01:00
dependabot[bot]
bb5bca9cf0
Bump vue-i18n from 8.27.2 to 8.28.0
Bumps [vue-i18n](https://github.com/intlify/vue-i18n-next/tree/HEAD/packages/vue-i18n) from 8.27.2 to 8.28.0.
- [Release notes](https://github.com/intlify/vue-i18n-next/releases)
- [Changelog](https://github.com/intlify/vue-i18n-next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/intlify/vue-i18n-next/commits/HEAD/packages/vue-i18n)

---
updated-dependencies:
- dependency-name: vue-i18n
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 03:01:41 +00:00
dependabot[bot]
e8a61821e9
Bump league/commonmark from 2.3.5 to 2.3.6
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.3.5 to 2.3.6.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.3/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.3.5...2.3.6)

---
updated-dependencies:
- dependency-name: league/commonmark
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 03:01:03 +00:00
dependabot[bot]
5d4cf5f55e
Bump doctrine/dbal from 3.5.0 to 3.5.1
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.5.0...3.5.1)

---
updated-dependencies:
- dependency-name: doctrine/dbal
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 03:00:57 +00:00
dependabot[bot]
5e9de60c1a
Bump laravel/framework from 9.36.4 to 9.37.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.36.4 to 9.37.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.36.4...v9.37.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 03:00:52 +00:00
dependabot[bot]
417700ef13
Bump symfony/http-client from 6.0.14 to 6.0.15
Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.0.14 to 6.0.15.
- [Release notes](https://github.com/symfony/http-client/releases)
- [Changelog](https://github.com/symfony/http-client/blob/6.1/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-client/compare/v6.0.14...v6.0.15)

---
updated-dependencies:
- dependency-name: symfony/http-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 03:00:44 +00:00
dependabot[bot]
b14062b197
Bump phpunit/phpunit from 9.5.25 to 9.5.26
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.25 to 9.5.26.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/main/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.25...9.5.26)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 03:00:40 +00: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
1a7d60ccc8
Fix phpcs script 2022-10-30 14:24:53 +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
8edfb1460c
Add php cs fixer and some rule sets. 2022-10-30 12:21:41 +01:00
James Cole
914dc8596b
remove old inspections 2022-10-30 12:12:35 +01:00
James Cole
6b64a39182
Install PHPstan rules again. 2022-10-30 12:02:56 +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
486f25cd96
Update translations. 2022-10-29 07:59:49 +02:00
James Cole
612a395eb2
Merge branch 'develop' into 5.8-dev 2022-10-26 05:50:42 +02:00
James Cole
a3b4d5ff62
Add missing locale data. 2022-10-26 05:50:06 +02:00
James Cole
b613b56d1e
Merge branch 'develop' into 5.8-dev
# Conflicts:
#	resources/views/list/groups.twig
2022-10-24 19:59:26 +02:00