Compare commits

...

943 Commits

Author SHA1 Message Date
James Cole
ca34e0ebd5 Merge branch 'release/5.7.2' 2022-04-12 20:34:53 +02:00
James Cole
e139cf76de Update packages for new release. 2022-04-12 20:34:30 +02:00
James Cole
50f87a210a Replace uri with url 2022-04-12 18:19:30 +02:00
James Cole
ac5c11a8d7 Update meta files for new release. 2022-04-12 17:45:54 +02:00
James Cole
3813b7a9e8 Reverse issue until confirmation. 2022-04-12 17:37:34 +02:00
James Cole
86a6e51ebc Add another option, fix https://github.com/firefly-iii/firefly-iii/issues/5992 2022-04-12 16:04:46 +02:00
James Cole
eb4343407d Validate amount 2022-04-09 07:06:41 +02:00
James Cole
8eb4c64602 Validate amount 2022-04-09 07:05:31 +02:00
James Cole
f033a14bc7 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2022-04-08 19:32:15 +02:00
James Cole
59199134a6 Possible fix for port. 2022-04-08 19:30:00 +02:00
James Cole
c6d831fd94 Merge pull request #5973 from turrisxyz/naveen/feat/set-perms-actions
Set permissions for GitHub actions
2022-04-08 06:14:23 +02:00
naveensrinivasan
a963e1bc03 Set permissions for GitHub actions
- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

 Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

Signed-off-by: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com>
2022-04-07 22:58:30 +00:00
James Cole
be48d3bea2 Merge pull request #5962 from firefly-iii/dependabot/composer/develop/psr/log-3.0.0
Bump psr/log from 2.0.0 to 3.0.0
2022-04-05 16:26:20 +02:00
James Cole
7d438375c1 Merge branch 'release/5.7.1' 2022-04-04 05:48:39 +02:00
James Cole
b20b8868bf Merge tag '5.7.1' into develop
5.7.1
2022-04-04 05:48:39 +02:00
James Cole
b4638e1ae5 Rebuild meta files for new release. 2022-04-04 05:48:15 +02:00
James Cole
9872c18715 Update meta-files for new release. 2022-04-04 05:46:16 +02:00
James Cole
e854c1b8ae Fix #5961 2022-04-04 05:40:29 +02:00
dependabot[bot]
e243ec10ba Bump psr/log from 2.0.0 to 3.0.0
Bumps [psr/log](https://github.com/php-fig/log) from 2.0.0 to 3.0.0.
- [Release notes](https://github.com/php-fig/log/releases)
- [Commits](https://github.com/php-fig/log/compare/2.0.0...3.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>
2022-04-04 03:00:42 +00:00
James Cole
b8f2f0a73f Catch null 2022-04-03 17:47:27 +02:00
James Cole
8c481e38f2 Update supported releases. 2022-04-03 16:24:19 +02:00
James Cole
609e911fd6 Make sure the wort things aren't broken. 2022-04-03 16:23:49 +02:00
James Cole
d894ccc9cc Catch missing date ranges. 2022-04-03 14:48:22 +02:00
James Cole
19d4b6ba86 Fix null pointer 2022-04-03 14:43:06 +02:00
James Cole
789dba7cf9 Fix https://github.com/firefly-iii/firefly-iii/issues/5958 2022-04-03 14:42:12 +02:00
James Cole
b6e88a56c5 Fix null pointer. 2022-04-03 14:40:42 +02:00
James Cole
b96a9a359c Remove token header 2022-04-03 12:39:30 +02:00
James Cole
ba64a7d039 Add error method 2022-04-03 12:38:17 +02:00
James Cole
20c8fea520 Merge tag '5.7.0' into develop
5.7.0
2022-04-03 12:13:37 +02:00
James Cole
e6854b9265 Merge branch 'release/5.7.0' 2022-04-03 12:13:35 +02:00
James Cole
122cab1757 Update meta files for new release. 2022-04-03 12:12:41 +02:00
James Cole
51b07f08ac Remove extra character. 2022-04-02 09:25:28 +02:00
James Cole
e453ee19a1 Update packages 2022-04-02 09:25:21 +02:00
James Cole
4786c97c0b Remove extra line. 2022-04-02 09:25:14 +02:00
James Cole
b5d4e82f45 Fix https://github.com/firefly-iii/firefly-iii/issues/5949 2022-04-01 07:37:45 +02:00
James Cole
c0072625c6 Merge branch 'main' into develop 2022-03-31 06:22:16 +02:00
James Cole
8c2455e8dd Update its_you_not_me.md 2022-03-31 04:21:50 +00:00
James Cole
55c82b2a0f Update support.md 2022-03-31 04:16:47 +00:00
James Cole
3120e29940 Update packages. 2022-03-30 20:09:19 +02:00
James Cole
1211a5c878 Remove log entry. 2022-03-30 06:58:41 +02:00
James Cole
8f98be32f9 Fix various sonatype issues. 2022-03-30 06:54:59 +02:00
James Cole
65764199fe Merge branch 'main' into develop 2022-03-30 06:35:35 +02:00
James Cole
9ce39f5724 Merge pull request #5946 from firefly-iii/dependabot/composer/guzzlehttp/psr7-2.2.1
Bump guzzlehttp/psr7 from 2.1.0 to 2.2.1
2022-03-30 06:34:49 +02:00
James Cole
59922e6c2e Expanding the account overview but still a bit stuck on the delete option. 2022-03-30 06:34:37 +02:00
dependabot[bot]
cb62469a80 Bump guzzlehttp/psr7 from 2.1.0 to 2.2.1
Bumps [guzzlehttp/psr7](https://github.com/guzzle/psr7) from 2.1.0 to 2.2.1.
- [Release notes](https://github.com/guzzle/psr7/releases)
- [Changelog](https://github.com/guzzle/psr7/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/psr7/compare/2.1.0...2.2.1)

---
updated-dependencies:
- dependency-name: guzzlehttp/psr7
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-29 22:18:38 +00:00
James Cole
3df8c4ff75 Replace deprecated method 2022-03-29 17:01:05 +02:00
James Cole
cf4c1d8089 Update translations. 2022-03-29 16:42:26 +02:00
James Cole
88539497bf Rename variable. 2022-03-29 16:42:10 +02:00
James Cole
123693096c Reformat various code. 2022-03-29 15:10:05 +02:00
James Cole
60786461a9 Reformat various code. 2022-03-29 15:01:48 +02:00
James Cole
452b6d0e1b Reformat various code. 2022-03-29 15:01:12 +02:00
James Cole
d04efb8325 Reformat various code. 2022-03-29 15:00:29 +02:00
James Cole
d1a09ff33b Reformat various code. 2022-03-29 14:59:58 +02:00
James Cole
29bed2547c Reformat various code. 2022-03-29 14:58:06 +02:00
James Cole
1209c4e76a Reformat various code. 2022-03-29 14:56:27 +02:00
James Cole
9cdaf7076a Add copyright statements 2022-03-29 14:55:51 +02:00
James Cole
2a1738cbe1 Update translations. 2022-03-29 14:53:44 +02:00
James Cole
09bd0b572a Make email messages Markdown. 2022-03-29 12:45:48 +02:00
James Cole
9c19a08b17 Defaul empty stateful domains. 2022-03-28 19:54:44 +02:00
James Cole
37f05338f7 First new translations. 2022-03-28 18:59:07 +02:00
James Cole
a72af79fab Fix type error 2022-03-28 12:32:39 +02:00
James Cole
2dfd230918 Merge branch 'develop' into 5.7.0 2022-03-28 12:28:20 +02:00
James Cole
409c24d45a Merge branch 'main' into develop 2022-03-28 12:27:45 +02:00
James Cole
35e187be77 Update packages. 2022-03-28 12:27:15 +02:00
James Cole
df78ef1c78 Merge pull request #5939 from firefly-iii/dependabot/npm_and_yarn/minimist-1.2.6
Bump minimist from 1.2.5 to 1.2.6
2022-03-28 12:27:08 +02:00
James Cole
d978838c84 Merge branch 'develop' into 5.7.0
# Conflicts:
#	composer.lock
2022-03-28 12:26:38 +02:00
dependabot[bot]
3320e06f81 Bump minimist from 1.2.5 to 1.2.6
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-28 10:26:33 +00:00
James Cole
ab50a6518b Merge branch 'main' into develop 2022-03-28 12:26:09 +02:00
James Cole
e1155328b8 Merge pull request #5938 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.3.4
Bump doctrine/dbal from 3.3.3 to 3.3.4
2022-03-28 12:25:25 +02:00
James Cole
daa6ddc39f Merge pull request #5937 from firefly-iii/dependabot/composer/develop/ramsey/uuid-4.3.1
Bump ramsey/uuid from 4.2.3 to 4.3.1
2022-03-28 12:25:13 +02:00
James Cole
3b1ffc87bc Merge pull request #5928 from firefly-iii/dependabot/npm_and_yarn/frontend/node-forge-1.3.0
Bump node-forge from 1.2.1 to 1.3.0 in /frontend
2022-03-28 12:24:47 +02:00
James Cole
94be254367 Merge pull request #5927 from firefly-iii/dependabot/npm_and_yarn/node-forge-1.3.0
Bump node-forge from 1.2.1 to 1.3.0
2022-03-28 12:24:37 +02:00
James Cole
abb1095cef Fix summary and dates, also fix #5770 2022-03-28 12:24:16 +02:00
James Cole
f2849c8058 New cron job for bills. 2022-03-28 12:23:46 +02:00
James Cole
e5a08d2cf1 Search in attachment file names and attachments notes. 2022-03-28 07:54:52 +02:00
dependabot[bot]
46e01475fc Bump doctrine/dbal from 3.3.3 to 3.3.4
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.3.3...3.3.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>
2022-03-28 03:00:49 +00:00
dependabot[bot]
89c1a2d912 Bump ramsey/uuid from 4.2.3 to 4.3.1
Bumps [ramsey/uuid](https://github.com/ramsey/uuid) from 4.2.3 to 4.3.1.
- [Release notes](https://github.com/ramsey/uuid/releases)
- [Changelog](https://github.com/ramsey/uuid/blob/4.x/CHANGELOG.md)
- [Commits](https://github.com/ramsey/uuid/compare/4.2.3...4.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-28 03:00:43 +00:00
James Cole
2be7813a67 Replace deprecated function. 2022-03-27 20:33:25 +02:00
James Cole
cbf14f541c Replace deprecated method. 2022-03-27 20:24:13 +02:00
James Cole
8ee4c2ea11 Piggies can have no target amount. 2022-03-27 18:30:46 +02:00
James Cole
980120f1bd Update search. 2022-03-27 16:03:50 +02:00
James Cole
679e72e5e2 Make it possible to search by interest date. 2022-03-27 08:48:30 +02:00
James Cole
ff7f4e5bba Merge branch 'develop' into 5.7.0 2022-03-27 06:54:15 +02:00
James Cole
582c6676c6 Rebuild and update. 2022-03-26 18:15:05 +01:00
James Cole
8002610234 Fix amounts with "e" in them. 2022-03-26 18:13:02 +01:00
dependabot[bot]
3ba81c6254 Bump node-forge from 1.2.1 to 1.3.0 in /frontend
Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/digitalbazaar/forge/releases)
- [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md)
- [Commits](https://github.com/digitalbazaar/forge/compare/v1.2.1...v1.3.0)

---
updated-dependencies:
- dependency-name: node-forge
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-26 04:34:08 +00:00
dependabot[bot]
dc16a1a430 Bump node-forge from 1.2.1 to 1.3.0
Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/digitalbazaar/forge/releases)
- [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md)
- [Commits](https://github.com/digitalbazaar/forge/compare/v1.2.1...v1.3.0)

---
updated-dependencies:
- dependency-name: node-forge
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-26 00:00:16 +00:00
James Cole
2f50fb38b0 New search opts 2022-03-24 19:34:32 +01:00
James Cole
aca008c911 Expand query search. 2022-03-21 06:31:38 +01:00
James Cole
ad0dcc2cf4 Merge branch 'develop' into 5.7.0 2022-03-21 06:25:00 +01:00
James Cole
be1d5591c4 Continue work on search 2022-03-21 06:24:40 +01:00
James Cole
bb57015004 Merge pull request #5919 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.12
Bump postcss from 8.4.8 to 8.4.12
2022-03-21 05:15:41 +00:00
James Cole
96f7047989 Merge pull request #5918 from firefly-iii/dependabot/composer/develop/guzzlehttp/guzzle-7.4.2
Bump guzzlehttp/guzzle from 7.4.1 to 7.4.2
2022-03-21 05:15:34 +00:00
dependabot[bot]
25e6114948 Bump postcss from 8.4.8 to 8.4.12
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.8 to 8.4.12.
- [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.4.8...8.4.12)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-21 03:01:44 +00:00
dependabot[bot]
0ac4a42351 Bump guzzlehttp/guzzle from 7.4.1 to 7.4.2
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.1 to 7.4.2.
- [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.4.1...7.4.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-21 03:00:35 +00:00
James Cole
02687dfe53 Expand search 2022-03-20 17:11:33 +01:00
James Cole
ba10aa5ca5 Move search operators to dedicated file and add lots of new ones. 2022-03-20 07:42:39 +01:00
James Cole
c000e090fe Add environment variable for https://github.com/firefly-iii/firefly-iii/issues/5648 2022-03-19 17:11:12 +01:00
James Cole
9c0893c093 Update version 2022-03-19 11:40:06 +01:00
James Cole
1e1aa28ab2 Add notes to budget https://github.com/firefly-iii/firefly-iii/issues/5373 2022-03-19 11:38:02 +01:00
James Cole
52a5995bd1 Remove LDAP support. 2022-03-19 11:19:58 +01:00
James Cole
5ca0a9f75a Update packages and various code for laravel 9 2022-03-19 08:10:42 +01:00
James Cole
45d99aa456 Merge branch 'develop' into 5.7.0
# Conflicts:
#	composer.json
#	composer.lock
2022-03-19 07:58:06 +01:00
James Cole
39eeea9c3c Fix https://github.com/firefly-iii/firefly-iii/issues/5882 2022-03-19 07:56:41 +01:00
James Cole
55a6cc5cd4 Fix https://github.com/firefly-iii/firefly-iii/issues/5852 2022-03-19 07:34:09 +01:00
James Cole
e3ecfdfac6 Add debug info 2022-03-19 07:14:20 +01:00
James Cole
3ddbb282d7 refer to another authentication guard. 2022-03-19 06:54:48 +01:00
James Cole
346478622b Fix link to docs. 2022-03-17 19:36:13 +01:00
James Cole
fcb9e76c17 Fix https://github.com/firefly-iii/firefly-iii/issues/5903 2022-03-17 16:44:24 +01:00
James Cole
bbcd86eab5 Merge pull request #5897 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.19
Bump phpunit/phpunit from 9.5.17 to 9.5.19
2022-03-15 18:10:04 +00:00
James Cole
24a6f5f36c Merge pull request #5896 from firefly-iii/dependabot/composer/develop/league/fractal-0.20
Bump league/fractal from 0.19.2 to 0.20
2022-03-15 18:09:52 +00:00
James Cole
6e18b8056d Merge pull request #5898 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.3.3
Bump doctrine/dbal from 3.3.2 to 3.3.3
2022-03-15 18:09:41 +00:00
dependabot[bot]
1e5137e5db Bump phpunit/phpunit from 9.5.17 to 9.5.19
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.17 to 9.5.19.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.17...9.5.19)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-15 18:04:00 +00:00
dependabot[bot]
78342537a0 Bump league/fractal from 0.19.2 to 0.20
Bumps [league/fractal](https://github.com/thephpleague/fractal) from 0.19.2 to 0.20.
- [Release notes](https://github.com/thephpleague/fractal/releases)
- [Changelog](https://github.com/thephpleague/fractal/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/fractal/compare/0.19.2...0.20)

---
updated-dependencies:
- dependency-name: league/fractal
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-15 18:03:25 +00:00
dependabot[bot]
b20e736f41 Bump doctrine/dbal from 3.3.2 to 3.3.3
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.3.2...3.3.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-15 18:03:15 +00:00
James Cole
df65f08dec Merge pull request #5888 from firefly-iii/dependabot/composer/develop/bacon/bacon-qr-code-2.0.7
Bump bacon/bacon-qr-code from 2.0.6 to 2.0.7
2022-03-15 18:03:11 +00:00
James Cole
03b6f6fcb1 Merge pull request #5889 from firefly-iii/dependabot/composer/develop/laravel/passport-10.3.3
Bump laravel/passport from 10.3.2 to 10.3.3
2022-03-15 18:02:49 +00:00
dependabot[bot]
5c30981e76 Bump laravel/passport from 10.3.2 to 10.3.3
Bumps [laravel/passport](https://github.com/laravel/passport) from 10.3.2 to 10.3.3.
- [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.3.2...v10.3.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-15 18:02:42 +00:00
dependabot[bot]
0b2ca03848 Bump bacon/bacon-qr-code from 2.0.6 to 2.0.7
Bumps [bacon/bacon-qr-code](https://github.com/Bacon/BaconQrCode) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/Bacon/BaconQrCode/releases)
- [Changelog](https://github.com/Bacon/BaconQrCode/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Bacon/BaconQrCode/compare/2.0.6...2.0.7)

---
updated-dependencies:
- dependency-name: bacon/bacon-qr-code
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-15 18:02:37 +00:00
James Cole
70041e713e Merge pull request #5890 from firefly-iii/dependabot/composer/develop/laravel/framework-8.83.4
Bump laravel/framework from 8.83.3 to 8.83.4
2022-03-15 18:02:23 +00:00
James Cole
31625cad4b Merge pull request #5891 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.18
Bump phpunit/phpunit from 9.5.17 to 9.5.18
2022-03-15 18:02:09 +00:00
James Cole
8663c877af Merge pull request #5892 from firefly-iii/dependabot/composer/develop/rcrowe/twigbridge-0.14.0
Bump rcrowe/twigbridge from 0.13.1 to 0.14.0
2022-03-15 18:01:53 +00:00
James Cole
f76ce602ce Merge pull request #5894 from firefly-iii/dependabot/npm_and_yarn/develop/axios-0.26.1
Bump axios from 0.26.0 to 0.26.1
2022-03-15 18:01:22 +00:00
dependabot[bot]
32d1554fbe Bump axios from 0.26.0 to 0.26.1
Bumps [axios](https://github.com/axios/axios) from 0.26.0 to 0.26.1.
- [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.26.0...v0.26.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-14 03:02:11 +00:00
dependabot[bot]
7c28b47f91 Bump rcrowe/twigbridge from 0.13.1 to 0.14.0
Bumps [rcrowe/twigbridge](https://github.com/rcrowe/TwigBridge) from 0.13.1 to 0.14.0.
- [Release notes](https://github.com/rcrowe/TwigBridge/releases)
- [Changelog](https://github.com/rcrowe/TwigBridge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rcrowe/TwigBridge/compare/v0.13.1...v0.14.0)

---
updated-dependencies:
- dependency-name: rcrowe/twigbridge
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-14 03:00:58 +00:00
dependabot[bot]
ff249a4ee6 Bump phpunit/phpunit from 9.5.17 to 9.5.18
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.17 to 9.5.18.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.17...9.5.18)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-14 03:00:51 +00:00
dependabot[bot]
a5c75e6abe Bump laravel/framework from 8.83.3 to 8.83.4
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.83.3 to 8.83.4.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v8.83.3...v8.83.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-14 03:00:46 +00:00
James Cole
b8a8ddf23e Update translations 2022-03-10 18:00:10 +01:00
James Cole
43c52daf6b Clean up debug page. 2022-03-10 17:59:30 +01:00
James Cole
f0265b9fda Fix https://github.com/firefly-iii/firefly-iii/issues/5870 2022-03-10 17:58:43 +01:00
James Cole
07813fa858 Possible fix for #5869 2022-03-10 17:57:43 +01:00
James Cole
ca7c86a057 Merge pull request #5858 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.8
Bump postcss from 8.4.7 to 8.4.8
2022-03-07 04:46:39 +00:00
James Cole
c59ccb1077 Merge pull request #5856 from firefly-iii/dependabot/composer/develop/laravel/framework-8.83.3
Bump laravel/framework from 8.83.2 to 8.83.3
2022-03-07 04:46:10 +00:00
James Cole
2ab45ac5d4 Merge pull request #5855 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.17
Bump phpunit/phpunit from 9.5.16 to 9.5.17
2022-03-07 04:46:00 +00:00
James Cole
ae6b177a08 Merge pull request #5854 from firefly-iii/dependabot/composer/develop/barryvdh/laravel-ide-helper-2.12.3
Bump barryvdh/laravel-ide-helper from 2.12.2 to 2.12.3
2022-03-07 04:45:48 +00:00
dependabot[bot]
50806ace32 Bump postcss from 8.4.7 to 8.4.8
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.7 to 8.4.8.
- [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.4.7...8.4.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-07 03:02:16 +00:00
dependabot[bot]
efb0dc42ff Bump laravel/framework from 8.83.2 to 8.83.3
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.83.2 to 8.83.3.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v8.83.2...v8.83.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-07 03:00:54 +00:00
dependabot[bot]
2fbeef95f1 Bump phpunit/phpunit from 9.5.16 to 9.5.17
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.16 to 9.5.17.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.16...9.5.17)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-07 03:00:45 +00:00
dependabot[bot]
f02d524e82 Bump barryvdh/laravel-ide-helper from 2.12.2 to 2.12.3
Bumps [barryvdh/laravel-ide-helper](https://github.com/barryvdh/laravel-ide-helper) from 2.12.2 to 2.12.3.
- [Release notes](https://github.com/barryvdh/laravel-ide-helper/releases)
- [Changelog](https://github.com/barryvdh/laravel-ide-helper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/barryvdh/laravel-ide-helper/compare/v2.12.2...v2.12.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-07 03:00:40 +00:00
James Cole
6479fbabed Catch account 2022-03-06 20:08:55 +01:00
James Cole
059bf32563 Include headers in error message. 2022-03-06 16:03:52 +01:00
James Cole
2f55499f7d Fix call. 2022-03-06 15:47:11 +01:00
James Cole
9c8bcd4f4c Merge branch 'main' into develop 2022-03-06 11:44:07 +01:00
James Cole
2715a181e3 Add debug 2022-03-06 11:43:25 +01:00
James Cole
b3c831d596 Merge pull request #5831 from firefly-iii/dependabot/npm_and_yarn/frontend/nanoid-3.3.1
Bump nanoid from 3.1.30 to 3.3.1 in /frontend
2022-03-04 04:44:54 +00:00
James Cole
274885c8a6 Merge pull request #5832 from firefly-iii/dependabot/npm_and_yarn/frontend/follow-redirects-1.14.9
Bump follow-redirects from 1.14.6 to 1.14.9 in /frontend
2022-03-04 04:44:41 +00:00
James Cole
d6e5f71d50 Clean up destroy routine 2022-02-28 17:06:43 +01:00
James Cole
b9536dfe4e Clean up destroy routine 2022-02-28 17:06:01 +01:00
James Cole
22a6e34279 Fix #5810 2022-02-28 09:11:08 +01:00
James Cole
b1a68b087c Merge tag '5.6.16' into develop
5.6.16
2022-02-28 09:01:01 +01:00
James Cole
ef8f9672af Merge branch 'release/5.6.16' 2022-02-28 09:00:56 +01:00
James Cole
b696b09f92 New meta files for release. 2022-02-28 09:00:33 +01:00
James Cole
9892e70028 Rename file. 2022-02-28 08:53:12 +01:00
James Cole
52f885df20 Rename migration so it doesn't clash. 2022-02-28 08:47:58 +01:00
James Cole
a58c6b0cec Do not search for empty number. 2022-02-28 08:31:58 +01:00
James Cole
b59723f276 Update meta files for 5.7.0 #5757 2022-02-28 07:48:58 +01:00
dependabot[bot]
20ab27b237 Bump nanoid from 3.1.30 to 3.3.1 in /frontend
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.3.1.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.3.1)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 06:11:28 +00:00
dependabot[bot]
046d7befca Bump follow-redirects from 1.14.6 to 1.14.9 in /frontend
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.9.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.9)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 06:11:28 +00:00
James Cole
a8cbbde8fc Merge branch 'release/5.6.15'
# Conflicts:
#	yarn.lock
2022-02-28 07:10:43 +01:00
James Cole
efb7d4275d Update meta files for new release. 2022-02-28 06:40:34 +01:00
mergify[bot]
d4f275e566 Merge pull request #5829 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.7
Bump postcss from 8.4.6 to 8.4.7
2022-02-28 03:02:15 +00:00
mergify[bot]
45db911011 Merge pull request #5828 from firefly-iii/dependabot/npm_and_yarn/develop/bootstrap-sass-3.4.2
Bump bootstrap-sass from 3.4.1 to 3.4.2
2022-02-28 03:02:11 +00:00
dependabot[bot]
50fccec438 Bump postcss from 8.4.6 to 8.4.7
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.6 to 8.4.7.
- [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.4.6...8.4.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 03:02:02 +00:00
dependabot[bot]
67e72e864c Bump bootstrap-sass from 3.4.1 to 3.4.2
Bumps [bootstrap-sass](https://github.com/twbs/bootstrap-sass) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/twbs/bootstrap-sass/releases)
- [Changelog](https://github.com/twbs/bootstrap-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-sass/compare/v3.4.1...v3.4.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 03:01:53 +00:00
mergify[bot]
dff4946b48 Merge pull request #5827 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.16
Bump phpunit/phpunit from 9.5.14 to 9.5.16
2022-02-28 03:01:31 +00:00
mergify[bot]
a38700f3fa Merge pull request #5826 from firefly-iii/dependabot/composer/develop/laravel/framework-8.83.2
Bump laravel/framework from 8.83.1 to 8.83.2
2022-02-28 03:01:26 +00:00
mergify[bot]
42c4441755 Merge pull request #5825 from firefly-iii/dependabot/composer/develop/league/commonmark-2.2.3
Bump league/commonmark from 2.2.2 to 2.2.3
2022-02-28 03:01:23 +00:00
mergify[bot]
1a4b646acd Merge pull request #5824 from firefly-iii/dependabot/composer/develop/laravel/sanctum-2.14.2
Bump laravel/sanctum from 2.14.1 to 2.14.2
2022-02-28 03:01:19 +00:00
mergify[bot]
5888dd38a2 Merge pull request #5823 from firefly-iii/dependabot/composer/develop/laravel/ui-3.4.5
Bump laravel/ui from 3.4.4 to 3.4.5
2022-02-28 03:01:15 +00:00
dependabot[bot]
f56d63c754 Bump phpunit/phpunit from 9.5.14 to 9.5.16
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.14 to 9.5.16.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.14...9.5.16)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 03:01:06 +00:00
dependabot[bot]
93db50383a Bump laravel/framework from 8.83.1 to 8.83.2
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.83.1 to 8.83.2.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v8.83.1...v8.83.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 03:01:02 +00:00
dependabot[bot]
4e9b5a71db Bump league/commonmark from 2.2.2 to 2.2.3
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.2/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.2.2...2.2.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 03:00:53 +00:00
dependabot[bot]
c85be915e6 Bump laravel/sanctum from 2.14.1 to 2.14.2
Bumps [laravel/sanctum](https://github.com/laravel/sanctum) from 2.14.1 to 2.14.2.
- [Release notes](https://github.com/laravel/sanctum/releases)
- [Changelog](https://github.com/laravel/sanctum/blob/2.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/sanctum/compare/v2.14.1...v2.14.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 03:00:47 +00:00
dependabot[bot]
1df4cdda42 Bump laravel/ui from 3.4.4 to 3.4.5
Bumps [laravel/ui](https://github.com/laravel/ui) from 3.4.4 to 3.4.5.
- [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.4.4...v3.4.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 03:00:41 +00:00
James Cole
cad03b04ae Initial build. 2022-02-27 10:16:34 +01:00
James Cole
cddfa3a8d2 Router and store 2022-02-27 10:14:26 +01:00
James Cole
3a49af94d0 Initial set of pages. 2022-02-27 10:14:08 +01:00
James Cole
e60320a9be Main layout 2022-02-27 10:13:55 +01:00
James Cole
0ffb3508c6 Support for languages 2022-02-27 10:13:43 +01:00
James Cole
d618f6d355 CSS 2022-02-27 10:13:31 +01:00
James Cole
e542a65bf3 Various components 2022-02-27 10:13:25 +01:00
James Cole
d1e1314dcf boot code 2022-02-27 10:13:16 +01:00
James Cole
9ebdb00579 API code 2022-02-27 10:13:07 +01:00
James Cole
95a7a0c90d Root source 2022-02-27 10:12:54 +01:00
James Cole
cabd3d60f0 Icons and other meta files. 2022-02-27 10:12:38 +01:00
James Cole
ab8ee8b72a Config files related to new layout. 2022-02-27 10:04:43 +01:00
James Cole
01f06a7e5b Meta files related to new layout. 2022-02-27 10:04:30 +01:00
James Cole
aa7d4a610b Add files and updates necessary to manage new layout. 2022-02-27 10:04:08 +01:00
James Cole
3f61b6d707 Clean up git ignore. 2022-02-27 09:52:08 +01:00
James Cole
9ae0cc5700 Clean up git ignore. 2022-02-27 09:51:54 +01:00
James Cole
6f65a73dd9 Add migration, update languages. 2022-02-26 11:24:16 +01:00
James Cole
fb676a9ad7 Update languages, config. 2022-02-26 07:55:36 +01:00
James Cole
dd66a1adf0 Fix https://github.com/firefly-iii/firefly-iii/issues/5810 2022-02-23 10:52:24 +01:00
James Cole
8c9bb3addb Tiny fixes in API 2022-02-23 06:33:27 +01:00
James Cole
472c1a0c37 Fix string conversion error. 2022-02-21 19:53:49 +01:00
James Cole
6fe8bf6c41 Update recurrence API 2022-02-21 16:48:26 +01:00
James Cole
342e6f2fef Fix https://github.com/firefly-iii/firefly-iii/issues/5806 2022-02-21 16:48:16 +01:00
mergify[bot]
23a8e3ef41 Merge pull request #5805 from firefly-iii/dependabot/npm_and_yarn/develop/vue-i18n-9.1.9
Bump vue-i18n from 8.27.0 to 9.1.9
2022-02-21 03:04:32 +00:00
dependabot[bot]
7c11b99469 Bump vue-i18n from 8.27.0 to 9.1.9
Bumps [vue-i18n](https://github.com/intlify/vue-i18n-next/tree/HEAD/packages/vue-i18n) from 8.27.0 to 9.1.9.
- [Release notes](https://github.com/intlify/vue-i18n-next/releases)
- [Changelog](https://github.com/intlify/vue-i18n-next/blob/v9.1.9/CHANGELOG.md)
- [Commits](https://github.com/intlify/vue-i18n-next/commits/v9.1.9/packages/vue-i18n)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-21 03:04:01 +00:00
mergify[bot]
e715162ed6 Merge pull request #5804 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.43
Bump laravel-mix from 6.0.42 to 6.0.43
2022-02-21 03:02:53 +00:00
mergify[bot]
368cc550cb Merge pull request #5803 from firefly-iii/dependabot/npm_and_yarn/develop/uiv-2.0.0
Bump uiv from 1.4.1 to 2.0.0
2022-02-21 03:02:49 +00:00
dependabot[bot]
60311341e0 Bump laravel-mix from 6.0.42 to 6.0.43
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.42 to 6.0.43.
- [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/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-21 03:02:27 +00:00
dependabot[bot]
749ebd9cc4 Bump uiv from 1.4.1 to 2.0.0
Bumps [uiv](https://github.com/uiv-lib/uiv) from 1.4.1 to 2.0.0.
- [Release notes](https://github.com/uiv-lib/uiv/releases)
- [Commits](https://github.com/uiv-lib/uiv/compare/v1.4.1...v2.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-21 03:02:16 +00:00
mergify[bot]
c699a14a35 Merge pull request #5802 from firefly-iii/dependabot/composer/develop/laravel/ui-3.4.4
Bump laravel/ui from 3.4.3 to 3.4.4
2022-02-21 03:01:30 +00:00
mergify[bot]
b05a2d385c Merge pull request #5801 from firefly-iii/dependabot/composer/develop/laravel/sanctum-2.14.1
Bump laravel/sanctum from 2.14.0 to 2.14.1
2022-02-21 03:01:27 +00:00
mergify[bot]
7c78d19e3a Merge pull request #5800 from firefly-iii/dependabot/composer/develop/laravel/framework-8.83.1
Bump laravel/framework from 8.83.0 to 8.83.1
2022-02-21 03:01:22 +00:00
mergify[bot]
8632307cb1 Merge pull request #5799 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.14
Bump phpunit/phpunit from 9.5.13 to 9.5.14
2022-02-21 03:01:19 +00:00
dependabot[bot]
5a18f3ce4a Bump laravel/ui from 3.4.3 to 3.4.4
Bumps [laravel/ui](https://github.com/laravel/ui) from 3.4.3 to 3.4.4.
- [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.4.3...v3.4.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-21 03:01:07 +00:00
dependabot[bot]
1258aff0b4 Bump laravel/sanctum from 2.14.0 to 2.14.1
Bumps [laravel/sanctum](https://github.com/laravel/sanctum) from 2.14.0 to 2.14.1.
- [Release notes](https://github.com/laravel/sanctum/releases)
- [Changelog](https://github.com/laravel/sanctum/blob/2.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/sanctum/compare/v2.14.0...v2.14.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-21 03:01:01 +00:00
dependabot[bot]
b0904c11a0 Bump laravel/framework from 8.83.0 to 8.83.1
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.83.0 to 8.83.1.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v8.83.0...v8.83.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-21 03:00:53 +00:00
dependabot[bot]
ca517eb4d9 Bump phpunit/phpunit from 9.5.13 to 9.5.14
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.13 to 9.5.14.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.13...9.5.14)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-21 03:00:45 +00:00
James Cole
c522dd2931 Update security.txt and associated key. 2022-02-19 07:28:13 +01:00
James Cole
7399edee2e Use dropIfExists 2022-02-19 05:20:42 +01:00
James Cole
ec93b7b5a0 Fix https://github.com/firefly-iii/firefly-iii/issues/5694 2022-02-17 19:22:58 +01:00
James Cole
280762fff3 Make sure fields are named properly 2022-02-17 19:03:54 +01:00
James Cole
b733fa2961 Update mandatory fields. 2022-02-17 19:03:41 +01:00
James Cole
5176f8bdc2 Add instructions. 2022-02-17 19:03:31 +01:00
mergify[bot]
91d96b2f0e Merge pull request #5784 from firefly-iii/dependabot/npm_and_yarn/develop/vue-3.2.31
Bump vue from 2.6.14 to 3.2.31
2022-02-14 03:03:30 +00:00
mergify[bot]
c3229e597c Merge pull request #5785 from firefly-iii/dependabot/npm_and_yarn/develop/axios-0.26.0
Bump axios from 0.25.0 to 0.26.0
2022-02-14 03:03:25 +00:00
dependabot[bot]
0f371bc5a9 Bump vue from 2.6.14 to 3.2.31
Bumps [vue](https://github.com/vuejs/core) from 2.6.14 to 3.2.31.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.31)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 03:03:16 +00:00
dependabot[bot]
297d5940ce Bump axios from 0.25.0 to 0.26.0
Bumps [axios](https://github.com/axios/axios) from 0.25.0 to 0.26.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.25.0...v0.26.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 03:02:52 +00:00
mergify[bot]
3b27ceaf53 Merge pull request #5783 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.42
Bump laravel-mix from 6.0.41 to 6.0.42
2022-02-14 03:02:44 +00:00
dependabot[bot]
d9142c1197 Bump laravel-mix from 6.0.41 to 6.0.42
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.41 to 6.0.42.
- [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/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 03:02:36 +00:00
mergify[bot]
9b3d1160d6 Merge pull request #5781 from firefly-iii/dependabot/npm_and_yarn/develop/vue-loader-17.0.0
Bump vue-loader from 15.9.8 to 17.0.0
2022-02-14 03:02:05 +00:00
dependabot[bot]
05d144c279 Bump vue-loader from 15.9.8 to 17.0.0
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.9.8 to 17.0.0.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/next/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits)

---
updated-dependencies:
- dependency-name: vue-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 03:02:01 +00:00
mergify[bot]
a318b66854 Merge pull request #5780 from firefly-iii/dependabot/composer/develop/laravel/ui-3.4.3
Bump laravel/ui from 3.4.2 to 3.4.3
2022-02-14 03:02:00 +00:00
mergify[bot]
431eef5e80 Merge pull request #5779 from firefly-iii/dependabot/composer/develop/barryvdh/laravel-debugbar-3.6.7
Bump barryvdh/laravel-debugbar from 3.6.6 to 3.6.7
2022-02-14 03:01:54 +00:00
dependabot[bot]
a8d20c5a01 Bump laravel/ui from 3.4.2 to 3.4.3
Bumps [laravel/ui](https://github.com/laravel/ui) from 3.4.2 to 3.4.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.4.2...v3.4.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>
2022-02-14 03:01:49 +00:00
mergify[bot]
676d75646e Merge pull request #5778 from firefly-iii/dependabot/composer/develop/barryvdh/laravel-ide-helper-2.12.2
Bump barryvdh/laravel-ide-helper from 2.12.1 to 2.12.2
2022-02-14 03:01:48 +00:00
mergify[bot]
6cbc438aa0 Merge pull request #5777 from firefly-iii/dependabot/composer/develop/laravel/framework-8.83.0
Bump laravel/framework from 8.82.0 to 8.83.0
2022-02-14 03:01:43 +00:00
dependabot[bot]
4a8913c98c Bump barryvdh/laravel-debugbar from 3.6.6 to 3.6.7
Bumps [barryvdh/laravel-debugbar](https://github.com/barryvdh/laravel-debugbar) from 3.6.6 to 3.6.7.
- [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.6...v3.6.7)

---
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>
2022-02-14 03:01:40 +00:00
mergify[bot]
9d1ecd845a Merge pull request #5776 from firefly-iii/dependabot/composer/develop/league/commonmark-2.2.2
Bump league/commonmark from 2.2.1 to 2.2.2
2022-02-14 03:01:39 +00:00
mergify[bot]
16987aca71 Merge pull request #5775 from firefly-iii/dependabot/composer/develop/rcrowe/twigbridge-0.13.1
Bump rcrowe/twigbridge from 0.13.0 to 0.13.1
2022-02-14 03:01:34 +00:00
mergify[bot]
445e8d7838 Merge pull request #5774 from firefly-iii/dependabot/composer/develop/laravelcollective/html-6.3.0
Bump laravelcollective/html from 6.2.1 to 6.3.0
2022-02-14 03:01:30 +00:00
dependabot[bot]
e521d5dcd0 Bump barryvdh/laravel-ide-helper from 2.12.1 to 2.12.2
Bumps [barryvdh/laravel-ide-helper](https://github.com/barryvdh/laravel-ide-helper) from 2.12.1 to 2.12.2.
- [Release notes](https://github.com/barryvdh/laravel-ide-helper/releases)
- [Changelog](https://github.com/barryvdh/laravel-ide-helper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/barryvdh/laravel-ide-helper/compare/v2.12.1...v2.12.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 03:01:29 +00:00
dependabot[bot]
a4ed85d33b Bump laravel/framework from 8.82.0 to 8.83.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.82.0 to 8.83.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v8.82.0...v8.83.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 03:01:23 +00:00
dependabot[bot]
65e8a7fed6 Bump league/commonmark from 2.2.1 to 2.2.2
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.2/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.2.1...2.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 03:01:09 +00:00
dependabot[bot]
1052a19262 Bump rcrowe/twigbridge from 0.13.0 to 0.13.1
Bumps [rcrowe/twigbridge](https://github.com/rcrowe/TwigBridge) from 0.13.0 to 0.13.1.
- [Release notes](https://github.com/rcrowe/TwigBridge/releases)
- [Changelog](https://github.com/rcrowe/TwigBridge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rcrowe/TwigBridge/compare/v0.13.0...v0.13.1)

---
updated-dependencies:
- dependency-name: rcrowe/twigbridge
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 03:01:04 +00:00
dependabot[bot]
a2b7a5f1f0 Bump laravelcollective/html from 6.2.1 to 6.3.0
Bumps [laravelcollective/html](https://github.com/LaravelCollective/html) from 6.2.1 to 6.3.0.
- [Release notes](https://github.com/LaravelCollective/html/releases)
- [Commits](https://github.com/LaravelCollective/html/compare/v6.2.1...v6.3.0)

---
updated-dependencies:
- dependency-name: laravelcollective/html
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 03:00:54 +00:00
James Cole
9f09872e0f Merge pull request #5765 from firefly-iii/dependabot/npm_and_yarn/follow-redirects-1.14.8
Bump follow-redirects from 1.14.7 to 1.14.8
2022-02-12 10:25:25 +00:00
dependabot[bot]
60ea033064 Bump follow-redirects from 1.14.7 to 1.14.8
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-12 10:05:59 +00:00
James Cole
1f3badb731 Update various routes 2022-02-09 17:31:30 +01:00
James Cole
eb0281e47f Fix code for #5493 as suggested by @tjmv 2022-02-09 11:14:00 +01:00
James Cole
7fc94415fb Update request must also have valid triggers and actions. 2022-02-09 07:50:36 +01:00
James Cole
8dd7d9ba26 Add validation for at least one active action. 2022-02-07 09:42:23 +01:00
James Cole
b9ac43e86d Fix https://github.com/firefly-iii/firefly-iii/issues/5724 2022-02-07 06:20:50 +01:00
James Cole
99a5f827ae Disable webhooks again 2022-02-07 06:19:35 +01:00
James Cole
fbdb7e099c Add new config key 2022-02-07 06:19:27 +01:00
James Cole
6080dabb56 Catch invalid setting 2022-02-07 06:19:19 +01:00
mergify[bot]
cf1540060a Merge pull request #5727 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.3.2
Bump doctrine/dbal from 3.3.1 to 3.3.2
2022-02-07 03:01:06 +00:00
dependabot[bot]
f96a9f652d Bump doctrine/dbal from 3.3.1 to 3.3.2
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.3.1...3.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-07 03:00:32 +00:00
James Cole
d969109e05 Clean up changelog. 2022-02-05 12:53:05 +01:00
James Cole
9a08cf6266 Merge branch 'release/5.6.14' 2022-02-05 09:10:45 +01:00
James Cole
10ea575cd8 Merge tag '5.6.14' into develop
5.6.14
2022-02-05 09:10:45 +01:00
James Cole
356876b2b2 Update meta files for new release. 2022-02-05 09:02:30 +01:00
James Cole
f5197ec2e0 Update meta files for new release. 2022-02-05 08:59:41 +01:00
James Cole
71af5db38e Update meta files for new release. 2022-02-05 08:59:24 +01:00
James Cole
45195e6496 Update version and language strings. 2022-02-05 08:53:58 +01:00
James Cole
a56a6df557 Final changes to bills 2022-02-05 08:53:45 +01:00
James Cole
d7e6a7b125 Fix https://github.com/firefly-iii/firefly-iii/issues/5670 2022-02-03 13:16:20 +01:00
James Cole
ddabfbc1ad Remove references to help 2022-02-03 10:32:20 +01:00
James Cole
944864ed25 Add daily bill period 2022-02-03 06:45:45 +01:00
James Cole
1c795e71d5 Fix https://github.com/firefly-iii/firefly-iii/issues/5695 2022-02-02 20:15:28 +01:00
James Cole
7d7e1366a6 Catch empty string. 2022-02-01 07:14:51 +01:00
mergify[bot]
158a7b1517 Merge pull request #5672 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.3.1
Bump doctrine/dbal from 3.3.0 to 3.3.1
2022-01-31 03:01:13 +00:00
mergify[bot]
03f19ec235 Merge pull request #5671 from firefly-iii/dependabot/composer/develop/bacon/bacon-qr-code-2.0.5
Bump bacon/bacon-qr-code from 2.0.4 to 2.0.5
2022-01-31 03:01:09 +00:00
dependabot[bot]
a82ec20833 Bump doctrine/dbal from 3.3.0 to 3.3.1
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.3.0...3.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-31 03:00:40 +00:00
dependabot[bot]
fb8e238319 Bump bacon/bacon-qr-code from 2.0.4 to 2.0.5
Bumps [bacon/bacon-qr-code](https://github.com/Bacon/BaconQrCode) from 2.0.4 to 2.0.5.
- [Release notes](https://github.com/Bacon/BaconQrCode/releases)
- [Changelog](https://github.com/Bacon/BaconQrCode/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Bacon/BaconQrCode/compare/2.0.4...2.0.5)

---
updated-dependencies:
- dependency-name: bacon/bacon-qr-code
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-31 03:00:35 +00:00
James Cole
ab943bf006 Fix https://github.com/firefly-iii/firefly-iii/issues/5666 2022-01-30 19:41:24 +01:00
James Cole
b15b58f099 Fix https://github.com/firefly-iii/firefly-iii/issues/5664 2022-01-30 17:37:44 +01:00
James Cole
fee8d962e3 Fix issues with accounts API https://github.com/firefly-iii/firefly-iii/discussions/5661 2022-01-30 17:17:01 +01:00
James Cole
4b1eaddfc2 Merge branch 'release/5.6.13' 2022-01-30 17:01:28 +01:00
James Cole
c0aca0e021 Merge tag '5.6.13' into develop
5.6.13
2022-01-30 17:01:28 +01:00
James Cole
4c3910dc59 Update meta files for new release. 2022-01-30 17:00:26 +01:00
James Cole
ec9e8cd672 Update version. 2022-01-30 16:57:23 +01:00
James Cole
5cbd93bba6 Fix #5663 2022-01-30 16:54:08 +01:00
James Cole
30fc0fbf54 Various new code. 2022-01-30 16:53:57 +01:00
James Cole
d26e847d54 Merge tag '5.6.12' into develop
5.6.12
2022-01-30 07:13:34 +01:00
James Cole
7c553c1f0b Merge branch 'release/5.6.12' 2022-01-30 07:13:33 +01:00
James Cole
eb63163ddf Update meta files for new release. 2022-01-30 07:12:48 +01:00
James Cole
6e4adc86b8 Add meta files for new release. 2022-01-30 07:12:02 +01:00
James Cole
b46398242f Fix template references. 2022-01-30 07:05:51 +01:00
James Cole
db071b1014 Remove v1 references. 2022-01-29 14:28:16 +01:00
James Cole
ebf6b50126 Restore error templates 2022-01-29 14:20:56 +01:00
James Cole
ebc498f0ff Restore API links 2022-01-29 14:19:24 +01:00
James Cole
ef4c34a31f Remove v1 references 2022-01-29 14:19:01 +01:00
James Cole
1d26c12771 Remove v1 references 2022-01-29 14:17:25 +01:00
James Cole
cb8b49fd7a Remove v1 references 2022-01-29 14:16:18 +01:00
James Cole
b0e6d12325 Remove old v1 views 2022-01-29 14:16:03 +01:00
James Cole
6da6a68e33 Move v1 views 2022-01-29 14:15:34 +01:00
James Cole
a12fd4a3ae Remove v2 views 2022-01-29 14:11:35 +01:00
James Cole
003d8ba02a Remove reference to a method no longer used. 2022-01-29 14:11:12 +01:00
James Cole
acb2a8697a Remove frontend source from repository. 2022-01-29 14:01:17 +01:00
James Cole
aff0e4a9df New endpoint for transactions without a budget. 2022-01-29 13:39:03 +01:00
James Cole
b7ba04dacf New endpoint for transactions without a budget. 2022-01-29 13:38:35 +01:00
James Cole
ee6c8786b2 Merge pull request #5654 from fedemic/link_to_contributing_doc
direct link to contributing docs in readme.md
2022-01-29 10:52:39 +00:00
Federico Micelli
4fc19b7eba restoring contributing guideline 2022-01-29 09:46:17 +01:00
James Cole
37964a375d Merge tag '5.6.11' into develop
5.6.11
2022-01-29 09:27:34 +01:00
James Cole
b8573d03a4 Merge branch 'release/5.6.11' 2022-01-29 09:27:33 +01:00
James Cole
b104914076 Update packages and meta files for new release. 2022-01-29 09:26:49 +01:00
James Cole
1d30b58685 Fix a source string. 2022-01-29 09:14:16 +01:00
Federico Micelli
326baa93a7 direct link to contributing docs in readme.md 2022-01-28 23:15:47 +01:00
James Cole
ab9f26f850 Update packages and meta files for new release. 2022-01-28 21:19:05 +01:00
James Cole
9a944175ac Merge branch 'main' into develop 2022-01-28 20:58:59 +01:00
James Cole
0bcc3240b7 Add support for DSN 2022-01-28 20:58:08 +01:00
James Cole
1bf3608142 Catch errors in transaction API. 2022-01-28 20:49:37 +01:00
James Cole
9dc971550c Merge pull request #5645 from firefly-iii/dependabot/npm_and_yarn/frontend/node-fetch-2.6.7
Bump node-fetch from 2.6.6 to 2.6.7 in /frontend
2022-01-27 09:22:50 +00:00
James Cole
33c52513a3 Merge branch 'main' into develop 2022-01-27 09:46:07 +01:00
mergify[bot]
2408ff11f6 Merge pull request #5620 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.29
Bump @vue/compiler-sfc from 3.2.27 to 3.2.29
2022-01-27 08:35:49 +00:00
dependabot[bot]
3d130e5d99 Bump @vue/compiler-sfc from 3.2.27 to 3.2.29
Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.2.27 to 3.2.29.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.29/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>
2022-01-27 08:35:30 +00:00
dependabot[bot]
bc0355c5b1 Bump node-fetch from 2.6.6 to 2.6.7 in /frontend
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-27 08:34:21 +00:00
James Cole
b90b13632e Merge pull request #5585 from firefly-iii/dependabot/npm_and_yarn/nanoid-3.2.0
Bump nanoid from 3.1.30 to 3.2.0
2022-01-27 08:33:46 +00:00
James Cole
bad57c907c Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2022-01-26 18:43:24 +01:00
James Cole
374793eb92 Add extra validation. 2022-01-26 18:43:14 +01:00
James Cole
8a6ae6105e Merge pull request #5631 from GeorgeHahn/dev/add-external-url-presence-filters
Attempt to add `external_url` filtering support
2022-01-26 18:37:26 +01:00
George Hahn
ecda8eebf2 Fix withoutExternalUrl query and add search modifiers
Co-authored-by: JC5 <james@firefly-iii.org>
2022-01-24 23:03:33 -07:00
mergify[bot]
f0a5257921 Merge pull request #5633 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.13
Bump phpunit/phpunit from 9.5.12 to 9.5.13
2022-01-25 05:04:00 +00:00
dependabot[bot]
860a4bdc0a Bump phpunit/phpunit from 9.5.12 to 9.5.13
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.12 to 9.5.13.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.12...9.5.13)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-25 05:03:56 +00:00
mergify[bot]
f6ddf72323 Merge pull request #5632 from firefly-iii/dependabot/composer/develop/barryvdh/laravel-ide-helper-2.12.1
Bump barryvdh/laravel-ide-helper from 2.12.0 to 2.12.1
2022-01-25 05:03:52 +00:00
dependabot[bot]
ec212bb98e Bump barryvdh/laravel-ide-helper from 2.12.0 to 2.12.1
Bumps [barryvdh/laravel-ide-helper](https://github.com/barryvdh/laravel-ide-helper) from 2.12.0 to 2.12.1.
- [Release notes](https://github.com/barryvdh/laravel-ide-helper/releases)
- [Changelog](https://github.com/barryvdh/laravel-ide-helper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/barryvdh/laravel-ide-helper/compare/v2.12.0...v2.12.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-25 05:03:47 +00:00
James Cole
fd7d37ac23 Merge branch 'main' into develop 2022-01-25 06:03:38 +01:00
James Cole
b4cd0d6bbc Update dependabot.yml 2022-01-25 06:03:12 +01:00
George Hahn
0a5908e4d8 Attempt to add external_url filtering support 2022-01-24 20:23:12 -07:00
James Cole
59f0631685 Add external url 2022-01-24 07:57:28 +01:00
James Cole
7718deb4a5 Fix missing external url field. 2022-01-24 07:50:33 +01:00
James Cole
75d52b7024 Catch https://github.com/firefly-iii/firefly-iii/issues/5610 2022-01-24 07:38:05 +01:00
James Cole
ecc72dd01b Code for https://github.com/firefly-iii/firefly-iii/issues/5610 2022-01-24 07:24:01 +01:00
mergify[bot]
6591512cf6 Merge pull request #5627 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/jquery-ui-1.13.1
Bump jquery-ui from 1.13.0 to 1.13.1 in /frontend
2022-01-24 03:06:07 +00:00
mergify[bot]
4a0e97e36a Merge pull request #5626 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.49.0
Bump sass from 1.48.0 to 1.49.0 in /frontend
2022-01-24 03:05:45 +00:00
mergify[bot]
f90b2d9410 Merge pull request #5621 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.67.0
Bump webpack from 5.66.0 to 5.67.0 in /frontend
2022-01-24 03:05:15 +00:00
mergify[bot]
582ba0ce5d Merge pull request #5624 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/vue-i18n-8.27.0
Bump vue-i18n from 8.26.8 to 8.27.0 in /frontend
2022-01-24 03:04:58 +00:00
mergify[bot]
ce411ab9b0 Merge pull request #5623 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.41
Bump laravel-mix from 6.0.39 to 6.0.41
2022-01-24 03:04:47 +00:00
dependabot[bot]
d90468db3f Bump jquery-ui from 1.13.0 to 1.13.1 in /frontend
Bumps [jquery-ui](https://github.com/jquery/jquery-ui) from 1.13.0 to 1.13.1.
- [Release notes](https://github.com/jquery/jquery-ui/releases)
- [Commits](https://github.com/jquery/jquery-ui/compare/1.13.0...1.13.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:03:55 +00:00
mergify[bot]
3a621e6ff7 Merge pull request #5622 from firefly-iii/dependabot/npm_and_yarn/develop/vue-i18n-8.27.0
Bump vue-i18n from 8.26.8 to 8.27.0
2022-01-24 03:03:46 +00:00
dependabot[bot]
a7ffe66547 Bump sass from 1.48.0 to 1.49.0 in /frontend
Bumps [sass](https://github.com/sass/dart-sass) from 1.48.0 to 1.49.0.
- [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.48.0...1.49.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:03:29 +00:00
dependabot[bot]
4a57f4d6dd Bump vue-i18n from 8.26.8 to 8.27.0 in /frontend
Bumps [vue-i18n](https://github.com/kazupon/vue-i18n) from 8.26.8 to 8.27.0.
- [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.8...v8.27.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:02:56 +00:00
dependabot[bot]
5b72ffa575 Bump laravel-mix from 6.0.39 to 6.0.41
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.39 to 6.0.41.
- [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/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:02:46 +00:00
mergify[bot]
04a9e2cec2 Merge pull request #5619 from firefly-iii/dependabot/npm_and_yarn/develop/axios-0.25.0
Bump axios from 0.24.0 to 0.25.0
2022-01-24 03:02:29 +00:00
dependabot[bot]
17022c1174 Bump vue-i18n from 8.26.8 to 8.27.0
Bumps [vue-i18n](https://github.com/kazupon/vue-i18n) from 8.26.8 to 8.27.0.
- [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.8...v8.27.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:02:26 +00:00
dependabot[bot]
59914a9d87 Bump webpack from 5.66.0 to 5.67.0 in /frontend
Bumps [webpack](https://github.com/webpack/webpack) from 5.66.0 to 5.67.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.66.0...v5.67.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:02:24 +00:00
dependabot[bot]
a7b9653de3 Bump axios from 0.24.0 to 0.25.0
Bumps [axios](https://github.com/axios/axios) from 0.24.0 to 0.25.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.24.0...v0.25.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:02:05 +00:00
mergify[bot]
c8dc065e24 Merge pull request #5618 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.3.0
Bump doctrine/dbal from 3.2.1 to 3.3.0
2022-01-24 03:01:47 +00:00
mergify[bot]
bac58ad0c2 Merge pull request #5617 from firefly-iii/dependabot/composer/develop/barryvdh/laravel-ide-helper-2.12.0
Bump barryvdh/laravel-ide-helper from 2.11.0 to 2.12.0
2022-01-24 03:01:41 +00:00
dependabot[bot]
6b2431b054 Bump doctrine/dbal from 3.2.1 to 3.3.0
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.2.1...3.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:01:40 +00:00
mergify[bot]
7e212ebd48 Merge pull request #5616 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.12
Bump phpunit/phpunit from 9.5.11 to 9.5.12
2022-01-24 03:01:36 +00:00
dependabot[bot]
b3223b90da Bump barryvdh/laravel-ide-helper from 2.11.0 to 2.12.0
Bumps [barryvdh/laravel-ide-helper](https://github.com/barryvdh/laravel-ide-helper) from 2.11.0 to 2.12.0.
- [Release notes](https://github.com/barryvdh/laravel-ide-helper/releases)
- [Changelog](https://github.com/barryvdh/laravel-ide-helper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/barryvdh/laravel-ide-helper/compare/v2.11.0...v2.12.0)

---
updated-dependencies:
- dependency-name: barryvdh/laravel-ide-helper
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:01:31 +00:00
mergify[bot]
6ea773cdd7 Merge pull request #5615 from firefly-iii/dependabot/composer/develop/mockery/mockery-1.5.0
Bump mockery/mockery from 1.4.4 to 1.5.0
2022-01-24 03:01:30 +00:00
mergify[bot]
997cddcb5a Merge pull request #5614 from firefly-iii/dependabot/composer/develop/laravel/framework-8.80.0
Bump laravel/framework from 8.79.0 to 8.80.0
2022-01-24 03:01:26 +00:00
dependabot[bot]
8228f76f5d Bump phpunit/phpunit from 9.5.11 to 9.5.12
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.11 to 9.5.12.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.11...9.5.12)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:01:20 +00:00
mergify[bot]
b35ee9ccf4 Merge pull request #5613 from firefly-iii/dependabot/composer/develop/fakerphp/faker-1.18.0
Bump fakerphp/faker from 1.17.0 to 1.18.0
2022-01-24 03:01:18 +00:00
mergify[bot]
16942af52b Merge pull request #5612 from firefly-iii/dependabot/composer/develop/league/commonmark-2.2.0
Bump league/commonmark from 2.1.1 to 2.2.0
2022-01-24 03:01:13 +00:00
dependabot[bot]
b190ce3538 Bump mockery/mockery from 1.4.4 to 1.5.0
Bumps [mockery/mockery](https://github.com/mockery/mockery) from 1.4.4 to 1.5.0.
- [Release notes](https://github.com/mockery/mockery/releases)
- [Changelog](https://github.com/mockery/mockery/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mockery/mockery/compare/1.4.4...1.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:01:11 +00:00
dependabot[bot]
9027915280 Bump laravel/framework from 8.79.0 to 8.80.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.79.0 to 8.80.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.79.0...v8.80.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:01:02 +00:00
dependabot[bot]
19aaaef37e Bump fakerphp/faker from 1.17.0 to 1.18.0
Bumps [fakerphp/faker](https://github.com/FakerPHP/Faker) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/FakerPHP/Faker/releases)
- [Changelog](https://github.com/FakerPHP/Faker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/FakerPHP/Faker/compare/v1.17.0...v1.18.0)

---
updated-dependencies:
- dependency-name: fakerphp/faker
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:00:45 +00:00
dependabot[bot]
a3bb90e160 Bump league/commonmark from 2.1.1 to 2.2.0
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.2/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.1.1...2.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 03:00:37 +00:00
dependabot[bot]
06bae0dd8b Bump nanoid from 3.1.30 to 3.2.0
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-22 02:22:18 +00:00
James Cole
7d48ab5671 Merge branch 'main' into develop 2022-01-20 18:21:40 +01:00
James Cole
8588405aa1 New translations. 2022-01-20 18:20:12 +01:00
James Cole
8238ae7d0a Error handling for https://github.com/firefly-iii/firefly-iii/issues/5575 2022-01-20 06:23:42 +01:00
James Cole
78ebec01a4 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2022-01-20 06:11:09 +01:00
James Cole
ac1137d7e8 More logging for validation. 2022-01-20 06:11:02 +01:00
James Cole
212e9b833b Update its_you_not_me.md 2022-01-19 09:57:59 +01:00
James Cole
52ad0ba352 Add new relic thing for the demo site. 2022-01-18 19:16:12 +01:00
mergify[bot]
318d86a1f5 Merge pull request #5556 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.66.0
Bump webpack from 5.65.0 to 5.66.0 in /frontend
2022-01-17 03:03:33 +00:00
mergify[bot]
fbffba4c21 Merge pull request #5555 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.48.0
Bump sass from 1.47.0 to 1.48.0 in /frontend
2022-01-17 03:03:29 +00:00
mergify[bot]
c7f4e5423a Merge pull request #5551 from firefly-iii/dependabot/composer/develop/spatie/data-transfer-object-3.7.3
Bump spatie/data-transfer-object from 3.7.2 to 3.7.3
2022-01-17 03:03:24 +00:00
dependabot[bot]
5f282a9b7d Bump webpack from 5.65.0 to 5.66.0 in /frontend
Bumps [webpack](https://github.com/webpack/webpack) from 5.65.0 to 5.66.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.65.0...v5.66.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-17 03:03:21 +00:00
dependabot[bot]
7539ee3560 Bump sass from 1.47.0 to 1.48.0 in /frontend
Bumps [sass](https://github.com/sass/dart-sass) from 1.47.0 to 1.48.0.
- [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.47.0...1.48.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-17 03:03:08 +00:00
dependabot[bot]
032389c6c0 Bump spatie/data-transfer-object from 3.7.2 to 3.7.3
Bumps [spatie/data-transfer-object](https://github.com/spatie/data-transfer-object) from 3.7.2 to 3.7.3.
- [Release notes](https://github.com/spatie/data-transfer-object/releases)
- [Changelog](https://github.com/spatie/data-transfer-object/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/data-transfer-object/compare/3.7.2...3.7.3)

---
updated-dependencies:
- dependency-name: spatie/data-transfer-object
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-17 03:03:02 +00:00
mergify[bot]
788ac54f86 Merge pull request #5550 from firefly-iii/dependabot/composer/develop/laravel/sanctum-2.14.0
Bump laravel/sanctum from 2.13.0 to 2.14.0
2022-01-17 03:02:33 +00:00
mergify[bot]
4e0fbc8532 Merge pull request #5553 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.27
Bump @vue/compiler-sfc from 3.2.26 to 3.2.27
2022-01-17 03:02:25 +00:00
dependabot[bot]
5764d9756c Bump laravel/sanctum from 2.13.0 to 2.14.0
Bumps [laravel/sanctum](https://github.com/laravel/sanctum) from 2.13.0 to 2.14.0.
- [Release notes](https://github.com/laravel/sanctum/releases)
- [Changelog](https://github.com/laravel/sanctum/blob/2.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/sanctum/compare/v2.13.0...v2.14.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-17 03:02:05 +00:00
dependabot[bot]
85e79922ab Bump @vue/compiler-sfc from 3.2.26 to 3.2.27
Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.2.26 to 3.2.27.
- [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.27/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>
2022-01-17 03:01:53 +00:00
mergify[bot]
6f3826a6ff Merge pull request #5552 from firefly-iii/dependabot/composer/develop/laravel/passport-10.3.0
Bump laravel/passport from 10.2.2 to 10.3.0
2022-01-17 03:01:43 +00:00
dependabot[bot]
c061b0b777 Bump laravel/passport from 10.2.2 to 10.3.0
Bumps [laravel/passport](https://github.com/laravel/passport) from 10.2.2 to 10.3.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.2.2...v10.3.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>
2022-01-17 03:01:37 +00:00
mergify[bot]
fc7bbfa8e2 Merge pull request #5549 from firefly-iii/dependabot/composer/develop/diglactic/laravel-breadcrumbs-7.1.1
Bump diglactic/laravel-breadcrumbs from 7.0.1 to 7.1.1
2022-01-17 03:01:32 +00:00
dependabot[bot]
0da20c7a1b Bump diglactic/laravel-breadcrumbs from 7.0.1 to 7.1.1
Bumps [diglactic/laravel-breadcrumbs](https://github.com/diglactic/laravel-breadcrumbs) from 7.0.1 to 7.1.1.
- [Release notes](https://github.com/diglactic/laravel-breadcrumbs/releases)
- [Commits](https://github.com/diglactic/laravel-breadcrumbs/compare/v7.0.1...v7.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-17 03:00:57 +00:00
James Cole
4e2d5fe166 Merge branch 'main' into develop 2022-01-14 05:44:26 +01:00
James Cole
70767678ba Fix https://github.com/firefly-iii/firefly-iii/discussions/5540 2022-01-14 05:44:09 +01:00
James Cole
7340e146f1 Merge pull request #5537 from firefly-iii/dependabot/npm_and_yarn/frontend/follow-redirects-1.14.7
Bump follow-redirects from 1.14.6 to 1.14.7 in /frontend
2022-01-13 13:59:11 +01:00
James Cole
583bc59d23 Merge pull request #5538 from firefly-iii/mergify/JC5/config-update
ci(Mergify): configuration update
2022-01-13 13:58:24 +01:00
James Cole
ff5b872fa3 ci(Mergify): configuration update
Signed-off-by: James Cole <james@firefly-iii.org>
2022-01-13 13:58:08 +01:00
dependabot[bot]
28517a8b78 Bump follow-redirects from 1.14.6 to 1.14.7 in /frontend
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-13 12:52:52 +00:00
James Cole
34138d1533 Merge pull request #5536 from firefly-iii/dependabot/npm_and_yarn/follow-redirects-1.14.7
Bump follow-redirects from 1.14.6 to 1.14.7
2022-01-13 13:52:19 +01:00
dependabot[bot]
ccf589f093 Bump follow-redirects from 1.14.6 to 1.14.7
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-13 12:50:28 +00:00
James Cole
3ee100e71e Fix https://github.com/firefly-iii/firefly-iii/issues/5422 2022-01-11 05:48:34 +01:00
James Cole
1e0547a02c Add message 2022-01-11 05:44:44 +01:00
James Cole
577e1f1b56 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2022-01-11 05:44:37 +01:00
James Cole
a7d25125a7 Remove old header 2022-01-11 05:44:27 +01:00
mergify[bot]
dbb09ef5d1 Merge pull request #5514 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.47.0
Bump sass from 1.45.2 to 1.47.0 in /frontend
2022-01-10 03:03:49 +00:00
dependabot[bot]
d840c94a29 Bump sass from 1.45.2 to 1.47.0 in /frontend
Bumps [sass](https://github.com/sass/dart-sass) from 1.45.2 to 1.47.0.
- [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.45.2...1.47.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-10 03:03:15 +00:00
James Cole
114980480e Merge branch 'release/5.6.10' 2022-01-09 08:30:18 +01:00
James Cole
95b1a821f3 Merge tag '5.6.10' into develop
5.6.10
2022-01-09 08:30:18 +01:00
James Cole
206397cc81 Add notice 2022-01-09 08:19:28 +01:00
James Cole
a6b1a6d0c2 Update packages. 2022-01-09 08:05:07 +01:00
James Cole
aba39a3b27 Update meta files for new release. 2022-01-09 08:02:02 +01:00
James Cole
b5f095dd91 Fix #5510 2022-01-09 07:15:30 +01:00
James Cole
a9e92d4fa6 Fix nullpointer. 2022-01-07 19:24:14 +01:00
James Cole
867a2eacd3 Add trim() 2022-01-07 16:17:38 +01:00
James Cole
accecf6a76 Fix #5503 2022-01-07 14:35:22 +01:00
James Cole
f12b3bc9b7 Add MXN 2022-01-07 07:23:10 +01:00
James Cole
a2ed755c9c Remove logging 2022-01-04 06:32:02 +01:00
James Cole
235639b728 Remove popup 2022-01-04 06:24:33 +01:00
James Cole
b1d5882fa6 Split IBAN display 2022-01-03 06:35:10 +01:00
James Cole
39e632d950 Empty opening balance means field should be empty. 2022-01-03 06:35:00 +01:00
James Cole
87ced85657 Make sure IBAN's have their spaces removed. 2022-01-03 06:34:42 +01:00
mergify[bot]
0c53a8db66 Merge pull request #5474 from firefly-iii/dependabot/composer/develop/league/commonmark-2.1.1
Bump league/commonmark from 2.1.0 to 2.1.1
2022-01-03 03:01:16 +00:00
dependabot[bot]
84dcbaf0e7 Bump league/commonmark from 2.1.0 to 2.1.1
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.1/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.1.0...2.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-03 03:00:43 +00:00
James Cole
047440eaea Remove empty headers 2022-01-02 09:23:41 +01:00
James Cole
217ad0234b Merge tag '5.6.9' into develop
5.6.9
2022-01-02 08:07:57 +01:00
James Cole
9795f46bea Merge branch 'release/5.6.9' 2022-01-02 08:07:56 +01:00
James Cole
10bc0098b9 Merge branch 'main' into develop 2022-01-02 08:07:25 +01:00
James Cole
7a900fd3d9 Update changelog. 2022-01-02 08:05:18 +01:00
James Cole
45cfb4e565 Make sure error is still visible. 2022-01-02 08:01:59 +01:00
James Cole
5320480767 Rebuild frontend(s) 2022-01-02 07:55:28 +01:00
James Cole
3e18e984fa Update translations 2022-01-02 07:52:12 +01:00
James Cole
fce759e98f Update meta files for new release. 2022-01-02 07:49:40 +01:00
James Cole
f4439778f1 Update packages to fix https://github.com/firefly-iii/firefly-iii/issues/5464 2022-01-02 07:37:53 +01:00
James Cole
11176fc212 Rebuild stuff and add warning. 2022-01-02 07:22:04 +01:00
James Cole
ffc71da2eb Fix https://github.com/firefly-iii/firefly-iii/discussions/5458 2021-12-31 06:13:05 +01:00
James Cole
246fa0d6e4 Fix date issue. 2021-12-28 20:42:50 +01:00
James Cole
3444146da3 Lock twigbrdige 2021-12-28 20:11:03 +01:00
James Cole
5c4a482f64 Update bug.yml 2021-12-28 08:54:04 +01:00
James Cole
01f84ea11d Update its_you_not_me.md 2021-12-27 11:29:03 +01:00
mergify[bot]
08402babbd Merge pull request #5435 from firefly-iii/dependabot/composer/develop/rcrowe/twigbridge-0.13.0
Bump rcrowe/twigbridge from 0.12.3 to 0.13.0
2021-12-27 03:04:47 +00:00
dependabot[bot]
7ef3dcbd23 Bump rcrowe/twigbridge from 0.12.3 to 0.13.0
Bumps [rcrowe/twigbridge](https://github.com/rcrowe/TwigBridge) from 0.12.3 to 0.13.0.
- [Release notes](https://github.com/rcrowe/TwigBridge/releases)
- [Changelog](https://github.com/rcrowe/TwigBridge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rcrowe/TwigBridge/compare/v0.12.3...v0.13.0)

---
updated-dependencies:
- dependency-name: rcrowe/twigbridge
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-27 03:04:16 +00:00
mergify[bot]
8836fa205b Merge pull request #5437 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.45.1
Bump sass from 1.45.0 to 1.45.1 in /frontend
2021-12-27 03:03:35 +00:00
mergify[bot]
f544a278c5 Merge pull request #5436 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/chart.js-3.7.0
Bump chart.js from 3.6.2 to 3.7.0 in /frontend
2021-12-27 03:03:31 +00:00
dependabot[bot]
4b8fd6adb9 Bump sass from 1.45.0 to 1.45.1 in /frontend
Bumps [sass](https://github.com/sass/dart-sass) from 1.45.0 to 1.45.1.
- [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.45.0...1.45.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-27 03:03:18 +00:00
dependabot[bot]
1ac8a9b4ac Bump chart.js from 3.6.2 to 3.7.0 in /frontend
Bumps [chart.js](https://github.com/chartjs/Chart.js) from 3.6.2 to 3.7.0.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](https://github.com/chartjs/Chart.js/compare/v3.6.2...v3.7.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-12-27 03:02:58 +00:00
mergify[bot]
08a8a69b34 Merge pull request #5434 from firefly-iii/dependabot/composer/develop/laravel/ui-3.4.1
Bump laravel/ui from 3.4.0 to 3.4.1
2021-12-27 03:01:31 +00:00
mergify[bot]
dbd668bda5 Merge pull request #5433 from firefly-iii/dependabot/composer/develop/laravel/framework-8.77.1
Bump laravel/framework from 8.76.2 to 8.77.1
2021-12-27 03:01:27 +00:00
dependabot[bot]
cc0760553b Bump laravel/ui from 3.4.0 to 3.4.1
Bumps [laravel/ui](https://github.com/laravel/ui) from 3.4.0 to 3.4.1.
- [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.4.0...v3.4.1)

---
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-12-27 03:01:24 +00:00
mergify[bot]
1142ff6b1f Merge pull request #5432 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.11
Bump phpunit/phpunit from 9.5.10 to 9.5.11
2021-12-27 03:01:23 +00:00
dependabot[bot]
927da5d742 Bump laravel/framework from 8.76.2 to 8.77.1
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.76.2 to 8.77.1.
- [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.76.2...v8.77.1)

---
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-12-27 03:01:09 +00:00
dependabot[bot]
9a734e48fe Bump phpunit/phpunit from 9.5.10 to 9.5.11
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.10 to 9.5.11.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.10...9.5.11)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-27 03:00:50 +00:00
James Cole
345fe39b54 Merge branch 'main' into develop 2021-12-26 11:01:50 +01:00
James Cole
c7e9d62712 It's you, not me. 2021-12-26 11:01:40 +01:00
James Cole
5918095f11 Update its_you_not_me.md 2021-12-26 11:01:03 +01:00
James Cole
24612eb634 Create its_you_not_me.md 2021-12-26 10:52:05 +01:00
James Cole
f7125d6198 Add buildnr to debug form. 2021-12-24 10:51:08 +01:00
James Cole
47870cd50c Various changes. 2021-12-24 10:46:41 +01:00
James Cole
45fbf83971 Better catch for key restauration problems. 2021-12-21 16:35:28 +01:00
James Cole
6044cffef3 Merge branch 'release/5.6.8' 2021-12-19 08:48:02 +01:00
James Cole
4d933e1ef7 Merge tag '5.6.8' into develop
5.6.8
2021-12-19 08:48:02 +01:00
James Cole
181e088ad5 Meta files for new release. 2021-12-19 08:47:37 +01:00
James Cole
179b86c3ba Clean up various code. 2021-12-19 08:47:02 +01:00
James Cole
083c15b956 Merge branch 'release/5.6.7'
# Conflicts:
#	.github/mergify.yml
2021-12-19 08:19:05 +01:00
James Cole
7c780dd75c Remove logging 2021-12-19 07:16:20 +01:00
James Cole
d35d51c014 Update packages. 2021-12-19 07:05:31 +01:00
James Cole
14c6926360 rebuild for new release 2021-12-19 07:04:57 +01:00
James Cole
bedfcb5c5d Updated translations. 2021-12-19 06:59:10 +01:00
James Cole
19461020ef Various layout fixes. 2021-12-19 06:56:11 +01:00
James Cole
36ecf25804 Refactor account search. 2021-12-18 12:35:17 +01:00
James Cole
0229fc243a Add new transactions. 2021-12-17 20:13:07 +01:00
James Cole
a2f09b305c Possible fix for https://github.com/firefly-iii/firefly-iii/issues/5405 2021-12-17 17:27:29 +01:00
James Cole
32d7a0fd1b Fix some code quality things. 2021-12-17 17:27:01 +01:00
James Cole
5d3f95762e Update mergify.yml 2021-12-16 16:52:02 +01:00
mergify[bot]
4ca9ee6eec Merge pull request #5392 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.45.0
Bump sass from 1.44.0 to 1.45.0 in /frontend
2021-12-13 03:04:04 +00:00
dependabot[bot]
9026b0bfd7 Bump sass from 1.44.0 to 1.45.0 in /frontend
Bumps [sass](https://github.com/sass/dart-sass) from 1.44.0 to 1.45.0.
- [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.44.0...1.45.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-13 03:03:30 +00:00
mergify[bot]
3d30a5938a Merge pull request #5391 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/postcss-8.4.5
Bump postcss from 8.4.4 to 8.4.5 in /frontend
2021-12-13 03:03:24 +00:00
dependabot[bot]
bcb06779b9 Bump postcss from 8.4.4 to 8.4.5 in /frontend
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.4 to 8.4.5.
- [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.4.4...8.4.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-13 03:03:15 +00:00
mergify[bot]
26b70f37d6 Merge pull request #5390 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.5
Bump postcss from 8.4.4 to 8.4.5
2021-12-13 03:02:47 +00:00
mergify[bot]
b20a354344 Merge pull request #5389 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.26
Bump @vue/compiler-sfc from 3.2.24 to 3.2.26
2021-12-13 03:02:43 +00:00
dependabot[bot]
753f518f77 Bump postcss from 8.4.4 to 8.4.5
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.4 to 8.4.5.
- [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.4.4...8.4.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-13 03:02:17 +00:00
dependabot[bot]
33d3019ffd Bump @vue/compiler-sfc from 3.2.24 to 3.2.26
Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.2.24 to 3.2.26.
- [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.26/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-12-13 03:02:09 +00:00
James Cole
26e3157ae7 Merge tag '5.6.6' into develop
5.6.6

# Conflicts:
2021-12-10 19:26:48 +01:00
James Cole
b592528318 Merge branch 'release/5.6.6' 2021-12-10 19:26:29 +01:00
James Cole
936d55d7de Update changelog. 2021-12-10 18:04:49 +01:00
James Cole
6df45fccc5 Update packages. 2021-12-10 18:00:38 +01:00
James Cole
f43ebcce87 Rebuild frontend. 2021-12-10 16:58:30 +01:00
James Cole
23fc261a82 Rebuild v1 2021-12-10 16:55:10 +01:00
James Cole
344db19232 Update translations. 2021-12-10 16:44:36 +01:00
James Cole
5f777845a3 Update version. 2021-12-10 16:42:15 +01:00
James Cole
f32bdd6c76 Fix various issues and remove debug comments. 2021-12-10 16:42:02 +01:00
James Cole
219c3c11f9 Expand API 2021-12-10 16:40:22 +01:00
James Cole
b3b367fcb3 Fix https://github.com/firefly-iii/firefly-iii/issues/5296 2021-12-10 16:37:30 +01:00
James Cole
52a43e7f30 Fix https://github.com/firefly-iii/firefly-iii/issues/5327 2021-12-10 16:31:26 +01:00
James Cole
04f5098d06 Fix https://github.com/firefly-iii/firefly-iii/issues/5335 2021-12-10 16:27:12 +01:00
James Cole
9731503826 Fix https://github.com/firefly-iii/firefly-iii/issues/5352 2021-12-10 15:43:42 +01:00
James Cole
b431351a22 Fix https://github.com/firefly-iii/firefly-iii/issues/5108 2021-12-10 15:32:14 +01:00
James Cole
089097a41c Fix https://github.com/firefly-iii/firefly-iii/issues/5297 2021-12-10 15:08:23 +01:00
James Cole
4468fdd76b Fix https://github.com/firefly-iii/firefly-iii/issues/5375 2021-12-10 15:01:41 +01:00
James Cole
79c70c59e3 Fix #5371 in other places as well. 2021-12-07 06:15:27 +01:00
James Cole
c8ffc81527 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-12-07 06:14:18 +01:00
James Cole
048db14a08 Merge pull request #5371 from weimdall/bugfix/auto_budget_value
Bugfix: Empty pre-filled value in auto-budgets
2021-12-07 05:12:52 +00:00
Julien Cassagne
a9ee07b19a Bugfix: Empty pre-filled value in auto-budgets
The auto-budget pre-filled is empty when the set amount is above
1000 (view /budgets/edit/X).

The root cause was the function 'number_format' returning a string that
cannot be casted to a float when the amount is above 1000, because of the
thousands separator.
2021-12-06 20:38:20 -05:00
mergify[bot]
e316d9ce6d Merge pull request #5366 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/date-fns-2.27.0
Bump date-fns from 2.26.0 to 2.27.0 in /frontend
2021-12-06 03:04:01 +00:00
dependabot[bot]
6bf354cf93 Bump date-fns from 2.26.0 to 2.27.0 in /frontend
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.26.0 to 2.27.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.26.0...v2.27.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-12-06 03:03:35 +00:00
mergify[bot]
384ebf9341 Merge pull request #5365 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/chart.js-3.6.2
Bump chart.js from 3.6.0 to 3.6.2 in /frontend
2021-12-06 03:03:25 +00:00
mergify[bot]
b2c74ba86a Merge pull request #5364 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.44.0
Bump sass from 1.43.5 to 1.44.0 in /frontend
2021-12-06 03:03:21 +00:00
dependabot[bot]
0c915de314 Bump chart.js from 3.6.0 to 3.6.2 in /frontend
Bumps [chart.js](https://github.com/chartjs/Chart.js) from 3.6.0 to 3.6.2.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](https://github.com/chartjs/Chart.js/compare/v3.6.0...v3.6.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-06 03:03:15 +00:00
dependabot[bot]
327e7efa89 Bump sass from 1.43.5 to 1.44.0 in /frontend
Bumps [sass](https://github.com/sass/dart-sass) from 1.43.5 to 1.44.0.
- [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.5...1.44.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-06 03:02:48 +00:00
mergify[bot]
c361b6cc07 Merge pull request #5362 from firefly-iii/dependabot/composer/develop/laravel/ui-3.4.0
Bump laravel/ui from 3.3.3 to 3.4.0
2021-12-06 03:02:12 +00:00
dependabot[bot]
59948d6746 Bump laravel/ui from 3.3.3 to 3.4.0
Bumps [laravel/ui](https://github.com/laravel/ui) from 3.3.3 to 3.4.0.
- [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.3...v3.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-06 03:01:53 +00:00
mergify[bot]
1d93cf41fd Merge pull request #5363 from firefly-iii/dependabot/composer/develop/fakerphp/faker-1.17.0
Bump fakerphp/faker from 1.16.0 to 1.17.0
2021-12-06 03:01:31 +00:00
dependabot[bot]
8bbbb05adc Bump fakerphp/faker from 1.16.0 to 1.17.0
Bumps [fakerphp/faker](https://github.com/FakerPHP/Faker) from 1.16.0 to 1.17.0.
- [Release notes](https://github.com/FakerPHP/Faker/releases)
- [Changelog](https://github.com/FakerPHP/Faker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/FakerPHP/Faker/compare/v1.16.0...v1.17.0)

---
updated-dependencies:
- dependency-name: fakerphp/faker
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-06 03:01:24 +00:00
mergify[bot]
6e314b6a30 Merge pull request #5361 from firefly-iii/dependabot/composer/develop/laravel/framework-8.74.0
Bump laravel/framework from 8.73.2 to 8.74.0
2021-12-06 03:01:23 +00:00
mergify[bot]
499b2ca7ef Merge pull request #5360 from firefly-iii/dependabot/composer/develop/league/commonmark-2.1.0
Bump league/commonmark from 2.0.2 to 2.1.0
2021-12-06 03:01:20 +00:00
mergify[bot]
77823d3f33 Merge pull request #5359 from firefly-iii/dependabot/composer/develop/league/csv-9.7.4
Bump league/csv from 9.7.3 to 9.7.4
2021-12-06 03:01:17 +00:00
dependabot[bot]
88dfb954ca Bump laravel/framework from 8.73.2 to 8.74.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.73.2 to 8.74.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.73.2...v8.74.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-12-06 03:01:06 +00:00
dependabot[bot]
ddc229f270 Bump league/commonmark from 2.0.2 to 2.1.0
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.0.2 to 2.1.0.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.1/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.0.2...2.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-06 03:00:51 +00:00
dependabot[bot]
8af8cc2c9a Bump league/csv from 9.7.3 to 9.7.4
Bumps [league/csv](https://github.com/thephpleague/csv) from 9.7.3 to 9.7.4.
- [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.3...9.7.4)

---
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-12-06 03:00:42 +00:00
James Cole
775492b391 Minor fixes. 2021-12-03 18:39:45 +01:00
James Cole
1419176094 Validate key existence more strictly. 2021-12-02 18:14:43 +01:00
James Cole
aa0ca5fdcf Flush cache after transaction destruction. 2021-12-01 16:57:55 +01:00
mergify[bot]
0d61a3ad5d Merge pull request #5333 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/postcss-8.4.4
Bump postcss from 8.4.1 to 8.4.4 in /frontend
2021-11-29 03:03:54 +00:00
mergify[bot]
bdbb3d9ad1 Merge pull request #5332 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.64.4
Bump webpack from 5.64.3 to 5.64.4 in /frontend
2021-11-29 03:03:48 +00:00
dependabot[bot]
fc73bddd43 Bump postcss from 8.4.1 to 8.4.4 in /frontend
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.1 to 8.4.4.
- [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.4.1...8.4.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-29 03:03:31 +00:00
dependabot[bot]
7515578ba7 Bump webpack from 5.64.3 to 5.64.4 in /frontend
Bumps [webpack](https://github.com/webpack/webpack) from 5.64.3 to 5.64.4.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.64.3...v5.64.4)

---
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-29 03:03:13 +00:00
mergify[bot]
84b9841886 Merge pull request #5331 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.4
Bump postcss from 8.4.1 to 8.4.4
2021-11-29 03:02:23 +00:00
dependabot[bot]
6b66476927 Bump postcss from 8.4.1 to 8.4.4
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.1 to 8.4.4.
- [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.4.1...8.4.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-29 03:02:18 +00:00
mergify[bot]
7357f19f81 Merge pull request #5330 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.23
Bump @vue/compiler-sfc from 3.2.22 to 3.2.23
2021-11-29 03:02:13 +00:00
dependabot[bot]
f29d8322d5 Bump @vue/compiler-sfc from 3.2.22 to 3.2.23
Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.2.22 to 3.2.23.
- [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.23/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-29 03:02:07 +00:00
mergify[bot]
31a3f6f4d8 Merge pull request #5329 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.2.0
Bump doctrine/dbal from 3.1.4 to 3.2.0
2021-11-29 03:01:26 +00:00
dependabot[bot]
7432a0c5cb Bump doctrine/dbal from 3.1.4 to 3.2.0
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.1.4 to 3.2.0.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.1.4...3.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-29 03:00:48 +00:00
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
James Cole
1d02d86f9e Merge branch 'release/5.6.0' 2021-09-17 15:19:52 +02:00
James Cole
f63a561c76 Update final packages. 2021-09-17 15:18:49 +02:00
James Cole
a74098d7dc Update some last-minute files. 2021-09-17 15:18:04 +02:00
James Cole
ebcf40cb8f Update packages 2021-09-17 09:27:40 +02:00
James Cole
0ab9db23d1 Update meta files for new release. 2021-09-17 09:23:49 +02:00
James Cole
46f2494dfd Rebuild frontend. 2021-09-17 09:02:59 +02:00
James Cole
5e5d2b2acc Fix #4988 2021-09-17 09:01:36 +02:00
James Cole
6691062747 Search for non-existing values now returns nothing. 2021-09-17 08:46:03 +02:00
James Cole
0e5256c8ce Rebuild transaction list. 2021-09-17 07:18:37 +02:00
James Cole
f95a064eca Rebuild frontend. 2021-09-16 14:32:06 +02:00
James Cole
eaa293f406 Merge stuff 2021-09-16 14:24:27 +02:00
James Cole
7c0f387f2c Various update meta-data in files. 2021-09-16 14:21:35 +02:00
James Cole
34f9b38ea3 Merge pull request #5067 from LBreda/develop
Maskable icon and service worker
2021-09-14 06:19:58 +02:00
Lorenzo Breda
232cdd6901 Rename Offline.twig -> offline.twig 2021-09-13 21:07:54 +02:00
Lorenzo Breda
a815d7b3e2 Delete the offline page translations 2021-09-13 21:06:24 +02:00
Lorenzo Breda
91b1a89334 Change serviceworker.js license holder 2021-09-13 21:04:55 +02:00
Lorenzo Breda
d7a5da0fc9 Remove .idea from .gitignore 2021-09-13 21:02:42 +02:00
James Cole
18b0386c75 Merge pull request #5080 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.52.1
Bump webpack from 5.52.0 to 5.52.1 in /frontend
2021-09-13 12:38:53 +02:00
James Cole
64d8985be1 Merge pull request #5081 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/laravel-mix-6.0.31
Bump laravel-mix from 6.0.29 to 6.0.31 in /frontend
2021-09-13 12:38:41 +02:00
James Cole
73c30f532a Merge pull request #5077 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.11
Bump @vue/compiler-sfc from 3.2.9 to 3.2.11
2021-09-13 12:18:51 +02:00
James Cole
27b556e653 Merge pull request #5076 from firefly-iii/dependabot/npm_and_yarn/develop/axios-0.21.4
Bump axios from 0.21.3 to 0.21.4
2021-09-13 12:17:40 +02:00
James Cole
511d3d958f Merge pull request #5078 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.39.2
Bump sass from 1.39.0 to 1.39.2 in /frontend
2021-09-13 12:17:31 +02:00
James Cole
69f091e430 Merge pull request #5079 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/axios-0.21.4
Bump axios from 0.21.3 to 0.21.4 in /frontend
2021-09-13 12:17:22 +02:00
dependabot[bot]
f230aba392 Bump laravel-mix from 6.0.29 to 6.0.31 in /frontend
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.29 to 6.0.31.
- [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/commits)

---
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-09-13 10:00:35 +00:00
dependabot[bot]
d1033251ff Bump webpack from 5.52.0 to 5.52.1 in /frontend
Bumps [webpack](https://github.com/webpack/webpack) from 5.52.0 to 5.52.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.52.0...v5.52.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-13 10:00:07 +00:00
James Cole
1e4551b306 Merge pull request #5075 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.31
Bump laravel-mix from 6.0.29 to 6.0.31
2021-09-13 11:57:25 +02:00
dependabot[bot]
12535706d0 Bump axios from 0.21.3 to 0.21.4 in /frontend
Bumps [axios](https://github.com/axios/axios) from 0.21.3 to 0.21.4.
- [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/0.21.3...v0.21.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-13 03:02:51 +00:00
dependabot[bot]
1d325c3433 Bump sass from 1.39.0 to 1.39.2 in /frontend
Bumps [sass](https://github.com/sass/dart-sass) from 1.39.0 to 1.39.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.39.0...1.39.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-13 03:02:40 +00:00
dependabot[bot]
fff9676811 Bump @vue/compiler-sfc from 3.2.9 to 3.2.11
Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.2.9 to 3.2.11.
- [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.11/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-13 03:02:37 +00:00
dependabot[bot]
244428929f Bump axios from 0.21.3 to 0.21.4
Bumps [axios](https://github.com/axios/axios) from 0.21.3 to 0.21.4.
- [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/0.21.3...v0.21.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-13 03:02:26 +00:00
dependabot[bot]
947336b578 Bump laravel-mix from 6.0.29 to 6.0.31
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.29 to 6.0.31.
- [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/commits)

---
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-09-13 03:02:18 +00:00
James Cole
c38e712338 Small readme updates. 2021-09-11 07:31:19 +02:00
James Cole
5bac889d52 Merge branch 'main' into develop 2021-09-11 06:55:16 +02:00
James Cole
4352f4a095 Update templates. 2021-09-11 06:54:57 +02:00
James Cole
4ab7f00f86 Improve transactions overview. 2021-09-11 06:53:06 +02:00
James Cole
c0099262ea Fix issue with piggies. 2021-09-11 06:52:49 +02:00
James Cole
e53eb48ecc Update readme. 2021-09-11 06:52:38 +02:00
Lorenzo Breda
16d39ff9d0 Add service worker and offline page (needed to install the webapp on mobile devices) 2021-09-11 01:52:58 +02:00
Lorenzo Breda
e9f2f56634 Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
James Cole
dceea6795a Merge pull request #5052 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.29
Bump laravel-mix from 6.0.28 to 6.0.29
2021-09-06 06:16:53 +02:00
James Cole
7756227dc2 Merge pull request #5053 from firefly-iii/dependabot/npm_and_yarn/develop/axios-0.21.3
Bump axios from 0.21.1 to 0.21.3
2021-09-06 06:16:45 +02:00
James Cole
5d0596053e Merge pull request #5054 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.9
Bump @vue/compiler-sfc from 3.2.6 to 3.2.9
2021-09-06 06:16:34 +02:00
James Cole
436298891e Merge pull request #5056 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/laravel-mix-6.0.29
Bump laravel-mix from 6.0.28 to 6.0.29 in /frontend
2021-09-06 06:16:26 +02:00
James Cole
55b8b082ed Merge pull request #5055 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.39.0
Bump sass from 1.38.2 to 1.39.0 in /frontend
2021-09-06 06:16:16 +02:00
James Cole
faff056674 Merge pull request #5057 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.52.0
Bump webpack from 5.51.1 to 5.52.0 in /frontend
2021-09-06 06:16:03 +02:00
James Cole
b10484d993 Merge pull request #5058 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/axios-0.21.3
Bump axios from 0.21.1 to 0.21.3 in /frontend
2021-09-06 06:15:52 +02:00
dependabot[bot]
b61c47cc8a Bump axios from 0.21.1 to 0.21.3 in /frontend
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.3.
- [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.1...0.21.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-06 03:04:10 +00:00
dependabot[bot]
859a71cc6a Bump webpack from 5.51.1 to 5.52.0 in /frontend
Bumps [webpack](https://github.com/webpack/webpack) from 5.51.1 to 5.52.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.51.1...v5.52.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-06 03:03:57 +00:00
dependabot[bot]
8297aa4100 Bump laravel-mix from 6.0.28 to 6.0.29 in /frontend
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.28 to 6.0.29.
- [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/commits)

---
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-09-06 03:03:40 +00:00
dependabot[bot]
83e5b5edc6 Bump sass from 1.38.2 to 1.39.0 in /frontend
Bumps [sass](https://github.com/sass/dart-sass) from 1.38.2 to 1.39.0.
- [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.38.2...1.39.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-06 03:03:29 +00:00
dependabot[bot]
fbfd763a74 Bump @vue/compiler-sfc from 3.2.6 to 3.2.9
Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.2.6 to 3.2.9.
- [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.9/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-06 03:02:08 +00:00
dependabot[bot]
925dbfead8 Bump axios from 0.21.1 to 0.21.3
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.3.
- [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.1...0.21.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-06 03:01:55 +00:00
dependabot[bot]
7de8439323 Bump laravel-mix from 6.0.28 to 6.0.29
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.28 to 6.0.29.
- [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/commits)

---
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-09-06 03:01:49 +00:00
James Cole
8572e056f9 Fix 404 title. 2021-09-04 07:32:25 +02:00
James Cole
6fee873729 Fix #5042 2021-09-04 07:32:03 +02:00
James Cole
b96a7bcbbd Update bug.yml 2021-09-04 07:25:46 +02:00
James Cole
4f2e7ac0d4 Fix foreign keys. 2021-09-04 06:12:31 +02:00
James Cole
30d155a8e2 Add field to user management. 2021-08-30 06:37:55 +02:00
James Cole
a08440aacf Update security text 2021-08-29 07:12:37 +02:00
James Cole
0cd5773362 Rebuild frontend. 2021-08-28 16:37:48 +02:00
James Cole
a13af41e9f Rebuild frontend. 2021-08-28 16:30:08 +02:00
James Cole
d8a7bb4dc7 Update packages 2021-08-28 16:29:45 +02:00
James Cole
9b8d50aa54 Update DB version. 2021-08-28 15:56:15 +02:00
James Cole
10787aada8 New user groups and memberships 2021-08-28 15:47:33 +02:00
James Cole
a14c9438ad Minor code cleanup. 2021-08-28 15:47:09 +02:00
James Cole
92f7a9c574 Small code cleanup 2021-08-28 15:46:34 +02:00
James Cole
d9e3d9ca9e Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-08-28 15:45:38 +02:00
James Cole
54b4b9438e Merge branch 'main' into develop 2021-08-28 15:45:04 +02:00
James Cole
ef3d2b8e99 Merge pull request #5015 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.28
Bump laravel-mix from 6.0.27 to 6.0.28
2021-08-25 12:17:02 +02:00
James Cole
fa2c90064d Merge pull request #5016 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.4
Bump @vue/compiler-sfc from 3.2.2 to 3.2.4
2021-08-25 12:16:03 +02:00
James Cole
ec1764ba8c Update fr.yml 2021-08-23 06:24:47 +02:00
dependabot[bot]
8049a5d301 Bump @vue/compiler-sfc from 3.2.2 to 3.2.4
Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.2.2 to 3.2.4.
- [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.4/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-08-23 03:02:26 +00:00
dependabot[bot]
edf4f9e49b Bump laravel-mix from 6.0.27 to 6.0.28
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.27 to 6.0.28.
- [Release notes](https://github.com/JeffreyWay/laravel-mix/releases)
- [Changelog](https://github.com/JeffreyWay/laravel-mix/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JeffreyWay/laravel-mix/compare/v6.0.27...v6.0.28)

---
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-08-23 03:02:15 +00:00
James Cole
17757eb3ca Merge pull request #5007 from hoshsadiq/patch-1
Add additional extensions to composer require
2021-08-21 20:43:10 +02:00
Hosh
cd009f51d6 Add additional extensions to composer require 2021-08-21 10:52:33 +00:00
James Cole
c9c043712a Sort and clean up some code. 2021-08-20 20:49:42 +02:00
James Cole
f80178b1b2 Fix https://huntr.dev/bounties/ea181323-51f8-46a2-a60f-6a401907feb7/ 2021-08-20 10:05:18 +02:00
James Cole
06d319cd71 Fix https://huntr.dev/bounties/d32f3d5a-0738-41ba-89de-34f2a772de76/ 2021-08-20 09:51:00 +02:00
James Cole
14cdce113e Fix vulnerability https://huntr.dev/bounties/dd54c5a1-0d4a-4f02-a111-7ce4ddc67a4d/ 2021-08-20 09:38:52 +02:00
James Cole
83518d7f96 Rebuild frontend. 2021-08-20 09:29:00 +02:00
James Cole
e73f04cf77 Fix #4987 2021-08-17 17:29:54 +02:00
James Cole
2a1cec61f3 Merge branch 'main' into develop 2021-08-17 17:18:04 +02:00
James Cole
c16eb6f939 Add feature request 2021-08-17 17:16:17 +02:00
James Cole
901d4a2206 Switch templates. 2021-08-17 17:10:52 +02:00
James Cole
3b7bf5a1dd new support document. 2021-08-17 17:08:51 +02:00
James Cole
716a90cf7e Expand show. 2021-08-17 17:07:51 +02:00
James Cole
df51dac805 Also test commit. 2021-08-17 12:30:39 +02:00
James Cole
c4567a521b Test commit. 2021-08-17 12:29:11 +02:00
James Cole
d1fa375d6f Merge branches 'develop' and 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-08-17 12:28:16 +02:00
James Cole
fe4db6ea35 Rename file. 2021-08-17 12:28:09 +02:00
James Cole
dfe5af9191 Merge pull request #4995 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.50.0
Bump webpack from 5.49.0 to 5.50.0 in /frontend
2021-08-16 08:23:52 +02:00
dependabot[bot]
0618b29778 Bump webpack from 5.49.0 to 5.50.0 in /frontend
Bumps [webpack](https://github.com/webpack/webpack) from 5.49.0 to 5.50.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.49.0...v5.50.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-16 03:03:08 +00:00
James Cole
a4ba6e1842 Rebuild front. 2021-08-12 15:19:32 +02:00
James Cole
077fe2eb69 Move iban character replacements. 2021-08-12 15:13:59 +02:00
James Cole
b1ea497262 Just log and return false. 2021-08-11 19:44:22 +02:00
James Cole
f741d05f94 Expand error 2021-08-11 14:17:27 +02:00
James Cole
d222a7f1b7 Add questionmark. 2021-08-11 14:17:01 +02:00
James Cole
1b62e7289f Fix code. 2021-08-11 14:16:23 +02:00
James Cole
41cb256d49 Filter special chars. 2021-08-11 14:13:19 +02:00
James Cole
baa3a91f65 Merge tag '5.6.0-alpha.2' into develop
5.6.0-alpha.2
2021-08-10 19:54:36 +02:00
James Cole
fd932ad5b3 Merge branch 'release/5.6.0-alpha.2' into main 2021-08-10 19:54:31 +02:00
James Cole
02aeccbfb4 Update frontend and packages. 2021-08-10 19:52:56 +02:00
James Cole
ec7bc53b5a Rebuild frontend. 2021-08-10 19:43:51 +02:00
James Cole
21d28a9a19 New translations. 2021-08-10 19:32:48 +02:00
James Cole
8328c26df3 Update PHP code, code cleanup. 2021-08-10 19:31:55 +02:00
James Cole
8e104a62ae Better endpoint to move transactions. 2021-08-10 18:43:21 +02:00
James Cole
840316d4e4 Fix huntr link. 2021-08-10 18:08:22 +02:00
James Cole
5938fb7f88 Update config. 2021-08-10 18:06:49 +02:00
James Cole
c54dc1ad98 Fix readme in dev. 2021-08-10 18:05:40 +02:00
James Cole
54cf46ff32 Rebuild frontend for account creation / editing. 2021-08-09 08:01:27 +02:00
James Cole
6f7900234d Progress and updates for new layout. 2021-08-07 12:14:48 +02:00
James Cole
d97f090f86 Fix conversion. 2021-08-03 10:20:50 +02:00
James Cole
4b9f70db1c cast to string 2021-08-03 06:18:35 +02:00
James Cole
a7eb92b9bb Edit views for auth 2021-08-02 20:31:00 +02:00
James Cole
e04a71738d Fix commonmark error. 2021-08-02 20:30:26 +02:00
James Cole
f7f296c674 Merge pull request #4962 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.8 2021-08-02 04:13:12 +00:00
James Cole
440ddd175d Merge pull request #4964 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-0.12.94 2021-08-02 04:13:04 +00:00
James Cole
c814082918 Merge pull request #4966 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.27 2021-08-02 04:12:57 +00:00
James Cole
879c0224d5 Merge pull request #4963 from firefly-iii/dependabot/composer/develop/league/commonmark-2.0.1 2021-08-02 04:12:48 +00:00
James Cole
18bd06760a Merge pull request #4967 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.37.0 2021-08-02 04:12:40 +00:00
James Cole
5232aec11e Merge pull request #4968 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/vue-loader-15.9.7 2021-08-02 04:12:32 +00:00
James Cole
8f926fb176 Merge pull request #4965 from firefly-iii/dependabot/npm_and_yarn/develop/uiv-1.3.1 2021-08-02 04:12:25 +00:00
dependabot[bot]
0cda2b7e4e Bump vue-loader from 15.9.6 to 15.9.7 in /frontend
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.9.6 to 15.9.7.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.9.6...v15.9.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-02 03:03:12 +00:00
dependabot[bot]
7ba803965e Bump sass from 1.36.0 to 1.37.0 in /frontend
Bumps [sass](https://github.com/sass/dart-sass) from 1.36.0 to 1.37.0.
- [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.36.0...1.37.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-02 03:02:49 +00:00
dependabot[bot]
a22ee35cd0 Bump laravel-mix from 6.0.25 to 6.0.27
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.25 to 6.0.27.
- [Release notes](https://github.com/JeffreyWay/laravel-mix/releases)
- [Changelog](https://github.com/JeffreyWay/laravel-mix/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JeffreyWay/laravel-mix/compare/v6.0.25...v6.0.27)

---
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-08-02 03:02:07 +00:00
dependabot[bot]
c6386241fd Bump uiv from 1.3.0 to 1.3.1
Bumps [uiv](https://github.com/uiv-lib/uiv) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/uiv-lib/uiv/releases)
- [Commits](https://github.com/uiv-lib/uiv/compare/v1.3.0...v1.3.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-08-02 03:01:56 +00:00
dependabot[bot]
3cd1369e61 Bump phpstan/phpstan from 0.12.93 to 0.12.94
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.12.93 to 0.12.94.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Commits](https://github.com/phpstan/phpstan/compare/0.12.93...0.12.94)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-02 03:00:59 +00:00
dependabot[bot]
924b615019 Bump league/commonmark from 2.0.0 to 2.0.1
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/main/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.0.0...2.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-02 03:00:50 +00:00
dependabot[bot]
47c43b485a Bump phpunit/phpunit from 9.5.7 to 9.5.8
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.7 to 9.5.8.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.7...9.5.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-02 03:00:41 +00:00
James Cole
8ebdd481aa Update frontpage and packages. 2021-07-30 07:02:11 +02:00
James Cole
1a79525024 New frontend. 2021-07-29 06:24:50 +02:00
James Cole
03bdca39f1 New translations. 2021-07-29 06:22:59 +02:00
James Cole
89f98bb7ab Catch error. 2021-07-26 18:51:29 +02:00
James Cole
0d4e952a69 Merge pull request #4941 from firefly-iii/dependabot/composer/develop/nunomaduro/larastan-0.7.11
Bump nunomaduro/larastan from 0.7.10 to 0.7.11
2021-07-26 18:45:29 +02:00
dependabot[bot]
3760d5b039 Bump nunomaduro/larastan from 0.7.10 to 0.7.11
Bumps [nunomaduro/larastan](https://github.com/nunomaduro/larastan) from 0.7.10 to 0.7.11.
- [Release notes](https://github.com/nunomaduro/larastan/releases)
- [Changelog](https://github.com/nunomaduro/larastan/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nunomaduro/larastan/compare/v0.7.10...v0.7.11)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-26 04:33:58 +00:00
James Cole
011d6273fa Merge pull request #4943 from firefly-iii/dependabot/composer/develop/laravel/framework-8.51.0
Bump laravel/framework from 8.50.0 to 8.51.0
2021-07-26 06:33:01 +02:00
dependabot[bot]
c980be28ac Bump laravel/framework from 8.50.0 to 8.51.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.50.0 to 8.51.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.50.0...v8.51.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-07-26 04:28:42 +00:00
James Cole
095ef308c7 Merge pull request #4944 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.3.6
Bump postcss from 8.3.5 to 8.3.6
2021-07-26 06:17:36 +02:00
James Cole
e329784448 Merge pull request #4942 from firefly-iii/dependabot/composer/develop/league/commonmark-2.0.0
Bump league/commonmark from 1.6.6 to 2.0.0
2021-07-26 06:16:02 +02:00
James Cole
b44f893869 Merge pull request #4940 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.7
Bump phpunit/phpunit from 9.5.6 to 9.5.7
2021-07-26 06:15:52 +02:00
James Cole
2df20b4480 Merge pull request #4945 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/v-calendar-2.3.2
Bump v-calendar from 2.3.1 to 2.3.2 in /frontend
2021-07-26 06:14:24 +02:00
dependabot[bot]
cad0004a92 Bump v-calendar from 2.3.1 to 2.3.2 in /frontend
Bumps [v-calendar](https://github.com/nathanreyes/v-calendar) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/nathanreyes/v-calendar/releases)
- [Commits](https://github.com/nathanreyes/v-calendar/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-26 03:02:48 +00:00
dependabot[bot]
453ca0b9f4 Bump postcss from 8.3.5 to 8.3.6
Bumps [postcss](https://github.com/postcss/postcss) from 8.3.5 to 8.3.6.
- [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.5...8.3.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-26 03:01:59 +00:00
dependabot[bot]
ab525867e1 Bump league/commonmark from 1.6.6 to 2.0.0
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 1.6.6 to 2.0.0.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/main/CHANGELOG-1.x.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/1.6.6...2.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-26 03:01:09 +00:00
dependabot[bot]
0153a326da Bump phpunit/phpunit from 9.5.6 to 9.5.7
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.6 to 9.5.7.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.6...9.5.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-26 03:00:47 +00:00
James Cole
9885b7e716 Rebuild frontend. 2021-07-25 19:41:28 +02:00
James Cole
abb4b0befe Update and improve bills. 2021-07-25 19:40:14 +02:00
James Cole
217a382616 Update frontend to facilitate bills. 2021-07-25 19:39:35 +02:00
James Cole
a18742d250 Merge pull request #4936 from Flightkick/feature/fix-broken-images-readme
Feature/fix broken images readme
2021-07-23 13:16:23 +02:00
Flightkick
91e7d3bac0 Update images in readme
Currently pointing to nowhere until the PR will be merged.
2021-07-23 12:05:29 +02:00
Flightkick
b5a2531090 Add screenshots to Github repo 2021-07-23 11:58:30 +02:00
James Cole
afc9f4b7eb Add missing rate limiter. 2021-07-23 06:26:42 +02:00
James Cole
cb759e5c21 Fix issue in liability credits. 2021-07-21 06:23:42 +02:00
James Cole
33d6584924 Merge pull request #4926 from firefly-iii/dependabot/npm_and_yarn/develop/vue-loader-16.3.1
Bump vue-loader from 15.9.7 to 16.3.1
2021-07-19 06:49:29 +02:00
dependabot[bot]
6bbd0f5be6 Bump vue-loader from 15.9.7 to 16.3.1
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.9.7 to 16.3.1.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits)

---
updated-dependencies:
- dependency-name: vue-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-19 04:37:48 +00:00
James Cole
fbb5a4dc25 Merge pull request #4927 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/vue-loader-16.3.1 2021-07-19 06:35:52 +02:00
James Cole
abb9ced8e6 Merge pull request #4924 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.1.5 2021-07-19 06:35:40 +02:00
James Cole
35bd023a79 Merge pull request #4925 from firefly-iii/dependabot/npm_and_yarn/develop/vue-i18n-8.25.0 2021-07-19 06:35:32 +02:00
dependabot[bot]
d827bfee99 Bump vue-loader from 15.9.7 to 16.3.1 in /frontend
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.9.7 to 16.3.1.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits)

---
updated-dependencies:
- dependency-name: vue-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-19 03:02:49 +00:00
dependabot[bot]
afc21844b5 Bump vue-i18n from 8.24.5 to 8.25.0
Bumps [vue-i18n](https://github.com/kazupon/vue-i18n) from 8.24.5 to 8.25.0.
- [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.24.5...v8.25.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-19 03:01:42 +00:00
dependabot[bot]
8a5354fcd7 Bump @vue/compiler-sfc from 3.1.4 to 3.1.5
Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.1.4 to 3.1.5.
- [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.1.5/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-07-19 03:01:33 +00:00
James Cole
e959dbc6e0 Rebuild frontend. 2021-07-18 19:23:50 +02:00
James Cole
704cf26725 Translations. 2021-07-18 19:21:30 +02:00
James Cole
e8c08a0e93 Update packages. 2021-07-18 19:20:24 +02:00
James Cole
6d971e86b1 Various fixes and extensions. 2021-07-18 14:51:30 +02:00
James Cole
fb17da3f56 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-07-18 14:50:51 +02:00
James Cole
fae8c05e71 Fix events for LDAP 2021-07-17 17:26:12 +02:00
James Cole
a865f4b72e Merge pull request #4913 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-0.12.92
Bump phpstan/phpstan from 0.12.91 to 0.12.92
2021-07-12 06:19:27 +02:00
dependabot[bot]
48ef268c0d Bump phpstan/phpstan from 0.12.91 to 0.12.92
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.12.91 to 0.12.92.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Commits](https://github.com/phpstan/phpstan/compare/0.12.91...0.12.92)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-12 03:00:44 +00:00
James Cole
2c943e0d53 Fix #4901 2021-07-11 09:31:29 +02:00
James Cole
7e1af72186 Update JS 2021-07-11 09:31:10 +02:00
James Cole
1bf4fb1b70 Rebuild frontend. 2021-07-10 16:24:00 +02:00
James Cole
b7919e4ef2 Add strict thing. 2021-07-10 15:54:49 +02:00
James Cole
d828660b9e Catch LDAP events 2021-07-10 07:35:54 +02:00
James Cole
ddb222cc72 Various code cleanup. 2021-07-10 07:29:39 +02:00
James Cole
b0ccd26928 Update packages 2021-07-10 07:27:22 +02:00
James Cole
c741878f9f Update translations. 2021-07-10 05:21:14 +02:00
James Cole
e2380def5d Delete unused route 2021-07-09 06:42:23 +02:00
James Cole
ec73020b3c Fix exception. 2021-07-08 20:31:12 +02:00
James Cole
253e7499e3 Remove unused strings. 2021-07-05 20:03:54 +02:00
James Cole
48fdd50428 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop
# Conflicts:
#	frontend/yarn.lock
2021-07-05 20:02:07 +02:00
James Cole
c0d3554acb Clean up views and code 2021-07-05 20:01:36 +02:00
James Cole
24b633b5ad Merge pull request #4896 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sortablejs-1.14.0
Bump sortablejs from 1.13.0 to 1.14.0 in /frontend
2021-07-05 06:18:21 +02:00
James Cole
41cfa7b84e Merge pull request #4897 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/vue-loader-16.3.0
Bump vue-loader from 15.9.7 to 16.3.0 in /frontend
2021-07-05 06:18:10 +02:00
James Cole
f9abb1fb6e Merge pull request #4895 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-0.12.91
Bump phpstan/phpstan from 0.12.90 to 0.12.91
2021-07-05 06:18:00 +02:00
dependabot[bot]
c4172d7f52 Bump vue-loader from 15.9.7 to 16.3.0 in /frontend
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.9.7 to 16.3.0.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits)

---
updated-dependencies:
- dependency-name: vue-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 03:03:07 +00:00
dependabot[bot]
addb351c85 Bump sortablejs from 1.13.0 to 1.14.0 in /frontend
Bumps [sortablejs](https://github.com/SortableJS/Sortable) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/SortableJS/Sortable/releases)
- [Commits](https://github.com/SortableJS/Sortable/compare/1.13.0...1.14.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 03:02:56 +00:00
dependabot[bot]
20d94782f5 Bump phpstan/phpstan from 0.12.90 to 0.12.91
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.12.90 to 0.12.91.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Commits](https://github.com/phpstan/phpstan/compare/0.12.90...0.12.91)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 03:00:41 +00:00
James Cole
8135c034a9 Rename file 2021-07-04 19:41:47 +02:00
James Cole
b5583eba23 Catch error 2021-07-04 19:38:17 +02:00
James Cole
b0ab79bb48 Build empty bills things. 2021-07-04 19:20:21 +02:00
James Cole
5eca404866 Fix issue in number formatting. 2021-07-04 19:19:31 +02:00
James Cole
b94885f8ba Update meta file. 2021-07-04 19:18:41 +02:00
James Cole
6814582f32 Empty bills view. 2021-07-04 19:18:23 +02:00
James Cole
a09d831613 Fix #4894 2021-07-04 07:58:11 +02:00
James Cole
d35b0ea279 Merge tag '5.6.0-alpha.1' into develop
5.6.0-alpha.1
2021-07-03 12:35:08 +02:00
1891 changed files with 81274 additions and 58830 deletions

View File

@@ -260,12 +260,6 @@ DISABLE_CSP_HEADER=false
TRACKER_SITE_ID=
TRACKER_URL=
#
# Firefly III can collect telemetry on how you use Firefly III. This is opt-in.
# In order to allow this, change the following variable to true.
# To read more about this feature, go to this page: https://docs.firefly-iii.org/support/telemetry
SEND_TELEMETRY=false
# You can fine tune the start-up of a Docker container by editing these environment variables.
# Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
# However if you know what you're doing you can significantly speed up container start times.

View File

@@ -261,12 +261,6 @@ DISABLE_CSP_HEADER=false
TRACKER_SITE_ID=
TRACKER_URL=
#
# Firefly III can collect telemetry on how you use Firefly III. This is opt-in.
# In order to allow this, change the following variable to true.
# To read more about this feature, go to this page: https://docs.firefly-iii.org/support/telemetry
SEND_TELEMETRY=false
# You can fine tune the start-up of a Docker container by editing these environment variables.
# Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
# However if you know what you're doing you can significantly speed up container start times.

View File

@@ -37,15 +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.
# - Docker + versions <= 4.8.1.8 and before: use "stdout"
# - Docker + versions > 4.8.1.8 : use "docker_out"
# - Docker + versions >= 5.1.1 : use "stack"
# - For everything else (als not Docker) : use 'stack'
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
@@ -68,6 +69,8 @@ DB_PORT=3306
DB_DATABASE=firefly
DB_USERNAME=firefly
DB_PASSWORD=secret_firefly_password
# leave empty or omit when not using a socket connection
DB_SOCKET=
# MySQL supports SSL. You can configure it here.
# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
@@ -88,6 +91,9 @@ PGSQL_SSL_CERT=null
PGSQL_SSL_KEY=null
PGSQL_SSL_CRL_FILE=null
# more PostgreSQL settings
PGSQL_SCHEMA=public
# If you're looking for performance improvements, you could install memcached or redis
CACHE_DRIVER=file
SESSION_DRIVER=file
@@ -136,7 +142,6 @@ MAIL_ENCRYPTION=null
MAILGUN_DOMAIN=
MAILGUN_SECRET=
# If you are on EU region in mailgun, use api.eu.mailgun.net, otherwise use api.mailgun.net
# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
MAILGUN_ENDPOINT=api.mailgun.net
@@ -170,36 +175,20 @@ MAP_DEFAULT_ZOOM=6
#
# Firefly III supports a few authentication methods:
# - 'web' (default, uses built in DB)
# - 'ldap'
# - 'remote_user_guard' for Authelia etc
# Read more about these settings in the documentation.
# https://docs.firefly-iii.org/advanced-installation/authentication
#
# Set to 'ldap' to enable LDAP
# LDAP is no longer supported :(
#
AUTHENTICATION_GUARD=web
#
# LDAP connection settings:
#
LDAP_HOST=ldap.yourserver.com
LDAP_USERNAME="uid=X,ou=,o=,dc=something,dc=com"
LDAP_PASSWORD=super_secret
LDAP_PORT=389
LDAP_BASE_DN="o=something,dc=site,dc=com"
LDAP_TIMEOUT=5
LDAP_SSL=false
LDAP_TLS=false
LDAP_AUTH_FIELD=uid
#
# Remote user guard settings
#
AUTHENTICATION_GUARD_HEADER=REMOTE_USER
AUTHENTICATION_GUARD_EMAIL=
#
# Extra authentication settings
#
@@ -236,6 +225,8 @@ ALLOW_WEBHOOKS=false
#
# For more info: https://docs.firefly-iii.org/firefly-iii/advanced-installation/cron/
#
# You can set this variable from a file by appending it with _FILE
#
STATIC_CRON_TOKEN=
# You can fine tune the start-up of a Docker container by editing these environment variables.
@@ -243,6 +234,13 @@ STATIC_CRON_TOKEN=
# However if you know what you're doing you can significantly speed up container start times.
# Set each value to true to enable, or false to disable.
# Set this to true to build all locales supported by Firefly III.
# This may take quite some time (several minutes) and is generally not recommended.
# If you wish to change or alter the list of locales, start your Docker container with
# `docker run -v locale.gen:/etc/locale.gen -e DKR_BUILD_LOCALE=true`
# and make sure your preferred locales are in your own locale.gen.
DKR_BUILD_LOCALE=false
# Check if the SQLite database exists. Can be skipped if you're not using SQLite.
# Won't significantly speed up things.
DKR_CHECK_SQLITE=true
@@ -271,7 +269,6 @@ DKR_RUN_PASSPORT_INSTALL=true
# Leave the following configuration vars as is.
# Unless you like to tinker and know what you're doing.
APP_NAME=FireflyIII
ADLDAP_CONNECTION=default
BROADCAST_DRIVER=log
QUEUE_DRIVER=sync
CACHE_PREFIX=firefly
@@ -289,6 +286,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.

View File

@@ -1,33 +0,0 @@
---
name: Bug report
about: Create a report to help Firefly III improve
title: ''
labels: ''
assignees: ''
---
**Bug description**
I am running Firefly III version x.x.x, and my problem is:
<!-- Replace the version and describe your problem or your issue may be closed. -->
**Steps to reproduce**
<!-- What do you need to do to trigger this bug? -->
**Extra info**
<!-- Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom).
DO NOT PUT ```BACKTICKS``` AROUND THE OUTPUT OF THE /debug PAGE
-->
**Bonus points**
<!-- Before you submit, verify the following please: -->
- I searched and nobody reported this bug before
- I have added a stack trace from my log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
- I have added a screenshot.
- I was able to replicate it on the demo site https://demo.firefly-iii.org/
<!-- - I donated money (this is a joke ;)-->

View File

@@ -1,27 +0,0 @@
---
name: I have a question or a problem
about: Ask away!
---
I am running Firefly III version x.x.x.
**Description**
<!-- (if relevant of course) -->
**Extra info**
<!-- Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom).
DO NOT PUT ```BACKTICKS``` AROUND THE OUTPUT OF THE /debug PAGE
-->
**Bonus points**
<!-- Complete the following checklist for bonus points -->
- I have read the FAQ at https://bit.ly/FF3-FAQ
- I added a screenshot
- I added log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
- I was able to replicate the issue on the demo site.
<!-- - I donated money (this is a joke :wink:)-->

View File

@@ -1,34 +0,0 @@
---
name: Feature request
about: Suggest an idea or feature for Firefly III
title: ''
labels: ''
assignees: ''
---
**Description**
<!--
Please describe your feature request:
- I would like Firefly III to do ABC.
- What if you would add feature XYZ?
- Firefly III doesn't do DEF.
-->
**Solution**
<!-- Describe what your feature would add to Firefly III. -->
**What are alternatives?**
<!-- Please describe what alternatives currently exist. -->
**Additional context**
<!-- Add any other context or screenshots about the feature request here. -->
**Bonus points**
<!-- Earn bonus points by:
- Make a drawing
- Donate money (just kidding ;)
-->

57
.github/ISSUE_TEMPLATE/bug.yml vendored Normal file
View File

@@ -0,0 +1,57 @@
name: Bug Report
description: Report a bug in Firefly III (or associated tools)
body:
- type: checkboxes
attributes:
label: Support guidelines
description: Please read the support guidelines before proceeding.
options:
- label: I've read the [support guidelines](https://github.com/firefly-iii/firefly-iii/blob/main/.github/support.md)
required: true
- type: checkboxes
attributes:
label: I've found a bug and checked that ...
description: Make sure that your request fulfills all of the following requirements. If one requirement cannot be satisfied, explain in detail why.
options:
- label: ... [the documentation](https://docs.firefly-iii.org/) does not mention anything about my problem
- label: ... there are no open or closed issues that are related to my problem
- label: ... it's [definitely me, not you](https://github.com/firefly-iii/firefly-iii/blob/main/.github/its_you_not_me.md)
- type: textarea
attributes:
label: Description
description: Please provide a brief description of the bug in 1-2 sentences.
validations:
required: true
- type: textarea
attributes:
label: Expected behaviour
description: Please describe precisely what you'd expect to happen.
validations:
required: true
- type: textarea
attributes:
label: Debug information
description: Please provide the table from the /debug page
placeholder: The output from the /debug page
validations:
required: true
- type: textarea
attributes:
label: Steps to reproduce
description: Please describe the steps to reproduce the bug.
placeholder: |
1. ...
2. ...
3. ...
validations:
required: false
- type: textarea
attributes:
label: Additional info
description: Please provide any additional information that seem useful.

42
.github/ISSUE_TEMPLATE/fr.yml vendored Normal file
View File

@@ -0,0 +1,42 @@
name: Feature Request
description: Request a feature or enhancement in Firefly III (or associated tools)
body:
- type: checkboxes
attributes:
label: Support guidelines
description: Please read the support guidelines before proceeding.
options:
- label: I've read the [support guidelines](https://github.com/firefly-iii/firefly-iii/blob/main/.github/support.md)
required: true
- label: My request is not listed as [a very good idea, but unfortunately...](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/what-its-not/)
required: true
- label: I've used [the search](https://github.com/firefly-iii/firefly-iii/issues?q=is%3Aissue) and this has not been discussed before.
required: true
- type: textarea
attributes:
label: Description
description: Please describe your feature request
placeholder: |
- I would like Firefly III to do ABC.
- What if you would add feature XYZ?
- Firefly III doesn't do DEF.
validations:
required: true
- type: textarea
attributes:
label: Solution
description: Describe what your feature would add to Firefly III.
validations:
required: true
- type: textarea
attributes:
label: What are alternatives?
description: Please describe what alternatives currently exist.
- type: textarea
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.

BIN
.github/assets/img/imac-complete.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 544 KiB

BIN
.github/assets/img/ipad-complete.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 921 KiB

BIN
.github/assets/img/iphone-complete.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 KiB

BIN
.github/assets/img/logo-small.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -19,11 +19,3 @@ updates:
schedule:
interval: "weekly"
# yarn / JS updates for new frontend
- package-ecosystem: "npm"
directory: "/frontend"
target-branch: develop
versioning-strategy: increase
labels: ["bug"]
schedule:
interval: "weekly"

16
.github/its_you_not_me.md vendored Normal file
View File

@@ -0,0 +1,16 @@
# It's not you, it's me
Sometimes bugs reported to Firefly III are configuration and system problems on the user's side.
If you run into any of the following problems, there's a good chance it's not a Firefly III issue, but a configuration issue.
- ⚠️ Firefly III can't connect to the database when starting or the password is wrong, even though you're sure it's correct.
- ⚠️ Errors about a missing `APP_KEY` or other encryption/hash problems
- ⚠️ You can't login due to `419` errors (page expired)
- ⚠️ Any `500` error when starting Firefly III
- ⚠️ Any white page when starting Firefly III
- ⚠️ Time-out when starting Firefly III for the first time
- ⚠️ Firefly III does not work behind your reverse proxy
- ⚠️ You can't connect to the Data Importer due to 404's or authentication issues.
If you run into an issue like this, please start a [discussion](https://github.com/firefly-iii/firefly-iii/discussions) or chat on [Gitter.im](https://gitter.im/firefly-iii/firefly-iii). There's a good chance it's not a bug but something we can fix rather quickly :+1:

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

@@ -0,0 +1,8 @@
pull_request_rules:
- name: Close all on main
conditions:
- base=main
- -author~=^dependabot(|-preview)\[bot\]$
actions:
close:
message: Please do not open PR's on the `main` branch, but on the `develop` branch only. Thank you!

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"

32
.github/support.md vendored
View File

@@ -1,12 +1,32 @@
# Welcome to Firefly III on Github!
# Support [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/firefly-iii/firefly-iii.svg)](http://isitmaintained.com/project/firefly-iii/firefly-iii "Average time to resolve an issue")
:+1::tada: Thank you for taking the time to contribute something to Firefly III!
## Bugs
## Reporting an issue
First of all: thank you for reporting a bug instead of ditching the tool altogether. If you find a bug, please take the time and see if the [demo site](https://demo.firefly-iii.org/) is also suffering from this bug. Include as many log files and details as you think are necessary. Bugs have a lot of priority!
First of all: thank you for reporting a bug instead of ditching the tool altogether. Bugs have a lot of priority!
## Installation problems
1. Open bugs will have open issues, so search for one first.
2. If your feature request is already there, vote on it with :+1: or :-1: reactions.
3. Do NOT hijack old issues with the bug you found, open your own issue.
4. If relevant, take the time and see if the [demo site](https://demo.firefly-iii.org/) is also suffering from your issue.
5. If relevant, read the [documentation](https://docs.firefly-iii.org/).
Please take the time to read the [documentation](https://docs.firefly-iii.org/) and make sure you search through closed issues for the problems other people
have had. Your problem may be among them! If not, open an issue and I will help where I can.
Please follow these guidelines when opening new issues:
## Writing good issues
- File a single issue for a single problem or feature requests. Feel free to open multiple issues.
- Collect as many details as you can.
- Be clear and specific, and state what you're not sure about.
Only then [create a new issue](https://github.com/firefly-iii/firefly-iii/issues/new/choose)!
## Issue closure and abandonment policy
- Issues can be converted into discussions if it's not a bug or feature request.
- Features that won't be implemented will be labelled "wontfix". [This isn't personal](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/what-its-not/).
- Issues can be closed if they're duplicates of other issues.
- Issues can be closed if the answer is in the FAQ.
- Issues will be closed automatically after 14 days.
- Issues will be locked automatically after 90 days.

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

@@ -5,8 +5,14 @@ on:
schedule:
- cron: '0 0 * * *'
permissions:
contents: read
jobs:
lock:
permissions:
issues: write # for dessant/lock-threads to lock issues
pull-requests: write # for dessant/lock-threads to lock PRs
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v2

View File

@@ -3,8 +3,14 @@ on:
schedule:
- cron: "30 1 * * *"
permissions:
contents: read
jobs:
stale:
permissions:
issues: write # for actions/stale to close stale issues
pull-requests: write # for actions/stale to close stale PRs
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3

10
.gitignore vendored
View File

@@ -1,18 +1,8 @@
/node_modules
/frontend/node_modules
/frontend/fonts
/frontend/images
/public/hot
/public/storage
/storage/*.key
/vendor
/.vagrant
Homestead.json
Homestead.yaml
npm-debug.log
yarn-error.log
.env
public/google*.html
report.html
composer.phar
app.js.map

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,15 @@ class AccountController extends Controller
}
/**
* Documentation for this endpoint:
* https://api-docs.firefly-iii.org/#/autocomplete/getAccountsAC
*
* @param AutocompleteRequest $request
*
* @return JsonResponse
* @throws JsonException
* @throws FireflyException
* @throws FireflyException
*/
public function accounts(AutocompleteRequest $request): JsonResponse
{
@@ -74,7 +82,7 @@ class AccountController extends Controller
$date = $data['date'] ?? today(config('app.timezone'));
$return = [];
$result = $this->repository->searchAccount((string)$query, $types, $data['limit']);
$result = $this->repository->searchAccount((string) $query, $types, $data['limit']);
$defaultCurrency = app('amount')->getDefaultCurrency();
/** @var Account $account */
@@ -88,7 +96,7 @@ class AccountController extends Controller
}
$return[] = [
'id' => (string)$account->id,
'id' => (string) $account->id,
'name' => $account->name,
'name_with_balance' => $nameWithBalance,
'type' => $account->accountType->type,

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
@@ -67,7 +70,7 @@ class BillController extends Controller
$filtered = $result->map(
static function (Bill $item) {
return [
'id' => (string)$item->id,
'id' => (string) $item->id,
'name' => $item->name,
];
}

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
@@ -67,7 +70,7 @@ class BudgetController extends Controller
$filtered = $result->map(
static function (Budget $item) {
return [
'id' => (string)$item->id,
'id' => (string) $item->id,
'name' => $item->name,
];
}

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
@@ -67,7 +70,7 @@ class CategoryController extends Controller
$filtered = $result->map(
static function (Category $item) {
return [
'id' => (string)$item->id,
'id' => (string) $item->id,
'name' => $item->name,
];
}

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
@@ -69,7 +72,7 @@ class CurrencyController extends Controller
/** @var TransactionCurrency $currency */
foreach ($collection as $currency) {
$result[] = [
'id' => (string)$currency->id,
'id' => (string) $currency->id,
'name' => $currency->name,
'code' => $currency->code,
'symbol' => $currency->symbol,
@@ -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
{
@@ -94,7 +101,7 @@ class CurrencyController extends Controller
/** @var TransactionCurrency $currency */
foreach ($collection as $currency) {
$result[] = [
'id' => (string)$currency->id,
'id' => (string) $currency->id,
'name' => sprintf('%s (%s)', $currency->name, $currency->code),
'code' => $currency->code,
'symbol' => $currency->symbol,

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
@@ -69,7 +72,7 @@ class ObjectGroupController extends Controller
/** @var ObjectGroup $objectGroup */
foreach ($result as $objectGroup) {
$return[] = [
'id' => (string)$objectGroup->id,
'id' => (string) $objectGroup->id,
'name' => $objectGroup->title,
'title' => $objectGroup->title,
];

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
@@ -75,11 +78,12 @@ class PiggyBankController extends Controller
foreach ($piggies as $piggy) {
$currency = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
$response[] = [
'id' => (string)$piggy->id,
'id' => (string) $piggy->id,
'name' => $piggy->name,
'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
@@ -103,7 +110,7 @@ class PiggyBankController extends Controller
$currency = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
$currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0';
$response[] = [
'id' => (string)$piggy->id,
'id' => (string) $piggy->id,
'name' => $piggy->name,
'name_with_balance' => sprintf(
'%s (%s / %s)', $piggy->name, app('amount')->formatAnything($currency, $currentAmount, false),
@@ -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
@@ -66,7 +69,7 @@ class RuleController extends Controller
/** @var Rule $rule */
foreach ($rules as $rule) {
$response[] = [
'id' => (string)$rule->id,
'id' => (string) $rule->id,
'name' => $rule->title,
'description' => $rule->description,
];

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
@@ -66,7 +69,7 @@ class RuleGroupController extends Controller
/** @var RuleGroup $group */
foreach ($groups as $group) {
$response[] = [
'id' => (string)$group->id,
'id' => (string) $group->id,
'name' => $group->title,
'description' => $group->description,
];

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
@@ -69,7 +72,7 @@ class TagController extends Controller
/** @var Tag $tag */
foreach ($result as $tag) {
$array[] = [
'id' => (string)$tag->id,
'id' => (string) $tag->id,
'name' => $tag->tag,
'tag' => $tag->tag,
];

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
@@ -77,8 +80,8 @@ class TransactionController extends Controller
/** @var TransactionJournal $journal */
foreach ($filtered as $journal) {
$array[] = [
'id' => (string)$journal->id,
'transaction_group_id' => (string)$journal->transaction_group_id,
'id' => (string) $journal->id,
'transaction_group_id' => (string) $journal->transaction_group_id,
'name' => $journal->description,
'description' => $journal->description,
];
@@ -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
@@ -98,7 +104,7 @@ class TransactionController extends Controller
$result = new Collection;
if (is_numeric($data['query'])) {
// search for group, not journal.
$firstResult = $this->groupRepository->find((int)$data['query']);
$firstResult = $this->groupRepository->find((int) $data['query']);
if (null !== $firstResult) {
// group may contain multiple journals, each a result:
foreach ($firstResult->transactionJournals as $journal) {
@@ -116,8 +122,8 @@ class TransactionController extends Controller
/** @var TransactionJournal $journal */
foreach ($result as $journal) {
$array[] = [
'id' => (string)$journal->id,
'transaction_group_id' => (string)$journal->transaction_group_id,
'id' => (string) $journal->id,
'transaction_group_id' => (string) $journal->transaction_group_id,
'name' => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
'description' => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
];

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
@@ -67,7 +70,7 @@ class TransactionTypeController extends Controller
foreach ($types as $type) {
// different key for consistency.
$array[] = [
'id' => (string)$type->id,
'id' => (string) $type->id,
'name' => $type->type,
'type' => $type->type,
];

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;
@@ -34,6 +35,9 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\Http\Api\ApiSupport;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use JsonException;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/**
* Class AccountController
@@ -69,9 +73,16 @@ class AccountController extends Controller
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/charts/getChartAccountOverview
*
* @param DateRequest $request
*
* @return JsonResponse
* @throws FireflyException
* @throws JsonException
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function overview(DateRequest $request): JsonResponse
{
@@ -100,11 +111,11 @@ 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_id' => (string) $currency->id,
'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol,
'currency_decimal_places' => $currency->decimal_places,
@@ -116,11 +127,11 @@ class AccountController extends Controller
];
$currentStart = clone $start;
$range = app('steam')->balanceInRange($account, $start, clone $end);
$previous = round((float)array_values($range)[0], 12);
$previous = round((float) array_values($range)[0], 12);
while ($currentStart <= $end) {
$format = $currentStart->format('Y-m-d');
$label = $currentStart->toAtomString();
$balance = array_key_exists($format, $range) ? round((float)$range[$format], 12) : $previous;
$balance = array_key_exists($format, $range) ? round((float) $range[$format], 12) : $previous;
$previous = $balance;
$currentStart->addDay();
$currentSet['entries'][$label] = $balance;

View File

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers;
use Carbon\Carbon;
use Carbon\Exceptions\InvalidDateException;
use Carbon\Exceptions\InvalidFormatException;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
@@ -33,6 +34,8 @@ use Illuminate\Routing\Controller as BaseController;
use League\Fractal\Manager;
use League\Fractal\Serializer\JsonApiSerializer;
use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Symfony\Component\HttpFoundation\ParameterBag;
/**
@@ -45,8 +48,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.
@@ -70,9 +73,11 @@ abstract class Controller extends BaseController
}
/**
* Method to grab all parameters from the URI.
* Method to grab all parameters from the URL.
*
* @return ParameterBag
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
private function getParameters(): ParameterBag
{
@@ -91,9 +96,9 @@ abstract class Controller extends BaseController
if (null !== $date) {
try {
$obj = Carbon::parse($date);
} catch (InvalidDateException $e) {
} catch (InvalidDateException | InvalidFormatException $e) {
// don't care
Log::error(sprintf('Invalid date exception in API controller: %s', $e->getMessage()));
Log::warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', $date, $e->getMessage()));
}
}
$bag->set($field, $obj);
@@ -143,7 +148,7 @@ abstract class Controller extends BaseController
/**
* Method to help build URI's.
* Method to help build URL's.
*
* @return string
*/

View File

@@ -1,4 +1,25 @@
<?php
/*
* AccountController.php
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Data\Bulk;
@@ -12,11 +33,16 @@ use Illuminate\Http\JsonResponse;
/**
* Class AccountController
*
* @deprecated
*/
class AccountController extends Controller
{
private AccountRepositoryInterface $repository;
/**
*
*/
public function __construct()
{
parent::__construct();
@@ -31,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

@@ -0,0 +1,100 @@
<?php
/*
* TransactionController.php
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Data\Bulk;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Data\Bulk\TransactionRequest;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
use Illuminate\Http\JsonResponse;
/**
* Class TransactionController
*
* Endpoint to update transactions by submitting
* (optional) a "where" clause and an "update"
* clause.
*
* Because this is a security nightmare waiting to happen validation
* is pretty strict.
*/
class TransactionController extends Controller
{
private AccountRepositoryInterface $repository;
/**
*
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
$this->repository = app(AccountRepositoryInterface::class);
$this->repository->setUser(auth()->user());
return $next($request);
}
);
}
/**
* This endpoint is documented at:
*
* @param TransactionRequest $request
*
* @return JsonResponse
*/
public function update(TransactionRequest $request): JsonResponse
{
$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']['account_id']);
$destination = $this->repository->find((int) $params['update']['account_id']);
/** @var AccountDestroyService $service */
$service = app(AccountDestroyService::class);
$service->moveTransactions($original, $destination);
}
return response()->json([], 204);
}
/**
* @param array $params
*
* @return bool
*/
private function updatesTransactionAccount(array $params): bool
{
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

@@ -1,7 +1,7 @@
<?php
declare(strict_types=1);
/*
* AccountController.php
* ExportController.php
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
@@ -20,13 +20,15 @@ declare(strict_types=1);
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
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
@@ -52,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
{
@@ -69,9 +74,7 @@ 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
{
@@ -90,16 +93,19 @@ class ExportController extends Controller
->header('Expires', '0')
->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
->header('Pragma', 'public')
->header('Content-Length', (string)strlen($data[$key]));
->header('Content-Length', (string) strlen($data[$key]));
return $response;
}
/**
* 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
{
@@ -109,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
{
@@ -122,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
{
@@ -135,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
{
@@ -148,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
{
@@ -161,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
{
@@ -174,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
{
@@ -187,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
@@ -88,11 +91,11 @@ class AccountController extends Controller
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
'id' => (string)$expense['id'],
'id' => (string) $expense['id'],
'name' => $expense['name'],
'difference' => $expense['sum'],
'difference_float' => (float)$expense['sum'],
'currency_id' => (string)$expense['currency_id'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
@@ -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
@@ -117,11 +123,11 @@ class AccountController extends Controller
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
'id' => (string)$expense['id'],
'id' => (string) $expense['id'],
'name' => $expense['name'],
'difference' => $expense['sum'],
'difference_float' => (float)$expense['sum'],
'currency_id' => (string)$expense['currency_id'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}

View File

@@ -1,7 +1,7 @@
<?php
declare(strict_types=1);
/*
* PeriodController.php
* BillController.php
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
@@ -20,6 +20,8 @@ declare(strict_types=1);
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
use FireflyIII\Api\V1\Controllers\Controller;
@@ -54,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
@@ -80,33 +85,33 @@ class BillController extends Controller
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$billId = (int)$journal['bill_id'];
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
$billId = (int) $journal['bill_id'];
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
$key = sprintf('%d-%d', $billId, $currencyId);
$foreignKey = sprintf('%d-%d', $billId, $foreignCurrencyId);
if (0 !== $currencyId) {
$response[$key] = $response[$key] ?? [
'id' => (string)$billId,
'id' => (string) $billId,
'name' => $journal['bill_name'],
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$key]['difference'] = bcadd($response[$key]['difference'], $journal['amount']);
$response[$key]['difference_float'] = (float)$response[$key]['difference'];
$response[$key]['difference_float'] = (float) $response[$key]['difference'];
}
if (0 !== $foreignCurrencyId) {
$response[$foreignKey] = $response[$foreignKey] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignKey]['difference'] = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
$response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
}
}
@@ -114,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
@@ -135,28 +143,28 @@ class BillController extends Controller
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']);
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
}
}

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
@@ -85,11 +88,11 @@ class BudgetController extends Controller
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
'id' => (string)$budget->id,
'id' => (string) $budget->id,
'name' => $budget->name,
'difference' => $expense['sum'],
'difference_float' => (float)$expense['sum'],
'currency_id' => (string)$expense['currency_id'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
@@ -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
@@ -114,8 +120,8 @@ class BudgetController extends Controller
foreach ($expenses as $expense) {
$result[] = [
'difference' => $expense['sum'],
'difference_float' => (float)$expense['sum'],
'currency_id' => (string)$expense['currency_id'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}

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
@@ -86,11 +89,11 @@ class CategoryController extends Controller
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
'id' => (string)$category->id,
'id' => (string) $category->id,
'name' => $category->name,
'difference' => $expense['sum'],
'difference_float' => (float)$expense['sum'],
'currency_id' => (string)$expense['currency_id'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
@@ -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
@@ -115,8 +121,8 @@ class CategoryController extends Controller
foreach ($expenses as $expense) {
$result[] = [
'difference' => $expense['sum'],
'difference_float' => (float)$expense['sum'],
'currency_id' => (string)$expense['currency_id'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}

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
@@ -52,28 +55,28 @@ class PeriodController extends Controller
$collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']);
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
}
}

View File

@@ -1,7 +1,7 @@
<?php
declare(strict_types=1);
/*
* PeriodController.php
* TagController.php
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
@@ -20,6 +20,8 @@ declare(strict_types=1);
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
use FireflyIII\Api\V1\Controllers\Controller;
@@ -53,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
@@ -74,28 +79,28 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']);
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
}
}
@@ -103,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
@@ -129,8 +137,8 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals();
/** @var array $journal */
foreach ($genericSet as $journal) {
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
/** @var array $tag */
foreach ($journal['tags'] as $tag) {
@@ -141,15 +149,15 @@ class TagController extends Controller
// on currency ID
if (0 !== $currencyId) {
$response[$key] = $response[$key] ?? [
'id' => (string)$tagId,
'id' => (string) $tagId,
'name' => $tag['name'],
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$key]['difference'] = bcadd($response[$key]['difference'], $journal['amount']);
$response[$key]['difference_float'] = (float)$response[$key]['difference'];
$response[$key]['difference_float'] = (float) $response[$key]['difference'];
}
// on foreign ID
@@ -157,11 +165,11 @@ class TagController extends Controller
$response[$foreignKey] = $journal[$foreignKey] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignKey]['difference'] = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
$response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
}
}
}

View File

@@ -38,7 +38,6 @@ use Illuminate\Http\JsonResponse;
*
* Shows income information grouped or limited by date.
* Ie. all income grouped by account + currency.
* See reference nr. 75
*/
class AccountController extends Controller
{
@@ -74,8 +73,8 @@ class AccountController extends Controller
}
/**
* See reference nr. 76
* See reference nr. 77
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeAsset
*
* @param GenericRequest $request
*
@@ -91,11 +90,11 @@ class AccountController extends Controller
/** @var array $entry */
foreach ($income as $entry) {
$result[] = [
'id' => (string)$entry['id'],
'id' => (string) $entry['id'],
'name' => $entry['name'],
'difference' => $entry['sum'],
'difference_float' => (float)$entry['sum'],
'currency_id' => (string)$entry['currency_id'],
'difference_float' => (float) $entry['sum'],
'currency_id' => (string) $entry['currency_id'],
'currency_code' => $entry['currency_code'],
];
}
@@ -104,7 +103,8 @@ class AccountController extends Controller
}
/**
* See reference nr. 78
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeRevenue
*
* @param GenericRequest $request
*
@@ -122,11 +122,11 @@ class AccountController extends Controller
/** @var array $entry */
foreach ($income as $entry) {
$result[] = [
'id' => (string)$entry['id'],
'id' => (string) $entry['id'],
'name' => $entry['name'],
'difference' => $entry['sum'],
'difference_float' => (float)$entry['sum'],
'currency_id' => (string)$entry['currency_id'],
'difference_float' => (float) $entry['sum'],
'currency_id' => (string) $entry['currency_id'],
'currency_code' => $entry['currency_code'],
];
}

View File

@@ -35,7 +35,6 @@ use Illuminate\Support\Collection;
/**
* Class CategoryController
* See reference nr. 79
*/
class CategoryController extends Controller
{
@@ -67,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
@@ -87,11 +89,11 @@ class CategoryController extends Controller
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
'id' => (string)$category->id,
'id' => (string) $category->id,
'name' => $category->name,
'difference' => $expense['sum'],
'difference_float' => (float)$expense['sum'],
'currency_id' => (string)$expense['currency_id'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
@@ -101,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
@@ -116,8 +121,8 @@ class CategoryController extends Controller
foreach ($expenses as $expense) {
$result[] = [
'difference' => $expense['sum'],
'difference_float' => (float)$expense['sum'],
'currency_id' => (string)$expense['currency_id'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}

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
@@ -52,30 +55,30 @@ class PeriodController extends Controller
$collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
}
}

View File

@@ -1,7 +1,7 @@
<?php
declare(strict_types=1);
/*
* PeriodController.php
* TagController.php
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
@@ -20,6 +20,8 @@ declare(strict_types=1);
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Insight\Income;
use FireflyIII\Api\V1\Controllers\Controller;
@@ -54,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
@@ -75,30 +80,30 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
}
}
@@ -106,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
@@ -132,8 +140,8 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals();
/** @var array $journal */
foreach ($genericSet as $journal) {
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
/** @var array $tag */
foreach ($journal['tags'] as $tag) {
@@ -144,15 +152,15 @@ class TagController extends Controller
// on currency ID
if (0 !== $currencyId) {
$response[$key] = $response[$key] ?? [
'id' => (string)$tagId,
'id' => (string) $tagId,
'name' => $tag['name'],
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$key]['difference'] = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
$response[$key]['difference_float'] = (float)$response[$key]['difference'];
$response[$key]['difference_float'] = (float) $response[$key]['difference'];
}
// on foreign ID
@@ -160,13 +168,13 @@ class TagController extends Controller
$response[$foreignKey] = $journal[$foreignKey] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignKey]['difference'] = bcadd(
$response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
}
}
}

View File

@@ -58,8 +58,8 @@ class AccountController extends Controller
}
/**
* See reference nr. 80
* See reference nr. 81
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransfers
*
* @param GenericRequest $request
*
@@ -71,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
@@ -85,11 +88,11 @@ class CategoryController extends Controller
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
'id' => (string)$category->id,
'id' => (string) $category->id,
'name' => $category->name,
'difference' => $expense['sum'],
'difference_float' => (float)$expense['sum'],
'currency_id' => (string)$expense['currency_id'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
@@ -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
@@ -114,8 +120,8 @@ class CategoryController extends Controller
foreach ($expenses as $expense) {
$result[] = [
'difference' => $expense['sum'],
'difference_float' => (float)$expense['sum'],
'currency_id' => (string)$expense['currency_id'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}

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
@@ -52,30 +55,30 @@ class PeriodController extends Controller
$collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
}
}

View File

@@ -39,7 +39,6 @@ class TagController extends Controller
/**
* TagController constructor.
* See reference nr. 82
*/
public function __construct()
{
@@ -56,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
*
@@ -77,30 +77,30 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
}
}
@@ -108,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
@@ -134,8 +137,8 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals();
/** @var array $journal */
foreach ($genericSet as $journal) {
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
/** @var array $tag */
foreach ($journal['tags'] as $tag) {
@@ -146,15 +149,15 @@ class TagController extends Controller
// on currency ID
if (0 !== $currencyId) {
$response[$key] = $response[$key] ?? [
'id' => (string)$tagId,
'id' => (string) $tagId,
'name' => $tag['name'],
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$key]['difference'] = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
$response[$key]['difference_float'] = (float)$response[$key]['difference'];
$response[$key]['difference_float'] = (float) $response[$key]['difference'];
}
// on foreign ID
@@ -162,13 +165,13 @@ class TagController extends Controller
$response[$foreignKey] = $journal[$foreignKey] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignKey]['difference'] = bcadd(
$response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
}
}
}

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,16 +70,19 @@ 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
{
$manager = $this->getManager();
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($account);
$count = $collection->count();
@@ -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
@@ -113,7 +118,7 @@ class ListController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getPiggyBanks($account);
@@ -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,11 +152,11 @@ class ListController extends Controller
* @param Account $account
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function transactions(Request $request, Account $account): JsonResponse
{
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);

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
@@ -81,7 +85,7 @@ class ShowController extends Controller
// types to get, page size:
$types = $this->mapAccountTypes($this->parameters->get('type'));
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of accounts. Count it and split it.
$this->repository->resetAccountOrder();
@@ -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

View File

@@ -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
@@ -100,7 +103,7 @@ class ShowController extends Controller
->header('Expires', '0')
->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
->header('Pragma', 'public')
->header('Content-Length', (string)strlen($content));
->header('Content-Length', (string) strlen($content));
return $response;
}
@@ -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
@@ -119,7 +125,7 @@ class ShowController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of attachments. Count it and split it.
$collection = $this->repository->get();
@@ -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

@@ -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

@@ -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
@@ -73,7 +77,7 @@ class ShowController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$start = $this->parameters->get('start');
$end = $this->parameters->get('end');
@@ -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,18 +67,21 @@ 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
{
$manager = $this->getManager();
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($bill);
$count = $collection->count();
@@ -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
@@ -111,7 +118,7 @@ class ListController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getRulesForBill($bill);
@@ -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,12 +150,12 @@ class ListController extends Controller
* @param Bill $bill
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Bill $bill): JsonResponse
{
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);

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
@@ -71,7 +74,7 @@ class ShowController extends Controller
$this->repository->correctOrder();
$bills = $this->repository->getBills();
$manager = $this->getManager();
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$count = $bills->count();
$bills = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
$paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
@@ -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

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

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,16 +71,19 @@ 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
{
$manager = $this->getManager();
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($budget);
$count = $collection->count();
@@ -100,18 +104,21 @@ 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
{
$manager = $this->getManager();
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$this->parameters->set('budget_id', $budget->id);
$collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
$count = $collection->count();
@@ -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,12 +146,12 @@ class ListController extends Controller
* @param Budget $budget
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Budget $budget): JsonResponse
{
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// user can overrule page size with limit parameter.
$limit = $this->parameters->get('limit');
@@ -191,4 +201,68 @@ class ListController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/listTransactionWithoutBudget
*
* Show all transactions.
*
* @param Request $request
*
* @return JsonResponse
* @throws FireflyException
* @codeCoverageIgnore
*/
public function withoutBudget(Request $request): JsonResponse
{
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// user can overrule page size with limit parameter.
$limit = $this->parameters->get('limit');
if (null !== $limit && $limit > 0) {
$pageSize = $limit;
}
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);
$types = $this->mapTransactionTypes($this->parameters->get('type'));
$manager = $this->getManager();
/** @var User $admin */
$admin = auth()->user();
// use new group collector:
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector
->setUser($admin)
// filter on budget.
->withoutBudget()
// all info needed for the API:
->withAPIInformation()
// set page size:
->setLimit($pageSize)
// set page to retrieve
->setPage($this->parameters->get('page'))
// set types of transactions to return.
->setTypes($types);
if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
$collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
}
$paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.budgets.without-budget') . $this->buildParams());
$transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */
$transformer = app(TransactionGroupTransformer::class);
$transformer->setParameters($this->parameters);
$resource = new FractalCollection($transactions, $transformer, 'transactions');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

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;
@@ -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
@@ -74,7 +78,7 @@ class ShowController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getBudgets();

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,12 +76,12 @@ 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
{
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);

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
@@ -83,7 +86,7 @@ class ShowController extends Controller
{
$manager = $this->getManager();
$manager->parseIncludes('budget');
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
$count = $collection->count();
$budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -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
*
@@ -113,7 +119,7 @@ class ShowController extends Controller
{
$manager = $this->getManager();
$manager->parseIncludes('budget');
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
$count = $collection->count();
$budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -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
@@ -140,7 +149,7 @@ class ShowController extends Controller
*/
public function show(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{
if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
if ((int) $budget->id !== (int) $budgetLimit->budget_id) {
throw new FireflyException('20028: The budget limit does not belong to the budget.');
}
// continue!

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
@@ -74,7 +77,7 @@ class UpdateController extends Controller
public function update(UpdateRequest $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{
if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
if ((int) $budget->id !== (int) $budgetLimit->budget_id) {
throw new FireflyException('20028: The budget limit does not belong to the budget.');
}
$data = $request->getAll();

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,16 +66,19 @@ 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
{
$manager = $this->getManager();
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($category);
$count = $collection->count();
@@ -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,12 +109,12 @@ class ListController extends Controller
* @param Category $category
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Category $category): JsonResponse
{
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);

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
@@ -71,7 +74,7 @@ class ShowController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getCategories();
@@ -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

View File

@@ -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;
@@ -62,19 +63,22 @@ 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
{
$manager = $this->getManager();
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of piggy banks. Count it and split it.
$collection = $this->repository->getBills($objectGroup);
$count = $collection->count();
@@ -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
@@ -109,7 +116,7 @@ class ListController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of piggy banks. Count it and split it.
$collection = $this->repository->getPiggyBanks($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\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
@@ -76,7 +80,7 @@ class ShowController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$this->repository->resetOrder();
$collection = $this->repository->get();
@@ -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

@@ -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,16 +60,19 @@ 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
{
$manager = $this->getManager();
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($piggyBank);
$count = $collection->count();
@@ -89,18 +93,21 @@ 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
{
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$manager = $this->getManager();
$collection = $this->repository->getEvents($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\PiggyBankTransformer;
@@ -59,17 +60,20 @@ 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
{
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getPiggyBanks();
@@ -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

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

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