Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								522bd3c8a3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop
							
							
							
							
							
						 | 
						
							2018-06-05 17:42:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
								
								
							
							
								
							
								219c2a322b
								
									
								
							
								
							
						 | 
						
							
							
								
								remove trailing whitespace
							
							
							
							
							
						 | 
						
							2018-05-30 19:42:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
								
								
							
							
								
							
								2e4be8bfd9
								
									
								
							
								
							
						 | 
						
							
							
								
								fix english and wrap comment
							
							
							
							
							
						 | 
						
							2018-05-30 19:24:12 +01:00 | 
						
					
				
					
						
							
							
								 
								Ruben Barkow
							
						 | 
						
							
							
							
								
								
							
							
								
							
								08ea5fe635
								
									
								
							
								
							
						 | 
						
							
							
								
								add link to thorough instruction how to configure consent
							
							
							
							
							
						 | 
						
							2018-05-25 23:19:55 +02:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								66bdae986f
								
							
								
							
						 | 
						
							
							
								
								Fix default for send_server_notice_to_guests
							
							
							
							
							
							
							
							bool("False") == True...
							
						 | 
						
							2018-05-25 11:42:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								ba1b163590
								
							
								
							
						 | 
						
							
							
								
								Avoid sending consent notice to guest users
							
							
							
							
							
							
							
							we think it makes sense not to send the notices to guest users. 
							
						 | 
						
							2018-05-25 11:36:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								82191b08f6
								
							
								
							
						 | 
						
							
							
								
								Support for putting %(consent_uri)s in messages
							
							
							
							
							
							
							
							Make it possible to put the URI in the error message and the server notice that
get sent by the server 
							
						 | 
						
							2018-05-23 15:24:31 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								a5e2941aad
								
							
								
							
						 | 
						
							
							
								
								Reject attempts to send event before privacy consent is given
							
							
							
							
							
							
							
							Returns an M_CONSENT_NOT_GIVEN error (cf
https://github.com/matrix-org/matrix-doc/issues/1252) if consent is not yet
given. 
							
						 | 
						
							2018-05-22 12:00:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								d5dca9a04f
								
							
								
							
						 | 
						
							
							
								
								Move consent config parsing into ConsentConfig
							
							
							
							
							
							
							
							turns out we need to reuse this, so it's better in the config class. 
							
						 | 
						
							2018-05-22 11:54:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								9ea219c514
								
							
								
							
						 | 
						
							
							
								
								Send users a server notice about consent
							
							
							
							
							
							
							
							When a user first syncs, we will send them a server notice asking them to
consent to the privacy policy if they have not already done so. 
							
						 | 
						
							2018-05-22 11:54:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								d14d7b8fdc
								
							
								
							
						 | 
						
							
							
								
								Rename 'version' param on user consent config
							
							
							
							
							
							
							
							we're going to use it for the version we require too. 
							
						 | 
						
							2018-05-22 11:54:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								47815edcfa
								
							
								
							
						 | 
						
							
							
								
								ConsentResource to gather policy consent from users
							
							
							
							
							
							
							
							Hopefully there are enough comments and docs in this that it makes sense on its
own. 
							
						 | 
						
							2018-05-15 15:11:59 +01:00 |