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

Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

master
andryyy 2019-01-02 21:28:52 +01:00
parent ca9c610460 0111362ef5
commit 75d5de016a
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/web/css/mailbox.css
View File

@ -9,7 +9,7 @@ table.footable>tbody>tr.footable-empty>td {
overflow: visible !important; overflow: visible !important;
} }
.table-responsive { .table-responsive {
overflow: visible !important; overflow: auto !important;
} }
@media screen and (max-width: 767px) { @media screen and (max-width: 767px) {
.table-responsive { .table-responsive {

8
data/web/edit.php
View File

@ -271,7 +271,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2" for="quota">Relayhost</label> <label class="control-label col-sm-2" for="quota"><?=$lang['edit']['relayhost'];?></label>
<div class="col-sm-10"> <div class="col-sm-10">
<select data-live-search="true" name="relayhost" class="form-control"> <select data-live-search="true" name="relayhost" class="form-control">
<?php <?php
@ -330,7 +330,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
<hr> <hr>
<form data-id="domratelimit" class="form-inline well" method="post"> <form data-id="domratelimit" class="form-inline well" method="post">
<div class="form-group"> <div class="form-group">
<label class="control-label">Ratelimit</label> <label class="control-label"><?=$lang['acl']['ratelimit'];?></label>
<input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" autocomplete="off" class="form-control" placeholder="disabled"> <input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" autocomplete="off" class="form-control" placeholder="disabled">
</div> </div>
<div class="form-group"> <div class="form-group">
@ -440,7 +440,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
<hr> <hr>
<form data-id="domratelimit" class="form-inline well" method="post"> <form data-id="domratelimit" class="form-inline well" method="post">
<div class="form-group"> <div class="form-group">
<label class="control-label">Ratelimit</label> <label class="control-label"><?=$lang['acl']['ratelimit'];?></label>
<input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" autocomplete="off" class="form-control" placeholder="disabled"> <input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" autocomplete="off" class="form-control" placeholder="disabled">
</div> </div>
<div class="form-group"> <div class="form-group">
@ -600,7 +600,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
<form data-id="mboxratelimit" class="form-inline well" method="post"> <form data-id="mboxratelimit" class="form-inline well" method="post">
<div class="row"> <div class="row">
<div class="col-sm-1"> <div class="col-sm-1">
<p class="help-block">Ratelimit</p> <p class="help-block"><?=$lang['acl']['ratelimit'];?></p>
</div> </div>
<div class="col-sm-10"> <div class="col-sm-10">
<div class="form-group"> <div class="form-group">

3
data/web/lang/lang.cs.php
View File

@ -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']['multiple_bookings'] = 'Vícenásobné rezervace';
$lang['edit']['kind'] = 'Druh'; $lang['edit']['kind'] = 'Druh';
$lang['edit']['resource'] = 'Zdroje'; $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']['spam_alias'] = 'Dočasné aliasy';
$lang['acl']['tls_policy'] = 'Pravidla TLS'; $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']['login_as'] = 'Přihlásit jako uživatel poštovní schránky';
$lang['acl']['bcc_maps'] = 'BCC maps'; $lang['acl']['bcc_maps'] = 'BCC maps';
$lang['acl']['filters'] = 'Filtry'; $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']['recipient_maps'] = 'Recipient maps';
$lang['acl']['prohibited'] = 'Zakázáno z důvodu ACL'; $lang['acl']['prohibited'] = 'Zakázáno z důvodu ACL';

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

@ -389,6 +389,7 @@ $lang['edit']['dont_check_sender_acl'] = "Disable sender check for domain %s (+
$lang['edit']['multiple_bookings'] = 'Multiple bookings'; $lang['edit']['multiple_bookings'] = 'Multiple bookings';
$lang['edit']['kind'] = 'Kind'; $lang['edit']['kind'] = 'Kind';
$lang['edit']['resource'] = 'Resource'; $lang['edit']['resource'] = 'Resource';
$lang['edit']['relayhost'] = 'Sender-dependent transports';
$lang['acl']['spam_alias'] = 'Temporary aliases'; $lang['acl']['spam_alias'] = 'Temporary aliases';
$lang['acl']['tls_policy'] = 'TLS policy'; $lang['acl']['tls_policy'] = 'TLS policy';

4
data/web/modals/mailbox.php
View File

@ -131,7 +131,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
</div> </div>
<hr> <hr>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2" for="rl_frame">Ratelimit</label> <label class="control-label col-sm-2" for="rl_frame"><?=$lang['acl']['ratelimit'];?></label>
<div class="col-sm-7"> <div class="col-sm-7">
<input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" class="form-control" placeholder="disabled"> <input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" class="form-control" placeholder="disabled">
</div> </div>
@ -328,7 +328,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
</div> </div>
<hr> <hr>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2" for="rl_frame">Ratelimit</label> <label class="control-label col-sm-2" for="rl_frame"><?=$lang['acl']['ratelimit'];?></label>
<div class="col-sm-7"> <div class="col-sm-7">
<input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" class="form-control" placeholder="disabled"> <input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" class="form-control" placeholder="disabled">
</div> </div>

2
generate_config.sh
View File

@ -159,7 +159,7 @@ USE_WATCHDOG=n
LOG_LINES=9999 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 IPV4_NETWORK=172.22.1