2ee1bd124c 
								
							
								 
							
						 
						
							
							
								
								Limit number of extremeties in backfill request  
							
							... 
							
							
							
							This works around a bug where if we make a backfill request with too
many extremeties it causes the request URI to be too long. 
							
						 
						
							2016-08-16 11:34:36 +01:00  
				
					
						
							
							
								 
						
							
							
								6cbd1b495e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'fix_integrity_retry' of  https://github.com/Ralith/synapse  into Ralith-fix_integrity_retry  
							
							
							
						 
						
							2016-08-16 10:50:24 +01:00  
				
					
						
							
							
								 
						
							
							
								75299af4fc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1009  from matrix-org/erikj/event_split  
							
							... 
							
							
							
							Split out /events to synchrotron 
							
						 
						
							2016-08-15 15:39:05 +01:00  
				
					
						
							
							
								 
						
							
							
								89e786bd85 
								
							
								 
							
						 
						
							
							
								
								Doc get_next() context manager usage  
							
							
							
						 
						
							2016-08-15 13:45:26 +01:00  
				
					
						
							
							
								 
						
							
							
								d9664344ec 
								
							
								 
							
						 
						
							
							
								
								Rename table. Add docs.  
							
							
							
						 
						
							2016-08-15 11:45:57 +01:00  
				
					
						
							
							
								 
						
							
							
								784a2d4f2c 
								
							
								 
							
						 
						
							
							
								
								Remove broken cache stuff  
							
							
							
						 
						
							2016-08-15 11:25:48 +01:00  
				
					
						
							
							
								 
						
							
							
								0be963472b 
								
							
								 
							
						 
						
							
							
								
								Use cached version of get_aliases_for_room  
							
							
							
						 
						
							2016-08-15 11:24:12 +01:00  
				
					
						
							
							
								 
						
							
							
								64e7e11853 
								
							
								 
							
						 
						
							
							
								
								Implement cache replication stream  
							
							
							
						 
						
							2016-08-15 11:16:45 +01:00  
				
					
						
							
							
								 
						
							
							
								4d70d1f80e 
								
							
								 
							
						 
						
							
							
								
								Add some invalidations to a cache_stream  
							
							
							
						 
						
							2016-08-15 11:15:17 +01:00  
				
					
						
							
							
								 
						
							
							
								99bbd90b0d 
								
							
								 
							
						 
						
							
							
								
								Always run txn.after_callbacks  
							
							
							
						 
						
							2016-08-15 09:45:44 +01:00  
				
					
						
							
							
								 
						
							
							
								8a57cc3123 
								
							
								 
							
						 
						
							
							
								
								Add missing database corruption recovery case  
							
							... 
							
							
							
							Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com> 
							
						 
						
							2016-08-14 11:50:22 -07:00  
				
					
						
							
							
								 
						
							
							
								2edb7c7676 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1007  from sargon/develop  
							
							... 
							
							
							
							Fix some bugs in the auth/ldap handler 
							
						 
						
							2016-08-14 16:07:31 +01:00  
				
					
						
							
							
								 
						
							
							
								dfaf0fee31 
								
									
								
							
								 
							
						 
						
							
							
								
								Log the value which is observed in the first place.  
							
							... 
							
							
							
							The name 'result' is of bool type and has no len property,
resulting in a TypeError. Futhermore in the flow control
conn.response is observed and hence should be reported.
Signed-off-by: Daniel Ehlers <sargon@toppoint.de> 
							
						 
						
							2016-08-14 16:49:05 +02:00  
				
					
						
							
							
								 
						
							
							
								e380538b59 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix AttributeError when bind_dn is not defined.  
							
							... 
							
							
							
							In case one does not define bind_dn in ldap configuration, filter
attribute is not declared. Since auth code only uses ldap_filter attribute
when according LDAP mode is selected, it is safe to only declare the
attribute in that case.
Signed-off-by: Daniel Ehlers <sargon@toppoint.de> 
							
						 
						
							2016-08-14 16:48:33 +02:00  
				
					
						
							
							
								 
						
							
							
								4e1cebd56f 
								
							
								 
							
						 
						
							
							
								
								Make synchrotron accept /events  
							
							
							
						 
						
							2016-08-12 15:31:44 +01:00  
				
					
						
							
							
								 
						
							
							
								5006c4b30d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1005  from matrix-org/erikj/linearize_joins  
							
							... 
							
							
							
							Only process one local membership event per room at a time 
							
						 
						
							2016-08-12 10:14:12 +01:00  
				
					
						
							
							
								 
						
							
							
								866a5320de 
								
							
								 
							
						 
						
							
							
								
								Dont invoke get_handlers fromClientV1RestServlet  
							
							... 
							
							
							
							hs.get_handlers() can not be invoked from split out processes. Moving
the invocations down a level means that we can slowly split out
individual servlets. 
							
						 
						
							2016-08-12 10:03:19 +01:00  
				
					
						
							
							
								 
						
							
							
								448ac6cf0d 
								
							
								 
							
						 
						
							
							
								
								Only process one local membership event per room at a time  
							
							
							
						 
						
							2016-08-12 09:32:19 +01:00  
				
					
						
							
							
								 
						
							
							
								832799dbff 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #997  from Half-Shot/develop  
							
							... 
							
							
							
							Don't change status_msg on /sync 
							
						 
						
							2016-08-11 14:10:55 +01:00  
				
					
						
							
							
								 
						
							
							
								5b5148b7ec 
								
							
								 
							
						 
						
							
							
								
								Synced up synchrotron set_state with PresenceHandler set_state  
							
							
							
						 
						
							2016-08-11 11:48:30 +01:00  
				
					
						
							
							
								 
						
							
							
								c9c1541fd0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1003  from matrix-org/erikj/redaction_prev_content  
							
							... 
							
							
							
							Include prev_content in redacted state events 
							
						 
						
							2016-08-11 10:41:18 +01:00  
				
					
						
							
							
								 
						
							
							
								1d40373c9d 
								
							
								 
							
						 
						
							
							
								
								Include prev_content in redacted state events  
							
							
							
						 
						
							2016-08-11 10:24:41 +01:00  
				
					
						
							
							
								 
						
							
							
								5202679edc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1000  from matrix-org/erikj/contexts  
							
							... 
							
							
							
							Clean up TransactionQueue 
							
						 
						
							2016-08-11 09:34:12 +01:00  
				
					
						
							
							
								 
						
							
							
								c315922b5f 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							
							
						 
						
							2016-08-10 16:34:10 +01:00  
				
					
						
							
							
								 
						
							
							
								ca8abfbf30 
								
							
								 
							
						 
						
							
							
								
								Clean up TransactionQueue  
							
							
							
						 
						
							2016-08-10 16:24:16 +01:00  
				
					
						
							
							
								 
						
							
							
								5aeadb7414 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #999  from matrix-org/erikj/measure_more  
							
							... 
							
							
							
							Measure federation send transaction resources 
							
						 
						
							2016-08-10 14:16:14 +01:00  
				
					
						
							
							
								 
						
							
							
								c9f724caa4 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #998  from matrix-org/erikj/pdu_fail_cache  
							
							... 
							
							
							
							Various federation /event/ improvements 
							
						 
						
							2016-08-10 14:09:14 +01:00  
				
					
						
							
							
								 
						
							
							
								487bc49bf8 
								
							
								 
							
						 
						
							
							
								
								Don't stop on 4xx series errors  
							
							
							
						 
						
							2016-08-10 13:39:12 +01:00  
				
					
						
							
							
								 
						
							
							
								739ea29d1e 
								
							
								 
							
						 
						
							
							
								
								Also check if server is in the room  
							
							
							
						 
						
							2016-08-10 13:32:23 +01:00  
				
					
						
							
							
								 
						
							
							
								ea8c4094db 
								
							
								 
							
						 
						
							
							
								
								Also pull out rejected events  
							
							
							
						 
						
							2016-08-10 13:26:13 +01:00  
				
					
						
							
							
								 
						
							
							
								7f41bcbeec 
								
							
								 
							
						 
						
							
							
								
								Correctly auth /event/ requests  
							
							
							
						 
						
							2016-08-10 13:22:20 +01:00  
				
					
						
							
							
								 
						
							
							
								11fdfaf03b 
								
							
								 
							
						 
						
							
							
								
								Only resign our own events  
							
							
							
						 
						
							2016-08-10 13:16:58 +01:00  
				
					
						
							
							
								 
						
							
							
								2510db3e76 
								
							
								 
							
						 
						
							
							
								
								Don't change status_msg on /sync  
							
							
							
						 
						
							2016-08-10 12:59:59 +01:00  
				
					
						
							
							
								 
						
							
							
								f91df1f761 
								
							
								 
							
						 
						
							
							
								
								Store if we fail to fetch an event from a destination  
							
							
							
						 
						
							2016-08-10 11:31:46 +01:00  
				
					
						
							
							
								 
						
							
							
								3bc9629be5 
								
							
								 
							
						 
						
							
							
								
								Measure federation send transaction resources  
							
							
							
						 
						
							2016-08-10 10:56:38 +01:00  
				
					
						
							
							
								 
						
							
							
								d45489474d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #996  from matrix-org/erikj/tls_error  
							
							... 
							
							
							
							Don't print stack traces when failing to get remote keys 
							
						 
						
							2016-08-10 10:56:08 +01:00  
				
					
						
							
							
								 
						
							
							
								fa1ce4d8ad 
								
							
								 
							
						 
						
							
							
								
								Don't print stack traces when failing to get remote keys  
							
							
							
						 
						
							2016-08-10 10:44:37 +01:00  
				
					
						
							
							
								 
						
							
							
								79ebfbe7c6 
								
							
								 
							
						 
						
							
							
								
								/login: Respond with a 403 when we get an invalid m.login.token  
							
							
							
						 
						
							2016-08-09 16:29:28 +01:00  
				
					
						
							
							
								 
						
							
							
								cd41c6ece2 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #995  from matrix-org/rav/clean_up_cas_login  
							
							... 
							
							
							
							Clean up CAS login code 
							
						 
						
							2016-08-09 10:21:56 +01:00  
				
					
						
							
							
								 
						
							
							
								27771b2495 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #994  from matrix-org/rav/fix_cas_login  
							
							... 
							
							
							
							Fix CAS login 
							
						 
						
							2016-08-08 17:47:45 +01:00  
				
					
						
							
							
								 
						
							
							
								d3250499c1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #993  from matrix-org/rav/fix_token_login  
							
							... 
							
							
							
							Fix token login 
							
						 
						
							2016-08-08 17:43:02 +01:00  
				
					
						
							
							
								 
						
							
							
								a8bcc7274d 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							
							
						 
						
							2016-08-08 17:20:38 +01:00  
				
					
						
							
							
								 
						
							
							
								65666fedd5 
								
							
								 
							
						 
						
							
							
								
								Clean up CAS login code  
							
							... 
							
							
							
							Remove some apparently unused code.
Clean up parse_cas_response, mostly to catch the exception if the CAS response
isn't valid XML. 
							
						 
						
							2016-08-08 17:17:25 +01:00  
				
					
						
							
							
								 
						
							
							
								0682ca04b3 
								
							
								 
							
						 
						
							
							
								
								Fix CAS login  
							
							... 
							
							
							
							Attempting to log in with CAS was giving a 500 error. 
							
						 
						
							2016-08-08 17:01:30 +01:00  
				
					
						
							
							
								 
						
							
							
								6fe6a6f029 
								
							
								 
							
						 
						
							
							
								
								Fix login with m.login.token  
							
							... 
							
							
							
							login with token (as used by CAS auth) was broken by 067596d 
							
						 
						
							2016-08-08 16:40:39 +01:00  
				
					
						
							
							
								 
						
							
							
								d330d45e2d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse  
							
							
							
						 
						
							2016-08-08 13:38:13 +01:00  
				
					
						
							
							
								 
						
							
							
								ccd4290777 
								
							
								 
							
						 
						
							
							
								
								Capatailize HTML  
							
							
							
						 
						
							2016-08-08 13:18:58 +01:00  
				
					
						
							
							
								 
						
							
							
								9cb42507f8 
								
							
								 
							
						 
						
							
							
								
								Be bolder  
							
							
							
						 
						
							2016-08-08 13:17:28 +01:00  
				
					
						
							
							
								 
						
							
							
								d960910c72 
								
							
								 
							
						 
						
							
							
								
								Update changelog  
							
							
							
						 
						
							2016-08-08 13:06:22 +01:00  
				
					
						
							
							
								 
						
							
							
								b46b8a5efb 
								
							
								 
							
						 
						
							
							
								
								Update changelog  
							
							
							
						 
						
							2016-08-08 11:34:33 +01:00