andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							b7a23a28fd
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev
						
						
						
						
						
					 | 
					
						2018-01-08 22:01:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e9cae9084
							
						
					 | 
					
						
						
							
							[Compose] New images with LOG_LINES
						
						
						
						
						
						
						
						[Update] Do not add empty line in each loop 
						
					 | 
					
						2018-01-08 22:00:54 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Kuron
							
						 
					 | 
					
						
						
						
						
							
						
						
							cde250a989
							
						
					 | 
					
						
						
							
							Properly wait for MySQL to come up before starting SOGo
						
						
						
						
						
					 | 
					
						2018-01-08 19:56:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								apoc4lyps
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							06955f5312
							
						
					 | 
					
						
						
							
							Update nextcloud.sh
						
						
						
						
						
						
						
						fix typo 
						
					 | 
					
						2018-01-04 16:58:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								apoc4lyps
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c3aaae2a76
							
						
					 | 
					
						
						
							
							[Helper] Nextcloud: fix subdomain and background
						
						
						
						
						
					 | 
					
						2018-01-04 15:59:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								apoc4lyps
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b8a20b3a23
							
						
					 | 
					
						
						
							
							[Helper] Nextcloud: fix subdomain
						
						
						
						
						
					 | 
					
						2018-01-04 15:57:43 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							102b33d619
							
						
					 | 
					
						
						
							
							Ignore worker-controller-password.inc
						
						
						
						
						
					 | 
					
						2018-01-02 18:16:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							868abc15bd
							
						
					 | 
					
						
						
							
							[Rspamd] Fix worker-controller-password placeholder
						
						
						
						
						
					 | 
					
						2018-01-02 18:15:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							8474840926
							
						
					 | 
					
						
						
							
							[Compose] New SOGo and ACME images
						
						
						
						
						
					 | 
					
						2018-01-02 18:13:43 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							db032af698
							
						
					 | 
					
						
						
							
							[ACME] Fix script
						
						
						
						
						
					 | 
					
						2017-12-31 17:17:46 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kristian
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cb23cf4a3
							
						
					 | 
					
						
						
							
							User - Allow send as all - list all domains inc. alias domains
						
						
						
						
						
					 | 
					
						2017-12-30 21:25:45 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Amir Zarrinkafsh
							
						 
					 | 
					
						
						
						
						
							
						
						
							65386d4ccf
							
						
					 | 
					
						
						
							
							Included folder mapping for iOS Mail Trash folder.
						
						
						
						
						
					 | 
					
						2017-12-30 13:58:17 +11:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							a8807b5894
							
						
					 | 
					
						
						
							
							[Helper] Nextcloud: Use latest 12
						
						
						
						
						
					 | 
					
						2017-12-26 11:23:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb57fce38f
							
						
					 | 
					
						
						
							
							[Dovecot] Possibly fixes #722
						
						
						
						
						
					 | 
					
						2017-12-25 10:25:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d56534e76
							
						
					 | 
					
						
						
							
							[Postfix] Don't try to authenticate to relayhosts without username, fixes #725
						
						
						
						
						
					 | 
					
						2017-12-25 10:18:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							603956ca6a
							
						
					 | 
					
						
						
							
							[Web] Disable connectors in footable filter for mailbox
						
						
						
						
						
					 | 
					
						2017-12-20 21:15:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							c067e6f715
							
						
					 | 
					
						
						
							
							[Compose] Push dockerapi version
						
						
						
						
						
					 | 
					
						2017-12-20 08:59:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f671c0b3c4
							
						
					 | 
					
						
						
							
							Merge pull request #827 from Oratorian/patch-2
						
						
						
						
						
						
						
						See Issue #826 
						
					 | 
					
						2017-12-18 17:55:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oratorian
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							236e4d4a36
							
						
					 | 
					
						
						
							
							See Issue #826
						
						
						
						
						
						
						
						Fixes dockerapi-mailcow_1 | raise TypeError('port must be an integer')
Containers are now restarting.
						
					 | 
					
						2017-12-18 16:41:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa96f227d8
							
						
					 | 
					
						
						
							
							[Web] No inline forms in admin
						
						
						
						
						
					 | 
					
						2017-12-17 17:57:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							52f4f850cf
							
						
					 | 
					
						
						
							
							[Postfix] Fix missing authentication data for relayhosts when sender domain is alias domain
						
						
						
						
						
					 | 
					
						2017-12-17 17:45:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							a771d66889
							
						
					 | 
					
						
						
							
							[Dovecot] Update imapsync
						
						
						
						
						
					 | 
					
						2017-12-17 17:45:05 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							2994b94b6c
							
						
					 | 
					
						
						
							
							[Docker API] Remove logs, remove env var for compose project name
						
						
						
						
						
					 | 
					
						2017-12-11 09:43:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							f1d533eef6
							
						
					 | 
					
						
						
							
							[Compose] Add TZ for libc to containers, add Rspamd controller password file to Docker API
						
						
						
						
						
					 | 
					
						2017-12-11 09:42:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							d71b6f0ad1
							
						
					 | 
					
						
						
							
							Add placeholder for Rspamd controller password written via UI
						
						
						
						
						
					 | 
					
						2017-12-11 09:41:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							6865402ae0
							
						
					 | 
					
						
						
							
							Fix maildir path
						
						
						
						
						
					 | 
					
						2017-12-10 19:10:49 +01:00 | 
					
					
						
						
							
							
							
						
					 |