Commit Graph

15866 Commits

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