From fec89cbc19726e55b2c31c376efad358b592ba99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20T=C5=99=C3=AD=C5=A1ka?= Date: Fri, 28 Dec 2018 21:40:58 +0100 Subject: [PATCH 1/3] Language support update --- data/web/edit.php | 8 ++++---- data/web/lang/lang.cs.php | 3 ++- data/web/lang/lang.en.php | 1 + data/web/modals/mailbox.php | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/data/web/edit.php b/data/web/edit.php index fed7e2c9..bf76b764 100644 --- a/data/web/edit.php +++ b/data/web/edit.php @@ -271,7 +271,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -440,7 +440,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -600,7 +600,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
-

Ratelimit

+

diff --git a/data/web/lang/lang.cs.php b/data/web/lang/lang.cs.php index 84eaf0b0..689f98a9 100644 --- a/data/web/lang/lang.cs.php +++ b/data/web/lang/lang.cs.php @@ -391,6 +391,7 @@ $lang['edit']['dont_check_sender_acl'] = "Disable sender check for domain %s (+ $lang['edit']['multiple_bookings'] = 'Vícenásobné rezervace'; $lang['edit']['kind'] = 'Druh'; $lang['edit']['resource'] = 'Zdroje'; +$lang['edit']['relayhost'] = 'Přeposílání závislé na odesílateli'; $lang['acl']['spam_alias'] = 'Dočasné aliasy'; $lang['acl']['tls_policy'] = 'Pravidla TLS'; @@ -404,7 +405,7 @@ $lang['acl']['quarantine'] = 'Karanténa'; $lang['acl']['login_as'] = 'Přihlásit jako uživatel poštovní schránky'; $lang['acl']['bcc_maps'] = 'BCC maps'; $lang['acl']['filters'] = 'Filtry'; -$lang['acl']['ratelimit'] = 'Omezování provozu (Rate limit)'; +$lang['acl']['ratelimit'] = 'Omezování provozu'; $lang['acl']['recipient_maps'] = 'Recipient maps'; $lang['acl']['prohibited'] = 'Zakázáno z důvodu ACL'; diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php index 02732704..567082ea 100644 --- a/data/web/lang/lang.en.php +++ b/data/web/lang/lang.en.php @@ -389,6 +389,7 @@ $lang['edit']['dont_check_sender_acl'] = "Disable sender check for domain %s (+ $lang['edit']['multiple_bookings'] = 'Multiple bookings'; $lang['edit']['kind'] = 'Kind'; $lang['edit']['resource'] = 'Resource'; +$lang['edit']['relayhost'] = 'Sender-dependent transports'; $lang['acl']['spam_alias'] = 'Temporary aliases'; $lang['acl']['tls_policy'] = 'TLS policy'; diff --git a/data/web/modals/mailbox.php b/data/web/modals/mailbox.php index 048393fe..608784fc 100644 --- a/data/web/modals/mailbox.php +++ b/data/web/modals/mailbox.php @@ -131,7 +131,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -328,7 +328,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
From 5b17fb80cdcaf145e94e9587fef3fa652af31130 Mon Sep 17 00:00:00 2001 From: Thomas Dietrich Date: Sun, 30 Dec 2018 14:10:30 +0100 Subject: [PATCH 2/3] Fix misleading typo in generated mailcow.conf --- generate_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate_config.sh b/generate_config.sh index 76f26ec7..ed941db6 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -159,7 +159,7 @@ USE_WATCHDOG=n LOG_LINES=9999 -# Internal IPv4 /24 subnet, format n.n.n. (expands to n.n.n.0/24) +# Internal IPv4 /24 subnet, format n.n.n (expands to n.n.n.0/24) IPV4_NETWORK=172.22.1 From 37cd8963daa92d9f19a41b816c31cdbe4bae2927 Mon Sep 17 00:00:00 2001 From: Phoenix Eve Aspacio Date: Mon, 31 Dec 2018 18:56:08 +0800 Subject: [PATCH 3/3] do not overflow. use horizontal scrollbars instead. --- data/web/css/mailbox.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/css/mailbox.css b/data/web/css/mailbox.css index 489a7b50..80ff063b 100644 --- a/data/web/css/mailbox.css +++ b/data/web/css/mailbox.css @@ -9,7 +9,7 @@ table.footable>tbody>tr.footable-empty>td { overflow: visible !important; } .table-responsive { - overflow: visible !important; + overflow: auto !important; } @media screen and (max-width: 767px) { .table-responsive {