Commit Graph

462 Commits (1faeadb786b2c06b171fc4c95cae742787d0ef3e)

Author SHA1 Message Date
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 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 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
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 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 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
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 c07e521309 [Web] Fixes number validation in forms, fixes #882 2018-01-13 18:32:28 +01:00
andre.peters d836f688dd [Web] Hide API until documented 2018-01-12 08:23:55 +01:00
Phoenix Eve Aspacio 91ccc47024
Make Capitalization Consistent
Some ~poorly~ configured reverse proxy interfaces are not specifically configured to respond appropriately with a lowercase "A" in the autodiscover url. So our best course is to make the capitalization consistent with the one we are used to.
2018-01-12 06:20:27 +08:00
andre.peters 278f1c2a37 [Web] Restart SOGo after adding a new domain, fixes #864 2018-01-11 22:40:43 +01:00
Markus Ritzmann 720d4d2779 #878 remove utf8_encode for macos mobileconfig 2018-01-11 11:01:03 +01:00
André Peters 74bd635505
Update dns_diagnostics.php
Oops, forgot 2 vars.
2018-01-03 21:00:29 +01:00
André Peters 2b93ad62b5
Merge branch 'dev' into dns 2018-01-03 20:52:33 +01:00
andre.peters 1c2ec43aa0 Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev 2018-01-03 20:49:49 +01:00
andre.peters 7a54b5cb67 [Web] Some minor fixes/changes to DNS diagnostics 2018-01-03 20:49:38 +01:00
André Peters a1103ccc15
Merge pull request #854 from FELDSAM-INC/feldsam/lang-selector
Remember selected lang in cookie
2018-01-03 20:46:19 +01:00
Michael Kuron 0a4424f251 Merge remote-tracking branch 'upstream/dev' into dns 2018-01-03 12:38:24 +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 b5793048df Remember selected lang in cookie
# Conflicts:
#	data/web/inc/prerequisites.inc.php
2018-01-02 12:36:35 +01:00
Michael Kuron 6090ec0c2f
DNS diagnostics: show correct TXT records 2018-01-02 10:32:30 +01:00
andre.peters d76d103c76 [Web] Move DNS diagnostic to modal, some minor fixes 2018-01-02 10:24:48 +01:00
André Peters a4c077db8f
Merge pull request #757 from mkuron/dns
DNS diagnostics: ignore spaces in DKIM record
2018-01-02 08:27:12 +01:00
André Peters c288473354
Merge pull request #848 from FELDSAM-INC/feldsam/fix-sync-job-edit
Fixed syncjob saving on edit
2018-01-01 09:19:43 +01:00
André Peters 4a6fc2af19
Merge pull request #849 from FELDSAM-INC/feldsam/sync-job-tables-enhancement
Sync job tables enhanced
2018-01-01 09:19:20 +01:00
andre.peters 87c6770132 [Web] Fix empty passwords for relayhosts 2018-01-01 09:17:52 +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
Kristian aa5f7a5584 Fixed syncjob saving on edit 2017-12-31 15:28:33 +01:00
Kristian 7cb23cf4a3 User - Allow send as all - list all domains inc. alias domains 2017-12-30 21:25:45 +01:00
andre.peters 603956ca6a [Web] Disable connectors in footable filter for mailbox 2017-12-20 21:15:43 +01:00
andre.peters aa96f227d8 [Web] No inline forms in admin 2017-12-17 17:57:57 +01:00
andre.peters f5a6667aad [Web] Fix removal of alias domain 2017-12-17 17:44:28 +01:00
andre.peters ae56c3b59e Fix quarantaine 2017-12-11 10:44:46 +01:00