paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #954 from mailcow/master 

Merge master to dev
master
André Peters 2018-01-24 09:26:56 +01:00 committed by GitHub
parent 1c6d3c16b6 fd2c647599
commit a6ac55e42e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/web/js/quarantaine.js
View File

@ -15,7 +15,7 @@ jQuery(function($){
{"name":"sender","title":lang.sender,"breakpoints":"xs sm"}, {"name":"sender","title":lang.sender,"breakpoints":"xs sm"},
{"name":"rcpt","title":lang.rcpt, "type": "text"}, {"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":"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({ "rows": $.ajax({
dataType: 'json', dataType: 'json',

2
data/web/lang/lang.en.php
View File

@ -570,7 +570,7 @@ $lang['admin']['api_key'] = "API key";
$lang['admin']['activate_api'] = "Activate API"; $lang['admin']['activate_api'] = "Activate API";
$lang['admin']['regen_api_key'] = "Regenerate API key"; $lang['admin']['regen_api_key'] = "Regenerate API key";
$lang['admin']['quarantine'] = "Quarantine"; $lang['admin']['quarantine'] = "Quarantaine";
$lang['admin']['quarantine_retention_size'] = "Retentions per mailbox:"; $lang['admin']['quarantine_retention_size'] = "Retentions per mailbox:";
$lang['admin']['quarantine_max_size'] = "Maximum size in MiB (larger elements are discarded):"; $lang['admin']['quarantine_max_size'] = "Maximum size in MiB (larger elements are discarded):";
$lang['admin']['quarantine_exclude_domains'] = "Exclude domains and alias-domains:"; $lang['admin']['quarantine_exclude_domains'] = "Exclude domains and alias-domains:";