André
05e026db3a
[Netfilter] New ban method, allow to set blacklists
2018-04-25 10:54:13 +02:00
André Peters
b175125d02
Merge branch 'dev' into master
2018-02-28 15:38:56 +01:00
Pascal Gollor
f38d9b8a1e
remove duplicates
2018-02-27 11:20:04 +01:00
Pascal Gollor
a95b3ab761
fix vars.local hint
2018-02-27 11:13:21 +01:00
André Peters
819626ab60
Merge pull request #1083 from descala/lang_ca
...
Catalan language support
2018-02-26 18:55:13 +01:00
André Peters
1aa940abc9
[Web] Add missing string
2018-02-26 17:44:24 +01:00
David Escala
165f6cb802
Catalan language support
2018-02-24 10:06:08 +01:00
André Peters
1f09544f32
Fix conflict
2018-02-16 22:44:02 +01:00
André Peters
2865c892a6
[Multi] Fixes #1058 by including a 'force password update' option and also introduces a attributes json object to be used for further mailbox configurations in the future
2018-02-16 22:40:51 +01:00
David Escala
8ae5077775
Remove unused language keys from data/web/lang/lang.*.php
...
helper-scripts/check_translations.rb checks if keys present in the master
translation file are used in any php or js code. Writes a sed comand to
stdout to remove unused keys from all lang files.
This saves unnecessary work when translating.
2018-02-09 18:56:06 +01:00
André Peters
a50036477e
[Web] Mind was set to french, reverting to english
2018-02-08 20:13:36 +01:00
root
fae542534d
Merge remote-tracking branch 'origin/master' into dev
2018-02-08 19:54:14 +01:00
andre.peters
b2032c0e8a
[Web] Hide up time of containers that are missing
...
[Web] Rename fail2ban logs to netfiter logs
[Web] Adding timeout to curl requests for dockerapi, fixes #981
[Web] Removed cow from favicon
2018-02-01 13:28:17 +01:00
Phoenix Eve Aspacio
afd078d777
Correction
2018-01-28 11:53:48 +08:00
Michael Kuron
c30448c4d8
Merge branch 'master' of https://github.com/andryyy/mailcow-dockerized into recipient_map
...
Conflicts:
data/web/inc/init_db.inc.php
2018-01-27 17:22:08 +01:00
andre.peters
04f9d74339
[Web, Dovecot] Add new options to imapsync, other minor changes to forms, partly fixes #955
2018-01-24 12:59:11 +01:00
André Peters
a6ac55e42e
Merge pull request #954 from mailcow/master
...
Merge master to dev
2018-01-24 09:26:56 +01:00
andre.peters
1c6d3c16b6
[Web] Set Fail2ban subnet sizes
2018-01-24 09:25:28 +01:00
Michael Kuron
e86565e283
Expose Postfix's recipient_canonical_maps through web UI
2018-01-23 20:02:31 +01:00
andre.peters
43770434b3
[Web] Alias by alias domain is now in 'direct aliases', added desc to direct and shared aliases
2018-01-21 15:02:56 +01:00
Phoenix Eve Aspacio
40c5566d0d
lang consistent
2018-01-20 06:51:22 +08:00
Aiko Appeldorn
9195ecdb36
+ added lang
2018-01-18 18:48:26 +01:00
André Peters
5648ec6d39
Merge pull request #915 from tiirex9/master
...
Adds 'do nothing' as default for sub-addressing
2018-01-18 10:27:14 +01:00
andre.peters
79cb929911
[Web] Add html2text converter; Show quarantaine html elements as text, do not escape html
2018-01-18 10:09:30 +01:00
andre.peters
8419266678
[Web] Important fixes for quarantaine; other minor changes
2018-01-17 15:23:33 +01:00
Tii
1faeadb786
Fuckup during merge
2018-01-16 14:10:50 +01:00
Tii
2291bdbeed
Added 'do nothing' option as default for sub-addressing
2018-01-16 13:13:04 +01:00
Tii
cd2c242540
Added 'do nothing' option as default for sub-addressing
2018-01-16 12:47:59 +01:00
André Peters
b383391e2c
Merge pull request #914 from mailcow/dev
...
Various fixes
2018-01-16 12:47:12 +01:00
andre.peters
1d34aa5064
Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev
2018-01-16 12:37:48 +01:00
andre.peters
d2aa57d01f
[Web] Remove 10M limit from quarantaine info text
2018-01-16 12:37:45 +01:00
André Peters
9aeaab23ab
Update lang.en.php
2018-01-16 09:26:48 +01:00
Kristián Feldsam
2a8bdc8dea
DNS Diagnostics - Ehnaced SPF record check
...
Signed-off-by: Kristián Feldsam <feldsam@gmail.com>
2018-01-16 00:07:25 +01:00
Phoenix Eve Aspacio
0691ce7855
English Lang Strings
2018-01-15 21:59:20 +08:00
Phoenix Eve Aspacio
fa17e9a936
German Lang Strings
2018-01-15 21:58:57 +08:00
Martin Wilhelmi
e9625ef29b
Fix wrong translation
2018-01-13 20:12:45 +01:00
André Peters
74721c08bd
Merge branch 'master' into dev
2018-01-13 18:38:08 +01:00
andre.peters
278f1c2a37
[Web] Restart SOGo after adding a new domain, fixes #864
2018-01-11 22:40:43 +01:00
andre.peters
34b7ab7104
[Web] Add DNS diagnostics as modal, some minor fixes, todo: Detect IPv4/6 by multiple sources and random selection
2018-01-02 18:17:27 +01:00
Kristian
254397af60
Sync job tables enhanced
...
Signed-off-by: Kristián Feldsam <feldsam@gmail.com>
# Conflicts:
# data/web/js/mailbox.js
2017-12-31 15:35:01 +01:00
andre.peters
adc23d86f9
Various...
2017-12-09 13:17:15 +01:00
Phoenix Eve Aspacio
9c35a55532
fixes #800
...
corrections will be made for other languages soon
2017-12-05 10:18:29 +08:00
Hagen Tasche
b1986e5f7c
Update lang.en.php
...
Translation from german to english
2017-11-30 14:01:46 +01:00
André
7bb1e2e40e
Fix conflicts
2017-11-14 10:48:04 +01:00
André
60e97503f7
[Web, Dovecot] Show wether a sync job is running, validate min max input attr and validate these values
2017-11-08 11:07:32 +01:00
André Peters
8aa98d2e6e
Merge pull request #451 from mkuron/dns2
...
DNS diagnostics page
2017-11-07 09:41:32 +01:00
André
f603008440
[Web] Reset last_run for imapsync jobs to run next, other minor changes...
2017-11-05 12:20:05 +01:00
Phoenix Eve Aspacio
afd933b630
Remove duplicate string definitions
2017-11-05 05:19:48 +08:00
Phoenix Eve Aspacio
09c2fc3534
Remove duplicate string definitions
2017-11-05 05:17:04 +08:00
Phoenix Eve Aspacio
1cfeea526e
Remove duplicate string definitions
2017-11-05 05:14:27 +08:00