Commit Graph

1229 Commits (4797057a072a23dd836fb968687884e64235b3de)

Author SHA1 Message Date
Antoine Sirinelli 4797057a07 Remove the duplicate string definitions (english)
The following strings were defined twice in lang.en.php.
The first occurence has been removed to avoid confusion (and bugs from
translation tools):

- $lang['danger']['whitelist_from_invalid']
- $lang['success']['aliasd_modified']
- $lang['user']['spamfilter_default_score']
- $lang['edit']['save']
- $lang['tfa']['totp']
- $lang['admin']['sr']
- $lang['admin']['save']
2017-10-23 22:45:51 +02:00
André Peters 40506d3052 [Web] Add missing sync job option when admin 2017-10-07 22:10:56 +02:00
André Peters 668a05bdf1 [Web] Fixes #657 2017-10-07 22:09:44 +02:00
André Peters 42567a352c Should fix #644 2017-10-01 12:40:44 +02:00
Michael Kuron 533f947074 Merge pull request #589 from marrco/master
Rspamd: better scores for mx_check symbols
2017-09-19 12:14:18 +00:00
Michael Kuron 68c87ce7a6 rspamd mx_check: composite symbol overrides individual scores 2017-09-19 14:12:10 +02:00
marrco 1fb4f34046 Update metrics.conf 2017-09-19 10:04:39 +02:00
marrco 5742e3b014 Update mx_check.conf 2017-09-19 10:00:50 +02:00
marrco 0752840369 Update mx_check.conf 2017-09-19 09:23:41 +02:00
marrco 9d611a903a Update metrics.conf 2017-09-19 09:21:36 +02:00
marrco 529c3bcc9c Create composites.conf 2017-09-19 09:19:22 +02:00
andryyy 4b39f667e2 [Postfix] Fix protocols 2017-09-18 11:00:11 +02:00
andryyy 0cf22b64e1 [Postfix] Less strict smtpd_tls_mandatory_protocols 2017-09-18 08:23:31 +02:00
andryyy 50fe21c646 Merge branch 'dev' 2017-09-16 23:29:05 +02:00
andryyy 1c3194910d [Compose] Rspamd fix 2017-09-16 23:28:54 +02:00
andryyy d0c0cd4992 [Rspamd] Fix user settings... 2017-09-16 23:27:13 +02:00
andryyy 0384daabe8 Merge branch 'dev' 2017-09-16 23:24:46 +02:00
andryyy f7ff93a499 [Update] Stop mailcow before update 2017-09-16 23:24:30 +02:00
andryyy 26e2baa131 Merge branch 'dev' 2017-09-16 23:07:06 +02:00
andryyy fcc6bcc4b3 Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev 2017-09-16 23:05:40 +02:00
andryyy 1b974bc8d1 [Compose] New images 2017-09-16 23:05:33 +02:00
André Peters 6d86813330 Merge pull request #610 from mkuron/rspamd-header
Rspamd user settings: fix matching From header
2017-09-16 23:00:38 +02:00
andryyy 750a2b8cef [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
Michael Kuron e4f13568d1 Rspamd user settings: fix matching From header 2017-09-16 18:46:28 +02:00
andryyy c6f81fe67b [Web] Fix autodiscover merge on user.php 2017-09-16 13:33:27 +02:00
andryyy e20d31e440 Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev 2017-09-16 13:17:59 +02:00
andryyy 2b97305f6d [ACME] Sleep, don't exit 2017-09-16 13:17:48 +02:00
andryyy 8741b5f3b1 [Compose] Enable some minimal inits, change or remove some health checks 2017-09-16 13:17:37 +02:00
André Peters 4acc82dbea Merge pull request #468 from mkuron/clientconfig4
Client configuration guide link
2017-09-16 13:11:54 +02:00
andryyy dd3bd82838 [Web] Add feature for null mail 2017-09-15 09:05:51 +02:00
andryyy edacce0329 Merge branch 'dev' 2017-09-15 07:55:35 +02:00
andryyy c63fb8b11a [Web] Init db fix for c_location 2017-09-15 07:55:23 +02:00
andryyy 762f18e913 [Clamd] Use Dockerds own init system 2017-09-14 23:13:24 +02:00
andryyy 868a832eb9 Merge branch 'dev' 2017-09-14 22:45:27 +02:00
andryyy c75f16c97c [Web] Fix initial admin creation 2017-09-14 22:45:17 +02:00
andryyy 17dc44004a Merge branch 'dev' 2017-09-14 13:35:10 +02:00
andryyy 089e8776f5 [Postfix] Stricter TLS settings for mandatory connections 2017-09-14 13:34:23 +02:00
andryyy f0df390d12 [Nginx] Stricter TLS settings 2017-09-14 13:34:07 +02:00
andryyy e6a0a7ff8f Merge branch 'dev' 2017-09-14 13:32:45 +02:00
andryyy 00e465a9a1 [Dovecot] Allow INBOX to be shared, sigh... fixes #594 2017-09-14 13:32:11 +02:00
andryyy 344f88dbf3 [Update] Set merge.defaultToUpstream true 2017-09-13 19:25:54 +02:00
André Peters 9c52ed3fb3 Merge pull request #593 from K2rool/patch-2
Rewrite the if for getting timezone
2017-09-13 18:11:44 +02:00
James Smith 2893a63ea0 Rewrite the if so it works correctly
My last edit of this file caused issue even if /etc/timezone existed it wouldn't use the timezone value of it, the only file i would try to get the timezone out of is /etc/localtime.
2017-09-13 16:59:59 +01:00
marrco a2720cca83 Update mx_check.conf 2017-09-13 16:32:10 +02:00
54f6e50bb5 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2017-09-13 16:14:14 +02:00
andryyy 71070fbe86 [Web] Fix admin injection query 2017-09-12 22:48:12 +02:00
andryyy 79985ad7ed [Compose] Disable strict mode in MariaDB 10.2 (temp.), skip most DNS resolving in MariaDB, fix MariaDB healthcheck by using a valid user, set larger MariaDB packet size 2017-09-12 20:59:24 +02:00
andryyy 998523bdfa [Web] Allow ratelimt per user, overrides domain tl 2017-09-12 20:57:54 +02:00
andryyy eeaa48a729 [PHP-FPM] Use valid user for mysqladmin ping
[SOGo] Use valid user for mysqladmin ping
2017-09-12 20:57:18 +02:00
marrco b311f80a76 Merge pull request #1 from marrco/MX_invalid-fix
Temporay fix to MX values
2017-09-12 17:04:18 +02:00