Commit Graph

16557 Commits

Author SHA1 Message Date
James Cole
93c83fbe7a Rename method 2022-10-01 05:29:42 +02:00
James Cole
4474a71e65 Attempted fix for #6475 2022-09-30 20:07:01 +02:00
James Cole
1558e87923 Fix https://github.com/firefly-iii/firefly-iii/issues/6461 2022-09-30 19:56:24 +02:00
James Cole
c6bc308ce7 Merge branch 'main' into develop 2022-09-30 19:46:57 +02:00
James Cole
c49f3fcccf Merge pull request #6476 from firefly-iii/dependabot/composer/twig/twig-3.4.3
Bump twig/twig from 3.4.2 to 3.4.3
2022-09-30 18:15:49 +02:00
dependabot[bot]
d144392bd6 Bump twig/twig from 3.4.2 to 3.4.3
Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/twigphp/Twig/releases)
- [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG)
- [Commits](https://github.com/twigphp/Twig/compare/v3.4.2...v3.4.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-30 15:47:40 +00:00
James Cole
0671f20ab1 Merge pull request #6464 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.4.5
Bump doctrine/dbal from 3.4.4 to 3.4.5
2022-09-26 05:42:18 +02:00
James Cole
4bdc5fa3fc Merge pull request #6463 from firefly-iii/dependabot/composer/develop/laravel/framework-9.31.0
Bump laravel/framework from 9.30.1 to 9.31.0
2022-09-26 05:41:35 +02:00
James Cole
ddff192a1f Merge pull request #6462 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.25
Bump phpunit/phpunit from 9.5.24 to 9.5.25
2022-09-26 05:40:36 +02:00
dependabot[bot]
ff55b36f32 Bump doctrine/dbal from 3.4.4 to 3.4.5
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.4.4 to 3.4.5.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.4.4...3.4.5)

---
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-09-26 03:01:06 +00:00
dependabot[bot]
8e4c772dcd Bump laravel/framework from 9.30.1 to 9.31.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.30.1 to 9.31.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.30.1...v9.31.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-09-26 03:01:00 +00:00
dependabot[bot]
fd7683c212 Bump phpunit/phpunit from 9.5.24 to 9.5.25
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.24 to 9.5.25.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/main/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.24...9.5.25)

---
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-09-26 03:00:52 +00:00
James Cole
6f9482fc1b Merge pull request #6444 from firefly-iii/dependabot/composer/develop/spatie/laravel-ignition-1.5.0
Bump spatie/laravel-ignition from 1.4.1 to 1.5.0
2022-09-19 08:16:56 +02:00
James Cole
af6e70c41c Merge pull request #6448 from firefly-iii/dependabot/composer/develop/laravel/passport-11.2.0
Bump laravel/passport from 11.1.0 to 11.2.0
2022-09-19 08:16:02 +02:00
dependabot[bot]
7116c65bd7 Bump laravel/passport from 11.1.0 to 11.2.0
Bumps [laravel/passport](https://github.com/laravel/passport) from 11.1.0 to 11.2.0.
- [Release notes](https://github.com/laravel/passport/releases)
- [Changelog](https://github.com/laravel/passport/blob/11.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/passport/compare/v11.1.0...v11.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>
2022-09-19 06:14:40 +00:00
dependabot[bot]
9e98c52c64 Bump spatie/laravel-ignition from 1.4.1 to 1.5.0
Bumps [spatie/laravel-ignition](https://github.com/spatie/laravel-ignition) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/spatie/laravel-ignition/releases)
- [Changelog](https://github.com/spatie/laravel-ignition/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/laravel-ignition/compare/1.4.1...1.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-19 06:14:38 +00:00
James Cole
c5e0c492a7 Merge pull request #6445 from firefly-iii/dependabot/composer/develop/spatie/data-transfer-object-3.9.1
Bump spatie/data-transfer-object from 3.8.1 to 3.9.1
2022-09-19 08:14:01 +02:00
James Cole
f43c74df66 Merge pull request #6443 from firefly-iii/dependabot/composer/develop/laravel/framework-9.30.1
Bump laravel/framework from 9.29.0 to 9.30.1
2022-09-19 08:13:49 +02:00
James Cole
40dbae17b1 Merge pull request #6447 from firefly-iii/dependabot/composer/develop/laravel/ui-4.0.2
Bump laravel/ui from 4.0.1 to 4.0.2
2022-09-19 08:13:39 +02:00
dependabot[bot]
3ca88adade Bump laravel/ui from 4.0.1 to 4.0.2
Bumps [laravel/ui](https://github.com/laravel/ui) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/laravel/ui/releases)
- [Changelog](https://github.com/laravel/ui/blob/4.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/ui/compare/v4.0.1...v4.0.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>
2022-09-19 06:12:01 +00:00
dependabot[bot]
c8be9ceaf5 Bump spatie/data-transfer-object from 3.8.1 to 3.9.1
Bumps [spatie/data-transfer-object](https://github.com/spatie/data-transfer-object) from 3.8.1 to 3.9.1.
- [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.8.1...3.9.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-19 06:09:39 +00:00
James Cole
52df1aad14 Merge pull request #6446 from firefly-iii/dependabot/composer/develop/ramsey/uuid-4.5.1
Bump ramsey/uuid from 4.4.0 to 4.5.1
2022-09-19 08:09:08 +02:00
dependabot[bot]
6bc73f4f55 Bump ramsey/uuid from 4.4.0 to 4.5.1
Bumps [ramsey/uuid](https://github.com/ramsey/uuid) from 4.4.0 to 4.5.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.4.0...4.5.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-09-19 03:01:26 +00:00
dependabot[bot]
4ade02efc8 Bump laravel/framework from 9.29.0 to 9.30.1
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.29.0 to 9.30.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/v9.29.0...v9.30.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>
2022-09-19 03:01:10 +00:00
James Cole
eef14ced59 Add amount check. Not sure why rule doesn't fire. 2022-09-18 05:53:11 +02:00
James Cole
11ba24482f Merge branch 'release/5.7.12' 5.7.12 2022-09-11 07:27:37 +02:00
James Cole
e5bc074e68 Merge tag '5.7.12' into develop
5.7.12
2022-09-11 07:27:37 +02:00
James Cole
93ea86f921 Fix meta files for new release. 2022-09-11 07:27:16 +02:00
James Cole
cf8957a460 Fix https://github.com/firefly-iii/firefly-iii/issues/6332 2022-09-11 07:08:54 +02:00
James Cole
9c2f771bae Fix https://github.com/firefly-iii/firefly-iii/issues/6333 2022-09-11 07:08:02 +02:00
James Cole
d9e8f8106a Fix https://github.com/firefly-iii/firefly-iii/issues/6379 2022-09-11 07:02:39 +02:00
James Cole
6589f88883 Fix https://github.com/firefly-iii/firefly-iii/issues/6421 2022-09-11 06:58:16 +02:00
James Cole
38ebdd8249 Merge pull request #6423 from canoine/develop
Redis username needed for both databases
2022-09-10 06:09:42 +02:00
canoine
6296ead897 Redis username needed for both databases
Redis username needed for both 'default' and 'cache' databases
2022-09-09 14:21:16 +02:00
James Cole
ecf5cc62f9 Fix https://github.com/firefly-iii/firefly-iii/issues/6287 2022-09-08 06:22:02 +02:00
James Cole
b205cc87fc Merge tag '5.7.11' into develop
5.7.11
2022-09-07 18:38:57 +02:00
James Cole
4c60473f02 Merge branch 'release/5.7.11' 5.7.11 2022-09-07 18:38:56 +02:00
James Cole
f47464944b Update packages 2022-09-07 18:33:23 +02:00
James Cole
edb9480c90 Merge pull request #6413 from firefly-iii/dependabot/composer/develop/predis/predis-2.0.1
Bump predis/predis from 2.0.0 to 2.0.1
2022-09-05 20:05:40 +02:00
dependabot[bot]
615e789134 Bump predis/predis from 2.0.0 to 2.0.1
Bumps [predis/predis](https://github.com/predis/predis) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/predis/predis/releases)
- [Changelog](https://github.com/predis/predis/blob/main/CHANGELOG.md)
- [Commits](https://github.com/predis/predis/compare/v2.0.0...v2.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-05 13:09:42 +00:00
James Cole
3e96bb526c Store secret correctly. 2022-09-05 05:39:47 +02:00
James Cole
1d21a8788c Update packages and meta data. 2022-09-04 13:58:21 +02:00
James Cole
e420ead9e8 Update translations. 2022-09-04 13:53:24 +02:00
James Cole
06b7f18d55 Make 2FA code + validation more robust. Thanks to @jtmoss3991, @timaschew and @Ottega. 2022-09-04 13:32:59 +02:00
James Cole
8659c7efbd Skip error 2022-09-04 13:31:46 +02:00
James Cole
80fe52f5d7 Merge pull request #6383 from firefly-iii/dependabot/composer/develop/guzzlehttp/guzzle-7.5.0
Bump guzzlehttp/guzzle from 7.4.5 to 7.5.0
2022-08-29 05:55:27 +02:00
dependabot[bot]
77358301e8 Bump guzzlehttp/guzzle from 7.4.5 to 7.5.0
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.5 to 7.5.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.4.5...7.5.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>
2022-08-29 03:55:01 +00:00
James Cole
93ed1de23f Merge pull request #6385 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.12
Bump symfony/http-client from 6.0.11 to 6.0.12
2022-08-29 05:54:52 +02:00
James Cole
a81ca5114b Merge pull request #6386 from firefly-iii/dependabot/composer/develop/laravel/passport-11.0.0
Bump laravel/passport from 10.4.1 to 11.0.0
2022-08-29 05:54:35 +02:00
James Cole
9a69b941d8 Merge pull request #6387 from firefly-iii/dependabot/npm_and_yarn/develop/jquery-3.6.1
Bump jquery from 3.6.0 to 3.6.1
2022-08-29 05:54:20 +02:00