Commit Graph
100 Commits
Author SHA1 Message Date
André Peters 4405cb3e74 Merge pull request #953 from mkuron/recipient_map
Expose Postfix's recipient_canonical_maps through web UI
2018-01-28 11:09:22 +01:00
André Peters 55586f4cb1 Merge pull request #963 from mailcow/dev
Dev
2018-01-27 10:34:34 +01:00
André Peters a6ac55e42e Merge pull request #954 from mailcow/master
Merge master to dev
2018-01-24 09:26:56 +01:00
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
André Peters 2730e95a01 Merge pull request #941 from mailcow/dev
Dev
2018-01-19 19:19:14 +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
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
André Peters b383391e2c Merge pull request #914 from mailcow/dev
Various fixes
2018-01-16 12:47:12 +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
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
André Peters 823fc80bcb Merge pull request #899 from mailcow/dev
[DockerAPI] Hide stderr from rspamadm output
2018-01-14 20:38:33 +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
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
André Peters d3c834f43e Merge pull request #891 from mailcow/dev
Dev
2018-01-13 22:50:33 +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
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
André Peters 0d70de4385 Merge pull request #874 from mkuron/sogo-mysql
Properly wait for MySQL to come up before starting SOGo
2018-01-08 20:24:32 +01:00
André Peters 24c8c82f5a Merge pull request #853 from mkuron/dns
DNS diagnostics: show correct TXT records
2018-01-03 21:25:53 +01:00
André Peters 74bd635505 Update dns_diagnostics.php
Oops, forgot 2 vars.
2018-01-03 21:00:29 +01:00
André Peters 111655c199 Merge branch 'dev' into dns 2018-01-03 20:56:35 +01:00
André Peters 2b93ad62b5 Merge branch 'dev' into dns 2018-01-03 20:52:33 +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
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
André Peters 921741cf7a Merge pull request #845 from FELDSAM-INC/feldsam/send-as-all-extension
User - Allow send as all - list all domains inc. alias domains
2017-12-30 22:18:59 +01:00
André Peters 41b75e1bcf Merge pull request #844 from nightah/iOS-bin-patch
Included folder mapping for iOS Mail Trash folder
2017-12-30 09:52:35 +01:00
André Peters f671c0b3c4 Merge pull request #827 from Oratorian/patch-2
See Issue #826
2017-12-18 17:55:27 +01:00
André Peters dbf5bc630a Merge pull request #815 from mailcow/dev-pre
Dev pre
2017-12-09 22:30:49 +01:00
André Peters 67606a779b Merge pull request #814 from mailcow/dev-pre
Dev pre
2017-12-09 22:29:47 +01:00
André Peters e4b91e06a3 Merge pull request #799 from mkuron/health
Disable broken MariaDB health check
2017-12-08 09:27:02 +01:00
André Peters f8416b83d1 Merge pull request #795 from pschiffe/dev-api-version
[Dockerapi] Auto detect version of docker server
2017-12-07 14:16:45 +01:00
André Peters b1855587ec Revert exclude, bad idea 2017-12-05 20:53:45 +01:00
André 3ec3a341e4 [Postfix] Remove gw from mynetworks in case of ipv6 failures 2017-11-21 09:33:43 +01:00
André e1eb83ef87 [Web] Update libs, fix U2F for Firefox Quantum 2017-11-21 09:33:22 +01:00
André Peters 4c98cbec27 Exclude 172.22.1.1 from mynetworks
In case of v6 nat failures.
2017-11-19 18:44:18 +01:00
André 1bd0d9270f Only rebuild on master pushes 2017-11-19 15:19:37 +01:00
André ade4b9e7ae [Postfix, Web] Feature: BCC maps 2017-11-19 15:13:43 +01:00
André 967108c057 [Web] Do not try to detroy invalid imagick sessions 2017-11-16 14:57:39 +01:00
André 5211ab10ed [ACME] Fix license issue 2017-11-16 14:57:17 +01:00
André 49c475cd78 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2017-11-15 12:29:28 +01:00
André c45ea5433f [Rspamd] Base on xenial to fix mime types problems 2017-11-15 12:29:18 +01:00
André Peters bc8b10753b Merge pull request #752 from mailcow/dev
[Web] Create new id on sieve filter update by using md5, fixes #750
2017-11-14 21:11:55 +01:00
André a5abca4c34 [Web] Create new id on sieve filter update by using md5, fixes #750 2017-11-14 21:11:36 +01:00
André Peters 012283296f Merge pull request #751 from mailcow/dev
Dev
2017-11-14 20:04:36 +01:00
André 39b560d992 [Web] Fix init_db, take 2 2017-11-14 20:03:45 +01:00
André 3de79b85ef [Web] Fix init db 2017-11-14 20:03:45 +01:00
André 00c205267f [Web] Fix init_db, take 2 2017-11-14 20:03:45 +01:00
André 7bbeb17ea2 [Web] Fix init db 2017-11-14 20:03:45 +01:00
André d0df8b57d1 Remove space... 2017-11-14 19:54:31 +01:00
André fe845ee56d [Fail2ban] Fix fail2ban container 2017-11-14 19:50:20 +01:00
André f368954418 [Web] Fix init_db, take 2 2017-11-14 13:29:02 +01:00
André 4d6ddc1db4 [Web] Fix init db 2017-11-14 12:37:08 +01:00
André 7bb1e2e40e Fix conflicts 2017-11-14 10:48:04 +01:00
André 84a7a1a2e7 [Compose] New images, Nginx checks for SOGo before bootstrapping
[PHP-FPM] Some more modules (primarily for Horde)
[Fail2ban] Do not log matches of local and private ips
[Watchdog] Some changes in log system for further processing (wip)
[ACME] Fixes #745
2017-11-14 10:44:22 +01:00
André c2d9928f8f [Rspamd] Set task timeout to 12s 2017-11-10 19:58:56 +01:00
André ec37c6b0c2 [Web] Minor changes 2017-11-10 19:58:17 +01:00
André Peters 25806b62a9 Merge pull request #707 from gigabit-gmbh/ui-view-for-permission
Disable Buttons on Mailbox / Domain when no permission to interact with them
2017-11-09 07:40:52 +01:00
André Peters 166d750599 Merge pull request #730 from mkuron/rspamd-timeout
Rspamd: increase task timeout
2017-11-09 07:35:09 +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é b4cc5a9891 generate_config: Added hint for FQDN 2017-11-07 18:38:40 +01:00
André Peters 8aa98d2e6e Merge pull request #451 from mkuron/dns2
DNS diagnostics page
2017-11-07 09:41:32 +01:00
André 2372949162 [Web] Fix check for existing domain when adding alias domains 2017-11-06 21:58:08 +01:00
André Peters 23b7594605 Update sogo.conf 2017-11-06 18:48:29 +01:00
André 3873e38919 [SOGo] Use SOGoMaximumSyncResponseSize of 2048 2017-11-06 13:35:48 +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
André a36a8828c2 [Dovecot] Specify supervisord user 2017-11-05 12:19:18 +01:00
André 586a0b0e05 [Dovecot] Add bindirs to cache compiled scripts, drop some privileges, run one login proc per user 2017-11-05 12:18:52 +01:00
André 548fe979ec [Compose] add net_bind_service cap to Dovecot, new images, reduce oom_score for dockerapi 2017-11-05 12:17:37 +01:00
André Peters 3f9a3c5354 Merge pull request #715 from mkuron/rspamd-update
Update rspamd
2017-11-04 10:53:04 +01:00
André 639ba941f3 [Helper] Nextcloud helper script (wip) 2017-11-03 20:39:58 +01:00
André bcdccf9c92 [Compose] New images, add restart to dockerapi, remove stop grace period (container now handles stop signals better) 2017-11-03 20:38:59 +01:00
André 85d1ee2f49 [Web] Autodiscover returns given password decoded and trimed; Add sieve pre and post filters to UI; Move ajax called files; Rework log system: 100 entries per default, add more per click; Syncjobs: Do not read log to data attribute 2017-11-03 20:37:24 +01:00
André 1ef10f1358 [PHP-FPM] Include net_sieve, test removal of usr/src/php for size 2017-11-03 20:27:43 +01:00
André b16684ce20 [Rspamd] Slightly reduce map watch interval 2017-11-03 20:26:36 +01:00
André a9f64a3472 [Dockerapi] Return answers in json 2017-11-03 20:26:09 +01:00
André 21e20f3786 [Dovecot] sieve_before/after maps in sql, changed dict names 2017-11-03 20:25:43 +01:00
André b32e5adcc5 [Dovecot] sieve_before/after maps in sql, changed dict names 2017-11-03 20:25:38 +01:00
André f067a45bcb [SOGo] Should fix some Android sync issues 2017-11-02 09:51:58 +01:00
André Peters 364338408b Delete api.php 2017-10-31 11:10:27 +01:00
André Peters 8f24b8c646 Merge pull request #705 from mailcow/revert-703-master
Revert "Adding a primary key in domain_admins table"
2017-10-31 10:43:55 +01:00
André Peters c8be2240e4 Revert "Adding a primary key in domain_admins table" 2017-10-31 10:43:45 +01:00
André Peters 5f7fc38fd8 Merge pull request #703 from MAGICCC/master
Adding a primary key in domain_admins table
2017-10-31 10:41:09 +01:00
André Peters f7e3626e67 Merge pull request #701 from markusg/master
Rspamd History fix small error
2017-10-30 22:30:24 +01:00
André Peters be752828d1 Merge pull request #700 from mkuron/compose21
docker-compose file format version 2.1
2017-10-30 19:01:38 +01:00
André eb6f0ebd81 Merge branch 'dev' 2017-10-27 11:24:29 +02:00
André 1e9bc49f2c [Rspamd] Echo dummy for fowardingshosts map; Use higher map reading interval;
[Dockerapi] Exit on sigterm;
[Watchdog] Wait for dockerapi-mailcow to be online
2017-10-27 11:22:39 +02:00
André Peters 255d4be785 Update docker-compose.yml 2017-10-27 09:57:23 +02:00
André fe2bd9779b Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev 2017-10-26 22:25:28 +02:00
André 083174a9bd [Rspamd] Do not try to index nil value 2017-10-26 22:25:13 +02:00
André Peters 01f3c1fac6 Merge pull request #674 from asirinelli/french
French translation
2017-10-26 22:24:40 +02:00
André e5e2990cda [Rspamd] Do not try to index nil value 2017-10-26 12:51:30 +02:00