David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							0e0aee25c4 
							
						 
					 
					
						
						
							
							Fix log line  
						
						
						
						
					 
					
						2017-03-08 11:46:22 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							82c5e7de25 
							
						 
					 
					
						
						
							
							Typos  
						
						
						
						
					 
					
						2017-03-08 11:42:44 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							2e27339add 
							
						 
					 
					
						
						
							
							Refector out assert_params_in_request  
						
						... 
						
						
						
						and replace requestEmailToken where we meant requestMsisdnToken 
						
						
					 
					
						2017-03-08 11:37:34 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							88df6c0c9a 
							
						 
					 
					
						
						
							
							Factor out msisdn canonicalisation  
						
						... 
						
						
						
						Plus a couple of other minor fixes 
						
						
					 
					
						2017-03-08 11:03:39 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							402a7bf63d 
							
						 
					 
					
						
						
							
							Fix pep8  
						
						
						
						
					 
					
						2017-03-08 09:33:40 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							00466e2feb 
							
						 
					 
					
						
						
							
							Support new login format  
						
						... 
						
						
						
						https://docs.google.com/document/d/1-6ZSSW5YvCGhVFDyD2QExAUAdpCWjccvJT5xiyTTG2Y/edit#  
					
						2017-03-07 16:37:23 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							c98d91fe94 
							
						 
					 
					
						
						
							
							Merge pull request  #1969  from matrix-org/erikj/get_distinct_devices  
						
						... 
						
						
						
						Select distinct devices from DB 
						
						
					 
					
						2017-03-06 11:52:46 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							ac5491f563 
							
						 
					 
					
						
						
							
							Select distinct devices from DB  
						
						... 
						
						
						
						Otherwise we might pull out tonnes of duplicate user_ids and this can
make synapse sad. 
						
						
					 
					
						2017-03-06 11:10:14 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							b0effa2160 
							
						 
					 
					
						
						
							
							Add msisdns as 3pids during registration  
						
						... 
						
						
						
						and support binding them with the bind_msisdn param 
						
						
					 
					
						2017-03-03 18:34:39 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							82f7f1543b 
							
						 
					 
					
						
						
							
							Merge pull request  #1964  from matrix-org/erikj/device_list_update_fix  
						
						... 
						
						
						
						Fix device list update to not constantly resync 
						
						
					 
					
						2017-03-03 16:18:16 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							96d79bb532 
							
						 
					 
					
						
						
							
							Merge pull request  #1963  from matrix-org/erikj/delete_old_device_streams  
						
						... 
						
						
						
						Clobber old device list stream entries 
						
						
					 
					
						2017-03-03 16:18:06 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f2581ee8b8 
							
						 
					 
					
						
						
							
							Don't keep around old stream IDs forever  
						
						
						
						
					 
					
						2017-03-03 16:02:53 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							9834367eea 
							
						 
					 
					
						
						
							
							Spelling  
						
						
						
						
					 
					
						2017-03-03 15:31:57 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							da52d3af31 
							
						 
					 
					
						
						
							
							Fix up  
						
						
						
						
					 
					
						2017-03-03 15:29:13 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							ad882cd54d 
							
						 
					 
					
						
						
							
							Just return the deferred straight off  
						
						... 
						
						
						
						defer.returnValue doth not maketh a generator: it would need a
yield to be a generator, and this doesn't need a yield. 
						
						
					 
					
						2017-03-01 18:08:51 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							3557cf34dc 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signin  
						
						
						
						
					 
					
						2017-03-01 17:20:37 +00:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							856a18f7a8 
							
						 
					 
					
						
						
							
							kick jenkins  
						
						
						
						
					 
					
						2017-03-01 16:24:11 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							d766343668 
							
						 
					 
					
						
						
							
							Add index to device_lists_stream  
						
						
						
						
					 
					
						2017-03-01 15:56:30 +00:00 
						 
				 
			
				
					
						
							
							
								Paul Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							0bf2c7f3bc 
							
						 
					 
					
						
						
							
							Merge pull request  #1960  from matrix-org/paul/sytest-integration  
						
						... 
						
						
						
						Prepare a script for Jenkins to run sytest via dendron+haproxy 
						
						
					 
					
						2017-03-01 15:08:09 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							36be39b8b3 
							
						 
					 
					
						
						
							
							Fix device list update to not constantly resync  
						
						
						
						
					 
					
						2017-03-01 14:12:11 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3365117151 
							
						 
					 
					
						
						
							
							Clobber old device list stream entries  
						
						
						
						
					 
					
						2017-03-01 10:21:30 +00:00 
						 
				 
			
				
					
						
							
							
								Benedict Lau 
							
						 
					 
					
						
						
						
						
							
						
						
							92312aa3e6 
							
						 
					 
					
						
						
							
							Clarify doc for SQLite to PostgreSQL port  
						
						
						
						
					 
					
						2017-03-01 01:30:11 -05:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							6b1ffa5f3d 
							
						 
					 
					
						
						
							
							Added also a control script to run via the crazy dendron+haproxy hybrid we're temporarily using  
						
						
						
						
					 
					
						2017-02-28 18:14:13 +00:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							f4e7545d88 
							
						 
					 
					
						
						
							
							No longer need to request all the sub-components to be split when running sytest+dendron  
						
						
						
						
					 
					
						2017-02-28 18:11:52 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e933a2712d 
							
						 
					 
					
						
						
							
							Don't log unknown cache warnings in workers  
						
						
						
						
					 
					
						2017-02-28 16:22:41 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							d638a7484b 
							
						 
					 
					
						
						
							
							Merge pull request  #1959  from matrix-org/erikj/intern_once  
						
						... 
						
						
						
						Intern table column names once 
						
						
					 
					
						2017-02-28 15:15:16 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7eff3afa05 
							
						 
					 
					
						
						
							
							Merge pull request  #1957  from matrix-org/device_poke_index  
						
						... 
						
						
						
						Add stream_id index to device_lists_outbound_pokes 
						
						
					 
					
						2017-02-28 14:48:32 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							b84907bdbb 
							
						 
					 
					
						
						
							
							Intern table column names once  
						
						
						
						
					 
					
						2017-02-28 14:38:16 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e4919b9329 
							
						 
					 
					
						
						
							
							Add stream_id index to device_lists_outbound_pokes  
						
						... 
						
						
						
						As this is used for replication streaming 
						
						
					 
					
						2017-02-28 11:19:06 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							8a12b6f1eb 
							
						 
					 
					
						
						
							
							Fix up txn name  
						
						
						
						
					 
					
						2017-02-28 10:15:50 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							848cf95ea0 
							
						 
					 
					
						
						
							
							Pop with default value to stop throwing  
						
						
						
						
					 
					
						2017-02-28 10:02:54 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							9037787f0b 
							
						 
					 
					
						
						
							
							merge in right archlinux package, thanks to @saram-kon from  https://github.com/matrix-org/synapse/pull/1956  
						
						
						
						
					 
					
						2017-02-28 00:30:25 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							eda96586ca 
							
						 
					 
					
						
						
							
							Merge pull request  #1955  from matrix-org/erikj/current_state_query_bypass  
						
						... 
						
						
						
						Don't fetch current state in common case 
						
						
					 
					
						2017-02-27 19:15:59 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							64a2cef9bb 
							
						 
					 
					
						
						
							
							Pop rather than del from dict  
						
						
						
						
					 
					
						2017-02-27 19:15:36 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a41dce8f8a 
							
						 
					 
					
						
						
							
							Remove needless check  
						
						
						
						
					 
					
						2017-02-27 18:54:43 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							c0d6045776 
							
						 
					 
					
						
						
							
							It should be all  
						
						
						
						
					 
					
						2017-02-27 18:45:24 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							49f4bc4709 
							
						 
					 
					
						
						
							
							Don't fetch current state in common case  
						
						... 
						
						
						
						Currently we fetch the list of current state events whenever we send
something in a room. This is overkill for the common case of persisting
a simple chain of non-state events, so lets handle that case specially. 
						
						
					 
					
						2017-02-27 18:33:41 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							8eec652de5 
							
						 
					 
					
						
						
							
							Merge pull request  #1904  from Pneumaticat/patch-1  
						
						... 
						
						
						
						Fix synapse_port_db failure (fixes  #1902 ) 
						
						
					 
					
						2017-02-27 18:11:13 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							fc5d876dba 
							
						 
					 
					
						
						
							
							Merge pull request  #1954  from matrix-org/erikj/cache_device2  
						
						... 
						
						
						
						Cache get_user_devices_from_cache 
						
						
					 
					
						2017-02-27 16:36:40 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f58dbb02a6 
							
						 
					 
					
						
						
							
							Cache get_user_devices_from_cache  
						
						
						
						
					 
					
						2017-02-27 16:22:12 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							ca7ea2a4b5 
							
						 
					 
					
						
						
							
							Merge pull request  #1951  from enckse/develop  
						
						... 
						
						
						
						the aur package is no longer there, community package in arch does exist 
						
						
					 
					
						2017-02-27 15:11:00 +00:00 
						 
				 
			
				
					
						
							
							
								Sean Enck 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c80439a320 
							
						 
					 
					
						
						
							
							the aur package is no longer there, community package in arch does exist  
						
						
						
						
					 
					
						2017-02-27 10:06:15 -05:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							acf6d4d2e3 
							
						 
					 
					
						
						
							
							Merge pull request  #1945  from jkolo/fix_dynamic_thumbnails_aspect  
						
						... 
						
						
						
						Fix  #1677  (dynamic thumbnails aspect) 
					
						2017-02-27 09:51:52 +00:00 
						 
				 
			
				
					
						
							
							
								Jurek 
							
						 
					 
					
						
						
						
						
							
						
						
							aea5461488 
							
						 
					 
					
						
						
							
							Fix dynamic thumbnails aspect  
						
						
						
						
					 
					
						2017-02-24 22:43:27 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							bf92b7201f 
							
						 
					 
					
						
						
							
							Merge pull request  #1939  from matrix-org/erikj/strip_sql_newlines  
						
						... 
						
						
						
						Strip newlines from SQL queries 
						
						
					 
					
						2017-02-23 11:30:33 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							1a4f8022e6 
							
						 
					 
					
						
						
							
							Strip newlines from SQL queries  
						
						
						
						
					 
					
						2017-02-23 11:15:31 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							b2d20e94fa 
							
						 
					 
					
						
						
							
							Remove lock from rotate notifs  
						
						
						
						
					 
					
						2017-02-22 14:24:02 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7455ba436a 
							
						 
					 
					
						
						
							
							Ensure we pass positive ints to delay function  
						
						
						
						
					 
					
						2017-02-22 12:08:14 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							b7442c3e2b 
							
						 
					 
					
						
						
							
							Store looping call  
						
						
						
						
					 
					
						2017-02-21 13:59:25 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a3708a1885 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:matrix-org/synapse into develop  
						
						
						
						
					 
					
						2017-02-21 13:46:27 +00:00