Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							650f0e69f2 
							
						 
					 
					
						
						
							
							Compile the regex's used in ASes  
						
						
						
						
					 
					
						2017-03-28 13:27:21 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							d28db583da 
							
						 
					 
					
						
						
							
							Merge pull request  #2063  from matrix-org/erikj/device_list_batch  
						
						... 
						
						
						
						Batch sending of device list pokes 
						
						
					 
					
						2017-03-28 11:35:41 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							58a35366be 
							
						 
					 
					
						
						
							
							The algorithm is part of the key id  
						
						
						
						
					 
					
						2017-03-28 11:34:37 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							dc56a6b8c8 
							
						 
					 
					
						
						
							
							Merge pull request  #2070  from matrix-org/erikj/perf_send  
						
						... 
						
						
						
						Short circuit if all new events have same state group 
						
						
					 
					
						2017-03-27 18:33:54 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							bac9bf1b12 
							
						 
					 
					
						
						
							
							Typo  
						
						
						
						
					 
					
						2017-03-27 18:02:17 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							d82c42837f 
							
						 
					 
					
						
						
							
							Short circuit if all new events have same state group  
						
						
						
						
					 
					
						2017-03-27 18:00:47 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							35b4aa04be 
							
						 
					 
					
						
						
							
							Notify on new federation traffic  
						
						
						
						
					 
					
						2017-03-27 14:07:47 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							2a28b79e04 
							
						 
					 
					
						
						
							
							Batch sending of device list pokes  
						
						
						
						
					 
					
						2017-03-24 14:44:49 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							281553afe6 
							
						 
					 
					
						
						
							
							Merge pull request  #2062  from matrix-org/erikj/presence_replication  
						
						... 
						
						
						
						Use presence replication stream to invalidate cache 
						
						
					 
					
						2017-03-24 13:57:45 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							987f4945b4 
							
						 
					 
					
						
						
							
							Actually call invalidate  
						
						
						
						
					 
					
						2017-03-24 13:28:20 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							31d56c3fb5 
							
						 
					 
					
						
						
							
							Merge pull request  #2061  from matrix-org/erikj/add_transaction_store  
						
						... 
						
						
						
						Add slave transaction store to workers who send federation requests 
						
						
					 
					
						2017-03-24 13:24:27 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							09f79aaad0 
							
						 
					 
					
						
						
							
							Use presence replication stream to invalidate cache  
						
						... 
						
						
						
						Instead of using the cache invalidation replication stream to invalidate
the _get_presence_cache, we can instead rely on the presence replication
stream. This reduces the amount of replication traffic considerably. 
						
						
					 
					
						2017-03-24 13:21:08 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							23e0ff840a 
							
						 
					 
					
						
						
							
							Merge pull request  #2060  from matrix-org/erikj/cache_hosts_in_room  
						
						... 
						
						
						
						Cache hosts in room 
						
						
					 
					
						2017-03-24 13:07:22 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							48e7697911 
							
						 
					 
					
						
						
							
							Add slave transaction store  
						
						
						
						
					 
					
						2017-03-24 13:05:30 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							f136c89d5e 
							
						 
					 
					
						
						
							
							Merge pull request  #2058  from matrix-org/rav/logcontext_leaks_2  
						
						... 
						
						
						
						try not to drop context after federation requests 
						
						
					 
					
						2017-03-24 12:47:26 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							01fc847f7f 
							
						 
					 
					
						
						
							
							Merge pull request  #2057  from matrix-org/rav/missing_yield_2  
						
						... 
						
						
						
						Add another missing yield on check_device_registered 
						
						
					 
					
						2017-03-24 12:46:43 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7fc1f1e2b6 
							
						 
					 
					
						
						
							
							Cache hosts in room  
						
						
						
						
					 
					
						2017-03-24 11:46:24 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							57cfa513f5 
							
						 
					 
					
						
						
							
							Merge pull request  #2054  from matrix-org/erikj/user_iter_cursor  
						
						... 
						
						
						
						Reduce some CPU work on DB threads 
						
						
					 
					
						2017-03-24 11:40:08 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							d58b1ffe94 
							
						 
					 
					
						
						
							
							Replace some calls to cursor_to_dict  
						
						... 
						
						
						
						cursor_to_dict can be surprisinglh expensive for large result sets, so lets
only call it when we need to. 
						
						
					 
					
						2017-03-24 11:07:02 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e71940aa64 
							
						 
					 
					
						
						
							
							Use iter(items|values)  
						
						
						
						
					 
					
						2017-03-24 10:57:02 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							e36950dec5 
							
						 
					 
					
						
						
							
							Merge pull request  #2055  from matrix-org/dbkr/fix_add_msisdn_requestToken  
						
						... 
						
						
						
						Fix token request for addition of phone numbers 
						
						
					 
					
						2017-03-24 10:32:57 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							f902e89d4b 
							
						 
					 
					
						
						
							
							Merge pull request  #2056  from matrix-org/dbkr/fix_invite_reject  
						
						... 
						
						
						
						Fix rejection of invites not reaching sync 
						
						
					 
					
						2017-03-24 10:32:51 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							a380f041c2 
							
						 
					 
					
						
						
							
							try not to drop context after federation requests  
						
						... 
						
						
						
						preserve_context_over_fn uses a ContextPreservingDeferred, which only restores
context for the duration of its callbacks, which isn't really correct, and
means that subsequent operations in the same request can end up without their
logcontexts. 
						
						
					 
					
						2017-03-23 22:36:21 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							9397edb28b 
							
						 
					 
					
						
						
							
							Merge pull request  #2050  from matrix-org/rav/federation_backoff  
						
						... 
						
						
						
						push federation retry limiter down to matrixfederationclient 
						
						
					 
					
						2017-03-23 22:27:01 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							06ce7335e9 
							
						 
					 
					
						
						
							
							Merge pull request  #2052  from matrix-org/rav/time_bound_deferred  
						
						... 
						
						
						
						Fix time_bound_deferred to throw the right exception 
						
						
					 
					
						2017-03-23 22:22:54 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							13c8749ac9 
							
						 
					 
					
						
						
							
							Add another missing yield on check_device_registered  
						
						
						
						
					 
					
						2017-03-23 22:18:53 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							e1f1784f99 
							
						 
					 
					
						
						
							
							Fix rejection of invites not reaching sync  
						
						... 
						
						
						
						Always allow the user to see their own leave events, otherwise
they won't see the event if they reject an invite for a room whose
history visibility is set such that they cannot see events before
joining. 
						
						
					 
					
						2017-03-23 18:50:31 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							86e865d7d2 
							
						 
					 
					
						
						
							
							Oops, remove unintentional change  
						
						
						
						
					 
					
						2017-03-23 18:48:30 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							a2dfab12c5 
							
						 
					 
					
						
						
							
							Fix token request for addition of phone numbers  
						
						
						
						
					 
					
						2017-03-23 18:46:17 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							00957d1aa4 
							
						 
					 
					
						
						
							
							User Cursor.__iter__ instead of fetchall  
						
						... 
						
						
						
						This prevents unnecessary construction of lists 
						
						
					 
					
						2017-03-23 17:53:49 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							6af0096f4f 
							
						 
					 
					
						
						
							
							Merge pull request  #1783  from pik/filter-validation  
						
						... 
						
						
						
						JSONSchema Validation For Filters 
						
						
					 
					
						2017-03-23 15:56:15 +00:00 
						 
				 
			
				
					
						
							
							
								pik 
							
						 
					 
					
						
						
						
						
							
						
						
							250ce11ab9 
							
						 
					 
					
						
						
							
							Add jsonschema to python_dependencies.py  
						
						... 
						
						
						
						Signed-off-by: pik <alexander.maznev@gmail.com> 
						
						
					 
					
						2017-03-23 11:42:47 -03:00 
						 
				 
			
				
					
						
							
							
								pik 
							
						 
					 
					
						
						
						
						
							
						
						
							566641a0b5 
							
						 
					 
					
						
						
							
							use jsonschema.FormatChecker for RoomID and UserID strings  
						
						... 
						
						
						
						* use a valid filter in rest/client/v2_alpha test
Signed-off-by: pik <alexander.maznev@gmail.com> 
						
						
					 
					
						2017-03-23 11:42:41 -03:00 
						 
				 
			
				
					
						
							
							
								pik 
							
						 
					 
					
						
						
						
						
							
						
						
							acafcf1c5b 
							
						 
					 
					
						
						
							
							Add valid filter tests, flake8, fix typo  
						
						... 
						
						
						
						Signed-off-by: pik <alexander.maznev@gmail.com> 
						
						
					 
					
						2017-03-23 11:42:10 -03:00 
						 
				 
			
				
					
						
							
							
								pik 
							
						 
					 
					
						
						
						
						
							
						
						
							e56c79c114 
							
						 
					 
					
						
						
							
							check_valid_filter using JSONSchema  
						
						... 
						
						
						
						* add invalid filter tests
Signed-off-by: pik <alexander.maznev@gmail.com> 
						
						
					 
					
						2017-03-23 11:42:07 -03:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							6ebe2d23b1 
							
						 
					 
					
						
						
							
							Raise a more helpful exception  
						
						
						
						
					 
					
						2017-03-23 13:48:30 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							0bfea9a2be 
							
						 
					 
					
						
						
							
							fix tests  
						
						
						
						
					 
					
						2017-03-23 13:20:08 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e64655c25d 
							
						 
					 
					
						
						
							
							Don't user upsert to persist new one time keys  
						
						... 
						
						
						
						Instead we no-op duplicate one time key uploads, an error if the key_id
already exists but encodes a different key. 
						
						
					 
					
						2017-03-23 13:17:00 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							5a16cb4bf0 
							
						 
					 
					
						
						
							
							Ignore backoff history for invites, aliases, and roomdirs  
						
						... 
						
						
						
						Add a param to the federation client which lets us ignore historical backoff
data for federation queries, and set it for a handful of operations. 
						
						
					 
					
						2017-03-23 12:23:22 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							b88a323ffb 
							
						 
					 
					
						
						
							
							Fix time_bound_deferred to throw the right exception  
						
						... 
						
						
						
						Due to a failure to instantiate DeferredTimedOutError, time_bound_deferred
would throw a CancelledError when the deferred timed out, which was rather
confusing. 
						
						
					 
					
						2017-03-23 12:07:11 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							59358cd3e7 
							
						 
					 
					
						
						
							
							Merge pull request  #2005  from kfatehi/docs/readme  
						
						... 
						
						
						
						Update README: specify python2.7 in virtualenv 
						
						
					 
					
						2017-03-23 09:32:10 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							55366814a6 
							
						 
					 
					
						
						
							
							Merge pull request  #2048  from matrix-org/rav/missing_yield  
						
						... 
						
						
						
						Add a missing yield in device key upload 
						
						
					 
					
						2017-03-23 09:29:44 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							b2d40d7363 
							
						 
					 
					
						
						
							
							Merge pull request  #2049  from matrix-org/rav/logcontext_leaks  
						
						... 
						
						
						
						Fix a couple of logcontext leaks 
						
						
					 
					
						2017-03-23 09:29:28 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							4bd597d9fc 
							
						 
					 
					
						
						
							
							push federation retry limiter down to matrixfederationclient  
						
						... 
						
						
						
						rather than having to instrument everywhere we make a federation call,
make the MatrixFederationHttpClient manage the retry limiter. 
						
						
					 
					
						2017-03-23 09:28:46 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							ad8a26e361 
							
						 
					 
					
						
						
							
							MatrixFederationHttpClient: clean up  
						
						... 
						
						
						
						rename _create_request to _request, and push ascii-encoding of `destination`
and `path` down into it 
						
						
					 
					
						2017-03-23 00:27:04 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							19b9366d73 
							
						 
					 
					
						
						
							
							Fix a couple of logcontext leaks  
						
						... 
						
						
						
						Use preserve_fn to correctly manage the logcontexts around things we don't want
to yield on. 
						
						
					 
					
						2017-03-23 00:17:46 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							e08f81d96a 
							
						 
					 
					
						
						
							
							Add a missing yield in device key upload  
						
						... 
						
						
						
						(this would only very very rarely actually be a useful thing, so the main
problem was the logcontext leak...) 
						
						
					 
					
						2017-03-23 00:16:43 +00:00 
						 
				 
			
				
					
						
							
							
								Richard Kellner 
							
						 
					 
					
						
						
						
						
							
						
						
							8d1dd7eb30 
							
						 
					 
					
						
						
							
							Removed requirement that is not needed  
						
						... 
						
						
						
						I have removed libsodium from CentOS system requirements, as it is
part PyNaCl.
Signed-off-by: Richard Kellner <richard.kellner@gmail.com> 
						
						
					 
					
						2017-03-22 22:49:32 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							35e0cfb54d 
							
						 
					 
					
						
						
							
							Merge pull request  #2044  from matrix-org/rav/crypto_docs  
						
						... 
						
						
						
						fix up some key verif docstrings 
						
						
					 
					
						2017-03-22 17:12:55 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							7b67848042 
							
						 
					 
					
						
						
							
							Merge pull request  #2042  from matrix-org/rav/fix_key_caching  
						
						... 
						
						
						
						Fix caching of remote servers' signature keys 
						
						
					 
					
						2017-03-22 17:11:55 +00:00