Merge branch 'main' into 'dev/settings'

# Conflicts: # ci4/app/Config/Routes.php
2025-07-25 22:52:08 +00:00 · 2023-05-28 14:58:36 +00:00
parent b1951de661 009d4f0fdb
commit c4ff55654d
46 changed files with 3311 additions and 124 deletions
--- a/ci4/app/Filters/LoginAuthFilter.php
+++ b/ci4/app/Filters/LoginAuthFilter.php
@ -176,6 +176,8 @@ class LoginAuthFilter implements FilterInterface
            'whiteListMethod',
            'allItemsSelect',
            'menuItems',
+            'datatable',
+            'datatablePG',
            'collect',
            'cast',
        ];