Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a158c36a8a 
							
						 
					 
					
						
						
							
							Comment  
						
						
						
						
					 
					
						2017-03-16 11:57:45 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							6957bfdca6 
							
						 
					 
					
						
						
							
							Don't recreate so many sets  
						
						
						
						
					 
					
						2017-03-16 11:54:26 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							2ccf3b241c 
							
						 
					 
					
						
						
							
							Implement no op for room stream in sync  
						
						
						
						
					 
					
						2017-03-16 11:06:41 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							9ce53a3861 
							
						 
					 
					
						
						
							
							Queue up federation PDUs while a room join is in progress  
						
						... 
						
						
						
						This just takes the existing `room_queues` logic and moves it out to
`on_receive_pdu` instead of `_process_received_pdu`, which ensures that we
don't start trying to fetch prev_events and whathaveyou until the join has
completed. 
						
						
					 
					
						2017-03-15 18:01:11 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							54d2b7e596 
							
						 
					 
					
						
						
							
							Merge pull request  #2014  from Half-Shot/hs/fix-appservice-presence  
						
						... 
						
						
						
						Add fallback to last_active_ts if it beats the last sync time on a presence timeout. 
						
						
					 
					
						2017-03-15 17:37:15 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							9d527191bc 
							
						 
					 
					
						
						
							
							Merge pull request  #2013  from matrix-org/erikj/presence_FASTER  
						
						... 
						
						
						
						Format presence events on the edges instead of reformatting them multiple times 
						
						
					 
					
						2017-03-15 16:01:29 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a8f96c63aa 
							
						 
					 
					
						
						
							
							Comment  
						
						
						
						
					 
					
						2017-03-15 16:01:01 +00:00 
						 
				 
			
				
					
						
							
							
								Will Hunt 
							
						 
					 
					
						
						
						
						
							
						
						
							c144292373 
							
						 
					 
					
						
						
							
							Modify test_user_sync so it doesn't look at last_active_ts over last_user_sync_ts  
						
						
						
						
					 
					
						2017-03-15 15:38:57 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f83ac78201 
							
						 
					 
					
						
						
							
							Cache set of users whose presence the other user should see  
						
						
						
						
					 
					
						2017-03-15 15:29:19 +00:00 
						 
				 
			
				
					
						
							
							
								Will Hunt 
							
						 
					 
					
						
						
						
						
							
						
						
							e6032054bf 
							
						 
					 
					
						
						
							
							Add a great comment to handle_timeout for active vs sync times.  
						
						
						
						
					 
					
						2017-03-15 15:24:48 +00:00 
						 
				 
			
				
					
						
							
							
								Will Hunt 
							
						 
					 
					
						
						
						
						
							
						
						
							ebf5a6b14c 
							
						 
					 
					
						
						
							
							Add fallback to last_active_ts if it beats the last sync time.  
						
						
						
						
					 
					
						2017-03-15 15:17:16 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e892457a03 
							
						 
					 
					
						
						
							
							Comment  
						
						
						
						
					 
					
						2017-03-15 15:01:39 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a297155a97 
							
						 
					 
					
						
						
							
							Remove unused import  
						
						
						
						
					 
					
						2017-03-15 14:49:25 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							6c82de5100 
							
						 
					 
					
						
						
							
							Format presence events on the edges instead of reformatting them multiple times  
						
						
						
						
					 
					
						2017-03-15 14:27:34 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							0ad44acb5a 
							
						 
					 
					
						
						
							
							Merge pull request  #1997  from matrix-org/dbkr/cas_partialdownload  
						
						... 
						
						
						
						Handle PartialDownloadError in CAS login 
						
						
					 
					
						2017-03-15 13:52:34 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							5f14e7e982 
							
						 
					 
					
						
						
							
							Merge pull request  #2010  from matrix-org/rav/fix_txnq_wedge  
						
						... 
						
						
						
						Fix assertion to stop transaction queue getting wedged 
						
						
					 
					
						2017-03-15 13:07:50 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							0970e0307e 
							
						 
					 
					
						
						
							
							typo  
						
						
						
						
					 
					
						2017-03-15 12:40:42 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							5aa42d4292 
							
						 
					 
					
						
						
							
							set default for turn_allow_guests correctly  
						
						
						
						
					 
					
						2017-03-15 12:40:13 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							e0ff66251f 
							
						 
					 
					
						
						
							
							add setting (on by default) to support TURN for guests  
						
						
						
						
					 
					
						2017-03-15 12:22:18 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							29ed09e80a 
							
						 
					 
					
						
						
							
							Fix assertion to stop transaction queue getting wedged  
						
						... 
						
						
						
						... and update some docstrings to correctly reflect the types being used.
get_new_device_msgs_for_remote can return a long under some circumstances,
which was being stored in last_device_list_stream_id_by_dest, and was then
upsetting things on the next loop. 
						
						
					 
					
						2017-03-15 12:16:55 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3b2dd1b3c2 
							
						 
					 
					
						
						
							
							Merge pull request  #2008  from matrix-org/erikj/notifier_stats  
						
						... 
						
						
						
						Add some metrics on notifier 
						
						
					 
					
						2017-03-15 11:25:02 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							872e75a3d5 
							
						 
					 
					
						
						
							
							Add some metrics on notifier  
						
						
						
						
					 
					
						2017-03-15 10:56:51 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7827251daf 
							
						 
					 
					
						
						
							
							Merge pull request  #1994  from matrix-org/dbkr/msisdn_signin_2  
						
						... 
						
						
						
						Phone number registration / login support v2 
						
						
					 
					
						2017-03-15 09:59:54 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							b5d1c68beb 
							
						 
					 
					
						
						
							
							Implement reset_context_after_deferred  
						
						... 
						
						
						
						to correctly reset the context when we fire off a deferred we aren't going to
wait for. 
						
						
					 
					
						2017-03-15 02:21:07 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							f2ed64eaaf 
							
						 
					 
					
						
						
							
							Merge pull request  #1992  from matrix-org/rav/fix_media_loop  
						
						... 
						
						
						
						Fix routing loop when fetching remote media 
						
						
					 
					
						2017-03-14 23:40:35 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							ef328b2fc1 
							
						 
					 
					
						
						
							
							kick jenkins  
						
						
						
						
					 
					
						2017-03-14 20:44:50 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							bad72b0b8e 
							
						 
					 
					
						
						
							
							Merge pull request  #2002  from matrix-org/erikj/dont_sync_by_default  
						
						... 
						
						
						
						Reduce number of spurious sync result generations. 
						
						
					 
					
						2017-03-14 16:58:45 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							1bf84c4b6b 
							
						 
					 
					
						
						
							
							Merge pull request  #1989  from matrix-org/erikj/public_list_speed  
						
						... 
						
						
						
						Speed up public room list 
						
						
					 
					
						2017-03-14 16:58:26 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							fd2eef49c8 
							
						 
					 
					
						
						
							
							Reduce spurious calls to generate sync  
						
						
						
						
					 
					
						2017-03-14 16:33:45 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							1d09586599 
							
						 
					 
					
						
						
							
							Address review comments  
						
						... 
						
						
						
						- don't blindly proxy all HTTPRequestExceptions
- log unexpected exceptions at error
- avoid `isinstance`
- improve docs on `from_http_response_exception` 
						
						
					 
					
						2017-03-14 14:15:37 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							7f237800e9 
							
						 
					 
					
						
						
							
							re-refactor exception heirarchy  
						
						... 
						
						
						
						Give CodeMessageException back its `msg` attribute, and use that to hold the
HTTP status message for HttpResponseException. 
						
						
					 
					
						2017-03-14 14:15:37 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							1ece06273e 
							
						 
					 
					
						
						
							
							Handle PartialDownloadError in CAS login  
						
						
						
						
					 
					
						2017-03-14 13:37:36 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							bb256ac96f 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_list_speed  
						
						
						
						
					 
					
						2017-03-14 11:35:05 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							6a3c5d6891 
							
						 
					 
					
						
						
							
							Merge pull request  #1996  from matrix-org/erikj/fix_current_state  
						
						... 
						
						
						
						Fix current_state_events table to not lie 
						
						
					 
					
						2017-03-14 11:34:35 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							cc7a294e2e 
							
						 
					 
					
						
						
							
							Fix current_state_events table to not lie  
						
						... 
						
						
						
						If we try and persist two state events that have the same ancestor we
calculate the wrong current state when persisting those events. 
						
						
					 
					
						2017-03-14 10:57:43 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							7b6ed9871e 
							
						 
					 
					
						
						
							
							Use extend instead of +=  
						
						
						
						
					 
					
						2017-03-14 10:49:55 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							d79a687d85 
							
						 
					 
					
						
						
							
							Oops, remove print  
						
						
						
						
					 
					
						2017-03-14 10:40:20 +00:00 
						 
				 
			
				
					
						
							
							
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							f29d85d9e4 
							
						 
					 
					
						
						
							
							Merge pull request  #1993  from matrix-org/luke/delete-devices  
						
						... 
						
						
						
						Implement delete_devices API 
						
						
					 
					
						2017-03-14 10:02:56 +00:00 
						 
				 
			
				
					
						
							
							
								Ryan Breaker 
							
						 
					 
					
						
						
						
						
							
						
						
							a175963ba5 
							
						 
					 
					
						
						
							
							Add --upgrade pip  
						
						... 
						
						
						
						Needed before `pip instal --upgrade setuptools` for CentOS 7 and also doesn't hurt for any other distro. 
						
						
					 
					
						2017-03-13 14:05:31 -05:00 
						 
				 
			
				
					
						
							
							
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							bbeeb97f75 
							
						 
					 
					
						
						
							
							Implement _simple_delete_many_txn, use it to delete devices  
						
						... 
						
						
						
						(But this doesn't implement the same for deleting access tokens or e2e keys.
Also respond to code review. 
						
						
					 
					
						2017-03-13 17:53:23 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							0a9945220e 
							
						 
					 
					
						
						
							
							Fix registration for broken clients  
						
						... 
						
						
						
						Only offer msisdn flows if the x_show_msisdn option is given. 
						
						
					 
					
						2017-03-13 17:29:38 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							73a5f06652 
							
						 
					 
					
						
						
							
							Support registration / login with phone number  
						
						... 
						
						
						
						Changes from https://github.com/matrix-org/synapse/pull/1971  
						
						
					 
					
						2017-03-13 17:27:51 +00:00 
						 
				 
			
				
					
						
							
							
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							c077c3277b 
							
						 
					 
					
						
						
							
							Flake  
						
						
						
						
					 
					
						2017-03-13 16:45:38 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							31f3ca1b2b 
							
						 
					 
					
						
						
							
							Merge pull request  #1990  from matrix-org/rav/log_config_comments  
						
						... 
						
						
						
						Add helpful texts to logger config options 
						
						
					 
					
						2017-03-13 16:42:12 +00:00 
						 
				 
			
				
					
						
							
							
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							c81f33f73d 
							
						 
					 
					
						
						
							
							Implement delete_devices API  
						
						... 
						
						
						
						This implements the proposal here https://docs.google.com/document/d/1C-25Gqz3TXy2jIAoeOKxpNtmme0jI4g3yFGqv5GlAAk  for deleting multiple devices at once in a single request. 
						
						
					 
					
						2017-03-13 16:33:51 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							170ccc9de5 
							
						 
					 
					
						
						
							
							Fix routing loop when fetching remote media  
						
						... 
						
						
						
						When we proxy a media request to a remote server, add a query-param, which will
tell the remote server to 404 if it doesn't recognise the server_name.
This should fix a routing loop where the server keeps forwarding back to
itself.
Also improves the error handling on remote media fetches, so that we don't
always return a rather obscure 502. 
						
						
					 
					
						2017-03-13 16:30:36 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							45c7f12d2a 
							
						 
					 
					
						
						
							
							Add new storage function to slave store  
						
						
						
						
					 
					
						2017-03-13 16:26:44 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							2cad971ab4 
							
						 
					 
					
						
						
							
							Merge pull request  #1978  from matrix-org/rav/refactor_received_pdu  
						
						... 
						
						
						
						Refactor FederationServer._handle_new_pdu 
						
						
					 
					
						2017-03-13 12:45:46 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							8d86d11fdf 
							
						 
					 
					
						
						
							
							Bring example log config into line with default  
						
						
						
						
					 
					
						2017-03-13 12:39:09 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							6037a9804c 
							
						 
					 
					
						
						
							
							Add helpful texts to logger config options  
						
						
						
						
					 
					
						2017-03-13 12:33:35 +00:00