Commit Graph

2407 Commits (6565e994bb785c582019afea245393aa56e2a09c)

Author SHA1 Message Date
andryyy a4ef22729c Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-22 21:29:30 +02:00
André Peters e0486ea5a5
Merge pull request #3080 from mkuron/oauth
OAuth improvements
2019-10-22 21:00:20 +02:00
Michael Kuron eccbb98002 OAuth: show reduced login screen 2019-10-22 20:23:00 +02:00
andryyy c10749c39e Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-22 20:22:31 +02:00
andryyy 5259f14abf
[Web] Add new lang strings 2019-10-22 20:22:29 +02:00
Michael Kuron 1db4d3d747 OAuth: add displayName attribute to profile for Nextcloud compatibility 2019-10-22 20:22:27 +02:00
André Peters 6fb856cbf4
Merge pull request #3079 from tinect/fixHtmlTypo
fix not valid tag
2019-10-22 20:21:27 +02:00
andryyy d2a8d6fe29 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-22 20:20:26 +02:00
tinect d98ac0f733 fix not valid tag 2019-10-22 20:20:22 +02:00
tinect 323ef5618a IE11 doesn't support optional parameters 2019-10-22 20:17:47 +02:00
evilMouse c3b6144f12
Additions and fixes
Added some missing texts (not all) corrected few errors and made quota naming more consistent (i.e. using "size" or "limit" instead of "value")
2019-10-22 16:06:13 +02:00
andryyy 1e4aa212ea
[ClamAV] Try to prevent update collisions 2019-10-22 13:50:03 +02:00
Michael Kuron 60741fcf5b
Merge pull request #3063 from mailcow/sogo-connector
SOGo Integrator is now SOGo Connector
2019-10-22 09:12:57 +02:00
andryyy be4099182b
[Rspamd] Do not log watchdog mails 2019-10-21 20:42:43 +02:00
andryyy 52cd9385f6
[Web] Add Finnish translation \o/ - thanks to Mika! 2019-10-21 19:40:45 +02:00
André Peters de8cfbde03
Merge pull request #3072 from tinect/deliverCSSandJSfiles
deliver CSS and JS as external request
2019-10-21 11:18:49 +02:00
andryyy d5ee7de66a
[Rspamd] Disable info logging, re-enable silent logging, only apply MILTER_HEADERS symbol to watchdog Rspamd settings map 2019-10-20 21:48:30 +02:00
tinect cc1bf5d426 deliver CSS and JS as external request 2019-10-20 21:25:58 +02:00
Marcel Hofer f2b552c00d
Fix custom http redirects with TLS-SNI
Disable http listener for SNI ssl hosts in nginx. This allows the use of the following config again:
https://mailcow.github.io/mailcow-dockerized-docs/u_e-80_to_443/

However that documentation page should still be updated: https://github.com/mailcow/mailcow-dockerized-docs/pull/175/commits
2019-10-20 20:24:16 +02:00
tinect 0c4b390a38 no message 2019-10-20 19:43:21 +02:00
André Peters 45e26c19c4
Merge pull request #3062 from tinect/cacheJS
cache JS- and CSS-File to reduce response-time
2019-10-20 19:40:56 +02:00
tinect 74244c7d0a cleanup cached js and css 2019-10-20 19:39:46 +02:00
André Peters caf57e86b5
Merge pull request #3068 from mhofer117/tls-sni
Fix custom nginx sites with tls-sni
2019-10-20 17:58:15 +02:00
Marcel Hofer 05e7c95829 [SSL] fix wildcard compare for non-bash shell 2019-10-20 17:02:54 +02:00
Marcel Hofer dcd50b2245 [SSL] restore old nginx templates. fix possible issues with custom nginx sites 2019-10-20 16:41:53 +02:00
André Peters 5d93ae655a
Merge pull request #2509 from mhofer117/tls-sni
Different SSL Certificate for each Domain with TLS SNI
2019-10-20 15:17:14 +02:00
Marcel Hofer 56bc9d45bb [SSL] prevent multiple certificates with the same domain 2019-10-20 14:44:39 +02:00
Michael Kuron c874781931
Add identifier to oauth profile
This is needed for nextcloud
2019-10-20 12:23:48 +02:00
Michael Kuron 267e7c662c
SOGo Integrator is now SOGo Connector 2019-10-20 10:07:27 +02:00
tinect 3f6a2fc7fa cache JS-File to reduce response-time
no message
2019-10-19 23:40:19 +02:00
Geitenijs 6d1b387d95
Fix Dutch language file 2019-10-19 23:03:20 +02:00
andryyy 23d7754825 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-19 22:58:55 +02:00
andryyy d35e3c1eff
[Dovecot] Fix Dovecot quarantine notification script 2019-10-19 22:58:11 +02:00
Marcel Hofer b413ed4013 [SSL] minor fix: prevent checking of empty SQL_DOMAIN 2019-10-19 18:23:59 +02:00
Geitenijs eb6229b2a4
Update lang.nl.php 2019-10-19 17:39:21 +02:00
Marcel Hofer 84c5f43438 [SSL] re-add nginx site.conf 2019-10-19 12:49:23 +02:00
Marcel Hofer 2e35da6816 [SSL] create individual domain certificates, add SNI configs for Postfix/Dovecot/Nginx 2019-10-19 12:48:56 +02:00
andryyy a95a3f6145
[Watchdog] Watch olefy 2019-10-18 19:45:16 +02:00
andryyy 65fc5d7518
Remove test hook 2019-10-18 12:03:44 +02:00
andryyy b0711db489
[Dockerfiles] Rename some files and create hook points 2019-10-18 12:01:47 +02:00
andryyy b02f73e68e
[Netfilter] Add missing rspamderror php... 2019-10-17 21:00:14 +02:00
Samy e329bff7da
Update admin.js 2019-10-17 11:17:29 +02:00
vain90 5957f16604
Update lang.de.php 2019-10-14 14:31:02 +02:00
Filip Hajny 980caaf398 Sync cs against en language file, improve translation. 2019-10-14 11:31:28 +02:00
friedPotat0 fbb800a783 fix rspamd 1.47 missing time_virtual value 2019-10-12 23:42:23 +02:00
andryyy 726235e9ee Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-12 19:00:03 +02:00
André Peters 6ead0a95a1
Merge pull request #3036 from friedPotat0/rspamdsymbols
Change rspamd debug log and quarantine symbols
2019-10-12 17:23:36 +02:00
friedPotat0 d2d520336b change sorting of rspamd symbols in quarantine 2019-10-12 15:35:57 +02:00
friedPotat0 5f777a1b25 remove obsolete lines 2019-10-12 15:35:49 +02:00
friedPotat0 84617b0d6b sort rspamd symbols in debug log 2019-10-12 15:35:40 +02:00
friedPotat0 c97b91503b change rspamd option delimiter 2019-10-12 15:35:32 +02:00
friedPotat0 31ceb54732 change text color of neutral rspamd symbol scores 2019-10-12 15:35:13 +02:00
andryyy a606f60b54
[Nginx] Modify site to catch failed logins to /rspamd 2019-10-12 13:16:49 +02:00
andryyy 2811b498ab
[Netfilter] Punish failed logins to /rspamd 2019-10-12 13:15:59 +02:00
andryyy 0089f72f3d
[Watchdog] Fix for Rspamd 2.0 2019-10-12 13:15:36 +02:00
andryyy ee57b5921f
[Rspamd] Various fixes for Rspamd 2.0, neural network activated, autolearning activated (auto-keeps a ratio) 2019-10-12 13:14:34 +02:00
andryyy 8783ec4415
[Web] Remove dangling domain admins after deleting domain, fixes #3027 - again 2019-10-11 16:47:39 +02:00
andryyy 5e6a70c438 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-11 08:51:54 +02:00
andryyy 71994b1bcd
[Web] Use panel instead of tab-pane to find panel-heading, fixes #3022 2019-10-11 08:51:40 +02:00
André Peters 727c27abb9
Merge pull request #3026 from friedPotat0/multilinesender
Fix alignment of senders in quarantine detail view
2019-10-11 08:45:24 +02:00
andryyy 6213d6ee02
[Web] Remove dangling domain admins after deleting domain, fixes #3027 2019-10-11 08:25:23 +02:00
Christian Zaenker d5ba43623b Fix alignment of senders in quarantine detail view 2019-10-10 18:16:39 +02:00
andryyy 0cfa056faa
[Rspamd] Do not quaratine if symbol is GLOBAL_X_BL 2019-10-10 12:38:24 +02:00
andryyy d03e90d3c0
[Web] Disable API as username 2019-10-10 07:13:50 +02:00
andryyy 3124226607
[Web] Fix for broken setting in quarantine (sender) 2019-10-10 07:13:26 +02:00
andryyy ecce16a8ca Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-09 22:32:16 +02:00
André Peters 8d8d7fd628
Merge pull request #3009 from heavygale/patch-2
sogo_access acl for domain admin
2019-10-09 22:32:02 +02:00
André Peters be9af6fb2a
Update init_db.inc.php 2019-10-09 22:31:41 +02:00
heavygale 11503fd316 Change ACL description 2019-10-09 22:30:20 +02:00
andryyy 88a32f025a Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-09 22:24:52 +02:00
André Peters a5fb1695fa
Merge pull request #3024 from friedPotat0/rspamdquarantinedetails
Add rspamd score and symbols to quarantine detail view
2019-10-09 22:24:47 +02:00
andryyy 83231ba8b5 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-09 22:23:05 +02:00
andryyy 227093ce9b
[Web] More details about SOGo profile purging 2019-10-09 22:22:53 +02:00
André Peters 7373d91724
Merge pull request #3002 from ntimo/task/api-status-codes
[API] Status Codes and only allow valid http method
2019-10-09 22:22:06 +02:00
friedPotat0 cb17d71c61 Add score, symbols to quarantine detail view 2019-10-09 22:07:26 +02:00
friedPotat0 6fc32e8e52 Add option to download quarantine item as eml 2019-10-09 20:18:21 +02:00
ntimo af13ae455c
[API] Invalidate session after api call is done 2019-10-08 19:30:01 +02:00
andryyy 80a9c39956
[Web] Validate plain md5 hashes, closes #3017 2019-10-08 17:36:28 +02:00
heavygale a049a1ffac Undo automatic whitespace cleanup 2 2019-10-06 18:59:54 +02:00
heavygale a997a2e462 Undo automatic whitespace cleanup 2019-10-06 18:56:24 +02:00
andryyy 1580e4b2a5
[Nginx, SOGo] Adjustments for EAS 2019-10-06 10:12:46 +02:00
ntimo 8a87dd4254
[API] Removed unsets that are not needed 2019-10-05 18:14:36 +02:00
heavygale 48838d9fd7 Don't update sogo_access when editing without acl
Disabled checkboxes send 0 even if checked -> don't change sogo_access at all, if mailbox gets edited by domain admin without sogo_access acl.
2019-10-05 18:07:46 +02:00
heavygale 292923a1cc Fix mistake in mailbox-edit 2019-10-05 17:34:25 +02:00
heavygale 2e42cfbd5f Added sogo_access acl for domain admin
- new sogo_access acl is added for domain admins
- changing sogo_acces on a mailbox is only allowed if attempted by admin or by an domain admin with sogo_access acl.
- new Mailboxes are created with SOGo access if "$MAILBOX_DEFAULT_ATTRIBUTES['sogo_access'] = true;" AND if created by admin or domain admin with sogo_access acl. Otherwise sogo_access is forbidden for the new mailbox.
2019-10-05 17:29:16 +02:00
ntimo 2c7e9f49d5
[API] Added comments to defaults 2019-10-04 09:01:31 +02:00
André Peters a008855991
Merge pull request #2999 from ntimo/task/api-docs
[Nginx] Fix nginx config for API docs
2019-10-04 08:51:26 +02:00
André Peters 0c2dcef916
Merge pull request #3003 from ntimo/task/replace-die-with-exit
[Web] Replaced die(); with exit(); due to code conventions
2019-10-04 08:45:08 +02:00
andryyy 4c952dda3b
[Web] Remove old transport-map from mailbox.js 2019-10-04 08:44:31 +02:00
andryyy 8f7693ccdb
[Postfix] Update postscreen_access 2019-10-04 08:43:59 +02:00
André Peters 37f6ddac2e
Merge pull request #2950 from friedPotat0/postwhite
update postscreen whitelist by using postwhite
2019-10-04 08:41:29 +02:00
ntimo cb9ab928b3
[Web] Replaced die(); with exit(); due to code conventions 2019-10-04 08:40:24 +02:00
ntimo 6372df21fe
[API] Replaced die(); with exit(); due to code conventions 2019-10-04 08:37:30 +02:00
ntimo 08350d9a95
[API] Added missing route not found error for /get/logs/ 2019-10-03 20:58:56 +02:00
ntimo 2da55296b5
[API] Catch more cases where no api route exists 2019-10-03 20:52:09 +02:00
ntimo b9c244b746
[API] Only allow POST method for edit apis 2019-10-03 18:14:27 +02:00
ntimo 5fa456770f
[API] Removed hard coded status code 200 2019-10-03 17:25:56 +02:00
ntimo 416d5a12f8
[API] Unset POST when only GET is allowed 2019-10-03 15:06:08 +02:00
ntimo ab298741e3
[API] Added comments 2019-10-03 15:04:25 +02:00
ntimo 877c48db58
[API] Added missing die() 2019-10-03 14:42:30 +02:00