Compare commits

...

231 Commits
5.6.0 ... 5.6.5

Author SHA1 Message Date
James Cole
f6d58191b2 Merge branch 'release/5.6.5'
# Conflicts:
#	routes/web.php
2021-11-26 06:41:09 +01:00
James Cole
89fbf0869a Fix some lines. 2021-11-26 06:40:14 +01:00
James Cole
b1e453438e Update meta files for new release. 2021-11-26 06:28:04 +01:00
James Cole
284c6033d3 Update meta files for new release. 2021-11-26 06:24:10 +01:00
James Cole
b85b32560c Fix https://github.com/firefly-iii/firefly-iii/issues/5325 2021-11-26 06:16:21 +01:00
James Cole
35bc92bb49 Update meta files for new release. 2021-11-25 07:16:05 +01:00
James Cole
243a5217e7 Fix redirect. 2021-11-25 06:26:38 +01:00
James Cole
b2eeeed0af Fix #5245 2021-11-24 20:27:57 +01:00
James Cole
afd4700758 Switch things. 2021-11-24 20:20:47 +01:00
James Cole
03a1601bf3 Fix. 2021-11-24 20:04:39 +01:00
James Cole
edfff4ec57 Fix. 2021-11-24 20:03:28 +01:00
James Cole
7b5bc3a25e Revert "Fix CSRF issues"
This reverts commit 518b4ba5a7.
2021-11-24 19:23:57 +01:00
James Cole
d98ca0bb44 Merge branch 'main' into develop 2021-11-24 19:23:45 +01:00
James Cole
518b4ba5a7 Fix CSRF issues 2021-11-24 19:22:07 +01:00
mergify[bot]
9c1f781be3 Merge pull request #5310 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.64.2
Bump webpack from 5.64.0 to 5.64.2 in /frontend
2021-11-22 05:42:08 +00:00
mergify[bot]
fa7c1b3ec8 Merge pull request #5309 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/date-fns-2.26.0
Bump date-fns from 2.25.0 to 2.26.0 in /frontend
2021-11-22 05:42:02 +00:00
mergify[bot]
89acb9b6f3 Merge pull request #5308 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.22
Bump @vue/compiler-sfc from 3.2.21 to 3.2.22
2021-11-22 05:41:55 +00:00
mergify[bot]
45971f8f26 Merge pull request #5305 from firefly-iii/dependabot/composer/develop/league/csv-9.7.3
Bump league/csv from 9.7.2 to 9.7.3
2021-11-22 05:41:47 +00:00
mergify[bot]
21f12b87a0 Merge pull request #5304 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.1.4
Bump doctrine/dbal from 3.1.3 to 3.1.4
2021-11-22 05:41:43 +00:00
mergify[bot]
d264333ab8 Merge pull request #5306 from firefly-iii/dependabot/composer/develop/laravel/ui-3.3.3
Bump laravel/ui from 3.3.2 to 3.3.3
2021-11-22 05:41:37 +00:00
James Cole
0f9c1b9427 Remove mergify file 2021-11-22 06:40:23 +01:00
James Cole
c273f309d4 Add mergify 2021-11-22 06:34:03 +01:00
James Cole
17fd2f9909 Remove config 2021-11-22 06:33:28 +01:00
dependabot[bot]
0436701f29 Bump webpack from 5.64.0 to 5.64.2 in /frontend
Bumps [webpack](https://github.com/webpack/webpack) from 5.64.0 to 5.64.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.64.0...v5.64.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 03:03:26 +00:00
dependabot[bot]
840632b34e Bump date-fns from 2.25.0 to 2.26.0 in /frontend
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.25.0 to 2.26.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.25.0...v2.26.0)

---
updated-dependencies:
- dependency-name: date-fns
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 03:03:13 +00:00
dependabot[bot]
764481690c Bump @vue/compiler-sfc from 3.2.21 to 3.2.22
Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.2.21 to 3.2.22.
- [Release notes](https://github.com/vuejs/vue-next/releases)
- [Changelog](https://github.com/vuejs/vue-next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-next/commits/v3.2.22/packages/compiler-sfc)

---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 03:02:08 +00:00
dependabot[bot]
66b9d7421b Bump laravel/ui from 3.3.2 to 3.3.3
Bumps [laravel/ui](https://github.com/laravel/ui) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/laravel/ui/releases)
- [Changelog](https://github.com/laravel/ui/blob/3.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/ui/compare/v3.3.2...v3.3.3)

---
updated-dependencies:
- dependency-name: laravel/ui
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 03:01:06 +00:00
dependabot[bot]
a02c1557ac Bump league/csv from 9.7.2 to 9.7.3
Bumps [league/csv](https://github.com/thephpleague/csv) from 9.7.2 to 9.7.3.
- [Release notes](https://github.com/thephpleague/csv/releases)
- [Changelog](https://github.com/thephpleague/csv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/csv/compare/9.7.2...9.7.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 03:00:54 +00:00
dependabot[bot]
ff8af87179 Bump doctrine/dbal from 3.1.3 to 3.1.4
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.1.3...3.1.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 03:00:47 +00:00
James Cole
9c8b31fdbb Add log messages and catch exception 2021-11-19 15:47:19 +01:00
James Cole
bda1413da4 Merge pull request #5294 from firefly-iii/dependabot/composer/doctrine/dbal-3.1.4
Bump doctrine/dbal from 3.1.3 to 3.1.4
2021-11-16 18:37:28 +01:00
dependabot[bot]
f1cc8a10f5 Bump doctrine/dbal from 3.1.3 to 3.1.4
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.1.3...3.1.4)

---
updated-dependencies:
- dependency-name: doctrine/dbal
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-16 17:28:40 +00:00
James Cole
babf462bcf Fix https://github.com/firefly-iii/firefly-iii/issues/5288 2021-11-15 23:16:30 +01:00
James Cole
dba24d2dee Merge pull request #5280 from StillLoading/develop
Drop default case. OpenLDAP is already the default (see #5279)
2021-11-13 18:39:00 +01:00
StillLoading
42066cfca2 Drop default case. OpenLDAP is already the default (see #5279) 2021-11-13 17:31:35 +01:00
James Cole
32e550c8e0 Merge pull request #5279 from StillLoading/develop
Develop
2021-11-13 17:17:29 +01:00
StillLoading
4f2c94a5a8 Merge branch 'develop' of github.com:StillLoading/firefly-iii into develop 2021-11-13 17:05:21 +01:00
StillLoading
95076bdb6a change LdapModel selection and add FreeIPA as choice 2021-11-13 17:00:22 +01:00
James Cole
547caadeb2 Fix #5231 as suggested. 2021-11-13 15:38:11 +01:00
James Cole
2469e1e811 Merge branch 'release/5.6.4' 2021-11-13 11:11:53 +01:00
James Cole
ded267c9ac Merge tag '5.6.4' into develop
5.6.4
2021-11-13 11:11:53 +01:00
James Cole
2c9733e739 Update meta files for new release. 2021-11-13 11:11:32 +01:00
James Cole
72fd263ddf Update version 2021-11-13 11:05:57 +01:00
James Cole
8b84a4b336 Add changelog. 2021-11-13 11:04:42 +01:00
James Cole
3caf1f2d36 Add return statement 2021-11-13 11:00:42 +01:00
James Cole
16391fe99c Fix #5276 2021-11-13 10:54:04 +01:00
James Cole
6d3c858cbe Merge tag '5.6.3' into develop
5.6.3
2021-11-12 20:27:12 +01:00
James Cole
7afe9fac0a Merge branch 'release/5.6.3' 2021-11-12 20:27:11 +01:00
James Cole
e6a2c10a19 Merge branch 'main' into develop 2021-11-12 20:26:10 +01:00
James Cole
cc9867bcc4 Update meta files for new release. 2021-11-12 20:24:52 +01:00
James Cole
ba7ae19533 Update meta data for new release. 2021-11-12 20:07:09 +01:00
James Cole
47fa9e3956 Fix huntr.dev logout issue. 2021-11-09 18:46:49 +01:00
James Cole
0b739b0e3f Merge pull request #5262 from firefly-iii/mergify/JC5/config-update
ci(Mergify): configuration update
2021-11-08 07:24:40 +01:00
James Cole
221e912645 ci(Mergify): configuration update
Signed-off-by: James Cole <james@firefly-iii.org>
2021-11-08 07:24:04 +01:00
James Cole
81f4e92231 Merge pull request #5253 from firefly-iii/dependabot/composer/develop/laravel/ui-3.3.2 2021-11-08 06:13:26 +01:00
dependabot[bot]
4fef85d5d0 Bump laravel/ui from 3.3.0 to 3.3.2
Bumps [laravel/ui](https://github.com/laravel/ui) from 3.3.0 to 3.3.2.
- [Release notes](https://github.com/laravel/ui/releases)
- [Changelog](https://github.com/laravel/ui/blob/3.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/ui/compare/v3.3.0...v3.3.2)

---
updated-dependencies:
- dependency-name: laravel/ui
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-08 05:12:25 +00:00
James Cole
04a6b09861 Merge pull request #5252 from firefly-iii/dependabot/composer/develop/laravel/passport-10.2.0 2021-11-08 06:11:55 +01:00
James Cole
e31842d768 Merge pull request #5251 from firefly-iii/dependabot/composer/develop/laravel/framework-8.69.0 2021-11-08 06:11:41 +01:00
James Cole
e99efae839 Merge pull request #5257 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.62.1 2021-11-08 06:11:31 +01:00
James Cole
36f91aa11b Merge pull request #5254 from firefly-iii/dependabot/npm_and_yarn/develop/uiv-1.4.1 2021-11-08 06:11:22 +01:00
James Cole
140658c1a3 Merge pull request #5256 from firefly-iii/dependabot/npm_and_yarn/develop/vue-i18n-8.26.7 2021-11-08 06:11:12 +01:00
James Cole
38be52d12f Merge pull request #5255 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.21 2021-11-08 06:11:02 +01:00
James Cole
a7fd8069c2 Merge pull request #5259 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/vue-i18n-8.26.7 2021-11-08 06:10:51 +01:00
James Cole
2df57bf684 Merge pull request #5258 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/uiv-1.4.1 2021-11-08 06:10:38 +01:00
James Cole
4a6cac96f6 Merge pull request #5260 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/laravel-mix-6.0.38 2021-11-08 06:10:24 +01:00
dependabot[bot]
0e6eb89cea Bump laravel-mix from 6.0.37 to 6.0.38 in /frontend
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.37 to 6.0.38.
- [Release notes](https://github.com/JeffreyWay/laravel-mix/releases)
- [Changelog](https://github.com/laravel-mix/laravel-mix/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JeffreyWay/laravel-mix/compare/v6.0.37...v6.0.38)

---
updated-dependencies:
- dependency-name: laravel-mix
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-08 03:03:50 +00:00
dependabot[bot]
0c883259d9 Bump vue-i18n from 8.26.5 to 8.26.7 in /frontend
Bumps [vue-i18n](https://github.com/kazupon/vue-i18n) from 8.26.5 to 8.26.7.
- [Release notes](https://github.com/kazupon/vue-i18n/releases)
- [Changelog](https://github.com/kazupon/vue-i18n/blob/v8.x/CHANGELOG.md)
- [Commits](https://github.com/kazupon/vue-i18n/compare/v8.26.5...v8.26.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-08 03:03:36 +00:00
dependabot[bot]
13bd98b842 Bump uiv from 1.4.0 to 1.4.1 in /frontend
Bumps [uiv](https://github.com/uiv-lib/uiv) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/uiv-lib/uiv/releases)
- [Commits](https://github.com/uiv-lib/uiv/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: uiv
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-08 03:03:12 +00:00
dependabot[bot]
c641046aa5 Bump webpack from 5.61.0 to 5.62.1 in /frontend
Bumps [webpack](https://github.com/webpack/webpack) from 5.61.0 to 5.62.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.61.0...v5.62.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-08 03:02:58 +00:00
dependabot[bot]
05bddbb40e Bump vue-i18n from 8.26.5 to 8.26.7
Bumps [vue-i18n](https://github.com/kazupon/vue-i18n) from 8.26.5 to 8.26.7.
- [Release notes](https://github.com/kazupon/vue-i18n/releases)
- [Changelog](https://github.com/kazupon/vue-i18n/blob/v8.x/CHANGELOG.md)
- [Commits](https://github.com/kazupon/vue-i18n/compare/v8.26.5...v8.26.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-08 03:02:26 +00:00
dependabot[bot]
4de6d10e27 Bump @vue/compiler-sfc from 3.2.20 to 3.2.21
Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.2.20 to 3.2.21.
- [Release notes](https://github.com/vuejs/vue-next/releases)
- [Changelog](https://github.com/vuejs/vue-next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-next/commits/v3.2.21/packages/compiler-sfc)

---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-08 03:02:18 +00:00
dependabot[bot]
253ed7b2bd Bump uiv from 1.4.0 to 1.4.1
Bumps [uiv](https://github.com/uiv-lib/uiv) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/uiv-lib/uiv/releases)
- [Commits](https://github.com/uiv-lib/uiv/compare/v1.4.0...v1.4.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-08 03:02:05 +00:00
dependabot[bot]
0d38741de7 Bump laravel/passport from 10.1.4 to 10.2.0
Bumps [laravel/passport](https://github.com/laravel/passport) from 10.1.4 to 10.2.0.
- [Release notes](https://github.com/laravel/passport/releases)
- [Changelog](https://github.com/laravel/passport/blob/10.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/passport/compare/v10.1.4...v10.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-08 03:01:01 +00:00
dependabot[bot]
b5cef50dc7 Bump laravel/framework from 8.68.1 to 8.69.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.68.1 to 8.69.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/8.x/CHANGELOG-8.x.md)
- [Commits](https://github.com/laravel/framework/compare/v8.68.1...v8.69.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>
2021-11-08 03:00:49 +00:00
James Cole
16ee3df31f Fix https://github.com/firefly-iii/firefly-iii/issues/5226 2021-11-05 07:48:22 +01:00
James Cole
341478db73 Simplify code for https://github.com/firefly-iii/firefly-iii/issues/5229 2021-11-05 07:34:58 +01:00
James Cole
ef1bf7c3e6 Catch null pointer 2021-11-04 20:16:35 +01:00
James Cole
ee5b64904d Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-11-01 06:40:18 +01:00
James Cole
0ff3b95f89 Merge pull request #5220 from firefly-iii/dependabot/composer/develop/psr/log-2.0.0
Bump psr/log from 1.1.4 to 2.0.0
2021-11-01 06:32:26 +01:00
James Cole
b70c904ec3 Merge pull request #5221 from firefly-iii/dependabot/npm_and_yarn/develop/axios-0.24.0
Bump axios from 0.23.0 to 0.24.0
2021-11-01 06:32:19 +01:00
dependabot[bot]
3e3465fb56 Bump axios from 0.23.0 to 0.24.0
Bumps [axios](https://github.com/axios/axios) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.23.0...v0.24.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 03:02:11 +00:00
dependabot[bot]
9e37a107ee Bump psr/log from 1.1.4 to 2.0.0
Bumps [psr/log](https://github.com/php-fig/log) from 1.1.4 to 2.0.0.
- [Release notes](https://github.com/php-fig/log/releases)
- [Commits](https://github.com/php-fig/log/compare/1.1.4...2.0.0)

---
updated-dependencies:
- dependency-name: psr/log
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 03:00:33 +00:00
James Cole
4de2512b34 Remove old files. 2021-10-31 17:50:25 +01:00
James Cole
90d4545a1f Fix https://github.com/firefly-iii/firefly-iii/issues/5218 2021-10-30 21:32:02 +02:00
James Cole
8561f3e177 Fix https://github.com/firefly-iii/firefly-iii/issues/5116 2021-10-30 17:26:05 +02:00
James Cole
51b5b3a846 Fix some v2 issues. 2021-10-30 17:06:40 +02:00
James Cole
1401282aa0 Fix #5200 2021-10-30 15:41:29 +02:00
James Cole
8b81526e54 Various improvs to the report generator. 2021-10-30 11:42:35 +02:00
James Cole
a16b6cb2b8 Slightly different info popup. 2021-10-30 10:48:16 +02:00
James Cole
7876030737 Fix https://github.com/firefly-iii/firefly-iii/issues/5178 2021-10-30 07:37:05 +02:00
James Cole
402d5748e4 Rename variable https://github.com/firefly-iii/firefly-iii/issues/5133 2021-10-30 06:53:21 +02:00
James Cole
280975b81a Improvements for https://github.com/firefly-iii/firefly-iii/issues/5133 2021-10-30 06:50:04 +02:00
James Cole
6f8778d87f Catch groups that are in use. 2021-10-26 06:25:41 +02:00
James Cole
fbf7578fb0 Make sure user group is deleted as well when empty. 2021-10-26 06:20:33 +02:00
James Cole
7dd560a2e3 Merge pull request #5201 from firefly-iii/dependabot/composer/develop/barryvdh/laravel-debugbar-3.6.4
Bump barryvdh/laravel-debugbar from 3.6.2 to 3.6.4
2021-10-25 06:59:04 +02:00
dependabot[bot]
0b2e1bc8e2 Bump barryvdh/laravel-debugbar from 3.6.2 to 3.6.4
Bumps [barryvdh/laravel-debugbar](https://github.com/barryvdh/laravel-debugbar) from 3.6.2 to 3.6.4.
- [Release notes](https://github.com/barryvdh/laravel-debugbar/releases)
- [Changelog](https://github.com/barryvdh/laravel-debugbar/blob/master/changelog.md)
- [Commits](https://github.com/barryvdh/laravel-debugbar/compare/v3.6.2...v3.6.4)

---
updated-dependencies:
- dependency-name: barryvdh/laravel-debugbar
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-25 04:45:02 +00:00
James Cole
baea455fde Merge pull request #5203 from firefly-iii/dependabot/composer/develop/laravel/passport-10.1.4 2021-10-25 06:45:00 +02:00
James Cole
eb303157ca Merge pull request #5206 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/postcss-8.3.11 2021-10-25 06:44:50 +02:00
James Cole
733b0d183f Merge pull request #5207 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/chart.js-3.6.0 2021-10-25 06:44:31 +02:00
James Cole
66233b7b00 Merge pull request #5208 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.43.3 2021-10-25 06:44:20 +02:00
James Cole
46a820fda5 Merge pull request #5205 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.3.11 2021-10-25 06:44:13 +02:00
James Cole
0244989b94 Merge pull request #5209 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.59.1 2021-10-25 06:44:00 +02:00
James Cole
990c369cab Merge pull request #5204 from firefly-iii/dependabot/composer/develop/guzzlehttp/guzzle-7.4.0 2021-10-25 06:43:51 +02:00
dependabot[bot]
af501952c2 Bump webpack from 5.58.2 to 5.59.1 in /frontend
Bumps [webpack](https://github.com/webpack/webpack) from 5.58.2 to 5.59.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.58.2...v5.59.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-25 03:03:18 +00:00
dependabot[bot]
d7ba71b1c0 Bump sass from 1.43.2 to 1.43.3 in /frontend
Bumps [sass](https://github.com/sass/dart-sass) from 1.43.2 to 1.43.3.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.43.2...1.43.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-25 03:02:59 +00:00
dependabot[bot]
b8df070d93 Bump chart.js from 3.5.1 to 3.6.0 in /frontend
Bumps [chart.js](https://github.com/chartjs/Chart.js) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](https://github.com/chartjs/Chart.js/compare/v3.5.1...v3.6.0)

---
updated-dependencies:
- dependency-name: chart.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-25 03:02:48 +00:00
dependabot[bot]
c55c4e0e89 Bump postcss from 8.3.9 to 8.3.11 in /frontend
Bumps [postcss](https://github.com/postcss/postcss) from 8.3.9 to 8.3.11.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.3.9...8.3.11)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-25 03:02:35 +00:00
dependabot[bot]
4249336320 Bump postcss from 8.3.9 to 8.3.11
Bumps [postcss](https://github.com/postcss/postcss) from 8.3.9 to 8.3.11.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.3.9...8.3.11)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-25 03:01:56 +00:00
dependabot[bot]
903b9bfd08 Bump guzzlehttp/guzzle from 7.3.0 to 7.4.0
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.3.0 to 7.4.0.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/compare/7.3.0...7.4.0)

---
updated-dependencies:
- dependency-name: guzzlehttp/guzzle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-25 03:01:14 +00:00
dependabot[bot]
e32a4a84a8 Bump laravel/passport from 10.1.3 to 10.1.4
Bumps [laravel/passport](https://github.com/laravel/passport) from 10.1.3 to 10.1.4.
- [Release notes](https://github.com/laravel/passport/releases)
- [Changelog](https://github.com/laravel/passport/blob/10.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/passport/compare/v10.1.3...v10.1.4)

---
updated-dependencies:
- dependency-name: laravel/passport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-25 03:01:06 +00:00
James Cole
b42d8d1e30 Fix rescan 2021-10-24 07:32:08 +02:00
James Cole
e9e9a359c8 Disable options for other peoples clients. 2021-10-24 07:25:51 +02:00
James Cole
b3f424fa28 Switch to timezone, not UTC 2021-10-23 11:21:48 +02:00
James Cole
ba740322f4 Fix class not found. 2021-10-23 09:37:53 +02:00
James Cole
898a517ae9 Fix class not found. 2021-10-23 09:37:15 +02:00
James Cole
c2c8c42ef3 Catch CSRF issues 2021-10-23 09:29:07 +02:00
James Cole
4d9c4a415d Add exception description 2021-10-23 09:28:24 +02:00
James Cole
f4fe930430 Update code to reflect latest changes. 2021-10-23 08:32:33 +02:00
James Cole
04dfeaf488 Merge pull request #5196 from weimdall/bugfix/foreign_amount
Bugfix: Foreign Amount rounded on some pages
2021-10-23 07:00:36 +02:00
Julien Cassagne
797064a119 Bugfix: Foreign Amount rounded on some pages 2021-10-22 16:58:52 -04:00
James Cole
4d8d9cb87d Code for #5179 2021-10-19 06:32:10 +02:00
James Cole
d1ae2cffcb Merge pull request #5182 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.34
Bump laravel-mix from 6.0.32 to 6.0.34
2021-10-18 10:55:35 +02:00
James Cole
102412cdb9 Merge pull request #5184 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.58.2
Bump webpack from 5.58.1 to 5.58.2 in /frontend
2021-10-18 10:55:16 +02:00
James Cole
f9ef5868cc Merge pull request #5185 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/laravel-mix-6.0.34
Bump laravel-mix from 6.0.32 to 6.0.34 in /frontend
2021-10-18 10:54:50 +02:00
James Cole
d9b2112b19 Merge pull request #5183 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-loader-12.2.0
Bump sass-loader from 12.1.0 to 12.2.0 in /frontend
2021-10-18 10:54:27 +02:00
dependabot[bot]
5edcd97c78 Bump sass-loader from 12.1.0 to 12.2.0 in /frontend
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 12.1.0 to 12.2.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v12.1.0...v12.2.0)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-18 08:53:30 +00:00
James Cole
9227a3039e Merge pull request #5186 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.43.2
Bump sass from 1.42.1 to 1.43.2 in /frontend
2021-10-18 10:50:59 +02:00
dependabot[bot]
f97521c118 Bump sass from 1.42.1 to 1.43.2 in /frontend
Bumps [sass](https://github.com/sass/dart-sass) from 1.42.1 to 1.43.2.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.42.1...1.43.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-18 05:10:00 +00:00
James Cole
119870fe9a Merge pull request #5181 from firefly-iii/dependabot/npm_and_yarn/develop/axios-0.23.0
Bump axios from 0.22.0 to 0.23.0
2021-10-18 07:07:34 +02:00
James Cole
f4942e32ed Merge pull request #5180 from firefly-iii/dependabot/composer/develop/laravel/framework-8.64.0
Bump laravel/framework from 8.63.0 to 8.64.0
2021-10-18 07:07:09 +02:00
dependabot[bot]
0ef5c10749 Bump laravel-mix from 6.0.32 to 6.0.34 in /frontend
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.32 to 6.0.34.
- [Release notes](https://github.com/JeffreyWay/laravel-mix/releases)
- [Changelog](https://github.com/laravel-mix/laravel-mix/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JeffreyWay/laravel-mix/compare/v6.0.32...v6.0.34)

---
updated-dependencies:
- dependency-name: laravel-mix
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-18 03:03:50 +00:00
dependabot[bot]
d37fc311db Bump webpack from 5.58.1 to 5.58.2 in /frontend
Bumps [webpack](https://github.com/webpack/webpack) from 5.58.1 to 5.58.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.58.1...v5.58.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-18 03:03:35 +00:00
dependabot[bot]
7b05b78cf7 Bump laravel-mix from 6.0.32 to 6.0.34
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.32 to 6.0.34.
- [Release notes](https://github.com/JeffreyWay/laravel-mix/releases)
- [Changelog](https://github.com/laravel-mix/laravel-mix/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JeffreyWay/laravel-mix/compare/v6.0.32...v6.0.34)

---
updated-dependencies:
- dependency-name: laravel-mix
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-18 03:02:18 +00:00
dependabot[bot]
576a429426 Bump axios from 0.22.0 to 0.23.0
Bumps [axios](https://github.com/axios/axios) from 0.22.0 to 0.23.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.22.0...v0.23.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-18 03:02:08 +00:00
dependabot[bot]
47ef0c3a0b Bump laravel/framework from 8.63.0 to 8.64.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.63.0 to 8.64.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/8.x/CHANGELOG-8.x.md)
- [Commits](https://github.com/laravel/framework/compare/v8.63.0...v8.64.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>
2021-10-18 03:00:47 +00:00
James Cole
66303f614b Fix login mail handing, #5173 2021-10-13 05:57:11 +02:00
James Cole
98358f7578 Drop some log lines. 2021-10-13 05:44:17 +02:00
James Cole
8486b846f2 Merge pull request #5172 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/laravel-mix-6.0.32
Bump laravel-mix from 6.0.31 to 6.0.32 in /frontend
2021-10-11 06:22:03 +02:00
James Cole
6cb35137cb Merge pull request #5171 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.32
Bump laravel-mix from 6.0.31 to 6.0.32
2021-10-11 06:21:53 +02:00
dependabot[bot]
f6182412a0 Bump laravel-mix from 6.0.31 to 6.0.32 in /frontend
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.31 to 6.0.32.
- [Release notes](https://github.com/JeffreyWay/laravel-mix/releases)
- [Changelog](https://github.com/laravel-mix/laravel-mix/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JeffreyWay/laravel-mix/compare/v6.0.31...v6.0.32)

---
updated-dependencies:
- dependency-name: laravel-mix
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-11 03:02:51 +00:00
dependabot[bot]
a67c87101d Bump laravel-mix from 6.0.31 to 6.0.32
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.31 to 6.0.32.
- [Release notes](https://github.com/JeffreyWay/laravel-mix/releases)
- [Changelog](https://github.com/laravel-mix/laravel-mix/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JeffreyWay/laravel-mix/compare/v6.0.31...v6.0.32)

---
updated-dependencies:
- dependency-name: laravel-mix
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-11 03:01:59 +00:00
James Cole
84b32514df Merge tag '5.6.2' into develop
5.6.2
2021-10-09 15:03:10 +02:00
James Cole
df8b7158a7 Merge branch 'release/5.6.2' 2021-10-09 15:03:09 +02:00
James Cole
ee226d4618 Update meta files for new release. 2021-10-09 10:15:27 +02:00
James Cole
6e2324528c Update translations. 2021-10-09 10:10:06 +02:00
James Cole
344ae4399e Update changelog. 2021-10-09 10:07:18 +02:00
James Cole
f91353f2f5 Fix empty audit message. 2021-10-09 10:07:09 +02:00
James Cole
339ac7c996 Merge branch 'main' into develop 2021-10-09 08:47:07 +02:00
James Cole
d153a4d83e Less logging. 2021-10-09 08:35:56 +02:00
James Cole
dc8e41357d Merge pull request #5159 from firefly-iii/dependabot/composer/composer/composer-2.1.9 2021-10-06 04:33:36 +02:00
dependabot[bot]
20ec53b41a Bump composer/composer from 2.1.8 to 2.1.9
Bumps [composer/composer](https://github.com/composer/composer) from 2.1.8 to 2.1.9.
- [Release notes](https://github.com/composer/composer/releases)
- [Changelog](https://github.com/composer/composer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/composer/composer/compare/2.1.8...2.1.9)

---
updated-dependencies:
- dependency-name: composer/composer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-05 21:05:04 +00:00
James Cole
7bd9f55df8 Fix nullpointer. 2021-10-04 14:57:30 +02:00
James Cole
d5045b51c7 Merge pull request #5157 from firefly-iii/dependabot/composer/develop/filp/whoops-2.14.4
Bump filp/whoops from 2.14.3 to 2.14.4
2021-10-04 11:16:07 +02:00
James Cole
fc19a86e1f Merge pull request #5158 from firefly-iii/dependabot/npm_and_yarn/develop/axios-0.22.0
Bump axios from 0.21.4 to 0.22.0
2021-10-04 11:15:57 +02:00
dependabot[bot]
422de9c672 Bump axios from 0.21.4 to 0.22.0
Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 0.22.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.4...v0.22.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-04 03:01:41 +00:00
dependabot[bot]
3d75d83a84 Bump filp/whoops from 2.14.3 to 2.14.4
Bumps [filp/whoops](https://github.com/filp/whoops) from 2.14.3 to 2.14.4.
- [Release notes](https://github.com/filp/whoops/releases)
- [Changelog](https://github.com/filp/whoops/blob/master/CHANGELOG.md)
- [Commits](https://github.com/filp/whoops/compare/2.14.3...2.14.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-04 03:00:38 +00:00
James Cole
0af2fd845d Fix Insufficient Granularity of Access Control 2021-10-03 18:18:44 +02:00
James Cole
e60444cf65 Add log for #5133 2021-10-03 15:31:36 +02:00
James Cole
10f8002da5 Fix logging scope. 2021-10-03 12:44:53 +02:00
James Cole
e331c10d7e Fix papertrail 2021-10-03 06:48:22 +02:00
James Cole
f4844e6252 Add driver 2021-10-03 06:45:38 +02:00
James Cole
76a07c84e9 Add level 2021-10-03 06:37:42 +02:00
James Cole
1c9dc9926a Add papertrail logging. 2021-10-03 06:26:25 +02:00
James Cole
aae80c348b Update packages 2021-10-03 06:06:56 +02:00
James Cole
ab6707b9d9 Fix previous url, also in Safari 2021-10-03 06:06:49 +02:00
James Cole
4e7a27dd65 Refer to steam method 2021-10-03 06:05:47 +02:00
James Cole
5d71baa4a1 Refer to steam method 2021-10-03 06:05:30 +02:00
James Cole
1e0e5d0fe9 Rename variable. 2021-10-03 06:05:11 +02:00
James Cole
0a89af3c83 catch logic exception 2021-10-02 18:46:26 +02:00
James Cole
0518c96567 Catch exception 2021-10-02 18:45:42 +02:00
James Cole
ad8a8ae612 Catch value error. 2021-10-02 18:43:30 +02:00
James Cole
b894bffad9 Update meta files and rebuild. 2021-10-02 16:58:33 +02:00
James Cole
68ad6b9913 Updating translations. 2021-10-02 16:57:59 +02:00
James Cole
1a1ff2dc44 Partial impl for #5142 2021-10-02 14:57:20 +02:00
James Cole
eaeb1f99c6 Fix #5143 2021-10-02 14:47:27 +02:00
James Cole
cc67583278 Group filter for #5133 2021-10-02 14:33:14 +02:00
James Cole
a14568c796 Small refactor in #5153 2021-10-02 14:23:34 +02:00
James Cole
b919a5705c Merge pull request #5153 from ajgon/feature/healthcheck
healthcheck endpoint
2021-10-02 14:19:17 +02:00
Igor Rzegocki
d1e6f4a136 healthcheck endpoint 2021-10-02 13:34:32 +02:00
James Cole
8662dfa4c0 Fix unsecure redirect code. 2021-10-02 13:28:56 +02:00
James Cole
4e84a5c40c Merge branch 'main' into develop 2021-10-02 13:04:06 +02:00
James Cole
2e3877f770 Refuse unsecure redirect urls 2021-10-02 12:50:21 +02:00
James Cole
437f939c57 Remove logging. 2021-10-02 12:50:06 +02:00
James Cole
a85b6420c1 Make sure temp file is closed (and thus deleted) 2021-10-01 11:33:45 +02:00
James Cole
3f1ec6a6d2 Fix markdown parser 2021-10-01 05:30:14 +02:00
James Cole
a694329998 Clean up referral URL catch 2021-10-01 05:30:05 +02:00
James Cole
b1b6ea9b11 Fix #5134 2021-10-01 05:04:03 +02:00
James Cole
d447f5f9d7 Fix #5144 2021-10-01 04:58:10 +02:00
James Cole
c4dbc2bc7f Fix #5145 2021-10-01 04:55:33 +02:00
James Cole
91eee69d9d Merge pull request #5138 from firefly-iii/dependabot/composer/lcobucci/jwt-4.1.5
Bump lcobucci/jwt from 4.1.4 to 4.1.5
2021-09-30 06:38:23 +02:00
dependabot[bot]
8152c4e75c Bump lcobucci/jwt from 4.1.4 to 4.1.5
Bumps [lcobucci/jwt](https://github.com/lcobucci/jwt) from 4.1.4 to 4.1.5.
- [Release notes](https://github.com/lcobucci/jwt/releases)
- [Commits](https://github.com/lcobucci/jwt/compare/4.1.4...4.1.5)

---
updated-dependencies:
- dependency-name: lcobucci/jwt
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-29 17:12:22 +00:00
James Cole
053dd50640 Merge pull request #5119 from firefly-iii/dependabot/composer/develop/ramsey/uuid-4.2.3
Bump ramsey/uuid from 4.2.2 to 4.2.3
2021-09-27 09:58:55 +02:00
James Cole
4d1dd28431 Merge pull request #5120 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.19
Bump @vue/compiler-sfc from 3.2.18 to 3.2.19
2021-09-27 09:58:47 +02:00
dependabot[bot]
04be7d6538 Bump @vue/compiler-sfc from 3.2.18 to 3.2.19
Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.2.18 to 3.2.19.
- [Release notes](https://github.com/vuejs/vue-next/releases)
- [Changelog](https://github.com/vuejs/vue-next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-next/commits/v3.2.19/packages/compiler-sfc)

---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-27 03:02:16 +00:00
dependabot[bot]
195427e544 Bump ramsey/uuid from 4.2.2 to 4.2.3
Bumps [ramsey/uuid](https://github.com/ramsey/uuid) from 4.2.2 to 4.2.3.
- [Release notes](https://github.com/ramsey/uuid/releases)
- [Changelog](https://github.com/ramsey/uuid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ramsey/uuid/compare/4.2.2...4.2.3)

---
updated-dependencies:
- dependency-name: ramsey/uuid
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-27 03:00:46 +00:00
James Cole
57bf78489b Add php8 code. 2021-09-25 16:25:03 +02:00
James Cole
5df04cb5ff Merge tag '5.6.1' into develop
5.6.1
2021-09-25 14:21:27 +02:00
James Cole
d55ff5735e Merge branch 'release/5.6.1' 2021-09-25 14:21:25 +02:00
James Cole
f38c56ee0d Rebuild for new release. 2021-09-25 14:20:57 +02:00
James Cole
f003ad9ee9 Rebuild the frontpage. 2021-09-25 06:40:55 +02:00
James Cole
dd7344d05d Fix issue #5100 2021-09-25 06:31:12 +02:00
James Cole
138b60c462 Update various translations. 2021-09-25 06:30:35 +02:00
James Cole
8ec556f8ae Fix #5101 2021-09-25 05:35:29 +02:00
James Cole
6c532f99ad Fix #5104 2021-09-25 05:32:15 +02:00
James Cole
30c23b51b6 Add service worker to ignored urls. fix #5110 2021-09-25 05:14:41 +02:00
James Cole
9b7ed21787 Clean up packages. 2021-09-23 20:07:34 +02:00
James Cole
b06d296a44 Step by step. 2021-09-23 20:03:39 +02:00
James Cole
6e084e662e Experimental update composer file. 2021-09-23 19:56:27 +02:00
James Cole
bf30b8027e Experimental update composer file. 2021-09-23 19:47:24 +02:00
James Cole
71ff4b8fe0 Update composer file. 2021-09-23 19:33:00 +02:00
James Cole
578f350498 Convert GET routes to POST. 2021-09-20 06:39:10 +02:00
James Cole
8f0a55feb0 Fix link 2021-09-19 17:29:15 +02:00
James Cole
048ba35d52 Update changelog 2021-09-19 17:29:04 +02:00
James Cole
915f4a0045 Add endpoint links. 2021-09-19 17:22:16 +02:00
James Cole
1efbbe4b84 Append API links 2021-09-19 10:20:28 +02:00
James Cole
18fad5f115 API: add missing fields 2021-09-19 08:28:18 +02:00
James Cole
eae0cc17a4 No need for break 2021-09-19 08:28:10 +02:00
James Cole
060c08c011 Return false 2021-09-19 08:28:01 +02:00
James Cole
a2dedde094 Add links to endpoints. 2021-09-19 08:27:52 +02:00
James Cole
4003cea759 Code reordering and reformatting. I should really start employing style CI. 2021-09-18 10:26:12 +02:00
James Cole
9b9d52e99f Update version. 2021-09-18 10:21:46 +02:00
James Cole
e829d79589 Various code cleanup. 2021-09-18 10:21:29 +02:00
James Cole
3589c9f60f Various code cleanup. 2021-09-18 10:20:19 +02:00
James Cole
481a6bdd5f Add meta data to models. 2021-09-18 10:08:10 +02:00
James Cole
b3a98d7079 Update API endpoints. 2021-09-18 10:07:45 +02:00
James Cole
d18e9da468 Bad hash checking found in #4997 2021-09-18 07:02:11 +02:00
James Cole
4f27ca28c3 Update various endpoints. 2021-09-18 05:58:22 +02:00
James Cole
190b6fb25f Update API endpoints. 2021-09-18 05:26:31 +02:00
James Cole
4fcc659263 Merge branch 'main' into develop 2021-09-17 15:28:49 +02:00
James Cole
cf16398794 Update readme. 2021-09-17 15:28:35 +02:00
James Cole
edf8ab6208 Merge tag '5.6.0' into develop
5.6.0
2021-09-17 15:19:53 +02:00
692 changed files with 8725 additions and 7297 deletions

View File

@@ -37,9 +37,16 @@ TRUSTED_PROXIES=
# Several other options exist. You can use 'single' for one big fat error log (not recommended).
# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
# A rotating log option is 'daily', creates 5 files that (surprise) rotate.
# A cool option is 'papertrail' for cloud logging
# Default setting 'stack' will log to 'daily' and to 'stdout' at the same time.
LOG_CHANNEL=stack
#
# Used when logging to papertrail:
#
PAPERTRAIL_HOST=
PAPERTRAIL_PORT=
# Log level. You can set this from least severe to most severe:
# debug, info, notice, warning, error, critical, alert, emergency
# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
@@ -170,6 +177,12 @@ MAP_DEFAULT_ZOOM=6
# https://docs.firefly-iii.org/advanced-installation/authentication
AUTHENTICATION_GUARD=web
#
# Your LDAP server may speak a dialect. You can choose between 'OpenLDAP' and 'ActiveDirectory'
# Anything else defaults to 'ActiveDirectory'
#
LDAP_DIALECT=OpenLDAP
#
# LDAP connection settings:
#
@@ -185,6 +198,15 @@ LDAP_PASSWORD=super_secret
LDAP_AUTH_FIELD=uid
#
# If you wish to only authenticate users from a specific group, use the base DN above.
#
# If you require extra/special filters please use the LDAP_EXTRA_FILTER with a valid DN.
#
# The extra filter will only be applied after the user is authenticated.
#
LDAP_EXTRA_FILTER=
#
# Remote user guard settings
#
@@ -280,6 +302,8 @@ FIREFLY_III_LAYOUT=v1
# It won't work. It doesn't do ANYTHING. Don't believe the lies you read online. I'm not joking.
# This configuration value WILL NOT HELP.
#
# Notable exception to this rule is Synology, which, according to some users, will use APP_URL to rewrite stuff.
#
# This variable is ONLY used in some of the emails Firefly III sends around. Nowhere else.
# So when configuring anything WEB related this variable doesn't do anything. Nothing
#

View File

@@ -1,7 +0,0 @@
pull_request_rules:
- name: PR on main is never approved.
conditions:
- base=main
actions:
close:
message: Please reopen this PR on the `develop` branch. Thank you.

7
.github/mergify.yml vendored Normal file
View File

@@ -0,0 +1,7 @@
pull_request_rules:
- name: Security update by dependabot
conditions:
- author~=^dependabot(|-preview)\[bot\]$
actions:
merge:
method: merge

4
.github/stale.yml vendored
View File

@@ -1,11 +1,11 @@
# Configuration for probot-stale - https://github.com/probot/stale
# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 7
daysUntilStale: 14
# Number of days of inactivity before a stale Issue or Pull Request is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 7
daysUntilClose: 14
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
# - "[Status] Maybe Later"

21
.github/workflows/build.yml vendored Normal file
View File

@@ -0,0 +1,21 @@
name: Sonarcloud CI
on:
push:
branches:
- main
- develop
pull_request:
types: [opened, synchronize, reopened]
jobs:
sonarcloud:
name: SonarCloud
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

View File

@@ -1,58 +0,0 @@
---
build:
nodes:
analysis:
project_setup:
override: true
tests:
override:
- php-scrutinizer-run
checks:
javascript: true
php:
align_assignments: true
avoid_fixme_comments: true
avoid_multiple_statements_on_same_line: true
avoid_perl_style_comments: true
avoid_todo_comments: true
duplication: false
encourage_single_quotes: true
newline_at_end_of_file: true
no_goto: true
no_long_variable_names:
maximum: "20"
no_short_method_names:
minimum: "3"
no_short_variable_names:
minimum: "3"
optional_parameters_at_the_end: true
parameter_doc_comments: true
remove_extra_empty_lines: true
return_doc_comment_if_not_inferrable: true
return_doc_comments: true
uppercase_constants: true
use_self_instead_of_fqcn: true
coding_style:
php:
spaces:
around_operators:
concatenation: true
other:
after_type_cast: false
filter:
excluded_paths:
- database/migrations/*
- bootstrap/*
- config/*
- docker/*
- public/js/lib/*
- public/lib/adminlte/js/*
- public/lib/bootstrap/js/*
- resources/*
- routes/*
- storage/*
paths:
- app/*
- public/js/ff/*
tools:
external_code_coverage: false

View File

@@ -1,20 +0,0 @@
language: php
php:
- '7.4'
dist: xenial
os: linux
cache:
directories:
- "/home/travis/.config"
- "/home/travis/build/firefly-iii/firefly-iii/vendor"
branches:
only:
- develop
before_script:
- phpenv config-rm xdebug.ini || return 0
script:
- "./.ci/phpstan.sh"
- "./.ci/phpunit.sh"

View File

@@ -25,12 +25,14 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Http\Api\AccountFilter;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use JsonException;
/**
* Class AccountController
@@ -62,9 +64,14 @@ class AccountController extends Controller
}
/**
* Documentation for this endpoint:
* https://api-docs.firefly-iii.org/#/autocomplete/getAccountsAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse
* @throws FireflyException
* @throws JsonException
*/
public function accounts(AutocompleteRequest $request): JsonResponse
{

View File

@@ -56,6 +56,9 @@ class BillController extends Controller
}
/**
* Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getBillsAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse

View File

@@ -56,6 +56,9 @@ class BudgetController extends Controller
}
/**
* Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getBudgetsAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse

View File

@@ -56,6 +56,9 @@ class CategoryController extends Controller
}
/**
* Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getCategoriesAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse

View File

@@ -56,6 +56,9 @@ class CurrencyController extends Controller
}
/**
* Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse
@@ -81,9 +84,13 @@ class CurrencyController extends Controller
}
/**
* Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesCodeAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse
* @deprecated
*/
public function currenciesWithCode(AutocompleteRequest $request): JsonResponse
{

View File

@@ -56,6 +56,9 @@ class ObjectGroupController extends Controller
}
/**
* Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getObjectGroupsAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse

View File

@@ -36,7 +36,7 @@ use Illuminate\Http\JsonResponse;
*/
class PiggyBankController extends Controller
{
private AccountRepositoryInterface $accountRepository;
private AccountRepositoryInterface $accountRepository;
private PiggyBankRepositoryInterface $piggyRepository;
/**
@@ -60,6 +60,9 @@ class PiggyBankController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse
@@ -80,6 +83,7 @@ class PiggyBankController extends Controller
'currency_id' => $currency->id,
'currency_name' => $currency->name,
'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol,
'currency_decimal_places' => $currency->decimal_places,
];
}
@@ -88,6 +92,9 @@ class PiggyBankController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesBalanceAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse
@@ -112,6 +119,7 @@ class PiggyBankController extends Controller
'currency_id' => $currency->id,
'currency_name' => $currency->name,
'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol,
'currency_decimal_places' => $currency->decimal_places,
];
}

View File

@@ -25,7 +25,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Models\Rule;
use FireflyIII\Models\Recurrence;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
use Illuminate\Http\JsonResponse;
@@ -53,22 +53,25 @@ class RecurrenceController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getRecurringAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
public function recurring(AutocompleteRequest $request): JsonResponse
{
$data = $request->getData();
$rules = $this->repository->searchRecurrence($data['query'], $data['limit']);
$response = [];
$data = $request->getData();
$recurrences = $this->repository->searchRecurrence($data['query'], $data['limit']);
$response = [];
/** @var Rule $rule */
foreach ($rules as $rule) {
/** @var Recurrence $recurrence */
foreach ($recurrences as $recurrence) {
$response[] = [
'id' => (string)$rule->id,
'name' => $rule->title,
'description' => $rule->description,
'id' => (string)$recurrence->id,
'name' => $recurrence->title,
'description' => $recurrence->description,
];
}

View File

@@ -53,6 +53,9 @@ class RuleController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getRulesAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse

View File

@@ -53,6 +53,9 @@ class RuleGroupController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getRuleGroupsAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse

View File

@@ -56,6 +56,9 @@ class TagController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getTagAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse

View File

@@ -61,6 +61,9 @@ class TransactionController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse
@@ -88,6 +91,9 @@ class TransactionController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsIDAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse

View File

@@ -52,6 +52,9 @@ class TransactionTypeController extends Controller
}
/**
* This endpoint is documented at
* https://api-docs.firefly-iii.org/#/autocomplete/getTransactionTypesAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse

View File

@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Data\DateRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -69,9 +70,13 @@ class AccountController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/charts/getChartAccountOverview
*
* @param DateRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function overview(DateRequest $request): JsonResponse
{
@@ -100,9 +105,9 @@ class AccountController extends Controller
foreach ($accounts as $account) {
$currency = $this->repository->getAccountCurrency($account);
if (null === $currency) {
$currency = $default;
$currency = $default;
}
$currentSet = [
$currentSet = [
'label' => $account->name,
'currency_id' => (string)$currency->id,
'currency_code' => $currency->code,

View File

@@ -46,8 +46,8 @@ abstract class Controller extends BaseController
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
protected const CONTENT_TYPE = 'application/vnd.api+json';
protected ParameterBag $parameters;
protected array $allowedSort;
protected ParameterBag $parameters;
/**
* Controller constructor.
@@ -92,7 +92,7 @@ abstract class Controller extends BaseController
if (null !== $date) {
try {
$obj = Carbon::parse($date);
} catch (InvalidDateException|InvalidFormatException $e) {
} catch (InvalidDateException | InvalidFormatException $e) {
// don't care
Log::error(sprintf('Invalid date exception in API controller: %s', $e->getMessage()));
}

View File

@@ -57,9 +57,12 @@ class AccountController extends Controller
}
/**
* This endpoint is deprecated and not documented.
*
* @param MoveTransactionsRequest $request
*
* @return JsonResponse
* @deprecated
*/
public function moveTransactions(MoveTransactionsRequest $request): JsonResponse
{

View File

@@ -61,6 +61,8 @@ class TransactionController extends Controller
}
/**
* This endpoint is documented at:
*
* @param TransactionRequest $request
*
* @return JsonResponse
@@ -69,12 +71,13 @@ class TransactionController extends Controller
{
$query = $request->getAll();
$params = $query['query'];
// this deserves better code, but for now a loop of basic if-statements
// to respond to what is in the $query.
// this is OK because only one thing can be in the query at the moment.
if ($this->updatesTransactionAccount($params)) {
$original = $this->repository->find((int)$params['where']['source_account_id']);
$destination = $this->repository->find((int)$params['update']['destination_account_id']);
$original = $this->repository->find((int)$params['where']['account_id']);
$destination = $this->repository->find((int)$params['update']['account_id']);
/** @var AccountDestroyService $service */
$service = app(AccountDestroyService::class);
@@ -91,7 +94,7 @@ class TransactionController extends Controller
*/
private function updatesTransactionAccount(array $params): bool
{
return array_key_exists('source_account_id', $params['where']) && array_key_exists('destination_account_id', $params['update']);
return array_key_exists('account_id', $params['where']) && array_key_exists('account_id', $params['update']);
}
}

View File

@@ -52,6 +52,9 @@ use Illuminate\Http\JsonResponse;
class DestroyController extends Controller
{
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/destroyData
*
* @param DestroyRequest $request
*
* @return JsonResponse

View File

@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Data\Export;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Support\Export\ExportDataGenerator;
use Illuminate\Http\Response as LaravelResponse;
use League\Csv\CannotInsertRecord;
/**
* Class ExportController
@@ -54,10 +54,13 @@ class ExportController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportAccounts
*
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws CannotInsertRecord
* @throws FireflyException
*/
public function accounts(ExportRequest $request): LaravelResponse
{
@@ -71,15 +74,13 @@ class ExportController extends Controller
* @param string $key
*
* @return LaravelResponse
* @throws CannotInsertRecord
* @throws \FireflyIII\Exceptions\FireflyException
* @throws \League\Csv\Exception
* @throws FireflyException
*/
private function returnExport(string $key): LaravelResponse
{
$date = date('Y-m-d-H-i-s');
$date = date('Y-m-d-H-i-s');
$fileName = sprintf('%s-export-%s.csv', $date, $key);
$data = $this->exporter->export();
$data = $this->exporter->export();
/** @var LaravelResponse $response */
$response = response($data[$key]);
@@ -98,10 +99,13 @@ class ExportController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportBills
*
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws CannotInsertRecord
* @throws FireflyException
*/
public function bills(ExportRequest $request): LaravelResponse
{
@@ -111,10 +115,13 @@ class ExportController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportBudgets
*
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws CannotInsertRecord
* @throws FireflyException
*/
public function budgets(ExportRequest $request): LaravelResponse
{
@@ -124,10 +131,13 @@ class ExportController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportCategories
*
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws CannotInsertRecord
* @throws FireflyException
*/
public function categories(ExportRequest $request): LaravelResponse
{
@@ -137,10 +147,13 @@ class ExportController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportPiggies
*
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws CannotInsertRecord
* @throws FireflyException
*/
public function piggyBanks(ExportRequest $request): LaravelResponse
{
@@ -150,10 +163,13 @@ class ExportController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportRecurring
*
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws CannotInsertRecord
* @throws FireflyException
*/
public function recurring(ExportRequest $request): LaravelResponse
{
@@ -163,10 +179,13 @@ class ExportController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportRules
*
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws CannotInsertRecord
* @throws FireflyException
*/
public function rules(ExportRequest $request): LaravelResponse
{
@@ -176,10 +195,13 @@ class ExportController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportTags
*
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws CannotInsertRecord
* @throws FireflyException
*/
public function tags(ExportRequest $request): LaravelResponse
{
@@ -189,10 +211,13 @@ class ExportController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportTransactions
*
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws CannotInsertRecord
* @throws FireflyException
*/
public function transactions(ExportRequest $request): LaravelResponse
{

View File

@@ -37,7 +37,7 @@ use Illuminate\Http\JsonResponse;
* Class AccountController
*
* Shows expense information grouped or limited by date.
* Ie. all expenses grouped by account + currency.
* I.e. all expenses grouped by account + currency.
*/
class AccountController extends Controller
{
@@ -73,6 +73,9 @@ class AccountController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseAsset
*
* @param GenericRequest $request
*
* @return JsonResponse
@@ -101,6 +104,9 @@ class AccountController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseExpense
*
* @param GenericRequest $request
*
* @return JsonResponse

View File

@@ -56,6 +56,9 @@ class BillController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseBill
*
* Expenses per bill, possibly filtered by bill and account.
*
* @param GenericRequest $request
@@ -116,6 +119,9 @@ class BillController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseNoBill
*
* Expenses for no bill filtered by account.
*
* @param GenericRequest $request

View File

@@ -65,6 +65,9 @@ class BudgetController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseBudget
*
* @param GenericRequest $request
*
* @return JsonResponse
@@ -99,6 +102,9 @@ class BudgetController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseNoBudget
*
* @param GenericRequest $request
*
* @return JsonResponse

View File

@@ -66,6 +66,9 @@ class CategoryController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferCategory
*
* @param GenericRequest $request
*
* @return JsonResponse
@@ -100,6 +103,9 @@ class CategoryController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory
*
* @param GenericRequest $request
*
* @return JsonResponse

View File

@@ -36,6 +36,9 @@ class PeriodController extends Controller
{
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseTotal
*
* @param GenericRequest $request
*
* @return JsonResponse

View File

@@ -55,6 +55,9 @@ class TagController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseNoTag
*
* Expenses for no tag filtered by account.
*
* @param GenericRequest $request
@@ -105,6 +108,9 @@ class TagController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseTag
*
* Expenses per tag, possibly filtered by tag and account.
*
* @param GenericRequest $request

View File

@@ -73,6 +73,9 @@ class AccountController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeAsset
*
* @param GenericRequest $request
*
* @return JsonResponse
@@ -100,6 +103,9 @@ class AccountController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeRevenue
*
* @param GenericRequest $request
*
* @return JsonResponse

View File

@@ -66,6 +66,9 @@ class CategoryController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeCategory
*
* @param GenericRequest $request
*
* @return JsonResponse
@@ -100,6 +103,9 @@ class CategoryController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeNoCategory
*
* @param GenericRequest $request
*
* @return JsonResponse

View File

@@ -36,6 +36,9 @@ class PeriodController extends Controller
{
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeTotal
*
* @param GenericRequest $request
*
* @return JsonResponse

View File

@@ -56,6 +56,9 @@ class TagController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeTag
*
* Expenses for no tag filtered by account.
*
* @param GenericRequest $request
@@ -108,6 +111,9 @@ class TagController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeNoTag
*
* Expenses per tag, possibly filtered by tag and account.
*
* @param GenericRequest $request

View File

@@ -58,6 +58,8 @@ class AccountController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransfers
*
* @param GenericRequest $request
*
@@ -69,6 +71,7 @@ class AccountController extends Controller
$end = $request->getEnd();
$assetAccounts = $request->getAssetAccounts();
$transfers = $this->opsRepository->sumTransfers($start, $end, $assetAccounts);
return response()->json($transfers);
}
}

View File

@@ -65,6 +65,9 @@ class CategoryController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferCategory
*
* @param GenericRequest $request
*
* @return JsonResponse
@@ -99,6 +102,9 @@ class CategoryController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory
*
* @param GenericRequest $request
*
* @return JsonResponse

View File

@@ -36,6 +36,9 @@ class PeriodController extends Controller
{
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferTotal
*
* @param GenericRequest $request
*
* @return JsonResponse

View File

@@ -55,7 +55,8 @@ class TagController extends Controller
}
/**
* Expenses for no tag filtered by account.
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferNoTag
*
* @param GenericRequest $request
*
@@ -107,6 +108,9 @@ class TagController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferTag
*
* Transfers per tag, possibly filtered by tag and account.
*
* @param GenericRequest $request

View File

@@ -56,6 +56,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/accounts/deleteAccount
*
* Remove the specified resource from storage.
*
* @param Account $account

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Account;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -69,11 +70,14 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/accounts/listAttachmentByAccount
*
* @param Account $account
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
* @throws FireflyException
*/
public function attachments(Account $account): JsonResponse
{
@@ -99,12 +103,13 @@ class ListController extends Controller
}
/**
* List all piggies.
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/accounts/listPiggyBankByAccount
*
* @param Account $account
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function piggyBanks(Account $account): JsonResponse
@@ -136,6 +141,9 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/accounts/listTransactionByAccount
*
* Show all transaction groups related to the account.
*
* @codeCoverageIgnore
@@ -144,7 +152,7 @@ class ListController extends Controller
* @param Account $account
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function transactions(Request $request, Account $account): JsonResponse
{

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Account;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Http\Api\AccountFilter;
@@ -65,12 +66,15 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/accounts/listAccount
*
* Display a listing of the resource.
*
* @param Request $request
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function index(Request $request): JsonResponse
@@ -80,7 +84,7 @@ class ShowController extends Controller
$this->parameters->set('type', $type);
// types to get, page size:
$types = $this->mapAccountTypes($this->parameters->get('type'));
$types = $this->mapAccountTypes($this->parameters->get('type'));
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of accounts. Count it and split it.
@@ -91,7 +95,7 @@ class ShowController extends Controller
// continue sort:
$accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
$accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
@@ -108,6 +112,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/accounts/getAccount
*
* Show single instance.
*
* @param Account $account

View File

@@ -58,6 +58,9 @@ class StoreController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/accounts/storeAccount
*
* Store a new instance.
*
* @param StoreRequest $request

View File

@@ -61,6 +61,9 @@ class UpdateController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/accounts/updateAccount
*
* Update account.
*
* @param UpdateRequest $request
@@ -71,10 +74,10 @@ class UpdateController extends Controller
public function update(UpdateRequest $request, Account $account): JsonResponse
{
Log::debug(sprintf('Now in %s', __METHOD__));
$data = $request->getUpdateData();
$data = $request->getUpdateData();
$data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
$account = $this->repository->update($account, $data);
$manager = $this->getManager();
$account = $this->repository->update($account, $data);
$manager = $this->getManager();
$account->refresh();
Preferences::mark();

View File

@@ -49,7 +49,7 @@ class DestroyController extends Controller
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
$this->repository = app(AttachmentRepositoryInterface::class);
$this->repository->setUser($user);
@@ -59,6 +59,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/attachments/deleteAttachment
*
* Remove the specified resource from storage.
*
* @codeCoverageIgnore

View File

@@ -66,6 +66,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/attachments/downloadAttachment
*
* Download an attachment.
*
* @param Attachment $attachment
@@ -108,6 +111,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/attachments/listAttachment
*
* Display a listing of the resource.
*
* @return JsonResponse
@@ -141,6 +147,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/attachments/getAttachment
*
* Display the specified resource.
*
* @param Attachment $attachment

View File

@@ -66,6 +66,9 @@ class StoreController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/attachments/uploadAttachment
*
* Store a newly created resource in storage.
*
* @param StoreRequest $request

View File

@@ -52,7 +52,7 @@ class UpdateController extends Controller
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
$this->repository = app(AttachmentRepositoryInterface::class);
$this->repository->setUser($user);
@@ -62,6 +62,9 @@ class UpdateController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/attachments/updateAttachment
*
* Update the specified resource in storage.
*
* @param UpdateRequest $request

View File

@@ -47,7 +47,7 @@ class DestroyController extends Controller
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
$this->abRepository = app(AvailableBudgetRepositoryInterface::class);
$this->abRepository->setUser($user);
@@ -57,6 +57,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/available_budgets/listAvailableBudget
*
* Remove the specified resource from storage.
*
* @param AvailableBudget $availableBudget

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\AvailableBudget;
use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
use FireflyIII\Transformers\AvailableBudgetTransformer;
@@ -62,10 +63,13 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/available_budgets/getAvailableBudget
*
* Display a listing of the resource.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse
@@ -98,6 +102,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/available_budgets/getAvailableBudget
*
* Display the specified resource.
*
* @param AvailableBudget $availableBudget

View File

@@ -25,11 +25,13 @@ namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Models\AvailableBudget\Request;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\TransactionCurrencyFactory;
use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
use FireflyIII\Transformers\AvailableBudgetTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use JsonException;
use League\Fractal\Resource\Item;
/**
@@ -60,11 +62,16 @@ class StoreController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/available_budgets/storeAvailableBudget
*
* Store a newly created resource in storage.
*
* @param Request $request
*
* @return JsonResponse
* @throws FireflyException
* @throws JsonException
*/
public function store(Request $request): JsonResponse
{

View File

@@ -61,6 +61,9 @@ class UpdateController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/available_budgets/updateAvailableBudget
*
* Update the specified resource in storage.
*
* @param Request $request

View File

@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V1\Controllers\Models\Bill;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Models\Bill;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
/**
@@ -55,6 +54,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/bills/deleteBill
*
* Remove the specified resource from storage.
*
* @param Bill $bill

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Bill;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\Bill;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
@@ -66,12 +67,15 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/bills/listAttachmentByBill
*
* Display a listing of the resource.
*
* @param Bill $bill
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function attachments(Bill $bill): JsonResponse
@@ -98,12 +102,15 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/bills/listRuleByBill
*
* List all of them.
*
* @param Bill $bill
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function rules(Bill $bill): JsonResponse
@@ -133,6 +140,9 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/bills/listTransactionByBill
*
* Show all transactions.
*
* @param Request $request
@@ -140,7 +150,7 @@ class ListController extends Controller
* @param Bill $bill
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Bill $bill): JsonResponse

View File

@@ -24,10 +24,10 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Bill;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Bill;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Transformers\BillTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
@@ -60,10 +60,13 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/bills/listBill
*
* Display a listing of the resource.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse
@@ -87,6 +90,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/bills/getBill
*
* Show the specified bill.
*
* @param Bill $bill

View File

@@ -29,7 +29,6 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Support\Http\Api\TransactionFilter;
use FireflyIII\Transformers\BillTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use League\Fractal\Resource\Item;
@@ -61,6 +60,9 @@ class StoreController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/bills/storeBill
*
* Store a bill.
*
* @param StoreRequest $request
@@ -70,8 +72,8 @@ class StoreController extends Controller
*/
public function store(StoreRequest $request): JsonResponse
{
$data = $request->getAll();
$bill = $this->repository->store($data);
$data = $request->getAll();
$bill = $this->repository->store($data);
$manager = $this->getManager();
/** @var BillTransformer $transformer */

View File

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Requests\Models\Bill\UpdateRequest;
use FireflyIII\Models\Bill;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Transformers\BillTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use League\Fractal\Resource\Item;
@@ -58,6 +57,9 @@ class UpdateController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/bills/updateBill
*
* Update a bill.
*
* @param UpdateRequest $request
@@ -67,8 +69,8 @@ class UpdateController extends Controller
*/
public function update(UpdateRequest $request, Bill $bill): JsonResponse
{
$data = $request->getAll();
$bill = $this->repository->update($bill, $data);
$data = $request->getAll();
$bill = $this->repository->update($bill, $data);
$manager = $this->getManager();
/** @var BillTransformer $transformer */

View File

@@ -54,6 +54,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/deleteBudget
*
* Remove the specified resource from storage.
*
* @param Budget $budget

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Budget;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\Budget;
use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
@@ -70,10 +71,13 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/listAttachmentByBudget
*
* @param Budget $budget
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function attachments(Budget $budget): JsonResponse
@@ -100,12 +104,15 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/listBudgetLimitByBudget
*
* Display a listing of the resource.
*
* @param Budget $budget
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function budgetLimits(Budget $budget): JsonResponse
@@ -129,6 +136,9 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/listTransactionByBudget
*
* Show all transactions.
*
* @param Request $request
@@ -136,7 +146,7 @@ class ListController extends Controller
* @param Budget $budget
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Budget $budget): JsonResponse

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Budget;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Budget;
use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
@@ -52,7 +53,7 @@ class ShowController extends Controller
parent::__construct();
$this->middleware(
function ($request, $next) {
$this->repository = app(BudgetRepositoryInterface::class);
$this->repository = app(BudgetRepositoryInterface::class);
$this->blRepository = app(BudgetLimitRepositoryInterface::class);
$this->repository->setUser(auth()->user());
$this->blRepository->setUser(auth()->user());
@@ -63,10 +64,13 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/listBudget
*
* Display a listing of the resource.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

View File

@@ -57,6 +57,9 @@ class StoreController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/storeBudget
*
* Store a budget.
*
* @param StoreRequest $request

View File

@@ -57,6 +57,9 @@ class UpdateController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/updateBudget
*
* Update a budget.
*
* @param UpdateRequest $request

View File

@@ -59,6 +59,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/deleteBudgetLimit
*
* Remove the specified resource from storage.
*
* @param Budget $budget

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\Budget;
use FireflyIII\Models\BudgetLimit;
@@ -66,6 +67,8 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/listTransactionByBudgetLimit
* Show all transactions.
*
* @param Request $request
@@ -73,7 +76,7 @@ class ListController extends Controller
* @param BudgetLimit $budgetLimit
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse

View File

@@ -70,7 +70,10 @@ class ShowController extends Controller
}
/**
* Display a listing of the budget limits for this budget..
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/listBudgetLimitByBudget
*
* Display a listing of the budget limits for this budget.
*
* @param Request $request
* @param Budget $budget
@@ -101,7 +104,10 @@ class ShowController extends Controller
}
/**
* Display a listing of the budget limits for this budget..
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/listBudgetLimit
*
* Display a listing of the budget limits for this budget.
*
* @param DateRequest $request
*
@@ -131,6 +137,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/getBudgetLimit
*
* @param Request $request
* @param Budget $budget
* @param BudgetLimit $budgetLimit

View File

@@ -25,7 +25,6 @@ namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Models\BudgetLimit\StoreRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Budget;
use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
use FireflyIII\Transformers\BudgetLimitTransformer;
@@ -61,6 +60,9 @@ class StoreController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/storeBudgetLimit
*
* Store a newly created resource in storage.
*
* @param StoreRequest $request

View File

@@ -42,6 +42,9 @@ class UpdateController extends Controller
private BudgetLimitRepositoryInterface $blRepository;
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/updateBudgetLimit
*
* BudgetLimitController constructor.
*
* @codeCoverageIgnore

View File

@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V1\Controllers\Models\Category;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
/**
@@ -55,6 +54,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/categories/deleteCategory
*
* Remove the specified resource from storage.
*
* @param Category $category

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Category;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
@@ -65,10 +66,13 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/categories/listAttachmentByCategory
*
* @param Category $category
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function attachments(Category $category): JsonResponse
@@ -95,6 +99,9 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/categories/listTransactionByCategory
*
* Show all transactions.
*
* @param Request $request
@@ -102,7 +109,7 @@ class ListController extends Controller
* @param Category $category
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Category $category): JsonResponse

View File

@@ -24,10 +24,10 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Category;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Transformers\CategoryTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
@@ -60,10 +60,13 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/categories/listCategory
*
* Display a listing of the resource.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse
@@ -92,6 +95,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/categories/getCategory
*
* Show the category.
*
* @param Category $category

View File

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Requests\Models\Category\StoreRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Transformers\CategoryTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use League\Fractal\Resource\Item;
@@ -58,6 +57,9 @@ class StoreController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/categories/storeCategory
*
* Store new category.
*
* @param StoreRequest $request

View File

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Requests\Models\Category\UpdateRequest;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Transformers\CategoryTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use League\Fractal\Resource\Item;
@@ -58,6 +57,9 @@ class UpdateController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/categories/updateCategory
*
* Update the category.
*
* @param UpdateRequest $request
@@ -67,9 +69,9 @@ class UpdateController extends Controller
*/
public function update(UpdateRequest $request, Category $category): JsonResponse
{
$data = $request->getAll();
$data = $request->getAll();
$category = $this->repository->update($category, $data);
$manager = $this->getManager();
$manager = $this->getManager();
/** @var CategoryTransformer $transformer */
$transformer = app(CategoryTransformer::class);

View File

@@ -47,7 +47,7 @@ class DestroyController extends Controller
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
$this->repository = app(ObjectGroupRepositoryInterface::class);
$this->repository->setUser($user);
@@ -57,6 +57,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/object_groups/deleteObjectGroup
*
* Remove the specified resource from storage.
*
* @param ObjectGroup $objectGroup

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\ObjectGroup;
use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
use FireflyIII\Transformers\BillTransformer;
@@ -52,7 +53,7 @@ class ListController extends Controller
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
$this->repository = app(ObjectGroupRepositoryInterface::class);
$this->repository->setUser($user);
@@ -62,12 +63,15 @@ class ListController extends Controller
}
/**
* List all bills
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/object_groups/listBillByObjectGroup
*
* List all bills in this object group
*
* @param ObjectGroup $objectGroup
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function bills(ObjectGroup $objectGroup): JsonResponse
@@ -95,12 +99,15 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/object_groups/listPiggyBankByObjectGroup
*
* List all piggies under the object group.
*
* @param ObjectGroup $objectGroup
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function piggyBanks(ObjectGroup $objectGroup): JsonResponse

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\ObjectGroup;
use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
use FireflyIII\Transformers\ObjectGroupTransformer;
@@ -63,12 +64,15 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/object_groups/listObjectGroups
*
* Display a listing of the resource.
*
* @param Request $request
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function index(Request $request): JsonResponse
@@ -98,6 +102,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/object_groups/getObjectGroup
*
* Show single instance.
*
* @param ObjectGroup $objectGroup

View File

@@ -50,7 +50,7 @@ class UpdateController extends Controller
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
$this->repository = app(ObjectGroupRepositoryInterface::class);
$this->repository->setUser($user);
@@ -60,6 +60,9 @@ class UpdateController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/object_groups/updateObjectGroup
*
* @param UpdateRequest $request
* @param ObjectGroup $objectGroup
*

View File

@@ -54,6 +54,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/piggy_banks/deletePiggyBank
*
* Delete the resource.
*
* @param PiggyBank $piggyBank

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Transformers\AttachmentTransformer;
@@ -59,10 +60,13 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/piggy_banks/listAttachmentByPiggyBank
*
* @param PiggyBank $piggyBank
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function attachments(PiggyBank $piggyBank): JsonResponse
@@ -89,12 +93,15 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/piggy_banks/listEventByPiggyBank
*
* List single resource.
*
* @param PiggyBank $piggyBank
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Transformers\PiggyBankTransformer;
@@ -59,10 +60,13 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/piggy_banks/listPiggyBank
*
* List all of them.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse
@@ -92,6 +96,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/piggy_banks/getPiggyBank
*
* List single resource.
*
* @param PiggyBank $piggyBank

View File

@@ -57,6 +57,9 @@ class StoreController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/piggy_banks/storePiggyBank
*
* Store new object.
*
* @param StoreRequest $request

View File

@@ -57,6 +57,9 @@ class UpdateController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/piggy_banks/updatePiggyBank
*
* Update piggy bank.
*
* @param UpdateRequest $request
@@ -66,7 +69,7 @@ class UpdateController extends Controller
*/
public function update(UpdateRequest $request, PiggyBank $piggyBank): JsonResponse
{
$data = $request->getAll();
$data = $request->getAll();
$piggyBank = $this->repository->update($piggyBank, $data);
if (array_key_exists('current_amount', $data) && '' !== $data['current_amount']) {

View File

@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Models\Recurrence;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
/**
@@ -55,6 +54,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/recurrences/deleteRecurrence
*
* Delete the resource.
*
* @param Recurrence $recurrence

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\Recurrence;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
@@ -63,13 +64,16 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/recurrences/listTransactionByRecurrence
*
* Show transactions for this recurrence.
*
* @param Request $request
* @param Recurrence $recurrence
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Recurrence $recurrence): JsonResponse

View File

@@ -24,10 +24,10 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Recurrence;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
use FireflyIII\Transformers\RecurrenceTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
@@ -60,10 +60,13 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/recurrences/listRecurrence
*
* List all of them.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse
@@ -94,6 +97,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/recurrences/getRecurrence
*
* List single resource.
*
* @param Recurrence $recurrence

View File

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Requests\Models\Recurrence\StoreRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
use FireflyIII\Transformers\RecurrenceTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use League\Fractal\Resource\Item;
@@ -58,6 +57,9 @@ class StoreController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/recurrences/storeRecurrence
*
* Store new object.
*
* @param StoreRequest $request
@@ -67,9 +69,9 @@ class StoreController extends Controller
*/
public function store(StoreRequest $request): JsonResponse
{
$data = $request->getAll();
$data = $request->getAll();
$recurrence = $this->repository->store($data);
$manager = $this->getManager();
$manager = $this->getManager();
/** @var RecurrenceTransformer $transformer */
$transformer = app(RecurrenceTransformer::class);

View File

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Requests\Models\Recurrence\UpdateRequest;
use FireflyIII\Models\Recurrence;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
use FireflyIII\Transformers\RecurrenceTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use League\Fractal\Resource\Item;
@@ -58,6 +57,9 @@ class UpdateController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/recurrences/updateRecurrence
*
* Update single recurrence.
*
* @param UpdateRequest $request
@@ -67,9 +69,9 @@ class UpdateController extends Controller
*/
public function update(UpdateRequest $request, Recurrence $recurrence): JsonResponse
{
$data = $request->getAll();
$data = $request->getAll();
$recurrence = $this->repository->update($recurrence, $data);
$manager = $this->getManager();
$manager = $this->getManager();
/** @var RecurrenceTransformer $transformer */
$transformer = app(RecurrenceTransformer::class);

View File

@@ -58,6 +58,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rules/deleteRule
*
* Delete the resource.
*
* @param Rule $rule

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Rule;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Rule;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\Transformers\RuleTransformer;
@@ -63,10 +64,13 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rules/listRule
*
* List all of them.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse
@@ -97,6 +101,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rules/getRule
*
* List single resource.
*
* @param Rule $rule

View File

@@ -60,6 +60,9 @@ class StoreController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rules/storeRule
*
* Store new object.
*
* @param StoreRequest $request
@@ -68,7 +71,7 @@ class StoreController extends Controller
*/
public function store(StoreRequest $request): JsonResponse
{
$rule = $this->ruleRepository->store($request->getAll());
$rule = $this->ruleRepository->store($request->getAll());
$manager = $this->getManager();
/** @var RuleTransformer $transformer */
$transformer = app(RuleTransformer::class);

View File

@@ -66,6 +66,9 @@ class TriggerController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rules/testRule
*
* @param TestRequest $request
* @param Rule $rule
*
@@ -113,6 +116,9 @@ class TriggerController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rules/fireRule
*
* Execute the given rule group on a set of existing transactions.
*
* @param TriggerRequest $request

View File

@@ -61,6 +61,9 @@ class UpdateController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rules/updateRule
*
* Update a rule.
*
* @param UpdateRequest $request
@@ -70,8 +73,8 @@ class UpdateController extends Controller
*/
public function update(UpdateRequest $request, Rule $rule): JsonResponse
{
$data = $request->getAll();
$rule = $this->ruleRepository->update($rule, $data);
$data = $request->getAll();
$rule = $this->ruleRepository->update($rule, $data);
$manager = $this->getManager();
/** @var RuleTransformer $transformer */

View File

@@ -58,6 +58,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rule_groups/deleteRuleGroup
*
* Delete the resource.
*
* @param RuleGroup $ruleGroup

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Transformers\RuleTransformer;
@@ -62,10 +63,13 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rule_groups/listRuleByGroup
*
* @param RuleGroup $group
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function rules(RuleGroup $group): JsonResponse

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Transformers\RuleGroupTransformer;
@@ -63,10 +64,12 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rule_groups/listRuleGroup
* List all of them.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse
@@ -95,6 +98,9 @@ class ShowController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rule_groups/getRuleGroup
*
* List single resource.
*
* @param RuleGroup $ruleGroup

View File

@@ -38,7 +38,7 @@ use League\Fractal\Resource\Item;
class StoreController extends Controller
{
private AccountRepositoryInterface $accountRepository;
private AccountRepositoryInterface $accountRepository;
private RuleGroupRepositoryInterface $ruleGroupRepository;
/**
@@ -66,6 +66,9 @@ class StoreController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rule_groups/storeRuleGroup
*
* Store new object.
*
* @param StoreRequest $request

View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
use Exception;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Models\RuleGroup\TestRequest;
use FireflyIII\Api\V1\Requests\Models\RuleGroup\TriggerRequest;
@@ -34,10 +35,8 @@ use FireflyIII\Transformers\TransactionGroupTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use Exception;
/**
* Class TriggerController
@@ -68,6 +67,9 @@ class TriggerController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rule_groups/testRuleGroup
*
* @param TestRequest $request
* @param RuleGroup $group
*
@@ -121,6 +123,9 @@ class TriggerController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rule_groups/fireRuleGroup
*
* Execute the given rule group on a set of existing transactions.
*
* @param TriggerRequest $request

View File

@@ -62,6 +62,9 @@ class UpdateController extends Controller
}
/**
* This is endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rule_groups/updateRuleGroup
*
* Update a rule group.
*
* @param UpdateRequest $request

View File

@@ -58,6 +58,9 @@ class DestroyController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/tags/deleteTag
*
* Delete the resource.
*
* @param Tag $tag

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Tag;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\Tag;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
@@ -68,10 +69,13 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/tags/listAttachmentByTag
*
* @param Tag $tag
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function attachments(Tag $tag): JsonResponse
@@ -98,13 +102,16 @@ class ListController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/tags/listTransactionByTag
*
* Show all transactions.
*
* @param Request $request
* @param Tag $tag
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Tag $tag): JsonResponse

Some files were not shown because too many files have changed in this diff Show More