Commit Graph

19568 Commits

Author SHA1 Message Date
James Cole
f9d4a43e05
This should fix the ci issues. 2024-02-22 06:57:57 +01:00
James Cole
92e7f344e0
Refresh update code. 2024-02-22 06:52:58 +01:00
github-actions
89ce2838d5 Auto commit for release 'develop' on 2024-02-22 2024-02-22 01:29:01 +01:00
James Cole
356b217692
Add missing array 2024-02-20 20:33:33 +01:00
James Cole
950e39b753
Clean up methods. 2024-02-20 20:05:43 +01:00
James Cole
8f14979717
Clean up rule set. 2024-02-20 19:59:55 +01:00
James Cole
aa2afd162e
Fix https://github.com/orgs/firefly-iii/discussions/8557 2024-02-20 19:51:13 +01:00
James Cole
fe33352ec1
Fix translation for https://github.com/firefly-iii/firefly-iii/issues/8555 2024-02-19 05:57:06 +01:00
github-actions
65c5249815 Auto commit for release 'develop' on 2024-02-19 2024-02-19 01:30:23 +01:00
James Cole
b1afaea1aa
Various updates. 2024-02-18 11:35:08 +01:00
James Cole
997dc3814b
Add host header validation 2024-02-17 08:18:49 +01:00
James Cole
b37b5b86d4
Fix https://github.com/firefly-iii/firefly-iii/issues/8544 2024-02-16 20:42:04 +01:00
github-actions
b13a4e1016 Auto commit for release 'develop' on 2024-02-15 2024-02-15 01:29:20 +01:00
James Cole
7897ebc4d5
Update code 2024-02-14 19:47:35 +01:00
James Cole
ac17b82d85
Do not complain when the category is already set. 2024-02-14 19:34:36 +01:00
James Cole
1b1712d998
Make sure that errors in the incoming webhook url are caught. 2024-02-14 19:32:15 +01:00
James Cole
a2c0d9f7d0
The update checker can handle the development releases 2024-02-14 06:34:38 +01:00
James Cole
5b68b25c85
Merge pull request #8538 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-11.0.3
Bump phpunit/phpunit from 10.5.10 to 11.0.3
2024-02-12 19:52:51 +01:00
dependabot[bot]
d3a215b575
Bump phpunit/phpunit from 10.5.10 to 11.0.3
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 10.5.10 to 11.0.3.
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/11.0.3/ChangeLog-11.0.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/10.5.10...11.0.3)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-12 03:35:09 +00:00
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