Commit Graph

1888 Commits (4a403e93232859a7c6265fd454dd68a4484967c3)

Author SHA1 Message Date
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
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
Kristián Feldsam 9f258df883 DNS Diagnostics - Allow for domain administrator
Signed-off-by: Kristián Feldsam <feldsam@gmail.com>
2018-01-16 00:07:19 +01:00
andre.peters 9fa20e229c [Web] Allow sync interval from 1 to 3600 2018-01-15 19:53:09 +01:00
Phoenix Eve Aspacio 1a2cdbf55c
Fix #880
FIX: Remove language dropdown if only one is active
2018-01-15 22:47:47 +08:00
Phoenix Eve Aspacio 8405a8b56c
Update header.inc.php 2018-01-15 22:44:48 +08:00
Phoenix Eve Aspacio eb04e703c2
Update index.php 2018-01-15 22:44:04 +08:00
Phoenix Eve Aspacio 53545f788b
Update mailcow.css 2018-01-15 22:43:41 +08:00
Phoenix Eve Aspacio 1170fd2cea
Fix #902
Add Language Strings
2018-01-15 22:02:32 +08: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
Phoenix Eve Aspacio 744b3d32ae
Add Language Strings 2018-01-15 21:58:22 +08:00
André Peters a343c62966
Merge pull request #900 from mailcow/dev
[Helper] Use proper names for volume and container name filters
2018-01-14 20:56:20 +01:00
andre.peters 686366b9f5 [Helper] Use proper names for volume and container name filters 2018-01-14 20:53:26 +01:00
André Peters 823fc80bcb
Merge pull request #899 from mailcow/dev
[DockerAPI] Hide stderr from rspamadm output
2018-01-14 20:38:33 +01:00
andre.peters 09b6c20bad [DockerAPI] Hide stderr from rspamadm output 2018-01-14 18:44:06 +01:00
André Peters 0e1c7e1424
Merge pull request #895 from mailcow/dev
[Dovecot] Revert to 2.2 to fix various errors
2018-01-14 10:47:16 +01:00
andre.peters 4cdcf70fca Travis: Temp stop auto build 2018-01-14 10:45:10 +01:00
andre.peters 5d5d36fc60 [Dovecot] Revert to 2.2 to fix various errors 2018-01-14 10:44:06 +01:00
André Peters 63ea097503
Merge pull request #894 from mailcow/dev
[Dovecot] Dovecot 2.3 from git for temp fixes
2018-01-14 10:36:49 +01:00
andre.peters 38aaeeb30b [Dovecot] Dovecot 2.3 from git for temp fixes
[ACME] Use -a switch (thanks to jas8522!)
2018-01-14 10:34:06 +01:00
André Peters d3c834f43e
Merge pull request #891 from mailcow/dev
Dev
2018-01-13 22:50:33 +01:00
andre.peters 42923698fd [Dovcot] Fixes for v2.3 2018-01-13 22:49:50 +01:00
andre.peters 8d47f5f347 [Helper] Remove interactive and pseudo-TTY switch 2018-01-13 22:09:17 +01:00
André Peters 25cff7de6e
Merge pull request #889 from mailcow/dev
Fix wrong translation for key 'qinfo'
2018-01-13 20:20:15 +01:00
André Peters e7cbc9116d
Merge pull request #888 from mnin/master
Fix wrong translation for key 'qinfo'
2018-01-13 20:19:35 +01:00
Martin Wilhelmi e9625ef29b
Fix wrong translation 2018-01-13 20:12:45 +01:00
André Peters 079170682c
Merge pull request #887 from mailcow/dev
Dev to master
2018-01-13 18:38:21 +01:00
André Peters 74721c08bd
Merge branch 'master' into dev 2018-01-13 18:38:08 +01:00