Commit Graph

18849 Commits

Author SHA1 Message Date
github-actions
5c352a0d3e Auto commit for release 'develop' on 2024-02-12 2024-02-12 01:29:15 +01:00
James Cole
fded058ea6
Rebuild frontend. 2024-02-11 19:16:27 +01:00
James Cole
99f041b114
Editable up until date. 2024-02-11 10:43:14 +01:00
James Cole
283b594995
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop
# Conflicts:
#	app/Helpers/Collector/GroupCollector.php
2024-02-10 08:29:59 +01:00
James Cole
723aa65e7a
Inline edit for v2 2024-02-10 08:28:59 +01:00
github-actions
64d315ad51 Auto commit for release 'develop' on 2024-02-08 2024-02-08 01:29:34 +01:00
James Cole
d0844356cb
Fix https://github.com/firefly-iii/firefly-iii/issues/8521 2024-02-07 06:14:40 +01:00
James Cole
ba8d65835a
Remove unused translation. 2024-02-07 06:02:43 +01:00
github-actions
fa3343f437 Auto commit for release 'v6.1.9' on 2024-02-05 2024-02-05 19:53:12 +01:00
James Cole
c5b8a951d2
Update changelog for new release. 2024-02-05 06:37:16 +01:00
James Cole
20b1fc05cb
Don't put a "v" in front of the version when it's a develop version. 2024-02-05 06:29:19 +01:00
github-actions
ab441d7d0c Auto commit for release 'develop' on 2024-02-05 2024-02-05 01:31:01 +01:00
James Cole
b621d14bdf
Merge branch 'main' into develop 2024-02-04 06:42:12 +01:00
James Cole
94730e998b
Better workflow for prune. 2024-02-04 06:39:55 +01:00
James Cole
23c2f76e52
Merge branch 'main' into develop 2024-02-04 06:36:42 +01:00
James Cole
40196d48b2
Back to monday/thursday 2024-02-04 06:36:32 +01:00
James Cole
ef3c2eb701
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2024-02-04 06:35:50 +01:00
github-actions
4f994a2795 Auto commit for release 'develop' on 2024-02-04 2024-02-04 01:31:06 +01:00
James Cole
807e575dac
Merge pull request #8502 from likuilin/issue-8501
Fix incorrect ID in bulk delete tx URL
2024-02-03 20:35:55 +01:00
kuilin
04b1465eb7
Fix incorrect ID in bulk delete tx URL
Fixes #8501

Signed-off-by: kuilin <kuilin@gmail.com>
2024-02-03 14:23:26 -05:00
James Cole
6f79ab2a70
Merge branch 'main' into develop 2024-02-03 20:00:52 +01:00
James Cole
c1469f016e
Add version to develop branch. 2024-02-03 20:00:41 +01:00
James Cole
373ec934df
Update version, fix https://github.com/firefly-iii/firefly-iii/issues/8499 2024-02-03 19:04:25 +01:00
github-actions
abd34ba1dc Auto commit for release 'v6.1.8' on 2024-02-03 2024-02-03 16:38:48 +01:00
James Cole
89b7596caf
Add fixed issue to changelog. 2024-02-03 16:31:58 +01:00
James Cole
3543548ba0
Fix https://github.com/firefly-iii/firefly-iii/issues/8497 2024-02-03 13:09:44 +01:00
James Cole
a932965908
Merge branch 'main' into develop 2024-02-03 10:09:41 +01:00
James Cole
9056126328
Update release script. 2024-02-03 10:09:30 +01:00
James Cole
0e85a5123d
Changelog for next release. 2024-02-03 10:08:46 +01:00
James Cole
d3f19db42d
This should fix the tests again. 2024-02-03 10:08:34 +01:00
James Cole
9894d16d26
Fix https://github.com/firefly-iii/firefly-iii/issues/8493 2024-02-03 07:51:18 +01:00
James Cole
0b069bcb58
Merge branch 'main' into develop 2024-02-01 05:44:52 +01:00
James Cole
36d54c3fac
Cast to string. 2024-02-01 05:44:41 +01:00
James Cole
530e48f16e
Fix description. 2024-02-01 05:43:48 +01:00
github-actions
9763f9f922 Auto commit for release 'develop' on 2024-02-01 2024-02-01 01:31:55 +01:00
James Cole
bbd4d7a8ef
Rebuild JS as well. 2024-01-31 07:35:43 +01:00
James Cole
bafe2ece8c
Should fix message title. 2024-01-31 07:25:51 +01:00
James Cole
b2449eb726
Merge branch 'main' into develop 2024-01-31 06:38:48 +01:00
James Cole
353c345d9a
Updated release script. 2024-01-31 06:38:36 +01:00
James Cole
e2461ba839
Also support redirect 2024-01-30 18:14:56 +01:00
James Cole
e199fdd2b6
Make sure the demo user can't export data. 2024-01-30 18:11:45 +01:00
James Cole
592a89d6a5
Merge pull request #8478 from firefly-iii/dependabot/github_actions/actions/github-script-7
Bump actions/github-script from 6 to 7
2024-01-30 08:31:34 +01:00
James Cole
7a7b629225
Merge pull request #8477 from firefly-iii/dependabot/github_actions/actions/checkout-4
Bump actions/checkout from 3 to 4
2024-01-30 08:31:25 +01:00
James Cole
21a4774561
Merge pull request #8476 from firefly-iii/dependabot/github_actions/actions/dependency-review-action-4
Bump actions/dependency-review-action from 3 to 4
2024-01-30 08:31:17 +01:00
James Cole
5be97bb18f
Merge pull request #8475 from firefly-iii/dependabot/github_actions/JC5/firefly-iii-dev-29
Bump JC5/firefly-iii-dev from 16 to 29
2024-01-30 08:31:07 +01:00
dependabot[bot]
a12ff10550
Bump actions/github-script from 6 to 7
Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-30 07:28:29 +00:00
dependabot[bot]
c808294ca1
Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-30 07:28:25 +00:00
dependabot[bot]
9dcf264658
Bump actions/dependency-review-action from 3 to 4
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3 to 4.
- [Release notes](https://github.com/actions/dependency-review-action/releases)
- [Commits](https://github.com/actions/dependency-review-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/dependency-review-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-30 07:28:21 +00:00
dependabot[bot]
e0bbd3a810
Bump JC5/firefly-iii-dev from 16 to 29
Bumps [JC5/firefly-iii-dev](https://github.com/jc5/firefly-iii-dev) from 16 to 29.
- [Commits](https://github.com/jc5/firefly-iii-dev/compare/v16...v29)

---
updated-dependencies:
- dependency-name: JC5/firefly-iii-dev
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-30 07:28:16 +00:00
James Cole
2886a22f4e
Update dependabot.yml
Signed-off-by: James Cole <james@firefly-iii.org>
2024-01-30 08:27:47 +01:00