09a50b6cfc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into 'master'  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5795d8be16 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #744  from kaiyou/fix-remove-debug  
							
							... 
							
							
							
							Remove some forgotten debugging, fix  #720  
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4060ac2223 
								
							
								 
							
						 
						
							
							
								
								Remove some forgotten debugging  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								087841d5b7 
								
							
								 
							
						 
						
							
							
								
								Fix the way we handle the application context  
							
							... 
							
							
							
							The init script was pushing an application context, which maked
flask.g global and persisted across requests. This was evaluated
to have a minimal security impact.
This explains/fixes #738 : flask_wtf caches the csrf token in the
application context to have a single token per request, and only
sets the session attribute after the first generation. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b5f51b0e2e 
								
							
								 
							
						 
						
							
							
								
								Update python dependencies  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0f4ba39141 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #741  from usrpro/fix-networks-bug  
							
							... 
							
							
							
							Fixed networks indentation 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								514d179db1 
								
							
								 
							
						 
						
							
							
								
								Fixed networks indentation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bb0fd896b3 
								
							
								 
							
						 
						
							
							
								
								Fix some bugs in setup for stack flavor  
							
							... 
							
							
							
							- Unbound and webmail images were hardcoded
- Removed unnecesary environment keyword 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8fe9e695f3 
								
							
								 
							
						 
						
							
							
								
								prefer non-wildcard aliases over wildcard aliases  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c7dcfee882 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #713  from pgeorgi/extend-nginx  
							
							... 
							
							
							
							nginx: Allow extending config with overrides 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								79768c09f6 
								
							
								 
							
						 
						
							
							
								
								fix alias matching behaviour  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								74693ee47c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #736  from usrpro/clamav-health-start  
							
							... 
							
							
							
							Increase health start period for clamav's DB download 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c1839b1ec1 
								
									
								
							
								 
							
						 
						
							
							
								
								Increase health start period for clamav's DB download  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ca8ed437d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #732  from Nebukadneza/add_front_certificate_reload  
							
							... 
							
							
							
							Add certificate watcher for external certs to reload nginx 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								94e42c9b52 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #727  from usrpro/feat-subnet2  
							
							... 
							
							
							
							Move the Mailu Docker network to a fixed subnet. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								33c0a99ffc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #678  from hacor/k8s-cni-fix  
							
							... 
							
							
							
							Added kubernetes CNI support for Mailu 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bb85079d92 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #695  from ofthesun9/master-patch1  
							
							... 
							
							
							
							POD_ADDRESS_RANGE need to be defined for admin service (dovecot authentific… 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								491f6b24bb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into 'feat-subnet2'  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1aa97c9914 
								
							
								 
							
						 
						
							
							
								
								Add certificate watcher for external certs to reload nginx  
							
							... 
							
							
							
							In case of TLS_FLAVOR=[mail,cert], the user supplies their own certificates.
However, since nginx is not aware of changes to these files, it cannot
reload itself e.g. when the certs get renewed.
To solve this, let’s add a small daemon in the place of
`letsencrypt.py`, which uses a flexible file-watching framework and
reloads nginx in the case the certificates change …. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c00910ca4b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into extend-nginx  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								97d338e68a 
								
									
								
							
								 
							
						 
						
							
							
								
								Rectify 'endif' placement  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7f46876b0c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #731  from usrpro/attachment-size  
							
							... 
							
							
							
							Dynamic attachment size limit 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								425cdd5e77 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix syntax errors  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								20f1faf6d0 
								
									
								
							
								 
							
						 
						
							
							
								
								Send 404 when nothing server at '/'  
							
							... 
							
							
							
							Prevents Nginx welcome screen 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c25ba75d68 
								
									
								
							
								 
							
						 
						
							
							
								
								Include WEBROOT_REDIRECT in setup templates  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9208d7262f 
								
									
								
							
								 
							
						 
						
							
							
								
								Correct variable naming in .env  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2de4995fec 
								
									
								
							
								 
							
						 
						
							
							
								
								Don't redirect when webmail is served on '/'  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								28daa22842 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #726  from usrpro/update-mergify  
							
							... 
							
							
							
							review/need2 in mergify 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8e5ccf2754 
								
									
								
							
								 
							
						 
						
							
							
								
								Don't merge when WIP or Blocked  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								626559f99b 
								
									
								
							
								 
							
						 
						
							
							
								
								Mergify dismiss reviews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								94edb48f08 
								
							
								 
							
						 
						
							
							
								
								Dynamic attachment size  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a2a9512afa 
								
									
								
							
								 
							
						 
						
							
							
								
								Enable mergify strict mode  
							
							... 
							
							
							
							In the past we had strict mode in branch protection. This didn't really work as it broke mergify. Now mergify supports this options and takes care of the merging automatically. Let's see how it goes ;)
Reason is the recent build failures we had on master, during a busy merge day. This could have been prevented if sequential PR's where re-merging with master.
More info: https://doc.mergify.io/strict-workflow.html  
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f0906073e3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into feat-subnet2  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a634c7b72d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #725  from usrpro/fix-outlook2019-smtp  
							
							... 
							
							
							
							Add login method to smtp_auth under ssl 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								38eb266c25 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #728  from usrpro/fix-autobuild  
							
							... 
							
							
							
							Fix autobuild 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c0972face6 
								
									
								
							
								 
							
						 
						
							
							
								
								Correct subnetting functionality for the tests and setup  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								35be1710a6 
								
									
								
							
								 
							
						 
						
							
							
								
								Changed user creation command  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8acf9451fa 
								
									
								
							
								 
							
						 
						
							
							
								
								Changed admin and user creation command  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8172f3eab8 
								
									
								
							
								 
							
						 
						
							
							
								
								Move the Mailu Docker network to a fixed subnet.  
							
							... 
							
							
							
							This will make network configuration and host based authentication
more robust, across different deployment platforms.
The options `RELAYNETS` and`POD_ADDRESS_RANGE` are kept for compatibility.
However, their usage have become optional. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3d98124bcd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #670  from kaiyou/refactor-config  
							
							... 
							
							
							
							Refactor the admin architecture and configuration management 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fee52e87ed 
								
									
								
							
								 
							
						 
						
							
							
								
								Don't allow for 1 review when review/need2 label is set  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b6aaf57be1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'refactor-config' of github.com:kaiyou/mailu into refactor-config  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d0f07984b0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into refactor-config  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								07b1e8d765 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #722  from usrpro/update-mergify  
							
							... 
							
							
							
							Update .mergify.yml 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9dd447e23b 
								
									
								
							
								 
							
						 
						
							
							
								
								Add login method to smtp_auth under ssl  
							
							... 
							
							
							
							Fixes  #704  
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								eac4d553a9 
								
							
								 
							
						 
						
							
							
								
								nginx: Allow extending config with overrides  
							
							... 
							
							
							
							To facilitate this, the default redirect at / can be disabled, even if
the default remains at redirecting to the webmailer.
The extensions are within the host scope and are read from
$ROOT/overrides/nginx/*.conf. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c25c646909 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #702  from dani909/feat-image-prefix  
							
							... 
							
							
							
							Add docker image prefix 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								02367d1447 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into feat-image-prefix  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2d4bac03ad 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #723  from usrpro/clean-healthcheck-logs  
							
							... 
							
							
							
							Admin: Prevent redirects during health checking 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a382f74680 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #705  from usrpro/fix-recaptcha  
							
							... 
							
							
							
							Fix recaptcha 
							
						 
						
							7 years ago