Merge branch 'v2.5-export' into nightly

2020-10-02 20:45:11 -07:00
parent 14b98a32e0 34c9ede9c9
commit 739c977cd7
45 changed files with 6500 additions and 521 deletions
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -212,7 +212,7 @@ users_list_table_options = {
            "data": "duration",
            "createdCell": function (td, cellData, rowData, row, col) {
                if (cellData !== null && cellData !== '') {
-                    $(td).html(humanTimeClean(cellData));
+                    $(td).html(humanDuration(cellData, 'dhm', 's'));
                }
            },
            "searchable": false,