Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								9db2476991
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact
							
							
							
							
							
						 | 
						
							2018-08-24 17:00:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								05077e06fa
								
							
								
							
						 | 
						
							
							
								
								Change admin_uri to admin_contact in config and errors
							
							
							
							
							
						 | 
						
							2018-08-24 16:51:27 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								01a5a8b9e3
								
							
								
							
						 | 
						
							
							
								
								Fix checking if service notice room is already tagged
							
							
							
							
							
							
							
							This manifested in synapse repeatedly setting the tag for the room 
							
						 | 
						
							2018-08-24 16:22:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								cdd24449ee
								
							
								
							
						 | 
						
							
							
								
								Ensure we wake up /sync when we add tag to notice room
							
							
							
							
							
						 | 
						
							2018-08-24 14:50:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								14d49c51db
								
							
								
							
						 | 
						
							
							
								
								Make content of tag an empty object rather than null
							
							
							
							
							
						 | 
						
							2018-08-24 14:44:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								7f147d623b
								
							
								
							
						 | 
						
							
							
								
								Fix bug where we broke sync when using limit_usage_by_mau
							
							
							
							
							
							
							
							We assumed that we always had service notices configured, but that is
not always true 
							
						 | 
						
							2018-08-24 11:33:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								7e6e588e60
								
							
								
							
						 | 
						
							
							
								
								Fix bug where we resent "limit exceeded" server notices
							
							
							
							
							
							
							
							This was due to a bug where we mutated a cached event's contents 
							
						 | 
						
							2018-08-23 16:21:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								9643a6f7f2
								
							
								
							
						 | 
						
							
							
								
								Update notice format
							
							
							
							
							
						 | 
						
							2018-08-22 17:00:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								ba1fbf7d5b
								
							
								
							
						 | 
						
							
							
								
								special case server_notices_mxid
							
							
							
							
							
						 | 
						
							2018-08-18 12:31:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								d49b77404b
								
							
								
							
						 | 
						
							
							
								
								clean up, no functional changes
							
							
							
							
							
						 | 
						
							2018-08-17 15:21:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								51b17ec566
								
							
								
							
						 | 
						
							
							
								
								flake8
							
							
							
							
							
						 | 
						
							2018-08-16 17:32:22 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								3c1080b6e4
								
							
								
							
						 | 
						
							
							
								
								refactor for readability, and reuse caching for setting tags
							
							
							
							
							
						 | 
						
							2018-08-16 17:02:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								eff3ae3b9a
								
							
								
							
						 | 
						
							
							
								
								add room tagging
							
							
							
							
							
						 | 
						
							2018-08-16 15:48:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								a675f9c556
								
							
								
							
						 | 
						
							
							
								
								check for room state before deciding on action
							
							
							
							
							
						 | 
						
							2018-08-16 14:53:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								df1e4f259f
								
							
								
							
						 | 
						
							
							
								
								WIP impl commiting to get feedback
							
							
							
							
							
						 | 
						
							2018-08-16 11:10:53 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								eabc5f8271
								
							
								
							
						 | 
						
							
							
								
								wip cut at sending resource server notices
							
							
							
							
							
						 | 
						
							2018-08-15 15:04:52 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								e2c9fe0a6a
								
							
								
							
						 | 
						
							
							
								
								backout ability to pass in event type to server notices
							
							
							
							
							
						 | 
						
							2018-08-14 13:32:56 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								9b75c78b4d
								
							
								
							
						 | 
						
							
							
								
								support server notice state events for resource limits
							
							
							
							
							
						 | 
						
							2018-08-14 11:20:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								63417c31e9
								
							
								
							
						 | 
						
							
							
								
								fix typo
							
							
							
							
							
						 | 
						
							2018-08-13 22:36:52 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								6c6aba76e1
								
							
								
							
						 | 
						
							
							
								
								implementation of server notices to alert on hitting resource limits
							
							
							
							
							
						 | 
						
							2018-08-10 15:12:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Neil Johnson
							
						 | 
						
							
							
							
							
								
							
								01021c812f
								
							
								
							
						 | 
						
							
							
								
								wip at implementing MSC 7075
							
							
							
							
							
						 | 
						
							2018-08-09 22:16:00 +01:00 |