Commit 52348ef9 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'datalog-list-add-user-field' into 'develop'

Added user field to datalog list view

Closes #6370

See merge request !1621
parents 59df847f 1a6acb2a
Pipeline #11817 passed with stage
in 9 seconds
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Servidor'; ...@@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Servidor';
$wb['dbtable_txt'] = 'Tabela do BD'; $wb['dbtable_txt'] = 'Tabela do BD';
$wb['action_txt'] = 'Ação'; $wb['action_txt'] = 'Ação';
$wb['status_txt'] = 'Estado'; $wb['status_txt'] = 'Estado';
$wb['user_txt'] = 'User';
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Tabulka'; $wb['dbtable_txt'] = 'DB Tabulka';
$wb['action_txt'] = 'Akce'; $wb['action_txt'] = 'Akce';
$wb['status_txt'] = 'Stav'; $wb['status_txt'] = 'Stav';
$wb['user_txt'] = 'User';
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'Datenbanktabelle'; $wb['dbtable_txt'] = 'Datenbanktabelle';
$wb['action_txt'] = 'Aktion'; $wb['action_txt'] = 'Aktion';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'Benutzer';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'Tabella DB'; $wb['dbtable_txt'] = 'Tabella DB';
$wb['action_txt'] = 'Azione'; $wb['action_txt'] = 'Azione';
$wb['status_txt'] = 'Stato'; $wb['status_txt'] = 'Stato';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; ...@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['dbtable_txt'] = 'DB Table'; $wb['dbtable_txt'] = 'DB Table';
$wb['action_txt'] = 'Action'; $wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status'; $wb['status_txt'] = 'Status';
$wb['user_txt'] = 'User';
?> ?>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment