Commit Graph

17351 Commits

Author SHA1 Message Date
James Cole
05bd732e7c
Merge pull request #7163 from firefly-iii/issue-template-updates
Small issue template updates
2023-03-07 05:23:04 +01:00
James Cole
70050678c5
Small issue template updates 2023-03-07 05:22:36 +01:00
James Cole
6a649f2f42
Merge pull request #7160 from firefly-iii/fix-7159
Fix #7159
2023-03-06 21:00:54 +01:00
James Cole
6912e05677
Fix #7159 2023-03-06 21:00:27 +01:00
James Cole
c78fa8eaea
Merge pull request #7151 from firefly-iii/fix-7144
Fix #7144
2023-03-06 05:55:20 +01:00
James Cole
5a06e3523b
Merge pull request #7150 from firefly-iii/fix-7140
Fix #7140 by better validating header content.
2023-03-06 05:54:36 +01:00
James Cole
b34cb0428b
Merge pull request #7149 from firefly-iii/mail-provider
Make sure default mail provider is "log", not smtp
2023-03-06 05:53:11 +01:00
James Cole
ce3c866168
Make sure default mail provider is "log", not smtp 2023-03-06 05:52:41 +01:00
James Cole
4ada2f3e3c
Merge pull request #7147 from firefly-iii/dependabot/composer/develop/nunomaduro/collision-7.1.0
Bump nunomaduro/collision from 7.0.5 to 7.1.0
2023-03-06 05:47:14 +01:00
dependabot[bot]
ad739c1d84
Bump nunomaduro/collision from 7.0.5 to 7.1.0
Bumps [nunomaduro/collision](https://github.com/nunomaduro/collision) from 7.0.5 to 7.1.0.
- [Release notes](https://github.com/nunomaduro/collision/releases)
- [Changelog](https://github.com/nunomaduro/collision/blob/v7.x/CHANGELOG.md)
- [Commits](https://github.com/nunomaduro/collision/compare/v7.0.5...v7.1.0)

---
updated-dependencies:
- dependency-name: nunomaduro/collision
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-06 04:46:06 +00:00
James Cole
60af2c4232
Merge pull request #7146 from firefly-iii/dependabot/composer/develop/nunomaduro/larastan-2.5.1 2023-03-06 05:45:29 +01:00
dependabot[bot]
cc69f50106
Bump nunomaduro/larastan from 2.4.1 to 2.5.1
Bumps [nunomaduro/larastan](https://github.com/nunomaduro/larastan) from 2.4.1 to 2.5.1.
- [Release notes](https://github.com/nunomaduro/larastan/releases)
- [Changelog](https://github.com/nunomaduro/larastan/blob/master/RELEASE.md)
- [Commits](https://github.com/nunomaduro/larastan/compare/2.4.1...2.5.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-06 03:56:26 +00:00
James Cole
0f57094b17
Fix #7144 2023-03-05 19:26:33 +01:00
James Cole
dad738ae42
Fix #7140 by better validating header content. 2023-03-05 17:07:27 +01:00
James Cole
3df05eb63c
Merge pull request #7136 from firefly-iii/fix-7130
Fix #7130
2023-03-05 08:00:11 +01:00
James Cole
57b83dd239
Fix #7130 2023-03-05 07:59:48 +01:00
James Cole
1539dcffd5 Revert "Fix #7130"
This reverts commit b4a09efb8b.
2023-03-05 07:57:40 +01:00
James Cole
b4a09efb8b
Fix #7130 2023-03-05 07:56:37 +01:00
James Cole
e82b372f75
Merge pull request #7134 from firefly-iii/fix-7131
Fix #7131 by expanding the global ajaxSetup instructions.
2023-03-05 07:52:09 +01:00
James Cole
83a89181bc
Add JSON.stringify 2023-03-05 07:00:04 +01:00
James Cole
b1e08b1084
Fix #7131 by expanding the global ajaxSetup instructions. 2023-03-05 06:09:25 +01:00
James Cole
0eb582ab3b
Merge pull request #7129 from firefly-iii/common-mail-errors
Catch common mail errors
2023-03-04 22:26:43 +01:00
James Cole
07b58b4200
Catch common mail errors 2023-03-04 22:26:09 +01:00
James Cole
8807f04599
Merge pull request #7128 from firefly-iii/fix-7127
Fix 7127
2023-03-04 22:19:17 +01:00
James Cole
4657d34ae4
Fix request 2023-03-04 22:18:37 +01:00
James Cole
79951453cd
Switch the button 2023-03-04 22:17:19 +01:00
James Cole
5291f485ac
Fix #7127 by adding an option to the API 2023-03-04 22:16:59 +01:00
James Cole
ed75d84376
Merge pull request #7116 from firefly-iii/fix-6985
Fix 6985
2023-03-04 07:36:10 +01:00
James Cole
a7011376cb
Add package. 2023-03-04 07:35:51 +01:00
James Cole
6c4bd84b66
Fix #6985 2023-03-04 07:35:30 +01:00
James Cole
c4418857e6
Merge pull request #7114 from firefly-iii/fix-7112
Fix https://github.com/firefly-iii/firefly-iii/issues/7112
2023-03-04 07:18:55 +01:00
James Cole
5d316ea26a
Fix https://github.com/firefly-iii/firefly-iii/issues/7112 2023-03-04 07:18:20 +01:00
James Cole
4a0887c978
Merge pull request #7109 from firefly-iii/css-fixes
CSS fixes for subdirectories. Full credits to @GaneshKandu
2023-03-03 09:15:11 +01:00
James Cole
dbfceafb02
CSS fixes for subdirectories. Full credits to @GaneshKandu 2023-03-03 09:14:44 +01:00
James Cole
4db73285b7 Merge branch 'main' into develop 2023-03-03 06:22:08 +01:00
James Cole
876ea8bb07
Merge pull request #7103 from firefly-iii/dependabot/npm_and_yarn/frontend/dns-packet-5.4.0
Bump dns-packet from 5.3.1 to 5.4.0 in /frontend
2023-03-03 06:21:40 +01:00
dependabot[bot]
e0e90845e7
Bump dns-packet from 5.3.1 to 5.4.0 in /frontend
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 5.3.1 to 5.4.0.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v5.3.1...5.4.0)

---
updated-dependencies:
- dependency-name: dns-packet
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-02 21:42:01 +00:00
James Cole
f1223a5a3f Merge tag 'v6.0.0' into develop
v6.0.0
2023-03-02 21:21:12 +01:00
James Cole
1a3720bfaa Merge branch 'release/v6.0.0' 2023-03-02 21:21:11 +01:00
James Cole
1ddcc51c48
Merge pull request #7102 from firefly-iii/final-60
Final 60
2023-03-02 21:19:40 +01:00
James Cole
9f43ea3118
Update packages. 2023-03-02 21:19:17 +01:00
James Cole
0fe4ac9ef5
Update files for 6.0.0 2023-03-02 21:18:06 +01:00
James Cole
d6d395eccd
Merge pull request #7101 from firefly-iii/fix-liabilities
Fix liabilities
2023-03-02 21:08:20 +01:00
James Cole
a26f5e2e6d
Do not remove liabilities. 2023-03-02 21:06:53 +01:00
James Cole
849e006eda
Merge pull request #7094 from firefly-iii/fix-7093
Fix https://github.com/firefly-iii/firefly-iii/issues/7093
2023-03-01 07:32:39 +01:00
James Cole
f70a4511c6
Fix https://github.com/firefly-iii/firefly-iii/issues/7093 2023-03-01 07:32:19 +01:00
James Cole
21ba311ecf
Merge pull request #7092 from firefly-iii/fix-broken-chart
Fix broken chart
2023-03-01 06:41:16 +01:00
James Cole
fb0a100a7f
Fix broken chart 2023-03-01 06:40:58 +01:00
James Cole
2295110cf1
Merge pull request #7090 from firefly-iii/dependabot/composer/develop/laravel/framework-10.1.5
Bump laravel/framework from 10.1.4 to 10.1.5
2023-02-27 06:05:10 +01:00
James Cole
3c82c9af8b
Merge pull request #7089 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.10.3
Bump phpstan/phpstan from 1.10.2 to 1.10.3
2023-02-27 06:05:01 +01:00