Commit Graph

15746 Commits

Author SHA1 Message Date
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
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