James Cole
7f7d7be646
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop
2020-08-26 18:06:24 +02:00
James Cole
2f2a02834b
Fix #3736
2020-08-26 18:06:14 +02:00
James Cole
e2a3aa12a8
Merge pull request #3733 from glmdev/glmdev-ldap-filter
...
Add config option to specify custom LDAP filter
2020-08-26 14:53:11 +00:00
root
a4f70794a2
LdapFilterScope - make ldap filter config call coerce string
2020-08-26 14:46:01 +00:00
root
0ee3941b43
This adds support for the ADLDAP_AUTH_FILTER env var, and the
...
ldap_auth.custom_filter config option. These are optional.
If provided, the custom filter will be applied to the LDAP query
using the FireflyIII\Scopes\LdapFilterScope class.
This allows the integrator to specify a custom LDAP filter.
2020-08-26 14:07:47 +00:00
James Cole
4e05ce4c35
Wrong field when updating limit
2020-08-25 06:21:44 +02:00
James Cole
c5fa48ca46
Extra text
2020-08-25 06:12:43 +02:00
James Cole
20e39b2e12
Missing default variable.
2020-08-25 06:10:52 +02:00
James Cole
d28394c5d9
Update changelog.
2020-08-24 18:31:26 +02:00
James Cole
86fff1b61c
Update packages.
2020-08-24 18:31:18 +02:00
James Cole
71ef5abea5
Remove references to unused code.
2020-08-24 18:31:10 +02:00
James Cole
6b83313ce8
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop
2020-08-24 18:05:27 +02:00
James Cole
2fe93656ee
Delete unused files.
2020-08-24 18:05:05 +02:00
James Cole
ec8003245f
Clean up configuration file.
2020-08-24 18:00:49 +02:00
James Cole
8f632cb57b
Merge pull request #3725 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/axios-0.20.0
...
Bump axios from 0.19.2 to 0.20.0 in /frontend
2020-08-24 08:07:53 +00:00
dependabot[bot]
d7b9129c33
Bump axios from 0.19.2 to 0.20.0 in /frontend
...
Bumps [axios](https://github.com/axios/axios ) from 0.19.2 to 0.20.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.19.2...v0.20.0 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-08-24 08:04:30 +00:00
James Cole
82efe530ea
Merge pull request #3724 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/vue-chartjs-3.5.1
...
Bump vue-chartjs from 3.5.0 to 3.5.1 in /frontend
2020-08-24 08:03:39 +00:00
James Cole
b3805585a7
Merge pull request #3726 from firefly-iii/dependabot/npm_and_yarn/develop/axios-0.20.0
...
Bump axios from 0.19.2 to 0.20.0
2020-08-24 08:03:03 +00:00
James Cole
04b84fd0dc
Merge pull request #3727 from firefly-iii/dependabot/composer/develop/vimeo/psalm-3.14.2
...
Bump vimeo/psalm from 3.14.1 to 3.14.2
2020-08-24 07:58:56 +00:00
dependabot[bot]
2ac405b2d0
Bump vimeo/psalm from 3.14.1 to 3.14.2
...
Bumps [vimeo/psalm](https://github.com/vimeo/psalm ) from 3.14.1 to 3.14.2.
- [Release notes](https://github.com/vimeo/psalm/releases )
- [Commits](https://github.com/vimeo/psalm/compare/3.14.1...3.14.2 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-08-24 07:14:39 +00:00
dependabot[bot]
eb8571a508
Bump axios from 0.19.2 to 0.20.0
...
Bumps [axios](https://github.com/axios/axios ) from 0.19.2 to 0.20.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.19.2...v0.20.0 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-08-24 07:03:01 +00:00
dependabot[bot]
f7e75e9b8a
Bump vue-chartjs from 3.5.0 to 3.5.1 in /frontend
...
Bumps [vue-chartjs](https://github.com/apertureless/vue-chartjs ) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/apertureless/vue-chartjs/releases )
- [Changelog](https://github.com/apertureless/vue-chartjs/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/apertureless/vue-chartjs/compare/v3.5.0...v3.5.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-08-24 06:43:49 +00:00
James Cole
0fd7dabbc1
Restore missing functions.
2020-08-24 07:38:33 +02:00
James Cole
9123454545
Migrate to new rule engine.
2020-08-24 07:31:50 +02:00
James Cole
3141ec0406
Expand search.
2020-08-24 07:03:17 +02:00
James Cole
4bf86500bd
Fix tag search
2020-08-23 18:48:40 +02:00
James Cole
bee54146bf
Fix #3721
2020-08-23 18:48:24 +02:00
James Cole
28698cc769
Make sure limits exist in rule engine.
2020-08-23 17:00:47 +02:00
James Cole
41f2339c8c
Switch to new rule engine on command line.
2020-08-23 16:37:08 +02:00
James Cole
ce34e097a2
Add new rule engine to API commands.
2020-08-23 16:26:39 +02:00
James Cole
fecc9f7659
Fix actions and associated tests.
2020-08-23 16:12:16 +02:00
James Cole
139b3ffab4
Test more rule actions.
2020-08-23 09:21:50 +02:00
James Cole
febe60b3d1
Test more actions in new format.
2020-08-23 08:51:58 +02:00
James Cole
fc519c41bc
Update conversion actions.
2020-08-23 08:03:28 +02:00
James Cole
6e074d9b8b
Start testing new rule actions.
2020-08-23 07:42:14 +02:00
James Cole
d89a4d8a54
Fix #3720
2020-08-23 05:52:59 +02:00
James Cole
a504617425
Mark all triggers as deprecated.
2020-08-22 20:07:39 +02:00
James Cole
0c0fef6e84
Fix #3715
2020-08-22 19:48:00 +02:00
James Cole
1dfda62125
Fix #3715
2020-08-22 19:46:08 +02:00
James Cole
5e0c0e25f2
Fix #3716
2020-08-22 19:27:16 +02:00
James Cole
07220eb167
Update rule actions.
2020-08-22 17:18:15 +02:00
James Cole
216a0a186c
Implement first version of the new rule engine.
2020-08-22 16:55:54 +02:00
James Cole
14df37712c
Fix date searches.
2020-08-22 13:02:33 +02:00
James Cole
ab5a146277
Rename class.
2020-08-22 13:01:37 +02:00
James Cole
24a373abf4
Fix search
2020-08-22 12:25:00 +02:00
James Cole
ffca935ced
Expand search.
2020-08-22 12:24:01 +02:00
James Cole
d69934ca8f
Rule engine and search engine now use the same operators; making them interchangeable.
2020-08-21 08:23:44 +02:00
James Cole
3081911eae
Merge tag '5.4.0-alpha.2' into develop
...
5.4.0-alpha.2
2020-08-21 08:04:50 +02:00
James Cole
67806cacdb
Merge branch 'release/5.4.0-alpha.2' into main
2020-08-21 08:04:49 +02:00
James Cole
8ee2f12217
Updates for alpha 2
2020-08-21 08:03:00 +02:00
