Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								76c9af193c
								
							
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'master' of github.com:matrix-org/synapse into develop"
							
							
							
							
							
							
							
							This reverts commit f9b255cd62, reversing
changes made to 1bd654dabd. 
							
						 | 
						
							2017-11-07 13:32:35 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								f9b255cd62
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into develop
							
							
							
							
							
						 | 
						
							2017-11-07 13:31:03 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								6980c4557e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'erikj/attestation_jitter' of github.com:matrix-org/synapse into develop
							
							
							
							
							
						 | 
						
							2017-10-27 15:09:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								af92f5b00f
								
							
								
							
						 | 
						
							
							
								
								Revert "Add jitter to validity period of attestations"
							
							
							
							
							
						 | 
						
							2017-10-27 15:07:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								4ab8abbc2b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'erikj/attestation_local_fix' of github.com:matrix-org/synapse into develop
							
							
							
							
							
						 | 
						
							2017-10-27 15:07:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								ca571b0ec3
								
							
								
							
						 | 
						
							
							
								
								Add jitter to validity period of attestations
							
							
							
							
							
							
							
							This helps ensure that the renewals of attestations are spread out more
evenly. 
							
						 | 
						
							2017-10-27 11:57:27 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								c067088747
								
							
								
							
						 | 
						
							
							
								
								Add comment about attestations
							
							
							
							
							
						 | 
						
							2017-10-27 11:35:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e27b76d117
								
							
								
							
						 | 
						
							
							
								
								Import logger
							
							
							
							
							
						 | 
						
							2017-10-27 10:54:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								82d8c1bacb
								
							
								
							
						 | 
						
							
							
								
								Fixup
							
							
							
							
							
						 | 
						
							2017-10-27 10:30:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								195abfe7a5
								
							
								
							
						 | 
						
							
							
								
								Remove incorrect attestations
							
							
							
							
							
						 | 
						
							2017-10-27 09:58:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								d8dde19f04
								
							
								
							
						 | 
						
							
							
								
								Log if we try to do attestations for our own user and group
							
							
							
							
							
						 | 
						
							2017-10-27 09:55:01 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								9ab859f27b
								
							
								
							
						 | 
						
							
							
								
								Fix typo in group attestation handling
							
							
							
							
							
						 | 
						
							2017-10-19 10:55:52 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								161a862ffb
								
							
								
							
						 | 
						
							
							
								
								Fix typo
							
							
							
							
							
						 | 
						
							2017-10-19 10:17:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								bbb739d24a
								
							
								
							
						 | 
						
							
							
								
								Comment
							
							
							
							
							
						 | 
						
							2017-07-11 14:31:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								26752df503
								
							
								
							
						 | 
						
							
							
								
								Typo
							
							
							
							
							
						 | 
						
							2017-07-11 14:29:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								0aac30d53b
								
							
								
							
						 | 
						
							
							
								
								Comments
							
							
							
							
							
						 | 
						
							2017-07-11 14:23:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								83936293eb
								
							
								
							
						 | 
						
							
							
								
								Comments
							
							
							
							
							
						 | 
						
							2017-07-11 11:42:25 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								b8ca494ee9
								
							
								
							
						 | 
						
							
							
								
								Initial group server implementation
							
							
							
							
							
						 | 
						
							2017-07-10 15:44:15 +01:00 |