Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							b2d8d07109 
							
						 
					 
					
						
						
							
							Lifts things into separate function  
						
						
						
						
					 
					
						2017-05-31 17:00:24 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f9791498ae 
							
						 
					 
					
						
						
							
							Typos  
						
						
						
						
					 
					
						2017-05-31 16:50:57 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f091061711 
							
						 
					 
					
						
						
							
							Fix tests  
						
						
						
						
					 
					
						2017-05-31 16:34:40 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							4abcff0177 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
						
					 
					
						2017-05-31 16:22:36 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							63c58c2a3f 
							
						 
					 
					
						
						
							
							Limit number of things we fetch out of the db  
						
						
						
						
					 
					
						2017-05-31 16:17:58 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							304880d185 
							
						 
					 
					
						
						
							
							Add stream change cache  
						
						
						
						
					 
					
						2017-05-31 15:46:36 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							5d79d728f5 
							
						 
					 
					
						
						
							
							Split out directory and search tables  
						
						
						
						
					 
					
						2017-05-31 15:23:49 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							dc51af3d03 
							
						 
					 
					
						
						
							
							Pull max id from correct table  
						
						
						
						
					 
					
						2017-05-31 15:13:49 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							350622a107 
							
						 
					 
					
						
						
							
							Handle the server leaving a public room  
						
						
						
						
					 
					
						2017-05-31 15:11:36 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							63fda37e20 
							
						 
					 
					
						
						
							
							Add comments  
						
						
						
						
					 
					
						2017-05-31 15:00:29 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							293ef29655 
							
						 
					 
					
						
						
							
							Weight differently  
						
						
						
						
					 
					
						2017-05-31 14:29:32 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							535c99f157 
							
						 
					 
					
						
						
							
							Use POST  
						
						
						
						
					 
					
						2017-05-31 14:15:45 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							45a5df5914 
							
						 
					 
					
						
						
							
							Add REST API  
						
						
						
						
					 
					
						2017-05-31 14:11:55 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3b5f22ca40 
							
						 
					 
					
						
						
							
							Add search  
						
						
						
						
					 
					
						2017-05-31 14:00:01 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							b5db4ed5f6 
							
						 
					 
					
						
						
							
							Update room column when room becomes unpublic  
						
						
						
						
					 
					
						2017-05-31 13:40:28 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							168524543f 
							
						 
					 
					
						
						
							
							Add call later  
						
						
						
						
					 
					
						2017-05-31 11:59:36 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3e123b8497 
							
						 
					 
					
						
						
							
							Start later  
						
						
						
						
					 
					
						2017-05-31 11:56:27 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							42137efde7 
							
						 
					 
					
						
						
							
							Don't go round in circles  
						
						
						
						
					 
					
						2017-05-31 11:55:13 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							eeb2f9e546 
							
						 
					 
					
						
						
							
							Add user_directory to database  
						
						
						
						
					 
					
						2017-05-31 11:51:01 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							5dbaa520a5 
							
						 
					 
					
						
						
							
							Merge pull request  #2251  from matrix-org/erikj/current_state_delta_stream  
						
						... 
						
						
						
						Add current_state_delta_stream table 
						
						
					 
					
						2017-05-30 15:06:17 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							dd48f7204c 
							
						 
					 
					
						
						
							
							Add comment  
						
						
						
						
					 
					
						2017-05-30 15:01:22 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							04095f7581 
							
						 
					 
					
						
						
							
							Add clobbered event_id  
						
						
						
						
					 
					
						2017-05-30 14:53:01 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a584a81b3e 
							
						 
					 
					
						
						
							
							Add current_state_delta_stream table  
						
						
						
						
					 
					
						2017-05-30 14:44:09 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							619e8ecd0c 
							
						 
					 
					
						
						
							
							Handle None state group correctly  
						
						
						
						
					 
					
						2017-05-26 10:46:03 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							23da638360 
							
						 
					 
					
						
						
							
							Fix typing tests  
						
						
						
						
					 
					
						2017-05-26 10:02:04 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							dfbda5e025 
							
						 
					 
					
						
						
							
							Faster cache for get_joined_hosts  
						
						
						
						
					 
					
						2017-05-25 17:24:44 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							2b03751c3c 
							
						 
					 
					
						
						
							
							Don't return weird prev_group  
						
						
						
						
					 
					
						2017-05-25 14:47:39 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							dbc0dfd2d5 
							
						 
					 
					
						
						
							
							Remove unused options  
						
						
						
						
					 
					
						2017-05-25 14:28:34 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							11f139a647 
							
						 
					 
					
						
						
							
							Merge pull request  #2247  from matrix-org/erikj/auth_event  
						
						... 
						
						
						
						Only store event_auth for state events 
						
						
					 
					
						2017-05-24 16:46:34 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							6e614e9e10 
							
						 
					 
					
						
						
							
							Add background task to clear out old event_auth  
						
						
						
						
					 
					
						2017-05-24 15:23:34 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							c049472b8a 
							
						 
					 
					
						
						
							
							Only store event_auth for state events  
						
						
						
						
					 
					
						2017-05-24 15:23:31 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							9a804b2812 
							
						 
					 
					
						
						
							
							Merge pull request  #2243  from matrix-org/matthew/fix-url-preview-length-again  
						
						... 
						
						
						
						actually trim oversize og:description meta 
						
						
					 
					
						2017-05-23 13:26:28 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							fbbc40f385 
							
						 
					 
					
						
						
							
							Merge pull request  #2237  from matrix-org/erikj/sync_key_count  
						
						... 
						
						
						
						Add count of one time keys to sync stream 
						
						
					 
					
						2017-05-23 11:18:13 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							8cf9f0a3e7 
							
						 
					 
					
						
						
							
							Remove redundant invalidation  
						
						
						
						
					 
					
						2017-05-23 09:46:59 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e6618ece2d 
							
						 
					 
					
						
						
							
							Missed an invalidation  
						
						
						
						
					 
					
						2017-05-23 09:36:52 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							58c4720293 
							
						 
					 
					
						
						
							
							Merge pull request  #2242  from matrix-org/erikj/email_refactor  
						
						... 
						
						
						
						Only load jinja2 templates once 
						
						
					 
					
						2017-05-23 09:34:08 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							836d5c44b6 
							
						 
					 
					
						
						
							
							actually trim oversize og:description meta  
						
						
						
						
					 
					
						2017-05-22 21:14:20 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							11c2a3655f 
							
						 
					 
					
						
						
							
							Only load jinja2 templates once  
						
						... 
						
						
						
						Instead of every time a new email pusher is created, as loading jinja2
templates is slow. 
						
						
					 
					
						2017-05-22 17:48:58 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							539aa4d333 
							
						 
					 
					
						
						
							
							Merge pull request  #2241  from matrix-org/erikj/fix_notifs  
						
						... 
						
						
						
						Correctly calculate push rules for member events 
						
						
					 
					
						2017-05-22 16:46:58 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f85a415279 
							
						 
					 
					
						
						
							
							Add missing storage function to slave store  
						
						
						
						
					 
					
						2017-05-22 16:31:24 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							6489455bed 
							
						 
					 
					
						
						
							
							Comment  
						
						
						
						
					 
					
						2017-05-22 16:22:04 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							d668caa79c 
							
						 
					 
					
						
						
							
							Remove spurious log level guards  
						
						
						
						
					 
					
						2017-05-22 16:21:06 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							74bf4ee7bf 
							
						 
					 
					
						
						
							
							Stream count_e2e_one_time_keys cache invalidation  
						
						
						
						
					 
					
						2017-05-22 16:19:22 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							33ba90c6e9 
							
						 
					 
					
						
						
							
							Merge pull request  #2240  from matrix-org/erikj/cache_list_fix  
						
						... 
						
						
						
						Update list cache to handle one arg case 
						
						
					 
					
						2017-05-22 16:10:46 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							ccd62415ac 
							
						 
					 
					
						
						
							
							Merge pull request  #2238  from matrix-org/erikj/faster_push_rules  
						
						... 
						
						
						
						Speed up calculating push rules 
						
						
					 
					
						2017-05-22 15:12:34 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							bd7bb5df71 
							
						 
					 
					
						
						
							
							Pull out if statement from for loop  
						
						
						
						
					 
					
						2017-05-22 15:12:19 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e3417a06e2 
							
						 
					 
					
						
						
							
							Update list cache to handle one arg case  
						
						... 
						
						
						
						We update the normal cache descriptors to handle caches with a single
argument specially so that the key wasn't a 1-tuple. We need to update
the cache list to be aware of this. 
						
						
					 
					
						2017-05-22 15:04:42 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7fb80b5eae 
							
						 
					 
					
						
						
							
							Check if current event is a membership event  
						
						
						
						
					 
					
						2017-05-22 15:02:12 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							2d17b09a6d 
							
						 
					 
					
						
						
							
							Add debug logging  
						
						
						
						
					 
					
						2017-05-22 15:01:36 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							24c8f38784 
							
						 
					 
					
						
						
							
							Comment  
						
						
						
						
					 
					
						2017-05-22 14:59:27 +01:00