André Peters 1f09544f32 Fix conflict

2018-02-16 22:44:02 +01:00

..

ajax

Fix conflict

2018-02-16 22:44:02 +01:00

lib

[Web] Fixes to Sieve validation (fixes #1027)

2018-02-11 13:29:13 +01:00

footer.inc.php

Fix conflict

2018-02-16 22:44:02 +01:00

functions.address_rewriting.inc.php

[Postfix] BCC destination must be single email address, fixes #993

2018-02-03 07:47:52 +01:00

functions.autoconfiguration.inc.php

[Web] Autodiscover logs

2017-10-02 21:47:31 +02:00

functions.customize.inc.php

+ added website title

2018-01-18 18:23:53 +01:00

functions.dkim.inc.php

[Web] New feature: Show DKIM private keys - needs variable set to true in vars.local.inc.php

2017-09-16 22:59:42 +02:00

functions.docker.inc.php

[Web] Hide up time of containers that are missing

2018-02-01 13:28:17 +01:00

functions.domain_admin.inc.php

[Web] Initial ratelimit support, more API actions

2017-07-16 11:03:28 +02:00

functions.fail2ban.inc.php

[Web] Hide up time of containers that are missing

2018-02-01 13:28:17 +01:00

functions.fwdhost.inc.php

Web UI improvements

2017-05-26 23:02:04 +02:00

functions.inc.php

Fix conflict

2018-02-16 22:44:02 +01:00

functions.mailbox.inc.php

Fix conflict

2018-02-16 22:44:02 +01:00

functions.policy.inc.php

[Web] Even more fixes for #1017

2018-02-10 22:42:46 +01:00

functions.quarantine.inc.php

[Web] Fix css; Use socket for Rspamd history; Fix function file name

2018-02-08 22:56:12 +01:00

functions.relayhost.inc.php

[Web] Fix empty passwords for relayhosts

2018-01-01 09:17:52 +01:00

header.inc.php

[Web] Even more fixes for #1017

2018-02-10 22:42:46 +01:00

init_db.inc.php

Fix conflict

2018-02-16 22:44:02 +01:00

languages.min.css

Formatting, Updated Bootstrap/Bootswatch

2017-05-16 19:20:58 +02:00

languages.png

mailcow dockerized

2016-12-09 20:39:02 +01:00

prerequisites.inc.php

[Web] Mind was set to french, reverting to english

2018-02-08 20:13:36 +01:00

sessions.inc.php

Various...

2017-12-09 13:17:15 +01:00

spf.inc.php

Use Redis for forwarded_hosts, some fixes

2017-05-08 23:09:40 +02:00

triggers.inc.php

[Web] Even more fixes for #1017

2018-02-10 22:42:46 +01:00

vars.inc.php

[Web] Set default pagination size to 20

2018-01-18 09:13:36 +01:00