Merge branch 'develop' into 5.8-dev

And fix rule creation and edit etc
2025-10-22 20:16:22 +00:00 · 2022-10-01 07:34:30 +02:00
parent 5714bd0749 5c471059f3
commit 9bfa52f3ce
10 changed files with 35 additions and 18 deletions
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -69,6 +69,7 @@
                            <thead>
                            <tr>
                                <th colspan="2">{{ 'trigger'|_ }}</th>
+                                <th>{{ 'is_not_rule_trigger'|_ }}</th>
                                <th>{{ 'trigger_value'|_ }}</th>
                                <th>{{ 'stop_processing_other_triggers'|_ }}</th>
                            </tr>