Michael Kuron
							
						 
					 | 
					
						
						
							
						
						c30448c4d8
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/andryyy/mailcow-dockerized into recipient_map
						
						
						
						
						
						
						
						Conflicts:
	data/web/inc/init_db.inc.php 
						
						
					 | 
					
						2018-01-27 17:22:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						855e93ef65
					 | 
					
						
						
							
							[Web] Slight css changes; Simple loading overlay...
						
						
						
						
						
						
					 | 
					
						2018-01-25 13:22:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						04f9d74339
					 | 
					
						
						
							
							[Web, Dovecot] Add new options to imapsync, other minor changes to forms, partly fixes #955
						
						
						
						
						
						
					 | 
					
						2018-01-24 12:59:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						1c6d3c16b6
					 | 
					
						
						
							
							[Web] Set Fail2ban subnet sizes
						
						
						
						
						
						
					 | 
					
						2018-01-24 09:25:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Kuron
							
						 
					 | 
					
						
						
							
						
						e86565e283
					 | 
					
						
						
							
							Expose Postfix's recipient_canonical_maps through web UI
						
						
						
						
						
						
					 | 
					
						2018-01-23 20:02:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						43770434b3
					 | 
					
						
						
							
							[Web] Alias by alias domain is now in 'direct aliases', added desc to direct and shared aliases
						
						
						
						
						
						
					 | 
					
						2018-01-21 15:02:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						08c8976a95
					 | 
					
						
						
							
							[SOGo] Show shared aliases and "allow to send as" addresses as FROM fields in SOGo
						
						
						
						
						
						
					 | 
					
						2018-01-21 14:58:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						1afca35b22
					 | 
					
						
						
							
							[Web] Fixes super annoying password verification bug #867
						
						
						
						
						
						
					 | 
					
						2018-01-19 11:52:32 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tii
							
						 
					 | 
					
						
						
							
						
						d58b89528f
					 | 
					
						
						
							
							rspamd multimap redis stuff doesn't work as expected...
						
						
						
						
						
						
					 | 
					
						2018-01-16 16:31:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Phoenix Eve Aspacio
							
						 
					 | 
					
						
						
							
						
						edbab3633d
					 | 
					
						
						
							
							Reload webpage after container restart
						
						
						
						
						
						
					 | 
					
						2018-01-16 22:05:42 +08: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
							
						
						f1f7749b85
					 | 
					
						
						
							
							Update dns_diagnostics.php
						
						
						
						
						
						
						
						Sprintf makes multi-lang easier.
Fix indents 
						
						
					 | 
					
						2018-01-16 09:33:39 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						278f1c2a37
					 | 
					
						
						
							
							[Web] Restart SOGo after adding a new domain, fixes #864
						
						
						
						
						
						
					 | 
					
						2018-01-11 22:40:43 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						d76d103c76
					 | 
					
						
						
							
							[Web] Move DNS diagnostic to modal, some minor fixes
						
						
						
						
						
						
					 | 
					
						2018-01-02 10:24:48 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						87c6770132
					 | 
					
						
						
							
							[Web] Fix empty passwords for relayhosts
						
						
						
						
						
						
					 | 
					
						2018-01-01 09:17:52 +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
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						c875508687
					 | 
					
						
						
							
							[Web] Remove logs from docker functions, fix debug syntax
						
						
						
						
						
						
					 | 
					
						2017-12-11 09:43:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						6865402ae0
					 | 
					
						
						
							
							Fix maildir path
						
						
						
						
						
						
					 | 
					
						2017-12-10 19:10:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						6c67b9df82
					 | 
					
						
						
							
							Replace name by IP, remove unused tables
						
						
						
						
						
						
					 | 
					
						2017-12-09 22:30:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
							
						
						adc23d86f9
					 | 
					
						
						
							
							Various...
						
						
						
						
						
						
					 | 
					
						2017-12-09 13:17:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |