Neil Johnson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4c22b4047b 
							
						 
					 
					
						
						
							
							Merge pull request  #3707  from matrix-org/neilj/limit_exceeded_error  
						
						... 
						
						
						
						add new error type ResourceLimit 
						
						
					 
					
						2018-08-17 13:33:54 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							782689bd40 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_profiles  
						
						
						
						
					 
					
						2018-08-17 14:15:48 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							ca87ad1def 
							
						 
					 
					
						
						
							
							Split ProfileHandler into master and worker  
						
						
						
						
					 
					
						2018-08-17 14:15:14 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							b5f638f1f4 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking  
						
						
						
						
					 
					
						2018-08-17 14:04:15 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							9fd161c6fb 
							
						 
					 
					
						
						
							
							Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse into neilj/limit_exceeded_error  
						
						
						
						
					 
					
						2018-08-17 13:58:40 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							0195dfbf52 
							
						 
					 
					
						
						
							
							server limits config docs  
						
						
						
						
					 
					
						2018-08-17 13:58:25 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							69c49d3fa3 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into neilj/limit_exceeded_error  
						
						
						
						
					 
					
						2018-08-17 12:44:26 +00:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							a2d872e7b3 
							
						 
					 
					
						
						
							
							Merge pull request  #3708  from matrix-org/neilj/resource_Limit_block_event_creation  
						
						... 
						
						
						
						Neilj/resource limit block event creation 
						
						
					 
					
						2018-08-17 12:42:59 +00:00 
						 
				 
			
				
					
						
							
							
								Amber Brown 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fa27073b14 
							
						 
					 
					
						
						
							
							Merge pull request  #3712  from matrix-org/travis/register-admin-docs  
						
						... 
						
						
						
						Update the admin register documentation to return a real user ID 
						
						
					 
					
						2018-08-17 22:31:02 +10:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							38f708a2bb 
							
						 
					 
					
						
						
							
							Remote profile cache should remain in master worker  
						
						
						
						
					 
					
						2018-08-17 11:37:42 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							73737bd0f9 
							
						 
					 
					
						
						
							
							Newsfile  
						
						
						
						
					 
					
						2018-08-17 11:14:05 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3b2dcfff78 
							
						 
					 
					
						
						
							
							Fix logging bug in EDU handling over replication  
						
						
						
						
					 
					
						2018-08-17 11:11:06 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							521d369e7a 
							
						 
					 
					
						
						
							
							remove errant yield  
						
						
						
						
					 
					
						2018-08-17 10:12:11 +01:00 
						 
				 
			
				
					
						
							
							
								Travis Ralston 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b99a0f3941 
							
						 
					 
					
						
						
							
							Create 3712.misc  
						
						
						
						
					 
					
						2018-08-17 02:47:31 -06:00 
						 
				 
			
				
					
						
							
							
								Travis Ralston 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a8ffc27db7 
							
						 
					 
					
						
						
							
							Update the admin register documentation to return a real user ID  
						
						... 
						
						
						
						Presumably this is the intention anyways. I've also updated the domain part to be something more along the lines of what people might expect. 
						
						
					 
					
						2018-08-17 02:46:25 -06:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							4c9da1440f 
							
						 
					 
					
						
						
							
							changelog  
						
						
						
						
					 
					
						2018-08-17 00:50:36 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							d9efd87d55 
							
						 
					 
					
						
						
							
							changelog  
						
						
						
						
					 
					
						2018-08-17 00:49:22 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							0e8d78f6aa 
							
						 
					 
					
						
						
							
							Logcontexts for replication command handlers  
						
						... 
						
						
						
						Run the handlers for replication commands as background processes. This should
improve the visibility in our metrics, and reduce the number of "running db
transaction from sentinel context" warnings.
Ideally it means converting the things that fire off deferreds into the night
into things that actually return a Deferred when they are done. I've made a bit
of a stab at this, but it will probably be leaky. 
						
						
					 
					
						2018-08-17 00:43:43 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							66f7dc8c87 
							
						 
					 
					
						
						
							
							Fix logcontexts for running pushers  
						
						... 
						
						
						
						First of all, avoid resetting the logcontext before running the pushers, to fix
the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning.
Instead, give them their own "background process" logcontexts. 
						
						
					 
					
						2018-08-17 00:32:39 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							7e51342196 
							
						 
					 
					
						
						
							
							For resource limit blocked users, prevent writing into rooms  
						
						
						
						
					 
					
						2018-08-16 23:05:20 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							bcfeb44afe 
							
						 
					 
					
						
						
							
							call reap on start up and fix under reaping bug  
						
						
						
						
					 
					
						2018-08-16 22:55:32 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							372bf073c1 
							
						 
					 
					
						
						
							
							block event creation and room creation on hitting resource limits  
						
						
						
						
					 
					
						2018-08-16 21:25:16 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							7edd11623d 
							
						 
					 
					
						
						
							
							add new error type ResourceLimit  
						
						
						
						
					 
					
						2018-08-16 21:04:30 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							13ad9930c8 
							
						 
					 
					
						
						
							
							add new error type ResourceLimit  
						
						
						
						
					 
					
						2018-08-16 18:02:02 +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 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b4d6db5c4a 
							
						 
					 
					
						
						
							
							Merge pull request  #3705  from matrix-org/erikj/fix_inbound_fed_worker  
						
						... 
						
						
						
						Fix inbound federation on reader worker 
						
						
					 
					
						2018-08-16 15:42:50 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							aae86a81ef 
							
						 
					 
					
						
						
							
							Newsfile  
						
						
						
						
					 
					
						2018-08-16 15:41:48 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7d5b1a60a3 
							
						 
					 
					
						
						
							
							Fix inbound federation on reader worker  
						
						... 
						
						
						
						Inbound federation requires calculating push, which in turn relies on
having access to account data. 
						
						
					 
					
						2018-08-16 15:32:20 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							bfb6c58624 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking  
						
						
						
						
					 
					
						2018-08-16 15:10:16 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							a675f9c556 
							
						 
					 
					
						
						
							
							check for room state before deciding on action  
						
						
						
						
					 
					
						2018-08-16 14:53:35 +01:00 
						 
				 
			
				
					
						
							
							
								Will Hunt 
							
						 
					 
					
						
						
						
						
							
						
						
							c151b32b1d 
							
						 
					 
					
						
						
							
							Add GET media/v1/config ( #3184 )  
						
						
						
						
					 
					
						2018-08-16 14:23:38 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							762a758fea 
							
						 
					 
					
						
						
							
							lazyload aware /messages ( #3589 )  
						
						
						
						
					 
					
						2018-08-16 14:22:47 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							25d2b5d55f 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking  
						
						
						
						
					 
					
						2018-08-16 11:37:17 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							df1e4f259f 
							
						 
					 
					
						
						
							
							WIP impl commiting to get feedback  
						
						
						
						
					 
					
						2018-08-16 11:10:53 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							c055c91655 
							
						 
					 
					
						
						
							
							fix case where empty string state check is evaulated as False  
						
						
						
						
					 
					
						2018-08-16 11:10:19 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							3f543dc021 
							
						 
					 
					
						
						
							
							initial cut at a room summary API ( #3574 )  
						
						
						
						
					 
					
						2018-08-16 09:46:50 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							859989f958 
							
						 
					 
					
						
						
							
							Merge pull request  #3686  from matrix-org/rav/changelog_links_to_prs  
						
						... 
						
						
						
						Changelog should link to PRs 
						
						
					 
					
						2018-08-15 22:22:38 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							8cfad2e686 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking  
						
						
						
						
					 
					
						2018-08-15 17:20:38 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							81d727efa9 
							
						 
					 
					
						
						
							
							Merge pull request  #3689  from matrix-org/neilj/fix_off_by_1+maus  
						
						... 
						
						
						
						Fix Mau off by one errors 
						
						
					 
					
						2018-08-15 16:19:41 +00:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							da7fe43899 
							
						 
					 
					
						
						
							
							Fix mau blocking calulation bug on login  
						
						
						
						
					 
					
						2018-08-15 17:03:30 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							e2e846628d 
							
						 
					 
					
						
						
							
							Remove incorrectly re-added changelog files  
						
						... 
						
						
						
						These were removed for the 0.33.2 release, but were incorrectly re-added in 
						
						
					 
					
						2018-08-15 16:38:46 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							2f78f432c4 
							
						 
					 
					
						
						
							
							speed up /members and add at= and membership params ( #3568 )  
						
						
						
						
					 
					
						2018-08-15 16:35:22 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							fc5d937550 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking  
						
						
						
						
					 
					
						2018-08-15 16:31:40 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							86a00e05e1 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus  
						
						
						
						
					 
					
						2018-08-15 16:27:08 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							d82fa0e9a6 
							
						 
					 
					
						
						
							
							changelog  
						
						
						
						
					 
					
						2018-08-15 15:12:35 +01:00 
						 
				 
			
				
					
						
							
							
								Amber Brown 
							
						 
					 
					
						
						
						
						
							
						
						
							a87af25fbb 
							
						 
					 
					
						
						
							
							Fix the tests  
						
						
						
						
					 
					
						2018-08-15 15:12:23 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							eabc5f8271 
							
						 
					 
					
						
						
							
							wip cut at sending resource server notices  
						
						
						
						
					 
					
						2018-08-15 15:04:52 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							c24fc9797b 
							
						 
					 
					
						
						
							
							add new event types  
						
						
						
						
					 
					
						2018-08-15 15:04:30 +01:00