mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2026-10-23 17:53:24 +00:00
Merge branch 'master' of https://github.com/andryyy/mailcow-dockerized into recipient_map
Conflicts: data/web/inc/init_db.inc.php
This commit is contained in:
commit
c30448c4d8
42 files changed
+710
-434
No files matched your search
@@ -15,7 +15,7 @@ jQuery(function($){
|
||||
{"name":"sender","title":lang.sender,"breakpoints":"xs sm"},
|
||||
{"name":"rcpt","title":lang.rcpt, "type": "text"},
|
||||
{"name":"created","formatter":function unix_time_format(tm) { var date = new Date(tm ? tm * 1000 : 0); return date.toLocaleString();},"title":lang.received,"style":{"width":"170px"}},
|
||||
{"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right"},"style":{"width":"205px"},"type":"html","title":lang.action,"breakpoints":"xs sm"}
|
||||
{"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right"},"style":{"width":"220px"},"type":"html","title":lang.action,"breakpoints":"xs sm"}
|
||||
],
|
||||
"rows": $.ajax({
|
||||
dataType: 'json',
|
||||
@@ -81,4 +81,4 @@ jQuery(function($){
|
||||
}
|
||||
// Initial table drawings
|
||||
draw_quarantaine_table();
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user