Commit Graph

3866 Commits (fd73bbc201119b45d13597a01fbb6cae2885a225)

Author SHA1 Message Date
André Peters 4ff1db2db5
Merge pull request #863 from apoc4lyps/dev
[Helper] Nextcloud fixes
2018-01-21 11:07:07 +01:00
André Peters fd2c647599
Merge pull request #934 from FELDSAM-INC/feldsam/quarantine-ui-fix
[WEB] Make quarantine action column more wider
2018-01-21 10:36:44 +01:00
Phoenix Eve Aspacio 40c5566d0d
lang consistent 2018-01-20 06:51:22 +08:00
André Peters 2730e95a01
Merge pull request #941 from mailcow/dev
Dev
2018-01-19 19:19:14 +01:00
andre.peters ea6c6a5e84 [Web] Fixes super annoying password verification bug #867 2018-01-19 11:52:59 +01:00
andre.peters 1afca35b22 [Web] Fixes super annoying password verification bug #867 2018-01-19 11:52:32 +01:00
andre.peters c38fad27e5 [Helper] Fix config val 2018-01-19 06:48:38 +01:00
andre.peters 838ab6cb6d [Helper] Should fix nc script issue #938 2018-01-18 22:17:43 +01:00
andre.peters 518d346845 [Helper] Should fix nc script issue #938 2018-01-18 22:17:23 +01:00
andre.peters 5c3a2888a0 [Web] Fix u2f I previously messed up, sorry 2018-01-18 22:12:35 +01:00
andre.peters ba105c9b83 Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev 2018-01-18 22:10:40 +01:00
andre.peters 0655efb8f9 [Web] Fix u2f I previously messed up, sorry 2018-01-18 22:10:32 +01:00
André Peters 184eae45ce
Merge pull request #933 from DevTek314/dev
Added custom website title feature
2018-01-18 20:39:28 +01:00
Kristian a6bcde3ee0 [WEB] Make quarantine action column more wider 2018-01-18 19:16:02 +01:00
Aiko Appeldorn 9195ecdb36 + added lang 2018-01-18 18:48:26 +01:00
Aiko Appeldorn 954d0e4bb1 + added website title 2018-01-18 18:23:53 +01:00
andre.peters a09ed211bc [Web] Fix sieve detection for users 2018-01-18 11:55:44 +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 9ba0786fbf [Web] Also show alias domains handled by domain admin in quarantaine 2018-01-18 09:14:29 +01:00
andre.peters c2f74ab75c [Web] Set default pagination size to 20 2018-01-18 09:13:36 +01:00
andre.peters eb064a530e [Web] Remove obsolete variable 2018-01-18 09:12:53 +01:00
andre.peters d338073e64 [Web] Fixes #928 2018-01-18 09:12:29 +01:00
andre.peters 8419266678 [Web] Important fixes for quarantaine; other minor changes 2018-01-17 15:23:33 +01:00
andre.peters 003e6ef5cd [Web] Important fixes for quarantaine; other minor changes 2018-01-17 15:22:11 +01:00
andre.peters 7701660119 [Web] Skip passwords in API log 2018-01-16 22:09:25 +01:00
andre.peters 0019502069 [Rspamd] Increase spam scores for SPF failures 2018-01-16 21:02:45 +01:00
andre.peters c6bcf322ff [Rspamd] Force-add metadata_exporter 2018-01-16 18:58:29 +01:00
Tii d58b89528f rspamd multimap redis stuff doesn't work as expected... 2018-01-16 16:31:37 +01:00
Phoenix Eve Aspacio d171da35de
Merge pull request #919 from mailcow/master
Update base branch
2018-01-16 22:18:25 +08:00
Phoenix Eve Aspacio 24d757d7db
Merge pull request #918 from PhoenixPeca/master
Reload webpage after container restart
2018-01-16 22:12:52 +08:00
Phoenix Eve Aspacio 2f60b40684
Reload webpage after container restart 2018-01-16 22:06:49 +08:00
Phoenix Eve Aspacio edbab3633d
Reload webpage after container restart 2018-01-16 22:05:42 +08: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 7fd6a1260c [Web] Remove 'allow ip' 2018-01-16 12:43:09 +01:00
andre.peters dca9ae4a34 [Web] Remove 'allow ip' 2018-01-16 12:42:46 +01:00
andre.peters 5fd3d986c7 [Rspamd] Fix settings map regex 2018-01-16 12:42:09 +01:00
andre.peters c227675262 [Web] Remove 'allow ip' 2018-01-16 12:41:30 +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 7183609bee
Merge pull request #910 from FELDSAM-INC/feldsam/diagnostics
DNS Diagnostics enhanced
2018-01-16 09:34:18 +01:00
André Peters f1f7749b85
Update dns_diagnostics.php
Sprintf makes multi-lang easier.
Fix indents
2018-01-16 09:33:39 +01:00
André Peters 9aeaab23ab
Update lang.en.php 2018-01-16 09:26:48 +01:00
André Peters 1aac0b23dc
Merge pull request #881 from snowflakeOps/master
Fix umlauts in MacOS mobileconfig generator
2018-01-16 09:23:05 +01:00
André Peters 0c8cc70666
Merge pull request #883 from apoc4lyps/master
[nextcloud] fix file upload size limit
2018-01-16 09:22:49 +01:00
André Peters b4e78765bf
Merge pull request #911 from burn79/patch-2
update language string
2018-01-16 09:22:17 +01:00
burn79 f1185ef68a
Update admin.php
Update language string
2018-01-16 08:50:09 +01:00