Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							0b32bb20bb 
							
						 
					 
					
						
						
							
							Index contains_url for file search queries  
						
						
						
						
					 
					
						2016-09-12 16:57:05 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							c94de0ab60 
							
						 
					 
					
						
						
							
							Add WHERE clause support to index creation  
						
						
						
						
					 
					
						2016-09-12 16:55:01 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							502c901e11 
							
						 
					 
					
						
						
							
							Merge pull request  #1107  from matrix-org/erikj/backfill_none  
						
						... 
						
						
						
						Fix backfill when cannot find an event. 
						
						
					 
					
						2016-09-12 16:48:01 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							48a5a7552d 
							
						 
					 
					
						
						
							
							Add is_direct param to /createRoom  
						
						
						
						
					 
					
						2016-09-12 16:34:20 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							706b5d76ed 
							
						 
					 
					
						
						
							
							Fix backfill when cannot find an event.  
						
						... 
						
						
						
						`get_pdu` can succeed but return None. 
						
						
					 
					
						2016-09-12 14:59:51 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7c679b1118 
							
						 
					 
					
						
						
							
							Merge pull request  #1106  from matrix-org/erikj/state_reindex_concurrent  
						
						... 
						
						
						
						Create new index concurrently 
						
						
					 
					
						2016-09-12 14:38:40 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							d080b3425c 
							
						 
					 
					
						
						
							
							Merge pull request  #1105  from matrix-org/erikj/make_notif_highlight_query_fast  
						
						... 
						
						
						
						Optimise /notifications query 
						
						
					 
					
						2016-09-12 14:34:12 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							03a98aff3c 
							
						 
					 
					
						
						
							
							Create new index concurrently  
						
						
						
						
					 
					
						2016-09-12 14:27:01 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							fa20c9ce94 
							
						 
					 
					
						
						
							
							Change the index to be stream_ordering, highlight  
						
						
						
						
					 
					
						2016-09-12 14:04:08 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							5ef5435529 
							
						 
					 
					
						
						
							
							Remove unused import  
						
						
						
						
					 
					
						2016-09-12 13:32:58 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							aa7b890cfe 
							
						 
					 
					
						
						
							
							Merge pull request  #1104  from matrix-org/markjh/direct_to_device_federation_sync  
						
						... 
						
						
						
						Fix direct to device messages recieved over federation to notify sync 
						
						
					 
					
						2016-09-12 13:25:23 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7cd6edb947 
							
						 
					 
					
						
						
							
							Use register_background_index_update  
						
						
						
						
					 
					
						2016-09-12 12:54:48 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							0294c14ec4 
							
						 
					 
					
						
						
							
							Add back in query change  
						
						
						
						
					 
					
						2016-09-12 12:43:56 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7fe42cf949 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_notif_highlight_query_fast  
						
						
						
						
					 
					
						2016-09-12 12:37:09 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							15ca0c6a4d 
							
						 
					 
					
						
						
							
							Make reindex happen in bg  
						
						
						
						
					 
					
						2016-09-12 12:36:36 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							0baf498bd1 
							
						 
					 
					
						
						
							
							Merge pull request  #1103  from matrix-org/markjh/comment_on_create_index  
						
						... 
						
						
						
						Add comments to existing schema deltas that used "CREATE INDEX" directly 
						
						
					 
					
						2016-09-12 12:33:18 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							a232e06100 
							
						 
					 
					
						
						
							
							Fix direct to device messages recieved over federation to notify sync  
						
						
						
						
					 
					
						2016-09-12 12:30:46 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							4a32d25d4c 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into markjh/bearer_token  
						
						
						
						
					 
					
						2016-09-12 11:14:56 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							31f85f9db9 
							
						 
					 
					
						
						
							
							Add comments to existing schema deltas that used "CREATE INDEX" directly  
						
						
						
						
					 
					
						2016-09-12 11:00:26 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							ec609f8094 
							
						 
					 
					
						
						
							
							Fix unit tests  
						
						
						
						
					 
					
						2016-09-12 10:46:02 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							caef86f428 
							
						 
					 
					
						
						
							
							Merge pull request  #1102  from matrix-org/revert-1099-dbkr/make_notif_highlight_query_fast  
						
						... 
						
						
						
						Revert "Add index to event_push_actions" 
						
						
					 
					
						2016-09-12 10:41:21 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							54417999b6 
							
						 
					 
					
						
						
							
							Revert "Add index to event_push_actions"  
						
						
						
						
					 
					
						2016-09-12 10:39:55 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							45dc260060 
							
						 
					 
					
						
						
							
							Merge pull request  #1101  from matrix-org/erikj/state_types_idx  
						
						... 
						
						
						
						Change state fetch query for postgres to be faster 
						
						
					 
					
						2016-09-12 10:20:38 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							d1c217c823 
							
						 
					 
					
						
						
							
							Merge pull request  #1097  from matrix-org/erikj/replication_typing_rest  
						
						... 
						
						
						
						Correctly handle typing stream id resetting 
						
						
					 
					
						2016-09-12 10:10:15 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							897d57bc58 
							
						 
					 
					
						
						
							
							Change state fetch query for postgres to be faster  
						
						... 
						
						
						
						It turns out that postgres doesn't like doing a list of OR's and is
about 1000x slower, so we just issue a query for each specific type
seperately. 
						
						
					 
					
						2016-09-12 10:05:07 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							555460ae1b 
							
						 
					 
					
						
						
							
							Merge pull request  #1095  from matrix-org/erikj/batch_edus  
						
						... 
						
						
						
						Clobber EDUs in send queue 
						
						
					 
					
						2016-09-12 08:04:15 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							4162f820ff 
							
						 
					 
					
						
						
							
							Merge pull request  #1100  from VShell/fix-cas  
						
						... 
						
						
						
						Conform better to the CAS protocol specification 
						
						
					 
					
						2016-09-09 21:57:42 +01:00 
						 
				 
			
				
					
						
							
							
								Shell Turner 
							
						 
					 
					
						
						
						
						
							
						
						
							29205e9596 
							
						 
					 
					
						
						
							
							Conform better to the CAS protocol specification  
						
						... 
						
						
						
						Redirect to CAS's /login endpoint properly, and
don't require an <attributes> element.
Signed-off-by: Shell Turner <cam.turn@gmail.com> 
						
						
					 
					
						2016-09-09 21:20:14 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							d213884c41 
							
						 
					 
					
						
						
							
							Merge pull request  #1099  from matrix-org/dbkr/make_notif_highlight_query_fast  
						
						... 
						
						
						
						Add index to event_push_actions 
						
						
					 
					
						2016-09-09 19:39:09 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							b91e2833b3 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into dbkr/make_notif_highlight_query_fast  
						
						
						
						
					 
					
						2016-09-09 19:11:34 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							f2acc3dcf9 
							
						 
					 
					
						
						
							
							Add index to event_push_actions  
						
						... 
						
						
						
						and remove room_id caluse so it uses it
Mostly from @negativemjark 
						
						
					 
					
						2016-09-09 18:54:54 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							3ddec016ff 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into markjh/bearer_token  
						
						
						
						
					 
					
						2016-09-09 18:51:22 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							8e01263587 
							
						 
					 
					
						
						
							
							Allow clients to supply access_tokens as headers  
						
						... 
						
						
						
						Clients can continue to supply access tokens as query parameters
or can supply the token as a header:
   Authorization: Bearer <access_token_goes_here>
This matches the ouath2 format of
https://tools.ietf.org/html/rfc6750#section-2.1  
						
						
					 
					
						2016-09-09 18:17:42 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3265def8c7 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into erikj/batch_edus  
						
						
						
						
					 
					
						2016-09-09 18:06:01 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							af4701b311 
							
						 
					 
					
						
						
							
							Fix incorrect attribute name  
						
						
						
						
					 
					
						2016-09-09 17:36:56 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							44330a21e9 
							
						 
					 
					
						
						
							
							Comment  
						
						
						
						
					 
					
						2016-09-09 17:22:07 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							464ffd1b5e 
							
						 
					 
					
						
						
							
							Comment  
						
						
						
						
					 
					
						2016-09-09 17:17:23 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							327425764e 
							
						 
					 
					
						
						
							
							Add edu.type as part of key. Remove debug logging  
						
						
						
						
					 
					
						2016-09-09 17:13:30 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							dbff7e9436 
							
						 
					 
					
						
						
							
							Merge pull request  #1096  from matrix-org/markjh/get_access_token  
						
						... 
						
						
						
						Add helper function for getting access_tokens from requests 
						
						
					 
					
						2016-09-09 17:09:27 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a4339de9de 
							
						 
					 
					
						
						
							
							Correctly handle typing stream id resetting  
						
						
						
						
					 
					
						2016-09-09 16:44:26 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							8aee5aa068 
							
						 
					 
					
						
						
							
							Add helper function for getting access_tokens from requests  
						
						... 
						
						
						
						Rather than reimplementing the token parsing in the various places.
This will make it easier to change the token parsing to allow access_tokens
in HTTP headers. 
						
						
					 
					
						2016-09-09 16:33:15 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							52b2318777 
							
						 
					 
					
						
						
							
							Clobber EDUs in send queue  
						
						
						
						
					 
					
						2016-09-09 15:59:08 +01:00 
						 
				 
			
				
					
						
							
							
								Paul Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							56f38d1776 
							
						 
					 
					
						
						
							
							Merge pull request  #1091  from matrix-org/paul/third-party-lookup  
						
						... 
						
						
						
						Improvements to 3PE lookup API 
						
						
					 
					
						2016-09-09 15:43:11 +01:00 
						 
				 
			
				
					
						
							
							
								Paul Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							8cb252d00c 
							
						 
					 
					
						
						
							
							Merge pull request  #1094  from matrix-org/paul/get-state-whole-event  
						
						... 
						
						
						
						Allow clients to ask for the whole of a single state event 
						
						
					 
					
						2016-09-09 15:26:17 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							776594f99d 
							
						 
					 
					
						
						
							
							Log if rejecting 3PE query metadata result due to type check  
						
						
						
						
					 
					
						2016-09-09 15:11:31 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							ed44c475d8 
							
						 
					 
					
						
						
							
							Reject malformed 3PE query metadata results earlier in AS API handling code  
						
						
						
						
					 
					
						2016-09-09 15:07:04 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							ab80d5e0a9 
							
						 
					 
					
						
						
							
							Drop replication log levels  
						
						
						
						
					 
					
						2016-09-09 14:56:50 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							f25d74f69c 
							
						 
					 
					
						
						
							
							Minor fixes from PR comments  
						
						
						
						
					 
					
						2016-09-09 14:54:16 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							ea05155a8c 
							
						 
					 
					
						
						
							
							Merge pull request  #1093  from matrix-org/erikj/dedupe_presence  
						
						... 
						
						
						
						Deduplicate presence in _update_states 
						
						
					 
					
						2016-09-09 14:45:21 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							d271383e63 
							
						 
					 
					
						
						
							
							Filter returned events for client-facing format  
						
						
						
						
					 
					
						2016-09-09 14:40:15 +01:00