Commit Graph

18895 Commits

Author SHA1 Message Date
Michael Thomas
b572c1dcd3 Merge remote-tracking branch 'upstream/main' into feat/expression-engine 2024-03-06 21:38:40 -05:00
Michael Thomas
95593f847b feat: update all rules to support action value expressions 2024-03-06 20:54:50 -05:00
Michael Thomas
daddee7806 feat: support action expression parsing, validation, and evaluation 2024-03-06 17:50:16 -05:00
github-actions
90d58ec8fa Auto commit for release 'v6.1.10' on 2024-03-02 2024-03-02 17:12:03 +01:00
github-actions
e92dd7f464 Merge branch 'develop' 2024-03-02 16:08:11 +00:00
James Cole
3bdf9eeed2
Jump to v34 2024-03-02 17:06:47 +01:00
James Cole
558ac7b0da
Update changelog. 2024-03-02 16:53:19 +01:00
James Cole
9d0488ffbc
fix phpstan issues. 2024-02-29 06:39:58 +01:00
James Cole
d7fa8b283e
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2024-02-29 06:27:24 +01:00
James Cole
a0097bd613
Fix issues with available budgets. 2024-02-29 06:26:23 +01:00
github-actions
ffc2156e5f Auto commit for release 'develop' on 2024-02-29 2024-02-29 01:28:57 +01:00
James Cole
e0a89bb5fe
Rebuild JS 2024-02-26 20:08:14 +01:00
James Cole
647179cd3c
Rebuild JS 2024-02-26 19:56:19 +01:00
James Cole
5106ccdbd7
Merge branch 'main' into develop 2024-02-26 19:55:14 +01:00
James Cole
7103098fe7
Better error handling 2024-02-26 19:54:45 +01:00
James Cole
f8072f0bfc
Merge pull request #8588 from firefly-iii/dependabot/github_actions/JC5/firefly-iii-dev-33
Bump JC5/firefly-iii-dev from 32 to 33
2024-02-26 06:17:04 +01:00
dependabot[bot]
96ac3a95c8
Bump JC5/firefly-iii-dev from 32 to 33
Bumps [JC5/firefly-iii-dev](https://github.com/jc5/firefly-iii-dev) from 32 to 33.
- [Commits](https://github.com/jc5/firefly-iii-dev/compare/v32...v33)

---
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-02-26 03:23:03 +00:00
github-actions
cd713dc40f Auto commit for release 'develop' on 2024-02-26 2024-02-26 01:29:50 +01:00
James Cole
d9fba39d80
Fix detection of transaction type. 2024-02-25 18:24:10 +01:00
James Cole
2564470197
Update source account detection. 2024-02-25 18:14:30 +01:00
James Cole
9222c82af0
Expand frontend, first attempt at sorting. 2024-02-25 18:09:52 +01:00
James Cole
243f283bfd
Fix tests 2024-02-24 08:36:57 +01:00
James Cole
5b60aaecc0
Update translations. 2024-02-24 08:19:23 +01:00
James Cole
20a4caec60
Add some missing translations 2024-02-24 06:03:34 +01:00
James Cole
99cc096b71
Fix https://github.com/firefly-iii/firefly-iii/issues/8578 2024-02-24 05:38:02 +01:00
James Cole
5626d1c56d
Fix https://github.com/firefly-iii/firefly-iii/issues/8575 2024-02-23 17:06:25 +01:00
James Cole
68c9c4ec3c
PHPStorm can order methods by alphabet, who knew. 2024-02-22 20:11:09 +01:00
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